Merge upstream master to 2022 Q4 breaking change

13 files changed, 0 insertions, 1306 deletions

diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
deleted file mode 100644
index 87e64544e0..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        QK_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_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,
-        CTL_T(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,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, LM(1, MOD_LALT),                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        TO(3),   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_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
-        _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [2] = LAYOUT(
-        _______, 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,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
-    ),
-    [3] = LAYOUT(
-        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
-        _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
-        _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
-        _______,          KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
-        _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
-    )
-};
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
deleted file mode 100644
index 2147ca8bf8..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Keymap for the DZ60RGB keyboard.
-    Copyright (C) 2020  Dimiter Geelen
-
-    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/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum didel_layers {
-    _QWERTY,
-    _MEDIA,
-    _RGB,
-    _DVORAK,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-        QK_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_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,
-        CTL_T(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,
-        LSFT_T(KC_GRAVE), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
-        KC_LCTL, LM(1, MOD_LALT), KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_MEDIA] = LAYOUT(
-        TO(3), 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_PWR,
-        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EE_CLR,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-
-    [_RGB] = LAYOUT(
-        _______, 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,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EE_CLR,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_DVORAK] = LAYOUT(
-        KC_DLR, KC_AMPR, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_PLUS, KC_RBRC, KC_EXLM, KC_HASH, KC_BSPC,
-        KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_AT, KC_BSLS,
-        KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT,
-        KC_LSFT, KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, RSFT_T(KC_Z), KC_UP, KC_DEL,
-        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RGHT
-    )
-};
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
deleted file mode 100644
index 7b408ba7bd..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define PERMISSIVE_HOLD
-
-#define TAP_HOLD_CAPS_DELAY 0
-#define USB_POLLING_INTERVAL_MS 1
-
-// some speed shit
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-#define TAPPING_FORCE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-
-// #include "config_led.h"
-// #include "dz60rgb.h"
-#undef DISABLE_RGB_MATRIX_SPLASH
-#undef DISABLE_RGB_MATRIX_MULTISPLASH
-#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#undef ENABLE_RGB_MATRIX_SOLID_COLOR
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
deleted file mode 100644
index 711d8687ba..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_ESC,        KC_1,    KC_2,            KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
-        KC_TAB,         KC_Q,    KC_W,            KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC, KC_BSLS,
-        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_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRAVE,   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_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
-        _______, _______, _______,                            KC_SPC,                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [2] = LAYOUT(
-        _______, 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,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
deleted file mode 100644
index 786360c5a2..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 150
-
-#define TAP_HOLD_CAPS_DELAY 0
-
-#undef DISABLE_RGB_MATRIX_SPLASH
-#undef DISABLE_RGB_MATRIX_MULTISPLASH
-#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #undef ENABLE_RGB_MATRIX_SPLASH
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGB_MATRIX_KEYRELEASES
-
-// some speed shit
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-#define TAPPING_FORCE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-
-// #include "config_led.h"
-// #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
deleted file mode 100644
index bd04aa8be1..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ /dev/null
@@ -1,331 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum dz60rgb_layers {
-	_QWERTY,
-	_FNM,
-	_NAV,
-	_RGB,
-	_FNC
-};
-
-enum dz60rgb_keycodes {
-	REBOOT = SAFE_RANGE,
-	MAS_CRM,
-	MAS_PRP,
-	MAS_RED,
-	MAS_GRN,
-	MAS_BLU,
-	MAS_CYN,
-	MAS_MGT,
-	MAS_YEL,
-	MAS_KEY,
-	MAS_WHT,
-};
-#define _V_V_V_ KC_TRNS
-#define LT_CAPS LT(_NAV, KC_CAPS)
-#define LT_DEL  LT(_RGB, KC_DEL)
-extern bool autoshift_enabled;
-#define MT_SLSH RSFT_T(KC_SLSH)
-#define MT_APP  RALT_T(KC_APP)
-#define LM_LALT LM(_FNM, MOD_LALT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT(
-		QK_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_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, \
-		LT_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,           \
-		SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MT_SLSH,          KC_UP,   LT_DEL,  \
-		KC_LCTL, KC_LGUI, LM_LALT,       KC_SPC,                                MT_APP,  MO(_FNC),         KC_LEFT, KC_DOWN, KC_RGHT  \
-	),
-	[_FNM] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
-		_______, _______, _V_V_V_,                   _______,                   _______, _______,          _______, _______, _______  \
-	),
-	[_NAV] = LAYOUT(
-		KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PMNS, KC_PPLS, KC_DEL,  \
-		_______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS, KC_PSCR, KC_SCRL, KC_INS,  \
-		_V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, KC_PENT,          \
-		_______, _______, _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, _______,          _______, _______, \
-		_______, _______, _______,                   _______,                   _______, _______,          _______, _______, _______  \
-	),
-	[_RGB] = LAYOUT(
-		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, \
-		_______, RGB_MOD,  RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD, RGB_MOD, _______, \
-		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, _______,          \
-		_______, RGB_TOG,  _______, _______, _______, _______, _______, MAS_YEL, MAS_GRN, MAS_CRM, _______,          _______, _V_V_V_, \
-		_______, _______,  _______,                   _______,                   _______, _______,          _______, _______, _______  \
-	),
-	[_FNC] = LAYOUT( // fuck it edition
-		RCTL(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,        AS_TOGG,       \
-		RCTL(KC_TAB),  RCTL(KC_Q), RCTL(KC_W), RCTL(KC_E), RCTL(KC_R), RCTL(KC_T), RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    RCTL(KC_LBRC), RCTL(KC_RBRC), RCTL(KC_BSLS), \
-		RCTL(KC_CAPS), RCTL(KC_A), RCTL(KC_S), RCTL(KC_D), RCTL(KC_F), RCTL(KC_G), RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), RCTL(KC_QUOT), RCTL(KC_ENT),                 \
-		RCTL(KC_LSFT), RCTL(KC_Z), RCTL(KC_X), RCTL(KC_C), RCTL(KC_V), REBOOT,     RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH),                KC_VOLU, RCTL(KC_DEL),        \
-		RCTL(KC_LCTL), RCTL(KC_LGUI), RCTL(KC_LALT),                   RCTL(KC_SPC),                       KC_MUTE,       _V_V_V_,                     RCTL(KC_LEFT), KC_VOLD, RCTL(KC_RGHT)        \
-	),
-	/*
-	[_FNC] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  AS_TOGG, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
-		_______, _______, _______, _______, _______, REBOOT,  _______, _______, _______, _______, RCTL(KC_SLSH),    KC_VOLU, RCTL(KC_DEL), \
-		_______, _______, _______,                   _______,                   KC_MUTE, _______,    RCTL(KC_LEFT), KC_VOLD, RCTL(KC_RGHT)  \
-	),
-	[_LAYER] = LAYOUT(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
-		_______, _______, _______,                   _______,                   _______, _______,          _______, _______, _______  \
-	),
-	 [_LAYER] = LAYOUT(
-		13,      12,      11,       10,      9,       8,       7,       6,       5,       4,       3,       2,       1,       0,      \
-		27,      26,      25,       24,      23,      22,      21,      20,      19,      18,      17,      16,      15,      14,     \
-		40,      39,      38,       37,      36,      35,      34,      33,      32,      31,      30,      29,      28,              \
-		53,      52,      51,       50,      49,      48,      47,      46,      45,      44,      43,               42,      41,     \
-		62,      61,      60,                         59,                        58,      57,               56,      55,      54      \
-	),
-	*/
-};
-
-bool rgb_matrix_indicators_user(void) {
-	uint8_t this_led = host_keyboard_leds();
-
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (get_highest_layer(layer_state)) {
-		case _NAV:
-			if (this_led & (1 << USB_LED_NUM_LOCK)) {
-				rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
-				rgb_matrix_set_color(19, 0xFF, 0xFF, 0x00);
-			} else {
-				rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
-				rgb_matrix_set_color(19, 0xFF, 0x00, 0x00);
-			}
-
-			rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); // layer indicator
-			// ESDF
-			rgb_matrix_set_color(24, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(38, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(36, 0xFF, 0x00, 0x00);
-			// home/end
-			rgb_matrix_set_color(25, 0x00, 0xFF, 0x00);
-			rgb_matrix_set_color(23, 0x00, 0xFF, 0x00);
-			// pgup/dn
-			rgb_matrix_set_color(26, 0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(39, 0x00, 0x00, 0xFF);
-			// numpad
-			rgb_matrix_set_color(6,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(5,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(4,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(20, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(18, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(33, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(32, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(31, 0xFF, 0xFF, 0x00);
-			// zero
-			rgb_matrix_set_color(47, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(46, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(45, 0xFF, 0x00, 0x00);
-			// dot
-			rgb_matrix_set_color(44, 0x00, 0x00, 0xFF);
-			// math shit
-			rgb_matrix_set_color(3,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(2,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(1,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(0,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(17, 0x00, 0x00, 0xFF);
-			// other
-			rgb_matrix_set_color(16, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(15, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(14, 0xFF, 0xFF, 0xFF);
-			break;
-
-		case _RGB: {
-			HSV hsv = { rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v };
-			HSV hui = hsv;
-			HSV hud = hsv;
-			HSV sai = hsv;
-			HSV sad = hsv;
-			HSV vai = hsv;
-			HSV vad = hsv;
-			hui.h = hsv.h + 8;
-			hud.h = hsv.h - 8;
-			sai.s = hsv.s + 16 > 255 ? 255 : hsv.s + 16;
-			sad.s = hsv.s - 16 < 0   ?   0 : hsv.s - 16;
-			vai.v = hsv.v + 16 > 255 ? 255 : hsv.v + 16;
-			vad.v = hsv.v - 16 < 0   ?   0 : hsv.v - 16;
-			RGB rgb = hsv_to_rgb(hsv);
-			RGB rgbHUI = hsv_to_rgb(hui);
-			RGB rgbHUD = hsv_to_rgb(hud);
-			RGB rgbSAI = hsv_to_rgb(sai);
-			RGB rgbSAD = hsv_to_rgb(sad);
-			RGB rgbVAI = hsv_to_rgb(vai);
-			RGB rgbVAD = hsv_to_rgb(vad);
-			rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF); // layer indicator
-			rgb_matrix_set_color(59, rgb.r, rgb.g, rgb.b); // color indicator
-			rgb_matrix_set_color(26, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(39, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(16, 0xFF, 0x80, 0x00); //RGB_RMOD
-			rgb_matrix_set_color(15, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(52, 0xFF, 0x40, 0x00); //TOG
-			rgb_matrix_set_color(25, 0x80, 0x80, 0x80); //SPI
-			rgb_matrix_set_color(38, 0x80, 0x80, 0x80); //SPD
-			rgb_matrix_set_color(24, rgbHUI.r, rgbHUI.g, rgbHUI.b); //HUI
-			rgb_matrix_set_color(37, rgbHUD.r, rgbHUD.g, rgbHUD.b); //HUD
-			rgb_matrix_set_color(23, rgbSAI.r, rgbSAI.g, rgbSAI.b); //SAI
-			rgb_matrix_set_color(36, rgbSAD.r, rgbSAD.g, rgbSAD.b); //SAD
-			rgb_matrix_set_color(22, rgbVAI.r, rgbVAI.g, rgbVAI.b); //VAI
-			rgb_matrix_set_color(35, rgbVAD.r, rgbVAD.g, rgbVAD.b); //VAD
-			rgb_matrix_set_color(19, 0xF0, 0x00, 0xFF); //MAS_MGT
-			rgb_matrix_set_color(18, 0x00, 0x02, 0xFF); //MAS_BLU
-			rgb_matrix_set_color(33, 0xFF, 0x00, 0x00); //MAS_RED
-			rgb_matrix_set_color(32, 0x00, 0x00, 0x00); //MAS_KEY
-			rgb_matrix_set_color(31, 0x00, 0xFF, 0xF7); //MAS_CYN
-			rgb_matrix_set_color(46, 0xFF, 0xDA, 0x00); //MAS_YEL
-			rgb_matrix_set_color(45, 0x00, 0xFF, 0x01); //MAS_GRN
-			rgb_matrix_set_color(44, 0xFF, 0xA5, 0x18); //MAS_CRM
-			rgb_matrix_set_color(30, 0x81, 0x3C, 0xFF); //MAS_PRP
-			rgb_matrix_set_color(17, 0xFF, 0xFF, 0xFF); //MAS_WHT
-		}
-		break;
-
-		case _FNC:
-			rgb_matrix_set_color(57, 0xFF, 0xFF, 0xFF); // layer indicator
-			rgb_matrix_set_color(48, 0xFF, 0x00, 0x00); // bootloader
-			rgb_matrix_set_color(42, 0x00, 0x80, 0xFF); // vol
-			rgb_matrix_set_color(55, 0x00, 0x80, 0xFF);
-			rgb_matrix_set_color(58, 0xFF, 0x00, 0x00); // mute
-			rgb_matrix_set_color(56, 0xFF, 0x80, 0x00); // ctrl+left/right
-			rgb_matrix_set_color(54, 0xFF, 0x80, 0x00);
-			rgb_matrix_set_color(41, 0xFF, 0x00, 0x40); // ctrl+delete
-			rgb_matrix_set_color(43, 0xFF, 0x00, 0x40); // ctrl+slash
-
-			if (this_led & (1 << !autoshift_enabled)) {
-				rgb_matrix_set_color(0, 0xFF, 0x00, 0x00); // AS_TOGG
-			} else {
-				rgb_matrix_set_color(0, 0xFF, 0xFF, 0x00);
-			}
-
-			break;
-		}
-	}
-
-	if (this_led & (1 << USB_LED_CAPS_LOCK)) {
-		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
-	}
-    return false;
-}
-
-void matrix_init_user(void)
-{
-	//user initialization
-	autoshift_disable();
-}
-
-void matrix_scan_user(void)
-{
-	//user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-	static uint32_t key_timer;
-
-	switch (keycode) {
-	case REBOOT:
-		if (record->event.pressed) {
-			key_timer = timer_read32();
-		} else {
-			if (timer_elapsed32(key_timer) >= 500) {
-				rgb_matrix_enable_noeeprom();
-				rgb_matrix_mode_noeeprom(1);
-				rgb_matrix_sethsv_noeeprom(11, 11, 11);
-				wait_ms(150);
-				reset_keyboard();
-			} else {
-				register_code(KC_RCTL);
-				tap_code(KC_B);
-				unregister_code(KC_RCTL);
-			}
-		}
-
-		return false;
-
-	case MAS_CRM:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(32, 160, 255);
-		}
-
-		return false;
-
-	case MAS_PRP:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(192, 112, 255);
-		}
-
-		return false;
-
-	case MAS_RED:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 255, 255);
-		}
-
-		return false;
-
-	case MAS_GRN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(88, 255, 255);
-		}
-
-		return false;
-
-	case MAS_BLU:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(168, 255, 255);
-		}
-
-		return false;
-
-	case MAS_CYN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 255, 255);
-		}
-
-		return false;
-
-	case MAS_MGT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(216, 255, 255);
-		}
-
-		return false;
-
-	case MAS_YEL:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(40, 255, 255);
-		}
-
-		return false;
-
-	case MAS_KEY:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 0, 0);
-		}
-
-		return false;
-
-	case MAS_WHT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 0, 255);
-		}
-
-		return false;
-
-	default:
-		return true;
-	}
-}
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
deleted file mode 100644
index 743d9188b0..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2021 MechMaster48 admin@mechbox.net
-
-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/>. 
-/*
-
--This is just a diagram that makes it easier for me to see what keys I have bound and where.
--The README has a better image to see the exact keymap.
-
---Layer 0--
-  _________________________________________________________________________________________________
- |[esc]            [1!]-[2@]-[3#]-[4$]-[5%]-[6^]-[7&]-[8*]-[9(]-[0)]-[-_]-[+=]      [  BackSpace  ]|
- |[ Tab ]               [Q]-[W]-[E]-[R]-[T]-[Y]-[U]-[I]-[O]-[P]-[[{]-[]}]                    [ |\ ]|
- |[CapsLock]             [A]-[S]-[D]-[F]-[G]-[H]-[J]-[K]-[L]-[;/:]-['/"]                    [Enter]|
- |[ Shift ]               [Z]-[X]-[C]-[V]-[B]-[N]-[M]-[</,]-[>/.]-[?//]                    [↑][del]|
- |[ctrl][win][alt]        [____________________SPACE__________________][fn/OSL(1)][ctrl][←][↓][→]  |
- |_________________________________________________________________________________________________|
-
-
-
-
---Layer 1--
-  _____________________________________________________________________________________
- |[TO(2)]    [F1]-[F2]-[F3]-[F4]-[F5]-[F6]-[F7]-[F8]-[F9]-[F10]-[F11]-[F12]   [   ▼   ]|
- |[ ▼ ]        [~]-[▼]-[▼]-[▼]-[▼]-[▼]-[PS]-[▼]-[▼]-[▼]-[play/pause]-[▼]      [ QK_BOOT ]|
- |[    ▼    ]        [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PU]-[▼]-[▼]               [  ▼  ]|
- |[ Shift ]            [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PD]-[▼]           [vol↑]  [ ▼ ]|
- |[ctrl][ ▼ ][alt]    [_________________▼________________] [▼][ ▼ ][←prvs][vol↓][next→]|
- |_____________________________________________________________________________________|
-
-
-
---Layer 2--
-  _________________________________________________________________________________________________
- |[ ▼ ]                   [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]             [     ▼     ]| 
- |[ ▼ ]     [RGBTgg]-[▼]-[Hue+]-[Hue-]-[Sat+]-[Sat-]-[Brt+]-[Brt-]-[RGBmd]-[▼]-[▼]-[▼]    [ QK_BOOT ]| 
- |[    ▼    ]              [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                      [  ▼  ]| 
- |[   ▼   ]                  [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                 [  ▼  ][  ▼  ]| 
- |[  ▼  ][ ▼ ][▼]             [_______________TO(0)________________] [▼][ ▼ ] [  ▼  ][  ▼  ][  ▼  ]| 
- |_________________________________________________________________________________________________|
-
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        QK_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_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,
-        CTL_T(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,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, KC_LALT,                           KC_SPC,                    OSL(1), KC_RCTL,           KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        TO(2),   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_GRV, _______, _______, _______, _______, _______, KC_PSCR, _______,  _______, _______, KC_MPLY, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, KC_VOLU, KC_MUTE,
-        KC_LCTL, _______, KC_LALT,                            TO(0),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [2] = LAYOUT(
-        _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            TO(0),                   _______, _______, _______, _______, _______
-    )
-};
\ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
deleted file mode 100644
index 4dca4d2396..0000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _LAYER0 0
-#define _LAYER1 1
-#define _LAYER2 2
-#define _LAYER3 3
-#define _LAYER4 4
-#define _LAYER5 5
-#define _LAYER6 6
-#define _LAYER7 7
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT( /* MAC */
-		QK_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_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,
-		CTL_T(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,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
-		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RGUI,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RGHT),
-	[_LAYER1] = LAYOUT( /* FN */
-		TO(3),    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,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SCRL,  KC_PAUS,  _______,  _______,   QK_BOOT,
-		_______,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_EJCT,  _______,  KC_ASTR,  KC_PSLS,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
-		_______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  MO(5),              KC_MPLY,            _______,
-		_______,  _______,  _______,                      TO(4),                        _______,  _______, KC_MPRV,   KC_MSTP,            KC_MFFD),
-	[_LAYER2] = LAYOUT( /* LIGHT */
-    RGB_TOG,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  _______,    _______,    _______,    _______,    _______,
-