Merge upstream master to 2022 Q4 breaking change

7 files changed, 0 insertions, 1063 deletions

diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
deleted file mode 100644
index 9222c1cad9..0000000000
--- a/keyboards/matrix/noah/config.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * config.h
- *
- */
-
-#pragma once
-
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-#define MATRIX_ROW_PINS {  B0,  A1, C14, C13,  A0}
-#define MATRIX_COL_PINS { C15, B10,  B7,  B6,  B5,  B4, A15, A10,  A9,  A8, B15, B14, B13, B12,  B2}
-
-#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE    5
-
-// i2c setting
-#define I2C1_SCL_PIN B8
-#define I2C1_SDA_PIN B9
-#define I2C1_CLOCK_SPEED 400000
-#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-#define PAL_MODE_STM32_ALTERNATE_OPENDRAIN (PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN)
-
-// rgb matrix setting
-#define DRIVER_ADDR_1 0b1110100
-#define DRIVER_ADDR_2 0b1110110
-#define DRIVER_COUNT 2
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* indicator rgb */
-#define RGBLED_NUM 7
-#define RGB_DI_PIN B1
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-
-// tapping setting
-//#define TAPPING_TERM 200
-//#define RETRO_TAPPING
-//#define PERMISSIVE_HOLD
diff --git a/keyboards/matrix/noah/keymaps/blockader/keymap.c b/keyboards/matrix/noah/keymaps/blockader/keymap.c
deleted file mode 100644
index b6d9a9acc3..0000000000
--- a/keyboards/matrix/noah/keymaps/blockader/keymap.c
+++ /dev/null
@@ -1,652 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum {
-    LAYER_NORM_BASE,
-    LAYER_NORM_EXTENSION,
-    LAYER_RACE_BASE,
-    LAYER_RACE_EXTENSION,
-    LAYER_LEGACY_BASE,
-    LAYER_LEGACY_EXTENSION,
-    LAYER_CONTROL,
-    LAYER_WINDOW,
-    LAYER_DESKTOP,
-    NUMBER_OF_LAYERS,
-};
-
-bool temporary[NUMBER_OF_LAYERS] = {
-    [LAYER_NORM_BASE] = false,
-    [LAYER_NORM_EXTENSION] = true,
-    [LAYER_RACE_BASE] = false,
-    [LAYER_RACE_EXTENSION] = true,
-    [LAYER_LEGACY_BASE] = false,
-    [LAYER_LEGACY_EXTENSION] = true,
-    [LAYER_CONTROL] = false,
-    [LAYER_WINDOW] = true,
-    [LAYER_DESKTOP] = false,
-};
-
-#define KEY_FORWARD_LAYER(a) SAFE_RANGE + a
-
-enum{
-    DANCE_PGDN_BOTTOM,
-    DANCE_PGUP_TOP,
-};
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-    [DANCE_PGDN_BOTTOM] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, LGUI(KC_DOWN)),
-    [DANCE_PGUP_TOP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, LGUI(KC_UP)),
-};
-
-#define KEY_DANCE(a) TD(a)
-
-enum custom_keycodes {
-    KEY_BACK_LAYER = SAFE_RANGE + NUMBER_OF_LAYERS,
-    KEY_INSERT_LINE_START,
-    KEY_INSERT_HERE,
-    KEY_INSERT_LINE_END,
-    KEY_CREATE_PREVIOUS_LINE,
-    KEY_CREATE_NEXT_LINE,
-    KEY_CUT_WORD,
-    KEY_CUT_LINE,
-    KEY_CUT_SELECTION,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [LAYER_NORM_BASE] = LAYOUT_default_splitspace(
-        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KEY_DANCE(DANCE_PGDN_BOTTOM), KEY_DANCE(DANCE_PGUP_TOP), KC_NO, KEY_CUT_LINE, KEY_FORWARD_LAYER(LAYER_RACE_BASE),
-        KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LCBR, KC_RCBR, KC_BSLS, KEY_FORWARD_LAYER(LAYER_LEGACY_BASE),
-        KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KEY_FORWARD_LAYER(LAYER_DESKTOP),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, LCTL(KC_LEFT),
-        KC_LCTL, KC_LGUI, KC_LALT, KEY_FORWARD_LAYER(LAYER_NORM_EXTENSION), KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_NO, LCTL(KC_RIGHT)),
-    [LAYER_NORM_EXTENSION] = LAYOUT_default_splitspace(
-        LGUI(LSFT(KC_4)), KC_NO, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, LCTL(KC_C), KEY_FORWARD_LAYER(LAYER_RACE_BASE),
-        KEY_FORWARD_LAYER(LAYER_WINDOW), LGUI(KC_SPC), LCTL(KC_SPC), KC_ESC, KC_TILD, KC_EXLM, KC_PEQL, KC_PLUS, KC_MINUS, KC_PIPE, KC_COLN, KC_LCBR, KC_RCBR, KEY_CREATE_PREVIOUS_LINE, KEY_FORWARD_LAYER(LAYER_LEGACY_BASE),
-        KEY_CUT_WORD, LALT(KC_LEFT), LALT(KC_RIGHT), KC_BSPC, LGUI(KC_LEFT), LCTL(KC_E), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LGUI(KC_V), KC_DQUO, KEY_CREATE_NEXT_LINE, KEY_FORWARD_LAYER(LAYER_DESKTOP),
-        KC_LSFT, LGUI(KC_Z), KEY_CUT_SELECTION, KC_LPRN, KC_RPRN, KC_UNDS, KC_LBRC, KC_RBRC, KC_LT, KC_GT, KC_QUES, KC_RSFT, KC_NO, LCTL(KC_LEFT),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, QK_BOOT, LCTL(KC_RIGHT)),
-    [LAYER_RACE_BASE] = LAYOUT_default_splitspace(
-        KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_NO, KC_NO, KC_NO, KEY_BACK_LAYER,
-        KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LCBR, KC_RCBR, KC_BSLS, KC_NO,
-        KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_NO,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KEY_FORWARD_LAYER(LAYER_RACE_EXTENSION), KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-    [LAYER_RACE_EXTENSION] = LAYOUT_default_splitspace(
-        KC_NO, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_9, KC_0, KC_NO, KC_NO, KC_NO, KEY_CUT_LINE, KEY_BACK_LAYER,
-        KC_NO, KC_Q, KC_W, KC_F, KC_TILD, KC_EXLM, KC_PEQL, KC_PLUS, KC_MINUS, KC_PIPE, KC_COLN, KC_LCBR, KC_RCBR, KC_BSLS, KC_NO,
-        KEY_CUT_LINE, KC_A, KC_R, KC_BSPC, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_DQUO, KC_ENT, KC_NO,
-        KC_LSFT, KC_Z, KC_X, KC_LPRN, KC_RPRN, KC_UNDS, KC_LBRC, KC_RBRC, KC_LT, KC_GT, KC_QUES, KC_RSFT, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-    [LAYER_LEGACY_BASE] = LAYOUT_default_splitspace(
-        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KEY_DANCE(DANCE_PGDN_BOTTOM), KEY_DANCE(DANCE_PGUP_TOP), KC_NO, KEY_CUT_LINE, KC_NO,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCBR, KC_RCBR, KC_BSLS, KEY_BACK_LAYER,
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KEY_FORWARD_LAYER(LAYER_DESKTOP),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, LCTL(KC_LEFT),
-        KC_LCTL, KC_LGUI, KC_LALT, KEY_FORWARD_LAYER(LAYER_LEGACY_EXTENSION), KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_NO, LCTL(KC_RIGHT)),
-    [LAYER_LEGACY_EXTENSION] = LAYOUT_default_splitspace(
-        LGUI(LSFT(KC_4)), KC_NO, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, LCTL(KC_C), KC_NO,
-        KEY_FORWARD_LAYER(LAYER_WINDOW), LGUI(KC_SPC), LCTL(KC_SPC), KC_ESC, KC_TILD, KC_EXLM, KC_PEQL, KC_PLUS, KC_MINUS, KC_PIPE, KC_COLN, KC_LCBR, KC_RCBR, KEY_CREATE_PREVIOUS_LINE, KEY_BACK_LAYER,
-        KEY_CUT_WORD, LALT(KC_LEFT), LALT(KC_RIGHT), KC_BSPC, LGUI(KC_LEFT), LCTL(KC_E), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LGUI(KC_V), KC_DQUO, KEY_CREATE_NEXT_LINE, KEY_FORWARD_LAYER(LAYER_DESKTOP),
-        KC_LSFT, LGUI(KC_Z), KEY_CUT_SELECTION, KC_LPRN, KC_RPRN, KC_UNDS, KC_LBRC, KC_RBRC, KC_LT, KC_GT, KC_QUES, KC_RSFT, KC_NO, LCTL(KC_LEFT),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KEY_FORWARD_LAYER(LAYER_CONTROL), KC_SPC, KC_RALT, KC_RGUI, KC_NO, KC_NO, LCTL(KC_RIGHT)),
-    [LAYER_CONTROL] = LAYOUT_default_splitspace(
-        KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KEY_INSERT_LINE_START, KEY_INSERT_HERE, KEY_INSERT_LINE_END, KC_NO, KC_NO, KC_NO, KEY_CREATE_PREVIOUS_LINE, KC_NO,
-        KEY_CUT_WORD, LALT(KC_LEFT), LALT(KC_RIGHT), KC_BSPC, LGUI(KC_LEFT), LCTL(KC_E), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LGUI(KC_V), KC_NO, KEY_CREATE_NEXT_LINE, KC_NO,
-        KC_LSFT, LGUI(KC_Z), KEY_CUT_SELECTION, LGUI(KC_C), LGUI(KC_V), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KEY_BACK_LAYER, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-    [LAYER_WINDOW] = LAYOUT_default_splitspace(
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KEY_BACK_LAYER, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO, KC_NO, KEY_BACK_LAYER, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KEY_BACK_LAYER, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-    [LAYER_DESKTOP] = LAYOUT_default_splitspace(
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LCTL(KC_LEFT), KC_NO, KC_NO, LCTL(KC_RIGHT), KC_NO, KC_NO, KEY_BACK_LAYER, KEY_BACK_LAYER,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KEY_BACK_LAYER, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-};
-
-int layers[16];
-
-struct {
-    bool back;
-} common_layer_data;
-struct {
-    int operator, multiplier;
-} layer_control_data;
-
-struct {
-    int start_time;
-} layer_window_data;
-
-bool handle_layer_key(uint16_t key, keyrecord_t* record) {
-    switch (layers[layers[0] + 1]) {
-        case LAYER_CONTROL:
-            switch (key) {
-                case KC_0:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_1:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 1;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_2:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 2;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_3:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 3;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_4:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 4;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_5:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 5;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_6:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 6;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_7:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 7;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_8:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 8;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KC_9:
-                    if (record->event.pressed) {
-                        layer_control_data.multiplier = layer_control_data.multiplier * 10 + 9;
-                        if (layer_control_data.multiplier < 0) layer_control_data.multiplier = 0;
-                    }
-                    return false;
-                case KEY_INSERT_LINE_START:
-                    if (record->event.pressed) common_layer_data.back = true;
-                    return true;
-                case KEY_INSERT_HERE:
-                    if (record->event.pressed) common_layer_data.back = true;
-                    return true;
-                case KEY_INSERT_LINE_END:
-                    if (record->event.pressed) common_layer_data.back = true;
-                    return true;
-                case KEY_CREATE_PREVIOUS_LINE:
-                    if (record->event.pressed) common_layer_data.back = true;
-                    return true;
-                case KEY_CUT_WORD:
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1) {
-                            register_code(KC_LALT);
-                            tap_code(KC_LEFT);
-                            tap_code(KC_RIGHT);
-                            unregister_code(KC_LALT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(LALT(KC_LEFT)));
-                            tap_code16(LGUI(KC_X));
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case LALT(KC_LEFT):
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LALT(KC_LEFT));
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            register_code(KC_LALT);
-                            tap_code(KC_LEFT);
-                            tap_code(KC_RIGHT);
-                            unregister_code(KC_LALT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(LALT(KC_LEFT)));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            register_code(KC_LALT);
-                            tap_code(KC_LEFT);
-                            tap_code(KC_RIGHT);
-                            unregister_code(KC_LALT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(LALT(KC_LEFT)));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_RIGHT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case LALT(KC_RIGHT):
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LALT(KC_RIGHT));
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            register_code(KC_LALT);
-                            tap_code(KC_RIGHT);
-                            tap_code(KC_LEFT);
-                            unregister_code(KC_LALT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(LALT(KC_RIGHT)));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            register_code(KC_LALT);
-                            tap_code(KC_RIGHT);
-                            tap_code(KC_LEFT);
-                            unregister_code(KC_LALT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(LALT(KC_RIGHT)));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_LEFT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case LGUI(KC_LEFT):
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            tap_code16(LGUI(KC_LEFT));
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            tap_code16(LSFT(LGUI(KC_LEFT)));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            tap_code16(LSFT(LGUI(KC_LEFT)));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_RIGHT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case LCTL(KC_E):
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            tap_code16(LCTL(KC_E));
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            tap_code16(LSFT(LCTL(KC_E)));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            tap_code16(LSFT(LCTL(KC_E)));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_LEFT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case KC_BSPC:
-                    if (record->event.pressed) {
-                        if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSFT);
-                            tap_code16(LGUI(KC_X));
-                            register_code(KC_LSFT);
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        } else if (layer_control_data.operator== - 1)
-                            layer_control_data.operator= KC_BSPC;
-                        else {
-                            if (layer_control_data.operator== KC_BSPC) {
-                                tap_code16(LCTL(KC_A));
-                                for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_DOWN));
-                                tap_code16(LGUI(KC_X));
-                            }
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        }
-                    }
-                    return false;
-                case KC_LEFT:
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code(KC_LEFT);
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_LEFT));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_LEFT));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_RIGHT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case KC_DOWN:
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code(KC_DOWN);
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            tap_code16(LCTL(KC_A));
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_DOWN));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            tap_code16(LCTL(KC_A));
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_DOWN));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_LEFT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case KC_UP:
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code(KC_UP);
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            tap_code16(LCTL(KC_E));
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_UP));
-                            tap_code16(LSFT(LCTL(KC_E)));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            tap_code16(LCTL(KC_E));
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_UP));
-                            tap_code16(LSFT(LCTL(KC_E)));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_RIGHT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case KC_RIGHT:
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code(KC_RIGHT);
-                        else if (layer_control_data.operator== KC_BSPC) {
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_RIGHT));
-                            tap_code16(LGUI(KC_X));
-                        } else if (layer_control_data.operator== LGUI(KC_C)) {
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_RIGHT));
-                            tap_code16(LGUI(KC_C));
-                            tap_code(KC_LEFT);
-                        }
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case KEY_CREATE_NEXT_LINE:
-                    if (record->event.pressed) common_layer_data.back = true;
-                    return true;
-                case LGUI(KC_Z):
-                    if (layer_control_data.operator== - 1 && layer_control_data.multiplier == 0) return true;
-                    if (record->event.pressed) {
-                        if (layer_control_data.operator== - 1)
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LGUI(KC_Z));
-                        layer_control_data.multiplier = 0;
-                        layer_control_data.operator   = - 1;
-                    }
-                    return false;
-                case LGUI(KC_C):
-                    if (record->event.pressed) {
-                        if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSFT);
-                            tap_code16(LGUI(KC_C));
-                            register_code(KC_LSFT);
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        } else if (layer_control_data.operator== - 1)
-                            layer_control_data.operator= LGUI(KC_C);
-                        else {
-                            if (layer_control_data.operator== LGUI(KC_C)) {
-                                tap_code16(LCTL(KC_A));
-                                for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LSFT(KC_DOWN));
-                                tap_code16(LGUI(KC_C));
-                                tap_code(KC_LEFT);
-                            }
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        }
-                    }
-                    return false;
-                case LGUI(KC_V):
-                    if (record->event.pressed) {
-                        if (get_mods() & MOD_MASK_SHIFT) {
-                            unregister_code(KC_LSFT);
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LGUI(KC_V));
-                            register_code(KC_LSFT);
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        } else {
-                            for (int i = 0; i < (layer_control_data.multiplier ? layer_control_data.multiplier : 1); ++i) tap_code16(LGUI(KC_V));
-                            layer_control_data.multiplier = 0;
-                            layer_control_data.operator   = - 1;
-                        }
-                    }
-                    return false;
-            }
-            layer_control_data.multiplier = 0;
-            layer_control_data.operator   = - 1;
-            return true;
-        case LAYER_WINDOW:
-            switch (key) {
-                case SAFE_RANGE + LAYER_WINDOW:
-                    if (!record->event.pressed) {
-                        if (timer_elapsed(layer_window_data.start_time) < 200)
-                            temporary[LAYER_WINDOW] = true;
-                        else
-                            temporary[LAYER_WINDOW] = false;
-                    }
-                    return true;
-                case KEY_BACK_LAYER:
-                    if (record->event.pressed) tap_code(KC_ENTER);
-                    return true;
-            }
-            return true;
-        case LAYER_DESKTOP:
-            switch (key) {
-                case KEY_BACK_LAYER:
-                    if (record->event.pressed) tap_code16(LCTL(KC_UP));
-                    return true;
-            }
-            return true;
-    }
-    return true;
-}
-
-void handle_layer_start(void) {
-    rgblight_disable_noeeprom();
-    switch (layers[layers[0] + 1]) {
-        case LAYER_RACE_BASE:
-        case LAYER_RACE_EXTENSION:
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-        case LAYER_LEGACY_BASE:
-        case LAYER_LEGACY_EXTENSION:
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_RED);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-        case LAYER_CONTROL:
-            layer_control_data.operator   = - 1;
-            layer_control_data.multiplier = 0;
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-        case LAYER_WINDOW:
-            register_code(KC_LGUI);
-            tap_code(KC_TAB);
-            layer_window_data.start_time = timer_read();
-            return;
-        case LAYER_DESKTOP:
-            tap_code16(LCTL(KC_UP));
-            return;
-    }
-}
-
-void handle_layer_return(void) {
-    rgblight_disable_noeeprom();
-    switch (layers[layers[0] + 1]) {
-        case LAYER_RACE_BASE:
-        case LAYER_RACE_EXTENSION:
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-        case LAYER_LEGACY_BASE:
-        case LAYER_LEGACY_EXTENSION:
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_RED);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-        case LAYER_CONTROL:
-            layer_control_data.operator   = - 1;
-            layer_control_data.multiplier = 0;
-            rgblight_enable_noeeprom();
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            return;
-    }
-}
-
-void handle_layer_end(void) {
-    switch (layers[layers[0] + 1]) {
-        case LAYER_WINDOW:
-            unregister_code(KC_LGUI);
-            return;
-    }
-}
-
-void update_layer(void) {
-    layer_clear();
-    common_layer_data.back = false;
-    layer_on(layers[layers[0] + 1]);
-}
-
-bool handle_call_key(uint16_t key, keyrecord_t* record) {
-    switch (key) {
-        case KEY_BACK_LAYER:
-            if (record->event.pressed) {
-                if (layers[0]) {
-                    handle_layer_end();
-                    --layers[0];
-                    update_layer();
-                    handle_layer_return();
-                }
-            }
-            return false;
-    }
-    if (key >= SAFE_RANGE && key < SAFE_RANGE + NUMBER_OF_LAYERS) {
-        int new_layer = key - SAFE_RANGE;
-        if (record->event.pressed) {
-            if (layers[layers[0] + 1] != new_layer) {
-                if (temporary[layers[layers[0] + 1]]) {
-                    handle_layer_end();
-                    layers[layers[0] + 1] = new_layer;
-                } else
-                    layers[++layers[0] + 1] = new_layer;
-                update_layer();
-                handle_layer_start();
-            }
-        } else {
-            if (layers[layers[0] + 1] == new_layer && temporary[layers[layers[0] + 1]]) {
-                handle_layer_end();
-                --layers[0];
-                update_layer();
-                handle_layer_return();
-            }
-        }
-        return false;
-    }
-    if (common_layer_data.back) {
-        if (layers[0]) {
-            handle_layer_end();
-            --layers[0];
-            update_layer();
-            handle_layer_return();
-        }
-    }
-    return true;
-}
-
-bool handle_common_key(uint16_t key, keyrecord_t* record) {
-    switch (key) {
-        case KEY_INSERT_LINE_START:
-            if (record->event.pressed) tap_code16(LGUI(KC_LEFT));
-            return false;
-        case KEY_INSERT_HERE:
-            return false;
-        case KEY_INSERT_LINE_END:
-            if (record->event.pressed) tap_code16(LGUI(KC_RIGHT));
-            return false;
-        case KEY_CREATE_PREVIOUS_LINE:
-            if (record->event.pressed) {
-                tap_code16(LGUI(KC_LEFT));
-                tap_code(KC_ENTER);
-                tap_code(KC_UP);
-            }
-            return false;
-        case KEY_CREATE_NEXT_LINE:
-            if (record->event.pressed) {
-                tap_code16(LGUI(KC_RIGHT));
-                tap_code(KC_ENTER);
-            }
-            return false;
-        case KEY_CUT_WORD:
-            if (record->event.pressed) {
-                register_code(KC_LALT);
-                tap_code(KC_LEFT);
-                tap_code(KC_RIGHT);
-                unregister_code(KC_LALT);
-                tap_code16(LSFT(LALT(KC_LEFT)));
-                tap_code16(LGUI(KC_X));
-            }
-            return false;
-        case KEY_CUT_LINE:
-            if (record->event.pressed) {
-                tap_code16(LGUI(KC_RIGHT));
-                tap_code16(LSFT(LGUI(KC_LEFT)));
-                tap_code16(LGUI(KC_X));
-            }
-            return false;
-        case KEY_CUT_SELECTION:
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_SHIFT) {
-                    unregister_code(KC_LSFT);
-                    tap_code16(LGUI(KC_X));
-                    register_code(KC_LSFT);
-                } else
-                    tap_code16(LGUI(KC_X));
-            }
-            return false;
-    }
-    return true;
-}
-
-bool process_record_user(uint16_t key, keyrecord_t* record) {
-    if (!handle_layer_key(key, record)) return false;
-    if (!handle_call_key(key, record)) return false;
-    return handle_common_key(key, record);
-}
-
-void keyboard_post_init_user() {
-    rgblight_disable_noeeprom();
-    rgb_matrix_disable();
-    common_layer_data.back = false;
-}
diff --git a/keyboards/matrix/noah/keymaps/default/keymap.c b/keyboards/matrix/noah/keymaps/default/keymap.c
deleted file mode 100644
index daa4ae833a..0000000000
--- a/keyboards/m