Fix user hook call for dynamic_macro_record_key (#22250 )

Lotus 58 Glow - Added Auto shift to OLED, corrected OLED orientation (#22424 )
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2025-09-10 17:15:43 +00:00 · 2024-01-09 21:45:44 +11:00 · 2024-01-09 21:17:46 +11:00 · 2024-01-09 20:53:26 +11:00 · 2024-01-07 18:37:56 +11:00 · 2024-01-06 23:36:22 -08:00
1437 changed files with 7251 additions and 10561 deletions
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -35,7 +35,7 @@ jobs:

    - name: Get changed files
      id: file_changes
-      uses: tj-actions/changed-files@v40
+      uses: tj-actions/changed-files@v41

    - name: Run qmk formatters
      shell: 'bash {0}'
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:

    - name: Get changed files
      id: file_changes
-      uses: tj-actions/changed-files@v40
+      uses: tj-actions/changed-files@v41

    - name: Print info
      run: |
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -313,7 +313,6 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
        OPT_DEFS += -DRGBLIGHT_$(strip $(shell echo $(RGBLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]'))
        SRC += $(QUANTUM_DIR)/color.c
        SRC += $(QUANTUM_DIR)/rgblight/rgblight.c
-        SRC += $(QUANTUM_DIR)/rgblight/rgblight_drivers.c
        CIE1931_CURVE := yes
        RGB_KEYCODES_ENABLE := yes
    endif
@@ -908,12 +907,6 @@ ifeq ($(strip $(ENCODER_ENABLE)), yes)
    endif
 endif

-ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
-    ifeq ($(strip $(DIP_SWITCH_MAP_ENABLE)), yes)
-        OPT_DEFS += -DDIP_SWITCH_MAP_ENABLE
-    endif
-endif
-
 VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor

 WS2812_DRIVER ?= bitbang
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@@ -35,7 +35,6 @@ GENERIC_FEATURES = \
    HAPTIC \
    KEY_LOCK \
    KEY_OVERRIDE \
-    LAMPARRAY \
    LEADER \
    MAGIC \
    MOUSEKEY \
--- a/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson
+++ b/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson
@@ -1,339 +0,0 @@
-{
-    "aliases": {
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ¿ │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ´ │ + │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ñ │ { │ } │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "KC_GRV": {
-            "key": "ES_PIPE",
-            "label": "|",
-        }
-        "KC_1": {
-            "key": "ES_1",
-            "label": "1",
-        }
-        "KC_2": {
-            "key": "ES_2",
-            "label": "2",
-        }
-        "KC_3": {
-            "key": "ES_3",
-            "label": "3",
-        }
-        "KC_4": {
-            "key": "ES_4",
-            "label": "4",
-        }
-        "KC_5": {
-            "key": "ES_5",
-            "label": "5",
-        }
-        "KC_6": {
-            "key": "ES_6",
-            "label": "6",
-        }
-        "KC_7": {
-            "key": "ES_7",
-            "label": "7",
-        }
-        "KC_8": {
-            "key": "ES_8",
-            "label": "8",
-        }
-        "KC_9": {
-            "key": "ES_9",
-            "label": "9",
-        }
-        "KC_0": {
-            "key": "ES_0",
-            "label": "0",
-        }
-        "KC_MINS": {
-            "key": "ES_QUOT",
-            "label": "'",
-        }
-        "KC_EQL": {
-            "key": "ES_IQUE",
-            "label": "¿",
-        }
-        "KC_Q": {
-            "key": "ES_Q",
-            "label": "Q",
-        }
-        "KC_W": {
-            "key": "ES_W",
-            "label": "W",
-        }
-        "KC_E": {
-            "key": "ES_E",
-            "label": "E",
-        }
-        "KC_R": {
-            "key": "ES_R",
-            "label": "R",
-        }
-        "KC_T": {
-            "key": "ES_T",
-            "label": "T",
-        }
-        "KC_Y": {
-            "key": "ES_Y",
-            "label": "Y",
-        }
-        "KC_U": {
-            "key": "ES_U",
-            "label": "U",
-        }
-        "KC_I": {
-            "key": "ES_I",
-            "label": "I",
-        }
-        "KC_O": {
-            "key": "ES_O",
-            "label": "O",
-        }
-        "KC_P": {
-            "key": "ES_P",
-            "label": "P",
-        }
-        "KC_LBRC": {
-            "key": "ES_ACUT",
-            "label": "´ (dead)",
-        }
-        "KC_RBRC": {
-            "key": "ES_PLUS",
-            "label": "+",
-        }
-        "KC_A": {
-            "key": "ES_A",
-            "label": "A",
-        }
-        "KC_S": {
-            "key": "ES_S",
-            "label": "S",
-        }
-        "KC_D": {
-            "key": "ES_D",
-            "label": "D",
-        }
-        "KC_F": {
-            "key": "ES_F",
-            "label": "F",
-        }
-        "KC_G": {
-            "key": "ES_G",
-            "label": "G",
-        }
-        "KC_H": {
-            "key": "ES_H",
-            "label": "H",
-        }
-        "KC_J": {
-            "key": "ES_J",
-            "label": "J",
-        }
-        "KC_K": {
-            "key": "ES_K",
-            "label": "K",
-        }
-        "KC_L": {
-            "key": "ES_L",
-            "label": "L",
-        }
-        "KC_SCLN": {
-            "key": "ES_NTIL",
-            "label": "Ñ",
-        }
-        "KC_QUOT": {
-            "key": "ES_LCBR",
-            "label": "{",
-        }
-        "KC_NUHS": {
-            "key": "ES_RCBR",
-            "label": "}",
-        }
-        "KC_NUBS": {
-            "key": "ES_LABK",
-            "label": "<",
-        }
-        "KC_Z": {
-            "key": "ES_Z",
-            "label": "Z",
-        }
-        "KC_X": {
-            "key": "ES_X",
-            "label": "X",
-        }
-        "KC_C": {
-            "key": "ES_C",
-            "label": "C",
-        }
-        "KC_V": {
-            "key": "ES_V",
-            "label": "V",
-        }
-        "KC_B": {
-            "key": "ES_B",
-            "label": "B",
-        }
-        "KC_N": {
-            "key": "ES_N",
-            "label": "N",
-        }
-        "KC_M": {
-            "key": "ES_M",
-            "label": "M",
-        }
-        "KC_COMM": {
-            "key": "ES_COMM",
-            "label": ",",
-        }
-        "KC_DOT": {
-            "key": "ES_DOT",
-            "label": ".",
-        }
-        "KC_SLSH": {
-            "key": "ES_MINS",
-            "label": "-",
-        }
-/* Shifted symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ° │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¡ │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ ¨ │ * │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │ [ │ ] │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ > │   │   │   │   │   │   │   │ ; │ : │ _ │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(ES_PIPE)": {
-            "key": "ES_MORD",
-            "label": "°",
-        }
-        "S(ES_1)": {
-            "key": "ES_EXLM",
-            "label": "!",
-        }
-        "S(ES_2)": {
-            "key": "ES_DQUO",
-            "label": "\"",
-        }
-        "S(ES_3)": {
-            "key": "ES_NUMB",
-            "label": "#",
-        }
-        "S(ES_4)": {
-            "key": "ES_DLR",
-            "label": "$",
-        }
-        "S(ES_5)": {
-            "key": "ES_PERC",
-            "label": "%",
-        }
-        "S(ES_6)": {
-            "key": "ES_AMPR",
-            "label": "&",
-        }
-        "S(ES_7)": {
-            "key": "ES_SLSH",
-            "label": "/",
-        }
-        "S(ES_8)": {
-            "key": "ES_LPRN",
-            "label": "(",
-        }
-        "S(ES_9)": {
-            "key": "ES_RPRN",
-            "label": ")",
-        }
-        "S(ES_0)": {
-            "key": "ES_EQL",
-            "label": "=",
-        }
-        "S(ES_QUOT)": {
-            "key": "ES_QUES",
-            "label": "?",
-        }
-        "S(ES_IQUE)": {
-            "key": "ES_IEXL",
-            "label": "¡",
-        }
-        "S(ES_ACUT)": {
-            "key": "ES_DIAE",
-            "label": "¨ (dead)",
-        }
-        "S(ES_PLUS)": {
-            "key": "ES_ASTR",
-            "label": "*",
-        }
-        "S(ES_LCBR)": {
-            "key": "ES_LBRC",
-            "label": "[",
-        }
-        "S(ES_RCBR)": {
-            "key": "ES_RBRC",
-            "label": "]",
-        }
-        "S(ES_LABK)": {
-            "key": "ES_RABK",
-            "label": ">",
-        }
-        "S(ES_COMM)": {
-            "key": "ES_SCLN",
-            "label": ";",
-        }
-        "S(ES_DOT)": {
-            "key": "ES_COLN",
-            "label": ":",
-        }
-        "S(ES_MINS)": {
-            "key": "ES_UNDS",
-            "label": "_",
-        }
-/* AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ¬ │   │   │   │   │   │   │   │   │   │   │ \ │   │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ @ │   │   │   │   │   │   │   │   │   │   │ ~ │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │ ^ │ ` │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(ES_PIPE)": {
-            "key": "ES_NOT",
-            "label": "¬",
-        }
-        "ALGR(ES_QUOT)": {
-            "key": "ES_BSLS",
-            "label": "\\",
-        }
-        "ALGR(ES_Q)": {
-            "key": "ES_AT",
-            "label": "@",
-        }
-        "ALGR(ES_PLUS)": {
-            "key": "ES_TILD",
-            "label": "~",
-        }
-        "ALGR(ES_LCBR)": {
-            "key": "ES_CIRC",
-            "label": "^",
-        }
-    }
-}
--- a/data/mappings/defaults.hjson
+++ b/data/mappings/defaults.hjson
@@ -45,11 +45,6 @@
            "bootloader": "rp2040",
            "processor": "RP2040"
        },
-        "imera": {
-            "processor": "RP2040",
-            "bootloader": "rp2040",
-            "board": "QMK_PM2040"
-        },
        "kb2040": {
            "board": "QMK_PM2040",
            "bootloader": "rp2040",
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -17,8 +17,6 @@
    "APA102_DI_PIN": {"info_key": "apa102.data_pin"},

    // Audio
-    "AUDIO_DEFAULT_ON": {"info_key": "audio.default.on", "value_type": "bool"},
-    "AUDIO_DEFAULT_CLICKY_ON": {"info_key": "audio.default.clicky", "value_type": "bool"},
    "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
    "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "bool"},

@@ -76,12 +74,12 @@
    "LEADER_TIMEOUT": {"info_key": "leader_key.timeout", "value_type": "int"},

    // LED Matrix
+    "LED_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "led_matrix.sleep", "value_type": "bool"},
    "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
    "LED_MATRIX_KEYRELEASES": {"info_key": "led_matrix.react_on_keyup", "value_type": "bool"},
    "LED_MATRIX_LED_FLUSH_LIMIT": {"info_key": "led_matrix.led_flush_limit", "value_type": "int"},
    "LED_MATRIX_LED_PROCESS_LIMIT": {"info_key": "led_matrix.led_process_limit", "value_type": "int", "to_json": false},
    "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
-    "LED_MATRIX_SLEEP": {"info_key": "led_matrix.sleep", "value_type": "bool"},
    "LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
    "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
    "LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"},
@@ -124,6 +122,7 @@
    "PS2_DATA_PIN": {"info_key": "ps2.data_pin"},

    // RGB Matrix
+    "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "rgb_matrix.sleep", "value_type": "bool"},
    "RGB_MATRIX_CENTER": {"info_key": "rgb_matrix.center_point", "value_type": "array.int"},
    "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"},
    "RGB_MATRIX_KEYRELEASES": {"info_key": "rgb_matrix.react_on_keyup", "value_type": "bool"},
@@ -131,7 +130,6 @@
    "RGB_MATRIX_LED_PROCESS_LIMIT": {"info_key": "rgb_matrix.led_process_limit", "value_type": "int", "to_json": false},
    "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
    "RGB_MATRIX_SAT_STEP": {"info_key": "rgb_matrix.sat_steps", "value_type": "int"},
-    "RGB_MATRIX_SLEEP": {"info_key": "rgb_matrix.sleep", "value_type": "bool"},
    "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
    "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
    "RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
@@ -144,12 +142,12 @@
    "RGB_MATRIX_DEFAULT_SPD": {"info_key": "rgb_matrix.default.speed", "value_type": "int"},

    // RGBLight
+    "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
    "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
    "RGBLIGHT_HUE_STEP": {"info_key": "rgblight.hue_steps", "value_type": "int"},
    "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
    "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"},
    "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"},
-    "RGBLIGHT_LED_COUNT": {"info_key": "rgblight.led_count", "value_type": "int"},
    "RGBLIGHT_LED_MAP": {"info_key": "rgblight.led_map", "value_type": "array.int"},
    "RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"},
    "RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"},
@@ -220,14 +218,12 @@
    "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, "replace_with": "DEBOUNCE"},
    "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
    "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "bool", "invalid": true},
-    "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true},
-    "LED_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.led_matrix_sleep", "invalid": true, "replace_with": "LED_MATRIX_SLEEP"},
+    "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true}
    "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true},
    "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true},
    "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
    "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
    "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
-    "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
    "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "bool", "invalid": true},
    "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true},
    "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true},
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -185,9 +185,6 @@
    "eek": {
        "target": "eek/silk_down"
    },
-    "era/klein": {
-        "target": "era/sirind/klein_sd"
-	},
    "ergodone": {
        "target": "ktec/ergodone"
    },
@@ -330,41 +327,11 @@
        "target": "keycapsss/plaid_pad/rev1"
    },
    "kudox": {
-        "target": "kumaokobo/kudox/rev1"
-    },
-    "kudox/columner": {
-        "target": "kumaokobo/kudox/columner"
-    },
-    "kudox/rev1": {
-        "target": "kumaokobo/kudox/rev1"
-    },
-    "kudox/rev2": {
-        "target": "kumaokobo/kudox/rev2"
-    },
-    "kudox/rev3": {
-        "target": "kumaokobo/kudox/rev3"
-    },
-    "kudox_full": {
-        "target": "kumaokobo/kudox_full/rev1"
-    },
-    "kudox_full/rev1": {
-        "target": "kumaokobo/kudox_full/rev1"
-    },
-    "kudox_game": {
-        "target": "kumaokobo/kudox_game/rev1"
-    },
-    "kudox_game/rev1": {
-        "target": "kumaokobo/kudox_game/rev1"
-    },
-    "kudox_game/rev2": {
-        "target": "kumaokobo/kudox_game/rev2"
+        "target": "kudox/rev1"
    },
    "kyria": {
        "target": "splitkb/kyria"
    },
-    "laser_ninja/pumpkin_pad": {
-        "target": "laser_ninja/pumpkinpad"
-    },
    "lattice60": {
        "target": "keyhive/lattice60"
    },
@@ -479,15 +446,6 @@
    "minim": {
        "target": "matthewdias/minim"
    },
-    "mnk1800s": {
-        "target": "monokei/mnk1800s"
-    },
-    "mnk50": {
-        "target": "monokei/mnk50"
-    },
-    "mnk75": {
-        "target": "monokei/mnk75"
-    },
    "model01": {
        "target": "keyboardio/model01"
    },
@@ -500,9 +458,6 @@
    "montsinger/rebound": {
        "target": "montsinger/rebound/rev1"
    },
-    "moonlander": {
-        "target": "zsa/moonlander"
-    },
    "mschwingen/modelm": {
        "target": "ibm/model_m/mschwingen"
    },
@@ -530,15 +485,6 @@
    "peiorisboards/ixora": {
        "target": "coarse/ixora"
    },
-    "pico": {
-        "target": "kumaokobo/pico/65keys"
-    },
-    "pico/65keys": {
-        "target": "kumaokobo/pico/65keys"
-    },
-    "pico/70keys": {
-        "target": "kumaokobo/pico/70keys"
-    },
    "plaid": {
        "target": "dm9records/plaid"
    },
@@ -852,12 +798,6 @@
    "eggman": {
        "target": "qpockets/eggman"
    },
-    "enter67": {
-        "target": "kezewa/enter67"
-    },
-    "enter80": {
-        "target": "kezewa/enter80"
-    },
    "ergo42": {
        "target": "biacco42/ergo42"
    },
@@ -882,9 +822,6 @@
    "felix": {
        "target": "unikeyboard/felix"
    },
-    "flygone60/rev3": {
-        "target": "shandoncodes/flygone60/rev3"
-    },
    "four_banger": {
        "target": "bpiphany/four_banger"
    },
@@ -978,12 +915,6 @@
    "keychron/q4": {
        "target": "keychron/q4/ansi/v1"
    }
-    "kmac": {
-        "target": "kbdmania/kmac"
-    }
-    "kmac_pad": {
-        "target": "kbdmania/kmac_pad"
-    }
    "kprepublic/bm40hsrgb": {
        "target": "kprepublic/bm40hsrgb/rev1"
    },
@@ -993,9 +924,6 @@
    "kprepublic/bm68hsrgb": {
        "target": "kprepublic/bm68hsrgb/rev1"
    },
-    "late9/rev1": {
-        "target": "rookiebwoy/late9/rev1"
-    },
    "latin17rgb": {
        "target": "latincompass/latin17rgb"
    },
@@ -1020,12 +948,6 @@
    "launchpad/rev1": {
        "target": "maple_computing/launchpad/rev1"
    },
-    "lefty": {
-        "target": "smoll/lefty/rev2"
-    },
-    "lefty/rev1": {
-        "target": "smoll/lefty/rev1"
-    },
    "lck75": {
        "target": "lyso1/lck75"
    },
@@ -1041,21 +963,9 @@
    "ls_60": {
        "target": "weirdo/ls_60"
    },
-    "lpad": {
-        "target": "laneware/lpad"
-    },
-    "lw67": {
-        "target": "laneware/lw67"
-    },
-    "lw75": {
-        "target": "laneware/lw75"
-    },
    "m3n3van": {
        "target": "matthewdias/m3n3van"
    },
-    "macro1": {
-        "target": "laneware/macro1"
-    },
    "massdrop/thekey": {
        "target": "drop/thekey/v1"
    },
@@ -1080,21 +990,9 @@
    "melody96": {
        "target": "ymdk/melody96"
    },
-    "miniaxe": {
-        "target": "kagizaraya/miniaxe"
-    },
    "minidox/rev1": {
        "target": "maple_computing/minidox/rev1"
    },
-    "mino/hotswap": {
-        "target": "shandoncodes/mino/hotswap"
-    },
-    "mino_plus/hotswap": {
-        "target": "shandoncodes/mino_plus/hotswap"
-    },
-    "mino_plus/soldered": {
-        "target": "shandoncodes/mino_plus/soldered"
-    },
    "mio": {
        "target": "recompile_keys/mio"
    },
@@ -1149,9 +1047,6 @@
    "nebula68b": {
        "target": "spaceholdings/nebula68b"
    },
-    "neopad/rev1": {
-        "target": "rookiebwoy/neopad/rev1"
-    },
    "niu_mini": {
        "target": "kbdfans/niu_mini"
    },
@@ -1206,9 +1101,6 @@
    "pursuit40": {
        "target": "checkerboards/pursuit40"
    },
-    "pw88": {
-        "target": "smoll/pw88"
-    },
    "qaz": {
        "target": "tominabox1/qaz"
    },
@@ -1218,9 +1110,6 @@
    "rabbit_capture_plan": {
        "target": "kakunpc/rabbit_capture_plan"
    },
-    "raindrop": {
-        "target": "laneware/raindrop"
-    },
    "ramonimbao/aelith": {
        "target": "rmi_kb/aelith"
    },
@@ -1287,9 +1176,6 @@
    "reviung61": {
        "target": "reviung/reviung61"
    },
-    "riot_pad": {
-        "target": "shandoncodes/riot_pad"
-    },
    "runner3680/3x6": {
        "target": "omkbd/runner3680/3x6"
    },
@@ -1413,9 +1299,6 @@
    "vn66": {
        "target": "hnahkb/vn66"
    },
-    "w1_at": {
-        "target": "geonworks/w1_at"
-    },
    "wallaby": {
        "target": "kkatano/wallaby"
    },
@@ -1464,12 +1347,6 @@
    "yurei": {
        "target": "kkatano/yurei"
    },
-    "z12": {
-        "target": "zigotica/z12"
-    },
-    "z34": {
-        "target": "zigotica/z34"
-    },
    "zinc": {
        "target": "25keys/zinc"
    },
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -43,7 +43,7 @@
        },
        "development_board": {
            "type": "string",
-            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris", "imera"]
+            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris"]
        },
        "pin_compatible": {
            "type": "string",
@@ -123,14 +123,6 @@
            "type": "object",
            "additionalProperties": false,
            "properties": {
-                "default": {
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                        "on": {"type": "boolean"},
-                        "clicky": {"type": "boolean"}
-                    }
-                },
                "macro_beep": {"type": "boolean"},
                "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                "voices": {"type": "boolean"}
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -84,7 +84,6 @@
    * [EEPROM](feature_eeprom.md)
    * [Key Lock](feature_key_lock.md)
    * [Key Overrides](feature_key_overrides.md)
-    * [LampArray](feature_lamparray.md)
    * [Layers](feature_layers.md)
    * [One Shot Keys](one_shot_keys.md)
    * [OS Detection](feature_os_detection.md)
--- a/docs/audio_driver.md
+++ b/docs/audio_driver.md
@@ -116,32 +116,19 @@ Additionally, in the board config, you'll want to make changes to enable the DAC
 | Define                           | Defaults                   | Description                                                                                                                                                           |
 | -------------------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `AUDIO_DAC_SAMPLE_MAX`           | `4095U`                    | Highest value allowed. Lower value means lower volume. And 4095U is the upper limit, since this is limited to a 12 bit value. Only effects non-pregenerated samples.  |
-| `AUDIO_DAC_OFF_VALUE`            | `AUDIO_DAC_SAMPLE_MAX / 2` | The value of the DAC when not playing anything. Some setups may require a high (`AUDIO_DAC_SAMPLE_MAX`) or low (`0`) value here.                                      |
+| `AUDIO_DAC_OFF_VALUE`            | `AUDIO_DAC_SAMPLE_MAX / 2` | The value of the DAC when notplaying anything. Some setups may require a high (`AUDIO_DAC_SAMPLE_MAX`) or low (`0`) value here.                                       |
 | `AUDIO_MAX_SIMULTANEOUS_TONES`   | __see next table__         | The number of tones that can be played simultaneously.  A value that is too high may freeze the controller or glitch out when too many tones are being played.        |
 | `AUDIO_DAC_SAMPLE_RATE`          | __see next table__         | Effective bit rate of the DAC (in hertz), higher limits simultaneous tones, and lower sacrifices quality.                                                             |
-| `AUDIO_DAC_BUFFER_SIZE`          | __see next table__         | Number of samples generated every refill. Too few may cause excessive CPU load; too many may cause freezes, RAM or flash exhaustion or lags during matrix scanning.   |

-There are a number of predefined quality settings that you can use, with "sane minimum" being the default.  You can use custom values by simply defining the sample rate, number of simultaneous tones and buffer size, instead of using one of the listed presets.
+There are a number of predefined quality settings that you can use, with "sane minimum" being the default.  You can use custom values by simply defining the sample rate and number of simultaneous tones, instead of using one of the listed presets. 

-| Define                            | Sample Rate | Simultaneous tones  | Buffer size |
-| --------------------------------- | ----------- | ------------------- | ----------- |
-| `AUDIO_DAC_QUALITY_VERY_LOW`      | `11025U`    | `8`                 | `64U`       |
-| `AUDIO_DAC_QUALITY_LOW`           | `22050U`    | `4`                 | `128U`      |
-| `AUDIO_DAC_QUALITY_HIGH`          | `44100U`    | `2`                 | `256U`      |
-| `AUDIO_DAC_QUALITY_VERY_HIGH`     | `88200U`    | `1`                 | `256U`      |
-| `AUDIO_DAC_QUALITY_SANE_MINIMUM`  | `16384U`    | `8`                 | `64U`       |
-
-#### Notes on buffer size :id=buffer-size
-
-By default, the buffer size attempts to keep to these constraints:
-
-* The interval between buffer refills can't be too short, since the microcontroller would then only be servicing buffer refills and would freeze up.
-* On the additive driver, the interval between buffer refills can't be too long, since matrix scanning would suffer lengthy pauses every so often, which would delay key presses or releases or lose some short taps altogether.
-* The interval between buffer refills is kept to a minimum, which allows notes to stop as soon as possible after they should.
-* For greater compatibility, the buffer size should be a power of 2.
-* The buffer size being too large causes resource exhaustion leading to build failures or freezing at runtime: RAM usage (on the additive driver) or flash usage (on the basic driver).
-
-You can lower the buffer size if you need a bit more space in your firmware, or raise it if your keyboard freezes up.
+| Define                            | Sample Rate | Simultaneous tones  |
+| --------------------------------- | ----------- | ------------------- |
+| `AUDIO_DAC_QUALITY_VERY_LOW`      | `11025U`    | `8`                 |
+| `AUDIO_DAC_QUALITY_LOW`           | `22040U`    | `4`                 |
+| `AUDIO_DAC_QUALITY_HIGH`          | `44100U`    | `2`                 |
+| `AUDIO_DAC_QUALITY_VERY_HIGH`     | `88200U`    | `1`                 |
+| `AUDIO_DAC_QUALITY_SANE_MINIMUM`  | `16384U`    | `8`                 |


 ```c
@@ -199,11 +186,6 @@ with all this information, the configuration would contain these lines:
 ChibiOS uses GPIOv1 for the F103, which only knows of one alternate function.
 On 'larger' STM32s, GPIOv2 or GPIOv3 are used; with them it is also necessary to configure `AUDIO_PWM_PAL_MODE` to the correct alternate function for the selected pin, timer and timer-channel.

-You can also use the Complementary output (`TIMx_CHyN`) for PWM on supported controllers.  To enable this functionality, you will need to make the following changes:
-```c
-// config.h:
-#define AUDIO_PWM_COMPLEMENTARY_OUTPUT
-```

 ### PWM software :id=pwm-software

--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -223,7 +223,7 @@ If you define these options you will enable the associated feature, which may in
  * Adds ability to [blink](feature_rgblight.md?id=lighting-layer-blink) a lighting layer for a specified number of milliseconds (e.g. to acknowledge an action).
 * `#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF`
  * If defined, then [lighting layers](feature_rgblight?id=overriding-rgb-lighting-onoff-status) will be shown even if RGB Light is off.
-* `#define RGBLIGHT_LED_COUNT 12`
+* `#define RGBLED_NUM 12`
  * number of LEDs
 * `#define RGBLIGHT_SPLIT`
  * Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -19,7 +19,6 @@ The following converters are available at this time:
 | `promicro` | `elite_pi`        |
 | `promicro` | `helios`          |
 | `promicro` | `liatris`         |
-| `promicro` | `imera`           |
 | `promicro` | `michi`           |
 | `elite_c`  | `stemcell`        |
 | `elite_c`  | `rp2040_ce`       |
@@ -83,7 +82,6 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)         | `elite_pi`        |
 | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                                  | `helios`          |
 | [Liatris](https://splitkb.com/products/liatris)                                          | `liatris`         |
-| [Imera](https://splitkb.com/products/imera)                                              | `imera`           |
 | [Michi](https://github.com/ci-bus/michi-promicro-rp2040)                                 | `michi`           |

 Converter summary:
@@ -101,7 +99,6 @@ Converter summary:
 | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
 | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          |
 | `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |
-| `imera`           | `-e CONVERT_TO=imera`           | `CONVERT_TO=imera`           | `#ifdef CONVERT_TO_IMERA`           |
 | `michi`           | `-e CONVERT_TO=michi`           | `CONVERT_TO=michi`           | `#ifdef CONVERT_TO_MICHI`           |

 ### Proton C :id=proton_c
--- a/docs/feature_dip_switch.md
+++ b/docs/feature_dip_switch.md
@@ -20,27 +20,6 @@ or
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {2,6} } // List of row and col pairs
 ```

-## DIP Switch map :id=dip-switch-map
-
-DIP Switch mapping may be added to your `keymap.c`, which replicates the normal keyswitch functionality, but with dip switches. Add this to your keymap's `rules.mk`:
-
-```make
-DIP_SWITCH_MAP_ENABLE = yes
-```
-
-Your `keymap.c` will then need a dip switch mapping defined (for two dip switches):
-
-```c
-#if defined(DIP_SWITCH_MAP_ENABLE)
-const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
-    DIP_SWITCH_OFF_ON(DF(0), DF(1)),
-    DIP_SWITCH_OFF_ON(EC_NORM, EC_SWAP)
-};
-#endif
-```
-
-?> This should only be enabled at the keymap level.
-
 ## Callbacks

 The callback functions can be inserted into your `<keyboard>.c`:
--- a/docs/feature_lamparray.md
+++ b/docs/feature_lamparray.md
@@ -1,36 +0,0 @@
-# LampArray
-
-Implements the open Human Interface Devices (HID) Lighting and Illumination standard.
-
-> LampArray devices have one or more Lamps (i.e. lights/LEDs/bulbs, etc…) that can be directly manipulated; setting state (on/off), brightness and color (RGB).
-
-Windows provides support for devices under [Dynamic Lighting](https://support.microsoft.com/en-us/windows/control-your-dynamic-lighting-devices-in-windows-8e8f22e3-e820-476c-8f9d-9ffc7b6ffcd2).
-
-## Overview
-
-Supported lighting frameworks:
-
-* [RGB Matrix](feature_rgb_matrix.md)
-
-Currently unsupported:
-
-* Split keyboard
-* VUSB
-
-## Basic Configuration :id=basic-configuration
-
-To enable this feature, add the following to your `rules.mk`:
-
-    LAMPARRAY_ENABLE = yes
-
-This should provide an out of the box experience, inferred from the existing keyboard and lighting framework configuration.
-
-## Advanced Configuration :id=advanced-configuration
-
-To change the default behavior, you can use the following defines in your `config.h`
-
-|Define         |Default      |Description    |
-|---------------|-------------|---------------|
-|`X`            |*Not defined*|               |
-|`Y`            |*Not defined*|               |
-|`Z`            |`7`          |               |
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -54,7 +54,7 @@ For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *    driver
 *    |  LED address
@@ -357,7 +357,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 ```c
 #define LED_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
 #define LED_MATRIX_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
-#define LED_MATRIX_SLEEP // turn off effects when suspended
+#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)
 #define LED_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -69,9 +69,9 @@ The current list of available languages is:
 | **italian_osx_iso** | **jis** | **latvian** | **lithuanian_azerty** |
 | **lithuanian_qwerty** | **norman** | **norwegian** | **portuguese** |
 | **portuguese_osx_iso** | **romanian** | **serbian_latin** | **slovak** |
-| **slovenian** | **spanish_dvorak** | **spanish_latin_america** | **spanish** |
-| **swedish** | **turkish_f** | **turkish_q** | **uk** |
-| **us_international** | **workman** | **workman_zxcvm** |
+| **slovenian** | **spanish_dvorak** | **spanish** | **swedish** |
+| **turkish_f** | **turkish_q** | **uk** | **us_international** |
+| **workman** | **workman_zxcvm** |

 ### Macro Basics

--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -69,29 +69,10 @@ The Analog Joystick is an analog (ADC) driven sensor.  There are a variety of jo
 | `ANALOG_JOYSTICK_Y_AXIS_PIN`      | (Required) The pin used for the horizontal/Y axis.                         | _not defined_ |
 | `ANALOG_JOYSTICK_AXIS_MIN`        | (Optional) Sets the lower range to be considered movement.                 | `0`           |
 | `ANALOG_JOYSTICK_AXIS_MAX`        | (Optional) Sets the upper range to be considered movement.                 | `1023`        |
-| `ANALOG_JOYSTICK_AUTO_AXIS`       | (Optional) Sets ranges to be considered movement automatically.            | _not defined_ |
 | `ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20`          |
 | `ANALOG_JOYSTICK_READ_INTERVAL`   | (Optional) The interval in milliseconds between reads.                     | `10`          |
 | `ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
 | `ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
-| `ANALOG_JOYSTICK_WEIGHTS`         | (Optional) Use custom weights for lever positions.                         | _not defined_ |
-| `ANALOG_JOYSTICK_CUTOFF`          | (Optional) Cut off movement when joystick returns to start position.       | _not defined_ |
-
-If `ANALOG_JOYSTICK_AUTO_AXIS` is used, then `ANALOG_JOYSTICK_AXIS_MIN` and `ANALOG_JOYSTICK_AXIS_MAX` are ignored.
-
-By default analog joystick implementation uses `x^2` weighting for lever positions. `ANALOG_JOYSTICK_WEIGHTS` allows to experiment with different configurations that might feel better.
-
-E.g. This is weights for `((x-0.4)^3+0.064)/0.282`:
-
-```c
-#define ANALOG_JOYSTICK_WEIGHTS {0,2,4,5,7,8,9,10,12,13,14,15,15,16,17,18,18,19,19,20,20,21,21,21,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,24,24,24,24,24,25,25,25,26,26,26,27,28,28,29,29,30,31,32,33,34,35,36,37,38,40,41,43,44,46,48,49,51,53,56,58,60,62,65,68,70,73,76,79,82,85,89,92,96,100}
-```
-
-You can use following JS code to generate weights for different formulas:
-
-```js
-JSON.stringify(Array.from(Array(101).keys()).map(x => Math.ceil((((x/100-0.4)**3+0.064)/0.282*100))))
-```

 ### Azoteq IQS5XX Trackpad

@@ -177,13 +158,12 @@ This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the

 #### Common settings

-| Setting                              | Description                                                | Default                                     |
-| ------------------------------------ | ---------------------------------------------------------- | ------------------------------------------- |
-| `CIRQUE_PINNACLE_DIAMETER_MM`        | (Optional) Diameter of the trackpad sensor in millimeters. | `40`                                        |
-| `CIRQUE_PINNACLE_ATTENUATION`        | (Optional) Sets the attenuation of the sensor data.        | `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X` |
-| `CIRQUE_PINNACLE_CURVED_OVERLAY`     | (Optional) Applies settings tuned for curved overlay.      | _not defined_                               |
-| `CIRQUE_PINNACLE_POSITION_MODE`      | (Optional) Mode of operation.                              | _not defined_                               |
-| `CIRQUE_PINNACLE_SKIP_SENSOR_CHECK`  | (Optional) Skips sensor presence check                     | _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.

--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -55,7 +55,7 @@ For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
@@ -139,7 +139,7 @@ Currently only 4 drivers are supported, but it would be trivial to support all 8
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
@@ -218,7 +218,7 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
@@ -292,7 +292,7 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
@@ -501,7 +501,7 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:

 ```c
-const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
 /* Each AW20216S channel is controlled by a register at some offset between 0x00
 * and 0xD7 inclusive.
 * See drivers/led/aw20216s.h for the mapping between register offsets and
@@ -869,7 +869,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 ```c
 #define RGB_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
 #define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -33,13 +33,13 @@ RGBLIGHT_DRIVER = apa102

 At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these.

-|Define              |Description                                                              |
-|--------------------|-------------------------------------------------------------------------|
-|`WS2812_DI_PIN`     |The pin connected to the data pin of the LEDs (WS2812)                   |
-|`APA102_DI_PIN`     |The pin connected to the data pin of the LEDs (APA102)                   |
-|`APA102_CI_PIN`     |The pin connected to the clock pin of the LEDs (APA102)                  |
-|`RGBLIGHT_LED_COUNT`|The number of LEDs connected                                             |
-|`RGBLED_SPLIT`      |(Optional) For split keyboards, the number of LEDs connected on each half|
+|Define         |Description                                                              |
+|---------------|-------------------------------------------------------------------------|
+|`WS2812_DI_PIN`|The pin connected to the data pin of the LEDs (WS2812)                   |
+|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102)                   |
+|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102)                  |
+|`RGBLED_NUM`   |The number of LEDs connected                                             |
+|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half|

 Then you should be able to use the keycodes below to change the RGB lighting to your liking.

@@ -152,28 +152,28 @@ Use these defines to add or remove animations from the firmware. When you are ru

 The following options are used to tweak the various animations:

-|Define                              |Default             |Description                                                                                    |
-|------------------------------------|--------------------|-----------------------------------------------------------------------------------------------|
-|`RGBLIGHT_EFFECT_BREATHE_CENTER`    |*Not defined*       |If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 |
-|`RGBLIGHT_EFFECT_BREATHE_MAX`       |`255`               |The maximum brightness for the breathing mode. Valid values are 1 to 255                       |
-|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40`                |How long (in milliseconds) to wait between animation steps for the "Christmas" animation       |
-|`RGBLIGHT_EFFECT_CHRISTMAS_STEP`    |`2`                 |The number of LEDs to group the red/green colors by for the "Christmas" animation              |
-|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM`    |`RGBLIGHT_LED_COUNT`|The number of LEDs to have the "Knight" animation travel                                       |
-|`RGBLIGHT_EFFECT_KNIGHT_LENGTH`     |`3`                 |The number of LEDs to light up for the "Knight" animation                                      |
-|`RGBLIGHT_EFFECT_KNIGHT_OFFSET`     |`0`                 |The number of LEDs to start the "Knight" animation from the start of the strip by              |
-|`RGBLIGHT_RAINBOW_SWIRL_RANGE`      |`255`               |Range adjustment for the rainbow swirl effect to get different swirls                          |
-|`RGBLIGHT_EFFECT_SNAKE_LENGTH`      |`4`                 |The number of LEDs to light up for the "Snake" animation                                       |
-|`RGBLIGHT_EFFECT_TWINKLE_LIFE`      |`200`               |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps)            |
-|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127`            |Adjusts how likely each LED is to twinkle (on each animation step)                             |
+|Define                              |Default      |Description                                                                                    |
+|------------------------------------|-------------|-----------------------------------------------------------------------------------------------|
+|`RGBLIGHT_EFFECT_BREATHE_CENTER`    |*Not defined*|If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 |
+|`RGBLIGHT_EFFECT_BREATHE_MAX`       |`255`        |The maximum brightness for the breathing mode. Valid values are 1 to 255                       |
+|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40`         |How long (in milliseconds) to wait between animation steps for the "Christmas" animation       |
+|`RGBLIGHT_EFFECT_CHRISTMAS_STEP`    |`2`          |The number of LEDs to group the red/green colors by for the "Christmas" animation              |
+|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM`    |`RGBLED_NUM` |The number of LEDs to have the "Knight" animation travel                                       |
+|`RGBLIGHT_EFFECT_KNIGHT_LENGTH`     |`3`          |The number of LEDs to light up for the "Knight" animation                                      |
+|`RGBLIGHT_EFFECT_KNIGHT_OFFSET`     |`0`          |The number of LEDs to start the "Knight" animation from the start of the strip by              |
+|`RGBLIGHT_RAINBOW_SWIRL_RANGE`      |`255`        |Range adjustment for the rainbow swirl effect to get different swirls                          |
+|`RGBLIGHT_EFFECT_SNAKE_LENGTH`      |`4`          |The number of LEDs to light up for the "Snake" animation                                       |
+|`RGBLIGHT_EFFECT_TWINKLE_LIFE`      |`200`        |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps)            |
+|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127`     |Adjusts how likely each LED is to twinkle (on each animation step)                             |

 ### Example Usage to Reduce Memory Footprint
  1. Use `#undef` to selectively disable animations. The following would disable two animations and save about 4KiB:

 ```diff
- #undef RGBLIGHT_LED_COUNT
+ #undef RGBLED_NUM
 +#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
 +#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
- #define RGBLIGHT_LED_COUNT 12
+ #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 ```
@@ -386,10 +386,10 @@ rgblight_set(); // Utility functions do not call rgblight_set() automatically, s
 #### direct operation
 |Function                                    |Description  |
 |--------------------------------------------|-------------|
-|`rgblight_setrgb_at(r, g, b, index)`          |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) |
-|`rgblight_sethsv_at(h, s, v, index)`          |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) |
-|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)|
-|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)|
+|`rgblight_setrgb_at(r, g, b, index)`          |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) |
+|`rgblight_sethsv_at(h, s, v, index)`          |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) |
+|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)|
+|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)|
 |`rgblight_setrgb(r, g, b)`                  |Set effect range LEDs to the given RGB value where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
 |`rgblight_setrgb_master(r, g, b)`           |Set the LEDs on the master side  to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
 |`rgblight_setrgb_slave(r, g, b)`            |Set the LEDs on the slave side  to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
@@ -519,7 +519,7 @@ By defining `RGBLIGHT_LED_MAP` as in the example below, you can specify the LED
 ```c
 // config.h

-#define RGBLIGHT_LED_COUNT 4
+#define RGBLED_NUM 4
 #define RGBLIGHT_LED_MAP { 3, 2, 1, 0 }

 ```
@@ -541,7 +541,7 @@ In addition to setting the Clipping Range, you can use `RGBLIGHT_LED_MAP` togeth

 ```c
 // config.h
-#define RGBLIGHT_LED_COUNT 8
+#define RGBLED_NUM 8
 #define RGBLIGHT_LED_MAP { 7, 6, 5, 4, 3, 2, 1, 0 }

 // some source
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {

    switch (keycode) {
        case TD(CT_CLN):  // list all tap dance keycodes with tap-hold configurations
-            action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(keycode)];
+            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);
--- a/docs/hardware_keyboard_guidelines.md
+++ b/docs/hardware_keyboard_guidelines.md
@@ -169,11 +169,11 @@ The `post_rules.mk` file can interpret `features` of a keyboard-level before `co

  ifeq ($(strip $(RGBLED_OPTION_TYPE)),backlight)
    RGBLIGHT_ENABLE = yes
-    OPT_DEFS += -DRGBLIGHT_LED_COUNT=30
+    OPT_DEFS += -DRGBLED_NUM=30
  endif
  ifeq ($(strip $(RGBLED_OPTION_TYPE)),underglow)
    RGBLIGHT_ENABLE = yes
-    OPT_DEFS += -DRGBLIGHT_LED_COUNT=6
+    OPT_DEFS += -DRGBLED_NUM=6
  endif
  ```

--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -125,7 +125,7 @@ At the top of the file you'll find this:

 These are some handy definitions we can use when building our keymap and our custom function. The `GRAVE_MODS` definition will be used later in our custom function, and the following `_BL`, `_FL`, and `_CL` defines make it easier to refer to each of our layers.

-Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unecessary, as they are included by default.
+Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unnecessary, as they are included by default.

 ### Layers and Keymaps

--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -19,20 +19,18 @@ The QMK CLI can be used to convert from normal images such as PNG files or anima

 Supported devices:

-| Display Panel  | Panel Type         | Size             | Comms Transport | Driver                                   |
-|----------------|--------------------|------------------|-----------------|------------------------------------------|
-| GC9A01         | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`  |
-| ILI9163        | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi` |
-| ILI9341        | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi` |
-| ILI9488        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi` |
-| SSD1351        | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi` |
-| ST7735         | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`  |
-| ST7789         | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7789_spi`  |
-| SH1106 (SPI)   | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
-| SH1106 (I2C)   | Monochrome OLED    | 128x64           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
-| SSD1306 (SPI)  | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
-| SSD1306 (I2C)  | Monochrome OLED    | 128x32           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
-| Surface        | Virtual            | User-defined     | None            | `QUANTUM_PAINTER_DRIVERS += surface`     |
+| Display Panel | Panel Type         | Size             | Comms Transport | Driver                                   |
+|---------------|--------------------|------------------|-----------------|------------------------------------------|
+| GC9A01        | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`  |
+| ILI9163       | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi` |
+| ILI9341       | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi` |
+| ILI9488       | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi` |
+| SSD1351       | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi` |
+| ST7735        | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`  |
+| ST7789        | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7789_spi`  |
+| SH1106 (SPI)  | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
+| SH1106 (I2C)  | Monochrome OLED    | 128x64           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
+| Surface       | Virtual            | User-defined     | None            | `QUANTUM_PAINTER_DRIVERS += surface`     |

 ## Quantum Painter Configuration :id=quantum-painter-config

@@ -435,10 +433,6 @@ The maximum number of displays of each type can be configured by changing the fo

 Native color format mono2 is compatible with SH1106

-#### ** SSD1306 **
-
-SSD1306 and SH1106 are almost entirely identical, to the point of being indisinguishable by Quantum Painter. Enable SH1106 support in Quantum Painter and create SH1106 devices in firmware to perform drawing operations on SSD1306 displays.
-
 <!-- tabs:end -->

 ### ** Surface **
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -111,13 +111,6 @@ Configures the [APA102](apa102_driver.md) driver.
 Configures the [Audio](feature_audio.md) feature.

 * `audio`
-    * `default`
-        * `on`
-            * The default audio enabled state.
-            * Default: `true`
-        * `clicky`
-            * The default audio clicky enabled state.
-            * Default: `true`
    * `macro_beep`
        * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
        * Default: `false`
--- a/docs/reference_keymap_extras.md
+++ b/docs/reference_keymap_extras.md
@@ -67,7 +67,6 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
 |Slovenian                        |`keymap_slovenian.h`             |`sendstring_slovenian.h`            |
 |Spanish                          |`keymap_spanish.h`               |`sendstring_spanish.h`              |
 |Spanish (Dvorak)                 |`keymap_spanish_dvorak.h`        |`sendstring_spanish_dvorak.h`       |
-|Spanish (Latin America)          |`keymap_spanish_latin_america.h` |`sendstring_spanish_latin_america.h`|
 |Swedish                          |`keymap_swedish.h`               |`sendstring_swedish.h`              |
 |Swedish (macOS, ANSI)            |`keymap_swedish_mac_ansi.h`      |                                    |
 |Swedish (macOS, ISO)             |`keymap_swedish_mac_iso.h`       |                                    |
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -210,7 +210,6 @@ That said, there are a number of Pro Micro replacements with ARM controllers:
 * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)
 * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop)
 * [Liatris](https://splitkb.com/products/liatris)
-* [Imera](https://splitkb.com/products/imera)
 * [Michi](https://github.com/ci-bus/michi-promicro-rp2040)

 There are other, non-Pro Micro compatible boards out there. The most popular being:
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -71,6 +71,11 @@ void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds) {
    apa102_end_frame(num_leds);
 }

+// Overwrite the default rgblight_call_driver to use apa102 driver
+void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds) {
+    apa102_setleds(start_led, num_leds);
+}
+
 void static apa102_init(void) {
    setPinOutput(APA102_DI_PIN);
    setPinOutput(APA102_CI_PIN);
--- a/drivers/led/apa102.h
+++ b/drivers/led/apa102.h
@@ -19,12 +19,6 @@

 #include "color.h"

-#if defined(RGBLIGHT_APA102)
-#    define APA102_LED_COUNT RGBLIGHT_LED_COUNT
-#elif defined(RGB_MATRIX_APA102)
-#    define APA102_LED_COUNT RGB_MATRIX_LED_COUNT
-#endif
-
 #ifndef APA102_DEFAULT_BRIGHTNESS
 #    define APA102_DEFAULT_BRIGHTNESS 31
 #endif
--- a/drivers/led/issi/is31fl3218-simple.c
+++ b/drivers/led/issi/is31fl3218-simple.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 "is31fl3218-simple.h"
+#include "is31fl3218.h"
 #include <string.h>
 #include "i2c_master.h"

@@ -28,7 +28,8 @@
 #    define IS31FL3218_I2C_PERSISTENCE 0
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Reusable buffer for transfers
+uint8_t g_twi_transfer_buffer[20];

 // IS31FL3218 has 18 PWM outputs and a fixed I2C address, so no chaining.
 uint8_t g_pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
@@ -38,27 +39,27 @@ uint8_t g_led_control_registers[IS31FL3218_LED_CONTROL_REGISTER_COUNT] = {0};
 bool    g_led_control_registers_update_required                        = false;

 void is31fl3218_write_register(uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
 #if IS31FL3218_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
+    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
 #endif
 }

 void is31fl3218_write_pwm_buffer(uint8_t *pwm_buffer) {
-    i2c_transfer_buffer[0] = IS31FL3218_REG_PWM;
-    memcpy(i2c_transfer_buffer + 1, pwm_buffer, 18);
+    g_twi_transfer_buffer[0] = IS31FL3218_REG_PWM;
+    memcpy(g_twi_transfer_buffer + 1, pwm_buffer, 18);

 #if IS31FL3218_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
    }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
 #endif
 }

--- a/drivers/led/issi/is31fl3218-simple.h
+++ b/drivers/led/issi/is31fl3218-simple.h
@@ -43,8 +43,6 @@ extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT];

 void is31fl3218_init(void);

-void is31fl3218_write_register(uint8_t reg, uint8_t data);
-
 void is31fl3218_set_value(int index, uint8_t value);

 void is31fl3218_set_value_all(uint8_t value);
--- a/drivers/led/issi/is31fl3218.c
+++ b/drivers/led/issi/is31fl3218.c
@@ -28,7 +28,8 @@
 #    define IS31FL3218_I2C_PERSISTENCE 0
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Reusable buffer for transfers
+uint8_t g_twi_transfer_buffer[20];

 // IS31FL3218 has 18 PWM outputs and a fixed I2C address, so no chaining.
 uint8_t g_pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
@@ -38,27 +39,27 @@ uint8_t g_led_control_registers[IS31FL3218_LED_CONTROL_REGISTER_COUNT] = {0};
 bool    g_led_control_registers_update_required                        = false;

 void is31fl3218_write_register(uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
 #if IS31FL3218_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
+    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
 #endif
 }

 void is31fl3218_write_pwm_buffer(uint8_t *pwm_buffer) {
-    i2c_transfer_buffer[0] = IS31FL3218_REG_PWM;
-    memcpy(i2c_transfer_buffer + 1, pwm_buffer, 18);
+    g_twi_transfer_buffer[0] = IS31FL3218_REG_PWM;
+    memcpy(g_twi_transfer_buffer + 1, pwm_buffer, 18);

 #if IS31FL3218_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
    }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, i2c_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
 #endif
 }

--- a/drivers/led/issi/is31fl3218.h
+++ b/drivers/led/issi/is31fl3218.h
@@ -45,8 +45,6 @@ extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT];

 void is31fl3218_init(void);

-void is31fl3218_write_register(uint8_t reg, uint8_t data);
-
 void is31fl3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);

 void is31fl3218_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31fl3731-simple.c
+++ b/drivers/led/issi/is31fl3731-simple.c
@@ -33,7 +33,8 @@
 #    define IS31FL3731_I2C_PERSISTENCE 0
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3731 PWM registers 0x24-0xB3.
 // Storing them like this is optimal for I2C transfers to the registers.
@@ -47,45 +48,41 @@ uint8_t g_led_control_registers[IS31FL3731_DRIVER_COUNT][IS31FL3731_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3731_DRIVER_COUNT]                        = {false};

 void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3731_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) {
            break;
        }
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
 #endif
 }

-void is31fl3731_select_page(uint8_t addr, uint8_t page) {
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, page);
-}
-
 void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 0 is already selected
+    // assumes bank is already selected

    // transmit PWM registers in 9 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
        // set the first register, e.g. 0x24, 0x34, 0x44, etc.
-        i2c_transfer_buffer[0] = 0x24 + i;
+        g_twi_transfer_buffer[0] = 0x24 + i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x24-0x33, 0x34-0x43, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3731_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
 #endif
    }
 }
@@ -126,7 +123,8 @@ void is31fl3731_init(uint8_t addr) {
    // then set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FUNCTION);
+    // select "function register" bank
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);

    // enable software shutdown
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
@@ -144,7 +142,8 @@ void is31fl3731_init(uint8_t addr) {
    // audio sync off
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FRAME_1);
+    // select bank 0
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);

    // turn off all LEDs in the LED control register
    for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
@@ -161,15 +160,16 @@ void is31fl3731_init(uint8_t addr) {
        is31fl3731_write_register(addr, i, 0x00);
    }

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FUNCTION);
+    // select "function register" bank
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);

    // disable software shutdown
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);

-    // select page 0 and leave it selected.
-    // most usage after initialization is just writing PWM buffers in page 0
+    // select bank 0 and leave it selected.
+    // most usage after initialization is just writing PWM buffers in bank 0
    // as there's not much point in double-buffering
-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FRAME_1);
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
 }

 void is31fl3731_set_value(int index, uint8_t value) {
--- a/drivers/led/issi/is31fl3731-simple.h
+++ b/drivers/led/issi/is31fl3731-simple.h
@@ -103,7 +103,6 @@ extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT];
 void is31fl3731_init_drivers(void);
 void is31fl3731_init(uint8_t addr);
 void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3731_select_page(uint8_t addr, uint8_t page);
 void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3731_set_value(int index, uint8_t value);
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -32,7 +32,8 @@
 #    define IS31FL3731_I2C_PERSISTENCE 0
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3731 PWM registers 0x24-0xB3.
 // Storing them like this is optimal for I2C transfers to the registers.
@@ -46,43 +47,39 @@ uint8_t g_led_control_registers[IS31FL3731_DRIVER_COUNT][IS31FL3731_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3731_DRIVER_COUNT]                        = {false};

 void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3731_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
 #endif
 }

-void is31fl3731_select_page(uint8_t addr, uint8_t page) {
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, page);
-}
-
 void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 0 is already selected
+    // assumes bank is already selected

    // transmit PWM registers in 9 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
        // set the first register, e.g. 0x24, 0x34, 0x44, etc.
-        i2c_transfer_buffer[0] = 0x24 + i;
+        g_twi_transfer_buffer[0] = 0x24 + i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x24-0x33, 0x34-0x43, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3731_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
 #endif
    }
 }
@@ -123,7 +120,8 @@ void is31fl3731_init(uint8_t addr) {
    // then set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FUNCTION);
+    // select "function register" bank
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);

    // enable software shutdown
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
@@ -141,7 +139,8 @@ void is31fl3731_init(uint8_t addr) {
    // audio sync off
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FRAME_1);
+    // select bank 0
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);

    // turn off all LEDs in the LED control register
    for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
@@ -158,15 +157,16 @@ void is31fl3731_init(uint8_t addr) {
        is31fl3731_write_register(addr, i, 0x00);
    }

-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FUNCTION);
+    // select "function register" bank
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);

    // disable software shutdown
    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);

-    // select page 0 and leave it selected.
-    // most usage after initialization is just writing PWM buffers in page 0
+    // select bank 0 and leave it selected.
+    // most usage after initialization is just writing PWM buffers in bank 0
    // as there's not much point in double-buffering
-    is31fl3731_select_page(addr, IS31FL3731_COMMAND_FRAME_1);
+    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
 }

 void is31fl3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
--- a/drivers/led/issi/is31fl3731.h
+++ b/drivers/led/issi/is31fl3731.h
@@ -104,7 +104,6 @@ extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT];
 void is31fl3731_init_drivers(void);
 void is31fl3731_init(uint8_t addr);
 void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3731_select_page(uint8_t addr, uint8_t page);
 void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -43,7 +43,7 @@
 #endif

 #ifndef IS31FL3733_CS_PULLDOWN
-#    define IS31FL3733_CS_PULLDOWN IS31FL3733_PDR_0_OHM
+#    define IS31FL3733_CSPULLDOWN IS31FL3733_PDR_0_OHM
 #endif

 #ifndef IS31FL3733_GLOBAL_CURRENT
@@ -63,10 +63,11 @@
 #    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3733 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
@@ -79,50 +80,45 @@ bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT]

 bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
    // If the transaction fails function returns false.
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3733_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
    return true;
 }

-void is31fl3733_select_page(uint8_t addr, uint8_t page) {
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, page);
-}
-
 bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes page 1 is already selected.
+    // Assumes PG1 is already selected.
    // If any of the transactions fails function returns false.
    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // Iterate over the pwm_buffer contents at 16 byte intervals.
    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // Copy the data from i to i+15.
        // Device will auto-increment register for data after the first byte
        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3733_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
@@ -167,23 +163,32 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) {
    // then disable software shutdown.
    // Sync is passed so set it according to the datasheet.

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3733_write_register(addr, i, 0x00);
    }

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
        is31fl3733_write_register(addr, i, 0x00);
    }

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -234,9 +239,11 @@ void is31fl3733_set_led_control_register(uint8_t index, bool value) {

 void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3733_select_page(addr, IS31FL3733_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1.
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);

-        // If any of the transactions fail we risk writing dirty page 0,
+        // If any of the transactions fail we risk writing dirty PG0,
        // refresh page 0 just in case.
        if (!is31fl3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
            g_led_control_registers_update_required[index] = true;
@@ -247,8 +254,9 @@ void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3733_select_page(addr, IS31FL3733_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -117,7 +117,6 @@ extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
 void is31fl3733_init_drivers(void);
 void is31fl3733_init(uint8_t addr, uint8_t sync);
 bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3733_select_page(uint8_t addr, uint8_t page);
 bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3733_set_value(int index, uint8_t value);
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -62,10 +62,11 @@
 #    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3733 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
@@ -78,50 +79,45 @@ bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT]

 bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
    // If the transaction fails function returns false.
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3733_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
    return true;
 }

-void is31fl3733_select_page(uint8_t addr, uint8_t page) {
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, page);
-}
-
 bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes page 1 is already selected.
+    // Assumes PG1 is already selected.
    // If any of the transactions fails function returns false.
    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // Iterate over the pwm_buffer contents at 16 byte intervals.
    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // Copy the data from i to i+15.
        // Device will auto-increment register for data after the first byte
        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3733_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
@@ -166,23 +162,32 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) {
    // then disable software shutdown.
    // Sync is passed so set it according to the datasheet.

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3733_write_register(addr, i, 0x00);
    }

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
        is31fl3733_write_register(addr, i, 0x00);
    }

-    is31fl3733_select_page(addr, IS31FL3733_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -249,9 +254,11 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo

 void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3733_select_page(addr, IS31FL3733_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1.
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);

-        // If any of the transactions fail we risk writing dirty page 0,
+        // If any of the transactions fail we risk writing dirty PG0,
        // refresh page 0 just in case.
        if (!is31fl3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
            g_led_control_registers_update_required[index] = true;
@@ -262,8 +269,9 @@ void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3733_select_page(addr, IS31FL3733_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -142,7 +142,6 @@ extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
 void is31fl3733_init_drivers(void);
 void is31fl3733_init(uint8_t addr, uint8_t sync);
 bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3733_select_page(uint8_t addr, uint8_t page);
 bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31fl3736-simple.c
+++ b/drivers/led/issi/is31fl3736-simple.c
@@ -47,10 +47,11 @@
 #    define IS31FL3736_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3736 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
@@ -62,43 +63,38 @@ uint8_t g_led_control_registers[IS31FL3736_DRIVER_COUNT][IS31FL3736_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3736_DRIVER_COUNT]                        = {false};

 void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3736_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
 #endif
 }

-void is31fl3736_select_page(uint8_t addr, uint8_t page) {
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, page);
-}
-
 void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 1 is already selected
+    // assumes PG1 is already selected

    // transmit PWM registers in 12 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3736_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
 #endif
    }
 }
@@ -139,23 +135,32 @@ void is31fl3736_init(uint8_t addr) {
    // Set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3736_write_register(addr, i, 0x00);
    }

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
        is31fl3736_write_register(addr, i, 0x00);
    }

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -212,7 +217,9 @@ void is31fl3736_set_led_control_register(uint8_t index, bool value) {

 void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3736_select_page(addr, IS31FL3736_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);

        is31fl3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
        g_pwm_buffer_update_required[index] = false;
@@ -221,8 +228,9 @@ void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3736_select_page(addr, IS31FL3736_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3736_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3736-simple.h
+++ b/drivers/led/issi/is31fl3736-simple.h
@@ -112,7 +112,6 @@ extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT];
 void is31fl3736_init_drivers(void);
 void is31fl3736_init(uint8_t addr);
 void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3736_select_page(uint8_t addr, uint8_t page);
 void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3736_set_value(int index, uint8_t value);
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -47,10 +47,11 @@
 #    define IS31FL3736_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3736 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
@@ -62,43 +63,38 @@ uint8_t g_led_control_registers[IS31FL3736_DRIVER_COUNT][IS31FL3736_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3736_DRIVER_COUNT]                        = {false};

 void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3736_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
 #endif
 }

-void is31fl3736_select_page(uint8_t addr, uint8_t page) {
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, page);
-}
-
 void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 1 is already selected
+    // assumes PG1 is already selected

    // transmit PWM registers in 12 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3736_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
 #endif
    }
 }
@@ -139,23 +135,32 @@ void is31fl3736_init(uint8_t addr) {
    // Set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_REG_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3736_write_register(addr, i, 0x00);
    }

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITELOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
        is31fl3736_write_register(addr, i, 0x00);
    }

-    is31fl3736_select_page(addr, IS31FL3736_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -229,7 +234,9 @@ void is31fl3736_set_led_control_register(uint8_t index, bool red, bool green, bo

 void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3736_select_page(addr, IS31FL3736_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);

        is31fl3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
        g_pwm_buffer_update_required[index] = false;
@@ -238,8 +245,9 @@ void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3736_select_page(addr, IS31FL3736_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3736_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -126,7 +126,6 @@ extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT];
 void is31fl3736_init_drivers(void);
 void is31fl3736_init(uint8_t addr);
 void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3736_select_page(uint8_t addr, uint8_t page);
 void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31fl3737-simple.c
+++ b/drivers/led/issi/is31fl3737-simple.c
@@ -49,10 +49,11 @@
 #    define IS31FL3737_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3737 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
@@ -65,43 +66,38 @@ uint8_t g_led_control_registers[IS31FL3737_DRIVER_COUNT][IS31FL3737_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3737_DRIVER_COUNT]                        = {false};

 void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3737_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
 #endif
 }

-void is31fl3737_select_page(uint8_t addr, uint8_t page) {
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, page);
-}
-
 void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 1 is already selected
+    // assumes PG1 is already selected

    // transmit PWM registers in 12 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3737_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
 #endif
    }
 }
@@ -142,23 +138,32 @@ void is31fl3737_init(uint8_t addr) {
    // Set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3737_write_register(addr, i, 0x00);
    }

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
        is31fl3737_write_register(addr, i, 0x00);
    }

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -209,7 +214,9 @@ void is31fl3737_set_led_control_register(uint8_t index, bool value) {

 void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3737_select_page(addr, IS31FL3737_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);

        is31fl3737_write_pwm_buffer(addr, g_pwm_buffer[index]);
        g_pwm_buffer_update_required[index] = false;
@@ -218,8 +225,9 @@ void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3737_select_page(addr, IS31FL3737_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3737_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3737-simple.h
+++ b/drivers/led/issi/is31fl3737-simple.h
@@ -102,7 +102,6 @@ extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT];
 void is31fl3737_init_drivers(void);
 void is31fl3737_init(uint8_t addr);
 void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3737_select_page(uint8_t addr, uint8_t page);
 void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3737_set_value(int index, uint8_t value);
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -49,10 +49,11 @@
 #    define IS31FL3737_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the IS31FL3737 PWM registers.
-// The control buffers match the page 0 LED On/Off registers.
+// The control buffers match the PG0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
@@ -65,43 +66,38 @@ uint8_t g_led_control_registers[IS31FL3737_DRIVER_COUNT][IS31FL3737_LED_CONTROL_
 bool    g_led_control_registers_update_required[IS31FL3737_DRIVER_COUNT]                        = {false};

 void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3737_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
 #endif
 }

-void is31fl3737_select_page(uint8_t addr, uint8_t page) {
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, page);
-}
-
 void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes page 1 is already selected
+    // assumes PG1 is already selected

    // transmit PWM registers in 12 transfers of 16 bytes
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // iterate over the pwm_buffer contents at 16 byte intervals
    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // copy the data from i to i+15
        // device will auto-increment register for data after the first byte
        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);

 #if IS31FL3737_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
        }
 #else
-        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
+        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
 #endif
    }
 }
@@ -142,23 +138,32 @@ void is31fl3737_init(uint8_t addr) {
    // Set up the mode and other settings, clear the PWM registers,
    // then disable software shutdown.

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_LED_CONTROL);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG0
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
    // Turn off all LEDs.
    for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
        is31fl3737_write_register(addr, i, 0x00);
    }

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_PWM);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG1
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
    // Set PWM on all LEDs to 0
    // No need to setup Breath registers to PWM as that is the default.
    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
        is31fl3737_write_register(addr, i, 0x00);
    }

-    is31fl3737_select_page(addr, IS31FL3737_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);

+    // Select PG3
+    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_FUNCTION);
    // Set de-ghost pull-up resistors (SWx)
    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
    // Set de-ghost pull-down resistors (CSx)
@@ -225,7 +230,9 @@ void is31fl3737_set_led_control_register(uint8_t index, bool red, bool green, bo

 void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3737_select_page(addr, IS31FL3737_COMMAND_PWM);
+        // Firstly we need to unlock the command register and select PG1
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);

        is31fl3737_write_pwm_buffer(addr, g_pwm_buffer[index]);
        g_pwm_buffer_update_required[index] = false;
@@ -234,8 +241,9 @@ void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        is31fl3737_select_page(addr, IS31FL3737_COMMAND_LED_CONTROL);
-
+        // Firstly we need to unlock the command register and select PG0
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
        for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
            is31fl3737_write_register(addr, i, g_led_control_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -119,7 +119,6 @@ extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT];
 void is31fl3737_init_drivers(void);
 void is31fl3737_init(uint8_t addr);
 void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3737_select_page(uint8_t addr, uint8_t page);
 void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31fl3741-simple.c
+++ b/drivers/led/issi/is31fl3741-simple.c
@@ -23,7 +23,6 @@
 #include "wait.h"

 #define IS31FL3741_PWM_REGISTER_COUNT 351
-#define IS31FL3741_SCALING_REGISTER_COUNT 351

 #ifndef IS31FL3741_I2C_TIMEOUT
 #    define IS31FL3741_I2C_TIMEOUT 100
@@ -53,10 +52,11 @@
 #    define IS31FL3741_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20] = {0xFF};
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20] = {0xFF};

 // These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
-// The scaling buffers match the page 2 and 3 LED On/Off registers.
+// The scaling buffers match the PG2 and PG3 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
@@ -65,62 +65,59 @@ uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
 bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
 bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};

-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_SCALING_REGISTER_COUNT];
+uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];

 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3741_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
 #endif
 }

-void is31fl3741_select_page(uint8_t addr, uint8_t page) {
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, page);
-}
-
 bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assume page 0 is already selected
+    // Assume PG0 is already selected

    for (int i = 0; i < 342; i += 18) {
        if (i == 180) {
-            is31fl3741_select_page(addr, IS31FL3741_COMMAND_PWM_1);
+            // unlock the command register and select PG1
+            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_1);
        }

-        i2c_transfer_buffer[0] = i % 180;
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 18);
+        g_twi_transfer_buffer[0] = i % 180;
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18);

 #if IS31FL3741_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
    }

    // transfer the left cause the total number is 351
-    i2c_transfer_buffer[0] = 162;
-    memcpy(i2c_transfer_buffer + 1, pwm_buffer + 342, 9);
+    g_twi_transfer_buffer[0] = 162;
+    memcpy(g_twi_transfer_buffer + 1, pwm_buffer + 342, 9);

 #if IS31FL3741_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
@@ -165,7 +162,11 @@ void is31fl3741_init(uint8_t addr) {
    // then disable software shutdown.
    // Unlock the command register.

-    is31fl3741_select_page(addr, IS31FL3741_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+
+    // Select PG4
+    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_FUNCTION);

    // Set to Normal operation
    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
@@ -217,7 +218,9 @@ void is31fl3741_set_led_control_register(uint8_t index, bool value) {

 void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_PWM_0);
+        // unlock the command register and select PG2
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_0);

        is31fl3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
    }
@@ -233,16 +236,20 @@ void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t value) {

 void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_scaling_registers_update_required[index]) {
-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_SCALING_0);
+        // unlock the command register and select PG2
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_0);

-        // CS1_SW1 to CS30_SW6 are on page 2
+        // CS1_SW1 to CS30_SW6 are on PG2
        for (int i = CS1_SW1; i <= CS30_SW6; ++i) {
            is31fl3741_write_register(addr, i, g_scaling_registers[index][i]);
        }

-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_SCALING_1);
+        // unlock the command register and select PG3
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_1);

-        // CS1_SW7 to CS39_SW9 are on page 3
+        // CS1_SW7 to CS39_SW9 are on PG3
        for (int i = CS1_SW7; i <= CS39_SW9; ++i) {
            is31fl3741_write_register(addr, i - CS1_SW7, g_scaling_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3741-simple.h
+++ b/drivers/led/issi/is31fl3741-simple.h
@@ -104,7 +104,6 @@ extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT];
 void is31fl3741_init_drivers(void);
 void is31fl3741_init(uint8_t addr);
 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3741_select_page(uint8_t addr, uint8_t page);
 bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3741_set_value(int index, uint8_t value);
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -23,7 +23,6 @@
 #include "wait.h"

 #define IS31FL3741_PWM_REGISTER_COUNT 351
-#define IS31FL3741_SCALING_REGISTER_COUNT 351

 #ifndef IS31FL3741_I2C_TIMEOUT
 #    define IS31FL3741_I2C_TIMEOUT 100
@@ -53,10 +52,11 @@
 #    define IS31FL3741_GLOBAL_CURRENT 0xFF
 #endif

-uint8_t i2c_transfer_buffer[20] = {0xFF};
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20] = {0xFF};

 // These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
-// The scaling buffers match the page 2 and 3 LED On/Off registers.
+// The scaling buffers match the PG2 and PG3 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
@@ -65,62 +65,59 @@ uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
 bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
 bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};

-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_SCALING_REGISTER_COUNT];
+uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];

 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if IS31FL3741_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
 #endif
 }

-void is31fl3741_select_page(uint8_t addr, uint8_t page) {
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, page);
-}
-
 bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assume page 0 is already selected
+    // Assume PG0 is already selected

    for (int i = 0; i < 342; i += 18) {
        if (i == 180) {
-            is31fl3741_select_page(addr, IS31FL3741_COMMAND_PWM_1);
+            // unlock the command register and select PG1
+            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_1);
        }

-        i2c_transfer_buffer[0] = i % 180;
-        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 18);
+        g_twi_transfer_buffer[0] = i % 180;
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18);

 #if IS31FL3741_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
    }

    // transfer the left cause the total number is 351
-    i2c_transfer_buffer[0] = 162;
-    memcpy(i2c_transfer_buffer + 1, pwm_buffer + 342, 9);
+    g_twi_transfer_buffer[0] = 162;
+    memcpy(g_twi_transfer_buffer + 1, pwm_buffer + 342, 9);

 #if IS31FL3741_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
@@ -165,7 +162,11 @@ void is31fl3741_init(uint8_t addr) {
    // then disable software shutdown.
    // Unlock the command register.

-    is31fl3741_select_page(addr, IS31FL3741_COMMAND_FUNCTION);
+    // Unlock the command register.
+    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+
+    // Select PG4
+    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_FUNCTION);

    // Set to Normal operation
    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
@@ -231,7 +232,9 @@ void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bo

 void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_PWM_0);
+        // unlock the command register and select PG2
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_0);

        is31fl3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
    }
@@ -249,16 +252,20 @@ void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t red, uint8_

 void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_scaling_registers_update_required[index]) {
-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_SCALING_0);
+        // unlock the command register and select PG2
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_0);

-        // CS1_SW1 to CS30_SW6 are on page 2
+        // CS1_SW1 to CS30_SW6 are on PG2
        for (int i = CS1_SW1; i <= CS30_SW6; ++i) {
            is31fl3741_write_register(addr, i, g_scaling_registers[index][i]);
        }

-        is31fl3741_select_page(addr, IS31FL3741_COMMAND_SCALING_1);
+        // unlock the command register and select PG3
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_1);

-        // CS1_SW7 to CS39_SW9 are on page 3
+        // CS1_SW7 to CS39_SW9 are on PG3
        for (int i = CS1_SW7; i <= CS39_SW9; ++i) {
            is31fl3741_write_register(addr, i - CS1_SW7, g_scaling_registers[index][i]);
        }
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -121,7 +121,6 @@ extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT];
 void is31fl3741_init_drivers(void);
 void is31fl3741_init(uint8_t addr);
 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3741_select_page(uint8_t addr, uint8_t page);
 bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

 void is31fl3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
--- a/drivers/led/issi/is31flcommon.c
+++ b/drivers/led/issi/is31flcommon.c
@@ -31,7 +31,8 @@
 #    define ISSI_PERSISTENCE 0
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the PWM & scaling registers.
 // Storing them like this is optimal for I2C transfers to the registers.
@@ -44,15 +45,15 @@ bool    g_scaling_buffer_update_required[DRIVER_COUNT] = {false};
 // For writing of single register entry
 void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data) {
    // Set register address and register data ready to write
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if ISSI_PERSISTENCE > 0
    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
    }
 #else
-    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, ISSI_TIMEOUT);
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
 #endif
 }

@@ -63,18 +64,18 @@ bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t
    // Split the buffer into chunks to transfer
    for (int i = 0; i < buffer_size; i += transfer_size) {
        // Set the first entry of transfer buffer to the first register we want to write
-        i2c_transfer_buffer[0] = i + start_reg_addr;
+        g_twi_transfer_buffer[0] = i + start_reg_addr;
        // Copy the section of our source buffer into the transfer buffer after first register address
-        memcpy(i2c_transfer_buffer + 1, source_buffer + i, transfer_size);
+        memcpy(g_twi_transfer_buffer + 1, source_buffer + i, transfer_size);

 #if ISSI_PERSISTENCE > 0
        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
            return false;
        }
 #endif
--- a/drivers/led/snled27351-simple.c
+++ b/drivers/led/snled27351-simple.c
@@ -37,7 +37,8 @@
        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 #endif

-uint8_t i2c_transfer_buffer[20];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];

 // These buffers match the SNLED27351 PWM registers.
 // The control buffers match the PG0 LED On/Off registers.
@@ -53,51 +54,47 @@ bool    g_led_control_registers_update_required[SNLED27351_DRIVER_COUNT]

 bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
    // If the transaction fails function returns false.
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if SNLED27351_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
    return true;
 }

-void snled27351_select_page(uint8_t addr, uint8_t page) {
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, page);
-}
-
 bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
    // Assumes PG1 is already selected.
    // If any of the transactions fails function returns false.
    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // i2c_transfer_buffer[] is 20 bytes
+    // g_twi_transfer_buffer[] is 20 bytes

    // Iterate over the pwm_buffer contents at 16 byte intervals.
    for (int i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 16) {
-        i2c_transfer_buffer[0] = i;
+        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++) {
-            i2c_transfer_buffer[1 + j] = pwm_buffer[i + j];
+            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
        }

 #if SNLED27351_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
@@ -136,8 +133,8 @@ void snled27351_init_drivers(void) {
 }

 void snled27351_init(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to shutdown mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
    // Setting internal channel pulldown/pullup
@@ -150,35 +147,33 @@ void snled27351_init(uint8_t addr) {
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
    // Setting Iref
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
-
-    snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
+    // Set LED CONTROL PAGE (Page 0)
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
        snled27351_write_register(addr, i, 0x00);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_PWM);
-
+    // Set PWM PAGE (Page 1)
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
        snled27351_write_register(addr, i, 0x00);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_CURRENT_TUNE);
-
+    // Set CURRENT PAGE (Page 4)
    uint8_t current_tune_reg_list[SNLED27351_LED_CURRENT_TUNE_LENGTH] = SNLED27351_CURRENT_TUNE;
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_CURRENT_TUNE);
    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
        snled27351_write_register(addr, i, current_tune_reg_list[i]);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
    // Enable LEDs ON/OFF
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
        snled27351_write_register(addr, i, 0xFF);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to normal mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }
@@ -220,7 +215,7 @@ void snled27351_set_led_control_register(uint8_t index, bool value) {

 void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        snled27351_select_page(addr, SNLED27351_COMMAND_PWM);
+        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);

        // If any of the transactions fail we risk writing dirty PG0,
        // refresh page 0 just in case.
@@ -233,8 +228,7 @@ void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void snled27351_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
+        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
        for (int i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
            snled27351_write_register(addr, i, g_led_control_registers[index][i]);
        }
@@ -256,15 +250,15 @@ void snled27351_flush(void) {
 }

 void snled27351_sw_return_normal(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to normal mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }

 void snled27351_sw_shutdown(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to shutdown mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
    // Write SW Sleep Register
--- a/drivers/led/snled27351-simple.h
+++ b/drivers/led/snled27351-simple.h
@@ -155,7 +155,6 @@ extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];

 void snled27351_init_drivers(void);
 void snled27351_init(uint8_t addr);
-void snled27351_select_page(uint8_t addr, uint8_t page);
 bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data);
 bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

--- a/drivers/led/snled27351.c
+++ b/drivers/led/snled27351.c
@@ -37,7 +37,8 @@
        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 #endif

-uint8_t i2c_transfer_buffer[65];
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[65];

 // These buffers match the SNLED27351 PWM registers.
 // The control buffers match the PG0 LED On/Off registers.
@@ -53,27 +54,23 @@ bool    g_led_control_registers_update_required[SNLED27351_DRIVER_COUNT]

 bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
    // If the transaction fails function returns false.
-    i2c_transfer_buffer[0] = reg;
-    i2c_transfer_buffer[1] = data;
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;

 #if SNLED27351_I2C_PERSISTENCE > 0
    for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
            return false;
        }
    }
 #else
-    if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
        return false;
    }
 #endif
    return true;
 }

-void snled27351_select_page(uint8_t addr, uint8_t page) {
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, page);
-}
-
 bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
    // Assumes PG1 is already selected.
    // If any of the transactions fails function returns false.
@@ -81,22 +78,22 @@ bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {

    // Iterate over the pwm_buffer contents at 64 byte intervals.
    for (uint8_t i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 64) {
-        i2c_transfer_buffer[0] = i;
+        g_twi_transfer_buffer[0] = i;
        // Copy the data from i to i+63.
        // Device will auto-increment register for data after the first byte
        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
        for (uint8_t j = 0; j < 64; j++) {
-            i2c_transfer_buffer[1 + j] = pwm_buffer[i + j];
+            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
        }

 #if SNLED27351_I2C_PERSISTENCE > 0
        for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
                return false;
            }
        }
 #else
-        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
            return false;
        }
 #endif
@@ -135,8 +132,8 @@ void snled27351_init_drivers(void) {
 }

 void snled27351_init(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to shutdown mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
    // Setting internal channel pulldown/pullup
@@ -149,34 +146,33 @@ void snled27351_init(uint8_t addr) {
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
    // Setting Iref
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
-
-    snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
+    // Set LED CONTROL PAGE (Page 0)
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
        snled27351_write_register(addr, i, 0x00);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_PWM);
-
+    // Set PWM PAGE (Page 1)
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
        snled27351_write_register(addr, i, 0x00);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_CURRENT_TUNE);
-
+    // Set CURRENT PAGE (Page 4)
    uint8_t current_tune_reg_list[SNLED27351_LED_CURRENT_TUNE_LENGTH] = SNLED27351_CURRENT_TUNE;
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_CURRENT_TUNE);
    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
        snled27351_write_register(addr, i, current_tune_reg_list[i]);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
+    // Enable LEDs ON/OFF
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
        snled27351_write_register(addr, i, 0xFF);
    }

-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to normal mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }
@@ -234,7 +230,7 @@ void snled27351_set_led_control_register(uint8_t index, bool red, bool green, bo

 void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {
    if (g_pwm_buffer_update_required[index]) {
-        snled27351_select_page(addr, SNLED27351_COMMAND_PWM);
+        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);

        // If any of the transactions fail we risk writing dirty PG0,
        // refresh page 0 just in case.
@@ -247,8 +243,7 @@ void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {

 void snled27351_update_led_control_registers(uint8_t addr, uint8_t index) {
    if (g_led_control_registers_update_required[index]) {
-        snled27351_select_page(addr, SNLED27351_COMMAND_LED_CONTROL);
-
+        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
        for (int i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
            snled27351_write_register(addr, i, g_led_control_registers[index][i]);
        }
@@ -270,15 +265,15 @@ void snled27351_flush(void) {
 }

 void snled27351_sw_return_normal(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to normal mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }

 void snled27351_sw_shutdown(uint8_t addr) {
-    snled27351_select_page(addr, SNLED27351_COMMAND_FUNCTION);
-
+    // Select to function page
+    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
    // Setting LED driver to shutdown mode
    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
    // Write SW Sleep Register
--- a/drivers/led/snled27351.h
+++ b/drivers/led/snled27351.h
@@ -169,7 +169,6 @@ extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];

 void snled27351_init_drivers(void);
 void snled27351_init(uint8_t addr);
-void snled27351_select_page(uint8_t addr, uint8_t page);
 bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data);
 bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);

--- a/drivers/painter/sh1106/qp_sh1106.c
+++ b/drivers/painter/sh1106/qp_sh1106.c
@@ -44,7 +44,7 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
    }

    // clang-format off
-    uint8_t sh1106_init_sequence[] = {
+    const uint8_t sh1106_init_sequence[] = {
        // Command,                 Delay,  N, Data[N]
        SH1106_SET_MUX_RATIO,           0,  1, 0x3F,
        SH1106_DISPLAY_OFFSET,          0,  1, 0x00,
@@ -61,16 +61,6 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
    };
    // clang-format on

-    // If the display height is anything other than the default 64 pixels, change SH1106_SET_MUX_RATIO data byte to the correct value
-    if (driver->oled.base.panel_height != 64) {
-        sh1106_init_sequence[3] = driver->oled.base.panel_height - 1;
-    }
-
-    // For 128x32 or 96x16 displays, change SH1106_COM_PADS_HW_CFG data byte from alternative (0x12) to sequential (0x02) configuration
-    if (driver->oled.base.panel_height <= 32) {
-        sh1106_init_sequence[20] = 0x02;
-    }
-
    qp_comms_bulk_command_sequence(device, sh1106_init_sequence, sizeof(sh1106_init_sequence));
    return true;
 }
@@ -213,4 +203,4 @@ painter_device_t qp_sh1106_make_i2c_device(uint16_t panel_width, uint16_t panel_
    return NULL;
 }

-#endif // QUANTUM_PAINTER_SH1106_I2C_ENABLE
+#endif // QUANTUM_PAINTER_SH1106_SPI_ENABLE
--- a/drivers/painter/sh1106/qp_sh1106_opcodes.h
+++ b/drivers/painter/sh1106/qp_sh1106_opcodes.h
@@ -16,7 +16,7 @@
 #define SH1106_COM_PADS_HW_CFG 0xDA
 #define SH1106_SET_CONTRAST 0x81
 #define SH1106_SET_PRECHARGE_PERIOD 0xD9
-#define SH1106_VCOM_DESELECT_LEVEL 0xDB
+#define SH1106_VCOM_DETECT 0xDB
 #define SH1106_ALL_ON_RESUME 0xA4
 #define SH1106_NON_INVERTING_DISPLAY 0xA6
 #define SH1106_DEACTIVATE_SCROLL 0x2E
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -22,28 +22,17 @@
 #include <stdlib.h>

 // Set Parameters
-#ifndef ANALOG_JOYSTICK_AUTO_AXIS
 uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
 uint16_t maxAxisValue = ANALOG_JOYSTICK_AXIS_MAX;
-#else
-int16_t minAxisValues[2];
-int16_t maxAxisValues[2];
-#endif

 uint8_t maxCursorSpeed = ANALOG_JOYSTICK_SPEED_MAX;
 uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR; // Lower Values Create Faster Movement

-#ifdef ANALOG_JOYSTICK_WEIGHTS
-int8_t weights[101] = ANALOG_JOYSTICK_WEIGHTS;
-#endif
-
 int16_t xOrigin, yOrigin;

 uint16_t lastCursor = 0;

-uint8_t prevValues[2] = {0, 0};
-
-int16_t axisCoordinate(pin_t pin, uint16_t origin, uint8_t axis) {
+int16_t axisCoordinate(pin_t pin, uint16_t origin) {
    int8_t  direction;
    int16_t distanceFromOrigin;
    int16_t range;
@@ -54,27 +43,12 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin, uint8_t axis) {
        return 0;
    } else if (origin > position) {
        distanceFromOrigin = origin - position;
-#ifdef ANALOG_JOYSTICK_AUTO_AXIS
-        if (position < minAxisValues[axis]) {
-            minAxisValues[axis] = position;
-        }
-        range = origin - minAxisValues[axis];
-#else
-        range = origin - minAxisValue;
-#endif
-        direction = -1;
+        range              = origin - minAxisValue;
+        direction          = -1;
    } else {
        distanceFromOrigin = position - origin;
-
-#ifdef ANALOG_JOYSTICK_AUTO_AXIS
-        if (position > maxAxisValues[axis]) {
-            maxAxisValues[axis] = position;
-        }
-        range = maxAxisValues[axis] - origin;
-#else
-        range = maxAxisValue - origin;
-#endif
-        direction = 1;
+        range              = maxAxisValue - origin;
+        direction          = 1;
    }

    float   percent    = (float)distanceFromOrigin / range;
@@ -88,29 +62,14 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin, uint8_t axis) {
    }
 }

-int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed, uint8_t axis) {
-    int16_t coordinate = axisCoordinate(pin, origin, axis);
-    int8_t  result;
-#ifndef ANALOG_JOYSTICK_WEIGHTS
+int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed) {
+    int16_t coordinate = axisCoordinate(pin, origin);
    if (coordinate != 0) {
        float percent = (float)coordinate / 100;
-        result        = percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
+        return percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
    } else {
        return 0;
    }
-#else
-    result = weights[abs(coordinate)] * (coordinate < 0 ? -1 : 1) * maxCursorSpeed / speedRegulator;
-#endif
-
-#ifdef ANALOG_JOYSTICK_CUTOFF
-    uint8_t pv       = prevValues[axis];
-    prevValues[axis] = abs(result);
-    if (pv > abs(result)) {
-        return 0;
-    }
-#endif
-
-    return result;
 }

 report_analog_joystick_t analog_joystick_read(void) {
@@ -118,8 +77,8 @@ report_analog_joystick_t analog_joystick_read(void) {

    if (timer_elapsed(lastCursor) > ANALOG_JOYSTICK_READ_INTERVAL) {
        lastCursor = timer_read();
-        report.x   = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed, 0);
-        report.y   = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed, 1);
+        report.x   = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed);
+        report.y   = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed);
    }
 #ifdef ANALOG_JOYSTICK_CLICK_PIN
    report.button = !readPin(ANALOG_JOYSTICK_CLICK_PIN);
@@ -134,11 +93,4 @@ void analog_joystick_init(void) {
    // Account for drift
    xOrigin = analogReadPin(ANALOG_JOYSTICK_X_AXIS_PIN);
    yOrigin = analogReadPin(ANALOG_JOYSTICK_Y_AXIS_PIN);
-
-#ifdef ANALOG_JOYSTICK_AUTO_AXIS
-    minAxisValues[0] = xOrigin - 100;
-    minAxisValues[1] = yOrigin - 100;
-    maxAxisValues[0] = xOrigin + 100;
-    maxAxisValues[1] = yOrigin + 100;
-#endif
 }
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -216,13 +216,6 @@ void cirque_pinnacle_cursor_smoothing(bool enable) {
    RAP_Write(HOSTREG__FEEDCONFIG3, feedconfig3);
 }

-// Check sensor is connected
-bool cirque_pinnacle_connected(void) {
-    uint8_t zidle = 0;
-    RAP_ReadBytes(HOSTREG__ZIDLE, &zidle, 1);
-    return zidle == HOSTREG__ZIDLE_DEFVAL;
-}
-
 /*  Pinnacle-based TM040040/TM035035/TM023023 Functions  */
 void cirque_pinnacle_init(void) {
 #if defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
@@ -281,10 +274,6 @@ void cirque_pinnacle_init(void) {
    }

    cirque_pinnacle_enable_feed(true);
-
-#ifndef CIRQUE_PINNACLE_SKIP_SENSOR_CHECK
-    touchpad_init = cirque_pinnacle_connected();
-#endif
 }

 pinnacle_data_t cirque_pinnacle_read_data(void) {
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -56,9 +56,9 @@
 #    define WS2812_TRST_US 280
 #endif

-#if defined(RGBLIGHT_WS2812)
-#    define WS2812_LED_COUNT RGBLIGHT_LED_COUNT
-#elif defined(RGB_MATRIX_WS2812)
+#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

--- a/keyboards/1k/keymaps/default/rgblite.h
+++ b/keyboards/1k/keymaps/default/rgblite.h
@@ -7,8 +7,8 @@
 #include "color.h"

 static inline void rgblite_setrgb(RGB rgb) {
-    rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}};
-    ws2812_setleds(leds, RGBLIGHT_LED_COUNT);
+    rgb_led_t leds[RGBLED_NUM] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}};
+    ws2812_setleds(leds, RGBLED_NUM);
 }

 static void rgblite_increase_hue(void) {
--- a/keyboards/1upkeyboards/1upocarina/config.h
+++ b/keyboards/1upkeyboards/1upocarina/config.h
@@ -19,7 +19,7 @@
 #define RGB_MATRIX_LED_COUNT 32
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses

-#    define RGB_MATRIX_SLEEP // turn off effects when suspended
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
--- a/keyboards/1upkeyboards/1upslider8/config.h
+++ b/keyboards/1upkeyboards/1upslider8/config.h
@@ -25,5 +25,5 @@

 #define RGB_MATRIX_LED_COUNT 8
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/keyboards/1upkeyboards/1upsuper16v3/config.h
+++ b/keyboards/1upkeyboards/1upsuper16v3/config.h
@@ -18,5 +18,5 @@

 #define RGB_MATRIX_LED_COUNT 48
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -13,7 +13,7 @@
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP // turn off effects when suspended
+#    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:
--- a/keyboards/1upkeyboards/pi50/config.h
+++ b/keyboards/1upkeyboards/pi50/config.h
@@ -11,7 +11,7 @@

 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended

 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
--- a/keyboards/1upkeyboards/pi60/config.h
+++ b/keyboards/1upkeyboards/pi60/config.h
@@ -6,7 +6,7 @@
 #define RGB_MATRIX_LED_COUNT 21
 //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 //#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP
+#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
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -6,7 +6,7 @@
 #define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP
+#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
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -6,7 +6,7 @@
 #define RGB_MATRIX_LED_COUNT 61
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_SLEEP // turn off effects when suspended
+#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:
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -22,7 +22,7 @@
 #define RGB_MATRIX_LED_COUNT 20
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP // turn off effects when suspended
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -19,7 +19,7 @@
 #define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SLEEP
+#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
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -19,7 +19,7 @@
 #define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SLEEP
+#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
--- a/keyboards/25keys/zinc/rev1/post_config.h
+++ b/keyboards/25keys/zinc/rev1/post_config.h
@@ -24,35 +24,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #define RGBLIGHT_SPLIT
  #ifdef RGBLED_BACK
    #ifdef RGBLED_CONT
-      #define RGBLIGHT_LED_COUNT 48
+      #define RGBLED_NUM 48
      #define RGBLED_SPLIT { 24, 24 }
    #else
-      #define RGBLIGHT_LED_COUNT 24
+      #define RGBLED_NUM 24
    #endif
  #else
    #ifdef RGBLED_BOTH
      #ifdef RGBLED_CONT
-        #define RGBLIGHT_LED_COUNT 60
+        #define RGBLED_NUM 60
        #define RGBLED_SPLIT { 30, 30 }
      #else
-        #define RGBLIGHT_LED_COUNT 30
+        #define RGBLED_NUM 30
      #endif
    #else
      #ifdef RGBLED_CONT
-        #define RGBLIGHT_LED_COUNT 12
+        #define RGBLED_NUM 12
        #define RGBLED_SPLIT { 6, 6 }
      #else
-        #define RGBLIGHT_LED_COUNT 6
+        #define RGBLED_NUM 6
      #endif
    #endif
  #endif
 #endif

 #ifndef IOS_DEVICE_ENABLE
-  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
+  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
    #define RGBLIGHT_LIMIT_VAL 255
  #else
-    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
+    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
      #define RGBLIGHT_LIMIT_VAL 130
    #else
      #define RGBLIGHT_LIMIT_VAL 120
@@ -60,10 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #endif
  #define RGBLIGHT_VAL_STEP 17
 #else
-  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
+  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
    #define RGBLIGHT_LIMIT_VAL 90
  #else
-    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
+    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
      #define RGBLIGHT_LIMIT_VAL 45
    #else
      #define RGBLIGHT_LIMIT_VAL 35
--- a/keyboards/25keys/zinc/reva/post_config.h
+++ b/keyboards/25keys/zinc/reva/post_config.h
@@ -24,35 +24,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #define RGBLIGHT_SPLIT
  #ifdef RGBLED_BACK
    #ifdef RGBLED_CONT
-      #define RGBLIGHT_LED_COUNT 48
+      #define RGBLED_NUM 48
      #define RGBLED_SPLIT { 24, 24 }
    #else
-      #define RGBLIGHT_LED_COUNT 24
+      #define RGBLED_NUM 24
    #endif
  #else
    #ifdef RGBLED_BOTH
      #ifdef RGBLED_CONT
-        #define RGBLIGHT_LED_COUNT 60
+        #define RGBLED_NUM 60
        #define RGBLED_SPLIT { 30, 30 }
      #else
-        #define RGBLIGHT_LED_COUNT 30
+        #define RGBLED_NUM 30
      #endif
    #else
      #ifdef RGBLED_CONT
-        #define RGBLIGHT_LED_COUNT 12
+        #define RGBLED_NUM 12
        #define RGBLED_SPLIT { 6, 6 }
      #else
-        #define RGBLIGHT_LED_COUNT 6
+        #define RGBLED_NUM 6
      #endif
    #endif
  #endif
 #endif

 #ifndef IOS_DEVICE_ENABLE
-  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
+  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
    #define RGBLIGHT_LIMIT_VAL 255
  #else
-    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
+    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
      #define RGBLIGHT_LIMIT_VAL 130
    #else
      #define RGBLIGHT_LIMIT_VAL 120
@@ -60,10 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #endif
  #define RGBLIGHT_VAL_STEP 17
 #else
-  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
+  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
    #define RGBLIGHT_LIMIT_VAL 90
  #else
-    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
+    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
      #define RGBLIGHT_LIMIT_VAL 45
    #else
      #define RGBLIGHT_LIMIT_VAL 35
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_DEFAULT_SPD 20
 #define RGB_MATRIX_DEFAULT_VAL 128
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SLEEP
+#define RGB_DISABLE_WHEN_USB_SUSPENDED

 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
--- 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 is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
    { 0, K_2,  J_2,  L_2 }, //D402
    { 0, K_3,  J_3,  L_3 }, //D403
    { 0, K_4,  J_4,  L_4 }, //D404
--- a/keyboards/4pplet/waffling60/rev_e_iso/config.h
+++ b/keyboards/4pplet/waffling60/rev_e_iso/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 IntusFacultas <pdelmorallopez@gmail.com>
+Copyright 2023 Stefan Sundin "4pplet" <mail@4pplet.com>

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,4 +16,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once

-#define ENCODER_MAP_KEY_DELAY 2
+#define WS2812_EXTERNAL_PULLUP
+
--- a/keyboards/4pplet/waffling60/rev_e_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_e_iso/info.json
@@ -0,0 +1,408 @@
+{
+    "manufacturer": "4pplet",
+    "keyboard_name": "waffling60 Rev E ISO HS",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 17
+    },
+    "url": "https://github.com/4pplet/waffling60",
+    "usb": {
+        "device_version": "0.0.5",
+        "pid": "0x0016",
+        "vid": "0x4444"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "60_iso_tsangan_split_bs_rshift", 
+        "60_iso_wkl_split_bs_rshift"
+     ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC, KC_RBRC,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_NUHS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS)
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,       KC_Y,      KC_U,      KC_I,      KC_O,       KC_P,    KC_LBRC,  KC_RBRC,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
--- a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
--- a/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
+++ b/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev E ISO
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │1D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2D  │
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│40   │41 │42   │44         │46 │48         │4B   │4C │4D   │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
--- a/keyboards/4pplet/waffling60/rev_e_iso/readme.md
+++ b/keyboards/4pplet/waffling60/rev_e_iso/readme.md
@@ -0,0 +1,26 @@
+# waffling60 Rev. E ISO
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. Revision E adds underglow and rotary encoder support.
+
+More info: https://github.com/4pplet/waffling60
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_e_iso:default
+
+Flashing example for this keyboard:
+
+    make 4pplet/waffling60/rev_e_iso:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+How to enter bootloader (DFU):
+* Short the reset-header (labled BL/RESET) on the back of the PCB for about 2 seconds for the keyboard to enter DFU. When in DFU, it's ready to flash the firmware. If using a APM MCU it will not automatically reset after flash. Simply short the reset-header for a very short time to just reset the PCB, alternatively unplug and repluck the USB-cable to the keyboard.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
--- a/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
--- a/keyboards/abko/ak84bt/ak84bt.c
+++ b/keyboards/abko/ak84bt/ak84bt.c
@@ -16,7 +16,7 @@

 #include QMK_KEYBOARD_H

-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
    {0, G_1,    I_1,    H_1},
    {0, G_3,    I_3,    H_3},
    {0, G_4,    I_4,    H_4},
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP  // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT

 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_DEFAULT_VAL 80
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP  // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_HUE_WAVE

 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"

 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP  // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT

 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_DEFAULT_VAL 60
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_SLEEP  // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT

 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

+#define RGBLED_NUM 1
+
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
--- a/keyboards/acheron/themis/87h/info.json
+++ b/keyboards/acheron/themis/87h/info.json
@@ -26,9 +26,6 @@
            "backing_size": 8192
        }
    },
-    "rgblight": {
-        "led_count": 1
-    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

+#define RGBLED_NUM 1
+
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
--- a/keyboards/acheron/themis/87htsc/info.json
+++ b/keyboards/acheron/themis/87htsc/info.json
@@ -26,9 +26,6 @@
            "backing_size": 8192
        }
    },
-    "rgblight": {
-        "led_count": 1
-    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

+#define RGBLED_NUM 1
+
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
--- a/keyboards/acheron/themis/88htsc/info.json
+++ b/keyboards/acheron/themis/88htsc/info.json
@@ -26,9 +26,6 @@
            "backing_size": 8192
        }
    },
-    "rgblight": {
-        "led_count": 1
-    },
    "ws2812": {
        "pin": "B15"
    },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kai	13f7b68240	Fix user hook call for dynamic_macro_record_key (#22250 )	2024-01-09 21:45:44 +11:00
Markus Knutsson	53f1e3b11f	Lotus 58 Glow - Added Auto shift to OLED, corrected OLED orientation (#22424 ) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>	2024-01-09 21:17:46 +11:00
Magne Lauritzen	89b46eedd5	Raise Circumflex from the grave in sendstring_french.h (#22285 )	2024-01-09 20:53:26 +11:00
Ryan	0b0c31665e	Keychron Q1V1: fix incorrect 3733 address (#22852 )	2024-01-07 18:37:56 +11:00
Joe Scotto	7e03877924	[Keyboard] Add ScottoKatana handwired keyboard (#22805 )	2024-01-06 23:36:22 -08:00
4pplet	31d28ba228	[Keyboard] Add Nordic65 by KBnordic (#22817 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>	2024-01-06 23:35:45 -08:00
James Kneafsey	a474cac2c3	Update keymap.md (#22834 )	2024-01-06 12:06:14 +11:00
QMK Bot	b02abcb9a6	Regenerate Files (#22821 )	2024-01-04 08:59:38 +00:00
dependabot[bot]	b514a591f3	Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#22812 ) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v40...v41) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-04 07:28:33 +00:00
Antoine Bertin	90811118b7	docs(skeletyl): fix readme instructions (#22791 )	2023-12-31 18:25:58 +00:00
4pplet	fc20e0b014	Waffling60 iso rev e (#22733 ) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>	2023-12-29 08:17:20 -08:00
yuezp	420b13468b	[Keyboard] Add meetlab kafkasplit (#22756 ) Co-authored-by: “yuezp” <“yuezpchn@126.com”>	2023-12-27 20:37:01 -08:00
Tom Barnes	2505d7edd0	vendor keymaps-mechboards via updates (#22767 ) * update mb_via keymaps to new naming for vendor keymaps * missed a reference to old name, tidy crkbd readme, add lily58 readme * fix typo * fix typo * delete shopify image	2023-12-27 15:11:06 -07:00
Ryan	cc08f230ff	bm40hsrgb/rev2: disable some RGB Matrix effects to reduce filesize (#22761 )	2023-12-27 01:12:42 +00:00