diff --git a/keyboards/custommk/evo70/keymaps/passing-comet/config.h b/keyboards/custommk/evo70/keymaps/passing-comet/config.h
deleted file mode 100644
index fab19ba301..0000000000
--- a/keyboards/custommk/evo70/keymaps/passing-comet/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define VIAL_KEYBOARD_UID {0x6E, 0x30, 0x6F, 0x9F, 0xE0, 0xBF, 0xAC, 0x6D}
-#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
-#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
-
-#define VIAL_TAP_DANCE_ENTRIES 16
-// #define VIAL_KEY_OVERRIDE_ENTRIES 8
-
-// #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-#define DEBOUNCE 7
-#define TAPPING_TERM 165
-
-#define NO_ACTION_ONESHOT
-
-// #define NO_DEBUG
-// #define NO_PRINT
-
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_RAINBOW_SWIRL + 4
diff --git a/keyboards/custommk/evo70/keymaps/passing-comet/keymap.c b/keyboards/custommk/evo70/keymaps/passing-comet/keymap.c
deleted file mode 100644
index db985aceab..0000000000
--- a/keyboards/custommk/evo70/keymaps/passing-comet/keymap.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2021 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_default(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- KC_F1, KC_F4, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
- KC_F2, KC_F5, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
- KC_F3, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE,KC_TRNS, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [1] = LAYOUT_default(
- KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
- KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_TOG, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_HOME,
- KC_F7, KC_F10, KC_CAPS, KC_TRNS, RGB_SPI, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_MPLY, KC_END,
- KC_F8, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F9, KC_F12, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_TRNS, RGB_VAD, KC_MNXT, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [2] = LAYOUT_default(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [3] = LAYOUT_default(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
-};
-
-static bool custom_encoder_mode = false;
-
-void set_custom_encoder_mode_user(bool custom_mode) {
- custom_encoder_mode = custom_mode;
-}
-
-
-keyevent_t encoder_ccw = {
- .key = (keypos_t){.row = 4, .col = 7},
- .pressed = false
-};
-
-keyevent_t encoder_cw = {
- .key = (keypos_t){.row = 4, .col = 10},
- .pressed = false
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (custom_encoder_mode) {
- if (clockwise) {
- encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
- action_exec(encoder_cw);
- } else {
- encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
- action_exec(encoder_ccw);
- }
- }
-
- return true;
-}
-
-void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_ccw)) {
- encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
- action_exec(encoder_ccw);
- }
-
- if (IS_PRESSED(encoder_cw)) {
- encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
- action_exec(encoder_cw);
- }
-}
-
-
-// // Shift + esc = ~
-// const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRV));
-
-// // Win + esc =
-// const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRV);
-
-// // Shift + bspc = del
-// const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL);
-
-// This globally defines all key overrides to be used
-// const key_override_t **key_overrides = (const key_override_t *[]){
-// &tilde_esc_override,
-// &grave_esc_override,
-// &delete_key_override,
-// NULL // Null terminate the array of overrides!
-// };
diff --git a/keyboards/custommk/evo70/keymaps/passing-comet/readme.md b/keyboards/custommk/evo70/keymaps/passing-comet/readme.md
deleted file mode 100644
index 2b44f55593..0000000000
--- a/keyboards/custommk/evo70/keymaps/passing-comet/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# EVO70 Layout for Vial
-
-This is the Vial layout for the EVO70.
\ No newline at end of file
diff --git a/keyboards/custommk/evo70/keymaps/passing-comet/rules.mk b/keyboards/custommk/evo70/keymaps/passing-comet/rules.mk
deleted file mode 100644
index 53924c2697..0000000000
--- a/keyboards/custommk/evo70/keymaps/passing-comet/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-
-QMK_SETTINGS = no # 2486
-
-# BACKLIGHT_ENABLE = no
-SPACE_CADET_ENABLE = no # ~324
-AUTO_SHIFT_ENABLE = no # 2528
-
-COMBO_ENABLE = no # ~2408
-TAP_DANCE_ENABLE = yes # 1812
-KEY_OVERRIDE_ENABLE = no # 1846
diff --git a/keyboards/custommk/evo70/keymaps/passing-comet/vial.json b/keyboards/custommk/evo70/keymaps/passing-comet/vial.json
deleted file mode 100644
index 60d1d261d5..0000000000
--- a/keyboards/custommk/evo70/keymaps/passing-comet/vial.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "customMK EVO70",
- "vendorId": "0xF35B",
- "productId": "0xFAB5",
- "lighting": "qmk_rgblight",
- "matrix": { "rows": 6, "cols": 14 },
- "layouts": {
- "keymap": [
- [{"c":"#aaaaaa"},"4,7","4,10"],
- [{"x":0.5,"y":0.1},"5,6",{"x":1,"c":"#777777"},"0,0",{"c": "#cccccc"},"5,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11",{"w":2,"c":"#aaaaaa"},"0,12","0,13"],
- [{"x":2.5},{"w":1.5},"5,1",{"c": "#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11",{"w":1.5,"c":"#aaaaaa"},"1,12","1,13"],
- ["5,5","2,0",{"x":0.5}, {"w":1.75},"5,2",{"c": "#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"w":2.25,"c":"#777777"},"2,12",{"c":"#aaaaaa"},"2,13"],
- ["4,6","4,4",{"x":0.5}, {"w":2.25},"3,0",{"c": "#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10",{"w":1.75,"c": "#aaaaaa"},"3,11","3,12","3,13"],
- ["4,1","4,3",{"x":0.5}, {"w":1.25},"5,4",{"w":1.25},"4,0",{"w":1.25},"4,2",{"w":6.25,"c": "#cccccc"},"4,5",{"w":1.25,"c": "#aaaaaa"},"4,8",{"w":1.25},"4,9",{"x":0.5},"4,11","4,12","4,13"]
- ]
- }
-}
diff --git a/keyboards/custommk/evo70/keymaps/vial/config.h b/keyboards/custommk/evo70/keymaps/vial/config.h
deleted file mode 100644
index cbf1542e92..0000000000
--- a/keyboards/custommk/evo70/keymaps/vial/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define VIAL_KEYBOARD_UID {0x6E, 0x30, 0x6F, 0x9F, 0xE0, 0xBF, 0xAC, 0x6D}
-#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
-#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
-
-#define DEBOUNCE 5
-
-#define NO_ACTION_ONESHOT
-
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_STATIC_GRADIENT + 0
diff --git a/keyboards/custommk/evo70/keymaps/vial/keymap.c b/keyboards/custommk/evo70/keymaps/vial/keymap.c
deleted file mode 100644
index e503cd5ccc..0000000000
--- a/keyboards/custommk/evo70/keymaps/vial/keymap.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2021 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_default(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
- KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [1] = LAYOUT_default(
- KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
- KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [2] = LAYOUT_default(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [3] = LAYOUT_default(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
-};
-
-static bool custom_encoder_mode = false;
-
-void set_custom_encoder_mode_user(bool custom_mode) {
- custom_encoder_mode = custom_mode;
-}
-
-
-keyevent_t encoder_ccw = {
- .key = (keypos_t){.row = 4, .col = 7},
- .pressed = false
-};
-
-keyevent_t encoder_cw = {
- .key = (keypos_t){.row = 4, .col = 10},
- .pressed = false
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (custom_encoder_mode) {
- if (clockwise) {
- encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
- action_exec(encoder_cw);
- } else {
- encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
- action_exec(encoder_ccw);
- }
- }
-
- return true;
-}
-
-void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_ccw)) {
- encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
- action_exec(encoder_ccw);
- }
-
- if (IS_PRESSED(encoder_cw)) {
- encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
- action_exec(encoder_cw);
- }
-}
diff --git a/keyboards/custommk/evo70/keymaps/vial/readme.md b/keyboards/custommk/evo70/keymaps/vial/readme.md
deleted file mode 100644
index 2b44f55593..0000000000
--- a/keyboards/custommk/evo70/keymaps/vial/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# EVO70 Layout for Vial
-
-This is the Vial layout for the EVO70.
\ No newline at end of file
diff --git a/keyboards/custommk/evo70/keymaps/vial/rules.mk b/keyboards/custommk/evo70/keymaps/vial/rules.mk
deleted file mode 100644
index b874fc2737..0000000000
--- a/keyboards/custommk/evo70/keymaps/vial/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-
-QMK_SETTINGS = no
-
-COMBO_ENABLE = no
-TAP_DANCE_ENABLE = no
-KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/custommk/evo70/keymaps/vial/vial.json b/keyboards/custommk/evo70/keymaps/vial/vial.json
deleted file mode 100644
index 60d1d261d5..0000000000
--- a/keyboards/custommk/evo70/keymaps/vial/vial.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "customMK EVO70",
- "vendorId": "0xF35B",
- "productId": "0xFAB5",
- "lighting": "qmk_rgblight",
- "matrix": { "rows": 6, "cols": 14 },
- "layouts": {
- "keymap": [
- [{"c":"#aaaaaa"},"4,7","4,10"],
- [{"x":0.5,"y":0.1},"5,6",{"x":1,"c":"#777777"},"0,0",{"c": "#cccccc"},"5,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11",{"w":2,"c":"#aaaaaa"},"0,12","0,13"],
- [{"x":2.5},{"w":1.5},"5,1",{"c": "#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11",{"w":1.5,"c":"#aaaaaa"},"1,12","1,13"],
- ["5,5","2,0",{"x":0.5}, {"w":1.75},"5,2",{"c": "#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"w":2.25,"c":"#777777"},"2,12",{"c":"#aaaaaa"},"2,13"],
- ["4,6","4,4",{"x":0.5}, {"w":2.25},"3,0",{"c": "#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10",{"w":1.75,"c": "#aaaaaa"},"3,11","3,12","3,13"],
- ["4,1","4,3",{"x":0.5}, {"w":1.25},"5,4",{"w":1.25},"4,0",{"w":1.25},"4,2",{"w":6.25,"c": "#cccccc"},"4,5",{"w":1.25,"c": "#aaaaaa"},"4,8",{"w":1.25},"4,9",{"x":0.5},"4,11","4,12","4,13"]
- ]
- }
-}
diff --git a/keyboards/mechwild/mercutio/keymaps/vial/config.h b/keyboards/mechwild/mercutio/keymaps/vial/config.h
index a4b2e6621f..77a1159dcc 100644
--- a/keyboards/mechwild/mercutio/keymaps/vial/config.h
+++ b/keyboards/mechwild/mercutio/keymaps/vial/config.h
@@ -14,9 +14,6 @@ along with this program. If not, see .
#pragma once
-/* Define custom font */
-#define OLED_FONT_H "keyboards/mechwild/mercutio/lib/mercutiofont.c"
-
/* VIAL Specific definitions */
#define VIAL_KEYBOARD_UID {0xAA, 0xF4, 0xE4, 0x5D, 0xDA, 0x2E, 0x52, 0x2F}
#define VIAL_UNLOCK_COMBO_ROWS { 1, 5 }
diff --git a/keyboards/novelkeys/nk87/keymaps/passing-comet/config.h b/keyboards/novelkeys/nk87/keymaps/passing-comet/config.h
deleted file mode 100644
index 5c6fc356ac..0000000000
--- a/keyboards/novelkeys/nk87/keymaps/passing-comet/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define VIAL_KEYBOARD_UID {0x9C, 0x04, 0x30, 0x89, 0xCC, 0x5A, 0xBD, 0x5A}
-#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
-#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
-#define VIAL_TAP_DANCE_ENTRIES 16
-
-#define DEBOUNCE 4
-#define TAPPING_TERM 175
diff --git a/keyboards/novelkeys/nk87/keymaps/passing-comet/keymap.c b/keyboards/novelkeys/nk87/keymaps/passing-comet/keymap.c
deleted file mode 100644
index 580fc9d174..0000000000
--- a/keyboards/novelkeys/nk87/keymaps/passing-comet/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2022 Gary Mei
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-
-#include QMK_KEYBOARD_H
-
-#define ALT_F4 LALT(KC_F4)
-#define CTL_W LCTL(KC_W)
-#define CA_DEL LCA(KC_DEL)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all( /* Base */
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), KC_VOLD, KC_MUTE, KC_VOLU,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [1] = LAYOUT_all( /* FN */
- KC_PWR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
- KC_TRNS, ALT_F4, CTL_W, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, CA_DEL, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_VOLU,
- KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
- ),
-
- [2] = LAYOUT_all( /* FN */
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [3] = LAYOUT_all( /* FN */
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- )
-};
diff --git a/keyboards/novelkeys/nk87/keymaps/passing-comet/readme.md b/keyboards/novelkeys/nk87/keymaps/passing-comet/readme.md
deleted file mode 100644
index 9d242e02a5..0000000000
--- a/keyboards/novelkeys/nk87/keymaps/passing-comet/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Custom Vial keymap for NK87
-
-
-
-Default layer is normal ANSI TKL
diff --git a/keyboards/novelkeys/nk87/keymaps/passing-comet/rules.mk b/keyboards/novelkeys/nk87/keymaps/passing-comet/rules.mk
deleted file mode 100644
index dd7a4699fe..0000000000
--- a/keyboards/novelkeys/nk87/keymaps/passing-comet/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-
-TAP_DANCE_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
-QMK_SETTINGS = yes
diff --git a/keyboards/novelkeys/nk87/keymaps/passing-comet/vial.json b/keyboards/novelkeys/nk87/keymaps/passing-comet/vial.json
deleted file mode 100644
index 12b26e5797..0000000000
--- a/keyboards/novelkeys/nk87/keymaps/passing-comet/vial.json
+++ /dev/null
@@ -1,214 +0,0 @@
-{
- "keyboard_name": "NK87",
- "layouts": {
- "keymap": [
- [
- {
- "c": "#777777"
- },
- "0,0",
- {
- "c": "#cccccc",
- "x": 0.25
- },
- "0,1",
- "0,2",
- "0,3",
- "0,4",
- {
- "c": "#aaaaaa",
- "x": 0.25
- },
- "0,5",
- "0,6",
- "0,7",
- "0,8",
- {
- "c": "#cccccc",
- "x": 0.25
- },
- "0,9",
- "0,10",
- "0,11",
- "0,12",
- {
- "c": "#aaaaaa",
- "x": 0.25
- },
- "0,13",
- {
- "c": "#999999",
- "x": 0.25
- },
- "0,14",
- "0,15",
- "0,16"
- ],
- [
- {
- "c": "#aaaaaa",
- "y": 0.25
- },
- "1,0",
- {
- "c": "#cccccc"
- },
- "1,1",
- "1,2",
- "1,3",
- "1,4",
- "1,5",
- "1,6",
- "1,7",
- "1,8",
- "1,9",
- "1,10",
- "1,11",
- "1,12",
- {
- "c": "#aaaaaa",
- "w": 2
- },
- "1,13",
- {
- "c": "#999999",
- "x": 0.25
- },
- "1,14",
- "1,15",
- "1,16"
- ],
- [
- {
- "c": "#aaaaaa",
- "w": 1.5
- },
- "2,0",
- {
- "c": "#cccccc"
- },
- "2,1",
- "2,2",
- "2,3",
- "2,4",
- "2,5",
- "2,6",
- "2,7",
- "2,8",
- "2,9",
- "2,10",
- "2,11",
- "2,12",
- {
- "c": "#aaaaaa",
- "w": 1.5
- },
- "3,12",
- {
- "c": "#999999",
- "x": 0.25
- },
- "2,14",
- "2,15",
- "2,16"
- ],
- [
- {
- "c": "#aaaaaa",
- "w": 1.75
- },
- "3,0",
- {
- "c": "#cccccc"
- },
- "3,1",
- "3,2",
- "3,3",
- "3,4",
- "3,5",
- "3,6",
- "3,7",
- "3,8",
- "3,9",
- "3,10",
- "3,11",
- {
- "c": "#777777",
- "w": 2.25
- },
- "3,13"
- ],
- [
- {
- "c": "#aaaaaa",
- "w": 2.25
- },
- "4,0",
- {
- "c": "#cccccc"
- },
- "4,2",
- "4,3",
- "4,4",
- "4,5",
- "4,6",
- "4,7",
- "4,8",
- "4,9",
- "4,10",
- "4,11",
- {
- "c": "#aaaaaa",
- "w": 2.75
- },
- "4,12",
- {
- "c": "#999999",
- "x": 1.25
- },
- "4,15"
- ],
- [
- {
- "c": "#aaaaaa",
- "w": 1.5
- },
- "5,0",
- "5,1",
- {
- "w": 1.5
- },
- "5,2",
- {
- "c": "#cccccc",
- "w": 7
- },
- "5,6",
- {
- "c": "#aaaaaa",
- "w": 1.5
- },
- "5,11",
- "5,12",
- {
- "w": 1.5
- },
- "5,13",
- {
- "c": "#999999",
- "x": 0.25
- },
- "5,14",
- "5,15",
- "5,16"
- ]
- ]
- },
- "lighting": "qmk_backlight",
- "maintainer": "Yiancar",
- "matrix": {
- "cols": 17,
- "rows": 6
- },
- "url": "www.yiancar-designs.com"
-}
\ No newline at end of file
diff --git a/keyboards/vertex/angler2/keymaps/vial/keymap.c b/keyboards/vertex/angler2/keymaps/vial/keymap.c
index 974b170a00..5300970900 100644
--- a/keyboards/vertex/angler2/keymaps/vial/keymap.c
+++ b/keyboards/vertex/angler2/keymaps/vial/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7 , KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SLCK,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_PGDN, KC_RGHT,KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN
),
- [1] = LAYOUT(
+ [1] = LAYOUT_all(
QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______
),
- [2] = LAYOUT(
+ [2] = LAYOUT_all(
QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______
),
- [3] = LAYOUT(
+ [3] = LAYOUT_all(
QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
diff --git a/keyboards/vertex/angler2/keymaps/vial/rules.mk b/keyboards/vertex/angler2/keymaps/vial/rules.mk
index 1ece03d3ec..719b982130 100644
--- a/keyboards/vertex/angler2/keymaps/vial/rules.mk
+++ b/keyboards/vertex/angler2/keymaps/vial/rules.mk
@@ -4,3 +4,4 @@ LTO_ENABLE = yes
TAP_DANCE_ENABLE = no
QMK_SETTINGS = no
COMBO_ENABLE = no
+RGBLIGHT_ENABLE = no