Remove userspace keymaps (#22544)

22 files changed, 0 insertions, 936 deletions

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
deleted file mode 100644
index 6d24808af2..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-
-Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_bastardkb_charybdis_3x5_blackpill
-
-#    undef MATRIX_ROW_PINS
-#    define MATRIX_ROW_PINS \
-        { B12, B13, B14, B15 }
-#    undef MATRIX_COL_PINS
-#    define MATRIX_COL_PINS \
-        { A15, B3, B4, B5, B6 }
-
-#    undef MATRIX_ROW_PINS_RIGHT
-#    define MATRIX_ROW_PINS_RIGHT \
-        { B12, B13, B14, B15 }
-#    undef MATRIX_COL_PINS_RIGHT
-#    define MATRIX_COL_PINS_RIGHT \
-        { A15, B3, B4, B5, B6 }
-
-#    define USB_VBUS_PIN B10
-#    undef SPLIT_HAND_PIN
-#    define SPLIT_HAND_PIN C14 // high = left, low = right
-
-// WS2812 RGB LED strip input and number of LEDs
-#    undef WS2812_DI_PIN
-#    define WS2812_DI_PIN A1
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#    define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
-#    define WS2812_PWM_CHANNEL 2    // default: 2
-#    define WS2812_PWM_PAL_MODE 1   // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#    define WS2812_EXTERNAL_PULLUP
-//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
-#    undef WS2812_DMA_STREAM
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMA_CHANNEL 3                 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_PWM_TARGET_PERIOD 800000
-
-#    define DEBUG_LED_PIN C13
-
-/* Audio config */
-#    define AUDIO_PIN B1
-#    define AUDIO_PWM_DRIVER PWMD3
-#    define AUDIO_PWM_CHANNEL 4
-#    define AUDIO_PWM_PAL_MODE 2
-
-/* serial.c configuration for split keyboard */
-#    undef SOFT_SERIAL_PIN
-#    define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode.
-#    undef SERIAL_USART_TX_PIN
-#    define SERIAL_USART_TX_PIN A2
-#    undef SERIAL_USART_RX_PIN
-#    define SERIAL_USART_RX_PIN A3
-#    define SERIAL_USART_DRIVER SD2
-#    define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#    define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#    define SERIAL_USART_TIMEOUT 100   // USART driver timeout. default 100
-#    define SERIAL_USART_SPEED 921600
-// #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
-// To use the highest possible baudrate (3.75Mbit/s) uncomment the following
-// line, this can result in dropped communications so lower the speed if there
-// are many timeouts.
-// #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
-
-#    define CRC8_USE_TABLE
-#    define CRC8_OPTIMIZE_SPEED
-
-/* spi config for eeprom and pmw3360 sensor */
-#    define SPI_DRIVER SPID1
-#    define SPI_SCK_PIN A5
-#    define SPI_SCK_PAL_MODE 5
-#    define SPI_MOSI_PIN A7
-#    define SPI_MOSI_PAL_MODE 5
-#    define SPI_MISO_PIN A6
-#    define SPI_MISO_PAL_MODE 5
-
-/* eeprom config */
-#    define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
-#    define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64
-// #define EXTERNAL_EEPROM_BYTE_COUNT           8196
-// #define EXTERNAL_EEPROM_PAGE_SIZE            32
-// #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
-
-/* pmw3360 config  */
-#    undef PMW33XX_CS_PIN
-#    define PMW33XX_CS_PIN B0
-#endif
-
-#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
-#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
-#define CHARYBDIS_MINIMUM_SNIPING_DPI 200
-#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
deleted file mode 100644
index 3b254172b4..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Nick Brassel (tzarc)
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
-#    define HAL_USE_PWM TRUE
-#    define HAL_USE_SERIAL TRUE
-#    define HAL_USE_I2C TRUE
-#    define HAL_USE_SPI TRUE
-#    define SPI_USE_WAIT TRUE
-#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
deleted file mode 100644
index e458a84373..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2021 Drashna Jael're @drashna
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "drashna.h"
-
-#define LAYOUT_charybdis_3x5_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
-#define LAYOUT_charybdis_3x5_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-    ) \
-    LAYOUT_charybdis_3x5 ( \
-       K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
-       ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
-       CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
-                LSFT_T(KC_GRV), KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
-    )
-#define LAYOUT_charybdis_3x5_base_wrapper(...)       LAYOUT_charybdis_3x5_base(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFAULT_LAYER_1] = LAYOUT_charybdis_3x5_base_wrapper(
-        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-    ),
-
-    [_DEFAULT_LAYER_2] = LAYOUT_charybdis_3x5_base_wrapper(
-        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
-        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
-        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
-    ),
-    [_DEFAULT_LAYER_3] = LAYOUT_charybdis_3x5_base_wrapper(
-        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-    ),
-
-    [_DEFAULT_LAYER_4] = LAYOUT_charybdis_3x5_base_wrapper(
-        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
-        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
-        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
-    ),
-
-    [_MOUSE] = LAYOUT_charybdis_3x5(
-        _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
-        _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
-        _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
-                          _______, SNIPING, _______,    _______, _______
-    ),
-    [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
-        _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
-        _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
-        _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
-                          _______, _______, _______,    _______, AUTO_CTN
-    ),
-    [_RAISE] = LAYOUT_charybdis_3x5_wrapper(
-        _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
-        _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
-        _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
-                          QK_RBT,  _______, _______,    _______, _______
-    ),
-    [_ADJUST] = LAYOUT_charybdis_3x5_wrapper(
-        _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
-        _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
-        _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,
-                          EE_CLR, KC_NUKE, _______,    _______, QK_BOOT
-    ),
-};
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
deleted file mode 100644
index 3defeed4dd..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Nick Brassel (tzarc)
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
-#    undef STM32_I2C_USE_I2C1
-#    define STM32_I2C_USE_I2C1 TRUE
-
-// #undef STM32_I2C_I2C1_RX_DMA_STREAM
-// #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-#    undef STM32_I2C_I2C1_TX_DMA_STREAM
-#    define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
-
-#    undef STM32_PWM_USE_TIM2
-#    define STM32_PWM_USE_TIM2 TRUE
-
-#    undef STM32_PWM_USE_TIM3
-#    define STM32_PWM_USE_TIM3 TRUE
-
-#    undef STM32_SPI_USE_SPI1
-#    define STM32_SPI_USE_SPI1 TRUE
-
-#    undef STM32_SERIAL_USE_USART2
-#    define STM32_SERIAL_USE_USART2 TRUE
-
-#    undef STM32_ST_USE_TIMER
-#    define STM32_ST_USE_TIMER 5
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
deleted file mode 100644
index 029b4a498b..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-RGB_MATRIX_ENABLE = no
-CUSTOM_UNICODE_ENABLE = no
-CUSTOM_POINTING_DEVICE = no
-CUSTOM_SPLIT_TRANSPORT_SYNC = no
-
-
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/blackpill)
-    # Bootloader selection
-    BOOTLOADER := tinyuf2
-
-    LTO_ENABLE := no
-
-    AUDIO_SUPPORTED = yes
-    AUDIO_ENABLE = yes
-    AUDIO_DRIVER = pwm_hardware
-
-    OVERLOAD_FEATURES = yes
-endif
-
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/stemcell)
-    OVERLOAD_FEATURES = yes
-endif
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/splinky)
-    OVERLOAD_FEATURES = yes
-endif
-
-
-ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
-    BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-    KEYBOARD_SHARED_EP = yes
-    MOUSE_SHARED_EP = yes
-
-    MOUSEKEY_ENABLE = yes
-    NKRO_ENABLE = yes
-    CONSOLE_ENABLE = yes
-    RGB_MATRIX_ENABLE = yes
-
-    AUTOCORRECT_ENABLE = yes
-
-    CUSTOM_UNICODE_ENABLE = yes
-    CUSTOM_POINTING_DEVICE = yes
-    CUSTOM_SPLIT_TRANSPORT_SYNC = yes
-endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h
deleted file mode 100644
index 935444af1b..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#pragma once
-
-#define LAYOUT_miryoku( \
-K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09, \
-K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
-K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \
-N30,   N31,   K32,   K33,   K34,          K35,   K36,   K37,   N38,   N39 \
-) \
-LAYOUT_charybdis_3x5( \
-K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09, \
-K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19, \
-K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29, \
-              K32,   K33,   K34,          K35,   K36 \
-)
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/keymap.c
deleted file mode 100644
index dbab7f9820..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/keymap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/rules.mk
deleted file mode 100644
index ef40279cbc..0000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/manna-harbour_miryoku/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2021 Manna Harbour
-# https://github.com/manna-harbour/miryoku
-
-MIRYOKU_KLUDGE_THUMBCOMBOS=yes
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
deleted file mode 100644
index 7fa9826125..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
-#    undef MATRIX_COL_PINS
-#    define MATRIX_COL_PINS \
-        { B0, B1, B12, B3, B4, B5 }
-
-#    define USB_VBUS_PIN B10
-#    define DEBUG_LED_PIN C13
-
-#    define AUDIO_PIN B7
-#    define AUDIO_PWM_DRIVER PWMD4
-#    define AUDIO_PWM_CHANNEL 2
-#    define AUDIO_PWM_PAL_MODE 2
-#    define AUDIO_INIT_DELAY
-#    define AUDIO_ENABLE_TONE_MULTIPLEXING
-#    define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
-
-#    define SERIAL_USART_SPEED (1 * 1024 * 1024)
-
-#    undef POINTING_DEVICE_CS_PIN
-#    define POINTING_DEVICE_CS_PIN A15 // b14
-#    define PMW33XX_LIFTOFF_DISTANCE 0b1111
-
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 33
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 29
-#endif
-
-#undef ROTATIONAL_TRANSFORM_ANGLE
-#define ROTATIONAL_TRANSFORM_ANGLE 25
-#define POINTING_DEVICE_ROTATION_270
-
-/* RGB Matrix. */
-#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
-#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
-#define CHARYBDIS_MINIMUM_SNIPING_DPI 200
-#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
-
-#define CHARYBDIS_CONFIG_SYNC
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-#define BOOTMAGIC_LITE_EEPROM_ROW 1
-#define BOOTMAGIC_LITE_EEPROM_COLUMN 0
-#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1
-#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0
-
-#define DEBOUNCE 15
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
deleted file mode 100644
index 31d1e92a7f..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "drashna.h"
-
-// clang-format off
-#define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__)
-#define LAYOUT_charybdis_4x6_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-  ) \
-  LAYOUT_charybdis_4x6_wrapper( \
-     KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
-     SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
-     LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
-     OS_LSFT,CTL_T(K21),ALT_T(K22),GUI_T(K23),K24,K25,                K26,K27,RGUI_T(K28),RALT_T(K29),RCTL_T(K2A), OS_RSFT, \
-                           SFT_T(KC_GRV), OS_LALT, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
-                                           KC_SPC, BK_LWER,     DL_RAIS \
-    )
-
-#define LAYOUT_base_wrapper(...)       LAYOUT_charybdis_4x6_base(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
-        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-    ),
-
-    [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
-        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
-        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
-        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
-    ),
-    [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
-        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-    ),
-
-    [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
-        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
-        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
-        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
-    ),
-
-    [_GAMEPAD] = LAYOUT_charybdis_4x6(
-        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,       _______, _______, _______, _______, _______, _______,
-        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,       _______, _______, _______, _______, _______, _______,
-        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,       _______, _______, _______, _______, _______, _______,
-        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,       _______, _______, _______, _______, _______, _______,
-                                   KC_V,    _______, _______,    _______, TG_GAME,
-                                           KC_SPC, KC_H,          _______
-    ),
-    [_DIABLO] = LAYOUT_charybdis_4x6(
-        KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
-        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,       _______, _______, _______, _______, _______, _______,
-        KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,       _______, _______, _______, _______, _______, _______,
-        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,       _______, _______, _______, _______, _______, _______,
-                                   KC_G,    _______, _______,    TO(_DIABLOII), TG_DBLO,
-                                           KC_LSFT, KC_LCTL,      _______
-    ),
-    [_DIABLOII] = LAYOUT_charybdis_4x6(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,     _______, _______, _______, _______, _______, _______,
-        KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,       _______, _______, _______, _______, _______, _______,
-        KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      _______, _______, _______, _______, _______, _______,
-        KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,     _______, _______, _______, _______, _______, _______,
-                           KC_DIABLO_CLEAR, _______, _______,    _______, TG(_DIABLOII),
-                               SFT_T(KC_SPACE),  ALT_T(KC_Q),      _______
-    ),
-    [_MOUSE] = LAYOUT_charybdis_4x6(
-        _______, _______, _______, _______, _______, _______,   _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER,
-        _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, DRGSCRL,
-        _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
-        _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
-                                   _______, _______, _______,   _______, _______,
-                                           _______, _______,     _______
-    ),
-
-    [_LOWER] = LAYOUT_charybdis_4x6_wrapper(
-        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
-        _______, _________________LOWER_L1__________________,    _________________LOWER_R1__________________, _______,
-        _______, _________________LOWER_L2__________________,    _________________LOWER_R2__________________, KC_PIPE,
-        _______, _________________LOWER_L3__________________,    _________________LOWER_R3__________________, _______,
-                                   _______, _______, _______,    _______, _______,
-                                           _______, _______,      _______
-    ),
-
-    [_RAISE] = LAYOUT_charybdis_4x6_wrapper(
-        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
-        KC_GRV,  _________________RAISE_L1__________________,    _________________RAISE_R1__________________, _______,
-        _______, _________________RAISE_L2__________________,    _________________RAISE_R2__________________, KC_BSLS,
-        _______, _________________RAISE_L3__________________,    _________________RAISE_R3__________________, _______,
-                                   _______, _______, _______,    _______, _______,
-                                           _______, _______,      _______
-    ),
-
-    [_ADJUST] = LAYOUT_charybdis_4x6_wrapper(
-        QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_COMIC,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT,
-        VRSN,    _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________, EE_CLR,
-        KEYLOCK, _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________, TG_MODS,
-        UC_NEXT, _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________, KC_MPLY,
-                                   QK_RBT, AUTO_CTN, _______,    _______, KC_NUKE,
-                                           _______, _______,      _______
-    )
-};
-// clang-format on
-
-void keyboard_post_init_keymap(void) {
-#ifdef RGB_MATRIX_ENABLE
-    g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] = g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] = g_led_config.flags[29] = g_led_config.flags[30] = g_led_config.flags[31] = g_led_config.flags[32] = LED_FLAG_MODIFIER;
-#endif
-}
-
-#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
-void keyboard_pre_init_keymap(void) {
-    setPinInputHigh(A0);
-}
-#endif
-
-#ifdef SWAP_HANDS_ENABLE
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-    /* Left hand, matrix positions */
-    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
-    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}},
-    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}},
-    {{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}},
-    {{2, 9}, {4, 9}, {5, 9}, {1, 9}, {0, 9}, {3, 9}},
-    /* Right hand, matrix positions */
-    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}},
-    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}},
-    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}},
-    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}},
-    {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}, {2, 4}}
-};
-
-#    ifdef ENCODER_MAP_ENABLE
-const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
-#    endif
-#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
deleted file mode 100644
index 0541043c53..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Nick Brassel (tzarc)
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
-#    undef STM32_PWM_USE_ADVANCED
-#    define STM32_PWM_USE_ADVANCED TRUE
-
-#    undef STM32_PWM_USE_TIM4
-#    define STM32_PWM_USE_TIM4 TRUE
-#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
deleted file mode 100644
index ef6b7cd24b..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-CUSTOM_UNICODE_ENABLE = no
-CUSTOM_POINTING_DEVICE = no
-CUSTOM_SPLIT_TRANSPORT_SYNC = no
-PER_KEY_TAPPING = yes
-
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
-    # MCU name
-    # Bootloader selection
-    BOOTLOADER := tinyuf2
-
-    AUDIO_ENABLE          = yes # Audio output
-    AUDIO_SUPPORTED       = yes # is set to no in kb, needs to be forcibly enabled
-    AUDIO_DRIVER          = pwm_hardware
-
-    BACKLIGHT_DRIVER      = pwm
-
-    OVERLOAD_FEATURES = yes
-endif
-
-ifeq ($(strip $(MCU)), atmega32u4)
-    LTO_ENABLE = yes
-    BOOTLOADER = qmk-hid
-    BOOTLOADER_SIZE = 512
-    EXTRAKEY_ENABLE = no
-else
-    OVERLOAD_FEATURES = yes
-endif
-
-ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
-    BOOTMAGIC_ENABLE      = yes # Enable Bootmagic Lite
-    MOUSEKEY_ENABLE       = yes # Mouse keys
-    EXTRAKEY_ENABLE       = yes # Audio control and System control
-    CONSOLE_ENABLE        = yes # Console for debug
-    COMMAND_ENABLE        = no  # Commands for debug and configuration
-    NKRO_ENABLE           = yes # Enable N-Key Rollover
-    RGBLIGHT_ENABLE       = no  # Enable keyboard RGB underglow
-
-    MOUSE_SHARED_EP       = no
-
-    AUTOCORRECT_ENABLE    = yes
-    CAPS_WORD_ENABLE      = yes
-    SWAP_HANDS_ENABLE     = yes
-    TAP_DANCE_ENABLE      = yes
-    WPM_ENABLE            = yes
-    LTO_ENABLE            = no
-    # OPT                   = 3
-
-    CUSTOM_UNICODE_ENABLE = yes
-    CUSTOM_POINTING_DEVICE = yes
-    CUSTOM_SPLIT_TRANSPORT_SYNC = yes
-
-endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/config.h
deleted file mode 100644
index aa8dc85054..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#pragma once
-
-#define XXX KC_NO
-
-#define LAYOUT_miryoku( \
-     K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, \
-     K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, \
-     K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29, \
-     N30, N31, K32, K33, K34,                K35, K36, K37, N38, N39 \
-) \
-LAYOUT_charybdis_4x6( \
-XXX, XXX, XXX, XXX, XXX, XXX,                XXX, XXX, XXX, XXX, XXX, XXX, \
-XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
-XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
-XXX, K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29, XXX, \
-               K32, K33, K34,                K35, K36, \
-                    XXX, K32,                K37 \
-)
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/keymap.c
deleted file mode 100644
index dbab7f9820..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/keymap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/rules.mk
deleted file mode 100644
index ef40279cbc..0000000000
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/manna-harbour_miryoku/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2021 Manna Harbour
-# https://github.com/manna-harbour/miryoku
-
-MIRYOKU_KLUDGE_THUMBCOMBOS=yes
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
deleted file mode 100644
index 7c46c83310..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define CIRQUE_PINNACLE_TAP_ENABLE
-#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
-#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
-
-#define OLED_DISPLAY_128X128
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
deleted file mode 100644
index 906bd65197..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_SPI TRUE
-#define HAL_USE_I2C TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
deleted file mode 100644
index bf75e97841..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "drashna.h"
-
-// clang-format off
-#define LAYOUT_split_3x5_2_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
-#define LAYOUT_split_3x5_2_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-    ) \
-    LAYOUT_split_3x5_2 ( \
-       K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
-       ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
-       CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
-                              KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
-    )
-
-#define LAYOUT_split_3x5_2_base_wrapper(...)       LAYOUT_split_3x5_2_base(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFAULT_LAYER_1] = LAYOUT_split_3x5_2_base_wrapper(
-        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-    ),
-
-    [_DEFAULT_LAYER_2] = LAYOUT_split_3x5_2_base_wrapper(
-        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
-        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
-        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
-    ),
-    [_DEFAULT_LAYER_3] = LAYOUT_split_3x5_2_base_wrapper(
-        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-    ),
-
-    [_DEFAULT_LAYER_4] = LAYOUT_split_3x5_2_base_wrapper(
-        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
-        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
-        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
-    ),
-
-    [_MOUSE] = LAYOUT_split_3x5_2(
-        _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
-        _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
-        _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
-                                    SNIPING, _______,    _______, _______
-    ),
-    [_LOWER] = LAYOUT_split_3x5_2_wrapper(
-        _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
-        _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
-        _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
-                                   _______, _______,    _______, AUTO_CTN
-    ),
-    [_RAISE] = LAYOUT_split_3x5_2_wrapper(
-        _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
-        _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
-        _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
-                                   _______, _______,    _______, _______
-    ),
-    [_ADJUST] = LAYOUT_split_3x5_2_wrapper(
-        _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
-        _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
-        _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,
-                                   KC_NUKE, _______,    _______, QK_BOOT
-    ),
-};
-
-#if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128)
-#    ifdef UNICODE_COMMON_ENABLE
-#        include "process_unicode_common.h"
-#        include "keyrecords/unicode.h"
-#    endif
-
-extern const char PROGMEM display_border[3];
-
-extern bool is_oled_enabled;
-
-
-bool oled_task_keymap(void) {
-    static const char PROGMEM header_image[] = {
-        0, 192, 32, 16, 8, 4, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 7, 15, 31, 63, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 192, 0,
-        //         0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0
-    };
-    oled_write_raw_P(header_image, sizeof(header_image));
-    oled_set_cursor(7, 0);
-    oled_write_P(PSTR("Dilemma"), true);
-
-    render_default_layer_state(1, 1);
-    render_layer_state(1, 2);
-    render_kitty(0, 5);
-    render_wpm(1, 7, 5);
-#   if defined(POINTING_DEVICE_ENABLE)
-    render_pointing_dpi_status(dilemma_get_pointer_sniping_enabled() ? dilemma_get_pointer_sniping_dpi() : dilemma_get_pointer_default_dpi(), 1, 7, 6);
-    render_mouse_mode(17, 6);
-#    elif defined(WPM_ENABLE) && defined(DEBUG_MATRIX_SCAN_RATE)
-    render_matrix_scan_rate(1, 7, 6);
-#    endif
-    render_bootmagic_status(7, 7);
-    render_user_status(1, 9);
-
-    render_mod_status(get_mods() | get_oneshot_mods(), 1, 10);
-    render_keylock_status(host_keyboard_led_state(), 1, 11);
-    render_unicode_mode(1, 12);
-
-//    render_rgb_hsv(1, 13);
-    oled_set_cursor(1, 13);
-    oled_write_P(PSTR("OS: "), false);
-    extern os_variant_t os_type;
-        switch (os_type) {
-            case OS_LINUX:
-                oled_write_ln_P(PSTR("Linux"), false);
-                break;
-            case OS_WINDOWS:
-                oled_write_ln_P(PSTR("Windows"), false);
-                break;
-            case OS_MACOS:
-                oled_write_ln_P(PSTR("MacOS"), false);
-                break;
-            case OS_IOS:
-                oled_write_ln_P(PSTR("iOS"), false);
-                break;
-            default:
-                break;
-        }
-
-    render_keylogger_status(1, 14);
-
-    for (uint8_t i = 1; i < 15; i++) {
-        oled_set_cursor(0, i);
-        oled_write_raw_P(display_border, sizeof(display_border));
-        oled_set_cursor(21, i);
-        oled_write_raw_P(display_border, sizeof(display_border));
-    }
-
-    static const char PROGMEM footer_image[] = {0, 3, 4, 8, 16, 32, 64, 128, 128, 128, 128, 128, 128, 128, 192, 224, 240, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 240, 224, 192, 128, 128, 128, 128, 128, 128, 128, 64, 32, 16, 8, 4, 3, 0};
-    oled_set_cursor(0, 15);
-    oled_write_raw_P(footer_image, sizeof(footer_image));
-
-    return false;
-}
-#endif
-
-
-#ifdef SWAP_HANDS_ENABLE
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-    /* Left hand, matrix positions */
-    {{0, 4}, {3, 4}, {2, 4}, {5, 4}, {4, 4}},
-    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}},
-    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}},
-    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}},
-    /* Right hand, matrix positions */
-    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
-    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
-    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
-    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}},
-    };
-#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
deleted file mode 100644
index f194dd225c..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_SPI_USE_SPI1
-#define RP_SPI_USE_SPI1 TRUE
-
-#undef RP_I2C_USE_I2C1
-#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
deleted file mode 100644
index a1be9cb8fd..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-SWAP_HANDS_ENABLE     = no
-AUTOCORRECT_ENABLE    = yes
-CAPS_WORD_ENABLE      = yes
-CONSOLE_ENABLE        = yes
-KEYLOGGER_ENABLE      = no
-WPM_ENABLE            = yes
-OLED_ENABLE           = yes
diff --git a/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h b/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h
deleted file mode 100644
index 5a3153ae37..0000000000
--- a/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#pragma once
-
-#define XXX KC_NO
-
-#define LAYOUT_miryoku( \
-     K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, \
-     K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, \
-     K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29, \
-     N30, N31, K32, K33, K34,                K35, K36, K37, N38, N39 \
-) \
-LAYOUT_split_4x6_5( \
-XXX, XXX, XXX, XXX, XXX, XXX,                XXX, XXX, XXX, XXX, XXX, XXX, \
-XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX, \
-XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX, \
-XXX, K20, K21, K22, K23, K24,                K25, K26, K27, K28, K29, XXX, \
-               K32, K33, K34,                K35, K36, K37, \
-                    XXX, XXX,                XXX, XXX \
-)
diff --git a/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c
deleted file mode 100644
index dbab7f9820..0000000000
--- a/keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.