diff --git a/keyboards/epomaker/th96/chconf.h b/keyboards/epomaker/th96/chconf.h
deleted file mode 100644
index 93d3c1783d4..00000000000
--- a/keyboards/epomaker/th96/chconf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#define CH_CFG_ST_FREQUENCY 10000
-
-#define CH_CFG_ST_FREQUENCY 10000
-
-#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
-
-#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
-
-#define CH_CFG_FACTORY_SEMAPHORES TRUE
-
-#define CH_CFG_FACTORY_MAILBOXES TRUE
-
-#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
-
-#define CH_CFG_FACTORY_PIPES TRUE
-
-#include_next <chconf.h>
diff --git a/keyboards/epomaker/th96/config.h b/keyboards/epomaker/th96/config.h
deleted file mode 100644
index 20a5128979b..00000000000
--- a/keyboards/epomaker/th96/config.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3151
-#define PRODUCT_ID      0x4010
-#define DEVICE_VER      0x0001
-#define PRODUCT         EPOMAKER TH96 QMK
-#define MANUFACTURER    TH96 
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
-#define MATRIX_ROW_PINS { C7, C8, C9, A8, A10, A6 }
-#define MATRIX_COL_PINS { C6, B15, B14, B1, B10, B13, A15, B4, C3, B6, B7, C13, B5, B3, D2, C12, C10, C11 }
-
-
-#ifdef DIP_SWITCH_ENABLE
-#define DIP_SWITCH_PINS { C4, A7 }
-#endif
-
-#ifdef ENCODER_ENABLE
-#    define ENCODERS_PAD_A { C5 }
-#    define ENCODERS_PAD_B { B0 }
-#    define ENCODER_RESOLUTION 4
-#endif
-
-#define LED_CAPS_LOCK_PIN C2
-#define LED_NUM_LOCK_PIN C1
-
-#define DEBOUNCE    5
-
-#define STM32_HSECLK 8000000
-
-#define TAP_CODE_DELAY 50
-
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100
-
-#define I2C_DRIVER I2CD1
-#define I2C1_SCL_PIN        B8
-#define I2C1_SDA_PIN        B9
-#define I2C1_SCL_PAL_MODE   4
-#define I2C1_SDA_PAL_MODE   4
-#define I2C1_OPMODE	OPMODE_I2C
-#define I2C1_CLOCK_SPEED	400000
-#define I2C1_DUTY_CYCLE	FAST_DUTY_CYCLE_2
-
-#define DRIVER_COUNT 2
-#define DRIVER_ADDR_1 0b1010000
-#define DRIVER_ADDR_2 0b1010011
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 36
-#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_RAINDROPS
-// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGBLIGHT_LIMIT_VAL 150
-// #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-// #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #    define RGB_MATRIX_KEYPRESSES
-// #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-// #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// // RGB Matrix Animation modes. Explicitly enabled
-// // For full list of effects, see:
-// // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-// #    define ENABLE_RGB_MATRIX_BREATHING
-// #    define ENABLE_RGB_MATRIX_BAND_SAT
-// #    define ENABLE_RGB_MATRIX_BAND_VAL
-// #    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-// #    define ENABLE_RGB_MATRIX_CYCLE_ALL
-// #    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-// #    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-// #    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-// #    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-// #    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-// #    define ENABLE_RGB_MATRIX_DUAL_BEACON
-// #    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #    define ENABLE_RGB_MATRIX_RAINDROPS
-// #    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #    define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #    define ENABLE_RGB_MATRIX_HUE_WAVE
-// #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-// #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// // #    define ENABLE_RGB_MATRIX_SPLASH
-// // #    define ENABLE_RGB_MATRIX_MULTISPLASH
-// #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-// #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-
-#ifdef VIA_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/epomaker/th96/halconf.h b/keyboards/epomaker/th96/halconf.h
deleted file mode 100644
index c4a7101379f..00000000000
--- a/keyboards/epomaker/th96/halconf.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define HAL_USE_I2C TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/epomaker/th96/keymaps/default/keymap.c b/keyboards/epomaker/th96/keymaps/default/keymap.c
deleted file mode 100644
index 8c8b8bee180..00000000000
--- a/keyboards/epomaker/th96/keymaps/default/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_NLCK, KC_END, KC_MUTE, KC_VOLU, 
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PSLS, KC_PAST, KC_VOLD, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, 
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_ENT
-    ),
-
-    [1] = LAYOUT_all(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MRWD, KC_MFFD, KC_DEL, KC_NLCK, KC_END, KC_MUTE, KC_VOLU, 
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PSLS, KC_PAST, KC_VOLD, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, 
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_ENT
-    ),
-
-    [2] = LAYOUT_all(
-		RGB_TOG,KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_Z), KC_MAIL, LGUI(KC_D), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_MSTP, KC_BRIU, 
-		KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, KC_NO, KC_NO, KC_BRID, 
-		KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, 
-		KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, KC_NO,   KC_NO, KC_NO, 
-		KC_NO,  0x5d61, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_VAD, RGB_SPD, KC_NO, KC_NO, KC_NO
-    ),
-
-    [3] = LAYOUT_all(
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-    )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-	palSetPadMode(GPIOC,  0, PAL_MODE_OUTPUT_PUSHPULL);
-    switch (get_highest_layer(state)) {
-        case 0:
-            palClearPad(GPIOC, 0);
-            break;
-        case 1:
-            palSetPad(GPIOC, 0);
-            break;
-		case 2:
-            palClearPad(GPIOC, 0);
-            break;
-        case 3:
-			palClearPad(GPIOC, 0);//亮
-            break;
-        default:
-            break;
-    }
-  return state;
-}
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if(clockwise){
-    uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state),0,17);
-    tap_code(keycode);
-  }
-  else{
-    uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state),1,17);
-    tap_code(keycode);
-  }
-  return true;
-}
-#endif
-
-bool dip_switch_update_user(uint8_t index, bool active) { 
-    switch (index) {
-        case 0:
-            if(active) { layer_on(0); } else { layer_off(0); }
-            break;
-        case 1:
-            if(active) { layer_on(1); } else { layer_off(1); }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/epomaker/th96/mcuconf.h b/keyboards/epomaker/th96/mcuconf.h
deleted file mode 100644
index 48bb4c74a50..00000000000
--- a/keyboards/epomaker/th96/mcuconf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1
-
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/epomaker/th96/rules.mk b/keyboards/epomaker/th96/rules.mk
deleted file mode 100644
index 650118a711f..00000000000
--- a/keyboards/epomaker/th96/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# MCU name
-MCU = STM32F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-STM32_BOOTLOADER_ADDRESS = 0x1FFF0000
-
-BOOTMAGIC_ENABLE = yes      	# Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       		# Mouse keys
-EXTRAKEY_ENABLE = yes      		# Audio control and System control
-CONSOLE_ENABLE = no        		# Console for debug
-COMMAND_ENABLE = no        		# Commands for debug and configuration
-NKRO_ENABLE = no           		# Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      		# Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        	# Enable keyboard RGB underglow
-AUDIO_ENABLE = no           	# Audio output
-
-RGB_MATRIX_ENABLE = yes			
-RGB_MATRIX_DRIVER = IS31FL3733	
-DIP_SWITCH_ENABLE = yes			
-ENCODER_ENABLE = yes			
-
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 
diff --git a/keyboards/epomaker/th96/th96.c b/keyboards/epomaker/th96/th96.c
deleted file mode 100644
index cf42015998a..00000000000
--- a/keyboards/epomaker/th96/th96.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "th96.h"
-
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
-/* Refer to IS31 manual for these locations
- *   driver
- *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
-    {0, A_1,    B_1,    C_1},
-    {0, A_2,    B_2,    C_2},
-    {0, A_3,    B_3,    C_3},
-    {0, A_4,    B_4,    C_4},
-    {0, A_5,    B_5,    C_5},
-    {0, A_6,    B_6,    C_6},
-    {0, A_7,    B_7,    C_7},
-    {0, A_8,    B_8,    C_8},
-    {0, A_9,    B_9,    C_9},
-    {0, A_10,   B_10,   C_10},
-    {0, A_11,   B_11,   C_11},
-    {0, A_12,   B_12,   C_12},
-    {0, A_13,   B_13,   C_13},
-    {0, A_14,   B_14,   C_14},
-    {0, A_15,   B_15,   C_15},
-    {0, A_16,   B_16,   C_16},
-
-    {0, D_1,    E_1,    F_1},
-    {0, D_2,    E_2,    F_2},
-    {0, D_3,    E_3,    F_3},
-    {0, D_4,    E_4,    F_4},
-    {0, D_5,    E_5,    F_5},
-    {0, D_6,    E_6,    F_6},
-    {0, D_7,    E_7,    F_7},
-    {0, D_8,    E_8,    F_8},
-    {0, D_9,    E_9,    F_9},
-    {0, D_10,   E_10,   F_10},
-    {0, D_11,   E_11,   F_11},
-    {0, D_12,   E_12,   F_12},
-    {0, D_13,   E_13,   F_13},
-    {0, D_14,   E_14,   F_14},
-    {0, D_15,   E_15,   F_15},
-    {0, D_16,   E_16,   F_16},
-
-    {0, G_1,    H_1,    I_1},
-    {0, G_2,    H_2,    I_2},
-    {0, G_3,    H_3,    I_3},
-    {0, G_4,    H_4,    I_4},
-    {0, G_5,    H_5,    I_5},
-    {0, G_6,    H_6,    I_6},
-    {0, G_7,    H_7,    I_7},
-    {0, G_8,    H_8,    I_8},
-    {0, G_9,    H_9,    I_9},
-    {0, G_10,   H_10,   I_10},
-    {0, G_11,   H_11,   I_11},
-    {0, G_12,   H_12,   I_12},
-    {0, G_13,   H_13,   I_13},
-    {0, G_14,   H_14,   I_14},
-    {1, A_13,    B_13,    C_13},
-    {1, A_14,    B_14,    C_14},
-    {1, A_15,    B_15,    C_15},
-    {1, A_16,    B_16,    C_16},
-
-    {0, J_1,    K_1,    L_1},
-    {0, J_2,    K_2,    L_2},
-    {0, J_3,    K_3,    L_3},
-    {0, J_4,    K_4,    L_4},
-    {0, J_5,    K_5,    L_5},
-    {0, J_6,    K_6,    L_6},
-    {0, J_7,    K_7,    L_7},
-    {0, J_8,    K_8,    L_8},
-    {0, J_9,    K_9,    L_9},
-    {0, J_10,   K_10,   L_10},
-    {0, J_11,   K_11,   L_11},
-    {0, J_12,   K_12,   L_12},
-    {0, J_13,   K_13,   L_13},    
-    {1, D_13,   E_13,   F_13},
-    {1, D_14,   E_14,   F_14},
-    {1, D_15,   E_15,   F_15},
-    {1, D_16,   E_16,   F_16},
-
-    {1, G_1,    H_1,    I_1},
-    {1, G_2,    H_2,    I_2},
-    {1, G_3,    H_3,    I_3},
-    {1, G_4,    H_4,    I_4},
-    {1, G_5,    H_5,    I_5},
-    {1, G_6,    H_6,    I_6},
-    {1, G_7,    H_7,    I_7},
-    {1, G_8,    H_8,    I_8},
-    {1, G_9,    H_9,    I_9},
-    {1, G_10,   H_10,   I_10},
-    {1, G_11,   H_11,   I_11},
-    {1, G_12,   H_12,   I_12},
-    {1, G_13,   H_13,   I_13},
-    {1, G_14,   H_14,   I_14},
-    {1, G_15,   H_15,   I_15},
-    {1, G_16,   H_16,   I_16},
-
-    {1, J_1,    K_1,    L_1},
-    {1, J_2,    K_2,    L_2},
-    {1, J_3,    K_3,    L_3},
-    {1, J_6,    K_6,    L_6},
-    {1, J_9,    K_9,    L_9},
-    {1, J_10,   K_10,   L_10},
-    {1, J_11,   K_11,   L_11},
-    {1, J_12,   K_12,   L_12},
-    {1, J_13,   K_13,   L_13},
-    {1, J_14,   K_14,   L_14}, 
-    {1, J_15,   K_15,   L_15},
-    {1, J_16,   K_16,   L_16},
-
-};
-
-led_config_t g_led_config = {
-	{
-    //     1    2    3    4       5       6    7       8       9       10      11      12      13      14      15      16      17      18
-		{  0,   1,   2,   3,      4,      5,   6,      7,      8,      9,      10,     11,     12,     13,     14,     15                    },
-		{  16,  17,  18,  19,     20,     21,  22,     23,     24,     25,     26,     27,     28,     29,     30,     31                    },
-		{  32,  33,  34,  35,     36,     37,  38,     39,     40,     41,     42,     43,     44,     45,     46,     47,     48,     49    },
-		{  50,  51,  52,  53,     54,     55,  56,     57,     58,     59,     60,     61,     62,     63,     64,     65,     66            },
-		{  67,  68,  69,  70,     71,     72,  73,     74,     75,     76,     77,     78,     79,     80,     81,     82                    },
-		{  83,  84,  88,  NO_LED, NO_LED, 86,  NO_LED, NO_LED, 87,     88,     89,     90,     91,     92,     93,     94                    }
-	},
-	{
-    //    1        2        3        4        5        6        7        8        9        10        11        12        13        14        15        16        17        18
-		{0,0},  {11,0},  {22, 0}, {33, 0}, {44, 0}, {55,0},  {66, 0}, {77, 0}, {88, 0}, {99, 0}, {110, 0}, {121, 0}, {132, 0}, {143, 0}, {154, 0}, {165, 0}, 
-	    {0,13}, {11,13}, {22,13}, {33,13}, {44,13}, {55,13}, {66,13}, {77,13}, {88,13}, {99,13}, {110,13}, {121,13}, {132,13}, {143,13}, {154,13}, {165,13},          
-	    {0,26}, {11,26}, {22,26}, {33,26}, {44,26}, {55,26}, {66,26}, {77,26}, {88,26}, {99,26}, {110,26}, {121,26}, {132,26}, {143,26}, {154,26}, {165,26}, {176,26}, {187,26},          
-	    {0,39}, {11,39}, {22,39}, {33,39}, {44,39}, {55,39}, {66,39}, {77,39}, {88,39}, {99,39}, {110,39}, {121,39}, {132,39}, {143,39}, {154,39}, {165,39}, {176,39},          
-	    {0,52}, {11,52}, {22,52}, {33,52}, {44,52}, {55,52}, {66,52}, {77,52}, {88,52}, {99,52}, {110,52}, {121,52}, {132,52}, {143,52}, {154,52}, {165,52},
-	    {0,64}, {11,64}, {22,64},                   {55,64},                   {88,64}, {99,64}, {110,64}, {121,64}, {132,64}, {143,64}, {154,64}, {165,64}, 
-	},
-	{
-    //  1     2     3     4     5     6     7     8     9     10    11    12    13    14    15    16    17    18
-		4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,
-		4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,    
-		4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,    4,    4,
-		4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,    4,
-		4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,	  4,	4,    4,
-		4,	  4,	4,				  4,				4,	  4,	4,	  4,	4,	  4,	4,    4,
-
-	}
-};
diff --git a/keyboards/epomaker/th96/th96.h b/keyboards/epomaker/th96/th96.h
deleted file mode 100644
index c09bfa63629..00000000000
--- a/keyboards/epomaker/th96/th96.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, K015, K016, K017, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, K114, K115,       K117, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, K214, K215, K216, K217, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312,       K314, K315, K316, K317, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410,       K412, K413, K414, K415, K416,       \
-	K50, K51, K52,           K55,                K59, K510,       K512, K513, K514, K515, K516, K517  \
-) { \
-	{ K00,  K01,  K02,  K03,   K04,   K05,  K06,   K07,   K08,   K09,  K010,  K011,   K012,  K013,   K014,  K015,  K016,  K017 }, \
-	{ K10,  K11,  K12,  K13,   K14,   K15,  K16,   K17,   K18,   K19,  K110,  K111,   K112,  K113,   K114,  K115,  KC_NO, K117 }, \
-	{ K20,  K21,  K22,  K23,   K24,   K25,  K26,   K27,   K28,   K29,  K210,  K211,   K212,  K213,   K214,  K215,  K216,  K217 }, \
-	{ K30,  K31,  K32,  K33,   K34,   K35,  K36,   K37,   K38,   K39,  K310,  K311,   K312,  KC_NO,  K314,  K315,  K316,  K317 }, \
-	{ K40,  K41,  K42,  K43,   K44,   K45,  K46,   K47,   K48,   K49,  K410,  KC_NO,  K412,  K413,   K414,  K415,  K416,  KC_NO }, \
-	{ K50,  K51,  K52,  KC_NO, KC_NO, K55,  KC_NO, KC_NO, KC_NO, K59,  K510,  KC_NO,  K512,  K513,   K514,  K515,  K516,  K517 }  \
-}