271 files changed, 490 insertions, 12337 deletions
diff --git a/keyboards/40percentclub/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
index 359cdc80a..8cc5a150a 100644
--- a/keyboards/40percentclub/4x4/4x4.h
+++ b/keyboards/40percentclub/4x4/4x4.h
@@ -56,16 +56,3 @@
    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
 }
-#define LAYOUT_kc_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0a, KC_##K0b, ___, ___, ___, ___}, \
-    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1a, KC_##K1b, ___, ___, ___, ___}, \
-    { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2a, KC_##K2b, ___, ___, ___, ___}, \
-    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3a, KC_##K3b, ___, ___, ___, ___} \
-}
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 6f9179926..011d03deb 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -20,8 +20,6 @@
 #include QMK_KEYBOARD_H
-#define KC_ KC_TRNS
 #define KC_FN1 MO(_FN)
 #define KC_FN2 LT(_FN, KC_CAPS)
@@ -54,30 +52,30 @@ enum {
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_kc( /* Default layer
+[_QWERTY] = LAYOUT_68_ansi( /* Default layer
   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    GESC, 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,MINS,EQL ,  BSPC  ,  INS ,PGUP, /*
+    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_INS ,KC_PGUP, /*
   ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫ */
-     TAB  , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,LBRC,RBRC, BSLS ,  DEL ,PGDN, /*
+     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_PGDN, /*
   ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛ */
-      FN2   , A  , S  , D  , F  , G  , H  , J  , K  , L  ,SCLN,QUOT,  ENTER  ,             /*
+      KC_FN2   , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,  KC_ENTER  ,         /*
   ┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓      */
-       LSFT   , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH,    RSFT    ,   UP ,      /*
+       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 ,  /*
   ┣━━━━━┳━━━━┻┳━━━┻━┳━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━┳┻━━━━╋━━━━┻┳━━━━━┳━━┳━━┻━╋━━━━╋━━━━┓ */
-    LCTL ,LGUI ,LALT ,             SPACE             ,RALT , FN1 ,RCTL ,   LEFT,DOWN,RGHT  /*
+    KC_LCTL ,KC_LGUI ,KC_LALT ,             KC_SPACE             ,KC_RALT , KC_FN1 ,KC_RCTL ,   KC_LEFT,KC_DOWN,KC_RGHT  /*
   ┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛ */),
-[_FN] = LAYOUT_kc( /* FN & CAPS layer
+[_FN] = LAYOUT_68_ansi( /* FN & CAPS layer
   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    GRV , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 , F10, F11, F12,  RSTP  ,  PSCR,HOME, /*
+    KC_GRV , 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_RSTP  ,  KC_PSCR,KC_HOME, /*
   ┣Esc ┻ 1! ┻ 2@ ┻ 3# ┻ 4$ ┻ 5% ┻ 6^ ┻ 7& ┻ 8* ┻ 9( ┻ 0) ┻ -_ ┻ =+ ┻━┳━ ←─ ━┫ ┣Ins ╋PgUp┫ */
-          ,PLY1,PLY2,    ,    ,    ,    ,    , 7  , 8  , 9  ,BLDN,BLUP,BLTOG ,      ,END , /*
+  _______ ,KC_PLY1,KC_PLY2,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_BLDN,KC_BLUP,KC_BLTOG ,KC_TRNS  ,KC_END , /*
   ┣ Tab ━┻ Q ━┻ W ━┻ E ━┻ R ━┻ T ━┻ Y ━┻ U ━┻ I ━┻ O ━┻ P ━┻ [{ ┻ ]} ┻━ \| ━┫ ┗Del ┻PgDn┛ */
-            ,    ,    ,    ,    ,    ,    ,    , 4  , 5  , 6  ,    ,   TERM  ,             /*
+    _______ ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,   KC_TERM  ,         /*
   ┣━ Caps ━┻ A ━┻ S ━┻ D ━┻ F ━┻ G ━┻ H ━┻ J ━┻ K ━┻ L ━┻ ;: ┻ '" ┻━ Enter ━┫ ┏━━━━┓      */
-              ,REC1,REC2,    ,    ,MSTP,    ,MUTE, 1  , 2  , 3  ,            ,  VOLU,      /*
+    _______   ,KC_REC1,KC_REC2,KC_TRNS,KC_TRNS,KC_MSTP,KC_TRNS,KC_MUTE, KC_1  , KC_2  , KC_3  ,KC_TRNS        ,  KC_VOLU,  /*
   ┣━━ Shift ━┻ Z ━┻ X ━┻ C ━┻ V ━┻ B ━┻ N ━┻ M ━┻ ,< ┻ .> ╋ /? ┻┳━━ Shift ━━┻━╋ ↑ ━╋━━━━┓ */
-         ,     ,     ,             MPLY              ,  0  ,     ,     ,   MPRV,VOLD,MNXT  /*
+  _______,KC_TRNS ,KC_TRNS ,         KC_MPLY              ,  KC_0  ,KC_TRNS ,KC_TRNS ,   KC_MPRV,KC_VOLD,KC_MNXT  /*
   ┗Ctrl ┻ GUI ┻ Alt ┻━━━━━━━━━━━━ Space ━━━━━━━━━━━━┻ Alt ┻ Fn ━┻Ctrl ┛  ┗ ← ━┻ ↓ ━┻ → ━┛ */)
 };
 // clang-format on
diff --git a/keyboards/40percentclub/mf68/keymaps/factory/keymap.c b/keyboards/40percentclub/mf68/keymaps/factory/keymap.c
deleted file mode 100644
index 12032350c..000000000
--- a/keyboards/40percentclub/mf68/keymaps/factory/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _QWERTY 0
-#define _FN1 1
-#define _FN2 2
-#define KC_ KC_TRNS
-#define KC_X0 LT(_FN2, KC_CAPS)
-#define KC_X1 MO(_FN1)
-#define KC_X2 BL_STEP
-#define KC_X3 BL_BRTG
-#define KC_X4 BL_TOGG
-#define KC_X5 BL_INC
-#define KC_X6 BL_DEC
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
- /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    ESC , 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,MINS,EQL ,  BSPC  ,   INS ,PGUP,
- /*|----`----`----`----`----`----`----`----`----`----`----`----`----`--------|  |----`----| */
-    TAB   , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,LBRC,RBRC, BSLS ,   DEL ,PGDN,
- /*|------`----`----`----`----`----`----`----`----`----`----`----`----`------|  `----`----' */
-    X0     , A  , S  , D  , F  , G  , H  , J  , K  , L  ,SCLN,QUOT,    ENTER ,
- /*|-------`----`----`----`----`----`----`----`----`----`----`----`----------|  ,----. */
-    LSFT     , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH,       RSFT  ,    UP ,
- /*|---------`----`----`----`----`----`----`----`----`----`----`-------------.--|----|----. */
-    LCTL ,LGUI ,LALT ,            SPACE             ,  X1  ,RALT ,RCTL ,    LEFT,DOWN,RGHT
- /*`-----+-----+-----+------------------------------+------+-----+-----'   `----+----+----' */
-  ),
-  [_FN1] = LAYOUT_kc(
- /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    GRV , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,   BSPC ,       ,HOME,
- /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-          ,    , UP ,    ,    ,    ,    ,    ,    ,PSCR,SLCK,PAUS, X2 ,      ,       ,END,
- /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-     X0    ,LEFT,DOWN,RGHT,    , X6 , X5 , X4 , X3 , X2 ,HOME,    ,          ,
- /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-             ,    ,MPLY,MSTP,MPRV,MNXT,VOLD,VOLU,MUTE,    ,END ,             ,    X5 ,
- /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-         ,     ,     ,                              ,      ,     ,     ,     X3 , X6 , X4
- /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
-  ),
-  [_FN2] = LAYOUT_kc(
- /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    GRV , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,   BSPC ,   VOLU,HOME,
- /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-          ,    ,    , UP ,    ,    ,    , 7  , 8  , 9  ,    ,    ,    ,      ,   VOLD,END,
- /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-           ,    ,LEFT,DOWN,RGHT,    ,    , 4  , 5  , 6  ,    ,    ,          ,
- /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-             ,    ,    ,    ,    ,    , 0  , 1  , 2  , 3  ,    ,             ,   MUTE,
- /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-         ,     ,     ,                              ,      ,     ,     ,    MPRV,MPLY,MNXT
- /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
-  )
-};
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c b/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c
index ae7e7297c..0002263de 100644
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c
@@ -3,51 +3,50 @@
 #define _QWERTY 0
 #define _FN1 1
 #define _FN2 2
-#define KC_ KC_TRNS
 #define KC_X0 LT(_FN2, KC_GRV)
 #define KC_X1 MO(_FN1)
 #define KC_X2 BL_STEP
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT_68_ansi(
 /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    ESC , 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,MINS,EQL ,  BSPC  ,   INS ,PGUP,
+    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_INS ,KC_PGUP,
 /*|----`----`----`----`----`----`----`----`----`----`----`----`----`--------|  |----`----| */
-    TAB   , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,LBRC,RBRC, BSLS ,   DEL ,PGDN,
+    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_PGDN,
 /*|------`----`----`----`----`----`----`----`----`----`----`----`----`------|  `----`----' */
-    X0     , A  , S  , D  , F  , G  , H  , J  , K  , L  ,SCLN,QUOT,    ENTER ,
+    KC_X0     , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,    KC_ENTER ,
 /*|-------`----`----`----`----`----`----`----`----`----`----`----`----------|  ,----. */
-    LSFT     , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH,       RSFT  ,    UP ,
+    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 ,
 /*|---------`----`----`----`----`----`----`----`----`----`----`-------------.--|----|----. */
-    LCTL ,LGUI ,LALT ,            SPACE             ,  X1  ,RALT ,RCTL ,    LEFT,DOWN,RGHT
+    KC_LCTL ,KC_LGUI ,KC_LALT ,            KC_SPACE             ,  KC_X1  ,KC_RALT ,KC_RCTL ,    KC_LEFT,KC_DOWN,KC_RGHT
 /*`-----+-----+-----+------------------------------+------+-----+-----'   `----+----+----' */
  ),
-  [_FN1] = LAYOUT_kc(
+  [_FN1] = LAYOUT_68_ansi(
 /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    GRV , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,   BSPC ,   VOLU,HOME,
+    KC_GRV , 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_BSPC ,   KC_VOLU,KC_HOME,
 /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-          ,    ,    , UP ,    ,    ,    ,    ,    ,    ,    ,    , X2 ,      ,   VOLD,END,
+      KC_TRNS,KC_TRNS,KC_TRNS, KC_UP ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_X2 ,  KC_TRNS,   KC_VOLD,KC_END,
 /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-           ,    ,LEFT,DOWN,RGHT,    ,    ,    ,    ,    ,    ,    ,          ,
+       KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,      KC_TRNS,
 /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-             ,    ,    ,    ,    ,    ,    ,MUTE,    ,    ,    ,             ,   MUTE,
+         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_TRNS,KC_TRNS,KC_TRNS,         KC_TRNS,   KC_MUTE,
 /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-         ,     ,     ,                              ,      ,     ,     ,    MPRV,MPLY,MNXT
+     KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV,KC_MPLY,KC_MNXT
 /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
  ),
-  [_FN2] = LAYOUT_kc(
+  [_FN2] = LAYOUT_68_ansi(
 /*,----+----+----+----+----+----+----+----+----+----+----+----+----+--------.  ,----+----. */
-    GRV , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 ,   BSPC ,   VOLU,HOME,
+    KC_GRV , 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_BSPC ,   KC_VOLU,KC_HOME,
 /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-          ,    ,    , UP ,    ,    ,    , 7  , 8  , 9  ,    ,    ,    ,      ,   VOLD,END,
+      KC_TRNS,KC_TRNS,KC_TRNS, KC_UP ,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_TRNS,KC_TRNS,KC_TRNS,  KC_TRNS,   KC_VOLD,KC_END,
 /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-           ,    ,LEFT,DOWN,RGHT,    ,    , 4  , 5  , 6  ,    ,    ,          ,
+       KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,KC_TRNS,      KC_TRNS,
 /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-             ,    ,    ,    ,    ,    , 0  , 1  , 2  , 3  ,    ,             ,   MUTE,
+         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_0  , KC_1  , KC_2  , KC_3  ,KC_TRNS,         KC_TRNS,   KC_MUTE,
 /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-         ,     ,     ,                              ,      ,     ,     ,    MPRV,MPLY,MNXT
+     KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV,KC_MPLY,KC_MNXT
 /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
  )
 };
diff --git a/keyboards/40percentclub/mf68/mf68.h b/keyboards/40percentclub/mf68/mf68.h
index 6844ed1b0..71ee4229d 100644
--- a/keyboards/40percentclub/mf68/mf68.h
+++ b/keyboards/40percentclub/mf68/mf68.h
@@ -18,20 +18,3 @@
    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
    { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
 }
-#define LAYOUT_kc( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14,     K15, K16, \
-    K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32,     K33, K34, \
-    K35,  K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47,     K48, \
-    K50,   K51, K52, K53, K54, K55, K56, K57, K58, K60, K61,    K62,          K63, \
-    K64,  K65,  K66,                 K67,              K68,  K70,  K71,  K72, K73, K74 \
-) LAYOUT_68_ansi( \
-    KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \
-    KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \
-    KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \
-    KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, \
-    KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, \
-    KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57, KC_##K58, \
-    KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, \
-    KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74 \
-)
diff --git a/keyboards/40percentclub/nori/nori.h b/keyboards/40percentclub/nori/nori.h
index 802f0bfce..ffcc39621 100644
--- a/keyboards/40percentclub/nori/nori.h
+++ b/keyboards/40percentclub/nori/nori.h
@@ -54,16 +54,3 @@
    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b } \
 }
-#define LAYOUT_kc_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0a, KC_##K0b }, \
-    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1a, KC_##K1b }, \
-    { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2a, KC_##K2b }, \
-    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3a, KC_##K3b } \
-}
diff --git a/keyboards/40percentclub/ut47/ut47.h b/keyboards/40percentclub/ut47/ut47.h
index f6456fe91..f595d3a45 100644
--- a/keyboards/40percentclub/ut47/ut47.h
+++ b/keyboards/40percentclub/ut47/ut47.h
@@ -29,18 +29,3 @@
    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b }  \
  }
-#define LAYOUT_kc( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-  K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3a, K3b  \
-) \
-  LAYOUT( \
-    KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0a, KC_##K0b, \
-    KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1a, KC_##K1b, \
-    KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2a, KC_##K2b, \
-    KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34,      KC_##K35,      KC_##K37, KC_##K38, KC_##K39, KC_##K3a, KC_##K3b \
-  )
-#define LAYOUT_kc_ut47 LAYOUT_kc
diff --git a/keyboards/adkb96/adkb96.h b/keyboards/adkb96/adkb96.h
index 4b2877500..5a47f16aa 100644
--- a/keyboards/adkb96/adkb96.h
+++ b/keyboards/adkb96/adkb96.h
@@ -5,24 +5,3 @@
 #ifdef KEYBOARD_adkb96_rev1
    #include "rev1.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc_ortho_6x16( \
-    L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
-    L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
-    L50, L51, L52, L53, L54, L55, L56, L57, R50, R51, R52, R53, R54, R55, R56, R57 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##L07, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, KC_##R07, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##L17, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, KC_##R17, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##L27, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, KC_##R27, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##L37, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, KC_##R37, \
-        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##L47, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46, KC_##R47, \
-        KC_##L50, KC_##L51, KC_##L52, KC_##L53, KC_##L54, KC_##L55, KC_##L56, KC_##L57, KC_##R50, KC_##R51, KC_##R52, KC_##R53, KC_##R54, KC_##R55, KC_##R56 ,KC_##R57 \
-    )
-#define LAYOUT_kc LAYOUT_kc_ortho_6x16
diff --git a/keyboards/atreus62/atreus62.h b/keyboards/atreus62/atreus62.h
index de6f64063..6af5d8bf6 100644
--- a/keyboards/atreus62/atreus62.h
+++ b/keyboards/atreus62/atreus62.h
@@ -1,5 +1,4 @@
-#ifndef ATREUS62_H
+#pragma once
-#define ATREUS62_H
 #include "quantum.h"
@@ -20,21 +19,3 @@
    { k30, k31, k32, k33, k34, k35, k46,   k36, k37, k38, k39, k3a, k3b }, \
    { k40, k41, k42, k43, k44, k45, k47,   k48, k49, k4a, k4b, k4c, k4d } \
 }
-// Used to create a keymap using only KC_ prefixed keys.
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25,           k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35,           k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
-    { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_NO,    KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \
-    { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_NO,    KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \
-    { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_NO,    KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \
-    { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k47, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }, \
-    { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_##k46, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b, KC_##k4c, KC_##k4d } \
-}
-#endif
diff --git a/keyboards/atreus62/keymaps/atreus52/README.md b/keyboards/atreus62/keymaps/atreus52/README.md
deleted file mode 100644
index 245df7deb..000000000
--- a/keyboards/atreus62/keymaps/atreus52/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- -*- mode: markdown; fill-column: 8192 -*- -->
-Atreus52 Modification
-=======================
-Firmware for my custom keyboard based on the Atreus layout, but with 5 rows and only 5 columns per hand.
-More documentation coming soon.
-# License
-  GPL-3+
diff --git a/keyboards/atreus62/keymaps/atreus52/config.h b/keyboards/atreus62/keymaps/atreus52/config.h
deleted file mode 100644
index 91b626b56..000000000
--- a/keyboards/atreus62/keymaps/atreus52/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "../../config.h"
-#undef MANUFACTURER
-#undef PRODUCT
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#undef DIODE_DIRECTION
-/* USB Device descriptor parameter */
-#define MANUFACTURER    Mesh Industries
-#define PRODUCT         Atreus52 Treeboard
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B1, F7, F6, F5, F4, B6, D3, D2, D1, D0, D4, B3 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c
deleted file mode 100644
index 2abd49b11..000000000
--- a/keyboards/atreus62/keymaps/atreus52/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include QMK_KEYBOARD_H
-// Layers
-#define DVORAK 0
-#define QWERTY 1
-#define RAISE 2
-#define LOWER 3
-#define BDO 4
-#define RESETL 5
-#define KC_RAIS MO(RAISE)
-#define KC_LOWR MO(LOWER)
-#define KC_TGBD TG(BDO)
-#define KC_TGRS TG(RESETL)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DVORAK] = LAYOUT_kc(
-    NO, 1,    2,    3,    4,    5,                6,    7,    8,    9,    0,    NO, \
-    NO, QUOT, COMM, DOT,  P,    Y,                F,    G,    C,    R,    L,    NO, \
-    NO, A,    O,    E,    U,    I,                D,    H,    T,    N,    S,    NO, \
-    NO, SCLN, Q,    J,    K,    X,                B,    M,    W,    V,    Z,    NO, \
-    NO, TGBD, LALT, LCTL, LOWR, LSFT, BSPC, ENT,  SPC,  RAIS, LGUI, LEFT, RGHT, NO
-  ),
-  [QWERTY] = LAYOUT_kc(
-    NO, 1,    2,    3,    4,    5,                6,    7,    8,    9,    0,    NO, \
-    NO, Q,    W,    E,    R,    T,                Y,    U,    I,    O,    P,    NO, \
-    NO, A,    S,    D,    F,    G,                H,    J,    K,    L,    SCLN, NO, \
-    NO, Z,    X,    C,    V,    B,                N,    M,    COMM, DOT,  SLSH, NO, \
-    NO, TGBD, LALT, LCTL, LOWR, LSFT, BSPC, ENT,  SPC,  RAIS, LGUI, LEFT, RGHT, NO
-  ),
-  [RAISE] = LAYOUT_kc(
-    NO, MRWD, MPRV, MPLY, MNXT, MFFD,             TRNS, MUTE, VOLD, VOLU, DEL,  NO, \
-    NO, TILD, GRV,  LCBR, RCBR, DQUO,             QUOT, EQL,  PLUS, MINS, QUES, NO, \
-    NO, ESC,  TAB,  LPRN, RPRN, BSLS,             SLSH, LEFT, DOWN, UP,   RGHT, NO, \
-    NO, TRNS, TRNS, LBRC, RBRC, TRNS,             INS,  PIPE, UNDS, TRNS, TRNS, NO, \
-    NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TGRS, NO
-  ),
-  [LOWER] = LAYOUT_kc(
-    NO, TRNS, TRNS, TRNS, TRNS, TRNS,             TRNS, TRNS, TRNS, TRNS, TRNS, NO, \
-    NO, EXLM, AT,   HASH, DLR,  PERC,             CIRC, AMPR, ASTR, LPRN, RPRN, NO, \
-    NO, 1,    2,    3,    4,    5,                6,    7,    8,    9,    0,    NO, \
-    NO, TRNS, TRNS, TRNS, TRNS, TRNS,             TRNS, DOT,  TRNS, TRNS, TRNS, NO, \
-    NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO
-  ),
-  [BDO] = LAYOUT_kc(
-    NO, ESC,  1,    2,    3,    4,                5,    0,    SLSH, U,    C,    NO, \
-    NO, TAB,  Q,    W,    E,    R,                6,    Y,    I,    O,    P,    NO, \
-    NO, LSFT, A,    S,    D,    F,                7,    G,    H,    J,    K,    NO, \
-    NO, T,    Z,    X,    C,    V,                8,    B,    N,    M,    L,    NO, \
-    NO, LCTL, SPC,  SPC,  SPC,  SPC,  COMM, ENT,  9,    NO,   NO,   NO,   TGBD, NO
-  ),
-  [RESETL] = LAYOUT(
-    KC_NO, RESET, 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, TG(RESETL),KC_NO
-  )
-};
-static uint8_t qw_dv_swap_state = 0;
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-  if (keycode == KC_LGUI) {
-    if (record->event.pressed) {
-      qw_dv_swap_state |= 0b00000001;
-    } else {
-      qw_dv_swap_state &= ~(0b00000001);
-    }
-  }
-  if (keycode == KC_LCTL) {
-    if (record->event.pressed) {
-      qw_dv_swap_state |= 0b00000010;
-    } else {
-      qw_dv_swap_state &= ~(0b00000010);
-    }
-  }
-  if (qw_dv_swap_state == 0b00000011) {
-    layer_invert(DVORAK);
-  }
-  return true;
-}
diff --git a/keyboards/atreus62/keymaps/atreus52/rules.mk b/keyboards/atreus62/keymaps/atreus52/rules.mk
deleted file mode 100644
index efa309d20..000000000
--- a/keyboards/atreus62/keymaps/atreus52/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-NKRO_ENABLE = true
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
diff --git a/keyboards/chimera_ergo/chimera_ergo.h b/keyboards/chimera_ergo/chimera_ergo.h
index 78e5c0dac..32d02886c 100644
--- a/keyboards/chimera_ergo/chimera_ergo.h
+++ b/keyboards/chimera_ergo/chimera_ergo.h
@@ -46,21 +46,6 @@
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
-#define LAYOUT_kc( \
-  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,      k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,      k42, k43, k44, k45, k46, k47, \
-                      k48, k49,      k50, k51 \
-) \
-{ \
-        { KC_NO,    KC_NO,    KC_##k26, KC_##k15, KC_##k28, KC_##k01,      KC_##k42, KC_##k31, KC_##k20, KC_##k33, KC_NO,    KC_NO     }, \
-        { KC_##k00, KC_NO,    KC_##k14, KC_##k27, KC_##k16, KC_##k36,      KC_##k47, KC_##k19, KC_##k32, KC_##k21, KC_NO,    KC_##k11  }, \
-        { KC_##k12, KC_##k25, KC_##k02, KC_##k39, KC_##k17, KC_##k49,      KC_##k50, KC_##k18, KC_##k44, KC_##k09, KC_##k34, KC_##k23  }, \
-        { KC_##k24, KC_##k13, KC_##k38, KC_##k04, KC_##k05, KC_##k48,      KC_##k51, KC_##k06, KC_##k07, KC_##k45, KC_##k22, KC_##k35  },  \
-        { KC_##k29, KC_##k41, KC_##k03, KC_##k40, KC_##k37, KC_NO,         KC_##k30, KC_##k43, KC_##k08, KC_##k10, KC_##k46, KC_NO     }, \
-}
 #define LAYOUT( \
  k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k10, k11, \
  k12, k13, k14, k15, k16, k17,      k18, k19, k20, k21, k22, k23, \
diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/chimera_ls/chimera_ls.h
index 8ca8534eb..45c91acc3 100644
--- a/keyboards/chimera_ls/chimera_ls.h
+++ b/keyboards/chimera_ls/chimera_ls.h
@@ -60,18 +60,5 @@
    { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }  \
 }
-#define LAYOUT_kc_ortho_4x12( \
-    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,           k30, k31, k32, k33, k34, k35, \
-    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-  ) { \
-    { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
-    { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
-    { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
-    { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \
-    { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }  \
-}
 #endif
diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/chimera_ortho/chimera_ortho.h
index fc2eba86b..ec893990a 100644
--- a/keyboards/chimera_ortho/chimera_ortho.h
+++ b/keyboards/chimera_ortho/chimera_ortho.h
@@ -60,18 +60,4 @@
  { KC_NO, k28, k14, k00, k45,      k48, k13, k27, k44, KC_NO }  \
 }
-#define LAYOUT_kc( \
-  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, k31, k32, k33, k34, k35,      k36, k37, k38, k41, k42, k43, k44, \
-                      k45, k46,                k47, k48      \
-) \
-{ \
-  { KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05,      KC_##k08, KC_##k09, KC_##k10, KC_##k11, KC_##k12 }, \
-  { KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19,      KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26 }, \
-  { KC_##k29, KC_##k31, KC_##k32, KC_##k33, KC_##k34,      KC_##k37, KC_##k38, KC_##k41, KC_##k42, KC_##k43 }, \
-  { KC_NO,    KC_##k06, KC_##k20, KC_##k35, KC_##k46,      KC_##k47, KC_##k36, KC_##k21, KC_##k07, KC_NO    }, \
-  { KC_NO,    KC_##k28, KC_##k14, KC_##k00, KC_##k45,      KC_##k48, KC_##k13, KC_##k27, KC_##k44, KC_NO    }  \
-}
 #endif
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/config.h b/keyboards/chimera_ortho/keymaps/dcompact/config.h
deleted file mode 100644
index d1e5c3aab..000000000
--- a/keyboards/chimera_ortho/keymaps/dcompact/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-#define MOUSEKEY_DELAY             200
-#define MOUSEKEY_INTERVAL          60
-#define MOUSEKEY_MAX_SPEED         50
-#define MOUSEKEY_TIME_TO_MAX       80
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c b/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
deleted file mode 100644
index 1c6ef7d6f..000000000
--- a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
+++ /dev/null
@@ -1,119 +0,0 @@
-#include QMK_KEYBOARD_H
-enum chimera_ortho_layers
-{
-        _BASE,
-        _NAV,
-        _SYM,
-        _FUNC,
-        _MOUSE
-};
-#define KC_NAV MO(_NAV)
-#define KC_SYM MO(_SYM)
-#define KC_FUNC MO(_FUNC)
-#define KC_MOUSE TT(_MOUSE)
-#define KC_DELSHFT SFT_T(KC_DEL)
-#define KC_CTLENT CTL_T(KC_ENT)
-#define KC_SYMSPC LT(_SYM, KC_SPC)
-#define KC_WK_LEFT LCA(KC_LEFT)
-#define KC_WK_DOWN LCA(KC_DOWN)
-#define KC_WK_UP LCA(KC_UP)
-#define KC_WK_RGHT LCA(KC_RGHT)
-#define KC_QUAKE LCTL(KC_GRAVE)
-#define LONGPRESS_DELAY 150
-// These are needed because of the 'KC_'-adding macro
-// This macro can be found in ../../chimera_ortho.h
-#define KC_RESET RESET
-#define KC_ KC_TRNS 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
-      //,-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------.
-         LALT   ,TAB    ,QUOT   ,COMM   ,DOT    ,P      ,Y           ,F      ,G      ,C      ,R      ,L      ,SLSH   ,FUNC   
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,LGUI   ,ESC    ,A      ,O      ,E      ,U      ,I           ,D      ,H      ,T      ,N      ,S      ,MINS   ,MOUSE  
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,LCTL   ,DELSHFT,SCLN   ,Q      ,J      ,K      ,X           ,B      ,M      ,W      ,V      ,Z      ,BSPC   ,ENTER
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-                                        ,LSHIFT ,NAV                         ,SYMSPC ,CTLENT
-      //\-------------------------------+-------+-------+-------/    \-------+-------+---------------------------------------/
-  ),
-  [_NAV] = LAYOUT_kc(
-      //,-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------.
-                ,       ,       ,       ,       ,       ,            ,       ,HOME   ,PGDOWN ,PGUP   ,END    ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,PSCR   ,MENU   ,       ,       ,       ,            ,       ,LEFT   ,DOWN   ,UP     ,RIGHT  ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,CAPS   ,NLCK   ,INS    ,       ,       ,            ,       ,WK_LEFT,WK_DOWN,WK_UP  ,WK_RGHT,       ,     
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-                                        ,       ,                            ,       ,    
-      //\-------------------------------+-------+-------+-------/    \-------+-------+---------------------------------------/
-  ),
-  [_SYM] = LAYOUT_kc(
-      //,-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------.
-                ,QUAKE  ,GRAVE  ,TILDE  ,BSLASH ,PIPE   ,LPRN        ,RPRN   ,7      ,8      ,9      ,SLSH   ,EQUAL  ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,EXLM   ,AT     ,HASH   ,DLR    ,LCBR        ,RCBR   ,4      ,5      ,6      ,ASTR   ,PLUS   ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,PERC   ,CIRC   ,AMPR   ,ASTR   ,LBRC        ,RBRC   ,1      ,2      ,3      ,MINUS  ,       ,     
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-                                        ,       ,                            ,       ,0
-      //\-------------------------------+-------+-------+-------/    \-------+-------+---------------------------------------/
-  ),
-  [_FUNC] = LAYOUT_kc(
-      //,-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------.
-                ,RESET  ,SLEP   ,MRWD   ,MPLY   ,MFFD   ,            ,       ,F9     ,F10    ,F11    ,F12    ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,PWR    ,MUTE   ,VOLD   ,VOLU   ,            ,       ,F5     ,F6     ,F7     ,F8     ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,WAKE   ,MPRV   ,MPLY   ,MNXT   ,            ,       ,F1     ,F2     ,F3     ,F4     ,       ,     
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-                                        ,       ,                            ,       ,    
-      //\-------------------------------+-------+-------+-------/    \-------+-------+---------------------------------------/
-  ),
-  [_MOUSE] = LAYOUT_kc(
-      //,-------+-------+-------+-------+-------+-------+-------.    ,-------+-------+-------+-------+-------+-------+-------.
-                ,       ,       ,       ,       ,       ,            ,       ,       ,       ,       ,       ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,       ,BTN1   ,BTN3   ,BTN2   ,            ,       ,MS_L   ,MS_D   ,MS_U   ,MS_R   ,       ,       
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-        ,       ,       ,       ,ACL0   ,ACL1   ,ACL2   ,            ,       ,WH_L   ,WH_D   ,WH_U   ,WH_R   ,       ,     
-      //|-------+-------+-------+-------+-------+-------+-------|    |-------+-------+-------+-------+-------+-------+-------|
-                                        ,       ,                            ,       ,    
-      //\-------------------------------+-------+-------+-------/    \-------+-------+---------------------------------------/
-  ),
-};
-// These control the color of the LED on the receiver
-// For color reference, see ../../chimera_ortho.h
-void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
-    
-    switch (layer) {
-        case _BASE:
-            set_led_cyan;
-            break;
-        case _NAV:
-            set_led_blue;
-            break;
-        case _SYM:
-            set_led_magenta;
-            break;
-        case _FUNC:
-            set_led_yellow;
-        default:
-            set_led_white;
-            break;
-    }
-};
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/readme.md b/keyboards/chimera_ortho/keymaps/dcompact/readme.md
deleted file mode 100644
index bf72567ef..000000000
--- a/keyboards/chimera_ortho/keymaps/dcompact/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# DCompact Layout
-**Dvorak, Layered, Mouse-Enabled, Compact -- Plover coming soon!?!~**
-_See [the layout source](keymap.c) for the actual layout_
-## Goals
-The following are the goals kept in mind when designing the DCompact
-layout:
- Provide minimal travel distance when typing English or coding
- Consistent muscle memory translation from standard QWERTY
- Stateless typing experience
- OS-agnostic features, macros, and key placement
- Minimize dependence on mouse usage
-These are generally all met or balanced within reason. This layout is
-not intended at all to be a familiar layout for much of anyone (except
-maybe those who already type in Dvorak) -- this is meant to amplify the
-best parts of having limited, ortholinear keys with layering.
-## As Reference Material
-If you're reading this hoping to find reference material to implement
-your own layout, then please feel free to copy over this layout and
-make edits where you see fit. I removed a lot of the features I felt
-extraneous to my usage and simplified style where I felt needed. This
-would hopefully mean that my code should feel like a good base to
-develop from for those new to QMK.
-_Remember that settings defined in the layout directory override and
-merge with those in the keyboard folder_
-## Relevant Links
- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
- [QMK Docs](https://docs.qmk.fm/#/)
- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
-## Contact
-Maintainer: [Dan](https://github.com/loksonarius)
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/rules.mk b/keyboards/chimera_ortho/keymaps/dcompact/rules.mk
deleted file mode 100644
index 6c605daec..000000000
--- a/keyboards/chimera_ortho/keymaps/dcompact/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/chimera_ortho/keymaps/gordon/keymap.c b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
deleted file mode 100644
index 5bd2019c2..000000000
--- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c
+++ /dev/null
@@ -1,363 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "gordon.h"
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define KC_SNAPLEFT LGUI(KC_LEFT)
-#define KC_SNAPRIGHT LGUI(KC_RIGHT)
-#define KC_SNAPUP LGUI(KC_UP)
-#define KC_SNAPDOWN LGUI(KC_DOWN)
-#define KC_PREVTAB LCTL(LSFT(KC_TAB))
-#define KC_NEXTTAB LCTL(KC_TAB)
-#define KC_WORKRIGHT LCTL(LGUI(KC_RIGHT))
-#define KC_WORKLEFT LCTL(LGUI(KC_LEFT))
-#define KC_NMPD TG(_NUMPAD)
-#define KC_SYMB TG(_SYMBOLS)
-#define KC_SCTL MT(MOD_LCTL, KC_LBRC)
-#define KC_SCTR MT(MOD_LCTL, KC_RBRC)
-#define KC_SPLT MT(MOD_LALT, KC_MINS)
-#define KC_SPRT MT(MOD_LALT, KC_1)
-#define KC_GBRC MT(MOD_RGUI, KC_8)
-#define KC_GQOT MT(MOD_LGUI, KC_QUOT)
-#define KC_CSHW MT(MOD_LCTL|MOD_LSFT,KC_W)
-#define KC_CDEL LCTL(KC_DEL)
-#define KC_AUDUP KC_AUDIO_VOL_UP
-#define KC_AUDOWN KC_AUDIO_VOL_DOWN
-#define KC_MEHS MEH_T(KC_S)
-#define KC_MEHL MEH_T(KC_L)
-#define KC_GWIN GUI_T(KC_G)
-#define KC_FCTL CTL_T(KC_F)
-#define KC_JCTL CTL_T(KC_J)
-#define KC_ZCTL CTL_T(KC_Z)
-#define KC_ALTV ALT_T(KC_V)
-#define KC_ALTN ALT_T(KC_N)
-#define KC_MEHX ALL_T(KC_X)
-#define KC_RESET RESET
-//LTs
-#define KC_MESC LT(_MACROS, KC_ESC)
-#define KC_DNUM LT(_NUMPAD, KC_D)
-#define KC_SPFN LT(_NAV,KC_EQL)
-#define KC_EMAUS LT(_MOUSE,KC_E)
-#define KC_ENAV LT(_NAV,KC_E)
-#define KC_INAV LT(_TEXTNAV,KC_I)
-#define KC_BSPSYM LT(_SYMBOLS,KC_BSPACE)
-#define KC_ENTSYM LT(_SYMBOLS,KC_ENTER)
-#define KC_CLNMAUS LT(_MOUSE,KC_SCOLON)
-#define KC_FUNC TT(_FUNCTION)
-//TAP DANCE
-#define KC_F6F7 TD(F6F7)
-#define KC_ALF4 TD(ALTF4)
-#define KC_TTT TD(TTT)
-#define KC_ENHM TD(HOME_END)
-#define KC_CLPS TD(CALC_PRINTSCREEN)
-#define KC_INCL M(0)
-#define KC_PULL M(1)
-#define KC_PUSH M(2)
-#define KC_SCAP M(3)
-#define KC_SCOF M(4)
-#define KC_CAD LALT(LCTL(KC_DEL))
-#define LONGPRESS_DELAY 150
-//#define LAYER_TOGGLE_DELAY 300
-// Fillers to make layering more clear
-#define KC_ KC_TRNS
-/* TODO:
- *
- * DONE: RESET and CAD into macro layer.
- * DONE: WINUP AND WINDOWN in NAV layer
- * DONE: Get rid of caps layer. not sure what it is even for.
- * DONE: LMEH
- * DONE: plus, divide, multiply on left hand for num layer
- * DONE: F1 - F12 on a layer toggle (not a temp toggle but a one shot or something)
- * DONE: Volume, page up and down for mouse layer.
- * DONE: Add full user files - without using anything.
- * DONE: Insert, ctrl delete
- * DONE: Home and End
- * DONE: Printscreen
- * Easier way to open new terminal (instead of alt + F2)
- * Intellij/text navigation layer (ctrl delete could be here).
- * Macro for "System.exit(0)" probably macro layer and "c"
- * Some sort of tap dance for comma, H, right pinky, and possibly other corners.
- * Something more with the right hand. not sure what.
- * Mouse: Left scroll, right scroll
- * Passwords and any other macros.
- * LED for control
- * All modifiers reset
- * Russain layer
- * Hebrew layer
- * Get rid of stupid git pull and push macros.
- *
-*/
-enum {
-  TTT = 4,
-  HOME_END,
-  CALC_PRINTSCREEN
-};
-static xtap ttt_state = {
-  .is_press_action = true,
-  .state = 0
-};
-//Already exists in gordon.c, shouldn't need this anymore
-/*// To activate SINGLE_HOLD, you will need to hold for 200ms first.
-// This tap dance favors keys that are used frequently in typing like 'f'
-int cur_dance (qk_tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted) {
-      return SINGLE_TAP;
-    }
-    else {
-      if (!state->pressed) return SINGLE_TAP;
-      else return SINGLE_HOLD;
-    }
-  }
-  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
-  //with single tap.
-  else if (state->count == 2) {
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
-  else if (state->count == 3) return TRIPLE_HOLD;
-  else return 8; //magic number. At some point this method will expand to work for more presses
-}*/
-/* "Super tap toggle"
- * Basically, TT but for two or more layers for a single key.
- * This particular dance:
- * Single tap/hold - TT for Function layer
- * Double tap/hold - TT for Numpad layer
- * Triple tap/hold - TT for Mouse layer
- *
-*/
-void TTT_finished (qk_tap_dance_state_t *state, void *user_data) {
-  ttt_state.state = cur_dance(state);
-  switch (ttt_state.state) {
-    case SINGLE_TAP: layer_invert(_FUNCTION); break;
-    case SINGLE_HOLD: layer_on(_FUNCTION); break;
-    case DOUBLE_TAP: layer_invert(_NUMPAD); break;
-    case DOUBLE_HOLD: layer_on(_NUMPAD); break;
-    case DOUBLE_SINGLE_TAP: layer_invert(_NUMPAD); break;
-    case TRIPLE_TAP: layer_invert(_MOUSE); break;
-    case TRIPLE_HOLD: layer_on(_MOUSE); break;
-  }
-}
-void TTT_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (ttt_state.state) {
-    case SINGLE_TAP: break;
-    case SINGLE_HOLD: layer_off(_FUNCTION); break;
-    case DOUBLE_TAP:  break;
-    case DOUBLE_HOLD: layer_off(_NUMPAD); break;
-    case DOUBLE_SINGLE_TAP:  break;
-    case TRIPLE_TAP:  break;
-    case TRIPLE_HOLD: layer_off(_MOUSE); break;
-  }
-  ttt_state.state = 0;
-}
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.      ,----+----+----+----+----+----+----.
-     MESC, Q  ,CSHW,ENAV, R  , T  ,SPC ,       CLPS, Y  , U  ,INAV, O  , P  ,TTT,
-  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
-     TAB , A , MEHS,DNUM,FCTL,GWIN,GRAVE,      TILD, H  ,JCTL, K ,MEHL,CLNMAUS,ENHM,
-  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
-    MINUS,ZCTL,MEHX, C  ,ALTV, B  ,DELETE,     INS ,ALTN, M  ,COMM,DOT ,SLSH,UNDS,
-  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
-                         LSHIFT,BSPSYM,                SPC ,ENTSYM
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_NUMPAD] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-         ,    ,    ,    ,ASTR,    ,    ,          ,    , 7  , 8  , 9  ,ASTR,/**/,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,MINS,PLUS,/**/,EQUAL,    ,   ,          ,    , 4  , 5  , 6  ,PLUS,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,SLSH,    ,    ,          ,    , 1  , 2  , 3  ,SLSH,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,                     , 0
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_SYMBOLS] = LAYOUT_kc(
-  //,----+----+-----+----+----+----+----.     ,----+----+----+----+----+----+----.
-         ,EXLM, AT  ,LCBR,RCBR,HASH,    ,          ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/,
-  //|----+----+-----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,EXLM,EXLM,LPRN,RPRN ,    ,    ,          ,    ,DQUO,EQUAL,QUOTE,RCBR,    ,
-  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
-      ,DOLLAR, PERC,LBRACKET,RBRACKET, ,      ,    ,PIPE,BSLASH,PLUS,  ,  ,  ,
-  //|----+----+-----+----+----+----+----|     |----+----+----+----+----+----+----|
-                          UNDS,/**/,                    ,/**/
-  // \-------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_FUNCTION] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-    F6F7 ,F1  ,F2  ,F3  ,ALF4,F5  ,F6  ,      F7  ,F8  ,F9  ,F10 ,F11 ,F12 ,/**/,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,                    ,
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_NAV] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-      ,   ,SNAPLEFT,/**/,SNAPRIGHT,,  ,           ,    ,    , UP ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     ,SNAPUP,PREVTAB, ,NEXTTAB,SNAPDOWN,,   ,    ,LEFT,DOWN,RGHT,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-    ,    ,WORKLEFT,    ,WORKRIGHT,,    ,          ,    ,PGUP,PGDN,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                            CDEL ,DEL,                 ,
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_TEXTNAV] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-         ,   ,    ,    ,    ,    ,  ,             ,    ,    ,/**/,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                                 ,    ,                 ,
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-   [_MOUSE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-         ,    ,    ,MS_UP,   ,   ,    ,      ,    ,    , UP ,    ,    ,    ,/**/
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-      ,   ,MS_LEFT,MS_DOWN,MS_RIGHT,   ,    ,     ,    ,LEFT,DOWN,RGHT,/**/,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                      ,MS_BTN1 ,MS_BTN2              ,
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  ),
-  [_MACROS] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-    /**/,RESET,SECRET_2,SECRET_3,   ,   ,   ,SYSTEM_SLEEP,    ,    ,INCL,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     CAD ,SECRET_1,    ,   ,   ,   ,   ,      ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     SCAP,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,SCAP,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,                    ,
-  // \------------------+----+----+---/       \---+----+----+-------------------/
-  )
-};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
-    /* include some kind of library or header */
-    case 0:
-      if (record->event.pressed) {
-        SEND_STRING("#include <>");
-        return MACRO( T(LEFT), END);
-      }
-      break;
-    case 1:
-      if (record->event.pressed) {
-        SEND_STRING("git pull");
-        return MACRO( T(ENT), END );
-      }
-      break;
-    case 2:
-      if (record->event.pressed){
-        SEND_STRING("git push");
-        return MACRO( T(ENT), END );
-      }
-      break;
-    case 3:
-      if (record->event.pressed){
-        // layer_on(_CAPS);
-        // register_code(KC_CAPSLOCK);
-        // unregister_code(KC_CAPSLOCK);
-      }
-      break;
-    case 4:
-      if (record->event.pressed){
-        // layer_off(_CAPS);
-        // register_code(KC_CAPSLOCK);
-        // unregister_code(KC_CAPSLOCK);
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
-void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
-    switch (layer) {
-      case _QWERTY:
-        set_led_green;
-        break;
-      case _MOUSE:
-        set_led_yellow;
-        break;
-      case _NUMPAD:
-        set_led_blue;
-        break;
-      case _SYMBOLS:
-        set_led_red;
-        break;
-      case _NAV:
-        set_led_magenta;
-        break;
-      case _MACROS:
-        set_led_green;
-        _delay_ms(45);
-        set_led_red;
-        _delay_ms(45);
-        break;
-      case _FUNCTION:
-        set_led_green;
-        _delay_ms(45);
-        set_led_blue;
-        _delay_ms(45);
-        break;
-      default:
-        set_led_green;
-        break;
-    }
-};
diff --git a/keyboards/claw44/rev1/rev1.h b/keyboards/claw44/rev1/rev1.h
index 79ae9586d..9a0597715 100644
--- a/keyboards/claw44/rev1/rev1.h
+++ b/keyboards/claw44/rev1/rev1.h
@@ -18,16 +18,3 @@
        { R25, R24, R23, R22, R21, R20 }, \
        { KC_NO, KC_NO, R33, R32, R31, R30 } \
    }
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                   L30, L31, L32, L33, R30, R31, R32, R33 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-                                      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##R30, KC_##R31, KC_##R32, KC_##R33 \
-    )
diff --git a/keyboards/comet46/comet46.h b/keyboards/comet46/comet46.h
index b6598f017..c108d4193 100644
--- a/keyboards/comet46/comet46.h
+++ b/keyboards/comet46/comet46.h
@@ -6,20 +6,6 @@
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
-#define LAYOUT_kc( \
-  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, k31, k32, k33,      k34, k35, k36, k37, k38, k41, k42,\
-                      k43, k44, k45,      k46, k47, k48     \
-) \
-{ \
-        { KC_##k13, KC_##k01, KC_##k26, KC_##k12, KC_##k00,      KC_##k11, KC_##k25, KC_##k42, KC_##k10, KC_##k24}, \
-        { KC_##k03, KC_##k28, KC_##k14, KC_##k02, KC_##k27,      KC_##k41, KC_##k09, KC_##k23, KC_##k38, KC_##k08}, \
-        { KC_##k31, KC_##k16, KC_##k04, KC_##k29, KC_##k15,      KC_##k22, KC_##k37, KC_##k07, KC_##k21, KC_##k36}, \
-        { KC_NO,    KC_##k32, KC_##k17, KC_##k05, KC_##k43,      KC_##k48, KC_##k06, KC_##k20, KC_##k35, KC_NO   },  \
-        { KC_NO,    KC_##k45, KC_##k33, KC_##k18, KC_##k44,      KC_##k47, KC_##k19, KC_##k34, KC_##k46, KC_NO   }, \
-}
 #define LAYOUT( \
  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,\
diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/comet46/keymaps/satt/keymap.c
index eec40eff4..98c3c175b 100644
--- a/keyboards/comet46/keymaps/satt/keymap.c
+++ b/keyboards/comet46/keymaps/satt/keymap.c
@@ -75,94 +75,90 @@ enum custom_keycodes {
 #define KC_CAD LCA(KC_DEL)
 #define KC_RST RESET
-// Fillers to make layering more clear
-#define KC_ KC_TRNS
-#define KC_XXXX KC_NO
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     CAEC, Q  , W  , E  , R  , T  ,                 Y  , U  , I  , O  , P  ,DEL ,
+     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     CSTB, A  , S  , D  , F  , G  ,LPRN,      RPRN, H  , J  , K  , L  ,SCLN,BSPC,
+     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_LPRN,      KC_RPRN, KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_BSPC,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,LBRC,      RBRC, N  , M  ,COMM,DOT ,SLSH,QUOT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBRC,      KC_RBRC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_QUOT,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         IMOF,LWR ,SPCT,      ENSF,RSE ,IMON
+                         KC_IMOF,KC_LWR ,KC_SPCT,      KC_ENSF,KC_RSE ,KC_IMON
  //                    +----+----+---/       \---+----+----+
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-         ,EXLM, AT ,HASH,DLR ,PERC,                CIRC,AMPR,ASTR,LPRN,RPRN,    ,
+     _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-         , F1 , F2 , F3 , F4 , F5 , F6 ,      GRV ,BSLS,MINS,EQL ,LBRC,RBRC,    ,
+     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_GRV ,KC_BSLS,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         , F7 , F8 , F9 , F10, F11, F12,      TILD,PIPE,UNDS,PLUS,LCBR,RCBR,    ,
+     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_TILD,KC_PIPE,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,    ,          ,    ,
+                         _______,_______,_______,      _______,_______,_______
  //                    +----+----+---/       \---+----+----+
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-         , 1  , 2  , 3  , 4  , 5  ,                 6  , 7  , 8  , 9  , 0  ,    ,
+     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,      XXXX,LEFT,DOWN, UP ,RGHT,END ,    ,
+     _______,_______,_______,_______,_______,_______,_______,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,      HOME,XXXX,PGDN,PGUP,XXXX,XXXX,    ,
+     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,    ,          ,    ,
+                         _______,_______,_______,      _______,_______,_______
  //                    +----+----+---/       \---+----+----+
  ),
-  [_PSEUDO_US] = LAYOUT_kc(
+  [_PSEUDO_US] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     CAEC, Q  , W  , E  , R  , T  ,                 Y  , U  , I  , O  , P  ,DEL ,
+     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     CSTB, A  , S  , D  , F  , G  ,JLPR,      JRPR, H  , J  , K  , L  ,J2US,BSPC,
+     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_JLPR,      KC_JRPR, KC_H  , KC_J  , KC_K  , KC_L  ,KC_J2US,KC_BSPC,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,J2US,      J2US, N  , M  ,COMM,DOT ,SLSH,J2US,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_J2US,      KC_J2US, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_J2US,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         IMOF,P_LW,SPCT,      ENSF,P_RS,IMON
+                         KC_IMOF,KC_P_LW,KC_SPCT,      KC_ENSF,KC_P_RS,KC_IMON
  //                    +----+----+---/       \---+----+----+
  ),
-  [_PSEUDO_US_LOWER] = LAYOUT_kc(
+  [_PSEUDO_US_LOWER] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-         ,EXLM,JAT ,HASH,DLR ,PERC,                JCIR,JAMP,JAST,JLPR,JRPR,    ,
+     _______,KC_EXLM,KC_JAT ,KC_HASH,KC_DLR ,KC_PERC,                KC_JCIR,KC_JAMP,KC_JAST,KC_JLPR,KC_JRPR,_______,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-         , F1 , F2 , F3 , F4 , F5 , F6 ,      JGRV,JBSL,MINS,JEQL,JLBR,JRBR,    ,
+     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_JGRV,KC_JBSL,KC_MINS,KC_JEQL,KC_JLBR,KC_JRBR,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         , F7 , F8 , F9 , F10, F11, F12,      JTIL,JPIP,JUND,JPLU,JLCB,JRCB,    ,
+     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_JTIL,KC_JPIP,KC_JUND,KC_JPLU,KC_JLCB,KC_JRCB,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,    ,          ,    ,
+                         _______,_______,_______,      _______,_______,_______
  //                    +----+----+---/       \---+----+----+
  ),
-  [_PSEUDO_US_RAISE] = LAYOUT_kc(
+  [_PSEUDO_US_RAISE] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-         , 1  , 2  , 3  , 4  , 5  ,                 6  , 7  , 8  , 9  , 0  ,    ,
+     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,JZHT,      XXXX,LEFT,DOWN, UP ,RGHT,END ,    ,
+     _______,_______,_______,_______,_______,_______,KC_JZHT,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,      HOME,XXXX,PGDN,PGUP,XXXX,XXXX,    ,
+     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,    ,          ,    ,
+                         _______,_______,_______,      _______,_______,_______
  //                    +----+----+---/       \---+----+----+
  ),
-  [_ADJUST] = LAYOUT_kc(
+  [_ADJUST] = LAYOUT(
  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,CAD ,      QWRT,    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,KC_CAD ,      KC_QWRT,_______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,RST ,      P_US,    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,KC_RST ,      KC_P_US,_______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                             ,    ,    ,          ,    ,
+                         _______,_______,_______,      _______,_______,_______
  //                    +----+----+---/       \---+----+----+
  )
diff --git a/keyboards/contra/contra.h b/keyboards/contra/contra.h
index 1ff481097..74aad77d0 100755
--- a/keyboards/contra/contra.h
+++ b/keyboards/contra/contra.h
@@ -27,17 +27,4 @@
  { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \
 }
-#define LAYOUT_kc_ortho_4x12( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) \
-  LAYOUT_ortho_4x12( \
-    KC_##K000,  KC_##K001,  KC_##K002,  KC_##K003,  KC_##K004,  KC_##K005,  KC_##K006,  KC_##K007,  KC_##K008,  KC_##K009,  KC_##K010,  KC_##K011, \
-    KC_##K100,  KC_##K101,  KC_##K102,  KC_##K103,  KC_##K104,  KC_##K105,  KC_##K106,  KC_##K107,  KC_##K108,  KC_##K109,  KC_##K110,  KC_##K111, \
-    KC_##K200,  KC_##K201,  KC_##K202,  KC_##K203,  KC_##K204,  KC_##K205,  KC_##K206,  KC_##K207,  KC_##K208,  KC_##K209,  KC_##K210,  KC_##K211, \
-    KC_##K300,  KC_##K301,  KC_##K302,  KC_##K303,  KC_##K304,  KC_##K305,  KC_##K306,  KC_##K307,  KC_##K308,  KC_##K309,  KC_##K310,  KC_##K311 \
-    )
 #endif
diff --git a/keyboards/crkbd/keymaps/like_jis/config.h b/keyboards/crkbd/keymaps/like_jis/config.h
deleted file mode 100644
index a061b4fb0..000000000
--- a/keyboards/crkbd/keymaps/like_jis/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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 USE_MATRIX_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define SSD1306OLED
-#define USE_SERIAL_PD2
-#define PREVENT_STUCK_MODIFIERS
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 250
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/like_jis/keymap.c b/keyboards/crkbd/keymaps/like_jis/keymap.c
deleted file mode 100644
index 41df6330f..000000000
--- a/keyboards/crkbd/keymaps/like_jis/keymap.c
+++ /dev/null
@@ -1,291 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-#include "oled_helper.h"
-extern keymap_config_t keymap_config;
-extern uint8_t is_master;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _BASE = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-  KANJI,
-  RGBRST
-};
-enum tapdances{
-  TD_CODO = 0,
-  // TD_MNUB,
-};
-// Layer Mode aliases
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_KANJI KANJI
-#define KC_RST   RESET
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_KNRM  AG_NORM
-#define KC_KSWP  AG_SWAP
-#define KC_TBSF  LSFT_T(KC_TAB)
-// #define KC_SPSF  LSFT_T(KC_SPC)
-#define KC_ALAP  LALT_T(KC_APP)
-#define KC_CODO  TD(TD_CODO)
-// #define KC_MNUB  TD(TD_MNUB)
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-  // [TD_MNUB] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, LSFT(KC_RO)),
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  MINS,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       TBSF,     A,     S,     D,     F,     G,                      H,     J,     K,     L,    UP,   ENT,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      LCTRL,     Z,     X,     C,     V,     B,                      N,     M,  CODO,  LEFT,  DOWN,  RGHT,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   LGUI, LOWER,  BSPC,      SPC, RAISE,  ALAP \
-                              //`--------------------'  `--------------------'
-  ),
-  [_LOWER] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-      _____,    F1,    F2,    F3,    F4,    F5,                  XXXXX,  MINS,   EQL,  JYEN,  LBRC,  RBRC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____,    F6,    F7,    F8,    F9,   F10,                  XXXXX, XXXXX, XXXXX,  SCLN,  QUOT,  BSLS,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____,   F11,   F12,   TAB, KANJI,   ENT,                  XXXXX, XXXXX,  COMM,   DOT,  SLSH,    RO,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____,   DEL,    _____, _____,   APP \
-                              //`--------------------'  `--------------------'
-  ),
-  [_RAISE] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-      _____,     1,     2,     3,     4,     5,                      6,     7,     8,     9,     0,  PSLS,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                   QUOT,     4,     5,     6,  PPLS,  PAST,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                      0,     1,     2,     3,   DOT,  PMNS,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____,  BSPC,    _____, _____,  LALT \
-                              //`--------------------'  `--------------------'
-  ),
-  [_ADJUST] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-      _____,    RST,  LRST,  KNRM, KSWP, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
-  //|------+-------+------+------+------+-----|                |------+------+------+------+------+------|
-      _____,   LTOG,  LHUI,  LSAI, LVAI, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX,  PGUP, XXXXX,\
-  //|------+-------+------+------+------+-----|                |------+------+------+------+------+------|
-      _____,   LMOD,  LHUD,  LSAD, LVAD, XXXXX,                  XXXXX, XXXXX, XXXXX,  HOME,  PGDN,   END,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____, XXXXX,    _____, _____, XXXXX \
-                              //`--------------------'  `--------------------'
-  )
-};
-#define L_BASE _BASE
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-#ifdef SSD1306OLED
-typedef struct {
-  uint8_t state;
-  char name[8];
-}LAYER_DISPLAY_NAME;
-#define LAYER_DISPLAY_MAX 5
-const LAYER_DISPLAY_NAME layer_display_name[LAYER_DISPLAY_MAX] = {
-  {L_BASE, "Base"},
-  {L_BASE + 1, "Base"},
-  {L_LOWER, "Lower"},
-  {L_RAISE, "Raise"},
-  {L_ADJUST_TRI, "Adjust"}
-};
-static inline const char* get_leyer_status(void) {
-  for (uint8_t i = 0; i < LAYER_DISPLAY_MAX; ++i) {
-    if (layer_state == 0 && layer_display_name[i].state == default_layer_state) {
-      return layer_display_name[i].name;
-    } else if (layer_state != 0 && layer_display_name[i].state == layer_state) {
-      return layer_display_name[i].name;
-    }
-  }
-  return "?";
-}
-static char layer_status_buf[24] = "Layer state ready.\n";
-static inline void update_keymap_status(void) {
-  snprintf(layer_status_buf, sizeof(layer_status_buf) - 1, "OS:%s Layer:%s\n",
-    keymap_config.swap_lalt_lgui? "win" : "mac", get_leyer_status());
-}
-static inline void render_keymap_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, layer_status_buf);
-}
-#define UPDATE_KEYMAP_STATUS() update_keymap_status()
-#define RENDER_KEYMAP_STATUS(a) render_keymap_status(a)
-#else
-#define UPDATE_KEYMAP_STATUS()
-#define RENDER_KEYMAP_STATUS(a)
-#endif
-static inline void update_change_layer(bool pressed, uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  pressed ? layer_on(layer1) : layer_off(layer1);
-  IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2) ? layer_on(layer3) : layer_off(layer3);
-}
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  UPDATE_KEY_STATUS(keycode, record);
-  bool result = false;
-  switch (keycode) {
-    case LOWER:
-      update_change_layer(record->event.pressed, _LOWER, _RAISE, _ADJUST);
-      break;
-    case RAISE:
-      update_change_layer(record->event.pressed, _RAISE, _LOWER, _ADJUST);
-        break;
-    case KANJI:
-      if (record->event.pressed) {
-        if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LANG2);
-        } else {
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LANG2);
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGBRST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-  UPDATE_KEYMAP_STATUS();
-  return result;
-}
-void matrix_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_config.mode;
-    UPDATE_KEYMAP_STATUS();
-  #endif
-  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-  #ifdef SSD1306OLED
-    iota_gfx_init(!has_usb()); // turns on the display
-  #endif
-}
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-void matrix_scan_user(void) {
-  iota_gfx_task();  // this is what updates the display continuously
-}
-static inline void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-static inline void render_status(struct CharacterMatrix *matrix) {
-  UPDATE_LED_STATUS();
-  RENDER_LED_STATUS(matrix);
-  RENDER_KEYMAP_STATUS(matrix);
-  UPDATE_LOCK_STATUS();
-  RENDER_LOCK_STATUS(matrix);
-  RENDER_KEY_STATUS(matrix);
-}
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  #if DEBUG_TO_SCREEN
-    if (debug_enable) {
-      return;
-    }
-  #endif
-  matrix_clear(&matrix);
-  if (is_master) {
-    render_status(&matrix);
-  } else {
-    RENDER_LOGO(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-#endif
diff --git a/keyboards/crkbd/keymaps/like_jis/oled_helper.c b/keyboards/crkbd/keymaps/like_jis/oled_helper.c
deleted file mode 100644
index 500d3c0dc..000000000
--- a/keyboards/crkbd/keymaps/like_jis/oled_helper.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifdef SSD1306OLED
-#include QMK_KEYBOARD_H
-#include "ssd1306.h"
-void render_logo(struct CharacterMatrix *matrix) {
-  const char logo_buf[]={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  matrix_write(matrix, logo_buf);
-}
-static char keylog_buf[24] = "Key state ready.";
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', ' ', '-', ' ', '@', ' ', ' ',
-    ' ', ';', ':', ' ', ',', '.', '/', ' ', ' ', ' '};
-void update_key_status(uint16_t keycode, keyrecord_t *record) {
-  if (!record->event.pressed) return;
-  char name = (keycode < 60) ? code_to_name[keycode] : ' ';
-  snprintf(keylog_buf, sizeof(keylog_buf) - 1, "Key:%dx%d %2x %c",
-          record->event.key.row, record->event.key.col,
-          (uint16_t)keycode, name);
-}
-void render_key_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, keylog_buf);
-}
-static char lock_buf[24] = "Lock state ready.\n";
-void update_lock_status(void) {
-  uint8_t leds = host_keyboard_leds();
-  char *num_lock = (leds & (1<<USB_LED_NUM_LOCK)) ? "Num" : "";
-  char *caps_lock = (leds & (1<<USB_LED_CAPS_LOCK)) ? "Caps" : "";
-  char *scrl_lock = (leds & (1<<USB_LED_SCROLL_LOCK)) ? "Scrn" : "";
-  snprintf(lock_buf, sizeof(lock_buf) - 1, "Lock:%s %s %s\n",
-          num_lock, caps_lock, scrl_lock);
-}
-void render_lock_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, lock_buf);
-}
-#ifdef RGBLIGHT_ENABLE
-extern rgblight_config_t rgblight_config;
-static char led_buf[24] = "LED state ready.\n";
-rgblight_config_t rgblight_config_bak;
-void update_led_status(void) {
-  if (rgblight_config_bak.enable != rgblight_config.enable ||
-      rgblight_config_bak.mode != rgblight_config.mode ||
-      rgblight_config_bak.hue != rgblight_config.hue ||
-      rgblight_config_bak.sat != rgblight_config.sat ||
-      rgblight_config_bak.val != rgblight_config.val
-  ) {
-    snprintf(led_buf, sizeof(led_buf) - 1, "LED%c:%2d hsv:%2d %2d %2d\n",
-      rgblight_config.enable ? '*' : '.', (uint8_t)rgblight_config.mode,
-      (uint8_t)(rgblight_config.hue / RGBLIGHT_HUE_STEP),
-      (uint8_t)(rgblight_config.sat / RGBLIGHT_SAT_STEP),
-      (uint8_t)(rgblight_config.val / RGBLIGHT_VAL_STEP));
-      rgblight_config_bak = rgblight_config;
-  }
-}
-void render_led_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, led_buf);
-}
-#endif
-#endif
diff --git a/keyboards/crkbd/keymaps/like_jis/oled_helper.h b/keyboards/crkbd/keymaps/like_jis/oled_helper.h
deleted file mode 100644
index 44628a526..000000000
--- a/keyboards/crkbd/keymaps/like_jis/oled_helper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifdef SSD1306OLED
-void render_logo(struct CharacterMatrix *matrix);
-void update_key_status(uint16_t keycode, keyrecord_t *record);
-void render_key_status(struct CharacterMatrix *matrix);
-void update_lock_status(void);
-void render_lock_status(struct CharacterMatrix *matrix);
-#define RENDER_LOGO(a) render_logo(a)
-#define UPDATE_KEY_STATUS(a, b) update_key_status(a, b)
-#define RENDER_KEY_STATUS(a) render_key_status(a)
-#define UPDATE_LOCK_STATUS() update_lock_status()
-#define RENDER_LOCK_STATUS(a) render_lock_status(a)
-#ifdef RGBLIGHT_ENABLE
-  void update_led_status(void);
-  void render_led_status(struct CharacterMatrix *matrix);
-  #define UPDATE_LED_STATUS() update_led_status()
-  #define RENDER_LED_STATUS(a) render_led_status(a)
-#else
-  #define UPDATE_LED_STATUS()
-  #define RENDER_LED_STATUS(a)
-#endif
-#else
-#define RENDER_LOGO(a)
-#define UPDATE_KEY_STATUS(a, b)
-#define RENDER_KEY_STATUS(a)
-#define UPDATE_LOCK_STATUS()
-#define RENDER_LOCK_STATUS(a)
-#define UPDATE_LED_STATUS()
-#define RENDER_LED_STATUS(a)
-#endif
diff --git a/keyboards/crkbd/keymaps/like_jis/rules.mk b/keyboards/crkbd/keymaps/like_jis/rules.mk
deleted file mode 100644
index 92f4693aa..000000000
--- a/keyboards/crkbd/keymaps/like_jis/rules.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-TAP_DANCE_ENABLE = yes
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-Link_Time_Optimization = yes # if firmware size over limit, try this option
-ifeq ($(strip $(Link_Time_Optimization)),yes)
-    EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
-endif
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        oled_helper.c \
diff --git a/keyboards/crkbd/keymaps/omgvee/config.h b/keyboards/crkbd/keymaps/omgvee/config.h
deleted file mode 100644
index 5699c3beb..000000000
--- a/keyboards/crkbd/keymaps/omgvee/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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 USE_MATRIX_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define SSD1306OLED
-#define USE_SERIAL_PD2
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define BACKLIGHT_LEVELS 10
-#undef PRODUCT
-#define PRODUCT "Vee's hotswappable Helidox/Corne/CRKBD split keeb"
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/crkbd/keymaps/omgvee/keymap.c b/keyboards/crkbd/keymaps/omgvee/keymap.c
deleted file mode 100644
index 2c33d8b8c..000000000
--- a/keyboards/crkbd/keymaps/omgvee/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-extern keymap_config_t keymap_config;
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-extern uint8_t is_master;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBRST
-};
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_RST   RESET
-#define KC_ERST  EEPROM_RESET
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_SFCPS SFT_T(KC_CAPS)
-#define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LANG2)
-#define KC_ALTKN ALT_T(KC_LANG1)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  BSPC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      SFCPS,     A,     S,     D,     F,     G,                      H,     J,     K,     L,  SCLN,  QUOT,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB,     Z,     X,     C,     V,     B,                      N,     M,  COMM,   DOT,  SLSH,  RSFT,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   ENT,      SPC, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_LOWER] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        GRV,     1,     2,     3,     4,     5,                      6,     7,     8,     9,     0,  BSPC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      SFCPS,    F1,    F2,    F3,    F4,    F5,                     F6,    F7,    F8,    F9,   F10,   ENT,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB,   F11,   F12,   F13,   F14,   F15,                    F16,   F17,   F18,   F19,   F20,  RSFT,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   ENT,      SPC, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_RAISE] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        TAB,  EXLM,    AT,  HASH,   DLR,  PERC,                   CIRC,  AMPR,  ASTR,  LPRN,  RPRN,   DEL,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      SFCPS, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                   MINS,   EQL,  LCBR,  RCBR,  PIPE,  BSLS,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB, XXXXX,  VOLD,  VOLU,  MUTE,  MPLY,                   UNDS,  PLUS,  LBRC,  RBRC,  SLSH,  RSFT,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   ENT,      SPC, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_ADJUST] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        RST,  LRST, XXXXX, XXXXX, XXXXX, ERST,                    MNXT,  MPRV,  MFFD,  MRWD, XXXXX,  EJCT,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LTOG,  LHUI,  LSAI,  LVAI,  PGUP, HOME,                    LEFT,  DOWN,    UP, RIGHT, XXXXX,   INS,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LMOD,  LHUD,  LSAD,  LVAD,  PGDN,  END,                    BRID,  BRIU,  VOLD,  VOLU,  MUTE,  MPLY,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   ENT,      SPC, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  )
-};
-int RGB_current_mode;
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write(matrix, read_logo());
-  }
-}
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/omgvee/readme.md b/keyboards/crkbd/keymaps/omgvee/readme.md
deleted file mode 100644
index bc316c2a3..000000000
--- a/keyboards/crkbd/keymaps/omgvee/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Reade.md for what I want from my HeliDox(CRKBD) layout
-======================================================
-![My beloved HeliDox keeb](https://i.imgur.com/NbVAB3g.jpg)
- media keys and media controls
- in-switch LED intensity controls (+/-)
- underglow RGB hue/color controls
- underglow RGB intensity controls
- familiar key arrangement with Enter and symbols on the usual keys (to the right hand side)
- navigation keys should be the vim ones really;
- arrow keys on one layer(most likely on the ADJUST one)
-See keymap.c for layouts
-P.S> this lil' keeb is so addictive I have no words, really...
diff --git a/keyboards/crkbd/keymaps/omgvee/rules.mk b/keyboards/crkbd/keymaps/omgvee/rules.mk
deleted file mode 100644
index 88e43aa99..000000000
--- a/keyboards/crkbd/keymaps/omgvee/rules.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-EXTRAFLAGS += -flto
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/rs/keymap.c b/keyboards/crkbd/keymaps/rs/keymap.c
index 135ccb076..7e2a2e066 100644
--- a/keyboards/crkbd/keymaps/rs/keymap.c
+++ b/keyboards/crkbd/keymaps/rs/keymap.c
@@ -2,37 +2,37 @@
 #include "rs.h"
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,EQL ,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_EQL ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESCC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,                N  , M  ,COMM,DOT ,SLSH,ENTS,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENTS,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LGUI,SPC ,         BSPC,CODE,FN
+                       KC_LALT,KC_LGUI,KC_SPC ,         KC_BSPC,KC_CODE,KC_FN
  //                  `----+----+----'        `+---+----+----'c
  ),
-  [_CODE] = LAYOUT_kc(
+  [_CODE] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH, DLR,PERC,               CIRC,LPLT,ASTR,RPGT,NEQL,    ,
+     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,               KC_CIRC,KC_LPLT,KC_ASTR,KC_RPGT,KC_NEQL,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,               MINS,LBRC, UP ,RBRC,    ,BSLS,
+     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,               KC_MINS,KC_LBRC, KC_UP ,KC_RBRC,_______,KC_BSLS,
  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-         , 6  , 7  , 8  , 9  , 0  ,               AMPR,LEFT,DOWN,RGHT,    ,PIPE,
+     _______, KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,               KC_AMPR,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_PIPE,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DOT ,             ,    ,
+                       _______,_______,KC_DOT ,         _______,_______,_______
  //                  `----+----+----'        `----+----+----'
  ),
-  [_FN] = LAYOUT_kc(
+  [_FN] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 , F10, F11,
+     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LTOG,LHUI,LSAI,LVAI,LRST,BRMU,               VOLU,    ,PGUP,    ,    ,    ,
+     KC_LTOG,KC_LHUI,KC_LSAI,KC_LVAI,KC_LRST,KC_BRMU,               KC_VOLU,_______,KC_PGUP,_______,_______,_______,
  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     LMOD,LHUD,LSAD,LVAD,RST ,BRMD,               VOLD,CTRA,PGDN,CTRE,    ,    ,
+     KC_LMOD,KC_LHUD,KC_LSAD,KC_LVAD,KC_RST ,KC_BRMD,               KC_VOLD,KC_CTRA,KC_PGDN,KC_CTRE,_______,_______,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,         MUTE,    ,     
+                       _______,_______,_______,         KC_MUTE,_______,_______
  //                  `----+----+----'        `----+----+----'
  ),
 };
diff --git a/keyboards/crkbd/keymaps/thefrey/README.md b/keyboards/crkbd/keymaps/thefrey/README.md
deleted file mode 100644
index 69b20cfcd..000000000
--- a/keyboards/crkbd/keymaps/thefrey/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-![the-frey-layout](https://raw.githubusercontent.com/the-frey/the-frey.github.com/master/assets/images/keyboard-layout.jpg)
-# Keyboard layout by the-frey
-This is a layout that allows access to all the paren keys easily, has a tab on the lower layer (for SUPER-TAB app switching) and some utility features like PGUP/PGDOWN and HOME/END.
-In addition, the arrows are on the lower layer and are bound to the vim keys (h,j,k,l). I've found this a productive layout for programming in emacs and hopefully you will too. 
-The layout image above shows the keymap, with each key marked with all three layers:
- The top indicates the raise layer
- The middle indicates the default layer
- The bottom indicates the lower layer
-All the keys respond as you'd expect to the 'shift' key - i.e. on a UK/GB keyboard, `/` becomes `?` and so on.
diff --git a/keyboards/crkbd/keymaps/thefrey/config.h b/keyboards/crkbd/keymaps/thefrey/config.h
deleted file mode 100644
index cee901fc8..000000000
--- a/keyboards/crkbd/keymaps/thefrey/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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 USE_MATRIX_I2C
-#define FORCE_NKRO
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define SSD1306OLED
-#define USE_SERIAL_PD2
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/thefrey/keymap.c b/keyboards/crkbd/keymaps/thefrey/keymap.c
deleted file mode 100644
index 9a142a924..000000000
--- a/keyboards/crkbd/keymaps/thefrey/keymap.c
+++ /dev/null
@@ -1,243 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-extern keymap_config_t keymap_config;
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-extern uint8_t is_master;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBRST
-};
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_RST   RESET
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LANG2)
-#define KC_ALTKN ALT_T(KC_LANG1)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  BSPC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB,     A,     S,     D,     F,     G,                      H,     J,     K,     L,  SCLN,  QUOT,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LSFT,     Z,     X,     C,     V,     B,                      N,     M,  COMM,   DOT,  SLSH,  RSFT,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   SPC,      ENT, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_LOWER] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        TAB,     1,     2,     3,     4,     5,                      6,     7,     8,     9,     0,  BSPC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB, MUTE,   VOLD,  VOLU,  PGUP,  PGDN,                   LEFT,  DOWN,    UP, RIGHT,  HOME,   END,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LSFT,    F1,    F2,    F3,    F4,    F5,                     F6,    F7,    F8,    F9,   F10, XXXXX,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   SPC,      ENT, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_RAISE] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,  EXLM,    AT,  HASH,   DLR,  PERC,                   CIRC,  AMPR,  ASTR,  LPRN,  RPRN,  BSPC,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                   MINS,   EQL,  LCBR,  RCBR,  PIPE,   GRV,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LSFT, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                   UNDS,  PLUS,  LBRC,  RBRC,  BSLS,  TILD,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   SPC,      ENT, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  ),
-  [_ADJUST] = LAYOUT_kc( \
-  //,-----------------------------------------.                ,-----------------------------------------.
-        RST,  LRST, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LTOG,  LHUI,  LSAI,  LVAI, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LMOD,  LHUD,  LSAD,  LVAD, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   SPC,      ENT, RAISE, ALTKN \
-                              //`--------------------'  `--------------------'
-  )
-};
-int RGB_current_mode;
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
-}
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/thefrey/rules.mk b/keyboards/crkbd/keymaps/thefrey/rules.mk
deleted file mode 100644
index 16deaf45d..000000000
--- a/keyboards/crkbd/keymaps/thefrey/rules.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
index c67958aa1..0011b1143 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
@@ -62,51 +62,51 @@ enum custom_keycodes {
 #define KC_ALTDL ALT_T(KC_DEL)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  BSPC,
+        KC_ESC,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_BSPC,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      CTLTB,     A,     S,     D,     F,     G,                      H,     J,     K,     L,  SCLN,  QUOT,
+      KC_CTLTB,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L,  KC_SCLN,  KC_QUOT,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LSFT,     Z,     X,     C,     V,     B,                      N,     M,  COMM,   DOT,  SLSH,   ENT,
+       KC_LSFT,     KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,   KC_ENT,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  ALTSP, LOWER, GUIEN,    SFTJP, RAISE, ALTDL
+                                  KC_ALTSP, KC_LOWER, KC_GUIEN,    KC_SFTJP, KC_RAISE, KC_ALTDL
                              //`--------------------'  `--------------------'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-           ,     1,     2,     3,     4,     5,                      6,     7,     8,     9,     0,      ,
+       _______,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  _______,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-           ,  HOME,   END,  PGDN,  PGUP,   F11,                   LEFT,  DOWN,    UP,  RGHT,   F12,  PIPE,
+       _______,  KC_HOME,   KC_END,  KC_PGDN,  KC_PGUP,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,   KC_F12,  KC_PIPE,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-           ,    F1,    F2,    F3,    F4,    F5,                     F6,    F7,    F8,    F9,   F10,      ,
+       _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  _______,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                       ,      ,      ,         ,      ,       
+                                   _______,  _______,  _______,     _______,  _______, _______
                              //`--------------------'  `--------------------'
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-           ,  EXLM,    AT,  HASH,   DLR,  PERC,                   CIRC,  AMPR,  ASTR,  LPRN,  RPRN,      ,
+       _______,  KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,  KC_PERC,                   KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-           , XXXXX, XXXXX, XXXXX, XXXXX,  PSCR,                    GRV,  MINS,  PLUS,  LCBR,  RCBR,  BSLS,
+       _______, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,  KC_PSCR,                    KC_GRV,  KC_MINS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_BSLS,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-           , XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                   TILD,  UNDS,   EQL,  LBRC,  RBRC,      ,
+       _______, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                   KC_TILD,  KC_UNDS,   KC_EQL,  KC_LBRC,  KC_RBRC,  _______,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                       ,      ,      ,         ,      ,       
+                                   _______,  _______,  _______,     _______,  _______, _______
                              //`--------------------'  `--------------------'
  ),
-  [_ADJUST] = LAYOUT_kc(
+  [_ADJUST] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        RST,  LRST, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+        KC_RST,  KC_LRST, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LTOG,  LHUI,  LSAI,  LVAI, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LMOD,  LHUD,  LSAD,  LVAD, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  GUIEI, LOWER,   SPC,      ENT, RAISE, ALTKN 
+                                  KC_GUIEI, KC_LOWER,   KC_SPC,      KC_ENT, KC_RAISE, KC_ALTKN 
                              //`--------------------'  `--------------------'
  )
 };
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
index 48f60419f..0bdc9d265 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
@@ -31,8 +31,6 @@ enum custom_keycodes {
  SCRL
 };
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
 #define KC_LOWER LOWER
 #define KC_RAISE RAISE
 #define KC_RST   RESET
@@ -57,51 +55,51 @@ enum custom_keycodes {
 #define KC_SCRL   SCRL
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  BSPC,
+        KC_ESC,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_BSPC,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-        TAB,  CTLA,     S,     D,     F,     G,                      H,     J,     K,     L, CTLSC,  QUOT,
+        KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      GRAVE,  SFTZ,  WINX,     C,     V,     B,                      N,     M,  COMM, WINDO, SFTSL,BSLASH,
+      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLASH,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC, XXXXX,  PGDN,  PSCR,  PGUP,  LBRC,                   RBRC,     7,     8,     9, XXXXX, XXXXX,
+        KC_ESC, XXXXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, XXXXXXX, XXXXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX, LCTRL,  PLUS,  MINS,   EQL,  LPRN,                   RPRN,     4,     5,     6, RCTRL, XXXXX,
+      XXXXXXX, KC_LCTRL,  KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTRL, XXXXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX,  LSFT,  HOME, XXXXX,   END,  LCBR,                   RCBR,     1,     2,     3,  RSFT, XXXXX,
+      XXXXXXX,  KC_LSFT,  KC_HOME, XXXXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, XXXXXXX,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT,     0
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT,     KC_0
                              //`--------------------'  `--------------------'
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC, XXXXX,    F7,    F8,    F9,   F10,                   BTN2,  BTN2,  MNXT,  MPRV,  MPLY,  MSTP,
+        KC_ESC, XXXXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX, LCTRL,    F4,    F5,    F6,   F11,                   LEFT,  DOWN,    UP, RIGHT, RCTRL, XXXXX,
+      XXXXXXX, KC_LCTRL,    KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTRL, XXXXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX,  LSFT,    F1,    F2,    F3,   F12,                  XXXXX, XXXXX,  VOLU,  VOLD,  MUTE,  RSFT,
+      XXXXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  XXXXXXX, XXXXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  ),
-  [_ADJUST] = LAYOUT_kc(
+  [_ADJUST] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        RST,  LRST, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,   RST,
+        KC_RST,  KC_LRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_RST,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LTOG,  LHUI,  LSAI,  LVAI, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LMOD,  LHUD,  LSAD,  LVAD, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  )
 };
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
index 8749f7a68..dc176a9fd 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
@@ -60,51 +60,51 @@ enum custom_keycodes {
 #define KC_SCRL   SCRL
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,                      Y,     U,     I,     O,     P,  BSPC,
+        KC_ESC,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_BSPC,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-        TAB,  CTLA,     S,     D,     F,     G,                      H,     J,     K,     L, CTLSC,  QUOT,
+        KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      GRAVE,  SFTZ,  WINX,     C,     V,     B,                      N,     M,  COMM, WINDO, SFTSL,BSLASH,
+      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLASH,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC, XXXXX,  PGDN,  PSCR,  PGUP,  LBRC,                   RBRC,     7,     8,     9, XXXXX, XXXXX,
+        KC_ESC, KC_XXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX, LCTRL,  PLUS,  MINS,   EQL,  LPRN,                   RPRN,     4,     5,     6, RCTRL, XXXXX,
+      KC_XXXXX, KC_LCTRL,  KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTRL, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX,  LSFT,  HOME, XXXXX,   END,  LCBR,                   RCBR,     1,     2,     3,  RSFT, XXXXX,
+      KC_XXXXX,  KC_LSFT,  KC_HOME, KC_XXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, KC_XXXXX,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT,     0
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT,     KC_0
                              //`--------------------'  `--------------------'
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        ESC, XXXXX,    F7,    F8,    F9,   F10,                   BTN2,  BTN2,  MNXT,  MPRV,  MPLY,  MSTP,
+        KC_ESC, KC_XXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX, LCTRL,    F4,    F5,    F6,   F11,                   LEFT,  DOWN,    UP, RIGHT, RCTRL, XXXXX,
+      KC_XXXXX, KC_LCTRL,    KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTRL, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXX,  LSFT,    F1,    F2,    F3,   F12,                  XXXXX, XXXXX,  VOLU,  VOLD,  MUTE,  RSFT,
+      KC_XXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  KC_XXXXX, KC_XXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  ),
-  [_ADJUST] = LAYOUT_kc(
+  [_ADJUST] = LAYOUT(
  //,-----------------------------------------.                ,-----------------------------------------.
-        RST,  LRST, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,   RST,
+        KC_RST,  KC_LRST, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,   KC_RST,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LTOG,  LHUI,  LSAI,  LVAI, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LMOD,  LHUD,  LSAD,  LVAD, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,
+       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  LOWER,   SPC,  SCRL,    MBTN1,   ENT, RAISE
+                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
                              //`--------------------'  `--------------------'
  )
 };
diff --git a/keyboards/crkbd/keymaps/vxid/keymap.c b/keyboards/crkbd/keymaps/vxid/keymap.c
index e1c73caeb..2b600cdd4 100644
--- a/keyboards/crkbd/keymaps/vxid/keymap.c
+++ b/keyboards/crkbd/keymaps/vxid/keymap.c
@@ -25,39 +25,39 @@ enum custom_keycodes {
 #define KC_RAISE RAISE
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc( \
+  [_QWERTY] = LAYOUT( \
  //,-----------------------------------------.                ,-----------------------------------------.
-          Q,     W,     E,     R,     T,   ESC,                    DEL,     Y,     U,     I,     O,     P,\
+          KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,   KC_ESC,                    KC_DEL,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,\
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          A,     S,     D,     F,     G,   SPC,                   BSPC,     H,     J,     K,     L,  SCLN,\
+          KC_A,     KC_S,     KC_D,     KC_F,     KC_G,   KC_SPC,                   KC_BSPC,     KC_H,     KC_J,     KC_K,     KC_L,  KC_SCLN,\
  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          Z,     X,     C,     V,     B,   TAB,                    ENT,     N,     M,  COMM,   DOT,  SLSH,\
+          KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,   KC_TAB,                    KC_ENT,     KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,\
  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   LALT,  LGUI,  LCTL,     LSFT, RAISE, LOWER \
+                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER \
                              //`--------------------'  `--------------------'
  ),
-  [_LOWER] = LAYOUT_kc( \
+  [_LOWER] = LAYOUT( \
  //,-----------------------------------------.                ,------------------------------------------.
-          1,     2,     3,     4,     5, XXXXX,                   XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
+          KC_1,     KC_2,     KC_3,     KC_4,     KC_5, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\
  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-          6,     7,     8,     9,     0, XXXXX,                   XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
+          KC_6,     KC_7,     KC_8,     KC_9,     KC_0, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\
  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-        EQL,  PLUS,  MINS,  SLSH,  ASTR, XXXXX,                   XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
+        KC_EQL,  KC_PLUS,  KC_MINS,  KC_SLSH,  KC_ASTR, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\
  //|------+------+------+------+------+------+------|  |------+-------+------+------+------+------+------|
-                                   LALT,  LGUI,  LCTL,     LSFT, RAISE, LOWER \
+                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER \
                              //`--------------------'  `--------------------'
  ),
-  [_RAISE] = LAYOUT_kc( \
+  [_RAISE] = LAYOUT( \
  //,-----------------------------------------.                ,------------------------------------------.
-       EXLM,    AT,  HASH,   DLR,  PERC,  LPRN,                    RPRN, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
+       KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,  KC_PERC,  KC_LPRN,                    KC_RPRN, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\
  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-       CIRC,  AMPR,  ASTR,  QUOT,  DQUO,  LCBR,                    RCBR,  LEFT,  DOWN,    UP, RIGHT, XXXXX,\
+       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_QUOT,  KC_DQUO,  KC_LCBR,                    KC_RCBR,  KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_XXXXX,\
  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-       BSLS,  TILD,   GRV,  UNDS,  PIPE,  LBRC,                    RBRC, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,\
+       KC_BSLS,  KC_TILD,   KC_GRV,  KC_UNDS,  KC_PIPE,  KC_LBRC,                    KC_RBRC, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,\
  //|------+------+------+------+------+------+------|  |------+-------+------+------+------+------+------|
-                                   LALT,  LGUI,  LCTL,     LSFT, RAISE, LOWER \
+                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER \
                              //`--------------------'  `--------------------'
  )
 };
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
index c805efccc..5446583b1 100644
--- a/keyboards/crkbd/rev1/rev1.h
+++ b/keyboards/crkbd/rev1/rev1.h
@@ -70,18 +70,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
  }
-#define LAYOUT_kc( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                      L30, L31, L32, R30, R31, R32 \
-  ) \
-  LAYOUT_split_3x6_3( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-                                            KC_##L30, KC_##L31, KC_##L32, KC_##R30, KC_##R31, KC_##R32 \
-  )
-// clang-format on
 #define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h
index d791cf7c0..0b1c83761 100644
--- a/keyboards/dm9records/plaid/plaid.h
+++ b/keyboards/dm9records/plaid/plaid.h
@@ -44,25 +44,9 @@
        { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_plaid_grid
-#define KC_KEYMAP( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-        ) \
-        LAYOUT_plaid_grid( \
-                KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-                KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-                KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-                KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-    )
-#define KEYMAP LAYOUT_plaid_grid
 #define LAYOUT_ortho_4x12 LAYOUT_plaid_grid
 #define LAYOUT_planck_mit LAYOUT_plaid_mit
-#define LAYOUT_kc_ortho_4x12 KC_KEYMAP
-#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 #define LED_RED C5
 #define LED_GREEN C4
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h
index 8c57244fb..211e41fe8 100644
--- a/keyboards/eco/eco.h
+++ b/keyboards/eco/eco.h
@@ -10,18 +10,4 @@
 #include "quantum.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314  \
-    ) \
-    { \
-        { KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k010, KC_##k011, KC_##k012, KC_##k013, KC_##k014 }, \
-        { KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k110, KC_##k111, KC_##k112, KC_##k113, KC_##k114 }, \
-        { KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k210, KC_##k211, KC_##k212, KC_##k213, KC_##k214 }, \
-        { KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k310, KC_##k311, KC_##k312, KC_##k313, KC_##k314 }  \
-    }
 #endif
diff --git a/keyboards/eco/keymaps/hexwire/keymap.c b/keyboards/eco/keymaps/hexwire/keymap.c
deleted file mode 100644
index 3f21eacd3..000000000
--- a/keyboards/eco/keymaps/hexwire/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-// Default ECO Layout
-// KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _FN3 3
-enum eco_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-// Fillers to make layering more clear
-#define KC_ KC_TRNS
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_LOWR MO(_LOWER)
-#define KC_RASE MO(_RAISE)
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_GRVF LT(_FN3, KC_GRV)
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,LPRN,RPRN, Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,LBRC,RBRC, H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,LCBR,RCBR, N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     GRVF,LCTL,LALT,LGUI,LOWR,SPC ,SPC ,BSPC,BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----+----+----+----+----.
-         , 1  , 2  , 3  , 4  , 5  ,LPRN,RPRN, 6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,LBRC,RBRC,RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,CPYP,    ,    ,DOWN,LCBR,LCBR,RCBR,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,DEL ,DEL ,    , P0 ,PDOT,    ,
-  //`----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----+----+----+----+----.
-         ,EXLM, AT ,HASH,DLR ,PERC,    ,    ,CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,    ,    ,EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,    ,PLUS,END ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,    ,    , F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     RTOG,RMOD,RHUI,RSAI,RVAI,    ,    ,    ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     RST ,DBUG,RHUD,RSAD,RVAD,    ,    ,    ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-  ),
-};
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/eco/keymaps/hexwire/rules.mk b/keyboards/eco/keymaps/hexwire/rules.mk
deleted file mode 100644
index 83d1175db..000000000
--- a/keyboards/eco/keymaps/hexwire/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/ergo42/ergo42.h b/keyboards/ergo42/ergo42.h
index ced1709d3..656b21130 100644
--- a/keyboards/ergo42/ergo42.h
+++ b/keyboards/ergo42/ergo42.h
@@ -5,19 +5,3 @@
 #ifdef KEYBOARD_ergo42_rev1
    #include "rev1.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc_ortho_4x14( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36 \
-    )
-#define LAYOUT_kc LAYOUT_kc_ortho_4x14
diff --git a/keyboards/ergodash/ergodash.h b/keyboards/ergodash/ergodash.h
index 83c785930..5fba70e75 100644
--- a/keyboards/ergodash/ergodash.h
+++ b/keyboards/ergodash/ergodash.h
@@ -1,44 +1,11 @@
-#ifndef ERGODASH_H
+#pragma once
-#define ERGODASH_H
 #include "quantum.h"
 #ifdef KEYBOARD_ergodash_rev1
    #include "rev1.h"
-    // Used to create a keymap using only KC_ prefixed keys
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-        L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-        L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-        L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-        L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
-        ) \
-        LAYOUT( \
-            KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-            KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-            KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-            KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \
-            KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46  \
-        )
 #endif // #ifdef KEYBOARD_ergodash_rev1
 #ifdef KEYBOARD_ergodash_mini
    #include "mini.h"
-    // Used to create a keymap using only KC_ prefixed keys
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-        L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-        L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-        L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36  \
-        ) \
-        LAYOUT( \
-            KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-            KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-            KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-            KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36  \
-        )
-#endif // #ifdef KEYBOARD_ergodash_mini
 #endif
diff --git a/keyboards/ergotravel/ergotravel.h b/keyboards/ergotravel/ergotravel.h
index 7201db788..314775495 100644
--- a/keyboards/ergotravel/ergotravel.h
+++ b/keyboards/ergotravel/ergotravel.h
@@ -5,18 +5,3 @@
 #endif
 #include "quantum.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,       R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,       R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33,      L34, L35,       R30, R31,      R32, R33, R34, R35  \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06,       KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16,       KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26,       KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33,           KC_##L34, KC_##L35,       KC_##R30, KC_##R31,           KC_##R32, KC_##R33, KC_##R34, KC_##R35  \
-    )
diff --git a/keyboards/ergotravel/keymaps/ckofy/config.h b/keyboards/ergotravel/keymaps/ckofy/config.h
deleted file mode 100644
index 7c99c093c..000000000
--- a/keyboards/ergotravel/keymaps/ckofy/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Pierre Constantineau <jpconstantineau@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
-/* Use I2C or Serial, not both */
-//#define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-//#define EE_HANDS
-#define TAPPING_TOGGLE 2
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ergotravel/keymaps/ckofy/keymap.c b/keyboards/ergotravel/keymaps/ckofy/keymap.c
deleted file mode 100644
index b9a2c140d..000000000
--- a/keyboards/ergotravel/keymaps/ckofy/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _COLEMAK 0
-#define _QWERTY 1
-#define _NUMPAD 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_XXXX KC_NO
-#define KC_CMK COLEMAK
-#define KC_QWE QWERTY
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_QRAS QRAISE
-#define KC_ADJT ADJUST
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-//#define KC_CATDEL LCTL(LALT(KC_DEL)) // Ctrl alt del
-#define KC_CPY LCTL(KC_C)
-#define KC_PST LCTL(KC_V)
-#define KC_SELA LCTL(KC_A)
-#define KC_UDO LCTL(KC_Z)
-#define KC_CUT LCTL(KC_X)
-#define KC_SVE LCTL(KC_S)
-#define KC_OSH OSM(MOD_LSFT)
-#define KC_OCTL OSM(MOD_LCTL)
-#define KC_NUMP TT(_NUMPAD)
-#define KC_SHESC MT(MOD_LSFT,KC_ESC)
-#define KC_SHENT MT(MOD_RSFT,KC_ENT)
-//#define KC_NUMP TG(_NUMPAD)  // Toggle layer NUMPAD for use in KC_keymaps
-//#define KC_RST RESET
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// Colemak Mod-DH is used. https://colemakmods.github.io/mod-dh/
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-     TAB , Q  , W  , F  , P  , B  ,LPRN,      RPRN, J  , L  , U  , Y  ,SCLN,BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     BSPC, A  , R  , S  , T  , G  ,EQL ,      MINS, K  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-    SHESC, Z  , X  , C  , D  , V  ,NUMP,       ENT, M  , H  ,COMM,DOT ,SLSH,SHENT,
-  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-     OCTL,LALT,LGUI,DEL ,LOWR, SPC,                OSH, RASE,LEFT,RIGHT,RALT,RCTL
-  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-     ESC , Q  , W  , E  , R  , T  ,LBRC,      RBRC, Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     TAB , A  , S  , D  , F  , G  ,LPRN,      RPRN, H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,    ,          , N  , M  ,COMM,DOT ,SLSH,ENT ,
-  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-     LCTL,LGUI,LALT,DEL ,    , SPC,                SPC ,    ,LEFT,DOWN, UP ,RIGHT
-  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_NUMPAD] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           ,    ,    ,    ,    ,    ,    ,          ,ASTR, P7 , P8 , P9 ,SLSH,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,PIPE, P4 , P5 , P6 ,MINS,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,COMM, P1 , P2 , P3 ,PLUS,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    , P0 ,NLCK,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-         ,XXXX,XXXX,XXXX,XXXX,CAPS,    ,          ,PGUP,HOME, UP ,END ,DEL ,    ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,SELA,LALT,LSFT,LCTL,SVE ,    ,          ,PGDN,LEFT,DOWN,RGHT,BSPC,INS ,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-         ,UDO ,CUT ,CPY ,PST ,XXXX,    ,          ,XXXX,XXXX,COMM,DOT ,SLSH,    ,
-  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           ,AMPR,PERC,HASH,EXLM,LPRN,    ,          ,ASTR,RPRN, AT ,DLR ,CIRC,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , 7  , 5  , 3  , 1  , 9  ,LBRC,      RBRC,  8 , 0  , 2  , 4  , 6  ,BSLS,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , GRV,TILD,XXXX,EQL ,PLUS,    ,          ,UNDS,MINS,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           , F1 , F2 , F3 , F4 , F5 , F6,         F7,  F8, F9 ,F10 , F11, F12,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,    , CMK,QWE ,    ,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,VOLD,VOLU,MUTE
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  )
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/ergotravel/keymaps/ckofy/rules.mk b/keyboards/ergotravel/keymaps/ckofy/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/ergotravel/keymaps/ckofy/rules.mk
+++ /dev/null
diff --git a/keyboards/ergotravel/keymaps/jpconstantineau/config.h b/keyboards/ergotravel/keymaps/jpconstantineau/config.h
deleted file mode 100644
index eeca26ce1..000000000
--- a/keyboards/ergotravel/keymaps/jpconstantineau/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Pierre Constantineau <jpconstantineau@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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ergotravel/keymaps/jpconstantineau/keymap.c b/keyboards/ergotravel/keymaps/jpconstantineau/keymap.c
deleted file mode 100644
index 764b2b18c..000000000
--- a/keyboards/ergotravel/keymaps/jpconstantineau/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_ADJT ADJUST
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-     ESC , Q  , W  , E  , R  , T  ,LBRC,      RBRC, Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     TAB , A  , S  , D  , F  , G  , A,          A,  H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-     LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-      GRAVE, 1  , 2  , 3  , 4  , 5  , A,           B,  6  , 7  , 8  , 9  , 0  ,DEL,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , F1 , F2 , F3 , F4 , F5 , F6 ,         D,  Y  ,MINS, EQL,LBRC,RBRC,BSLS,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, F7 , F8 , F9 , F10, F11, F12,       SPC,  N  , M ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       ESC , 1  , 2  , 3  , 4  , 5  , A,          B,  6  , 7  , 8  , 9  , 0  ,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , Q  , W  , E  , R  , T  , C ,         D,  Y  , U  , I  , O  , P  ,DEL ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       ESC , F1 , F2 , F3 , F4 , F5 , F6,         F7,  F8, F9 ,F10 , F11, F12,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , Q  , W  , E  , R  , T  , C ,         D,  Y  , U  , I  , O  , P  ,DEL ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  )
-};
-   
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/ergotravel/keymaps/jpconstantineau/rules.mk b/keyboards/ergotravel/keymaps/jpconstantineau/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/ergotravel/keymaps/jpconstantineau/rules.mk
+++ /dev/null
diff --git a/keyboards/ergotravel/keymaps/rs/keymap.c b/keyboards/ergotravel/keymaps/rs/keymap.c
index 0cf1cb362..f8c6de56b 100644
--- a/keyboards/ergotravel/keymaps/rs/keymap.c
+++ b/keyboards/ergotravel/keymaps/rs/keymap.c
@@ -2,37 +2,37 @@
 #include "rs.h"
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  , GRV,      BSLS, Y  , U  , I  , O  , P  ,EQL ,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_GRV,      KC_BSLS, KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_EQL ,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,PIPE,      MINS, H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESCC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_PIPE,      KC_MINS, KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  , SPC,      BSPC, N  , M  ,COMM,DOT ,SLSH,ENTS,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_SPC,      KC_BSPC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENTS,
  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-      FN ,    ,LCTL,LALT,LGUI, SPC,               BSPC, CODE,LEFT, UP ,DOWN,RIGHT
+      KC_FN ,_______,KC_LCTL,KC_LALT,KC_LGUI, KC_SPC,               KC_BSPC, KC_CODE,KC_LEFT, KC_UP ,KC_DOWN,KC_RIGHT
  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
  ),
-  [_CODE] = LAYOUT_kc(
+  [_CODE] = LAYOUT(
    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       GRV ,EXLM, AT ,HASH, DLR,PERC,    ,          ,CIRC,LPLT,ASTR,RPGT,NEQL,    ,
+       KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,_______,      _______,KC_CIRC,KC_LPLT,KC_ASTR,KC_RPGT,KC_NEQL,_______,
    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , 1  , 2  , 3  , 4  , 5  ,    ,          ,MINS,LBRC, UP ,RBRC,    ,BSLS,
+       _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,_______,      _______,KC_MINS,KC_LBRC, KC_UP ,KC_RBRC,_______,KC_BSLS,
    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , 6  , 7  , 8  , 9  , 0  , DOT,          ,AMPR,LEFT,DOWN,RGHT,    ,PIPE,
+       _______, KC_6  , KC_7  , KC_8  , KC_9  , KC_0  , KC_DOT,      _______,KC_AMPR,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_PIPE,
    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
+       _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______
    //`----+----+----+----+----/----/               \----\----+----+----+----+----'
  ),
-  [_FN] = LAYOUT_kc(
+  [_FN] = LAYOUT(
    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           , F1 , F2 , F3 , F4 , F5 ,    ,          , F6 , F7 , F8 , F9 , F10,F11 ,
+       _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,_______,      _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10,KC_F11 ,
    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,BRMU,          ,    ,    ,PGUP,    ,    ,    ,
+       _______,_______,_______,_______,_______,_______,KC_BRMU,      _______,_______,_______,KC_PGUP,_______,_______,_______,
    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    , RST,BRMD,      VOLU,    ,CTRA,PGDN,CTRE,    ,    ,
+       _______,_______,_______,_______,_______, KC_RST,KC_BRMD,      KC_VOLU,_______,KC_CTRA,KC_PGDN,KC_CTRE,_______,_______,
    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                VOLD,MUTE,    ,    ,    ,
+       _______,_______,_______,_______,_______,_______,                KC_VOLD,KC_MUTE,_______,_______,_______,_______
    //`----+----+----+----+----/----/               \----\----+----+----+----+----'
  ),
-};
-\ No newline at end of file
+};
diff --git a/keyboards/ergotravel/keymaps/viet/config.h b/keyboards/ergotravel/keymaps/viet/config.h
deleted file mode 100644
index 1c6c400b4..000000000
--- a/keyboards/ergotravel/keymaps/viet/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Pierre Constantineau <jpconstantineau@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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 26
-#define RGBLIGHT_HUE_STEP 20
-#define RGBLIGHT_SAT_STEP 20
-#define RGBLIGHT_VAL_STEP 20
-#define RGBLIGHT_LIMIT_VAL 220
diff --git a/keyboards/ergotravel/keymaps/viet/keymap.c b/keyboards/ergotravel/keymaps/viet/keymap.c
deleted file mode 100644
index dd7fffcc6..000000000
--- a/keyboards/ergotravel/keymaps/viet/keymap.c
+++ /dev/null
@@ -1,326 +0,0 @@
-#include "ergotravel.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "mousekey.h"
-#include "process_unicode.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _NUMBERS 1
-#define _SYMBOLS 2
-#define _CODING 3
-#define _NAVIGATION 4
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  ADJUST,
-  CODING_SPACE,
-  NUMBERS_SPACE,
-  SYMBOLS_SPACE,
-  NAVIGATE_SPACE,
-  TABLE_FLIP,
-  RESET_TABLE,
-  SHRUG,
-  LOOK_OF_DISAPPROVAL
-};
-#define KC_ KC_TRNS
-#define KC_ADJT MO(_ADJUST)
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_RSEN MT(MOD_RSFT, KC_ENT) // Tap for enter, hold for right shift
-#define KC_LCCA MT(MOD_LCTL, KC_CAPS)  // Tap for caps lock, hold for left control
-#define KC_SHDE MT(MOD_LSFT, KC_DEL) // Tap for delete, hold for left shift
-#define KC_NAVI MO(_NAVIGATION)
-#define KC_COSP CODING_SPACE
-#define KC_NUSP NUMBERS_SPACE
-#define KC_SYSP SYMBOLS_SPACE
-#define KC_NASP NAVIGATE_SPACE
-#define KC_FLIP TABLE_FLIP
-#define KC_TSET RESET_TABLE
-#define KC_SRUG SHRUG
-#define KC_DISA LOOK_OF_DISAPPROVAL
-#define KC_RST RESET
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       TAB , Q  , W  , E  , R  , T  ,HOME,      PGUP, Y  , U  , I  , O  , P  ,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LCCA, A  , S  , D  , F  , G  ,END ,      PGDN, H  , J  , K  , L  ,SCLN,QUOT,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       SHDE, Z  , X  , C  , V  , B  ,LGUI,      RALT, N  , M  ,COMM,DOT ,SLSH,RSEN,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       ESC ,ADJT,LALT,ENT ,NUSP,NASP,                SYSP,COSP,RCTL,NAVI,ADJT,DEL
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_NUMBERS] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-      GRAVE, 1  , 2  , 3  , 4  , 5  ,MPLY,      VOLU,  6  , 7  , 8  , 9  , 0 ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,MNXT,      VOLD,FLIP,TSET,SRUG,DISA,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_SYMBOLS] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-      GRAVE,EXLM, AT ,HASH,DLR ,PERC,MPLY,      VOLU,CIRC,AMPR,ASTR,LPRN,RPRN,BSLS,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,MNXT,      VOLD,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_CODING] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           ,    ,    ,LCBR,RCBR,    ,MPLY,      VOLU,    ,AMPR,PIPE,DLR ,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,LPRN,RPRN,    ,MNXT,      VOLD,    ,UNDS,MINS,ASTR,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,LBRC,RBRC,    ,    ,          ,    ,PLUS,EQL ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_NAVIGATION] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           ,    ,    , UP ,    ,    ,MPLY,      VOLU,WH_U,BTN1,MS_U,BTN1,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,LEFT,DOWN,RGHT,    ,MNXT,      VOLD,WH_D,MS_L,MS_D,MS_R,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       F1  ,F2  ,F3  ,F4  ,F5  ,F6  ,    ,          ,F7  ,F8  ,F9  ,F10 ,F11 ,F12 ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,RTOG,RVAI,RHUI,RSAI,    ,    ,          ,    ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,RMOD,RVAD,RHUD,RSAD,    ,    ,          ,RST ,    ,    ,    ,    ,    ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-uint16_t custom_lt_timer;
-keypos_t prv_key_pressed;
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-//    set_unicode_input_mode(UC_LNX); // Linux
-    set_unicode_input_mode(UC_OSX); // Mac OSX
-//    set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki)
-    //set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki)
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(record->event.pressed) prv_key_pressed = record->event.key;
-    #define IS_KEYPOS_SAME(keyone,keytwo)  ((keyone.col==keytwo.col)&&(keyone.row==keytwo.row))
-    #define ANOTHER_KEY_PRESSED (!IS_KEYPOS_SAME(prv_key_pressed, record->event.key))
-  inline void tap(uint16_t keycode) {
-    register_code(keycode);
-    unregister_code(keycode);
-  };
-  inline void swapInput(void) {
-    register_code(KC_LGUI);
-    tap(KC_SPC);
-    unregister_code(KC_LGUI);
-  };
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case CODING_SPACE:
-      if (record->event.pressed) {
-        custom_lt_timer = timer_read();
-        layer_on(_CODING);
-      } else {
-        layer_off(_CODING);
-        if (timer_elapsed(custom_lt_timer)<150 && (!ANOTHER_KEY_PRESSED)) {
-          register_code(KC_SPC);
-          unregister_code(KC_SPC);
-        }
-      }
-      return false;
-      break;
-    case NUMBERS_SPACE:
-      if (record->event.pressed) {
-        custom_lt_timer = timer_read();
-        layer_on(_NUMBERS);
-      } else {
-        layer_off(_NUMBERS);
-        if (timer_elapsed(custom_lt_timer)<150 && (!ANOTHER_KEY_PRESSED)) {
-          register_code(KC_SPC);
-          unregister_code(KC_SPC);
-        }
-      }
-      return false;
-      break;
-    case SYMBOLS_SPACE:
-      if (record->event.pressed) {
-        custom_lt_timer = timer_read();
-        layer_on(_SYMBOLS);
-      } else {
-        layer_off(_SYMBOLS);
-        if (timer_elapsed(custom_lt_timer)<150 && (!ANOTHER_KEY_PRESSED)) {
-          register_code(KC_SPC);
-          unregister_code(KC_SPC);
-        }
-      }
-      return false;
-      break;
-    case NAVIGATE_SPACE:
-      if (record->event.pressed) {
-        custom_lt_timer = timer_read();
-        layer_on(_NAVIGATION);
-      } else {
-        layer_off(_NAVIGATION);
-        if (timer_elapsed(custom_lt_timer)<150 && (!ANOTHER_KEY_PRESSED)) {
-          register_code(KC_SPC);
-          unregister_code(KC_SPC);
-        }
-      }
-      return false;
-      break;
-    case TABLE_FLIP:
-      if (record->event.pressed) {
-        swapInput();
-        register_code(KC_RSFT);
-        tap(KC_9);
-        unregister_code(KC_RSFT);
-        process_unicode((0x256F|QK_UNICODE), record);   // Arm
-        process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-        process_unicode((0x25A1|QK_UNICODE), record);   // Mouth
-        process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-        register_code(KC_RSFT);
-        tap(KC_0);
-        unregister_code(KC_RSFT);
-        process_unicode((0x256F|QK_UNICODE), record);   // Arm
-        tap(KC_SPC);
-        process_unicode((0x0361|QK_UNICODE), record);   // Flippy
-        tap(KC_SPC);
-        process_unicode((0x253B|QK_UNICODE), record);   // Table
-        process_unicode((0x2501|QK_UNICODE), record);   // Table
-        process_unicode((0x253B|QK_UNICODE), record);   // Table
-        swapInput();
-      }
-      return false;
-      break;
-    case RESET_TABLE: // ┬──┬ ノ( ゜-゜ノ)
-      if (record->event.pressed) {
-        swapInput();
-        process_unicode((0x252C|QK_UNICODE), record);   // Table
-        process_unicode((0x2500|QK_UNICODE), record);   // Table
-        process_unicode((0x2500|QK_UNICODE), record);   // Table
-        process_unicode((0x252C|QK_UNICODE), record);   // Table
-        tap(KC_SPC);
-        process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-        register_code(KC_RSFT);
-        tap(KC_9);
-        unregister_code(KC_RSFT);
-        tap(KC_SPC);
-        process_unicode((0x309C|QK_UNICODE), record);   // Eye
-        tap(KC_MINS);
-        process_unicode((0x309C|QK_UNICODE), record);   // Eye
-        process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-        register_code(KC_RSFT);
-        tap(KC_0);
-        unregister_code(KC_RSFT);
-        swapInput();
-      }
-      return false;
-      break;
-    case SHRUG: // ¯\_(ツ)_/¯
-      if (record->event.pressed) {
-        swapInput();
-        process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-        tap(KC_BSLS);                                   // Arm
-        register_code(KC_RSFT);
-        tap(KC_UNDS);                                   // Arm
-        tap(KC_LPRN);                                   // Head
-        unregister_code(KC_RSFT);
-        process_unicode((0x30C4|QK_UNICODE), record);   // Face
-        register_code(KC_RSFT);
-        tap(KC_RPRN);                                   // Head
-        tap(KC_UNDS);                                   // Arm
-        unregister_code(KC_RSFT);
-        tap(KC_SLSH);                                   // Arm
-        process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-        swapInput();
-      }
-      return false;
-      break;
-    case LOOK_OF_DISAPPROVAL:       // ಠ_ಠ
-      if(record->event.pressed){
-        swapInput();
-        process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-        register_code(KC_RSFT);
-        tap(KC_MINS);
-        unregister_code(KC_RSFT);
-        process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-        swapInput();
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/ergotravel/keymaps/viet/rules.mk b/keyboards/ergotravel/keymaps/viet/rules.mk
deleted file mode 100644
index 24963d46b..000000000
--- a/keyboards/ergotravel/keymaps/viet/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no
-UNICODE_ENABLE = yes
diff --git a/keyboards/fortitude60/fortitude60.h b/keyboards/fortitude60/fortitude60.h
index 61404fa75..0ad157f2d 100644
--- a/keyboards/fortitude60/fortitude60.h
+++ b/keyboards/fortitude60/fortitude60.h
@@ -5,19 +5,3 @@
 #endif
 #include "quantum.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, LT5, RT5, R30, R31, R32, R33, R34, R35, \
-              LT0, LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1, RT0 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##LT5, KC_##RT5, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-                            KC_##LT0, KC_##LT1, KC_##LT2, KC_##LT3, KC_##LT4, KC_##RT4, KC_##RT3, KC_##RT2, KC_##RT1, KC_##RT0 \
-    )
diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
index c0f650ecc..98ca93505 100644
--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 // lshift split, backspace split, full ANSI enter, full right shift
-#define KEYMAP_BZIO(                                                         \
+#define LAYOUT_BZIO(                                                         \
               K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
               K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
               K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* 0: HHKB with hyper key where ctrl used to be, and right half of left
       shift used as a key lock */
-    KEYMAP_BZIO(
+    LAYOUT_BZIO(
        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_BSLS, KC_GRV, \
        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_BSPC,\
        KC_LCTL,          KC_A,    KC_S,    KC_D,  KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,\
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* 1: spacefn with WASD arrows/navigation block and extra space key for
       realignment of source code, plus IJKL mouse arrows, volume up/down in <>,
       and caps lock where it used to be */
-    KEYMAP_BZIO(
+    LAYOUT_BZIO(
        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_TRNS, KC_TRNS, \
        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDOWN, KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   \
        KC_TRNS,          KC_LEFT, KC_DOWN, KC_RGHT,   KC_DELETE,  KC_MS_BTN1, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, \
diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h
index e2e8510b6..a53c26742 100644
--- a/keyboards/handwired/atreus50/atreus50.h
+++ b/keyboards/handwired/atreus50/atreus50.h
@@ -18,19 +18,6 @@
        { k30, k31, k32, k33, k34, k35, km1,   k36, k37, k38, k39, k3a, k3b } \
 }
-#define LAYOUT_kc( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \
-  k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \
-  k20, k21, k22, k23, k24, k25,           k26, k27, k28, k29, k2a, k2b, \
-  k30, k31, k32, k33, k34, k35, km0, km1, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_NO,    KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \
-    { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_NO,    KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \
-    { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##km0, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \
-    { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##km1, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b } \
-}
 #define KC_ KC_TRNS
 #endif
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
deleted file mode 100644
index c3c4a1b69..000000000
--- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#define SOLENOID_ENABLE
-#define SOLENOID_PIN F6
-#define SOLENOID_ACTIVE true
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c
deleted file mode 100644
index 01c64d870..000000000
--- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-extern keymap_config_t keymap_config;
-#define KC_LOCK TD(TD_ALTLOCK)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
-       TAB,    Q,    W,    E,    R,    T,             Y,    U,    I,    O,    P, BSPC,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-      LCTL,    A,    S,    D,    F,    G,             H,    J,    K,    L, SCLN, QUOT,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-      LSFT,    Z,    X,    C,    V,    B,             N,    M, COMM,  DOT, SLSH,  ENT,
-  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
-                          LGUI, LOWR,  SPC,       SPC, RASE, LOCK
-  //                     `----+-----+-----`     `----+-----+-----`
-   ),
-  [_LOWER] = LAYOUT_kc(
-  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
-       ESC,    1,    2,    3,    4,    5,             6,    7,    8,    9,    0,  DEL,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-          ,     ,     ,     ,     ,     ,              ,     ,     , LCBR, RCBR, BSLS,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-          ,     ,     , XCPY, XINS,     ,              ,     ,     ,     ,     ,     ,
-  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
-                              ,     ,     ,          ,     ,
-  //                     `----+-----+-----`     `----+-----+-----`
-  ),
-  [_RAISE] = LAYOUT_kc(
-  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
-       GRV, EXLM,   AT, HASH,  DLR, PERC,          CIRC, AMPR, ASTR, LPRN, RPRN,  DEL,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-          ,     ,     ,     , MINS,  EQL,              ,     ,   UP, LBRC, RBRC, PIPE,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-          ,     ,     ,     ,     ,     ,              , LEFT, DOWN, RGHT,     ,     ,
-  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
-                              ,     ,     ,          ,     ,
-  //                     `----+-----+-----`     `----+-----+-----`
-   ),
-  [_ADJUST] = LAYOUT_kc(
-  // ,----+-----+-----+-----+-----+-----,         ,----+-----+-----+-----+-----+-----,
-      STOG, xxxx, xxxx, xxxx,  RST, xxxx,          ROOT, PPLY, PSEF, xxxx, xxxx,  CAD,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-      SDM,   SDP, SBOF, SBON, xxxx, xxxx,          xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,
-  // |----+-----+-----+-----+-----+-----|         |----+-----+-----+-----+-----+-----|
-      xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,          xxxx, xxxx, xxxx, xxxx, xxxx, xxxx,
-  // |----+-----+-----+-----+-----+-----|-,     ,-|----+-----+-----+-----+-----+-----|
-                          xxxx,     , xxxx,      xxxx,     , xxxx
-  //                     `----+-----+-----`     `----+-----+-----`
-  )
-};
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk
deleted file mode 100644
index e5ddcae8d..000000000
--- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h
index 05e7bc491..c24a515e4 100644
--- a/keyboards/handwired/not_so_minidox/not_so_minidox.h
+++ b/keyboards/handwired/not_so_minidox/not_so_minidox.h
@@ -21,22 +21,4 @@
                { KC_NO, KC_NO, KC_NO, RT1, RT2, RT3 }, \
        }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05,           R05, R04, R03, R02, R01, R00, \
-        L10, L11, L12, L13, L14, L15,           R15, R14, R13, R12, R11, R10, \
-        L20, L21, L22, L23, L24, L25,           R25, R24, R23, R22, R21, R20, \
-                                                                                        LT1, LT2, LT3, RT3, RT2, RT1 \
-        ) \
-        { \
-                { KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05 }, \
-                { KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15 }, \
-                { KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25 }, \
-                { KC_NO, KC_NO, KC_NO, KC_##LT1, KC_##LT2, KC_##LT3 }, \
-                { KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05 }, \
-                { KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15 }, \
-                { KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 }, \
-                { KC_NO, KC_NO, KC_NO, KC_##RT1, KC_##RT2, KC_##RT3 }, \
-        }
 #endif
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h
index a43fc76ae..bd34925a9 100644
--- a/keyboards/handwired/ortho5x13/ortho5x13.h
+++ b/keyboards/handwired/ortho5x13/ortho5x13.h
@@ -16,18 +16,3 @@
  { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b, k3c }, \
  { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
 }
-#define LAYOUT_kc( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
-  k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b, k4c \
-) \
-{ \
-  { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, KC_##k0c }, \
-  { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, KC_##k1c }, \
-  { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, KC_##k2c }, \
-  { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k35, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b, KC_##k3c }, \
-  { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_NO,    KC_##k47, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b, KC_##k4c } \
-}
diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h
index 55c83aca5..944ec10f5 100644
--- a/keyboards/handwired/qc60/qc60.h
+++ b/keyboards/handwired/qc60/qc60.h
@@ -7,20 +7,4 @@
    #include "proto.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-    LD1, LD2, LD3, LD4, LD5,      RD1,      RD4, RD5, RD6, RD7 \
-    ) \
-    LAYOUT( \
-        KC_##LA1, KC_##LA2, KC_##LA3, KC_##LA4, KC_##LA5, KC_##LA6, KC_##RA1, KC_##RA2, KC_##RA3, KC_##RA4, KC_##RA5, KC_##RA6, KC_##RA7, \
-        KC_##LB1, KC_##LB2, KC_##LB3, KC_##LB4, KC_##LB5, KC_##LB6, KC_##RB1, KC_##RB2, KC_##RB3, KC_##RB4, KC_##RB5,           KC_##RB7, \
-        KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1,           KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
-        KC_##LD1, KC_##LD2, KC_##LD3, KC_##LD4, KC_##LD5,           KC_##RD1,                     KC_##RD4, KC_##RD5, KC_##RD6, KC_##RD7 \
-    )
 #endif
diff --git a/keyboards/handwired/tennie/keymaps/default/readme.md b/keyboards/handwired/tennie/keymaps/default/readme.md
deleted file mode 100644
index 1fbaa7f46..000000000
--- a/keyboards/handwired/tennie/keymaps/default/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Default keymap
-This keymap is to serve as an example of how you could make a multi-layer keymap.
-#### keymap
-```
-[base] = LAYOUT_kc(
-//         ┌────────┬────────┬────────┐
-              DEL   ,  SPC   ,   ENT  ,
-//    ├────────┼────────┼────────┼────────┼
-        LEFT   ,  DOWN  ,   UP   ,  RGHT ,
-//    ├────────┼────────┼────────┼────────┼
-              SHRK  ,  OGRE  ,   TCP
-//         └────────┴────────┴────────┘
-),
-[shrek] = LAYOUT_kc(
-//         ┌────────┬────────┬────────┐
-              MPRV  ,  MPLY  ,  MNXT  ,
-//    ├────────┼────────┼────────┼────────┼
-         BRID  ,  VOLD  ,  VOLU  ,  BRIU  ,
-//    ├────────┼────────┼────────┼────────┼
-             _______, _______, _______
-//         └────────┴────────┴────────┘
-),
-[ogre] = LAYOUT_kc(
-//         ┌────────┬────────┬────────┐
-             RGB_MOD, RGB_TOG, RGB_RMOD
-//    ├────────┼────────┼────────┼────────┼
-         F13   ,   F14  ,   F15  ,  F16   ,
-//    ├────────┼────────┼────────┼────────┼
-             _______, _______, _______
-//         └────────┴────────┴────────┘
-),
-[tcp] = LAYOUT_kc(
-//         ┌────────┬────────┬────────┐
-              WBAK  ,  WREF  ,  WFWD  ,
-//    ├────────┼────────┼────────┼────────┼
-       XXXXXXX ,  PGDN  ,  PGUP  , XXXXXXX ,
-//    ├────────┼────────┼────────┼────────┼
-             _______, _______, _______
-//         └────────┴────────┴────────┘
-),
-```
diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h
index 972a1a94a..acf2ee702 100644
--- a/keyboards/handwired/traveller/traveller.h
+++ b/keyboards/handwired/traveller/traveller.h
@@ -16,7 +16,7 @@
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
+#define LAYOUT( \
        k00, k01, k02, k03, k04, k05,       k07, k08, k09, k0a, k0b, k0c, \
        k10, k11, k12, k13, k14, k15,       k17, k18, k19, k1a, k1b, k1c, \
        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
diff --git a/keyboards/hecomi/hecomi.h b/keyboards/hecomi/hecomi.h
index ef90a8ead..9586e8394 100644
--- a/keyboards/hecomi/hecomi.h
+++ b/keyboards/hecomi/hecomi.h
@@ -67,23 +67,3 @@ Right hand:
        {K80, K81, K82, K83, K84, K85, K86, K87},\
        {KC_NO,    KC_NO,    K92, K93, K94, K95, K96, K97}\
 }
-#define LAYOUT_kc(\
-K00, K01, K02, K03, K04, K05, K06,        K50, K51, K52, K53, K54, K55, K56, K57, \
-K10,   K11, K12, K13, K14, K15, K16,    K60, K61, K62, K63, K64, K65, K66,   K67, \
-K20,    K21, K22, K23, K24, K25,          K71, K72, K73, K74, K75, K76,      K77,\
-K30,     K31, K32, K33, K34, K35,      K80, K81, K82, K83, K84, K85, K86,    K87, \
-    K40,  K41, K42, K43, K44, K45,        K92, K93, K94, K95, K96, K97\
-) {\
-{KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_NO},\
-{KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO},\
-{KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_NO,    KC_NO},\
-{KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_NO,    KC_NO},\
-{KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_NO,    KC_NO},\
-{KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57},\
-{KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67},\
-{KC_NO,    KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77},\
-{KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_##K87},\
-{KC_NO,    KC_NO,    KC_##K92, KC_##K93, KC_##K94, KC_##K95, KC_##K96, KC_##K97}\
-}
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 60a5078ed..5fa5f7295 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -50,15 +50,3 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to
        { R36, R30, R31, R32, R33, R34, R35 }, \
  }
 #endif
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
-) LAYOUT( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-    KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-)
diff --git a/keyboards/helix/rev1/rev1.h b/keyboards/helix/rev1/rev1.h
index b3a525554..7db27bcca 100644
--- a/keyboards/helix/rev1/rev1.h
+++ b/keyboards/helix/rev1/rev1.h
@@ -127,42 +127,3 @@
 #else
    #error "expected HELIX_ROWS 3 or 4 or 5"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
-    ) LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 \
-    )
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#else // HELIX_ROWS == 5
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-        L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-    ) LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
-    )
-#endif
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index bab841fe3..787b6c67b 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -99,32 +99,3 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to
        }
    #endif
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
-    ) LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#else // HELIX_ROWS == 5
-    #define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
-        L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
-    ) LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
-    )
-#endif
diff --git a/keyboards/jc65/v32a/v32a.h b/keyboards/jc65/v32a/v32a.h
index b319ba80a..4e2442091 100644
--- a/keyboards/jc65/v32a/v32a.h
+++ b/keyboards/jc65/v32a/v32a.h
@@ -36,21 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  { KC_NO,  K17,  K27,  K37,  K47,  K57,  K67,  K77,  K87,KC_NO,KC_NO,  KB7,  KC7,  KD7,  KE7 }  \
 }
-#define LAYOUT_kc( \
-  K04,K14,K24,K34,K44,K54,K16,KB6,KB7,K17,KA4,KB4,KC4,KD4,KE4,KD0, \
-  K03,K13,K23,K33,K43,K53,K26,KC6,KC7,K27,KA3,KB3,KC3,    KD3,K67, \
-  K02,K12,K22,K32,K42,K52,K36,KD6,KD7,K37,KA2,KB2,KC2,    KD2,K87, \
-  K01,K30,K11,K21,K31,K41,K51,K46,KE6,KE7,K47,KA1,    KB1,K86,K77, \
-  K00,K10,K20,    K40,K56,K50,            K57,KB0,KC0,K96,K76,K66  \
-) \
-{ \
-  { KC_##K00,KC_##K10,KC_##K20,KC_##K30,KC_##K40,KC_##K50,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_##KB0,KC_##KC0,KC_##KD0,   KC_NO }, \
-  { KC_##K01,KC_##K11,KC_##K21,KC_##K31,KC_##K41,KC_##K51,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_##KA1,KC_##KB1,   KC_NO,   KC_NO,   KC_NO }, \
-  { KC_##K02,KC_##K12,KC_##K22,KC_##K32,KC_##K42,KC_##K52,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_##KA2,KC_##KB2,KC_##KC2,KC_##KD2,   KC_NO }, \
-  { KC_##K03,KC_##K13,KC_##K23,KC_##K33,KC_##K43,KC_##K53,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_##KA3,KC_##KB3,KC_##KC3,KC_##KD3,   KC_NO }, \
-  { KC_##K04,KC_##K14,KC_##K24,KC_##K34,KC_##K44,KC_##K54,   KC_NO,   KC_NO,   KC_NO,   KC_NO,KC_##KA4,KC_##KB4,KC_##KC4,KC_##KD4,KC_##KE4 }, \
-  {    KC_NO,KC_##K16,KC_##K26,KC_##K36,KC_##K46,KC_##K56,KC_##K66,KC_##K76,KC_##K86,KC_##K96,   KC_NO,KC_##KB6,KC_##KC6,KC_##KD6,KC_##KE6 }, \
-  {    KC_NO,KC_##K17,KC_##K27,KC_##K37,KC_##K47,KC_##K57,KC_##K67,KC_##K77,KC_##K87,   KC_NO,   KC_NO,KC_##KB7,KC_##KC7,KC_##KD7,KC_##KE7 }  \
-}
 #endif
diff --git a/keyboards/jd40/jd40.h b/keyboards/jd40/jd40.h
index 3ed6149f0..4426fd762 100644
--- a/keyboards/jd40/jd40.h
+++ b/keyboards/jd40/jd40.h
@@ -28,20 +28,6 @@ inline void gh60_esc_led_off(void)   	{ DDRF &= ~(1<<6); PORTF &= ~(1<<6); }
 inline void gh60_wasd_leds_off(void)    { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 */
-/* JD40 MKII keymap definition macro
- */
-#define LAYOUT_kc( \
-    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, K30, K31, K32, K33, K34, \
-        K35, K36, K37, K38, K39, K40, K41, K42, K43, K44 \
-) { \
-    { KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K10, KC_##K11, KC_##K12 }, \
-    { KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_NO    }, \
-    { KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_NO    }, \
-    { KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_NO,    KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_NO    }  \
-}
 #define LAYOUT( \
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \
        K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
diff --git a/keyboards/jd45/jd45.h b/keyboards/jd45/jd45.h
index 105a8acb6..a0603d4e4 100644
--- a/keyboards/jd45/jd45.h
+++ b/keyboards/jd45/jd45.h
@@ -17,16 +17,4 @@
    { k30,   k31,   k32,   k33,   k34,   KC_NO, k36,   KC_NO, k38,   k39,   k3a,   k3b,   KC_NO }  \
 }
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,     k1b, \
-    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, \
-    k30, k31, k32, k33,      k34,     k36,       k38, k39, k3a, k3b  \
-) { \
-    { KC_##k00,   KC_##k01,   KC_##k02,   KC_##k03,   KC_##k04,   KC_##k05,   KC_##k06,   KC_##k07,   KC_##k08,   KC_##k09,   KC_##k0a,   KC_##k0b,   KC_##k0c }, \
-    { KC_##k10,   KC_##k11,   KC_##k12,   KC_##k13,   KC_##k14,   KC_##k15,   KC_##k16,   KC_##k17,   KC_##k18,   KC_##k19,   KC_##k1a,   KC_##k1b,   KC_NO    }, \
-    { KC_##k20,   KC_##k21,   KC_##k22,   KC_##k23,   KC_##k24,   KC_##k25,   KC_##k26,   KC_##k27,   KC_##k28,   KC_##k29,   KC_##k2a,   KC_##k2b,   KC_NO    }, \
-    { KC_##k30,   KC_##k31,   KC_##k32,   KC_##k33,   KC_##k34,   KC_NO,      KC_##k36,   KC_NO,      KC_##k38,   KC_##k39,   KC_##k3a,   KC_##k3b,   KC_NO    }  \
-}
 #endif
diff --git a/keyboards/jd45/keymaps/justin/keymap.c b/keyboards/jd45/keymaps/justin/keymap.c
deleted file mode 100644
index 985ff19b8..000000000
--- a/keyboards/jd45/keymaps/justin/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_MO1 MO(1)
-#define KC_MO2 MO(2)
-#define KC_MO3 MO(3)
-#define KC_LM4 LM(4, MOD_LSFT)
-#define KC_MTCM MT(MOD_LCTL, KC_MINS)
-#define KC_MTSG MT(MOD_LSFT, KC_GRV)
-#define KC_MTSW MT(MOD_RSFT, KC_RGUI)
-#define KC_MTSC MT(MOD_RSFT, KC_CAPS)
-#define KC_MTCT MT(MOD_LCTL, KC_TAB)
-#define KC_BLTG BL_TOGG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_kc(
-        ESC, Q, W, F, P, G, J, L, U, Y, SCLN, QUOT, BSPC,
-        MTCT, A, R, S, T, D, H, N, E, I, O, ENT,
-        LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, MTSC,
-        MTSG, LGUI, LM4, MO2, MO1, SPC, MTSW, RALT, MO3, MTCM),
-    [1] = LAYOUT_kc(
-        TRNS, FN10, FN11, FN12, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, DEL,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGUP, LEFT, RGHT,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, END, PGDN, DOWN, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
-    [2] = LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, 7, 8, 9, 0, TRNS, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LBRC, 4, 5, 6, DOT, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, RBRC, 1, 2, 3, BSLS, TRNS,
-        TRNS, BLTG, TRNS, TRNS, TRNS, PAUSE, EQL, MINS, TRNS, TRNS),
-    [3] = LAYOUT_kc(
-        TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
-    [4] = LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, 7, 8, 9, 0, TRNS, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LBRC, 4, 5, 6, DOT, TRNS,
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, RBRC, 1, 2, 3, BSLS, TRNS,
-        TRNS, BLTG, TRNS, TRNS, TRNS, PAUSE, EQL, MINS, TRNS, TRNS),
-};
-enum macro_id
-{
-    PSWD1,
-    PSWD2,
-    PSWD3,
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [10] = ACTION_MACRO(PSWD1),
-    [11] = ACTION_MACRO(PSWD2),
-    [12] = ACTION_MACRO(PSWD3)
-};
-/*
- * Macro definition
- */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch (id)
-    {
-    case PSWD1:
-        return (record->event.pressed ? MACRO(I(0), T(1), T(2), T(3), T(4), T(5), T(6), T(7), T(8), T(ENT), END) : MACRO_NONE);
-    case PSWD2:
-        return (record->event.pressed ? MACRO(I(0), T(1), T(2), T(3), T(4), T(5), T(6), T(7), T(8), T(ENT), END) : MACRO_NONE);
-    case PSWD3:
-        return (record->event.pressed ? MACRO(I(0), T(1), T(2), T(3), T(4), T(5), T(6), T(7), T(8), T(ENT), END) : MACRO_NONE);
-        //case VOLUP:
-        //    return (record->event.pressed ?
-        //            MACRO( D(VOLU), U(VOLU), END ) :
-        //            MACRO_NONE );
-        //case ALT_TAB:
-        //    return (record->event.pressed ?
-        //            MACRO( D(LALT), D(TAB), END ) :
-        //            MACRO( U(TAB), END ));
-    }
-    return MACRO_NONE;
-}
diff --git a/keyboards/jd45/keymaps/mjt/config.h b/keyboards/jd45/keymaps/mjt/config.h
deleted file mode 100644
index 1121d9ab0..000000000
--- a/keyboards/jd45/keymaps/mjt/config.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    geekhack
-#define PRODUCT         JD45
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { F0, F1, F5, B4 }
-#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 }
-#define UNUSED_PINS
-#define BACKLIGHT_PIN B7
-#define USB_MAX_POWER_CONSUMPTION 50
-#define BACKLIGHT_BREATHING
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-#endif
diff --git a/keyboards/jd45/keymaps/mjt/keymap.c b/keyboards/jd45/keymaps/mjt/keymap.c
deleted file mode 100644
index 95f96066d..000000000
--- a/keyboards/jd45/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include QMK_KEYBOARD_H
-/* Mike's Layout for JD45 with backlight LEDs acting as layer indicator
- */
-#define KC_TT2 TT(2)
-#define KC_BLST BL_STEP
-#define KC_BLTG BL_TOGG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_kc(
-        TAB, Q, W, E, R, T, Y, U, I, O, P, MINS, BSLS,
-        FN1, A, S, D, F, G, H, J, K, L, QUOT, ENT,
-        FN0, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT,
-        NO, LCTL, LALT, LGUI, SPC, BSPC, APP, TT2, ESC, NO),
-    [1] = LAYOUT_kc(
-        GRV, TRNS, UP, TRNS, 7, 8, 9, 0, MINS, EQL, PSCR, LBRC, RBRC,
-        TRNS, LEFT, DOWN, RGHT, 4, 5, 6, INS, HOME, PGUP, SCLN, TRNS,
-        TRNS, TRNS, TRNS, TRNS, 1, 2, 3, DEL, END, PGDN, TRNS, TRNS,
-        TRNS, TRNS, TRNS, SPC, TRNS, DEL, TRNS, BLST, TRNS, TRNS),
-    [2] = LAYOUT_kc(
-        TRNS, TRNS, VOLU, TRNS, F7, F8, F9, F10, F11, F12, PSCR, BLST, BLTG,
-        TRNS, MPRV, VOLD, MNXT, F4, F5, F6, J, K, L, SCLN, TRNS,
-        TRNS, TRNS, TRNS, TRNS, F1, F2, F3, MUTE, MPRV, MNXT, MSTP, TRNS,
-        TRNS, TRNS, TRNS, LGUI, TRNS, TRNS, TRNS, TRNS, PAUS, TRNS)
-    /*  ,
-[3] = LAYOUT_kc(
-TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-TRNS, TRNS, TRNS, TRNS, TRNS, BTLD, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS )*/
-};
-enum macro_id
-{
-    M_LAYER1,
-    M_LAYER2
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_MODS_TAP_TOGGLE(MOD_LSFT),
-    [1] = ACTION_MACRO(M_LAYER1)
-};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    // MACRODOWN only works in this function
-    switch (id)
-    {
-    case M_LAYER1:
-        // need to add a timer for doubletap: https://github.com/jackhumbert/qmk_firmware/wiki#timer-functionality
-        // action_function_tap may also handle this...
-        if (record->event.pressed)
-        {
-            breathing_period_set(3);
-            breathing_enable();
-            layer_on(1);
-        }
-        else
-        {
-            breathing_period_set(1);
-            breathing_self_disable();
-            layer_off(1);
-        }
-        break;
-    case M_LAYER2:
-        if (record->event.pressed)
-        {
-            breathing_period_set(2);
-            breathing_pulse();
-            layer_on(2);
-        }
-        else
-        {
-            breathing_period_set(1);
-            breathing_self_disable();
-            layer_off(2);
-        }
-        break;
-    }
-    return MACRO_NONE;
-};
diff --git a/keyboards/jd45/keymaps/mjt/readme.md b/keyboards/jd45/keymaps/mjt/readme.md
deleted file mode 100644
index 54bdb8346..000000000
--- a/keyboards/jd45/keymaps/mjt/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Mike's JD45 standard layout
- Backlight that matches active layer
- Works with iPhone Camera Adapter
-## Layers
-Base for letters and mods.
-Function 1 layer adds a centered numpad to the board
-Function 2 layer replaces the numpad numbers with Fkeys.
diff --git a/keyboards/jd45/keymaps/mjt/rules.mk b/keyboards/jd45/keymaps/mjt/rules.mk
deleted file mode 100644
index a22e71b0d..000000000
--- a/keyboards/jd45/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/jj40/jj40.h b/keyboards/jj40/jj40.h
index fce68eda5..a77f35af2 100644
--- a/keyboards/jj40/jj40.h
+++ b/keyboards/jj40/jj40.h
@@ -63,20 +63,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-LAYOUT_ortho_4x12( \
-        KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-        KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-        KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-        KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b  \
-)
 #define LAYOUT LAYOUT_planck_mit
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_LAYOUT_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/jj40/keymaps/like_jis/config.h b/keyboards/jj40/keymaps/like_jis/config.h
deleted file mode 100644
index cd9709272..000000000
--- a/keyboards/jj40/keymaps/like_jis/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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
-// place overrides here
-#define TAPPING_TERM 200
-#ifdef MOUSEKEY_ENABLE
-  #undef MOUSEKEY_INTERVAL
-  #define MOUSEKEY_INTERVAL 5
-  #undef MOUSEKEY_TIME_TO_MAX
-  #define MOUSEKEY_TIME_TO_MAX 150
-  #undef MOUSEKEY_MAX_SPEED
-  #define MOUSEKEY_MAX_SPEED 3
-  #undef MOUSEKEY_MOVE_DELTA
-  #define MOUSEKEY_MOVE_DELTA 3
-  #undef MOUSEKEY_DELAY
-  #define MOUSEKEY_DELAY 0
-#endif
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 15
-// #undef BACKLIGHT_LEVELS
-// #define BACKLIGHT_BREATHING
-// #undef BREATHING_PERIOD
-// #define BREATHING_PERIOD 4
diff --git a/keyboards/jj40/keymaps/like_jis/keymap.c b/keyboards/jj40/keymaps/like_jis/keymap.c
deleted file mode 100644
index 24db91947..000000000
--- a/keyboards/jj40/keymaps/like_jis/keymap.c
+++ /dev/null
@@ -1,200 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-  RGBRST
-};
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_KANJI KC_GRV
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_ADJST ADJUST
-#define KC_RST   RESET
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_BTOG  BL_TOGG
-#define KC_BINC  BL_INC
-#define KC_BDEC  BL_DEC
-// #define KC_BRTG  BL_BRTG
-#define KC_KNRM  AG_NORM
-#define KC_KSWP  AG_SWAP
-// Layer Mode aliases
-// #define KC_L_LO  MO(_LOWER)
-// #define KC_L_RA  MO(_RAISE)
-// #define KC_L_AD  MO(_ADJUST)
-#define KC_TBSF  LSFT_T(KC_TAB)
-// #define KC_SPSF  LSFT_T(KC_SPC)
-// #define KC_GUAP  LALT_T(KC_APP)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-        ESC,     Q,     W,     E,     R,     T,     Y,     U,     I,     O,     P,  MINS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-       TBSF,     A,     S,     D,     F,     G,     H,     J,     K,     L,  SCLN,   ENT,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-       LSFT,     Z,     X,     C,     V,     B,     N,     M,  COMM,   DOT,    UP,  RSFT,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      LCTRL,  LALT,  LGUI, ADJST, LOWER,  BSPC,   SPC, RAISE,   APP,  LEFT,  DOWN,  RGHT \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-  [_LOWER] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-        TAB,    F1,    F2,    F3,    F4,    F5, XXXXX,  MINS,   EQL,  JYEN,  LBRC,  RBRC,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____,    F6,    F7,    F8,    F9,   F10, XXXXX, XXXXX, XXXXX,  SCLN,  QUOT,  BSLS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____,   F11,   F12, XXXXX, KANJI,   ENT, XXXXX, XXXXX,  COMM,   DOT,  SLSH,    RO,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____,   DEL, _____, _____, _____, _____, _____, _____ \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-  [_RAISE] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-      _____,     1,     2,     3,     4,     5,     6,     7,     8,     9,     0,  MINS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,     4,     5,     6,  QUOT,  PLUS,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,     0,     1,     2,     3,   DOT,  SLSH,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____,  BSPC, _____, _____, _____, _____, _____, _____ \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  ),
-  [_ADJUST] = KC_LAYOUT_ortho_4x12( \
-  //,-----------------------------------------------------------------------------------.
-      XXXXX,   RST,  LRST,  KNRM,  KSWP, XXXXX, XXXXX,  WH_L,  WH_U,  HOME,  PGUP, XXXXX,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      XXXXX,  LTOG,  LHUI,  LSAI,  LVAI,  BTOG,  BINC,  WH_R,  WH_D,   END,  PGDN, XXXXX,\
-  //|------+------+------+------+------+------|------+------+------+------+------+------|
-      XXXXX,  LMOD,  LHUD,  LSAD,  LVAD, XXXXX,  BDEC, XXXXX,  BTN1,  BTN2,  MS_U, XXXXX,\
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-      _____, _____, _____, _____, _____, XXXXX, XXXXX, _____, _____,  MS_L,  MS_D,  MS_R \
-  //|------+------+------+------+------+-------------+------+------+------+------+------|
-  )
-};
-#ifdef BACKLIGHT_ENABLE
-  extern backlight_config_t backlight_config;
-  inline void enable_backright(bool on) {
-      backlight_config.enable = on;
-      if (backlight_config.raw == 1) // enabled but level = 0
-          backlight_config.level = 1;
-      eeconfig_update_backlight(backlight_config.raw);
-      // dprintf("backlight toggle: %u\n", backlight_config.enable);
-      backlight_set(backlight_config.enable ? backlight_config.level : 0);
-  }
-  uint8_t bl_breath_count;
-  uint8_t bl_breath_speed = 10;
-  int8_t bl_breath_updown = 1;
-  bool bl_breath_on;
-  backlight_config_t bl_breath_backup;
-  void bl_breath_start(uint8_t speed) {
-    bl_breath_on = true;
-    bl_breath_speed = speed;
-    bl_breath_backup = backlight_config;
-  }
-  void bl_breath_end(void) {
-    bl_breath_on = false;
-    backlight_config = bl_breath_backup;
-    eeconfig_update_backlight(backlight_config.raw);
-    backlight_set(backlight_config.enable ? backlight_config.level : 0);
-  }
-  void bl_breath_update(void) {
-    if (bl_breath_on) {
-      ++bl_breath_count;
-      if (bl_breath_count > bl_breath_speed) {
-        bl_breath_count = 0;
-        backlight_config.level += bl_breath_updown;
-        bl_breath_updown = (backlight_config.level > BACKLIGHT_LEVELS) ? -1 :
-                          (backlight_config.level <= 0) ? 1 :
-                          bl_breath_updown;
-        enable_backright(true);
-      }
-    }
-  }
-  #define BL_BREATH_START bl_breath_start
-  #define BL_BREATH_END bl_breath_end
-  #define BL_BREATH_UPDATE bl_breath_update
-#else
-  #define BL_BREATH_START(a)
-  #define BL_BREATH_END()
-  #define BL_BREATH_UPDATE()
-#endif
-// Loop
-void matrix_scan_user(void) {
-  BL_BREATH_UPDATE();
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        BL_BREATH_START(50);
-        layer_on(_LOWER);
-      } else {
-        BL_BREATH_END();
-        layer_off(_LOWER);
-      }
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        BL_BREATH_START(100);
-        layer_on(_RAISE);
-      } else {
-        BL_BREATH_END();
-        layer_off(_RAISE);
-      }
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    default:
-      return true;
-  }
-  return false;
-}
diff --git a/keyboards/jj40/keymaps/like_jis/rules.mk b/keyboards/jj40/keymaps/like_jis/rules.mk
deleted file mode 100644
index 0103be5f4..000000000
--- a/keyboards/jj40/keymaps/like_jis/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/jm60/jm60.h b/keyboards/jm60/jm60.h
index c0af36298..bea4451a0 100644
--- a/keyboards/jm60/jm60.h
+++ b/keyboards/jm60/jm60.h
@@ -34,5 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, XXX, k3D }, \
    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
 }
-#define KEYMAP_ANSI LAYOUT_60_ansi
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.h b/keyboards/kbdfans/kbd4x/kbd4x.h
index ab31d3657..9e7e2ba22 100644
--- a/keyboards/kbdfans/kbd4x/kbd4x.h
+++ b/keyboards/kbdfans/kbd4x/kbd4x.h
@@ -43,16 +43,3 @@
        { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
        { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
 }
-#define LAYOUT_kc_ortho_4x12( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-        { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \
-        { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \
-        { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \
-        { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }  \
-}
diff --git a/keyboards/keebio/chocopad/chocopad.h b/keyboards/keebio/chocopad/chocopad.h
index d37aefc57..43e94a093 100644
--- a/keyboards/keebio/chocopad/chocopad.h
+++ b/keyboards/keebio/chocopad/chocopad.h
@@ -13,17 +13,3 @@
    { C1, C2, C3, C4 }, \
    { D1, D2, D3, D4 } \
 }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    A1, A2, A3, A4, \
-    B1, B2, B3, B4, \
-    C1, C2, C3, C4, \
-    D1, D2, D3, D4 \
-) \
-    LAYOUT_ortho_4x4( \
-        KC_##A1, KC_##A2, KC_##A3, KC_##A4, \
-        KC_##B1, KC_##B2, KC_##B3, KC_##B4, \
-        KC_##C1, KC_##C2, KC_##C3, KC_##C4, \
-        KC_##D1, KC_##D2, KC_##D3, KC_##D4 \
-    )
diff --git a/keyboards/keebio/chocopad/keymaps/khord/config.h b/keyboards/keebio/chocopad/keymaps/khord/config.h
deleted file mode 100644
index 7fa3bf328..000000000
--- a/keyboards/keebio/chocopad/keymaps/khord/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-#endif
diff --git a/keyboards/keebio/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h
index c7cc4aa72..229c6cd95 100644
--- a/keyboards/keebio/dilly/dilly.h
+++ b/keyboards/keebio/dilly/dilly.h
@@ -16,16 +16,4 @@
    { C10, C9, C8, C7, C6 } \
 }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \
-    B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \
-    C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \
-) \
-    LAYOUT_ortho_3x10( \
-        KC_##A1, KC_##A2, KC_##A3, KC_##A4, KC_##A5, KC_##A6, KC_##A7, KC_##A8, KC_##A9, KC_##A10, \
-        KC_##B1, KC_##B2, KC_##B3, KC_##B4, KC_##B5, KC_##B6, KC_##B7, KC_##B8, KC_##B9, KC_##B10, \
-        KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7, KC_##C8, KC_##C9, KC_##C10 \
-    )
 #endif
diff --git a/keyboards/keebio/dilly/keymaps/bakingpy/config.h b/keyboards/keebio/dilly/keymaps/bakingpy/config.h
deleted file mode 100644
index d141283ea..000000000
--- a/keyboards/keebio/dilly/keymaps/bakingpy/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#define TAPPING_TERM 150
diff --git a/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c b/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c
deleted file mode 100644
index 7b52d5ff7..000000000
--- a/keyboards/keebio/dilly/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-#define _FN3 3
-#define _FN4 4
-#define _FN5 5
-#define KC_ KC_TRNS
-// Tap-Hold keys
-#define KC_ASFT MT(MOD_LSFT, KC_A)
-#define KC_F_L3 LT(_FN3, KC_F)
-#define KC_ZCTL MT(MOD_LCTL, KC_Z)
-#define KC_XALT MT(MOD_LALT, KC_X)
-#define KC_CGUI MT(MOD_LGUI, KC_C)
-#define KC_V_L4 LT(_FN4, KC_V)
-#define KC_SPL2 LT(_FN2, KC_SPC)
-#define KC_B_L1 LT(_FN1, KC_B)
-#define KC_N_L5 LT(_FN5, KC_N)
-#define KC_MALT MT(MOD_RALT, KC_M)
-#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
-#define KC_ENTS MT(MOD_RSFT, KC_ENT)
-#define KC_ESCS MT(MOD_RSFT, KC_ESC)
-#define KC_SCNS MT(MOD_RSFT, KC_SCLN)
-#define KC_GUIC LGUI(KC_C)
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-     ASFT, S  , D  ,F_L3, G  , H  , J  , K  , L  ,ESCS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN1] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
-  //|----+----+----+----+----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,BSPC,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN2] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-     F11 ,F12 ,    ,    ,    ,LEFT,DOWN, UP ,RGHT,GRV ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,DEL ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,MINS,EQL ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    ,COMM,DOT ,SLSH,SCLN,QUOT,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,BSPC,    ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN4] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    , LT , GT ,QUES,COLN,DQUO,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,GUIC,    ,BSPC,    ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN5] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     RTOG,RMOD,    ,RST ,RHUI,RSAI,RVAI,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,DBUG,    ,RHUD,RSAD,RVAD,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----|
-     BL_S,    ,GUIC,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  )
-};
diff --git a/keyboards/keebio/dilly/keymaps/bakingpy/rules.mk b/keyboards/keebio/dilly/keymaps/bakingpy/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/dilly/keymaps/bakingpy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/dilly/keymaps/delmo/config.h b/keyboards/keebio/dilly/keymaps/delmo/config.h
deleted file mode 100644
index 4d704c17e..000000000
--- a/keyboards/keebio/dilly/keymaps/delmo/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-#define TAPPING_TERM 200
-#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
-#endif
diff --git a/keyboards/keebio/dilly/keymaps/delmo/keymap.c b/keyboards/keebio/dilly/keymaps/delmo/keymap.c
deleted file mode 100644
index 9d6c900ff..000000000
--- a/keyboards/keebio/dilly/keymaps/delmo/keymap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-#define _FN3 3
-#define _FN4 4
-#define _FN5 5
-#define KC_ KC_TRNS
-// Tap-Hold keys
-//#define KC_ASFT MT(MOD_LSFT, KC_A)
-#define KC_F_L3 LT(_FN3, KC_F)
-#define KC_ZCTL MT(MOD_LCTL, KC_Z)
-#define KC_XALT MT(MOD_LALT, KC_X)
-//#define KC_CGUI MT(MOD_LGUI, KC_C)
-#define KC_V_L4 LT(_FN4, KC_V)
-#define KC_SPL2 LT(_FN2, KC_SPC)
-#define KC_B_L1 LT(_FN1, KC_B)
-#define KC_N_L5 LT(_FN5, KC_N)
-//#define KC_MALT MT(MOD_RALT, KC_M)
-//#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
-#define KC_ENTS MT(MOD_RSFT, KC_ENT)
-#define KC_BSCS MT(MOD_RSFT, KC_BSPC)
-#define KC_GUIC LGUI(KC_C)
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-      A  , S  , D  ,F_L3, G  , H  , J  , K  , L  ,BSCS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     ZCTL,XALT,C   ,V_L4,B_L1,SPL2,N_L5,M   ,DOT ,ENTS
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN1] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,BSPC,    ,    ,    ,CAPS
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN2] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
-  //|----+----+----+----+----+----+----+----+----+----|
-     F11 ,F12 ,    ,    ,    ,    ,    ,    ,    ,GRV ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,DEL ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     ESC ,    ,    ,    ,    ,MINS,EQL ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    ,COMM,DOT ,SLSH,SCLN,QUOT,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,BSPC,    ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN4] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    , LT , GT ,QUES,COLN,DQUO,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,GUIC,    ,BSPC,    ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN5] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     RTOG,RMOD,    ,RST ,RHUI,RSAI,RVAI,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,DBUG,    ,RHUD,RSAD,RVAD,    ,    ,    ,
-  //|----+----+----+----+----+----+----+----+----+----|
-     BL_S,    ,GUIC,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  )
-};
diff --git a/keyboards/keebio/dilly/keymaps/delmo/rules.mk b/keyboards/keebio/dilly/keymaps/delmo/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/dilly/keymaps/delmo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/dilly/keymaps/pletcher/config.h b/keyboards/keebio/dilly/keymaps/pletcher/config.h
deleted file mode 100644
index 805bef418..000000000
--- a/keyboards/keebio/dilly/keymaps/pletcher/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-#define AUTO_SHIFT_TIMEOUT 150
-#define NO_AUTO_SHIFT_SPECIAL
-#define NO_AUTO_SHIFT_NUMERIC
-#define USB_MAX_POWER_CONSUMPTION 50
-#endif
diff --git a/keyboards/keebio/dilly/keymaps/pletcher/keymap.c b/keyboards/keebio/dilly/keymaps/pletcher/keymap.c
deleted file mode 100644
index 8bad575d6..000000000
--- a/keyboards/keebio/dilly/keymaps/pletcher/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-#define _FN3 3
-#define _FN4 4
-#define _FN5 5
-#define KC_ KC_TRNS
-// Tap-Hold keys
-#define KC_F_L3 LT(_FN3, KC_F)
-#define KC_ZCTL MT(MOD_LCTL, KC_Z)
-#define KC_XALT MT(MOD_LALT, KC_X)
-#define KC_CGUI MT(MOD_LGUI, KC_C)
-#define KC_V_L4 LT(_FN4, KC_V)
-#define KC_SPL2 LT(_FN2, KC_SPC)
-#define KC_B_L1 LT(_FN1, KC_B)
-#define KC_N_L5 LT(_FN5, KC_N)
-#define KC_MALT MT(MOD_RALT, KC_M)
-#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
-#define KC_ENTS MT(MOD_RSFT, KC_ENT)
-#define KC_ESCS MT(MOD_RSFT, KC_ESC)
-#define KC_GUIC LGUI(KC_C)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-      A  , S  , D  ,F_L3, G  , H  , J  , K  , L  ,ESCS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN1] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-      1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,
-  //|----+----+----+----+----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,BSPC,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN2] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-     EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
-  //|----+----+----+----+----+----+----+----+----+----|
-     F11 ,F12 ,    ,    ,    ,    ,    ,    ,    ,GRV ,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,TAB , DEL,    ,    ,    ,
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,MINS,EQL ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    ,COMM,DOT ,SLSH,SCLN,QUOT,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,    ,    ,BSPC,    ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN4] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----+----+----+----+----|
-     TAB ,    ,    ,    ,    , LT , GT ,QUES,COLN,DQUO,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,GUIC,    ,BSPC,    ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----+----+----+----'
-  ),
-  [_FN5] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----+----+----+----.
-         ,    ,    ,RST ,    ,    ,MSTP,VOLD,VOLU,MPLY,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,DBUG,    ,    ,    ,    ,ASDN,ASUP,ASRP,
-  //|----+----+----+----+----+----+----+----+----+----|
-         ,    ,GUIC,    ,    ,    ,    ,    ,    ,ASTG
-  //`----+----+----+----+----+----+----+----+----+----'
-  )
-};
diff --git a/keyboards/keebio/dilly/keymaps/pletcher/rules.mk b/keyboards/keebio/dilly/keymaps/pletcher/rules.mk
deleted file mode 100644
index 9b9dd8341..000000000
--- a/keyboards/keebio/dilly/keymaps/pletcher/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h
index 7505ad8b3..b99dd57c2 100644
--- a/keyboards/keebio/fourier/fourier.h
+++ b/keyboards/keebio/fourier/fourier.h
@@ -22,17 +22,3 @@
        { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
        { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
    }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-    LD1, LD2, LD3, LD4, LD5,      RD1,      RD4, RD5, RD6, RD7 \
-    ) \
-    LAYOUT( \
-        KC_##LA1, KC_##LA2, KC_##LA3, KC_##LA4, KC_##LA5, KC_##LA6, KC_##RA1, KC_##RA2, KC_##RA3, KC_##RA4, KC_##RA5, KC_##RA6, KC_##RA7, \
-        KC_##LB1, KC_##LB2, KC_##LB3, KC_##LB4, KC_##LB5, KC_##LB6, KC_##RB1, KC_##RB2, KC_##RB3, KC_##RB4, KC_##RB5,           KC_##RB7, \
-        KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1,           KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
-        KC_##LD1, KC_##LD2, KC_##LD3, KC_##LD4, KC_##LD5,           KC_##RD1,                     KC_##RD4, KC_##RD5, KC_##RD6, KC_##RD7 \
-    )
diff --git a/keyboards/keebio/fourier/keymaps/jennetters/config.h b/keyboards/keebio/fourier/keymaps/jennetters/config.h
deleted file mode 100644
index 5f99c65ad..000000000
--- a/keyboards/keebio/fourier/keymaps/jennetters/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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 TAPPING_TERM 100
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
diff --git a/keyboards/keebio/fourier/keymaps/jennetters/keymap.c b/keyboards/keebio/fourier/keymaps/jennetters/keymap.c
deleted file mode 100644
index a6ec95e1e..000000000
--- a/keyboards/keebio/fourier/keymaps/jennetters/keymap.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-#define KC_ KC_TRNS
-#define KC_FN1 MO(_FN1)
-#define KC_FN2 MO(_FN2)
-#define KC_SPFN1 LT(_FN1, KC_SPACE)
-#define KC_SPFN2 LT(_FN2, KC_SPACE)
-#define KC_BSFN1 LT(_FN1, KC_BSPC)
-#define KC_BSFN2 LT(_FN2, KC_BSPC)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-//Tap Dance Declarations
-enum {
-  ESC_GR = 0,
-  Q_1,
-  W_2,
-  E_3,
-  R_4,
-  T_5,
-  Y_6,
-  U_7,
-  I_8,
-  O_9,
-  P_0,
-  MIN_LB,
-  EQL_RB,
-  SCL_QUO
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
- // ,----+----+----+----+----+----|----+----+----+----+----+----+----.
- // |ESC | Q1 | W2 | E3 | R4 | T5 | Y6 | U7 | I8 | O9 | P0 | -[ | =] |
- // |----`----`----`----`----`----|----`----`----`----`----`----`----|
- // | TAB | A  | S  | D  | F  | G  | H  | H  | J  | K  | L  |  BKSP  |
- // |-----`----`----`----`----`----|----`----`----`----`----`--------|
- // | SHIFT | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | /  | SHFT |
- // |-------`----`----`----`----`----|----`----`----`----`----`------|
- // | CTL | SYS| ALT | SP    SPACE | SPACE  | FN1 | CTL  | \  | ENT  |
- // `-----+----+-----+----+--------|--------+-----+------+----+------'
-  TD(ESC_GR), TD(Q_1), TD(W_2), TD(E_3), TD(R_4), TD(T_5), TD(Y_6), TD(U_7), TD(I_8), TD(O_9), TD(P_0),TD(MIN_LB),TD(EQL_RB), \
-  KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCL_QUO), KC_BSPC, \
-  KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, \
-  KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_FN1, KC_LCTL, KC_NUBS, KC_ENTER
-  ),
-  [_FN1] = LAYOUT_kc(
- // ,----+----+----+----+----+----|----+----+----+----+----+----+----.
- // |    |    | UP |    |    |    |    |    |    |    |    |    |    |
- // |----`----`----`----`----`----|----`----`----`----`----`----`----|
- // |     | LT | DN | RT |    |    |    |    |    |    | '  |  DEL   |
- // |-----`----`----`----`----`----|----`----`----`----`----`--------|
- // |       |    |    |    |    |    |    |    |    |    |PIPE|      |
- // |-------`----`----`----`----`----|----`----`----`----`----`------|
- // |     |    |     |    |        |        |     |      |    |      |
- // `-----+----+-----+----+--------|--------+-----+------+----+------'
-   , , UP, , , , , , , , , , , \
-   , LEFT, DOWN, RIGHT, , , , , , , QUOT, DEL, \
-   , , , , , , , , , , NUBS, , \
-   , , , , , , , , ,
-  ),
-  [_FN2] = LAYOUT_kc(
- // ,----+----+----+----+----+----|----+----+----+----+----+----+----.
- // |    |    |    |    |    |    |    |    |    |    |    |    |    |
- // |----`----`----`----`----`----|----`----`----`----`----`----`----|
- // |     |   |     |    |    |    |    |    |    |    |    |        |
- // |-----`----`----`----`----`----|----`----`----`----`----`--------|
- // |       |    |    |    |    |    |    |    |    |    |    |      |
- // |-------`----`----`----`----`----|----`----`----`----`----`------|
- // |     |    |     |    |        |        |     |      |    |      |
- // `-----+----+-----+----+--------|--------+-----+------+----+------'
-   , , , , , , , , , , , , , \
-   , , , , , , , , , , , , \
-   , , , , , , , , , , , , \
-   , , , , , , , , ,
-  )
-};
-void esc_gr_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_ESC);
-  } else if (state->count == 2) {
-    register_code (KC_GRV);
-  } else {
-    register_code (KC_LSFT);
-    register_code (KC_GRV);
-  }
-}
-void esc_gr_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_ESC);
-  } else if (state->count == 2) {
-    unregister_code (KC_GRV);
-  } else {
-    unregister_code (KC_LSFT);
-    unregister_code (KC_GRV);
-  }
-}
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-[ESC_GR] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, esc_gr_finished, esc_gr_reset), //Tap once for ESC, twice for `, thrice for ~
-[Q_1]  = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_1), //Tap once for Q, twice for 1/!
-[W_2]  = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_2), //Tap once for W, twice for 2/@
-[E_3]  = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_3), //Tap once for E, twice for 3/#
-[R_4]  = ACTION_TAP_DANCE_DOUBLE(KC_R, KC_4), //Tap once for R, twice for 4/$
-[T_5]  = ACTION_TAP_DANCE_DOUBLE(KC_T, KC_5), //Tap once for T, twice for 5/%
-[Y_6]  = ACTION_TAP_DANCE_DOUBLE(KC_Y, KC_6), //Tap once for Y, twice for 6/^
-[U_7]  = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_7), //Tap once for U, twice for 7/&
-[I_8]  = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_8), //Tap once for I, twice for 8/*
-[O_9]  = ACTION_TAP_DANCE_DOUBLE(KC_O, KC_9), //Tap once for O, twice for 9/(
-[P_0]  = ACTION_TAP_DANCE_DOUBLE(KC_P, KC_0), //Tap once for P, twice for 0/)
-[MIN_LB]  = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_LBRC), //Tap once for -, twice for [/{
-[EQL_RB]  = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_RBRC), //Tap once for =, twice for ]/}
-[SCL_QUO] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT) //Tap once for ;, '/"
-// Other declarations would go here, separated by commas, if you have them
-};
diff --git a/keyboards/keebio/fourier/keymaps/jennetters/rules.mk b/keyboards/keebio/fourier/keymaps/jennetters/rules.mk
deleted file mode 100644
index 1ba2fa8fb..000000000
--- a/keyboards/keebio/fourier/keymaps/jennetters/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/keebio/fourier/keymaps/valgrahf/config.h b/keyboards/keebio/fourier/keymaps/valgrahf/config.h
deleted file mode 100644
index 20e49c421..000000000
--- a/keyboards/keebio/fourier/keymaps/valgrahf/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-#endif
diff --git a/keyboards/keebio/fourier/keymaps/valgrahf/keymap.c b/keyboards/keebio/fourier/keymaps/valgrahf/keymap.c
deleted file mode 100644
index a31c88475..000000000
--- a/keyboards/keebio/fourier/keymaps/valgrahf/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-#define KC_ KC_TRNS
-#define KC_FN1 LT(_FN1, KC_NO)
-#define KC_FN2 LT(_FN2, KC_NO)
-#define KC_SPFN LT(_FN1, KC_SPACE)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
- //,----+----+----+----+----+----|----+----+----+----+----+----+----.
-    TAB , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  , DEL,BSPC,
- //|----`----`----`----`----`----|----`----`----`----`----`----`----|
-    ESC  , A  , S  , D  , F  , G  , H  , J  , K  , L  ,QUOT,  SCLN  ,
- //|-----`----`----`----`----`----|----`----`----`----`----`--------|
-    LSFT   , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH, PGUP ,
- //|-------`----`----`----`----`----|----`----`----`----`----`------|
-    LCTL ,LALT,  FN1,   ,ENTER    ,  SPACE , FN2 , HOME, END , PGDN
- //`-----+----+-----+-------------|--------+-----+-----+-----+------'
-  ),
-  [_FN1] = LAYOUT_kc(
- //,----+----+----+----+----+----|----+----+----+----+----+----+----.
-    GRV , 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,    ,    ,
- //|----`----`----`----`----`----|----`----`----`----`----`----`----|
-     DEL , F1  ,F2 , F3 , F4 , F5 , F6 ,MINS, EQL,LBRC,RBRC,  BSLS  ,
- //|-----`----`----`----`----`----|----`----`----`----`----`--------|
-           , F7 , F8 , F9 , F10, F11, F12,    ,    ,    , UP ,      ,
- //|-------`----`----`----`----`----|----`----`----`----`----`------|
-         ,    ,     ,    ,         ,        ,RGUI,LEFT ,DOWN ,RIGHT
- //`-----+----+-----+-------------|--------+-----+-----+-----+------'
-  ),
-  [_FN2] = LAYOUT_kc(
- //,----+----+----+----+----+----|----+----+----+----+----+----+----.
-    TILD,EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,    ,    ,
- //|----`----`----`----`----`----|----`----`----`----`----`----`----|
-     DEL ,RHUI,RSAI,RVAI,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,  PIPE  ,
- //|-----`----`----`----`----`----|----`----`----`----`----`--------|
-           ,RHUD,RSAD,RVAD,    ,    ,VOLU,VOLD,    ,    , UP ,      ,
- //|-------`----`----`----`----`----|----`----`----`----`----`------|
-         ,RTOG,RMOD ,    ,        ,        ,     , LEFT, DOWN, RIGHT
- //`-----+----+-----+-------------|--------+-----+-----+-----+------'
-  )
-};
diff --git a/keyboards/keebio/fourier/keymaps/valgrahf/rules.mk b/keyboards/keebio/fourier/keymaps/valgrahf/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/keebio/fourier/keymaps/valgrahf/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
index 878d57897..a02158e36 100644
--- a/keyboards/keebio/iris/iris.h
+++ b/keyboards/keebio/iris/iris.h
@@ -14,19 +14,3 @@
 #include "quantum.h"
 #include "via.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, LT4, RT4, R30, R31, R32, R33, R34, R35, \
-                        LT1, LT2, LT3, RT3, RT2, RT1 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##LT4, KC_##RT4, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-                                                KC_##LT1, KC_##LT2, KC_##LT3, KC_##RT3, KC_##RT2, KC_##RT1 \
-    )
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c b/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
index fd953bab3..ce2fee792 100644
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
+++ b/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
@@ -22,17 +22,17 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  , AA ,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  , KC_AA ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  , OE , AE ,
+     KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  , KC_OE , KC_AE ,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LCTL, Z  , X  , C  , V  , B  ,LBR      ,RBR ,  N , M  ,COMM,DOT ,SLSH,MINS,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBR      ,KC_RBR ,  KC_N , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_MINS,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPC ,         ENT ,RASE,LALT
+                       KC_LGUI,KC_LOWR,KC_SPC ,         KC_ENT ,KC_RASE,KC_LALT
  //                  `----+----+----'        `----+----+----'
  ),
diff --git a/keyboards/keebio/iris/keymaps/broswen/config.h b/keyboards/keebio/iris/keymaps/broswen/config.h
deleted file mode 100644
index fcfbfe8cf..000000000
--- a/keyboards/keebio/iris/keymaps/broswen/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 5
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define AUDIO_PIN C6
-#define NO_MUSIC_MODE
-#ifdef AUDIO_ENABLE
-  #define STARTUP_SONG SONG(NO_SOUND)
-#endif
-#if !defined(NO_DEBUG) && !defined(CONSOLE_ENABLE)
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define DISABLE_LEADER
diff --git a/keyboards/keebio/iris/keymaps/broswen/keymap.c b/keyboards/keebio/iris/keymaps/broswen/keymap.c
deleted file mode 100644
index a64b03f57..000000000
--- a/keyboards/keebio/iris/keymaps/broswen/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  , DEL,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSPC ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,LBRC,     RBRC , N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LGUI,SPC,         ENT ,LOWR,RASE
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,PGDN,PGUP,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,TILD,PIPE,MINS,PLUS,    ,               LEFT,DOWN, UP ,RGHT,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , GRV,BSLS,UNDS, EQL,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,F12 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,   ,     ,               MUTE,VOLD,VOLU,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      AU_TOG,  CK_UP,  CK_DOWN,  _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RESET  , DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-   // case QWERTY:
-   //   if (record->event.pressed) {
-   //     persistent_default_layer_set(1UL<<_QWERTY);
-   //   }
-   //   return false;
-   //   break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/broswen/rules.mk b/keyboards/keebio/iris/keymaps/broswen/rules.mk
deleted file mode 100644
index 14fa11289..000000000
--- a/keyboards/keebio/iris/keymaps/broswen/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
-MIDI_ENABLE = no
-BLUETOOTH_ENABLE = no
-COMMAND_ENABLE = no
-TERMINAL_ENABLE = no
-AUDIO_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
index 4d76d745d..aa757508a 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
@@ -54,81 +54,81 @@ enum {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_COLEMAK] = LAYOUT_kc(
+        [_COLEMAK] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
+     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSPC,
+     KC_GRV , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   NAVMAC, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
+   KC_NAVMAC, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,                KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SFLK, Z  , X  , C  , V  , B  , PC ,     ENT , K  , M  ,COMM, DOT,SLSH,RSFT,
+     KC_SFLK, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_PC ,     KC_ENT , KC_K  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,LGUI,CMBS,         SPC, SYM, LALT
+                       KC_LCTL,KC_LGUI,KC_CMBS,         KC_SPC, KC_SYM, KC_LALT
  //                  `----+----+----'        `----+----+----'
  ),
-    [_PC] = LAYOUT_kc(
+    [_PC] = LAYOUT(
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    NAVPC,___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC_NAVPC,KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ , GM, ___, ___ , ___ , ___ , ___ , ___ , ___ , 
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ , KC_GM, KC____, KC____ , KC____ , KC____ , KC____ , KC____ , KC____ , 
        
-                      LGUI , LCTL , CTBS ,    ___ , ___ , ___ 
+                      KC_LGUI , KC_LCTL , KC_CTBS ,    KC____ , KC____ , KC____ 
    ),
   
-    [_GAME] = LAYOUT_kc(
+    [_GAME] = LAYOUT(
-    ___ , ___ , ___ , ___ , ___ , ___ ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-     B  ,  T  ,  Q  ,  W  ,  E  ,  R  ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+     KC_B  ,  KC_T  ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    TAB , LSFT,  A  ,  S  ,  D  ,  F  ,          ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC_TAB , KC_LSFT,  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    LALT, LCTL,  Z  ,  X  ,  C  ,  V  ,  M,   P , ___, ___ , ___ , ___ , ___ , ___ , 
+    KC_LALT, KC_LCTL,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_M,   KC_P , KC____, KC____ , KC____ , KC____ , KC____ , KC____ , 
        
-                          G   ,  I  , SPC,    BSPC, MAC, ___ 
+                          KC_G   ,  KC_I  , KC_SPC,    KC_BSPC, KC_MAC, KC____ 
    ), 
    
-    [_SYMBOL] = LAYOUT_kc(
+    [_SYMBOL] = LAYOUT(
    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
    
-    LBRC,  1  ,  2  ,  3  ,  4  ,  5  ,          6  ,  7  ,  8  ,  9  ,  0  , RBRC,
+    KC_LBRC,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,          KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  , KC_RBRC,
        
-    BSLS, EXLM, AT  , HASH, DLR , PERC,         CIRC, AMPR, ASTR, LPRN, RPRN, EQL ,
+    KC_BSLS, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
        
-    ___ , HOME, END , VOLD, VOLU, MPLY,___,  ___,___, MINS, ___ , ___ , ___ , ___ , 
+    KC____ , KC_HOME, KC_END , KC_VOLD, KC_VOLU, KC_MPLY,KC____,  KC____,KC____, KC_MINS, KC____ , KC____ , KC____ , KC____ , 
        
-                        ___ , ___ , ___,      ___, ___ , ___ 
+                        KC____ , KC____ , KC____,      KC____, KC____ , KC____ 
    ),
   
-    [_NAVMAC] = LAYOUT_kc(
+    [_NAVMAC] = LAYOUT(
    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         C_TAB, AL ,  UP ,  AR , DEL , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_C_TAB, KC_AL ,  KC_UP ,  KC_AR , KC_DEL , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         GSL , LEFT, DOWN, RGHT, GSR , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_GSL , KC_LEFT, KC_DOWN, KC_RGHT, KC_GSR , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,G_TAB,ABSPC, ___ , ___ , ___ , ___ , 
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,KC____,  KC____,KC_G_TAB,KC_ABSPC, KC____ , KC____ , KC____ , KC____ , 
        
-                        ___ , ___ , ___ ,       ___ , ___ , ___ 
+                        KC____ , KC____ , KC____ ,       KC____ , KC____ , KC____ 
    ),
    
-    [_NAVPC] = LAYOUT_kc(
+    [_NAVPC] = LAYOUT(
    
-    ___ , ___ , ___ , ___ , ___ , ___ ,         ___ , ___ , ___ , ___ , ___ , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         C_TAB, CL ,  UP ,  CR , DEL , ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_C_TAB, KC_CL ,  KC_UP ,  KC_CR , KC_DEL , KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,         CPGU, LEFT, DOWN, RGHT, CPGD, ___ ,
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_CPGU, KC_LEFT, KC_DOWN, KC_RGHT, KC_CPGD, KC____ ,
        
-    ___ , ___ , ___ , ___ , ___ , ___ ,___,  ___,A_TAB,CBSPC, ___ , ___ , ___ , ___ , 
+    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,KC____,  KC____,KC_A_TAB,KC_CBSPC, KC____ , KC____ , KC____ , KC____ , 
        
-                        ___ , ___ , ___ ,       ___ , ___ , ___ 
+                        KC____ , KC____ , KC____ ,       KC____ , KC____ , KC____ 
    ),
   
 };
@@ -153,4 +153,4 @@ void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
 qk_tap_dance_action_t tap_dance_actions[] = {
    //Tap once for Shift, twice for Caps Lock
    [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end)
-};
-\ No newline at end of file
+};
diff --git a/keyboards/keebio/iris/keymaps/dbroqua/config.h b/keyboards/keebio/iris/keymaps/dbroqua/config.h
deleted file mode 100644
index 130b52c28..000000000
--- a/keyboards/keebio/iris/keymaps/dbroqua/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-#define USE_SERIAL
-#define MASTER_LEFT
-#endif
diff --git a/keyboards/keebio/iris/keymaps/dbroqua/keymap.c b/keyboards/keebio/iris/keymaps/dbroqua/keymap.c
deleted file mode 100644
index fe19696e1..000000000
--- a/keyboards/keebio/iris/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-    /*
-     * ,-----+-----+-----+-----+-----+-----+                ,-----+-----+-----+-----+-----+-----+
-     * | ESC |  1  |  2  |  3  |  4  |  5  |                |  6  |  7  |  8  |  9  |  0  |  `  |
-     * |-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * | TAB |  Q  |  W  |  E  |  R  |  T  |                |  Y  |  U  |  I  |  O  |  P  | BSPC|
-     * +-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * | LCTL|  A  |  S  |  D  |  F  |  G  |                |  H  |  J  |  K  |  L  |  ;  |  '  |
-     * +-----+-----+-----+-----+-----+-----+-----.    ,-----+-----+-----+-----+-----+-----+-----+
-     * | LSFT|  Z  |  X  |  C  |  V  |  B  |     /    \     |  N  |  M  |  ,  |  .  |  /  | RSFT|
-     * +-----+-----+-----+--+--+-----+-----+ SPC/      \ ENT+-----+-----+--+--+-----+-----+-----+
-     *                      \ LGUI| LOWR|      /        \      | RASE| LALT/
-     *                      `-----+-----+-----'          `-----+-----+----'
-     */
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  , GRV,
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSPC,
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-     LSFT, Z  , X  , C  , V  , B  ,    ,         , N  , M  ,COMM,DOT ,SLSH,RSFT,
-                       LGUI,LOWR, SPC ,        ENT ,RASE,LALT
-  ),
-  [_LOWER] = LAYOUT_kc(
-    /*
-     * ,-----+-----+-----+-----+-----+-----+                ,-----+-----+-----+-----+-----+-----+
-     * |  ~  |  !  |  @  |  #  |  $  |  %  |                |  ^  |  &  |  *  |  (  |  )  | BSPC|
-     * |-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * | RST |  1  |  2  |  3  |  4  |  5  |                |  6  |  7  |  8  |  9  |  0  |     |
-     * +-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * | DEL |     | LEFT| RGHT| UP  |  [  |                |  ]  |  4  |  5  |  6  |  +  |  |  |
-     * +-----+-----+-----+-----+-----+-----+-----.    ,-----+-----+-----+-----+-----+-----+-----+
-     * |     |     |     |     | DOWN|  {  |     /    \     |  }  |  1  |  2  |  3  |  -  |     |
-     * +-----+-----+-----+--+--+-----+-----+ DEL/      \ DEL+-----+-----+--+--+-----+-----+-----+
-     *                      \     |     |      /        \      |     | 0   /
-     *                      `-----+-----+-----'          `-----+-----+----'
-     */
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-     DEL ,    ,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-         ,    ,    ,    ,DOWN,LCBR,    ,         ,RCBR, P1 , P2 , P3 ,MINS,    ,
-                           ,    ,DEL ,         DEL ,    , P0
-  ),
-  [_RAISE] = LAYOUT_kc(
-    /*
-     * ,-----+-----+-----+-----+-----+-----+                ,-----+-----+-----+-----+-----+-----+
-     * | F12 |  F1 |  F2 |  F3 |  F4 |  F5 |                |  F6 |  F7 |  F8 |  F9 | F10 | F11 |
-     * |-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * |     |  !  |  @  |  #  |  $  |  %  |                |  ^  |  &  |  *  |  (  |  )  |     |
-     * +-----+-----+-----+-----+-----+-----+                +-----+-----+-----+-----+-----+-----+
-     * |     | Prev| Next| Vol+| PgUp|  _  |                |  =  | Home|     |     |  +  |  \  |
-     * +-----+-----+-----+-----+-----+-----+-----.    ,-----+-----+-----+-----+-----+-----+-----+
-     * | Mute| Stop| Play| Vol-| PgDn|  -  |     /    \     |  +  | End |     |     |     |Debug|
-     * +-----+-----+-----+--+--+-----+-----+    /      \    +-----+-----+--+--+-----+-----+-----+
-     *                      \     |     |      /        \      |     | 0   /
-     *                      `-----+-----+-----'          `-----+-----+----'
-     */
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-         ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,DBUG,
-                           ,    ,    ,             ,    ,
-  )
-};
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _QWERTY);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _QWERTY);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _QWERTY);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/dbroqua/rules.mk b/keyboards/keebio/iris/keymaps/dbroqua/rules.mk
deleted file mode 100644
index 1d2d9e5a9..000000000
--- a/keyboards/keebio/iris/keymaps/dbroqua/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/config.h b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/config.h
deleted file mode 100644
index 72e35c472..000000000
--- a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/keymap.c b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/keymap.c
deleted file mode 100644
index 12ac00cd7..000000000
--- a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/keymap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB ,    ,COMM,DOT , P  , Y  ,                F  , G  , C  , R  , L  ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LSFT, A  , O  , E  , U  , I  ,                D  , H  , T  , N  , S  ,INS ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LCTL,QUOT, Q  , J  , K  , X  ,HOME,     END , B  , M  , W  , V  , Z  ,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,ENT ,         SPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,    ,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,    ,    ,    ,DOWN,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,         DEL ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RTOG,RMOD,RHUI,RSAI,RVAI,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,DBUG,RHUD,RSAD,RVAD,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,RST ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/rules.mk b/keyboards/keebio/iris/keymaps/dvp-zjpxshade/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/dvp-zjpxshade/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/fabian/config.h b/keyboards/keebio/iris/keymaps/fabian/config.h
deleted file mode 100644
index faae942a8..000000000
--- a/keyboards/keebio/iris/keymaps/fabian/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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
-// Add layout to the product identifier
-#undef PRODUCT
-#define PRODUCT         Iris Keyboard (fabian)
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-// RGB configuration
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/fabian/keymap.c b/keyboards/keebio/iris/keymaps/fabian/keymap.c
deleted file mode 100644
index d7d98fdc0..000000000
--- a/keyboards/keebio/iris/keymaps/fabian/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-enum custom_layers {
-  _COLEMAK,
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _MOUSECURSOR,
-  _ADJUST,
-};
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  LOWER,
-  RAISE,
-  MOUSECURSOR,
-  ADJUST,
-  DYNAMIC_MACRO_RANGE,
-};
-#include "dynamic_macro.h"
-#define KC_ KC_TRNS
-#define KC_COLE COLEMAK
-#define KC_LOWR LOWER
-#define KC_QWER QWERTY
-#define KC_RASE RAISE
-#define KC_RECB DYN_REC_START1
-#define KC_RECE DYN_REC_STOP
-#define KC_RECP DYN_MACRO_PLAY1
-#define KC_RSET RESET
-#define KC_CTLE CTL_T(KC_ESC)             // Tap for Escape, hold for Control
-#define KC_HTAB ALL_T(KC_TAB)             // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define KC_SBSP SFT_T(KC_BSPC)            // Tap for Backspace, hold for Shift
-#define KC_SENT KC_SFTENT                 // Tap for Enter, hold for Shift
-#define KC_TGMC TG(_MOUSECURSOR)          // Toggle MOUSECURSOR layer
-#define KC_SPMC LT(_MOUSECURSOR, KC_SPC)  // Tap for Space, hold for MOUSECURSOR layer
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     MEH , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,TGMC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     HTAB, Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CTLE, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SBSP, Z  , X  , C  , V  , B  ,LALT,     RALT, N  , M  ,COMM,DOT ,SLSH,SENT,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPMC,         HTAB,RASE,RGUI
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     MEH , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,TGMC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     HTAB, Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CTLE, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SBSP, Z  , X  , C  , V  , B  ,LALT,     RALT, K  , M  ,COMM,DOT ,SLSH,SENT,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPMC,         HTAB,RASE,RGUI
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV , F1 , F2 , F3 , F4 , F5 ,                F6 ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , F7 , F8 , F9 ,F10 ,F11 ,    ,         ,F12 ,MS_L,MS_D,MS_U,MS_R,BTN1,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TILD, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV , F1 , F2 , F3 , F4 , F5 ,                F6 ,MINS,EQL ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , F7 , F8 , F9 ,F10 ,F11 ,    ,         ,F12 ,LEFT,DOWN, UP ,RGHT,BTN2,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_MOUSECURSOR] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    , UP ,    ,    ,               WH_D,WH_R,MS_U,ACL0,ACL1,ACL2,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,LEFT,DOWN,RGHT,    ,               WH_L,MS_L,MS_D,MS_R,BTN1,BTN2,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,WH_U,LEFT,DOWN, UP ,RGHT,BTN3,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RSET,    ,    ,    ,    ,                   ,    ,    ,    ,RSET,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,QWER,COLE,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,RECB,RECE,RECP,CAPS,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (!process_record_dynamic_macro(keycode, record)) {
-    return false;
-  }
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
- }
diff --git a/keyboards/keebio/iris/keymaps/fate/config.h b/keyboards/keebio/iris/keymaps/fate/config.h
deleted file mode 100644
index 5f16bffb7..000000000
--- a/keyboards/keebio/iris/keymaps/fate/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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
-/* QMK DFU configuration */
-#define QMK_ESC_OUTPUT F6
-#define QMK_ESC_INPUT D7
-#define QMK_LED     D5
-#define QMK_SPEAKER C6
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/fate/keymap.c b/keyboards/keebio/iris/keymaps/fate/keymap.c
deleted file mode 100644
index 0e21944c7..000000000
--- a/keyboards/keebio/iris/keymaps/fate/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-enum iris_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _NUMPAD
-};
-// Tap Dance Declarations
-enum {
-    TD_LALT_LGUI = 0,
-    TD_RALT_RGUI
-};
-#define KC_ KC_TRNS
-#define KC_LOWR MO(_LOWER)
-#define KC_RASE MO(_RAISE)
-#define KC_NUM TG(_NUMPAD)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_BL_S BL_STEP
-#define KC_RTOG RGB_TOG
-#define KC_RMD RGB_MOD
-#define KC_RRMD RGB_RMOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_LAG TD(TD_LALT_LGUI)
-#define KC_RAG TD(TD_RALT_RGUI)
-#define KC_RSEN MT(MOD_RSFT, KC_ENT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,ENT ,     ENT , N  , M  ,COMM,DOT ,SLSH,RSEN,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LAG ,LOWR,SPC ,         SPC ,RASE,RAG
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CAPS,    ,HOME, UP ,END ,PGUP,               LEFT,DOWN, UP ,RGHT,INS ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,TILD,LEFT,DOWN,RGHT,PGDN,                   ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,MPLY,MPRV,MNXT,VOLD,VOLU,    ,         ,HOME,PGDN,PGUP,END ,APP ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CAPS,    ,BTN1,MS_U,BTN2,WH_U,               LEFT,DOWN, UP ,RGHT,INS ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,GRV ,MS_L,MS_D,MS_R,WH_D,                   ,MINS,EQL ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,MPLY,MPRV,MNXT,VOLD,VOLU,    ,         ,HOME,PGDN,PGUP,END ,APP ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RMD ,RHUI,RSAI,RVAI,RTOG,                   ,PSCR,SLCK,PAUS,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RRMD,RHUD,RSAD,RVAD,BL_S,               LEFT,DOWN, UP ,RGHT,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,DBUG,    ,    ,    ,RST ,NUM ,     NUM ,HOME,PGDN,PGUP,END ,APP ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_NUMPAD] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,               NLCK, P7 , P8 , P9 ,PSLS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   , P4 , P5 , P6 ,PAST,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   , P1 , P2 , P3 ,PPLS,ENT ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    , P0 , P0 ,PDOT,PMNS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
-uint32_t layer_state_set_user(uint32_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for L-Alt, twice for L-GUI
-    [TD_LALT_LGUI] = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_LGUI),
-    // Tap once for R-Alt, twice for R-GUI
-    [TD_RALT_RGUI] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_RGUI)
-};
diff --git a/keyboards/keebio/iris/keymaps/fate/readme.md b/keyboards/keebio/iris/keymaps/fate/readme.md
deleted file mode 100644
index 70f464b0d..000000000
--- a/keyboards/keebio/iris/keymaps/fate/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Fate Iris Layout
-This keymap is configured for Pro Micro(s) with QMK-DFU bootloader flashed. Please refer to [this guide](https://www.reddit.com/r/olkb/comments/8sxgzb/replace_pro_micro_bootloader_with_qmk_dfu/) for further details on ISP flashing your Pro Micro.
-To generate a production-ready .hex file (containing the application and the bootloader), use the production target
-    make iris/rev2:fate:production
-To replace your Pro Micro with QMK-DFU bootloader along with the keymap, setup your ISP Flasher and avrdude, run (This command assumes you're using SparkFun's Pocket AVR Programmer to program):
-    $ avrdude -p m32u4 -P usb -c usbtiny -U flash:w:"iris_rev2_fate_production.hex" -U lfuse:w:0x5E:m -U hfuse:w:0xD9:m -U efuse:w:0xC3:m -U lock:w:0x3F:m -v
-Command to replace your Pro Micro with QMK-DFU bootloader only:
-    $ avrdude -p m32u4 -P usb -c usbtiny -U flash:w:"iris_rev2_fate_bootloader.hex" -U lfuse:w:0x5E:m -U hfuse:w:0xD9:m -U efuse:w:0xC3:m -U lock:w:0x3F:m -v
-The QMK_ESC is mapped to the ESC key in keymap.c; QMK_LED is mapped to TX_LED on the Pro Micro.
-    /* QMK DFU configuration */
-    #define QMK_ESC_OUTPUT F6
-    #define QMK_ESC_INPUT D7
-    #define QMK_LED     D5
-    #define QMK_SPEAKER C6
diff --git a/keyboards/keebio/iris/keymaps/fate/rules.mk b/keyboards/keebio/iris/keymaps/fate/rules.mk
deleted file mode 100644
index 378a653d9..000000000
--- a/keyboards/keebio/iris/keymaps/fate/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
-BOOTLOADER = qmk-dfu
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/gary/keymap.c b/keyboards/keebio/iris/keymaps/gary/keymap.c
index 41ac9207b..fd9a8a0d4 100644
--- a/keyboards/keebio/iris/keymaps/gary/keymap.c
+++ b/keyboards/keebio/iris/keymaps/gary/keymap.c
@@ -2,46 +2,46 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RASE, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_RASE, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----   +----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,NEXT,     FULL , N  , M  ,COMM,DOT ,SLSH,SFTENT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_NEXT,     KC_FULL , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_SFTENT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPC ,        GARY, ENT,LALT
+                       KC_LGUI,KC_LOWR,KC_SPC ,        KC_GARY, KC_ENT,KC_LALT
  //                  `----+----+----'        `----+----+----'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-    GRV ,EXLM, AT ,HASH,DLR ,PERC,                CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
+    KC_GRV ,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CLTB,    ,CNTR,UPLF,UPRG,    ,                   ,    ,PLUS,LBRC,RBRC,OPASS,
+     KC_CLTB,_______,KC_CNTR,KC_UPLF,KC_UPRG,_______,               _______,_______,KC_PLUS,KC_LBRC,KC_RBRC,KC_OPASS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,LHLF,RHLF,DNLF,DNRG,    ,                   ,    ,MINS,    ,    ,PIPE,
+     _______,KC_LHLF,KC_RHLF,KC_DNLF,KC_DNRG,_______,               _______,_______,KC_MINS,_______,_______,KC_PIPE,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|`
-         ,    ,    ,CTLC,    ,    ,    ,         ,    ,    ,    ,EQL ,    ,UNDS ,
+     _______,_______,_______,KC_CTLC,_______,_______,_______,     _______,_______,_______,_______,KC_EQL ,_______,KC_UNDS ,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,        BSPC ,    ,
+                       _______,_______,KC_DEL ,        KC_BSPC ,_______, _______
  //                  `----+----+----'        `----+----+----'
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD, F1 , F2 , F3 ,SHOT, F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
+     KC_TILD, KC_F1 , KC_F2 , KC_F3 ,KC_SHOT, KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MPRV,MPLY,MNXT,    ,    ,                   ,PGUP, UP ,PGDN,    ,    ,
+     _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,               _______,KC_PGUP, KC_UP ,KC_PGDN,_______,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,VOLD,VOLU,MUTE,    ,                   ,LEFT,DOWN,RGHT,    ,    ,
+     _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,               _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,      RST,    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,_______,      KC_RST,_______,_______,_______,_______,_______,_______,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                            ,LALT,    ,             ,    ,
+                        _______,KC_LALT,_______,         _______,_______, _______
  //                  `----+----+----'        `----+----+----'
  ),
 };
diff --git a/keyboards/keebio/iris/keymaps/hag/config.h b/keyboards/keebio/iris/keymaps/hag/config.h
deleted file mode 100644
index c4604af43..000000000
--- a/keyboards/keebio/iris/keymaps/hag/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/hag/keymap.c b/keyboards/keebio/iris/keymaps/hag/keymap.c
deleted file mode 100644
index 222b68208..000000000
--- a/keyboards/keebio/iris/keymaps/hag/keymap.c
+++ /dev/null
@@ -1,295 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-//Heavily modified keymap. Some features:
-//Multiple layouts, I use dvorak as main.
-//Nordic(swedish) signs
-//Symbols, numpad, arrows/navigation reachable under the alpas via the layers
-//Mirrored ctl, alt and shift to be able to use both hands when doing commands
-//Gaming layer, qwerty with space on left half.
-#define _QWERTY 2
-#define _DVORAK 0
-#define _COLEMAK 1
-#define _WORKMAN 3
-#define _GAMING 4
-#define _NUMPAD 5
-#define _LOWER 6
-#define _RAISE 7
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  COLEMAK,
-  WORKMAN,
-  GAMING,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_Sw2 RALT(KC_2) // Nordic @
-#define KC_Sw3 RALT(KC_3) // Nordic something
-#define KC_Sw4 RALT(KC_4) // Nordic something
-#define KC_Sw5 RALT(KC_5) // Nordic something
-#define KC_Sw6 RALT(KC_6) // ...
-#define KC_Sw7 RALT(KC_7)
-#define KC_Sw8 RALT(KC_8)
-#define KC_Sw9 RALT(KC_9)
-#define KC_Sw0 RALT(KC_0)
-#define KC_Tild RALT(KC_RBRC)
-#define KC_Bsls RALT(KC_MINS)
-#define KC_Bar RALT(KC_NUBS)
-#define KC_Less S(KC_NUBS)
-#define KC_CATDEL LCTL(LALT(KC_DEL)) // Ctrl alt del
-#define KC_TSKMGR LCTL(S(KC_ESC)) // Ctrl shift esc
-#define KC_NUMP TG(_NUMPAD)  // Toggle layer NUMPAD for use in LAYOUT_kc
-#define KC_Close RALT(KC_F4) // Alt F4
-#define KC_Great S(KC_NUBS)
-#define KC_MEH1 MEH(KC_1)
-#define KC_MEH2 MEH(KC_2)
-#define KC_MEH3 MEH(KC_3)
-#define KC_MEH4 MEH(KC_4)
-#define KC_MEH5 MEH(KC_5)
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     DEL ,APP, VOLD,MUTE,VOLU,LGUI,               RGUI,MPRV,MPLY,MNXT,DOWN,ESC ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,LBRC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,NUMP,     ENT , N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LOWR,BSPC,         SPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_GAMING] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,ESC ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,RCTL,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  , Y  ,     ENT , N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LOWR,SPC,         BSPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
- [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     DEL ,APP ,VOLD,MUTE,VOLU,LGUI,               RGUI,MPRV,MPLY,MNXT,DOWN,ESC ,
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TAB ,LBRC,QUOT,SCLN, P  , Y  ,                F  , G  , C  , R  , L  ,DEL,
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     LCTL, A  , O  , E  , U  , I  ,                D  , H  , T  , N  , S  ,RCTL,
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     LSFT,DOT , Q  , J  , K  , X  ,NUMP,     ENT , B  , M  , W  , V  , Z  ,RSFT,
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-                       LALT,LOWR,BSPC,         SPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
- [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     DEL ,APP, VOLD,MUTE,VOLU,LGUI,               RGUI,MPRV,MPLY,MNXT,DOWN,ESC ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,LBRC,QUOT,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,SCLN,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,NUMP,     ENT , K  , M  ,COMM, DOT,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LOWR,BSPC,         SPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-[_WORKMAN] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     DEL ,APP, VOLD,MUTE,VOLU,LGUI,               RGUI,MPRV,MPLY,MNXT,DOWN,ESC ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , R  , W  , B  ,                J  , F  , U  , P  ,LBRC,SCLN,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , H  , T  , G  ,                Y  , N  , E  , O  , I  ,RCTL,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , M  , C  , V  ,NUMP,     ENT , K  , L  ,QUOT, DOT,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LOWR,BSPC,         SPC ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_NUMPAD] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F1  , F2 , F3 , F4 , F5 , F6 ,                F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MEH1,BTN2,MS_U,BTN1,CATDEL,             PIPE, P7 , P8 , P9 ,SLSH,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MEH4,MS_L,MS_D,MS_R,TSKMGR,             COMM, P4 , P5 , P6 ,MINS,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,MEH5,ACL0,ACL1,ACL2,MEH3,    ,     PENT,DOT , P1 , P2 , P3 , P0 ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LOWR,BSPC,             , P0 ,NLCK
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F1  , F2 , F3 , F4 , F5 , F6 ,                F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,CAPS,PGUP, UP ,PGDN, ESC,               RCBR,EXLM,ASTR,LPRN,UNDS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,HOME,LEFT,DOWN,RGHT, END,               RPRN,QUES,Sw8 ,Sw9 ,LABK,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , ENT,    ,    ,    , DEL,    ,         ,RABK,NUBS,Sw7 ,Sw0 ,Great,   ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,   ,            ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM,GRV ,EQL, DLR ,PERC,               Sw3 ,Sw5 ,Sw6 ,Sw0 ,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,Bar ,Sw2 ,HASH, AT ,PERC,               PIPE, 7  , 8  , 9  ,PMNS,PSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,Bsls,Tild,SLSH,AMPR,BSLS,               COMM, 4  , 5  , 6  ,PPLS,PAST,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,PIPE,Sw4 ,PLUS,CIRC,TILD,    ,     PENT,DOT , 1  , 2  , 3  , 0  ,PEQL,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      GAMING , DVORAK,  WORKMAN, COLEMAK, QWERTY ,   KC_RST,                           _______, _______, _______, _______, KC_PWR,    RESET,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,LGUI(KC_UP),_______,LALT(KC_F4),                       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______,LGUI(KC_LEFT),LGUI(KC_DOWN),LGUI(KC_RGHT),_______,             _______,  DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-//          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case NUMPAD:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-//          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_NUMPAD);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-//          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-//          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_WORKMAN);
-      }
-      return false;
-      break;
-    case GAMING:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-//          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_GAMING);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/hag/rules.mk b/keyboards/keebio/iris/keymaps/hag/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/hag/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
index a886bf7a3..7c477f850 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -87,7 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
                                 _______,_______,_______,             _______,_______,_______
  //                            `-------+-------+-------'            `-------+-------+-------'
  ),
  [_ADJUST] = LAYOUT(
diff --git a/keyboards/keebio/iris/keymaps/hexwire/config.h b/keyboards/keebio/iris/keymaps/hexwire/config.h
deleted file mode 100644
index 8166822d9..000000000
--- a/keyboards/keebio/iris/keymaps/hexwire/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-#define USE_I2C
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/hexwire/keymap.c b/keyboards/keebio/iris/keymaps/hexwire/keymap.c
deleted file mode 100644
index 33105c1c8..000000000
--- a/keyboards/keebio/iris/keymaps/hexwire/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,QUOT,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,ENTS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,SPC ,     LCTL, N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPC ,         BSPC,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,CPYP,    ,    ,DOWN,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,         DEL ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RESET  , DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/hexwire/rules.mk b/keyboards/keebio/iris/keymaps/hexwire/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/hexwire/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c b/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c
index 930c747f0..4abb6a63b 100644
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c
@@ -20,45 +20,45 @@ extern keymap_config_t keymap_config;
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
 //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-   GUIE, 1,   2,   3,   4,   5,                  6,   7,   8,   9,   0,  BSLS,
+   KC_GUIE, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,  KC_BSLS,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   TAB,  Q,   W,   E,   R,   T,                  Y,   U,   I,   O,   P,  BSPC,
+   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,  KC_BSPC,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   AGRV, A,   S,   D,   F,   G,                  H,   J,   K,   L,  SCLN,AQUO,
+   KC_AGRV, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                  KC_H,   KC_J,   KC_K,   KC_L,  KC_SCLN,KC_AQUO,
 //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-   PSFT, Z,   X,   C,   V,   B,  NAVI,     NAVI, N,   M,  COMM,DOT, SLSH,DSFT,
+   KC_PSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  KC_NAVI,     KC_NAVI, KC_N,   KC_M,  KC_COMM,KC_DOT, KC_SLSH,KC_DSFT,
 //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                     NAVI,ECTL, SPC,         ENT, MCTL,NAVI
+                     KC_NAVI,KC_ECTL, KC_SPC,         KC_ENT, KC_MCTL,KC_NAVI
 //                  `----+----+----'        `----+----+----'
     ),
-  [_NAVI] = LAYOUT_kc(
+  [_NAVI] = LAYOUT(
 //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-   F12,  F1,  F2,  F3,  F4,  F5,                 F6,  F7,  F8,  F9, F10, F11,
+   KC_F12,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,                 KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   TRNS,TRNS,MUTE,VOLU,TRNS,TRNS,               PGUP,HOME, UP, END, TRNS,TRNS,
+   KC_TRNS,KC_TRNS,KC_MUTE,KC_VOLU,KC_TRNS,KC_TRNS,               KC_PGUP,KC_HOME, KC_UP, KC_END, KC_TRNS,KC_TRNS,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   TRNS,TRNS,BRID,VOLD,BRIU,TRNS,               PGDN,LEFT,DOWN,RGHT,TRNS,TRNS,
+   KC_TRNS,KC_TRNS,KC_BRID,KC_VOLD,KC_BRIU,KC_TRNS,               KC_PGDN,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,
 //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-   TRNS,TRNS,TRNS,NUMP,INS, TRNS,TRNS,     TRNS,TRNS,CAPS,LBRC,RBRC,TRNS,TRNS,
+   KC_TRNS,KC_TRNS,KC_TRNS,KC_NUMP,KC_INS, KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_CAPS,KC_LBRC,KC_RBRC,KC_TRNS,KC_TRNS,
 //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                     TRNS,TRNS,TRNS,         TRNS,TRNS,TRNS
+                     KC_TRNS,KC_TRNS,KC_TRNS,         KC_TRNS,KC_TRNS,KC_TRNS
 //                  `----+----+----'        `----+----+----'
     ),
-  [_NUMP] = LAYOUT_kc(
+  [_NUMP] = LAYOUT(
 //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,               TRNS,NLCK,PSLS,PAST,PMNS,TRNS,
+   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,KC_TRNS,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,               TRNS, P7,  P8,  P9, PPLS,TRNS,
+   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS, KC_P7,  KC_P8,  KC_P9, KC_PPLS,KC_TRNS,
 //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,               TRNS, P4,  P5,  P6, PCMM,TRNS,
+   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS, KC_P4,  KC_P5,  KC_P6, KC_PCMM,KC_TRNS,
 //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,TRNS, P1,  P2,  P3, PEQL,TRNS,
+   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS, KC_P1,  KC_P2,  KC_P3, KC_PEQL,KC_TRNS,
 //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                     TRNS,TRNS,TRNS,         PENT, P0, PDOT
+                     KC_TRNS,KC_TRNS,KC_TRNS,         KC_PENT, KC_P0, KC_PDOT
 //                  `----+----+----'        `----+----+----'
     )
 };
diff --git a/keyboards/keebio/iris/keymaps/jennetters/config.h b/keyboards/keebio/iris/keymaps/jennetters/config.h
deleted file mode 100644
index 42f91bd02..000000000
--- a/keyboards/keebio/iris/keymaps/jennetters/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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 TAPPING_TERM 150
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/jennetters/keymap.c b/keyboards/keebio/iris/keymaps/jennetters/keymap.c
deleted file mode 100644
index c06079c92..000000000
--- a/keyboards/keebio/iris/keymaps/jennetters/keymap.c
+++ /dev/null
@@ -1,206 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  YUNO,
-  SHRG,
-  NOVY,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_YUNO YUNO
-#define KC_SHRG SHRG
-#define KC_NOVY NOVY
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-//Tap Dance Declartaions
-enum {
-  ESC_GR = 0
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //  ,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  //  | ESC| 1  | 2  | 3  | 4  | 5  |              | 6  | 7  | 8  | 9  | 0  | -  |
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  | TAB| Q  | W  | E  | R  | T  |              | Y  | U  | I  | O  | P  | BSP|
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  | CAP| A  | S  | D  | F  | G  |              | H  | J  | K  | L  | ;  | '  |
-  //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //  | SFT| Z  | X  | C  | V  | B  | SPC|    | SPC| N  | M  | ,  | .  | /  | ENT|
-  //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \  GUI| ALT| CTL /      \RASE\ CTL | SFT /
-  //                    `----+----+----'        `----+----+----'
-  TD(ESC_GR), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, \
-  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
-  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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_SPC, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \
-  KC_LGUI, KC_LALT, KC_LCTL, KC_RASE, KC_RCTL, KC_RSFT
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //  ,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  //  |  ~ | !  | @  | #  | $  | %  |              | ^  | &  | *  | (  | )  | DEL|
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  |    | 1  | 2  | 3  | 4  | 5  |              | 6  | 7  | 8  | 9  | 0  |    |
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  |    |    |    |    |    |    |              |    |    |    |    |    |PIPE|
-  //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //  | \  |    |    |    |    | [  | (  |    | )  | ]  |    |    |    | -  |    |
-  //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \     |    | DEL /      \ DEL\     |     /
-  //                    `----+----+----'        `----+----+----'
-  TILD, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, DEL, \
-   , 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, , \
-   , , , , , , , , , , ,PIPE, \
-  BL_S, , , , , LCBR, LPRN, RPRN, RCBR, , , , MINS, , \
-   , , DEL, DEL, ,
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //  ,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  //  |    | F1 | F2 |    |    |    |              |    |    |    | [  | ]  | =  |
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  |    |    | UP |    |    |    |              |    |    |    | {  | }  | DEL|
-  //  |----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //  |    | LT | DN | RT |    |    |              |SHRG|    |    |    |PIPE|    |
-  //  |----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //  |    |    |    |    |    |    |    |    |    |    |    |    |    | \  |    |
-  //  `----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   \     |    |     /      \    \     |     /
-  //                    `----+----+----'        `----+----+----'
-   , F1, F2, , , , , , , LBRC, RBRC, EQL, \
-   , , UP, , , , YUNO, NOVY, , LCBR, RCBR, DEL, \
-   , LEFT, DOWN, RIGHT, , , SHRG, , , , PIPE, , \
-   , , , , , , , , , , , , BSLS, , \
-   , , , , ,
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, \
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, \
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, \
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, \
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void esc_gr_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_ESC);
-  } else if (state->count == 2) {
-    register_code (KC_GRV);
-  } else {
-    register_code (KC_LSFT);
-    register_code (KC_GRV);
-  }
-}
-void esc_gr_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_ESC);
-  } else if (state->count == 2) {
-    unregister_code (KC_GRV);
-  } else {
-    unregister_code (KC_LSFT);
-    unregister_code (KC_GRV);
-  }
-}
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for ESC, twice for `, thrice for ~
-  [ESC_GR] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, esc_gr_finished, esc_gr_reset)
-  // Other declarations would go here, separated by commas, if you have them
-};
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-    case SHRG:
-      if (record->event.pressed) {
-      SEND_STRING("¯\\_(ツ)_/¯"); // I dunno.
-               return false;
-      }
-    /* Ignore for now - special characters not working with macros
-       }
-    case NOVY:
-      if (record->event.pressed) {
-        SEND_STRING("ლ(ಠ_ಠლ)"); // YUNO?!
-                return false;
-      }
-    */
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/jennetters/readme.md b/keyboards/keebio/iris/keymaps/jennetters/readme.md
deleted file mode 100644
index 272a4ed74..000000000
--- a/keyboards/keebio/iris/keymaps/jennetters/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## jennetters iris keymap
-This keymap is based on the Iris default by [Bakingpy/nooges](https://github.com/nooges) without much deviation.
-* The QERTY layer remains largely the same with repositioning of the control key for ease of use. 
-* L/RBRC, L/RCBR, and PIPE added to raise layer.
-* Arrow keys moved to wasd on raise layer.
-* Grave Escape added to maintain usage of ESC/~/` with top left key.
-See keymap.c for full details.
-\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/jennetters/rules.mk b/keyboards/keebio/iris/keymaps/jennetters/rules.mk
deleted file mode 100644
index 1ba2fa8fb..000000000
--- a/keyboards/keebio/iris/keymaps/jennetters/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/lewisridden/config.h b/keyboards/keebio/iris/keymaps/lewisridden/config.h
deleted file mode 100644
index 6d96b31bd..000000000
--- a/keyboards/keebio/iris/keymaps/lewisridden/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-//#define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/lewisridden/keymap.c b/keyboards/keebio/iris/keymaps/lewisridden/keymap.c
deleted file mode 100644
index e5d12ebd1..000000000
--- a/keyboards/keebio/iris/keymaps/lewisridden/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RASE, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,SPC ,     PSCR , N  , M  ,COMM,DOT ,SLSH,RGHT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,LOWR,SPC ,         ENT ,LGUI,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,PGUP,    ,    ,LBRC,               RBRC, P7 , P8 , P9 ,PLUS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,HOME,PGDN,END,     ,LPRN,               RPRN, P4 , P5 , P6 ,MINS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    , P1 , P2 , P3 ,EQL ,UNDS ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,        BSPC ,    , P0
-  //                  `----+----+----'        `----+----+----'
-),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    , UP ,    ,    ,LBRC,               RBRC,    ,NLCK,INS ,SLCK,MUTE,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,LEFT,DOWN,RGHT,    ,LPRN,               RPRN,MPRV,MPLY,MNXT,    ,VOLU,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,VOLD,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RESET  , DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      BL_STEP, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/lewisridden/rules.mk b/keyboards/keebio/iris/keymaps/lewisridden/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/lewisridden/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
index 2ecfc0f6a..e3ec65183 100644
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
@@ -43,8 +43,6 @@ enum custom_keycodes {
  ADJUST
 };
-#define KC_ KC_TRNS
 #define SE_YEN ALGR(SE_6) //isn't in the swedish_keymap.h
 #define KC_CATDEL LCTL(LALT(KC_DEL)) // Ctrl alt del
 #define KC_TSKMGR LCTL(S(KC_ESC)) // Ctrl shift esc
diff --git a/keyboards/keebio/iris/keymaps/mtdjr/config.h b/keyboards/keebio/iris/keymaps/mtdjr/config.h
deleted file mode 100644
index 9adb6d627..000000000
--- a/keyboards/keebio/iris/keymaps/mtdjr/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-//#define SOLENOID_ENABLE
-//#define SOLENOID_PIN C6
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-//#define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define AUDIO_CLICKY
-// #define AUDIO_CLICKY_ON
-// #define AUDIO_PIN C6
-// #define AUDIO_CLICKY_FREQ_RANDOMNESS 0.1f
-// #define AUDIO_CLICKY_FREQ_MAX 100.0f
-// #define MASTER_RIGHT
-// #define EE_HANDS
-// #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/mtdjr/keymap.c b/keyboards/keebio/iris/keymaps/mtdjr/keymap.c
deleted file mode 100644
index d6e3ec05e..000000000
--- a/keyboards/keebio/iris/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-extern keymap_config_t keymap_config;
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     EXC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,QUOT,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,ENT ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-      EQL, Z  , X  , C  , V  , B  ,LGUI,     LALT, N  , M  ,COMM,DOT ,SLSH,MINS,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,RASE,SPC ,         SPC ,LOWR,xxxx
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,LCBR,RCBR,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    , UP ,    ,    ,PIPE,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,LEFT,DOWN,RGHT,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,HOME,    ,END ,    ,EQL ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 ,    ,                   ,    ,    ,LBRC,RBRC,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , F5 , F6 , F7 , F8 ,    ,                   ,    ,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , F9 ,F10 ,F11 ,F12 ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,XCPY,XINS,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     STOG,ROOT,PPLY,PSEF,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,               xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       xxxx,    ,xxxx,         xxxx,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/mtdjr/rules.mk b/keyboards/keebio/iris/keymaps/mtdjr/rules.mk
deleted file mode 100644
index 7f8c630d8..000000000
--- a/keyboards/keebio/iris/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-#AUDIO_ENABLE = yes 
diff --git a/keyboards/keebio/iris/keymaps/osiris/keymap.c b/keyboards/keebio/iris/keymaps/osiris/keymap.c
index a777c8a35..09ad74733 100644
--- a/keyboards/keebio/iris/keymaps/osiris/keymap.c
+++ b/keyboards/keebio/iris/keymaps/osiris/keymap.c
@@ -17,8 +17,6 @@ enum custom_keycodes {
  RAISE
 };
-#define KC_ KC_TRNS
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
 #define KC_RST  RESET
@@ -30,59 +28,59 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GESC, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+     KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSLS,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_LCTL, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LESF, Z  , X  , C  , V  , B  ,LBRC,     RBRC, N  , M  ,COMM,DOT ,SLSH,RGHT,
+     KC_LESF, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBRC,     KC_RBRC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RGHT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,ENT ,         SPC ,RASE,RALT
+                       KC_LGUI,KC_LOWR,KC_ENT ,         KC_SPC ,KC_RASE,KC_RALT
  //                  `----+----+----'        `----+----+----'
  ),
-    [_COLEMAK] = LAYOUT_kc(
+    [_COLEMAK] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GESC, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+     KC_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSLS,
+     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSLS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LCTL, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
+     KC_LCTL, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,                KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LESF, Z  , X  , C  , V  , B  ,LBRC,     RBRC, K  , M  ,COMM,DOT ,SLSH,RGHT,
+     KC_LESF, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBRC,     KC_RBRC, KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RGHT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,ENT ,         SPC ,RASE,RALT
+                       KC_LGUI,KC_LOWR,KC_ENT ,         KC_SPC ,KC_RASE,KC_RALT
  //                  `----+----+----'        `----+----+----'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,DEL ,
+     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,               KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,BTN1,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,               _______,_______,KC_BTN1,_______,_______,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,               MS_L,MS_D,MS_U,MS_R,    ,    ,
+     _______,_______,_______,_______,_______,_______,               KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    , UP ,    ,         ,DOWN,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______, KC_UP ,_______,     _______,KC_DOWN,_______,_______,_______,_______,_______,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,   
+                       _______,_______,_______,         _______,_______,   _______
  //                  `----+----+----'        `----+----+----'
 ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
+     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,VOLU,    ,    ,LBRC,               RBRC,UNDS,PLUS,    ,    ,MUTE,
+     _______,_______,KC_VOLU,_______,_______,KC_LBRC,               KC_RBRC,KC_UNDS,KC_PLUS,_______,_______,KC_MUTE,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MPLY,VOLD,MNXT,    ,LPRN,               RPRN,MINS,EQL ,    ,    ,    ,
+     _______,KC_MPLY,KC_VOLD,KC_MNXT,_______,KC_LPRN,               KC_RPRN,KC_MINS,KC_EQL ,_______,_______,_______,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,_______,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
+                       _______,_______,_______,         _______,_______, _______
  //                  `----+----+----'        `----+----+----'
  ),
diff --git a/keyboards/keebio/iris/keymaps/rdhaene/config.h b/keyboards/keebio/iris/keymaps/rdhaene/config.h
deleted file mode 100644
index 3c4b6cfd2..000000000
--- a/keyboards/keebio/iris/keymaps/rdhaene/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-// #define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/rdhaene/keymap.c b/keyboards/keebio/iris/keymaps/rdhaene/keymap.c
deleted file mode 100644
index 7a153346c..000000000
--- a/keyboards/keebio/iris/keymaps/rdhaene/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RASE, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,SPC ,     ENT , N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LCTL,LOWR,SPC ,         ENT ,LGUI,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,    ,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,    ,    ,    ,DOWN,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,         DEL ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RTOG,RMOD,RHUI,RSAI,RVAI,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,DBUG,RHUD,RSAD,RVAD,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,RST ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/rdhaene/rules.mk b/keyboards/keebio/iris/keymaps/rdhaene/rules.mk
deleted file mode 100644
index 4bfbfb2ae..000000000
--- a/keyboards/keebio/iris/keymaps/rdhaene/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/rs/keymap.c b/keyboards/keebio/iris/keymaps/rs/keymap.c
index 0e254ea19..40c62bbc8 100644
--- a/keyboards/keebio/iris/keymaps/rs/keymap.c
+++ b/keyboards/keebio/iris/keymaps/rs/keymap.c
@@ -2,43 +2,43 @@
 #include "rs.h"
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
+     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,EQL ,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_EQL ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESCC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,SPC,      BSPC, N  , M  ,COMM,DOT ,SLSH,ENTS,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_SPC,      KC_BSPC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENTS,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LGUI,SPC ,         BSPC,CODE,FN
+                       KC_LALT,KC_LGUI,KC_SPC ,         KC_BSPC,KC_CODE,KC_FN
  //                  `----+----+----'        `+---+----+----'
  ),
-  [_CODE] = LAYOUT_kc(
+  [_CODE] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,               _______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV ,EXLM, AT ,HASH, DLR,PERC,               CIRC,LPLT,ASTR,RPGT,NEQL,    ,
+     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,               KC_CIRC,KC_LPLT,KC_ASTR,KC_RPGT,KC_NEQL,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,               MINS,LBRC, UP ,RBRC,    ,BSLS,
+     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,               KC_MINS,KC_LBRC, KC_UP ,KC_RBRC,_______,KC_BSLS,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , 6  , 7  , 8  , 9  , 0  ,    ,         ,AMPR,LEFT,DOWN,RGHT,    ,PIPE,
+     _______, KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,     _______,KC_AMPR,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_PIPE,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    , DOT,             ,    ,    
+                       _______,_______, KC_DOT,         _______,_______,    _______
  //                  `----+----+----'        `----+----+----'
  ),
-  [_FN] = LAYOUT_kc(
+  [_FN] = LAYOUT(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 , F10, F11,
+     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,               _______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     BLTG,BLUP,    ,    ,    ,BRMU,                   ,    ,PGUP,    ,    ,    ,
+     KC_BLTG,KC_BLUP,_______,_______,_______,KC_BRMU,               _______,_______,KC_PGUP,_______,_______,_______,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,BLDN,    ,    ,RST ,BRMD,    ,     VOLU,    ,CTRA,PGDN,CTRE,    ,    ,
+     _______,KC_BLDN,_______,_______,KC_RST ,KC_BRMD,_______,     KC_VOLU,_______,KC_CTRA,KC_PGDN,KC_CTRE,_______,_______,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,     ,         VOLD,MUTE,    
+                       _______,_______, _______,         KC_VOLD,KC_MUTE,    _______
  //                  `----+----+----'        `----+----+----'
  ),
 };
diff --git a/keyboards/keebio/iris/keymaps/s1carii/config.h b/keyboards/keebio/iris/keymaps/s1carii/config.h
deleted file mode 100644
index 117f82523..000000000
--- a/keyboards/keebio/iris/keymaps/s1carii/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#endif
diff --git a/keyboards/keebio/iris/keymaps/s1carii/keymap.c b/keyboards/keebio/iris/keymaps/s1carii/keymap.c
deleted file mode 100644
index 4655bb1ad..000000000
--- a/keyboards/keebio/iris/keymaps/s1carii/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-//#define KC_DEV DEVLAYER
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LOWR, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,LGUI,     RCMD, N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+-+--+----+----+----'
-                       RCTL,ENT ,SPC ,         SPC ,RASE,RALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
-     GRV ,    ,    ,    ,    ,    ,                   ,    ,    ,MINS,EQL ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,PGDN, UP ,PGUP,LBRC,RBRC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,VOLD,VOLU,MUTE,    ,    ,               HOME,LEFT,DOWN,RGHT,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT,    ,    ,    ,    ,    ,LGUI,     RCMD,END ,    ,    ,    ,PSCR,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+-+--+----+----+----'
-                       RCTL,ENT ,SPC ,         SPC ,    ,RALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    , UP ,    ,    ,    ,                   , P7 , P8 , P9 ,PSLS,PAST,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,LEFT,DOWN,RGHT,    ,    ,                   , P4 , P5 , P6 ,PMNS,PPLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,     NLCK,    , P1 , P2 , P3 ,PDOT,PENT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+-+--+----+----+----'
-                       RCTL,ENT ,SPC ,         SPC ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
-         ,    ,    ,    ,    ,RST ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,DBUG,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+-+--+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
- /*
-    [_DEVLAYER] = LAYOUT_kc(
-  //,----+----+----+--+-+----+----.              ,----+----+-+--+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+-+--+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-*/
-};
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/s1carii/readme.md b/keyboards/keebio/iris/keymaps/s1carii/readme.md
deleted file mode 100644
index 6d94b6c87..000000000
--- a/keyboards/keebio/iris/keymaps/s1carii/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Pok3r Based iris Keymap
-Pok3r was what got me into mechanical keyboards years ago and what has been my daily driver since, WhiteFox and the like being always on the periphery. As such, those keybinds are what is most natural and notably not in the default keymap configuration.
-Make example for this keymap (after setting up your build environment):
-    make iris/rev2:s1carii:avrdude
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/keebio/iris/keymaps/s1carii/rules.mk b/keyboards/keebio/iris/keymaps/s1carii/rules.mk
deleted file mode 100644
index 5cf55d3d7..000000000
--- a/keyboards/keebio/iris/keymaps/s1carii/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE= no
diff --git a/keyboards/keebio/iris/keymaps/saviof/config.h b/keyboards/keebio/iris/keymaps/saviof/config.h
deleted file mode 100644
index eb4c7328e..000000000
--- a/keyboards/keebio/iris/keymaps/saviof/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Savio Fernandes
-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
-/* Use I2C or Serial, not both */
-//#define USE_SERIAL
-#define USE_I2C
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-// #define BACKLIGHT_BREATHING
-// #define EE_HANDS
-#define TAPPING_TERM 200
-// #undef RGBLED_NUM
-// #define RGBLIGHT_ANIMATIONS
-// #define RGBLED_NUM 30
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/saviof/keymap.c b/keyboards/keebio/iris/keymaps/saviof/keymap.c
deleted file mode 100644
index a63e60682..000000000
--- a/keyboards/keebio/iris/keymaps/saviof/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJ 3
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJ,
-};
-//Tap Dance Declarations
-enum {
-  TD_SPC_ENT = 0
-};
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    [TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LT(_LOWER, KC_LEFT) //LOWER
-#define KC_RASE LT(_RAISE, KC_RIGHT) //RAISE
-#define KC_ADJT LT(_ADJ, KC_LGUI) //RAISE
-#define KC_SCET TD(TD_SPC_ENT)
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_LMOD RGB_RMOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_BTOG BL_TOGG
-#define KC_BLVL BL_STEP
-#define KC_BRTG BL_BRTG
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LCTL, Z  , X  , C  , V  , B  ,HOME,     END , N  , M  ,COMM,DOT ,SLSH,RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       ADJT,LOWR, SPC,         SCET,RASE, ENT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH, DLR,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,    ,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,    ,    ,    ,DOWN,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,         DEL ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJ] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,LMOD,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RTOG,RMOD,RHUI,RSAI,RVAI,    ,               BTOG,BLVL,BRTG,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,DBUG,RHUD,RSAD,RVAD,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,RST ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/saviof/rules.mk b/keyboards/keebio/iris/keymaps/saviof/rules.mk
deleted file mode 100644
index 0e1023be1..000000000
--- a/keyboards/keebio/iris/keymaps/saviof/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c b/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
index 269350403..3195a2ba0 100644
--- a/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sethBarberee/keymap.c
@@ -17,8 +17,6 @@
 extern backlight_config_t backlight_config;
-#define KC_ KC_TRNS
 #define KC_RST RESET
 #define KC_BL_S BL_STEP
 #define KC_RTOG RGB_TOG
diff --git a/keyboards/keebio/iris/keymaps/swedish/config.h b/keyboards/keebio/iris/keymaps/swedish/config.h
deleted file mode 100644
index 4e3e55861..000000000
--- a/keyboards/keebio/iris/keymaps/swedish/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/swedish/keymap.c b/keyboards/keebio/iris/keymaps/swedish/keymap.c
deleted file mode 100644
index c6b7f6afd..000000000
--- a/keyboards/keebio/iris/keymaps/swedish/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "iris.h"
-#include "keymap_swedish.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _EMPTY 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-#define KC_ KC_TRNS
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_AA SE_AA
-#define KC_AE SE_AE
-#define KC_OE SE_OSLH
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  , AA ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  , OE , AE ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LCTL, Z  , X  , C  , V  , B  ,DEL ,     BSPC, N  , M  ,COMM,DOT ,SLSH,MINS,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPC ,         ENT ,RASE,LALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     SE_TILD,KC_EXLM,SE_AT  ,KC_HASH,SE_DLR ,KC_PERC,                     SE_CIRC,SE_AMPR,SE_ASTR,SE_SLSH,SE_LPRN,SE_RPRN,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     SE_ACUT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,                     KC_TRNS,KC_TRNS,KC_TRNS,SE_PIPE,SE_LCBR,SE_RCBR,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,SE_BSLS,                     KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,SE_LBRC,SE_RBRC,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,SE_LESS,SE_GRTR,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   KC_TRNS,KC_TRNS,KC_TRNS,         KC_TRNS,KC_TRNS,KC_TRNS
-  //                              `-------+-------+-------'        `-------+-------+-------'
-  ),
-  [_RAISE] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     KC_F12 ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,                     KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     SE_GRV ,KC_7   ,KC_8   ,KC_9   ,SE_MINS,SE_ASTR,                     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,SE_PIPE,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_TRNS,KC_4   ,KC_5   ,KC_6   ,SE_PLUS,SE_SLSH,                     KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_TRNS,SE_BSLS,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_TRNS,KC_1   ,KC_2   ,KC_3   ,KC_0   ,SE_EQL ,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   KC_TRNS,KC_TRNS,KC_TRNS,         KC_TRNS,KC_TRNS,KC_TRNS
-  //                              `-------+-------+-------'        `-------+-------+-------'
-  )
-};
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _EMPTY);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _EMPTY);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _EMPTY);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _EMPTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/swedish/rules.mk b/keyboards/keebio/iris/keymaps/swedish/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/swedish/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/transmogrified/Readme.md b/keyboards/keebio/iris/keymaps/transmogrified/Readme.md
deleted file mode 100644
index 96e27411d..000000000
--- a/keyboards/keebio/iris/keymaps/transmogrified/Readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-This layout is an attempt to make switching between the Iris and my laptop keyboard as seemless as possible. I switch caps lock and Ctrl/ESC on my laptop and I am able to adjust well with everything else... I still miss the Iris, but I am able to get work done.  
-I use the following lighting queues to indicate layer changes.
-* Momentary toggled layer : LEDs brighten and dim when layer is released.
-* Locked layer : LEDs breath.
-* Config layer locked : LEDs off.
-NOTE you will need to flash both sides to update the brightness_levels so that breathing works on both sides as expected. 
diff --git a/keyboards/keebio/iris/keymaps/transmogrified/config.h b/keyboards/keebio/iris/keymaps/transmogrified/config.h
deleted file mode 100644
index 12f2d7d6d..000000000
--- a/keyboards/keebio/iris/keymaps/transmogrified/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2017 Adam Roberts <adam+gh@bikuman.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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define NO_USB_STARTUP_CHECK //keep both sides on when pc is sleeping.
-#define TAPPING_TERM 200
-// Remove features i don't use
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
- 
-// Override the rev2 config.h BACKLIGHT_LEVELS setting
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 125
diff --git a/keyboards/keebio/iris/keymaps/transmogrified/keymap.c b/keyboards/keebio/iris/keymaps/transmogrified/keymap.c
deleted file mode 100644
index 67545f08e..000000000
--- a/keyboards/keebio/iris/keymaps/transmogrified/keymap.c
+++ /dev/null
@@ -1,421 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _RLAYER 2
-#define _LLAYER 3
-#define _DUAL 4
-#define _CONFIG 5
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,        // qwerty base layer
-  COLEMAK,                    // colemak base layer
-  RLAYER,                     // right layer
-  LLAYER,                     // left layer
-  RLOCK,                      // right layer LOCK
-  LLOCK,                      // left layer LOCK
-  DUAL,                       // right and left combo layer
-  CONFIG,                     // config layer
-  LEDUP,                      // custom LED brightness increase keycode
-  LEDDOWN,                    // custom LED brightness decrease keycode
-};
-/* Tap Dance */
-enum {
-  TD_LGUIAPP,                 // LGUI x1, app/menu x2
-  TD_SHIFTCAPS,               // LSHIFT x1, CAPS x3
-  TD_CTRLALTDL,               // CTRL+ALT+DEL x3
-  TD_SHIFTCLAT,               // LSHIFT x1, LCRTL x2, LALT x3, CTRL+ALT x4
-};
-/* NOOP Key and Transparent */
-#define KC_     KC_TRNS
-#define KC_XXXX KC_NO
-/* LAYERS / CUSTOM KEYS */
-#define KC_LLAY LLAYER
-#define KC_RLAY RLAYER
-#define KC_RLOK RLOCK
-#define KC_LLOK LLOCK
-#define KC_QWER QWERTY
-#define KC_COLE COLEMAK
-#define KC_DUAL DUAL
-#define KC_CONF CONFIG
-#define KC_BLUP LEDUP
-#define KC_BLDN LEDDOWN
-/* Custom Shortened Keys (4 digits so they fit in my grid) */
-#define KC_MCTB LCTL(KC_TAB)
-#define KC_MCST LCTL(LSFT(KC_TAB))
-#define KC_CTEC CTL_T(KC_ESC)
-#define KC_SINS LSFT(KC_INS)
-#define KC_LGU1 LGUI(KC_1)
-#define KC_LGU2 LGUI(KC_2)
-#define KC_LGU3 LGUI(KC_3)
-#define KC_LGU4 LGUI(KC_4)
-#define KC_LGU5 LGUI(KC_5)
-#define KC_LGU6 LGUI(KC_6)
-#define KC_LGU7 LGUI(KC_7)
-#define KC_LGU8 LGUI(KC_8)
-#define KC_LGU9 LGUI(KC_9)
-#define KC_LGU0 LGUI(KC_0)
-#define KC_SYSR KC_SYSREQ
-#define KC_REST RESET
-/* Tap Dance */
-#define KC_LGUA TD(TD_LGUIAPP)
-#define KC_SHCP TD(TD_SHIFTCAPS)
-#define KC_CADL TD(TD_CTRLALTDL)
-#define KC_SHCA TD(TD_SHIFTCLAT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     CADL, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CTEC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,ENT ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SHCP, Z  , X  , C  , V  , B  ,LLOK,     RLOK, N  , M  ,COMM,DOT ,SLSH,SHCA,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LLAY,TAB ,        SPC ,RLAY,LGUA
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     CADL, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     CTEC, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,ENT ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     SHCP, Z  , X  , C  , V  , B  ,LLOK,     RLOK, K  , M  ,COMM,DOT ,SLSH,SHCA,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LLAY,TAB ,        SPC ,RLAY,LGUA
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RLAYER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,SLCK,SYSR,PSCR,INS ,PAUS,               MUTE,VOLD,VOLU,BLDN,BLUP,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,TILD,GRV ,EQL ,LBRC,RBRC,               ASTR,HOME, UP ,PGUP,PLUS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM,PIPE,DLR ,LPRN,RPRN,               AMPR,LEFT,DOWN,RGHT,MINS,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , AT ,HASH,PERC,LCBR,RCBR,    ,         ,CIRC,END ,UNDS,PGDN,BSLS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,            ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LLAYER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,XXXX,XXXX, UP , F5 ,XXXX,               ASTR, 7  , 8  , 9  ,PLUS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,XXXX,MCST,DOWN,MCTB,ENT ,               SLSH, 4  , 5  , 6  ,MINS,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,XXXX,XXXX,BSPC,SINS,SPC ,F11 ,     F12 ,EQL , 1  , 2  , 3  ,DOT ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,         0  ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_DUAL] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,XXXX,XXXX,XXXX,XXXX,XXXX,               XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,XXXX,XXXX,XXXX,XXXX,XXXX,               XXXX,XXXX,MS_U,XXXX,XXXX,XXXX,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,XXXX,XXXX,XXXX,XXXX,XXXX,               BTN2,MS_L,MS_D,MS_R,BTN1,XXXX,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,LGU1,LGU2,LGU3,LGU4,LGU5,CONF,     XXXX,LGU6,LGU7,LGU8,LGU9,LGU0,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,            ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_CONFIG] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     REST,XXXX,XXXX,XXXX,XXXX,XXXX,               XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     XXXX,QWER,XXXX,XXXX,XXXX,XXXX,               XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,               XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     XXXX,XXXX,XXXX,COLE,XXXX,XXXX,    ,         ,XXXX,XXXX,XXXX,XXXX,XXXX,XXXX,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       XXXX,    ,XXXX,        XXXX,    ,XXXX
-  //                  `----+----+----'        `----+----+----'
-  ),
-};
-/* VARIABLES */
-// Configurable Variables for layer toggled light
-int layerBLStep = 20;         // change how much the brightness changes when holding layer key
-int breathPulse = 5;          // timing of the breathing
-int breathPulseStall = 3;     // time to pause at top and bottom of breath cycle
-int blSteps = 6;              // blSteps + 1 is the amount of brightness settings when manually adjusting
-// Variables needed for layer locked breathing and layer toggling lighting to work
-int counter = 0;
-bool breathUp = true;
-bool resetBL = false;
-bool rlocked = false;
-bool llocked = false;
-bool configOn = false;
-int lockedBLLevel;
-int momentaryLBLLevel;
-int momentaryRBLLevel;
-int currentBL;
-/* END VARIABLES */
-/* TAP DANCE */
-void shift_caps_down (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 3) {
-    register_code (KC_CAPS);
-  } else {
-    register_code (KC_LSFT);
-  }
-}
-void shift_caps_up (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 3) {
-    unregister_code (KC_CAPS);
-  } else {
-    unregister_code (KC_LSFT);
-  }
-}
-void shift_ctrlalt_down (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 4) {
-    register_code (KC_LCTL);
-    register_code (KC_LALT);
-  } else if (state->count == 3) {
-    register_code (KC_LALT);
-  } else if (state->count == 2) {
-    register_code (KC_LCTL);
-  } else {
-    register_code (KC_RSFT);
-  }
-}
-void shift_ctlalt_up (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 4) {
-    unregister_code (KC_LALT);
-    unregister_code (KC_LCTL);
-  } else if (state->count == 3) {
-    unregister_code (KC_LALT);
-  } else if (state->count == 2) {
-    unregister_code (KC_LCTL);
-  } else {
-    unregister_code (KC_RSFT);
-  }
-}
-void ctrlaltdel_up (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 3) {
-    unregister_code (KC_DEL);
-    unregister_code (KC_LALT);
-    unregister_code (KC_LCTL);
-  } else {
-  }
-}
-void ctrlaltdel_down (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 3) {
-    register_code (KC_LCTL);
-    register_code (KC_LALT);
-    register_code (KC_DEL);
-  } else {
-  }
-}
-qk_tap_dance_action_t tap_dance_actions[] = {
-        [TD_LGUIAPP] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_APP),
-        [TD_SHIFTCAPS] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, shift_caps_down, shift_caps_up),
-        [TD_SHIFTCLAT] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, shift_ctrlalt_down, shift_ctlalt_up),
-        [TD_CTRLALTDL] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ctrlaltdel_down, ctrlaltdel_up)
-};
-/* END TAP DANCE */
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-        configOn = false;
-        if (momentaryRBLLevel != 0 || momentaryLBLLevel != 0){
-          backlight_toggle();
-        }
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-        configOn = false;
-        if (momentaryRBLLevel != 0 || momentaryLBLLevel != 0){
-          backlight_toggle();
-        }
-      }
-      return false;
-      break;
-    case CONFIG:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_CONFIG);
-        configOn = true;
-        if (momentaryRBLLevel != 0 || momentaryLBLLevel != 0){
-          backlight_toggle();
-        }
-      }
-      return false;
-      break;
-    case RLAYER:
-      if (record->event.pressed) {
-        layer_on(_RLAYER);
-        update_tri_layer(_RLAYER, _LLAYER, _DUAL);
-        momentaryRBLLevel = get_backlight_level();
-        if (momentaryRBLLevel != 0 || momentaryLBLLevel != 0){
-          for (int i = 0; i < layerBLStep ; i++){
-            backlight_increase();
-          }
-        }
-      } else {
-        unregister_code(KC_LGUI);
-        layer_off(_RLAYER);
-        update_tri_layer(_RLAYER, _LLAYER, _DUAL);
-        if ( llocked == false && configOn == false ) {
-          for (int i = 0; i < layerBLStep ; i++){
-            backlight_decrease();
-          }
-        } else {
-        }
-        rlocked = false;
-      }
-      return false;
-      break;
-    case LLAYER:
-      if (record->event.pressed) {
-        layer_on(_LLAYER);
-        update_tri_layer(_RLAYER, _LLAYER, _DUAL);
-        momentaryLBLLevel = get_backlight_level();
-        if (momentaryRBLLevel != 0 || momentaryLBLLevel != 0){
-          for (int i = 0; i < layerBLStep ; i++){
-            backlight_increase();
-          }
-        }
-      } else {
-        layer_off(_LLAYER);
-        update_tri_layer(_RLAYER, _LLAYER, _DUAL);
-        if ( rlocked == false && configOn == false ) {
-          for (int i = 0; i < layerBLStep ; i++){
-            backlight_decrease();
-          }
-        } else {
-        }
-        llocked = false;
-      }
-      return false;
-      break;
-    case RLOCK:
-      if (record->event.pressed) {
-        layer_on(_RLAYER);
-        /* add logic to toggle backlight change when on a layer */
-        if (rlocked == false && llocked == false){
-          lockedBLLevel = get_backlight_level();
-        }
-        rlocked = true;
-      } else {
-      }
-      return false;
-      break;
-    case LLOCK:
-      if (record->event.pressed) {
-        layer_on(_LLAYER);
-        /* add logic to toggle backlight change when on a layer */
-        if (rlocked == false && llocked == false){
-          lockedBLLevel = get_backlight_level();
-        }
-        llocked = true;
-      } else {
-      }
-      return false;
-      break;
-    case LEDUP:
-      if (record->event.pressed) {
-        for (int i = 0; i < (BACKLIGHT_LEVELS / blSteps ) ; i++ ){
-          backlight_increase();
-        }
-      } else {
-      }
-      return false;
-      break;
-    case LEDDOWN:
-      if (record->event.pressed) {
-        for (int i = 0; i < (BACKLIGHT_LEVELS / blSteps ) ; i++ ){
-          backlight_decrease();
-        }
-      } else {
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-// LED breathing when a layer is locked
-void matrix_scan_user(void) {
-  // Only breath if layer is locked
-  if (lockedBLLevel != 0 && (rlocked || llocked)){
-    // counter to slow down the breathing
-    if (counter >= breathPulse) {
-      counter = 0;
-      // iterate brightness up or down
-      if (breathUp){
-        backlight_increase();
-      } else {
-        backlight_decrease();
-      }
-      // figure out if we need to change directions
-      currentBL = get_backlight_level();
-      if (currentBL >= BACKLIGHT_LEVELS){
-        breathUp = false;
-        // make counter a big negative number to add some stall time
-        counter = ((BACKLIGHT_LEVELS * breathPulseStall) * (-1));
-      } else if (currentBL == 0){
-        breathUp = true;
-        // make counter a big negative number to add some stall time
-        counter = ((BACKLIGHT_LEVELS * breathPulseStall) * (-1));
-      }
-      // make not that we need to change the brightness back to when we started the breathing
-      resetBL = true;
-    } else {
-      counter++;
-    }
-  } else {
-    // get the brightness back to the level it started at
-    if (resetBL){
-      int i = 0;
-      // i is just there to make sure i don't get stuck in a loop if for some reason get_backlight_level isn't working as expected
-      while (get_backlight_level() != lockedBLLevel && i <= BACKLIGHT_LEVELS ){
-        backlight_step();
-        i++;
-      }
-      resetBL = false;
-    }
-  }
-}
diff --git a/keyboards/keebio/iris/keymaps/transmogrified/rules.mk b/keyboards/keebio/iris/keymaps/transmogrified/rules.mk
deleted file mode 100644
index 444fa38a9..000000000
--- a/keyboards/keebio/iris/keymaps/transmogrified/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
index cc120c158..e5e8aebd2 100644
--- a/keyboards/keebio/iris/keymaps/xyverz/keymap.c
+++ b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
@@ -23,7 +23,6 @@ enum custom_keycodes {
  ADJUST
 };
-#define KC_____ KC_TRNS
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
 #define KC_RST RESET
@@ -40,60 +39,60 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT_kc (
+  [_DVORAK] = LAYOUT (
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSLS,
+     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSLS,
-     TAB ,QUOT,COMM,DOT , P  , Y  ,                F  , G  , C  , R  , L  ,SLSH,
+     KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P  , KC_Y  ,                KC_F  , KC_G  , KC_C  , KC_R  , KC_L  ,KC_SLSH,
-     ESC , A  , O  , E  , U  , I  ,                D  , H  , T  , N  , S  ,MINS,
+     KC_ESC , KC_A  , KC_O  , KC_E  , KC_U  , KC_I  ,                KC_D  , KC_H  , KC_T  , KC_N  , KC_S  ,KC_MINS,
-     LSFT,SCLN, Q  , J  , K  , X  ,LOWR,     RASE, B  , M  , W  , V  , Z  ,RSFT,
+     KC_LSFT,KC_SCLN, KC_Q  , KC_J  , KC_K  , KC_X  ,KC_LOWR,     KC_RASE, KC_B  , KC_M  , KC_W  , KC_V  , KC_Z  ,KC_RSFT,
-                       LCTL,BSLT,LGUI,         ENT ,SPC ,LALT
+                       KC_LCTL,KC_BSLT,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
  ),
-  [_QWERTY] = LAYOUT_kc (
+  [_QWERTY] = LAYOUT (
-     EQL , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
+     KC_EQL , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSLS,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
-     ESC , A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESC , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     LSFT, Z  , X  , C  , V  , B  ,LOWR,     RASE, N  , M  ,COMM,DOT ,SLSH,RSFT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LOWR,     KC_RASE, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-                       LCTL,BSPC,LGUI,         ENT ,SPC ,LALT
+                       KC_LCTL,KC_BSPC,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
  ),
-  [_COLEMAK] = LAYOUT_kc (
+  [_COLEMAK] = LAYOUT (
-     EQL , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
+     KC_EQL , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
-     TAB , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSPC,
+     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
-     ESC , A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
+     KC_ESC , KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,                KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
-     LSFT, Z  , X  , C  , V  , B  ,LOWR,     RASE, K  , M  ,COMM,DOT ,SLSH,RSFT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LOWR,     KC_RASE, KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-                       LCTL,BSPC,LGUI,         ENT ,SPC ,LALT
+                       KC_LCTL,KC_BSPC,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
  ),
-  [_WOW] = LAYOUT_kc (
+  [_WOW] = LAYOUT (
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSLS,
+     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSLS,
-     TAB ,QUOT,COMM,DOT , P  , Y  ,                F  , G  , C  , R  , L  ,SLSH,
+     KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P  , KC_Y  ,                KC_F  , KC_G  , KC_C  , KC_R  , KC_L  ,KC_SLSH,
-     ESC , A  , O  , E  , U  , I  ,                D  , H  , T  , N  , S  ,MINS,
+     KC_ESC , KC_A  , KC_O  , KC_E  , KC_U  , KC_I  ,                KC_D  , KC_H  , KC_T  , KC_N  , KC_S  ,KC_MINS,
-     LSFT,SCLN, Q  , J  , K  , X  ,LALT,     RGUI, B  , M  , W  , V  , Z  ,RSFT,
+     KC_LSFT,KC_SCLN, KC_Q  , KC_J  , KC_K  , KC_X  ,KC_LALT,     KC_RGUI, KC_B  , KC_M  , KC_W  , KC_V  , KC_Z  ,KC_RSFT,
-                       LOWR,BSPC,LCTL,         ENT ,SPC ,RASE
+                       KC_LOWR,KC_BSPC,KC_LCTL,         KC_ENT ,KC_SPC ,KC_RASE
  ),
-  [_LOWER] = LAYOUT_kc (
+  [_LOWER] = LAYOUT (
-     F11 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F12 ,
+     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     TILD,____,____, UP ,____,____,               ____,____,____,____,____,____,
+     KC_TILD,_______,_______, KC_UP ,_______,_______,               _______,_______,_______,_______,_______,_______,
-     CAPS,____,LEFT,DOWN,RGHT,HOME,               PGUP,UNDS,PLUS,LCBR,RCBR,PIPE,
+     KC_CAPS,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_HOME,               KC_PGUP,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
-     BL_S,____,MUTE,VOLD,VOLU,END ,____,     ____,PGDN,MPRV,MPLY,MNXT,____,____,
+     KC_BL_S,_______,KC_MUTE,KC_VOLD,KC_VOLU,KC_END ,_______,     _______,KC_PGDN,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,
-                       ____,DEL ,____,         ____,INS ,____
+                       _______,KC_DEL ,_______,         _______,KC_INS ,_______
  ),
-  [_RAISE] = LAYOUT_kc (
+  [_RAISE] = LAYOUT (
-     F11 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F12 ,
+     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     GRV ,____,____, UP ,____,____,               ____,____,____,____,____,____,
+     KC_GRV ,_______,_______, KC_UP ,_______,_______,               _______,_______,_______,_______,_______,_______,
-     CAPS,____,LEFT,DOWN,RGHT,HOME,               PGUP,MINS,EQL ,LBRC,RBRC,BSLS,
+     KC_CAPS,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_HOME,               KC_PGUP,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,KC_BSLS,
-     BL_S,____,MUTE,VOLD,VOLU,END ,____,     ____,PGDN,MPRV,MPLY,MNXT,____,____,
+     KC_BL_S,_______,KC_MUTE,KC_VOLD,KC_VOLU,KC_END ,_______,     _______,KC_PGDN,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,
-                       ____,DEL ,____,         ____,INS ,____
+                       _______,KC_DEL ,_______,         _______,KC_INS ,_______
  ),
-  [_ADJUST] = LAYOUT_kc (
+  [_ADJUST] = LAYOUT (
-     F11 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F12 ,
+     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     ____,RST ,____,____,____,____,               ____,____,____,____,____,____,
+     _______,KC_RST ,_______,_______,_______,_______,               _______,_______,_______,_______,_______,_______,
-     ____,____,____,____,____,____,               ____,QWRT,CLMK,DVRK,WOW ,____,
+     _______,_______,_______,_______,_______,_______,               _______,KC_QWRT,KC_CLMK,KC_DVRK,KC_WOW ,_______,
-     ____,____,____,____,____,____,____,     ____,____,____,____,____,____,____,
+     _______,_______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,_______,
-                       ____,____,____,         ____,____,____
+                       _______,_______,_______,         _______,_______,_______
  )
 };
@@ -137,4 +136,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      return false;
  }
  return true;
-}
-\ No newline at end of file
+}
diff --git a/keyboards/keebio/iris/keymaps/yanfali/config.h b/keyboards/keebio/iris/keymaps/yanfali/config.h
deleted file mode 100644
index 81df2e916..000000000
--- a/keyboards/keebio/iris/keymaps/yanfali/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/iris/keymaps/yanfali/keymap.c b/keyboards/keebio/iris/keymaps/yanfali/keymap.c
deleted file mode 100644
index 92117bd6d..000000000
--- a/keyboards/keebio/iris/keymaps/yanfali/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)    // Control (hold), Escape (tap)
-#define KC_BACK LGUI(KC_LEFT)           // Browser Back
-#define KC_FORW LGUI(KC_RIGHT)          // Browser Forward
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,PLUS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,SPC ,     LALT, N  , M  ,COMM,DOT ,SLSH,DEL ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LGUI,LOWR,SPC ,         BSPC,ENTS,RASE
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RST , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     BL_S,CPYP,    ,    ,DOWN,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DEL ,         DEL ,    , P0
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     DEL ,MPRV,BACK,FORW,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RESET  , DEBUG  , RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/yanfali/readme.md b/keyboards/keebio/iris/keymaps/yanfali/readme.md
deleted file mode 100644
index f72e88e51..000000000
--- a/keyboards/keebio/iris/keymaps/yanfali/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## u/yanfali keymap for Iris
-Based heavily off Hexwire's configuration. Differs in following ways:
- 1. Moved LALT to LCTL; I don't need CTL because of ESCC.
- 1. Moved RAISE to old LALT.
- 1. Moved ENTER to old RAISE.
- 1. Move QUOTE to old ENTER.
- 1. Moved PLUS to old QUOTE.
- 1. replaced music next and volume up with browser forward and back
-    through history
-This configuration lets me use my thumbs for enter and backspace.
-It turns out I need `+` a lot for programming so I moved it logically
-below `-`.  I also added a couple of web specific short cuts for
-navigating previous and next in web history on OSX Chrome.
diff --git a/keyboards/keebio/iris/keymaps/yanfali/rules.mk b/keyboards/keebio/iris/keymaps/yanfali/rules.mk
deleted file mode 100644
index 73142a168..000000000
--- a/keyboards/keebio/iris/keymaps/yanfali/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/laplace/keymaps/bakingpy/keymap.c b/keyboards/keebio/laplace/keymaps/bakingpy/keymap.c
deleted file mode 100644
index 97fb70af5..000000000
--- a/keyboards/keebio/laplace/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-#define KC_ KC_TRNS
-#define KC_FN1 MO(_FN1)
-#define KC_FN2 MO(_FN2)
-#define KC_SPFN1 LT(_FN1, KC_SPACE)
-#define KC_SPFN2 LT(_FN2, KC_SPACE)
-#define KC_BSFN1 LT(_FN1, KC_BSPC)
-#define KC_BSFN2 LT(_FN2, KC_BSPC)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc(
- //,----+----+----+----+----+----+----+----+----+----+----+----+----.
-    ESC , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,DEL ,BSPC,
- //|----`----`----`----`----`----`----`----`----`----`----`----`----+
-    TAB  , A  , S  , D  , F  , G  , H  , J  , K  , L  ,QUOT, ENTER  ,
- //|-----`----`----`----`----`----`----`----`----`----`----`--------+
-    LSFT   , Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH, RSFT ,
- //|-------`----`----`----`----`----`----`----`----`----`----`------+
-    GRV  ,LCTL,LALT ,LGUI, SPFN1  ,  BSFN2 , FN2 ,RALT ,RCTL , FN1
- //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
-  ),
-  [_FN1] = LAYOUT_kc(
- //,----+----+----+----+----+----+----+----+----+----+----+----+----.
-    GRV , 1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,MINS,EQL ,
- //|----`----`----`----`----`----`----`----`----`----`----`----`----+
-    RST  ,RHUI,RSAI,RVAI,VOLU,LBRC,RBRC, 4  , 5  , 6  ,SCLN,        ,
- //|-----`----`----`----`----`----`----`----`----`----`----`--------+
-    RMOD   ,RHUD,RSAD,RVAD,VOLD,LCBR,RCBR, 1  , 2  , 3  , UP ,      ,
- //|-------`----`----`----`----`----`----`----`----`----`----`------+
-    RTOG ,    ,     ,    ,        ,  DEL   ,  0  ,LEFT ,DOWN , RGHT
- //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
-  ),
-  [_FN2] = LAYOUT_kc(
- //,----+----+----+----+----+----+----+----+----+----+----+----+----.
-    TILD,EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,UNDS,PLUS,
- //|----`----`----`----`----`----`----`----`----`----`----`----`----+
-         ,    ,    ,INS ,PGUP,HOME,    ,    ,    ,    ,COLN,        ,
- //|-----`----`----`----`----`----`----`----`----`----`----`--------+
-           ,    ,    ,DEL ,PGDN,END ,    ,    ,    ,    ,    ,      ,
- //|-------`----`----`----`----`----`----`----`----`----`----`------+
-         ,    ,     ,    ,  DEL   ,        ,     ,     ,     ,
- //`-----+----+-----+----+--------+--------+-----+-----+-----+------'
-  )
-};
diff --git a/keyboards/keebio/laplace/keymaps/bakingpy/rules.mk b/keyboards/keebio/laplace/keymaps/bakingpy/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/keebio/laplace/keymaps/bakingpy/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/laplace/laplace.h b/keyboards/keebio/laplace/laplace.h
index fc0510fe5..0be1e95b9 100644
--- a/keyboards/keebio/laplace/laplace.h
+++ b/keyboards/keebio/laplace/laplace.h
@@ -17,17 +17,3 @@
        {D1, D2, D3, D4, D5, KC_NO, D7}, \
        {KC_NO, D13, D12, D11, D10, KC_NO, KC_NO} \
    }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, \
-    B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11,      B13, \
-    C1, C2, C3, C4, C5, C6, C7,     C9, C10, C11, C12, C13, \
-    D1, D2, D3, D4, D5,     D7,         D10, D11, D12, D13 \
-    ) \
-    LAYOUT( \
-        KC_##A1, KC_##A2, KC_##A3, KC_##A4, KC_##A5, KC_##A6, KC_##A7, KC_##A8, KC_##A9, KC_##A10, KC_##A11, KC_##A12, KC_##A13, \
-        KC_##B1, KC_##B2, KC_##B3, KC_##B4, KC_##B5, KC_##B6, KC_##B7, KC_##B8, KC_##B9, KC_##B10, KC_##B11,           KC_##B13, \
-        KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7,          KC_##C9, KC_##C10, KC_##C11, KC_##C12, KC_##C13, \
-        KC_##D1, KC_##D2, KC_##D3, KC_##D4, KC_##D5,          KC_##D7,                   KC_##D10, KC_##D11, KC_##D12, KC_##D13 \
-    )
diff --git a/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h b/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h
deleted file mode 100644
index 1db6ea433..000000000
--- a/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/levinson/keymaps/bakingpy2u/keymap.c b/keyboards/keebio/levinson/keymaps/bakingpy2u/keymap.c
deleted file mode 100644
index 6a6ab496a..000000000
--- a/keyboards/keebio/levinson/keymaps/bakingpy2u/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FN3 5
-#define _FN4 6
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  FN3,
-  FN4,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_X0 MT(MOD_LCTL, KC_ESC)
-#define KC_X1 LOWER
-#define KC_X2 RAISE
-#define KC_X3 LT(_FN3, KC_GRV)
-#define KC_X4 MT(MOD_LSFT, KC_ENT)
-#define KC_X5 BL_STEP
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH, X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL, X1 ,LGUI,SPC ,SPC ,     BSPC,BSPC, X2 ,RALT, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH, X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL, X1 ,LGUI,SPC ,SPC ,     BSPC,BSPC, X2 ,RALT, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  , X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL, X1 ,LGUI,SPC ,SPC ,     BSPC,BSPC, X2 ,RALT, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-      X5 , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,DEL ,     DEL ,    , P0 ,PDOT,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT( \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/bakingpy2u/rules.mk b/keyboards/keebio/levinson/keymaps/bakingpy2u/rules.mk
deleted file mode 100644
index d7463419b..000000000
--- a/keyboards/keebio/levinson/keymaps/bakingpy2u/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/levinson/keymaps/jyh/config.h b/keyboards/keebio/levinson/keymaps/jyh/config.h
deleted file mode 100644
index d3e598bd0..000000000
--- a/keyboards/keebio/levinson/keymaps/jyh/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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
-/* Select hand configuration */
-#define MASTER_LEFT
-/* Tap Dance timing */
-#define TAPPING_TERM 150
-/* Toggling layer requires # taps */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/levinson/keymaps/omgvee/config.h b/keyboards/keebio/levinson/keymaps/omgvee/config.h
deleted file mode 100644
index ba005c0b2..000000000
--- a/keyboards/keebio/levinson/keymaps/omgvee/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#undef PRODUCT
-#define PRODUCT "Vee's hotswappable LEVINSON purely ortholinear keeb"
diff --git a/keyboards/keebio/levinson/keymaps/omgvee/keymap.c b/keyboards/keebio/levinson/keymaps/omgvee/keymap.c
deleted file mode 100644
index 8dab1c274..000000000
--- a/keyboards/keebio/levinson/keymaps/omgvee/keymap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FN3 5
-#define _FN4 6
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  FN3,
-  FN4,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_X0 MT(MOD_LCTL, KC_ESC)
-#define KC_SCAP SFT_T(KC_CAPS)
-#define KC_LOW LOWER
-#define KC_RAIS RAISE
-#define KC_X3 LT(_FN3, KC_GRV)
-#define KC_SENT MT(MOD_LSFT, KC_ENT)
-#define KC_X5 BL_STEP
-#define KC_CTB CTL_T(KC_TAB)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     GESC, Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCAP, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      CTB, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,SENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI,LOW ,ENT ,      SPC,RAIS,RALT,    ,    ,    
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     GRV , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCAP, NO ,HOME,PGDN,PGUP, END,     LEFT,DOWN, UP ,RGHT, INS, DEL,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     CTB , F1 , F2 , F3 , F4 , F5 ,      F6,  F7 , F8 , F9 , F10, F11,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, LOW, ENT,      SPC,RAIS,RALT,    ,    , F12
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB, EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN, DEL,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCAP,    ,    ,    ,    ,    ,     MINS, EQL,    ,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      CTB,    ,    ,    ,    ,    ,     UNDS,PLUS,VOLD,VOLU,MUTE,SENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, LOW, ENT,      SPC,RAIS,RALT,    ,    , NO
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     GESC, Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCAP, A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      CTB, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH,SENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, LOW, ENT,      SPC,RAIS,RALT,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.  
-     TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS, 
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  ,SENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, LOW, ENT,      SPC,RAIS,RALT,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,     MS_L,MS_D,MS_U,MS_R,WH_L,WH_R,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,     BTN1,WH_D,WH_U,BTN2,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT( \
-      RESET,  QWERTY, COLEMAK,  DVORAK, _______, EEP_RST,   KC_MNXT, KC_MPRV, KC_MFFD, KC_MRWD,  DVORAK, KC_EJCT, \
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_PGUP, KC_HOME,   KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   CK_UP, CK_DOWN, \
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_PGDN,  KC_END,   KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, \
-    BL_TOGG,  BL_INC,  BL_DEC, BL_BRTG, _______, _______,    CK_RST, _______, CK_TOGG,  MU_MOD,  MU_TOG,  AU_TOG \
-  )
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-         set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/omgvee/readme.md b/keyboards/keebio/levinson/keymaps/omgvee/readme.md
deleted file mode 100644
index f882c98b0..000000000
--- a/keyboards/keebio/levinson/keymaps/omgvee/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# What I want from my LEVINSON (Let's Split on steroids) keymap
-====================================================================================================
-![My indigo Levinson keeb](https://i.imgur.com/sPfzSTk.jpg)
- media keys and media controls, including Eject, for however rare those computers with OSX *and* bloody optical drives might be
- in-switch LED intensity controls (+/-)
- underglow RGB hue/color controls
- underglow RGB intensity controls
- familiar key arrangement with Enter and symbols on the usual keys (to the right hand side, on some layer, pref RAISE for one-handed operation)
- navigation keys should be the vim ones really;
- arrow keys on one layer(most likely on the ADJUST one, but also on LOWER, as per my usual other split keebs)
- mouse keys too
- hardware reset for the ProMicro to put it bootloader mode, sounds, eeprom reset, backlights and rgb controls reset, etc.
-See keymap.c for layouts
-See config.h for various toggles and flags
-P.S> this is my first fully and purely ortholinear keyboard, as opposed to my [Iris](https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/iris/keymaps/omgvee "Vee's Iris keeb"), [Helidox](https://github.com/qmk/qmk_firmware/tree/master/keyboards/crkbd/keymaps/omgvee "Vee's beloved Helidox keeb"), MiniDox, etc., which are mildly staggered, but on the vertical side, which seems better imho than this... but we'll see how I get on with it over time...
diff --git a/keyboards/keebio/levinson/keymaps/omgvee/rules.mk b/keyboards/keebio/levinson/keymaps/omgvee/rules.mk
deleted file mode 100644
index 3540947ac..000000000
--- a/keyboards/keebio/levinson/keymaps/omgvee/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRAFLAGS += -flto
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = no
-NKRO_ENABLE = yes
-LEADER_ENABLE = no
-UNICODE_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
index 4d3d9a4f6..55ac74e9d 100644
--- a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
@@ -22,8 +22,6 @@ enum custom_keycodes {
  ADJUST,
 };
-#define KC_ KC_TRNS
 #define KC_X1 CODE
 #define KC_X2 NUMB
 #define KC_X3 MO(_SYS)
@@ -31,75 +29,75 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,      KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     BSPC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
+     KC_BSPC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,      KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH, X4 ,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,      KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH, KC_X4 ,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,LALT,     SPC , X2 ,LEFT,DOWN, UP ,RGHT
+      KC_X3 ,KC_LCTL,KC_LALT,KC_LGUI, KC_X1 ,KC_LALT,     KC_SPC , KC_X2 ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
  ),
-  [_COLEMAK] = LAYOUT_kc(
+  [_COLEMAK] = LAYOUT(
  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
+     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,      KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_MINS,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     BSPC, A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT,
+     KC_BSPC, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,      KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH, X4 ,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,      KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH, KC_X4 ,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,LALT,     SPC , X2 ,LEFT,DOWN, UP ,RGHT
+      KC_X3 ,KC_LCTL,KC_LALT,KC_LGUI, KC_X1 ,KC_LALT,     KC_SPC , KC_X2 ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
  ),
-  [_GAME] = LAYOUT_kc(
+  [_GAME] = LAYOUT(
  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,      KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     ESC , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESC , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,      KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT , UP ,ENT ,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,      KC_N  , KC_M  ,KC_COMM,KC_DOT , KC_UP ,KC_ENT ,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LCTL, X3 ,LGUI,LALT,SPC , X2 ,     BSPC, X1 ,SLSH,LEFT,DOWN,RGHT
+     KC_LCTL, KC_X3 ,KC_LGUI,KC_LALT,KC_SPC , KC_X2 ,     KC_BSPC, KC_X1 ,KC_SLSH,KC_LEFT,KC_DOWN,KC_RGHT
  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
  ),
-  [_NUMB] = LAYOUT_kc(
+  [_NUMB] = LAYOUT(
  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN, DEL,
+     KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,     KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     GRV , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,UNDS,
+     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,      KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_UNDS,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,MPRV,MNXT,MPLY,    ,         ,VOLD,VOLU,MUTE,    ,    ,
+     _______,_______,KC_MPRV,KC_MNXT,KC_MPLY,_______,     _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,LALT,         ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,KC_LALT,     _______,_______,_______,_______,_______,_______
  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
  ),
-  [_CODE] = LAYOUT_kc(
+  [_CODE] = LAYOUT(
  //,----+------+----+----+----+----.    ,----+----+----+----+----+----.
-     ESC ,      ,    , UP ,    ,    ,     PGUP,HOME,LPRN,RPRN,BSLS,PIPE,
+     KC_ESC ,  _______,_______, KC_UP ,_______,_______,     KC_PGUP,KC_HOME,KC_LPRN,KC_RPRN,KC_BSLS,KC_PIPE,
  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-     CAPS,SELECT,LEFT,DOWN,RGHT,DEL ,     PGDN, END,LBRC,RBRC,MINS,UNDS,
+     KC_CAPS,KC_SELECT,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,     KC_PGDN, KC_END,KC_LBRC,KC_RBRC,KC_MINS,KC_UNDS,
  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, UNDO ,CUT ,COPY,PASTE,   ,     LEFT,RGHT,LCBR,RCBR,PLUS, EQL,
+     KC_LSFT, KC_UNDO ,KC_CUT ,KC_COPY,KC_PASTE,   _______,     KC_LEFT,KC_RGHT,KC_LCBR,KC_RCBR,KC_PLUS, KC_EQL,
  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-         ,      ,    ,    ,    ,LALT,         ,    ,    ,    ,    ,
+     _______,  _______,_______,_______,_______,KC_LALT,     _______,_______,_______,_______,_______,_______
  //`----+------+----+----+----+----'    `----+----+----+----+----+----'
  ),
-  [_SYS] = LAYOUT_kc(
+  [_SYS] = LAYOUT(
  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
+     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,      KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______
  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
  ),
diff --git a/keyboards/keebio/levinson/keymaps/valgrahf/config.h b/keyboards/keebio/levinson/keymaps/valgrahf/config.h
deleted file mode 100644
index b7c6b0a7f..000000000
--- a/keyboards/keebio/levinson/keymaps/valgrahf/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "config_common.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 12
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/keebio/levinson/keymaps/valgrahf/keymap.c b/keyboards/keebio/levinson/keymaps/valgrahf/keymap.c
deleted file mode 100644
index cbe86db37..000000000
--- a/keyboards/keebio/levinson/keymaps/valgrahf/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-#define KC_ KC_TRNS
-#define KC_FN1 LT(_FN1, KC_NO)
-#define KC_FN2 LT(_FN2, KC_NO)
-#define KC_SPFN LT(_FN1, KC_SPACE)
-#define KC_RST RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-      TAB, Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      ESC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM, DOT,SLSH,PGUP,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LCTL,LGUI,LALT, FN1, ENT, ENT,      SPC, SPC, FN2,HOME, END,PGDN
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-   [_FN1] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-      GRV, 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      DEL,  F1, F2,  F3,  F4,  F5,        F6,MINS, EQL,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,  F7,  F8,  F9, F10, F11,      F12,    ,    ,    ,  UP,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,LEFT,DOWN,RIGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_FN2] = LAYOUT_kc_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      DEL,RHUI,RSAI,RVAI,    ,    ,         ,UNDS,PLUS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,RHUD,RSAD,RVAD,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,RTOG,RMOD,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-};
diff --git a/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk b/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk
deleted file mode 100644
index 1f54b32c4..000000000
--- a/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h
index 503b1f0fd..fd022ab51 100644
--- a/keyboards/keebio/levinson/levinson.h
+++ b/keyboards/keebio/levinson/levinson.h
@@ -9,19 +9,3 @@
 #elif KEYBOARD_keebio_levinson_rev3
    #include "rev3.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/README.md b/keyboards/keebio/nyquist/keymaps/bakingpy/README.md
deleted file mode 100644
index 3ce3f6af3..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/README.md
+++ /dev/null
@@ -1,116 +0,0 @@
-Hexwire's Nyquist Layout
-============================
-### Changes from default layout
- Main layer
-    - The right space bar key has been changed to backspace, as I only hit space with my left thumb
-    - Backtick is at the lower right and also serves goes to the 3rd function layer when held
-    - Enter key acts as shift when held
-    - Escape key acts as control when held
-    - Minus key at upper right
- Lower layer
-    - Numbers are on the lower layer, to make it easier to use a numpad on the right hand
-    - Arrow keys
-    - Straight and curly brackets in the middle two columns
-    - Screenshot keys for MacOS
- Upper layer
-    - Symbols are on the upper layer
-    - Media keys
-    - Page Up/Down, Home/End
- 3rd function layer
-    - Function keys
-## Layouts
-### QWERTY
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH, X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Colemak
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH, X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Dvorak
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  , X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Lower
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,   |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Raise
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### 3rd function layer
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/Underglow Pinouts.md b/keyboards/keebio/nyquist/keymaps/bakingpy/Underglow Pinouts.md
deleted file mode 100644
index 9a7633a52..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/Underglow Pinouts.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Let's Split RGB Underglow
-## Master
-### Pro Micro
- Red: LED +5V -> Pro Micro VCC
- Green: LED Din -> Pro Micro TX0
- Black: LED GND -> Pro Micro GND
-### TRRS
- Red: LED +5V -> PCB VCC
- Green: LED Do  -> PCB Extra Data
- Black: LED GND -> PCB GND
-## Slave
-### TRRS
- Red: LED +5V -> PCB VCC
- Green: LED Din -> PCB Extra Data
- Black: LED GND -> PCB GND
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/config.h b/keyboards/keebio/nyquist/keymaps/bakingpy/config.h
deleted file mode 100644
index eecff3dd5..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-/* Use I2C or Serial, not both */
-// #define USE_I2C
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap.c b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap.c
deleted file mode 100644
index 38c13f3ba..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,216 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FN3 5
-#define _FN4 6
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  FN3,
-  FN4,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_X0 MT(MOD_LCTL, KC_ESC)
-#define KC_X1 LOWER
-#define KC_X2 RAISE
-#define KC_X3 LT(_FN3, KC_GRV)
-#define KC_X4 MT(MOD_LSFT, KC_ENT)
-#define KC_BL_S BL_STEP
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH, X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH, X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X0 , A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  , X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     BL_S,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT( \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_converter.py b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_converter.py
deleted file mode 100755
index 683f64da4..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_converter.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-import re
-class KeymapConverter:
-  def __init__(self, filename):
-    self.filename = filename
-  def read_keymaps(self):
-    with open(self.filename) as f:
-      lines = f.readlines()
-    mode = 0
-    for line in lines:
-      line = line[:-1]
-      if mode == 0:
-        if "KC_KEYMAP" in line:
-          matches = re.match(r'.*\[(.*)\] = .*', line)
-          if matches:
-            layer_name = matches.group(1)
-            layer_name = layer_name[1:].capitalize()
-            print '###', layer_name
-            print '```'
-          mode = 1
-      elif mode == 1:
-        if "//" in line:
-          print line[4:]
-        elif ")" in line:
-          mode = 0
-          print '```'
-          print
-        elif line[-1] == ',':
-          print "|" + line[5:-1] + "|"
-        else:
-          print "|" + line[5:] + "|"
-converter = KeymapConverter('keymap.c')
-converter.read_keymaps()
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_to_readme.rb b/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_to_readme.rb
deleted file mode 100755
index 7285b008a..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/keymap_to_readme.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-class KeymapConverter
-  def initialize(filename)
-    @filename = filename
-    @mode = :search
-  end
-  def read_keymaps
-    lines = IO.readlines(@filename)
-    lines.each { |line| parse_line line[0..-2] }
-  end
-  def parse_line(line)
-    case @mode
-    when :search
-      if line =~ /KC_KEYMAP/
-        puts "### #{line}"
-        puts "```"
-        @mode = :parse
-      end
-    when :parse
-      if line =~ /\)/
-        @mode = :search
-        puts "```\n\n"
-      else 
-        line = line[4..-1]
-        line.sub!(/(,)^-/m, "|")
-        line.sub!(/( {4})/, "    |")
-        puts line
-      end
-    end
-  end
-end
-converter = KeymapConverter.new('keymap.c')
-converter.read_keymaps
diff --git a/keyboards/keebio/nyquist/keymaps/bakingpy/rules.mk b/keyboards/keebio/nyquist/keymaps/bakingpy/rules.mk
deleted file mode 100644
index a81250cdf..000000000
--- a/keyboards/keebio/nyquist/keymaps/bakingpy/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/keymaps/mtdjr/config.h b/keyboards/keebio/nyquist/keymaps/mtdjr/config.h
deleted file mode 100644
index 0fa606f29..000000000
--- a/keyboards/keebio/nyquist/keymaps/mtdjr/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/mtdjr/keymap.c b/keyboards/keebio/nyquist/keymaps/mtdjr/keymap.c
deleted file mode 100644
index 668e7964b..000000000
--- a/keyboards/keebio/nyquist/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-extern keymap_config_t keymap_config;
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc (
-// ,-----------------------------.  .-----------------------------.
-    GESC,  1 ,  2 ,  3 ,  4 ,  5 ,     6 ,  7 ,  8 ,  9 ,  0 ,BSPC,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-     TAB,  Q ,  W ,  E ,  R ,  T ,     Y ,  U ,  I ,  O ,  P ,QUOT,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    RASE,  A ,  S ,  D ,  F ,  G ,     H ,  J ,  K ,  L ,SCLN, ENT,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    LSFT,  Z ,  X ,  C ,  V ,  B ,     N ,  M ,COMM, DOT,SLSH,xxxx,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    LOWR,LCTL,LALT,LGUI, SPC, SPC,    SPC, SPC,LEFT,DOWN, UP ,RGHT
-// '-----------------------------'  '-----------------------------'
-),
-  [_LOWER] = LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-    TILD,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,UNDS,PLUS, DEL,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,LBRC,RBRC,BSLS,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,xxxx,xxxx,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,UNDO, CUT,XCPY,XINS,xxxx,   xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,    ,    ,    ,    ,    ,       ,    ,MNXT,VOLD,VOLU,MPLY
-// '-----------------------------'  '-----------------------------'
-),
-  [_RAISE] = LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,MINS, EQL,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,LCBR,RCBR,PIPE,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,xxxx,xxxx,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,    ,    ,    ,    ,    ,       ,    ,MNXT,VOLD,VOLU,MPLY
-// '-----------------------------'  '-----------------------------'
-),
-  [_ADJUST] =  LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-    xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,    F1 , F2 , F3 , F4 , F5 , F6 ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx, RST,xxxx,    F7 , F8 , F9 , F10, F11, F12,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        , RGB,RHUI,RSAI,RVAI, MOD,   xxxx,xxxx,xxxx,xxxx,xxxx,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,RBTH,RHUD,RSAD,RVAD,RMOD,   xxxx,xxxx,xxxx,xxxx,xxxx, BLB,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,xxxx,xxxx,xxxx,    ,    ,       ,    ,BLOF, BLD, BLI,BLON
-// '-----------------------------'  '-----------------------------'
-)
-};
diff --git a/keyboards/keebio/nyquist/keymaps/mtdjr/rules.mk b/keyboards/keebio/nyquist/keymaps/mtdjr/rules.mk
deleted file mode 100644
index d7463419b..000000000
--- a/keyboards/keebio/nyquist/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h
index f261c2994..25da44172 100644
--- a/keyboards/keebio/nyquist/nyquist.h
+++ b/keyboards/keebio/nyquist/nyquist.h
@@ -12,24 +12,6 @@
 #include "quantum.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
-    )
-#define LAYOUT_kc_ortho_5x12 LAYOUT_kc
 #define LAYOUT_ortho_4x12( \
    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
index 02139e043..bbd5ad699 100644
--- a/keyboards/keebio/quefrency/quefrency.h
+++ b/keyboards/keebio/quefrency/quefrency.h
@@ -11,17 +11,3 @@
 #ifdef KEYBOARD_keebio_quefrency_rev3
    #include "rev3.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-    LD1, LD2, LD3, LD4, LD5,      RD1,      RD4, RD5, RD6, RD7 \
-    ) \
-    LAYOUT( \
-        KC_##LA1, KC_##LA2, KC_##LA3, KC_##LA4, KC_##LA5, KC_##LA6, KC_##RA1, KC_##RA2, KC_##RA3, KC_##RA4, KC_##RA5, KC_##RA6, KC_##RA7, \
-        KC_##LB1, KC_##LB2, KC_##LB3, KC_##LB4, KC_##LB5, KC_##LB6, KC_##RB1, KC_##RB2, KC_##RB3, KC_##RB4, KC_##RB5,           KC_##RB7, \
-        KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1,           KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
-        KC_##LD1, KC_##LD2, KC_##LD3, KC_##LD4, KC_##LD5,           KC_##RD1,                     KC_##RD4, KC_##RD5, KC_##RD6, KC_##RD7 \
-    )
diff --git a/keyboards/keebio/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h
index 45e64587f..f11093f07 100644
--- a/keyboards/keebio/rorschach/rorschach.h
+++ b/keyboards/keebio/rorschach/rorschach.h
@@ -5,19 +5,3 @@
 #endif
 #include "quantum.h"
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35, \
-                             LT1, LT2, RT2, RT1 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35,                     KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-                                                          KC_##LT1, KC_##LT2, KC_##RT2, KC_##RT1 \
-    )
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.h b/keyboards/keebio/tragicforce68/tragicforce68.h
index cdecc55d9..a177f5281 100644
--- a/keyboards/keebio/tragicforce68/tragicforce68.h
+++ b/keyboards/keebio/tragicforce68/tragicforce68.h
@@ -56,21 +56,4 @@
    { J1, J2, J3, J4, J5, J6, J7, J8 } \
 }
-#define LAYOUT_kc( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14,     K15, K16, \
-    K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32,     K33, K34, \
-    K35,  K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47,     K48, \
-    K50,   K51, K52, K53, K54, K55, K56, K57, K58, K60, K61,    K62,          K63, \
-    K64,  K65,  K66,                 K67,              K68,  K70,  K71,  K72, K73, K74 \
-) LAYOUT( \
-    KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \
-    KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \
-    KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \
-    KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, \
-    KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, \
-    KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57, KC_##K58, \
-    KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, \
-    KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74 \
-)
 #define LAYOUT LAYOUT_68_ansi
diff --git a/keyboards/keebio/viterbi/keymaps/bakingpy/README.md b/keyboards/keebio/viterbi/keymaps/bakingpy/README.md
deleted file mode 100644
index 3ce3f6af3..000000000
--- a/keyboards/keebio/viterbi/keymaps/bakingpy/README.md
+++ /dev/null
@@ -1,116 +0,0 @@
-Hexwire's Nyquist Layout
-============================
-### Changes from default layout
- Main layer
-    - The right space bar key has been changed to backspace, as I only hit space with my left thumb
-    - Backtick is at the lower right and also serves goes to the 3rd function layer when held
-    - Enter key acts as shift when held
-    - Escape key acts as control when held
-    - Minus key at upper right
- Lower layer
-    - Numbers are on the lower layer, to make it easier to use a numpad on the right hand
-    - Arrow keys
-    - Straight and curly brackets in the middle two columns
-    - Screenshot keys for MacOS
- Upper layer
-    - Symbols are on the upper layer
-    - Media keys
-    - Page Up/Down, Home/End
- 3rd function layer
-    - Function keys
-## Layouts
-### QWERTY
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH, X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Colemak
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB , Q  , W  , F  , P  , G  ,      J  , L  , U  , Y  ,SCLN,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , R  , S  , T  , D  ,      H  , N  , E  , I  , O  ,QUOT|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT, Z  , X  , C  , V  , B  ,      K  , M  ,COMM,DOT ,SLSH, X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Dvorak
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,MINS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X0 , A  , O  , E  , U  , I  ,      D  , H  , T  , N  , S  ,SLSH|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  , X4 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-| X3 ,LCTL,LALT,LGUI, X1 ,SPC ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT|
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Lower
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,   |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### Raise
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|TILD,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS|
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
-### 3rd function layer
-```
-,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-|F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-|----+----+----+----+----+----|    |----+----+----+----+----+----|
-|    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    |
-`----+----+----+----+----+----'    `----+----+----+----+----+----'
-```
diff --git a/keyboards/keebio/viterbi/keymaps/bakingpy/config.h b/keyboards/keebio/viterbi/keymaps/bakingpy/config.h
deleted file mode 100644
index 7d01468e8..000000000
--- a/keyboards/keebio/viterbi/keymaps/bakingpy/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-// #define USE_I2C
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/viterbi/keymaps/bakingpy/keymap.c b/keyboards/keebio/viterbi/keymaps/bakingpy/keymap.c
deleted file mode 100644
index ab8cf2a9a..000000000
--- a/keyboards/keebio/viterbi/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FN3 5
-#define _FN4 6
-#define _ADJUST 16
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  FN3,
-  FN4,
-  ADJUST,
-};
-#define KC_ KC_TRNS
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_X0 MT(MOD_LCTL, KC_ESC)
-#define KC_X1 LOWER
-#define KC_X2 RAISE
-#define KC_X3 LT(_FN3, KC_GRV)
-#define KC_X4 MT(MOD_LSFT, KC_ENT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,    ,      Y  , U  , I  , O  , P  ,MINS,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X0 , A  , S  , D  , F  , G  ,    ,      H  , J  , K  , L  ,SCLN,QUOT,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,    ,      N  , M  ,COMM,DOT ,SLSH, X4 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_COLEMAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     TAB , Q  , W  , F  , P  , G  ,    ,      J  , L  , U  , Y  ,SCLN,MINS,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X0 , A  , R  , S  , T  , D  ,    ,      H  , N  , E  , I  , O  ,QUOT,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,    ,      K  , M  ,COMM,DOT ,SLSH, X4 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     ESC , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,BSPC,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     TAB ,QUOT,COMM,DOT , P  , Y  ,    ,      F  , G  , C  , R  , L  ,MINS,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X0 , A  , O  , E  , U  , I  ,    ,      D  , H  , T  , N  , S  ,SLSH,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     LSFT,SCLN, Q  , J  , K  , X  ,    ,      B  , M  , W  , V  , Z  , X4 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-      X3 ,LCTL,LALT,LGUI, X1 ,SPC ,    ,     BSPC, X2 ,LEFT,DOWN, UP ,RGHT,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,    ,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,    ,      6  , 7  , 8  , 9  , 0  ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,    ,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,CPYP,    ,    ,DOWN,LCBR,    ,     RCBR, P1 , P2 , P3 ,MINS,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,     DEL ,    , P0 ,PDOT,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,    ,     CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,EXLM, AT ,HASH,DLR ,PERC,    ,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,    ,     EQL ,HOME,    ,    ,    ,BSLS,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,     PLUS,END ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_FN3] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     F12 , F1 , F2 , F3 , F4 , F5 ,    ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT( \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, _______, \
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/viterbi/keymaps/bakingpy/rules.mk b/keyboards/keebio/viterbi/keymaps/bakingpy/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/viterbi/keymaps/bakingpy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/viterbi/keymaps/dwallace/config.h b/keyboards/keebio/viterbi/keymaps/dwallace/config.h
deleted file mode 100644
index 585b41dbc..000000000
--- a/keyboards/keebio/viterbi/keymaps/dwallace/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/viterbi/keymaps/dwallace/keymap.c b/keyboards/keebio/viterbi/keymaps/dwallace/keymap.c
deleted file mode 100644
index c03cf970f..000000000
--- a/keyboards/keebio/viterbi/keymaps/dwallace/keymap.c
+++ /dev/null
@@ -1,223 +0,0 @@
-#include "viterbi.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _FN 1
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  STK_SHIFT,
-  STK_CTRL,
-  STK_ALT,
-  STK_GUI,
-  STK_META,
-  STK_CLEAR,
-  RGB_LEVEL_UP,
-  RGB_LEVEL_DOWN,
-};
-#define KC_ KC_TRNS
-#define KC_SWIN LGUI(KC_TILD)   // Switch between windows
-#define KC_SAPP LGUI(KC_TAB)    // Switch between applications
-#define KC_FN1 MO(_FN)
-#define KC_LCAG LCAG(KC_NO)
-#define KC_RTOG RGB_TOG
-#define KC_RGUP RGB_LEVEL_UP
-#define KC_RGDN RGB_LEVEL_DOWN
-#define KC_RST RESET
-#define KC_SSFT STK_SHIFT
-#define KC_SCTL STK_CTRL
-#define KC_SALT STK_ALT
-#define KC_SGUI STK_GUI
-#define KC_SMTA STK_META
-#define KC_SCLR STK_CLEAR
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     GRV , 1  , 2  , 3  , 4  , 5  , 6  ,      7  , 8  , 9  , 0  ,MINS,EQL ,BSPC,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,LBRC,      Y  , U  , I  , O  , P  ,BSLS,PGUP,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     ESC , A  , S  , D  , F  , G  ,RBRC,      H  , J  , K  , L  ,SCLN,QUOT,ENT ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     SSFT, Z  , X  , C  , V  , B  ,SWIN,      N  , M  ,COMM,DOT , UP ,SLSH,RSFT,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     SCTL,SMTA,SALT,SGUI,SPC ,SCLR,SAPP,     FN1 ,SPC ,RGUI,LEFT,DOWN,RGHT,PGDN
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_FN] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 , F6 ,      F7 , F8 , F9 ,F10 ,F11 ,F12 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,RST ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,     RTOG,    ,RGDN,RGUP,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,MUTE,VOLD,VOLU,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-bool modifier_already_applied = false;
-uint8_t physically_held_modifiers = 0;
-uint8_t last_mods = 0xFF;
-uint8_t rgb_dimming = 0;
-#define SET_LED_RGB(val, led_num) setrgb(((val >> 16) & 0xFF) >> rgb_dimming, ((val >> 8) & 0xFF) >> rgb_dimming, (val & 0xFF) >> rgb_dimming, (LED_TYPE *)&led[led_num])
-void update_underglow_level(void) {
-  if (get_mods() == last_mods)
-    return;
-  last_mods = get_mods();
-  if (get_mods() == 0) {
-    uint8_t level = 0x10 >> rgb_dimming;
-    rgblight_setrgb(level, level, level);
-    return;
-  }
-  uint32_t mod_colors[4] = {0};
-  uint8_t mod_count = 0;
-  rgblight_setrgb(0x00, 0x00, 0x00);
-  if (get_mods() & MOD_BIT(KC_LSFT))
-    mod_colors[mod_count++] = 0xFF0000;
-  if (get_mods() & MOD_BIT(KC_LCTL))
-    mod_colors[mod_count++] = 0x00FF00;
-  if (get_mods() & MOD_BIT(KC_LALT))
-    mod_colors[mod_count++] = 0x0000FF;
-  if (get_mods() & MOD_BIT(KC_LGUI))
-    mod_colors[mod_count++] = 0xFFFF00;
-  uint8_t led_num = 0;
-  for (int m = 0; m < mod_count; m++) {
-    for (; led_num < RGBLED_NUM*(m+1)/mod_count; led_num++) {
-      SET_LED_RGB(mod_colors[m], led_num);
-    }
-  }
-  rgblight_set();
-}
-void add_sticky_modifier(uint16_t keycode) {
-  add_mods(MOD_BIT(keycode));
-  register_code(keycode);
-  modifier_already_applied = false;
-}
-void clear_sticky_modifiers(void) {
-  unregister_code(KC_LSFT);
-  unregister_code(KC_LCTL);
-  unregister_code(KC_LALT);
-  unregister_code(KC_LGUI);
-  update_underglow_level();
-}
-void handle_sticky_modifier_event(uint16_t keycode, bool pressed) {
-  if (pressed) {
-    add_sticky_modifier(keycode);
-    physically_held_modifiers |= MOD_BIT(keycode);
-  } else {
-    del_mods(MOD_BIT(keycode));
-    physically_held_modifiers &= ~MOD_BIT(keycode);
-    if (modifier_already_applied) {
-      clear_sticky_modifiers();
-    } else {
-      add_sticky_modifier(keycode);
-    }
-  }
-  update_underglow_level();
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case STK_SHIFT:
-      handle_sticky_modifier_event(KC_LSFT, record->event.pressed);
-      return false;
-      break;
-    case STK_CTRL:
-      handle_sticky_modifier_event(KC_LCTL, record->event.pressed);
-      return false;
-      break;
-    case STK_ALT:
-      handle_sticky_modifier_event(KC_LALT, record->event.pressed);
-      return false;
-      break;
-    case STK_GUI:
-      handle_sticky_modifier_event(KC_LGUI, record->event.pressed);
-      return false;
-      break;
-    case STK_META:
-      handle_sticky_modifier_event(KC_LCTL, record->event.pressed);
-      handle_sticky_modifier_event(KC_LALT, record->event.pressed);
-      handle_sticky_modifier_event(KC_LGUI, record->event.pressed);
-      return false;
-      break;
-    case STK_CLEAR:
-      if (record->event.pressed) {
-        clear_sticky_modifiers();
-      }
-      return false;
-      break;
-    case RGB_LEVEL_DOWN:
-      if (record->event.pressed && rgb_dimming < 8) {
-        rgb_dimming++;
-      }
-      return false;
-      break;
-    case RGB_LEVEL_UP:
-      if (record->event.pressed && rgb_dimming > 0) {
-        rgb_dimming--;
-      }
-      return false;
-      break;
-  }
-  if (!record->event.pressed && IS_KEY(keycode)) {
-    modifier_already_applied = true;
-    if (physically_held_modifiers == 0)
-      clear_sticky_modifiers();
-  }
-  return true;
-}
-void matrix_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-  rgblight_enable();
-  #endif //RGBLIGHT_ENABLE
-}
-void matrix_scan_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-  update_underglow_level();
-  #endif //RGBLIGHT_ENABLE
-}
diff --git a/keyboards/keebio/viterbi/keymaps/dwallace/rules.mk b/keyboards/keebio/viterbi/keymaps/dwallace/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/viterbi/keymaps/dwallace/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/viterbi/keymaps/fido/config.h b/keyboards/keebio/viterbi/keymaps/fido/config.h
deleted file mode 100644
index 5cb108365..000000000
--- a/keyboards/keebio/viterbi/keymaps/fido/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-#ifndef MASTER_LEFT
-    #define MASTER_RIGHT
-#endif
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keebio/viterbi/keymaps/fido/keymap.c b/keyboards/keebio/viterbi/keymaps/fido/keymap.c
deleted file mode 100644
index cd6c8d087..000000000
--- a/keyboards/keebio/viterbi/keymaps/fido/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "viterbi.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-extern keymap_config_t keymap_config;
-#define _QWERTY 0
-#define _FN 1
-#define KC_ KC_TRNS
-#define KC_FN1 MO(_FN)
-#define KC_WD_L LCTL(KC_LEFT)
-#define KC_WD_R LCTL(KC_RGHT)
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
-#define KC_RST RESET
-#define KC_CTLZ LCTL(KC_Z)
-#define KC_CTLX LCTL(KC_X)
-#define KC_CTLC LCTL(KC_C)
-#define KC_CTLV LCTL(KC_V)
-#define KC_ATAB LALT(KC_TAB)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-      1  , 2  , 3  , 4  , 5  , 6  ,ESC ,     DEL , 7  , 8  , 9  , 0  ,MINS,EQL ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     RBRC, Q  , W  , E  , R  , T  ,TAB ,     BSPC, Y  , U  , I  , O  , P  ,LBRC,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     GRV , A  , S  , D  , F  , G  ,LALT,     CAPS, H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     BSLS, Z  , X  , C  , V  , B  ,LSFT,     RSFT, N  , M  ,COMM,DOT ,SLSH,ENT ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     INS ,PSCR,MENU,LGUI,LCTL,SPC ,FN1 ,     FN1 ,SPC ,RCTL,RALT,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_FN] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-      F1 , F2 , F3 , F4 , F5 , F6 ,    ,         , F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,PGUP,WD_L, UP ,WD_R,    ,ATAB,         ,RMOD,RHUI,RSAI,RVAI,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,HOME,LEFT,DOWN,RGHT,    ,    ,         ,    ,RHUD,RSAD,RVAD,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,CTLZ,CTLX,CTLC,CTLV,    ,    ,         ,MUTE,VOLD,VOLU,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  )
-};
-void led_set_user(uint8_t usb_led) {
-  #ifdef RGBLIGHT_ENABLE
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    rgblight_enable();
-  } else {
-    rgblight_disable();
-  }
-  #endif //RGBLIGHT_ENABLE
-}
diff --git a/keyboards/keebio/viterbi/keymaps/fido/rules.mk b/keyboards/keebio/viterbi/keymaps/fido/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/viterbi/keymaps/fido/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/viterbi/keymaps/mike808/config.h b/keyboards/keebio/viterbi/keymaps/mike808/config.h
deleted file mode 100644
index 95625ea67..000000000
--- a/keyboards/keebio/viterbi/keymaps/mike808/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-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
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define TAPPING_TERM 150
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/viterbi/keymaps/mike808/keymap.c b/keyboards/keebio/viterbi/keymaps/mike808/keymap.c
deleted file mode 100644
index 9922f1a55..000000000
--- a/keyboards/keebio/viterbi/keymaps/mike808/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _DVORAK 0
-#define _QWERTY 1
-#define _FN1 2
-#define _MOUSE 3
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-};
-#define KC_ KC_TRNS
-#define KC_DVOR DVORAK
-#define KC_QWER QWERTY
-#define KC_FN1 MO(_FN1)
-// Tap-Hold keys (QWERTY)
-#define KC_S_C MT(MOD_LCTL, KC_S)
-#define KC_D_A MT(MOD_LALT, KC_D)
-#define KC_F_G MT(MOD_LGUI, KC_F)
-#define KC_J_G MT(MOD_RGUI, KC_J)
-#define KC_K_A MT(MOD_RALT, KC_K)
-#define KC_L_C MT(MOD_RCTL, KC_L)
-// Tap-Hold keys (Dvorak)
-#define KC_O_C MT(MOD_LCTL, KC_O)
-#define KC_E_A MT(MOD_LALT, KC_E)
-#define KC_U_G MT(MOD_LGUI, KC_U)
-#define KC_H_G MT(MOD_RGUI, KC_H)
-#define KC_T_A MT(MOD_RALT, KC_T)
-#define KC_N_C MT(MOD_RCTL, KC_N)
-#define KC_G_A LGUI(KC_A)
-#define KC_G_C LGUI(KC_C)
-#define KC_G_V LGUI(KC_V)
-#define KC_G_X LGUI(KC_X)
-#define KC_G_Z LGUI(KC_Z)
-#define KC_G_BL LGUI(KC_BSLS)
-#define KC_G_TB LGUI(KC_TAB)
-#define KC_G_SP LGUI(KC_SPC)
-#define KC_ENTM LT(_MOUSE, KC_ENT)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     DVOR,ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,MINS,PGUP,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_A ,TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,BSLS,PGDN,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_X ,CAPS, A  ,S_C ,D_A ,F_G , G  ,      H  ,J_G ,K_A ,L_C ,SCLN,QUOT, UP ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_C ,LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,RSFT,DOWN,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_V ,FN1 ,G_TB,G_SP,BSPC,SPC ,SPC ,     ENTM,ENTM,G_Z ,GRV ,EQL ,LEFT,RGHT
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_DVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-     QWER,ESC , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,EQL ,PGUP,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_A ,TAB ,QUOT,COMM,DOT , P  , Y  ,      F  , G  , C  , R  , L  ,SLSH,PGDN,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_X ,CAPS, A  ,O_C ,E_A ,U_G , I  ,      D  ,H_G ,T_A ,N_C , S  ,MINS, UP ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_C ,LSFT,SCLN, Q  , J  , K  , X  ,      B  , M  , W  , V  , Z  ,RSFT,DOWN,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     G_V ,FN1 ,G_TB,G_SP,BSPC,SPC ,SPC ,     ENTM,ENTM,G_Z ,GRV ,BSLS,LEFT,RGHT
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_FN1] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-         ,    , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,EXLM, AT ,LCBR,RCBR,PIPE,         , P7 , P8 , P9 ,ASTR,F12 ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,HASH,DLR ,LPRN,RPRN,GRV ,         , P4 , P5 , P6 ,PLUS,MINS,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,PERC,CIRC,LBRC,RBRC,TILD,     AMPR, P1 , P2 , P3 ,SLSH,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,PDOT, P0 ,EQL ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  ),
-  [_MOUSE] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.    ,----+----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,MS_U,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,MS_L,MS_D,MS_R,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,BTN1,BTN2,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----'    `----+----+----+----+----+----+----'
-  )
-};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-#endif
-void update_rgblight(uint16_t layer) {
-  if (layer & (1UL << _DVORAK)) {
-    rgblight_sethsv_green();
-  } else if (layer & (1UL << _QWERTY)) {
-    rgblight_sethsv_goldenrod();
-  }
-}
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-  #ifdef RGBLIGHT_ENABLE
-  update_rgblight(default_layer);
-  #endif // RGBLIGHT_ENABLE
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL << _QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL << _DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-void matrix_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-  rgblight_enable();
-  uint8_t default_layer = eeconfig_read_default_layer();
-  update_rgblight(default_layer);
-  #endif
-}
diff --git a/keyboards/keebio/viterbi/keymaps/mike808/rules.mk b/keyboards/keebio/viterbi/keymaps/mike808/rules.mk
deleted file mode 100644
index 1e3cebb14..000000000
--- a/keyboards/keebio/viterbi/keymaps/mike808/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h
index 186892d57..b17b32241 100644
--- a/keyboards/keebio/viterbi/viterbi.h
+++ b/keyboards/keebio/viterbi/viterbi.h
@@ -8,21 +8,5 @@
    #include "rev2.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \
-        KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46 \
-    )
 #define LAYOUT_ortho_5x14 LAYOUT
diff --git a/keyboards/keebio/wavelet/wavelet.h b/keyboards/keebio/wavelet/wavelet.h
index 69a87a70c..d6a0ef422 100644
--- a/keyboards/keebio/wavelet/wavelet.h
+++ b/keyboards/keebio/wavelet/wavelet.h
@@ -19,19 +19,4 @@
                { R35, R34, R33, R32, R31, R30 } \
        }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
 #define LAYOUT_ortho_4x12 LAYOUT
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/laptreus/laptreus.h b/keyboards/laptreus/laptreus.h
index 305d41274..f367c13dc 100644
--- a/keyboards/laptreus/laptreus.h
+++ b/keyboards/laptreus/laptreus.h
@@ -23,19 +23,4 @@
  {A1, B1, C1, D1, KC_NO, KC_NO, D12, C12, B12, A12} \
 }
-#define LAYOUT_kc( \
-  A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, \
-  B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, \
-  C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, \
-  D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12 \
-) \
-{ \
-  LAYOUT( \
-    KC_##A1, KC_##A2, KC_##A3, KC_##A4, KC_##A5, KC_##A6, KC_##A7, KC_##A8, KC_##A9, KC_##A10, KC_##A11, KC_##A12, \
-    KC_##B1, KC_##B2, KC_##B3, KC_##B4, KC_##B5, KC_##B6, KC_##B7, KC_##B8, KC_##B9, KC_##B10, KC_##B11, KC_##B12, \
-    KC_##C1, KC_##C2, KC_##C3, KC_##C4, KC_##C5, KC_##C6, KC_##C7, KC_##C8, KC_##C9, KC_##C10, KC_##C11, KC_##C12, \
-    KC_##D1, KC_##D2, KC_##D3, KC_##D4, KC_##D5, KC_##D6, KC_##D7, KC_##D8, KC_##D9, KC_##D10, KC_##D11, KC_##D12 \
-  ) \
-}
 #endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem/keymap.c b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
index 623117530..f9eab059e 100755
--- a/keyboards/lets_split/keymaps/bbaserdem/keymap.c
+++ b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
@@ -5,7 +5,6 @@
 * Most of the code is in the "user" directory.
 * Check qmk_firmware/users/bbaserdem for the main part of the code
 */
-#define KEYMAP(...) LAYOUT_ortho_4x12(__VA_ARGS__)
 #include "lets_split.h"
 #include "bbaserdem.h"
diff --git a/keyboards/lets_split/keymaps/mtdjr/config.h b/keyboards/lets_split/keymaps/mtdjr/config.h
deleted file mode 100644
index afbf73569..000000000
--- a/keyboards/lets_split/keymaps/mtdjr/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This is the c configuration file for the keymap
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-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/>.
-*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-#define SOLENOID_ENABLE
-#define SOLENOID_PIN F4
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8
-/* Use I2C or Serial, not both */
-#define USE_SERIAL
-// #define USE_I2C
-/* Select hand configuration */
- #define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-#endif
diff --git a/keyboards/lets_split/keymaps/mtdjr/keymap.c b/keyboards/lets_split/keymaps/mtdjr/keymap.c
deleted file mode 100644
index 47972fcd3..000000000
--- a/keyboards/lets_split/keymaps/mtdjr/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "mtdjr.h"
-extern keymap_config_t keymap_config;
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-     TAB,  Q ,  W ,  E ,  R ,  T ,     Y ,  U ,  I ,  O ,  P ,BSPC,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    EXC,   A ,  S ,  D ,  F ,  G ,     H ,  J ,  K ,  L ,SCLN,QUOT,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    LSFT,  Z ,  X ,  C ,  V ,  B ,     N ,  M ,COMM, DOT,SLSH, ENT,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    LOWR,LCTL,LALT,LGUI,LOWR, SPC,    SPC,RASE,LEFT,DOWN, UP ,RGHT
-// '-----------------------------'  '-----------------------------'
-  ),
-  [_LOWER] = LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-    TILD,  1 ,  2 ,  3 ,  4 ,  5 ,     6 ,  7 ,  8 ,  9 ,  0 , DEL,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   xxxx,xxxx,xxxx,LBRC,RBRC,BSLS,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,UNDO, CUT,XCPY,XINS,xxxx,   xxxx,xxxx,xxxx,xxxx,xxxx,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,    ,    ,    ,    ,    ,       ,    ,    ,    ,    ,
-// '-----------------------------'  '-----------------------------'
-  ),
-  [_RAISE] = LAYOUT_kc(
-// ,-----------------------------.  .-----------------------------.
-     GRV,EXLM, AT ,HASH, DLR,PERC,   CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,   MINS, EQL,xxxx,LCBR,RCBR,PIPE,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,xxxx,xxxx,xxxx,xxxx,xxxx,   UNDS,PLUS,xxxx,xxxx,xxxx,    ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,    ,    ,    ,    ,    ,       ,    ,MNXT,VOLD,VOLU,MPLY
-// '-----------------------------'  '-----------------------------'
-  ),
-  [_ADJUST] =  LAYOUT_kc( \
-// ,-----------------------------.  .-----------------------------.
-    xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,    RST,STOG,xxxx,xxxx,xxxx, DEL,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-     RGB,RHUI,RSAI,RVAI, MOD,xxxx,    F1 , F2 , F3 , F4 , F5 , F6 ,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-    RBTH,RHUD,RSAD,RVAD,RMOD,xxxx,    F7 , F8 , F9 , F10, F11, F12,
-// |----+----+----+----+----+----|  |----+----+----+----+----+----|
-        ,xxxx,xxxx,xxxx,    ,xxxx,   xxxx,    ,xxxx,xxxx,xxxx,xxxx
-// '-----------------------------'  '-----------------------------'
-  )
-};
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
deleted file mode 100644
index a81250cdf..000000000
--- a/keyboards/lets_split/keymaps/mtdjr/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index 9c46f382d..90290e586 100644
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -9,20 +9,3 @@
 #elif KEYBOARD_lets_split_sockets
    #include "sockets.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/lets_split_eh/lets_split_eh.h b/keyboards/lets_split_eh/lets_split_eh.h
index 51828b09b..aa1f213b2 100644
--- a/keyboards/lets_split_eh/lets_split_eh.h
+++ b/keyboards/lets_split_eh/lets_split_eh.h
@@ -5,20 +5,3 @@
 #ifdef KEYBOARD_lets_split_eh_eh
    #include "eh.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechmini/v1/v1.h
index acdad5c6d..401eac85b 100644
--- a/keyboards/mechmini/v1/v1.h
+++ b/keyboards/mechmini/v1/v1.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 #include "quantum.h"
-#define KEYMAP( \
+#define LAYOUT( \
    K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \
    K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \
    K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \
diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h
index 8cdcd09fe..cad590477 100644
--- a/keyboards/meira/meira.h
+++ b/keyboards/meira/meira.h
@@ -25,7 +25,7 @@ void reset_keyboard_kb(void);
 // The following is an example using the Planck MIT layout
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
-#define KEYMAP( \
+#define LAYOUT( \
   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -38,23 +38,7 @@ void reset_keyboard_kb(void);
        { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT_ortho_4x12 LAYOUT
-#define KC_KEYMAP( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-  ) \
-      KEYMAP( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-    )
-#define LAYOUT_ortho_4x12 KEYMAP
-#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
-#define LAYOUT_kc_ortho_4x12 KC_KEYMAP
 #endif
diff --git a/keyboards/mt40/mt40.h b/keyboards/mt40/mt40.h
index 3ff9c89d0..c202d5f6c 100644
--- a/keyboards/mt40/mt40.h
+++ b/keyboards/mt40/mt40.h
@@ -38,22 +38,6 @@
    { KC_NO, KC_NO, K09,   K19,   K29,   KC_NO, K2B,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K08,   K18,   K28   }  \
 }
-#define LAYOUT_kc( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-        k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-        ) \
-        LAYOUT_planck_mit( \
-                KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-                KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-                KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-                KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34,      KC_##k35,      KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-    )
 #define LAYOUT LAYOUT_planck_mit
-#define LAYOUT_kc_planck_mit LAYOUT_kc
 #endif
diff --git a/keyboards/niu_mini/niu_mini.h b/keyboards/niu_mini/niu_mini.h
index 5fef7b432..b81521912 100644
--- a/keyboards/niu_mini/niu_mini.h
+++ b/keyboards/niu_mini/niu_mini.h
@@ -28,19 +28,4 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-    ) \
-    LAYOUT_ortho_4x12( \
-        KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-        KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-        KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-        KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-    )
 #define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h
index 6f8dad60a..ebf13debb 100644
--- a/keyboards/orthodox/orthodox.h
+++ b/keyboards/orthodox/orthodox.h
@@ -11,18 +11,3 @@
 #ifdef KEYBOARD_orthodox_rev3_teensy
 #include "rev3_teensy.h"
 #endif
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-        L00, L01, L02, L03, L04, L05,                            R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15, L16, L18,       R10, R12, R13, R14, R15, R16, R17, R18,  \
-        L20, L21, L22, L23, L24, L25, L26, L27, L28,  R20, R21, R22, R23, R24, R25, R26, R27, R28 \
-        ) \
-        { \
-                { KC_##LL00, KC_##LL01, KC_##LL02, KC_##LL03, KC_##LL04, KC_##LL05 }, \
-                { KC_##LL10, KC_##LL11, KC_##LL12, KC_##LL13, KC_##LL14, KC_##LL15, KC_##LL16, KC_NO, KC_##LL18}, \
-                { KC_##LL20, KC_##LL21, KC_##LL22, KC_##LL23, KC_##LL24, KC_##LL25, KC_##LL26, KC_##LL27, KC_##LL28 }, \
-                { KC_##LR05, KC_##LR04, KC_##LR03, KC_##LR02, KC_##LR01, KC_##LR00 }, \
-                { KC_##LR18, KC_##LR17, KC_##LR16, KC_##LR15, KC_##LR14, KC_##LR13, KC_##LR12, KC_NO, KC_##LR10 }, \
-                { KC_##LR28, KC_##LR27, KC_##LR26, KC_##LR25, KC_##LR24, KC_##LR23, KC_##LR22, KC_##LR21, KC_##LR20 } \
-        }
diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h
index f989cd938..d11929d3e 100644
--- a/keyboards/planck/ez/ez.h
+++ b/keyboards/planck/ez/ez.h
@@ -51,7 +51,6 @@ LAYOUT_planck_1x2uC( \
    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
 )
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
index 3099a7834..a927c522a 100644
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ b/keyboards/planck/keymaps/corvec/keymap.c
@@ -40,12 +40,6 @@ enum planck_keycodes {
  BACKLIT
 };
-#define KC_ KC_TRNS
-#define KC_____ KC_TRNS
-#define KC_XXXX KC_NO
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
 /**
 * Custom Corvec Bindings
 *
@@ -76,54 +70,54 @@ enum planck_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK] = KC_KEYMAP(
+  [_COLEMAK] = LAYOUT_planck_grid(
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     TAB , Q  , W  , F  , P  , G  , J  , L  , U  , Y  ,SCLN,BSPC,
+     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  , KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     RESC, A  , R  , S  , T  , D  , H  , N  , E  , I  , O  ,TQTD,
+     KC_RESC, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  , KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_TQTD,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     LSFT, Z  , X  , C  , V  , B  , K  , M  ,COMM,DOT ,SLSH,RSFT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     LCTL,LGUI,WOBL,LALT,LENT, SPC, SPC,RASE,SDEL,TALT,TGUI,RCTL
+     KC_LCTL,KC_LGUI,KC_WOBL,KC_LALT,KC_LENT, KC_SPC, KC_SPC,RAISE,KC_SDEL,KC_TALT,KC_TGUI,KC_RCTL
  ),
-  [_QWERTY] = KC_KEYMAP(
+  [_QWERTY] = LAYOUT_planck_grid(
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     TAB , Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,BSPC,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSPC,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     RESC, A  , S  , D  , F  , G  , H  , J  , K  , L  ,SCLN,TQTD,
+     KC_RESC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_TQTD,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     LSFT, Z  , X  , C  , V  , B  , N  , M  ,COMM,DOT ,SLSH,RSFT,
+     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
  //-----+----+----+----+----+----+----+----+----+----+----+----
-     LCTL,LGUI,WOBL,LALT,LENT, SPC, SPC,RASE,RALT,SAPP,RGUI,RCTL
+     KC_LCTL,KC_LGUI,KC_WOBL,KC_LALT,KC_LENT, KC_SPC, KC_SPC,RAISE,KC_RALT,KC_SAPP,KC_RGUI,KC_RCTL
  ),
-  [_LOWER] = KC_KEYMAP(
+  [_LOWER] = LAYOUT_planck_grid(
-     GRV ,EXLM, AT ,HASH, DLR,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,____,
+     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-     ____,LPRN,RPRN,LBRC,RBRC,XXXX,LEFT,DOWN, UP ,RGHT,XXXX,MINS,
+     _______,KC_LPRN,KC_RPRN,KC_LBRC,KC_RBRC,XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,XXXXXXX,KC_MINS,
-     ____,BSLS,TILD,PIPE,EQL ,UNDS,HOME,PGDN,PGUP,END ,BSLS,____,
+     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_BSLS,_______,
-     ____,____,____,____,____,____,____,____,____,____,____,____
+     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
  ),
-  [_LEANDOWN] = KC_KEYMAP(
+  [_LEANDOWN] = LAYOUT_planck_grid(
-     GRV ,EXLM, AT ,HASH, DLR,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,____,
+     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-     ____,LPRN,RPRN,LBRC,RBRC,LCBR,LCBR,DLR ,PERC,CIRC,____,____,
+     _______,KC_LPRN,KC_RPRN,KC_LBRC,KC_RBRC,KC_LCBR,KC_LCBR,KC_DLR ,KC_PERC,KC_CIRC,_______,_______,
-     ____,BSLS,TILD,PIPE,EQL ,UNDS,HOME,EXLM, AT ,HASH,BSLS,____,
+     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,KC_HOME,KC_EXLM, KC_AT ,KC_HASH,KC_BSLS,_______,
-     ____,____,____,____,____,____,____,____,LEFT,DOWN, UP ,RGHT
+     _______,_______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
  ),
-  [_RAISE] = KC_KEYMAP(
+  [_RAISE] = LAYOUT_planck_grid(
-     GRV ,  1 ,  2 ,  3 ,  4 ,  5 ,  6 ,  7 ,  8 ,  9 ,  0 ,____,
+     KC_GRV ,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
-     ____,LPRN,RPRN,LCBR,RCBR,XXXX,XXXX,  4 ,  5 ,  6 ,PPLS,MINS,
+     _______,KC_LPRN,KC_RPRN,KC_LCBR,KC_RCBR,XXXXXXX,XXXXXXX,  KC_4 ,  KC_5 ,  KC_6 ,KC_PPLS,KC_MINS,
-     ____,BSLS,TILD,PIPE,EQL ,UNDS,XXXX,  1 ,  2 ,  3 ,PAST,____,
+     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,XXXXXXX,  KC_1 ,  KC_2 ,  KC_3 ,KC_PAST,_______,
-     ____,____,____,____,____,____,____,____,____,____,____,____
+     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
  ),
-  [_WOBBLE] = KC_KEYMAP(
+  [_WOBBLE] = LAYOUT_planck_grid(
-     GRV , F1 , F2 , F3 , F4 , NO ,MUTE,VOLD,VOLU, NO , NO , DEL,
+     KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO ,KC_MUTE,KC_VOLD,KC_VOLU, KC_NO , KC_NO , KC_DEL,
-         , F5 , F6 , F7 , F8 , NO ,MPRV,MPLY,MSTP,MNXT, NO ,BSLS,
+     _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_NO ,KC_MPRV,KC_MPLY,KC_MSTP,KC_MNXT, KC_NO ,KC_BSLS,
-         , F9 , F10, F11, F12, NO , NO , NO , NO , INS,PSCR,    ,
+     _______, KC_F9 , KC_F10, KC_F11, KC_F12, KC_NO , KC_NO , KC_NO , KC_NO , KC_INS,KC_PSCR,_______,
-         ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,
+     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
  ),
 /* Adjust (Lower + Raise)
diff --git a/keyboards/planck/light/light.h b/keyboards/planck/light/light.h
index 3ead109ac..f014c5017 100644
--- a/keyboards/planck/light/light.h
+++ b/keyboards/planck/light/light.h
@@ -46,24 +46,8 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
-#endif
-\ No newline at end of file
+#endif
diff --git a/keyboards/planck/rev1/rev1.h b/keyboards/planck/rev1/rev1.h
index 3d1d1d21c..db4c6b368 100644
--- a/keyboards/planck/rev1/rev1.h
+++ b/keyboards/planck/rev1/rev1.h
@@ -28,22 +28,6 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/planck/rev2/rev2.h b/keyboards/planck/rev2/rev2.h
index 3d1d1d21c..db4c6b368 100644
--- a/keyboards/planck/rev2/rev2.h
+++ b/keyboards/planck/rev2/rev2.h
@@ -28,22 +28,6 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h
index 3d1d1d21c..db4c6b368 100644
--- a/keyboards/planck/rev3/rev3.h
+++ b/keyboards/planck/rev3/rev3.h
@@ -28,22 +28,6 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h
index 3d1d1d21c..db4c6b368 100644
--- a/keyboards/planck/rev4/rev4.h
+++ b/keyboards/planck/rev4/rev4.h
@@ -28,22 +28,6 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/planck/rev5/rev5.h b/keyboards/planck/rev5/rev5.h
index 3d1d1d21c..db4c6b368 100644
--- a/keyboards/planck/rev5/rev5.h
+++ b/keyboards/planck/rev5/rev5.h
@@ -28,22 +28,6 @@
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/planck/rev6/rev6.h b/keyboards/planck/rev6/rev6.h
index 513b98f39..9fd51e70f 100644
--- a/keyboards/planck/rev6/rev6.h
+++ b/keyboards/planck/rev6/rev6.h
@@ -104,24 +104,8 @@
 }
-// Used to create a keymap using only KC_ prefixed keys
+#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_kc( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-LAYOUT_ortho_4x12( \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-    KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-)
-#define KEYMAP LAYOUT_ortho_4x12
 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
-#define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-#define KC_KEYMAP LAYOUT_kc
 #endif
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index 3ba52081d..7f7863fdb 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -45,19 +45,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *                                    |  Spc |  Ent |  |  Ent |  Spc |
   *                                    `-------------'  `-------------'
   */
-  [_QWERTY] = LAYOUT_kc( \
+  [_QWERTY] = LAYOUT( \
  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-          GRV,       1,       2,       3,       4,       5,       MINS,          EQL,          6,       7,       8,       9,       0,    BSPC,
+          KC_GRV,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_MINS,          KC_EQL,          KC_6,       KC_7,       KC_8,       KC_9,       KC_0,    KC_BSPC,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          TAB,       Q,       W,       E,       R,       T,       LBRC,         RBRC,          Y,       U,       I,       O,       P,    BSLS,
+          KC_TAB,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_LBRC,         KC_RBRC,          KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,    KC_BSLS,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          ESC,       A,       S,       D,       F,       G,    _______,      _______,          H,       J,       K,       L,    SCLN,    QUOT,
+          KC_ESC,       KC_A,       KC_S,       KC_D,       KC_F,       KC_G,    _______,      _______,          KC_H,       KC_J,       KC_K,       KC_L,    KC_SCLN,    KC_QUOT,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         LSPO,       Z,       X,       C,       V,       B,    _______,      _______,          N,       M,    COMM,     DOT,    SLSH,    RSPC,
+         KC_LSPO,       KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,    _______,      _______,          KC_N,       KC_M,    KC_COMM,     KC_DOT,    KC_SLSH,    KC_RSPC,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         LCTL,    LALT,      FN,    LGUI, RGB_MOD,        SPC,     DEL,         BSPC,        SPC,     ADJ,    LGUI,      FN,    LALT,    LCTL,
+         KC_LCTL,    KC_LALT,      FN,    KC_LGUI, RGB_MOD,        KC_SPC,     KC_DEL,         KC_BSPC,        KC_SPC,     ADJ,    KC_LGUI,      FN,    KC_LALT,    KC_LCTL,
  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-                                                          SPC,     ENT,          ENT,        SPC
+                                                          KC_SPC,     KC_ENT,          KC_ENT,        KC_SPC
  //                                                |--------+--------|    |--------+-----------+
      ),
@@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *                                    |      |      |  |      |      |
   *                                    `-------------'  `-------------'
   */
-  [_FN] = LAYOUT_kc( \
+  [_FN] = LAYOUT( \
  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-           F1,      F2,      F3,      F4,      F5,      F6,    _______,      _______,         F7,      F8,      F9,     F10,     F11,     F12,
+           KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,    _______,      _______,         KC_F7,      KC_F8,      KC_F9,     KC_F10,     KC_F11,     KC_F12,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,      UP, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
+      _______, _______, _______,      KC_UP, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______,    LEFT,    DOWN,    RGHT, _______,    _______,      _______,       MPLY,    MNXT,    MUTE,    VOLD,    VOLU, _______,
+      _______, _______,    KC_LEFT,    KC_DOWN,    KC_RGHT, _______,    _______,      _______,       KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU, _______,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
      _______, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index 1bc87cb0a..e885dc78c 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -56,24 +56,3 @@
  { E50, E51 }, \
  { E60, E61 } \
 }
-#define KC________ KC_TRNS
-#define KC_RGB_MOD RGB_MOD
-#define KC_FN FN
-#define KC_ADJ ADJ
-#define LAYOUT_kc( \
-  L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15, L16, R16, R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45, \
-                           L55, L56, R56, R50 \
-  ) \
-  LAYOUT( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-    KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
-    KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, \
-                                                      KC_##L55, KC_##L56, KC_##R56, KC_##R50 \
-  )
diff --git a/keyboards/sentraq/s60_x/default/default.h b/keyboards/sentraq/s60_x/default/default.h
index e330d99bb..04f284171 100644
--- a/keyboards/sentraq/s60_x/default/default.h
+++ b/keyboards/sentraq/s60_x/default/default.h
@@ -103,21 +103,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, }  \
 }
-/*This special definition is used for S60-X keymaps that were ported from TMK
- * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended
- */
-#define LAYOUT_kc( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \
-) { \
-  { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \
-  { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, XXX      }, \
-  { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, XXX      }, \
-  { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
-  { KC_##K40, KC_##K41, KC_##K42, XXX,      XXX,      XXX,      KC_##K46, XXX,      XXX,      XXX,      KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, XXX      }  \
-}
diff --git a/keyboards/sentraq/s60_x/keymaps/custom/keymap.c b/keyboards/sentraq/s60_x/keymaps/custom/keymap.c
deleted file mode 100644
index c98d14349..000000000
--- a/keyboards/sentraq/s60_x/keymaps/custom/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-/* Main layer: Test layout, using all keys.
-      0     1     2     3     4     5     6     7     8     9     A     B     C     D     E
-   ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
- 0 │GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │PGUP │BKSPC│
-   ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- 1 │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-   ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- 2 │CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │PGDN │ENTER│█████│
-   ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- 3 │LSHFT│HOME │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │ END │RSHFT│  UP │
-   ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- 4 │LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│R_GUI│ APP │RCTRL│█████│
-   └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-*/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: ANSI qwerty */
-        LAYOUT_kc(GRV,    1,    2,    3,    4,    5,    6,    7,    8,    9,    0, MINS,  EQL, PGUP, BSPC, \
-           TAB,    Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P, LBRC, RBRC, BSLS,       \
-          CAPS,    A,    S,    D,    F,    G,    H,    J,    K,    L, SCLN, QUOT, PGDN, ENT ,       \
-          LSFT, HOME,    Z,    X,    C,    V,    B,    N,    M, COMM,  DOT, SLSH,  END, RSFT,   UP, \
-          LCTL, LGUI, LALT,                    SPC,                   RALT, RGUI,  APP, RCTL),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/custom/readme.md b/keyboards/sentraq/s60_x/keymaps/custom/readme.md
deleted file mode 100644
index 88ecdbbfc..000000000
--- a/keyboards/sentraq/s60_x/keymaps/custom/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### 8  Custom
-The custom keymap - [keymap.c](keymap.c) - is where I tested all the switches, not being concerned with a specific layout or layers. It's a plain layout option with the extra keys used on ISO & HHKB layouts being assigned some other keys.
-#### 8.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │PgUp │BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │PgDwn│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│Home │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │ End │Shift│  Up │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│ Alt │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c b/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
deleted file mode 100644
index cba307ba4..000000000
--- a/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
+++ /dev/null
@@ -1,180 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_MO4 MO(4)
-#define KC_MO6 MO(6)
-#define KC_MO7 MO(7)
-#define KC_LT5 LT(5, KC_SLSH)
-#define KC_LT6 LT(6, KC_SCLN)
-#define KC_MTRS MT(MOD_RSFT, KC_GRV)
-#define KC_DF0 DF(0)
-#define KC_DF1 DF(1)
-#define KC_DF2 DF(2)
-#define KC_DF3 DF(3)
-/*
- * Hasu
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap 0: Default Layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │ Fn2 │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │ Fn1 │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ Fn3 │ Fn3 │ Fn0 │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-        LAYOUT_kc(
-         ESC,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L,  LT6, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT,  LT5,   NO,  MTRS,   NO, \
-        LCTL, LGUI, LALT,                SPC,                 RALT,  MO6,  MO6,  MO4),
-    /* Keymap 1: colemak
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│BKSPC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│R_WIN│ APP │ Fn0 │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS, EQL,   NO, BSPC, \
-         TAB,    Q,    W,   F,   P,   G,   J,   L,   U,    Y, SCLN, LBRC, RBRC, BSLS,      \
-        BSPC,    A,    R,   S,   T,   D,   H,   N,   E,    I,    O, QUOT,   NO,  ENT,      \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   K,   M, COMM,  DOT, SLSH,   NO, RSFT,  NO, \
-        LCTL, LGUI, LALT,                SPC,                 RALT, RGUI,  APP,  MO4),
-    /* Keymap 2: dvorak
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│R_WIN│ APP │ FN0 │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,    3,   4,   5,   6,   7,   8,   9,   0, LBRC, RBRC,   NO, BSPC, \
-         TAB, QUOT, COMM,  DOT,   P,   Y,   F,   G,   C,   R,   L, SLSH,  EQL, BSLS,       \
-        CAPS,    A,    O,    E,   U,   I,   D,   H,   T,   N,   S, MINS,   NO,  ENT,       \
-        LSFT,   NO, SCLN,    Q,   J,   K,   X,   B,   M,   W,   V,    Z,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                 SPC,               RALT, RGUI,  APP,  MO4),
-    /* Keymap 3: workman
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  D  │  E  │  W  │  B  │  J  │  F  │  U  │  P  │  ;  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│BKSPC│  A  │  S  │  H  │  T  │  G  │  Y  │  N  │  E  │  O  │  I  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  M  │  C  │  V  │  K  │  L  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│R_WIN│ APP │ FN0 │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    D,   R,   W,   B,   J,   F,   U,    P, SCLN, LBRC, RBRC, BSLS,       \
-        BSPC,    A,    S,   H,   T,   G,   Y,   N,   E,    O,    I, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   M,   C,   V,   K,   L, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                SPC,                 RALT, RGUI,  APP,  MO4),
-    /* Overlay 4: HHKB mode
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│Grave│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│ Del │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Caps │     │     │     │     │     │     │     │ Psc │ Slk │Pause│ Up  │     │ Ins │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│ VoD │ VoU │Mute │     │     │NP_* │NP_/ │Home │PgUp │Left │Right│▒▒▒▒▒│Enter│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│     │     │     │     │     │NP_+ │NP_- │ End │PgDwn│Down │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████│Space│█████│█████│█████│R_ALT│R_GUI│ App │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS,  DEL, \
-        CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, SLCK, PAUS,   UP, TRNS,  INS,       \
-        LCTL, VOLD, VOLU, MUTE, TRNS, TRNS, PAST, PSLS, HOME, PGUP, LEFT, RGHT, TRNS,  ENT,       \
-        LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PPLS, PMNS,  END, PGDN, DOWN, TRNS, RSFT, TRNS, \
-        LCTL, LGUI, LALT,                    SPC,                   RALT, RGUI,  MO7, TRNS),
-    /* Overlay 5: Vi mode (Slash)
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│Grave│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│BkSpc│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ Tab │Home │PgDwn│ Up  │PgUp │ End │Home │PgDwn│PgUp │ End │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│     │Left │Down │Right│     │Left │Down │ Up  │Right│     │     │▒▒▒▒▒│Enter│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│     │     │     │     │     │Home │PgDwn│PgUp │ End │     │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████│Space│█████│█████│█████│R_ALT│R_GUI│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-         GRV, F1,     F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, BSPC, \
-         TAB, HOME, PGDN,   UP, PGUP,  END, HOME, PGDN, PGUP,  END, TRNS, TRNS, TRNS, TRNS,       \
-        LCTL, TRNS, LEFT, DOWN, RGHT, TRNS, LEFT, DOWN,   UP, RGHT, TRNS, TRNS, TRNS,  ENT,       \
-        LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP,  END, TRNS, TRNS, RSFT, TRNS, \
-        LCTL, LGUI, LALT,                    SPC,                   RALT, RGUI,  APP, RCTL),
-    /* Overlay 6: Mouse mode (Semicolon/App)
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│Grave│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│BkSpc│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ Tab │     │     │     │     │     │ MwL │ MwD │ MwU │ MwR │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│     │ Ac0 │ Ac1 │ Ac2 │     │ McL │ McD │ McU │ McR │     │     │▒▒▒▒▒│Enter│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSFHT│▒▒▒▒▒│     │     │     │     │ Mb3 │ Mb2 │ Mb1 │ Mb4 │ Mb5 │     │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████│ Mb1 │█████│█████│█████│     │     │     │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
-     */
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, BSPC, \
-         TAB, TRNS, TRNS, TRNS, TRNS, TRNS, WH_L, WH_D, WH_U, WH_R, TRNS, TRNS, TRNS, TRNS,       \
-        LCTL, TRNS, ACL0, ACL1, ACL2, TRNS, MS_L, MS_D, MS_U, MS_R, TRNS, TRNS, TRNS,  ENT,       \
-        LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, BTN3, BTN2, BTN1, BTN4, BTN5, TRNS, TRNS, RSFT, TRNS, \
-        LCTL, LGUI, LALT,                   BTN1,                   TRNS, TRNS, TRNS, RCTL),
-    /* Overlay 7: Layout selector
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Lq  │ Lc  │ Ld  │ Lw  │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Lq  │ Lw  │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │ Ld  │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │ Lc  │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-Lq: set Qwerty layout
-Lc: set Colemak layout
-Ld: set Dvorak layout
-Lw: set Workman layout
-    */
-    LAYOUT_kc(
-         DF0,  DF1,  DF2,  DF3, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS,  DF0,  DF3, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS,  DF2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS,  DF1, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/hasu/readme.md b/keyboards/sentraq/s60_x/keymaps/hasu/readme.md
deleted file mode 100644
index 7a8104472..000000000
--- a/keyboards/sentraq/s60_x/keymaps/hasu/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### 5. Hasu
-This is Hasu's favorite keymap with HHKB Fn, Vi cursor and Mousekey layer. See [keymap.c](keymap.c) for detail.
-(Hasu is the initial creator of the TMK firmware, in case you weren't aware.)
-\ No newline at end of file
diff --git a/keyboards/sentraq/s60_x/keymaps/hhkb/keymap.c b/keyboards/sentraq/s60_x/keymaps/hhkb/keymap.c
deleted file mode 100644
index 1ccefb6dd..000000000
--- a/keyboards/sentraq/s60_x/keymaps/hhkb/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_MO1 MO(1)
-/*
- * HHKB Layout
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: Default layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │  `  │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BkSpc│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Ctrl │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │ Fn3 │  '  │▒▒▒▒▒│Enter│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│ Fn  │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│▒▒▒▒▒│ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│▒▒▒▒▒│ Alt │ Gui │▒▒▒▒▒│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-        ESC,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL, BSLS, GRV, \
-        TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSPC,      \
-        LCTL,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,      \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT, MO1, \
-        NO, LGUI, LALT,                SPC,                   NO, RALT, RGUI,   NO),
-    /* 1: HHKB Fn layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Pwr │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │ Ins │ Del │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Caps │     │     │     │     │     │     │     │ Psc │ Slk │ Pus │ Up  │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ VoD │ VoU │ Mut │ Ejc │     │NP_* │NP_/ │Home │PgUp │Left │Right│▒▒▒▒▒│NPEnt│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │NP_+ │NP_- │ End │PgDwn│Down │▒▒▒▒▒│     │     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│▒▒▒▒▒│     │     │█████│█████│█████│     │█████│█████│█████│▒▒▒▒▒│     │     │▒▒▒▒▒│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-       PWR,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12,  INS,  DEL, \
-       CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, SLCK, PAUS,   UP, TRNS, TRNS,       \
-       TRNS, VOLD, VOLU, MUTE, EJCT, TRNS, PAST, PSLS, HOME, PGUP, LEFT, RGHT,   NO, PENT,       \
-       TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PPLS, PMNS,  END, PGDN, DOWN,   NO, TRNS, TRNS, \
-       TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/hhkb/readme.md b/keyboards/sentraq/s60_x/keymaps/hhkb/readme.md
deleted file mode 100644
index 08df14e48..000000000
--- a/keyboards/sentraq/s60_x/keymaps/hhkb/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-### 7. HHKB
-[keymap.c](keymap.c) emulates original HHKB layers.
-#### 7.0: Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │  `  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BkSpc│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │ Fn3 │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│ Fn  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │▒▒▒▒▒│ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│▒▒▒▒▒│ Alt │ Gui │▒▒▒▒▒│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 7.1: HHKB Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Pwr │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │ Ins │ Del │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │     │     │     │     │     │     │     │ Psc │ Slk │ Pus │ Up  │     │     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │ VoD │ VoU │ Mut │ Ejc │     │  *  │  /  │Home │PgUp │Left │Right│▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│     │     │     │     │     │  +  │  -  │ End │PgDwn│Down │▒▒▒▒▒│     │     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │▒▒▒▒▒│     │     │█████│█████│█████│     │█████│█████│█████│▒▒▒▒▒│     │     │▒▒▒▒▒│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/iso/keymap.c b/keyboards/sentraq/s60_x/keymaps/iso/keymap.c
deleted file mode 100644
index aec23f1ae..000000000
--- a/keyboards/sentraq/s60_x/keymaps/iso/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-/* 0: Main layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │▒▒▒▒▒│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │NUHS │ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│  \  │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ MO1 │ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-*/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: ANSI qwerty */
-    LAYOUT_kc(ESC,    1,    2,    3,    4,    5,    6,    7,    8,    9,    0, MINS,  EQL,   NO, BSPC, \
-           TAB,    Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P, LBRC, RBRC,   NO,       \
-          CAPS,    A,    S,    D,    F,    G,    H,    J,    K,    L, SCLN, QUOT, NUHS, ENT ,       \
-          LSFT, BSLS,    Z,    X,    C,    V,    B,    N,    M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-          LCTL, LGUI, LALT,                    SPC,                   RALT,  MO(1),APP, RCTL),
-/* 1: Fn layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│▒▒▒▒▒│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-*/
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS, TRNS,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, PGDN, PSCR, SLCK, PAUS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/iso/readme.md b/keyboards/sentraq/s60_x/keymaps/iso/readme.md
deleted file mode 100644
index 6b846617d..000000000
--- a/keyboards/sentraq/s60_x/keymaps/iso/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-### 2  Standard - ISO
-The same as the standard keymap, but with additional ISO keys.
-#### 2.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │▒▒▒▒▒│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │NUHS │ENTER│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LSHFT│  \  │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │RCTRL│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 2.1 Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│▒▒▒▒▒│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │     │     │     │     │     │     │     │     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c b/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
deleted file mode 100644
index 24182ad20..000000000
--- a/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright 2016 Julien Pecqueur <julien@peclu.net>
-Copyright 2016 Felix Uhl <ifreilicht@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/>.
-*/
-#include QMK_KEYBOARD_H
-#define KC_MO1 MO(1)
-#define KC_SPFN LT(1, KC_SPC)
-#define KC_SDEL S(KC_DEL)
-#define KC_CINS C(KC_INS)
-#define KC_SINS S(KC_INS)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        /* Layout 0: Default Layer
-        * ,-----------------------------------------------------------.
-        * |`  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-        * |-----------------------------------------------------------|
-        * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-        * |-----------------------------------------------------------|
-        * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
-        * |-----------------------------------------------------------|
-        * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-        * |-----------------------------------------------------------|
-        * |Fn1 |Gui |Alt |        SpaceFn         |Alt |Gui |App |Ctrl|
-        * `-----------------------------------------------------------'
-        */
-    LAYOUT_kc(
-                GRV,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    MINS,  EQL, BSPC, BSPC, \
-                TAB,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    LBRC, RBRC, BSLS, \
-                LCTL, A,    S,    D,    F,    G,    H,    J,    K,    L, SCLN,    QUOT, NUHS, ENT,  \
-                LSFT, NUBS, Z,    X,    C,    V,    B,    N,    M, COMM,  DOT,    SLSH,   NO, RSFT, NO, \
-                MO1,  LGUI, LALT,             SPFN,                         RALT, RGUI, APP,  RCTL),
-        /* Layout 1: Function Layer
-        * ,-----------------------------------------------------------.
-        * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
-        * |-----------------------------------------------------------|
-        * |     |Prv|Ply|Nxt|Stp|   |   |PUp|Up |PDn|   |Slk|Pau|Ins  |
-        * |-----------------------------------------------------------|
-        * |      |Vl-|Mut|Vl+|   |   |Hom|Lef|Dow|Rig|End|   |PEnt    |
-        * |-----------------------------------------------------------|
-        * |        |Prt|Cut|Cop|Pst|Cal|   |   |   |   |   |CapsLock  |
-        * |-----------------------------------------------------------|
-        * |    |    |    |                        |    |    |    |    |
-        * `-----------------------------------------------------------'
-        */
-    LAYOUT_kc(
-                ESC,  F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,   F10,  F11,  F12,  TRNS, DEL,  \
-                TRNS, MPRV, MPLY, MNXT, MSTP, TRNS, TRNS, PGUP, UP,   PGDN, TRNS, SLCK, PAUS, INS,  \
-                TRNS, VOLD, MUTE, VOLU, TRNS, TRNS, HOME, LEFT, DOWN, RGHT, END,  TRNS, TRNS, PENT, \
-                TRNS, TRNS, PSCR, SDEL, CINS, SINS, CALC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CAPS, TRNS, \
-                TRNS, TRNS, TRNS,             TRNS,                         TRNS, TRNS, TRNS, TRNS),
-};
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sentraq/s60_x/keymaps/jpec/readme.md b/keyboards/sentraq/s60_x/keymaps/jpec/readme.md
deleted file mode 100644
index 73318dad7..000000000
--- a/keyboards/sentraq/s60_x/keymaps/jpec/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for s60-x
-\ No newline at end of file
diff --git a/keyboards/sentraq/s60_x/keymaps/plain/keymap.c b/keyboards/sentraq/s60_x/keymaps/plain/keymap.c
deleted file mode 100644
index 3cdda7562..000000000
--- a/keyboards/sentraq/s60_x/keymaps/plain/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-/* Main layer:
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│R_GUI│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-*/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty */
-    LAYOUT_kc(ESC,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS, EQL,    NO, BSPC, \
-           TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-          CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT, NO,   ENT,        \
-          LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH, NO,   RSFT,   NO, \
-          LCTL, LGUI, LALT,                SPC,                 RALT, RGUI, APP,  RCTL),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/plain/readme.md b/keyboards/sentraq/s60_x/keymaps/plain/readme.md
deleted file mode 100644
index 402aa1bf9..000000000
--- a/keyboards/sentraq/s60_x/keymaps/plain/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-### 4. Plain
-Without any Fn layer this will be useful if you want to use key remapping tool like AHK on host.
-See [keymap.c](keymap.c) for detail.
-#### 4.0 Plain Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│ Alt │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/poker/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker/keymap.c
deleted file mode 100644
index 6286f2437..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_MO6 MO(6)
-#define KC_MO7 MO(7)
-#define KC_DF0 DF(0)
-#define KC_DF1 DF(1)
-#define KC_DF2 DF(2)
-#define KC_DF3 DF(3)
-#define KC_TG4 TG(4)
-#define KC_TG5 TG(5)
-#define KC_CSES C(S(KC_ESC))
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                SPC,                  MO6, RGUI,  APP, RCTL),
-    /* 1: colemak
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│BKSPC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS, EQL,   NO, BSPC, \
-         TAB,    Q,    W,   F,   P,   G,   J,   L,   U,    Y, SCLN, LBRC, RBRC, BSLS,      \
-        BSPC,    A,    R,   S,   T,   D,   H,   N,   E,    I,    O, QUOT,   NO,  ENT,      \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   K,   M, COMM,  DOT, SLSH,   NO, RSFT,  NO, \
-        LCTL, LGUI, LALT,                SPC,                  MO6, RGUI,  APP, RCTL),
-    /* 2: dvorak
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,    3,   4,   5,   6,   7,   8,   9,   0, LBRC, RBRC,   NO, BSPC, \
-         TAB, QUOT, COMM,  DOT,   P,   Y,   F,   G,   C,   R,   L, SLSH,  EQL, BSLS,       \
-        CAPS,    A,    O,    E,   U,   I,   D,   H,   T,   N,   S, MINS,   NO,  ENT,       \
-        LSFT,   NO, SCLN,    Q,   J,   K,   X,   B,   M,   W,   V,    Z,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                 SPC,                MO6, RGUI,  APP, RCTL),
-    /* 3: workman
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  D  │  E  │  W  │  B  │  J  │  F  │  U  │  P  │  ;  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│BKSPC│  A  │  S  │  H  │  T  │  G  │  Y  │  N  │  E  │  O  │  I  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  M  │  C  │  V  │  K  │  L  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    D,   R,   W,   B,   J,   F,   U,    P, SCLN, LBRC, RBRC, BSLS,       \
-        BSPC,    A,    S,   H,   T,   G,   Y,   N,   E,    O,    I, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   M,   C,   V,   K,   L, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                SPC,                  MO6, RGUI,  APP, RCTL),
-    /* 4: Poker with Arrow
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │Left │Down │Right│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,   UP, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, LEFT, DOWN, RGHT),
-    /* 5: Poker with Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-    /* 6: Poker Fn
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ FnQ │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │ FnL │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Tsk │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ FnS │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-Fn:  to Fn overlay
-FnL: to Layout selector overaly
-FnQ: toggle Esc overlay
-FnS: toggle Arrow overlay
-    */
-    LAYOUT_kc(
-        ESC,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS,  TG5,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS,  MO7,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                    TG4,                   TRNS, TRNS, TRNS, TRNS),
-    /* 7: Layout selector
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Lq  │ Lc  │ Ld  │ Lw  │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Lq  │ Lw  │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │ Ld  │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │ Lc  │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-Lq: set Qwerty layout
-Lc: set Colemak layout
-Ld: set Dvorak layout
-Lw: set Workman layout
-    */
-    LAYOUT_kc(
-        DF0,  DF1,  DF2,  DF3, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS,  DF0,  DF3, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS,  DF2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS,  DF1, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/poker/readme.md b/keyboards/sentraq/s60_x/keymaps/poker/readme.md
deleted file mode 100644
index 2fdc9d702..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### 3  Poker
-[keymap_poker](../poker/readme.md) emulates original Poker layers
-while both [keymap_poker_bit](../poker_bit/readme.md) and [keymap_poker_set](../poker_set/readme.md) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
-    Fn + Esc = `
-    Fn + {left, down, up, right}  = {home, pgdown, pgup, end}
-#### 3.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│ Fn  │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 3.1 Poker Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │ FnQ │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Tsk │ End │▒▒▒▒▒│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│ FnS │█████│█████│█████│ Fn  │Left │Down │Right│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/poker_bit/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker_bit/keymap.c
deleted file mode 100644
index a4ab412ee..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker_bit/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_TG5 TG(5)
-#define KC_TG6 TG(6)
-#define KC_CSES C(S(KC_ESC))
-// Poker fix with toggle and bit operation
-// Fn + Esc = `
-// Fn + {left, down, up, right}  = {home, pgdown, pgup, end}
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        LCTL,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                SPC,                  FN0, RGUI,  APP, RCTL),
-    /* 4: Poker Default + Fn'd
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Caps │ Fn2 │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Fn4 │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ Fn1 │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    [4] = LAYOUT_kc(
-        TRNS,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        CAPS,  TG6,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                    TG5,                   TRNS, TRNS, TRNS, TRNS),
-    /* 5: Poker with Arrow
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│PgUp │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│ Fn3 │Home │PgDwn│ End │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                    FN3, HOME, PGDN,  END),
-    /* 6: Poker with Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-    /* 7: Poker with Arrow + Fn'd
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │Left │Down │Right│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,   UP, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, LEFT, DOWN, RGHT),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    /* Poker Layout */
-    [0] = ACTION_LAYER_BIT_XOR(1, 0b0101, ON_BOTH),   // Poker Fn(with fix for Esc)
-    [3] = ACTION_LAYER_BIT_XOR(1, 0b1101, ON_BOTH),   // Poker Fn(with fix for Arrow)
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/poker_bit/readme.md b/keyboards/sentraq/s60_x/keymaps/poker_bit/readme.md
deleted file mode 100644
index 2fdc9d702..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker_bit/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### 3  Poker
-[keymap_poker](../poker/readme.md) emulates original Poker layers
-while both [keymap_poker_bit](../poker_bit/readme.md) and [keymap_poker_set](../poker_set/readme.md) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
-    Fn + Esc = `
-    Fn + {left, down, up, right}  = {home, pgdown, pgup, end}
-#### 3.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│ Fn  │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 3.1 Poker Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │ FnQ │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Tsk │ End │▒▒▒▒▒│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│ FnS │█████│█████│█████│ Fn  │Left │Down │Right│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/poker_set/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker_set/keymap.c
deleted file mode 100644
index 64678cd56..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker_set/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_CSES C(S(KC_ESC))
-// Poker fix with set(state transition)
-// Fn + Esc = `
-// Fn + {left, down, up, right}  = {home, pgdown, pgup, end}
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│GRAVE│  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_WIN│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│ Fn0 │R_WIN│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        LCTL,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                SPC,                  FN0, RGUI,  APP, RCTL),
-    /* 1: Poker with Arrow
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│ Fn1 │Left │Down │Right│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,   UP, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                    FN1, LEFT, DOWN, RGHT),
-    /* 2: Poker with Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│ Fn2 │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                    FN2, TRNS, TRNS, TRNS),
-    /* 3: Poker with Arrow and Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│ Fn3 │Left │Down │Right│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,   UP, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                    FN3, LEFT, DOWN, RGHT),
-    /* 4: Poker Fn'd
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Fn6 │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Fn8 │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ Fn5 │█████│█████│█████│ Fn4 │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS,  FN6,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS,  CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                    FN5,                    FN4, TRNS, TRNS, TRNS),
-    /* 5: Poker Fn'd arrow
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Fn7 │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Fn8 │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│PgUp │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ Fn4 │█████│█████│█████│ Fn5 │Home │PgDwn│ End │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         ESC,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS,  FN7,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS,  CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, PGUP, TRNS, \
-        TRNS, TRNS, TRNS,                    FN4,                    FN5, HOME, PGDN,  END),
-    /* 6: Poker Fn'd Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│Grave│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Fn4 │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Fn8 │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ Fn7 │█████│█████│█████│ Fn6 │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS,  FN4,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS,  CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                    FN7,                    FN6, TRNS, TRNS, TRNS),
-    /* 7: Poker Fn'd Arrow + Esc
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│Grave│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ Fn5 │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Fn8 │ End │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│PgUp │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│ Fn6 │█████│█████│█████│ Fn7 │Home │PgDwn│ End │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-    */
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS, TRNS, \
-        TRNS,  FN5,   UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, CALC, TRNS, HOME,  INS, TRNS,       \
-        TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, PSCR, SLCK, PAUS, TRNS, CSES,  END, TRNS, TRNS,       \
-        TRNS, TRNS,  DEL, TRNS, WHOM, MUTE, VOLU, VOLD, TRNS, PGUP, PGDN,  DEL, TRNS, PGUP, TRNS, \
-        TRNS, TRNS, TRNS,                    FN6,                    FN7, HOME, PGDN,  END),
-};
-/*
- * Fn action definition
- */
-const uint16_t PROGMEM fn_actions[] = {
-    /* Poker Layout */
-    [0] = ACTION_LAYER_SET(4, ON_PRESS),     // FN0 move to Fn'd             when press
-    [1] = ACTION_LAYER_SET(5, ON_PRESS),     // FN1 move to Fn'd arrow       when press
-    [2] = ACTION_LAYER_SET(6, ON_PRESS),     // FN2 move to Fn'd Esc         when press
-    [3] = ACTION_LAYER_SET(7, ON_PRESS),     // FN3 move to Fn'd arrow + Esc when press
-    //[4] = ACTION_LAYER_CLEAR(ON_RELEASE),    // FN4 clear overlay            when release
-    [4] = ACTION_LAYER_SET(0, ON_RELEASE),   // FN4 clear overlay            when release
-    [5] = ACTION_LAYER_SET(1, ON_RELEASE),   // FN5 move to arrow            when release
-    [6] = ACTION_LAYER_SET(2, ON_RELEASE),   // FN6 move to Esc              when release
-    [7] = ACTION_LAYER_SET(3, ON_RELEASE),   // FN7 move to arrow + Esc      when release
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/poker_set/readme.md b/keyboards/sentraq/s60_x/keymaps/poker_set/readme.md
deleted file mode 100644
index 2fdc9d702..000000000
--- a/keyboards/sentraq/s60_x/keymaps/poker_set/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### 3  Poker
-[keymap_poker](../poker/readme.md) emulates original Poker layers
-while both [keymap_poker_bit](../poker_bit/readme.md) and [keymap_poker_set](../poker_set/readme.md) implements same layout in different way and they fix a minor issue of original Poker and enhance arrow keys.
-    Fn + Esc = `
-    Fn + {left, down, up, right}  = {home, pgdown, pgup, end}
-#### 3.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│█████│Space│█████│█████│█████│ Fn  │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 3.1 Poker Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │ FnQ │ Up  │     │     │     │     │     │     │ Cal │     │Home │ Ins │     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │ Psc │ Slk │Pause│     │ Tsk │ End │▒▒▒▒▒│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│ Del │     │ Web │Mute │ VoU │ VoD │     │PgUp │PgDwn│ Del │▒▒▒▒▒│ Up  │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│ FnS │█████│█████│█████│ Fn  │Left │Down │Right│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c b/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
deleted file mode 100644
index 6ef273d1e..000000000
--- a/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-#define KC_LT1 LT(1, KC_SPC)
-/*
- * SpaceFN
- * http://geekhack.org/index.php?topic=51069.0
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap 0: Default Layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│LCTRL│L_GUI│L_ALT│█████│█████│█████Spc/Fn0█████│█████│█████│R_ALT│R_GUI│ APP │RCTRL│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-         ESC,    1,    2,   3,   4,   5,   6,   7,   8,    9,    0, MINS,  EQL,   NO, BSPC, \
-         TAB,    Q,    W,   E,   R,   T,   Y,   U,   I,    O,    P, LBRC, RBRC, BSLS,       \
-        CAPS,    A,    S,   D,   F,   G,   H,   J,   K,    L, SCLN, QUOT,   NO,  ENT,       \
-        LSFT,   NO,    Z,   X,   C,   V,   B,   N,   M, COMM,  DOT, SLSH,   NO, RSFT,   NO, \
-        LCTL, LGUI, LALT,                LT1,                 RALT, RGUI,  APP, RCTL),
-    /* Overlay 1: SpaceFN
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│  `  │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│ Del │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │ Esc │     │     │     │Home │ Up  │ End │Pscr │Slck │Pause│ Ins │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │     │     │     │PgUp │Left │Down │Right│     │     │▒▒▒▒▒│     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │▒▒▒▒▒│     │     │     │Space│PgDwn│  `  │  ~  │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-    LAYOUT_kc(
-         GRV,   F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12, TRNS,  DEL, \
-        TRNS, TRNS, TRNS,  ESC, TRNS, TRNS, TRNS, HOME,   UP,  END, PSCR, SLCK, PAUS,  INS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS,       \
-        TRNS, TRNS, TRNS, TRNS, TRNS,  SPC, PGDN,  GRV,  TILD, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
-        TRNS, TRNS, TRNS,                   TRNS,                   TRNS, TRNS, TRNS, TRNS),
-};
diff --git a/keyboards/sentraq/s60_x/keymaps/spacefn/readme.md b/keyboards/sentraq/s60_x/keymaps/spacefn/readme.md
deleted file mode 100644
index 3fe215afc..000000000
--- a/keyboards/sentraq/s60_x/keymaps/spacefn/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### 6. SpaceFN
-This layout proposed by spiceBar uses space bar to change layer with using Dual role key technique. See [keymap.c](keymap.c) and [SpaceFN discussion](http://geekhack.org/index.php?topic=51069.0).
-#### 6.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BkSpc│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Caps │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│Enter│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Shift│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│Shift│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │Ctrl │ Gui │ Alt │█████│█████│████ Space/Fn ███│█████│█████│ Alt │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 6.1 SpaceFN layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │  `  │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│ Del │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │     │     │     │     │Home │ Up  │ End │ Psc │ Slk │Pause│ Ins │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │     │     │     │PgUp │Left │Down │Right│     │     │▒▒▒▒▒│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│     │     │     │     │Space│PgDwn│  `  │  ~  │     │     │▒▒▒▒▒│     │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│ Fn  │█████│█████│█████│ Alt │ Gui │ App │Ctrl │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/sentraq/s60_x/rgb/rgb.h b/keyboards/sentraq/s60_x/rgb/rgb.h
index 59ffdfbbf..932aca624 100644
--- a/keyboards/sentraq/s60_x/rgb/rgb.h
+++ b/keyboards/sentraq/s60_x/rgb/rgb.h
@@ -76,21 +76,3 @@
    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, }, \
    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, }  \
 }
-/*This special definition is used for S60-X keymaps that were ported from TMK
- * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended
- */
-#define LAYOUT_kc( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \
-) { \
-  { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \
-  { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, XXX      }, \
-  { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, XXX      }, \
-  { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
-  { KC_##K40, KC_##K41, KC_##K42, XXX,      XXX,      XXX,      KC_##K46, XXX,      XXX,      XXX,      KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, XXX      }  \
-}
diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h
index aa8fc62aa..7af43fb6b 100644
--- a/keyboards/vision_division/keymaps/default/config.h
+++ b/keyboards/vision_division/keymaps/default/config.h
@@ -19,7 +19,7 @@
 #define MATRIX_COLS     GET_MATRIX_COLS(         NUMERIC_NORMAL,          NUMERIC_MAX_TEENSY)
 #define MATRIX_COL_PINS GET_MATRIX_COL_PINS(     NUMERIC_NORMAL,          NUMERIC_MAX_TEENSY)
-#define KEYMAP(MATRIX_LAYER, \
+#define LAYOUT(MATRIX_LAYER, \
      k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A,               k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C, \
      k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A,               k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C, \
      k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A,               k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, k31C, \
@@ -27,7 +27,7 @@
      k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A,               k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, k51C, \
      k601, k602, k603, k604,       k605, k606, k607, k608, k609, k60A,               k611, k612, k613, k614, k615, k616, k617, k618,       k619, k61A, k61B, k61C  \
 ) \
-KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          NUMERIC_MAX_TEENSY, \
+LAYOUT_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          NUMERIC_MAX_TEENSY, \
      k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, KC_NO, KC_NO, k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C, \
      k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, KC_NO, KC_NO, k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C, \
      k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A, KC_NO, KC_NO, k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, k31C, \
@@ -39,7 +39,7 @@ KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          NUMERI
 // Example Keymap Macros
 /*
-#define KEYMAP(MATRIX_LAYER, \
+#define LAYOUT(MATRIX_LAYER, \
      k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C, \
      k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C, \
      k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, k31C, \
@@ -47,7 +47,7 @@ KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          NUMERI
      k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, k51C, \
      k601, k602, k603, k604,       k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618,       k619, k61A, k61B, k61C  \
 ) \
-KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_MAX_TEENSY,      NUMERIC_MAX, \
+LAYOUT_MASTER(MATRIX_LAYER,                      NUMERIC_MAX_TEENSY,      NUMERIC_MAX, \
      k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \
      k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \
      k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \
@@ -58,7 +58,7 @@ KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_MAX_TEENSY,      NUMERI
 */
 /*
-#define KEYMAP(MATRIX_LAYER, \
+#define LAYOUT(MATRIX_LAYER, \
      k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, \
      k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, \
      k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A, k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, \
@@ -66,7 +66,7 @@ KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_MAX_TEENSY,      NUMERI
      k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A, k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, \
      k601, k602, k603, k604,       k605, k606, k607, k608, k609, k60A, k611, k612, k613, k614, k615, k616, k617, k618,       k619, k61A, k61B  \
 ) \
-KEYMAP_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          HOMING_MAX_TEENSY, \
+LAYOUT_MASTER(MATRIX_LAYER,                      NUMERIC_NORMAL,          HOMING_MAX_TEENSY, \
      k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, KC_NO, KC_NO, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, KC_NO, \
      k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, KC_NO, KC_NO, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, KC_NO, \
      k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, KC_NO, KC_NO, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, KC_NO, \
diff --git a/keyboards/vision_division/matrix_types.h b/keyboards/vision_division/matrix_types.h
index 893e5272a..460545ab0 100644
--- a/keyboards/vision_division/matrix_types.h
+++ b/keyboards/vision_division/matrix_types.h
@@ -107,47 +107,47 @@
 // Specialized Row Macros
-#define KEYMAP_ROW_LEFT_ABSENT(                   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)
+#define LAYOUT_ROW_LEFT_ABSENT(                   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)
-#define KEYMAP_ROW_LEFT_NUMERIC_MAX(              k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_LEFT_NUMERIC_MAX(              k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_LEFT_HOMING_MAX(               k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_LEFT_HOMING_MAX(               k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_LEFT_NUMERIC_EXTENDED(         k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_LEFT_NUMERIC_EXTENDED(         k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_LEFT_HOMING_EXTENDED(          k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_LEFT_HOMING_EXTENDED(          k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_LEFT_NUMERIC_NORMAL(           k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A
+#define LAYOUT_ROW_LEFT_NUMERIC_NORMAL(           k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A
-#define KEYMAP_ROW_LEFT_HOMING_NORMAL(            k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A
+#define LAYOUT_ROW_LEFT_HOMING_NORMAL(            k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A
-#define KEYMAP_ROW_LEFT_NUMERIC_MAX_TEENSY(       k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_LEFT_NUMERIC_MAX_TEENSY(       k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_LEFT_HOMING_MAX_TEENSY(        k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_LEFT_HOMING_MAX_TEENSY(        k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_LEFT_NUMERIC_EXTENDED_TEENSY(  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_LEFT_NUMERIC_EXTENDED_TEENSY(  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_LEFT_HOMING_EXTENDED_TEENSY(   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_LEFT_HOMING_EXTENDED_TEENSY(   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_LEFT_NUMERIC_NORMAL_TEENSY(    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A
+#define LAYOUT_ROW_LEFT_NUMERIC_NORMAL_TEENSY(    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A
-#define KEYMAP_ROW_LEFT_HOMING_NORMAL_TEENSY(     k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A
+#define LAYOUT_ROW_LEFT_HOMING_NORMAL_TEENSY(     k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A
-#define KEYMAP_ROW_RIGHT_ABSENT(                  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)
+#define LAYOUT_ROW_RIGHT_ABSENT(                  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)
-#define KEYMAP_ROW_RIGHT_NUMERIC_MAX(             k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_MAX(             k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_MAX(              k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_MAX(              k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_RIGHT_NUMERIC_EXTENDED(        k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_EXTENDED(        k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_EXTENDED(         k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_EXTENDED(         k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_RIGHT_NUMERIC_NORMAL(          k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_NORMAL(          k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_NORMAL(           k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_NORMAL(           k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_RIGHT_NUMERIC_MAX_TEENSY(      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_MAX_TEENSY(      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_MAX_TEENSY(       k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_MAX_TEENSY(       k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_RIGHT_NUMERIC_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_EXTENDED_TEENSY(  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_EXTENDED_TEENSY(  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)        k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B
-#define KEYMAP_ROW_RIGHT_NUMERIC_NORMAL_TEENSY(   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
+#define LAYOUT_ROW_RIGHT_NUMERIC_NORMAL_TEENSY(   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C
-#define KEYMAP_ROW_RIGHT_HOMING_NORMAL_TEENSY(    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B
+#define LAYOUT_ROW_RIGHT_HOMING_NORMAL_TEENSY(    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C)             k03, k04, k05, k06, k07, k08, k09, k0A, k0B
 // Changable Row Macro
-#define _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, \
+#define _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, \
  k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \
 ) \
-KEYMAP_ROW_LEFT_ ## _LEFT_TYPE(   k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C ), \
+LAYOUT_ROW_LEFT_ ## _LEFT_TYPE(   k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C ), \
-KEYMAP_ROW_RIGHT_ ## _RIGHT_TYPE( k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C )
+LAYOUT_ROW_RIGHT_ ## _RIGHT_TYPE( k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C )
 // Changable Master Macro
-#define KEYMAP_MASTER(_MATRIX_LAYER, _LEFT_TYPE, _RIGHT_TYPE, \
+#define LAYOUT_MASTER(_MATRIX_LAYER, _LEFT_TYPE, _RIGHT_TYPE, \
                                            k001, k002, k003, k004,       k005, k006, k007, k008, k009, k00A, k00B, k00C,       k011, k012, k013, k014, k015, k016, k017, k018,       k019, k01A, k01B, k01C, \
                                            k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, k10B, k10C,       k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C, \
                                            k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, k20B, k20C,       k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C, \
@@ -156,13 +156,13 @@ KEYMAP_ROW_RIGHT_ ## _RIGHT_TYPE( k011, k012, k013, k014, k015, k016, k017, k018
                                            k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A, k50B, k50C,       k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, k51C  \
 ) \
 [_MATRIX_LAYER] = { \
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k001, k002, k003, k004,       k005, k006, k007, k008, k009, k00A, k00B, k00C,       k011, k012, k013, k014, k015, k016, k017, k018,       k019, k01A, k01B, k01C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k001, k002, k003, k004,       k005, k006, k007, k008, k009, k00A, k00B, k00C,       k011, k012, k013, k014, k015, k016, k017, k018,       k019, k01A, k01B, k01C ) },\
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, k10B, k10C,       k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k101, k102, k103, k104,       k105, k106, k107, k108, k109, k10A, k10B, k10C,       k111, k112, k113, k114, k115, k116, k117, k118,       k119, k11A, k11B, k11C ) },\
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, k20B, k20C,       k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k201, k202, k203, k204,       k205, k206, k207, k208, k209, k20A, k20B, k20C,       k211, k212, k213, k214, k215, k216, k217, k218,       k219, k21A, k21B, k21C ) },\
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A, k30B, k30C,       k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, k31C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k301, k302, k303, k304,       k305, k306, k307, k308, k309, k30A, k30B, k30C,       k311, k312, k313, k314, k315, k316, k317, k318,       k319, k31A, k31B, k31C ) },\
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k401, k402, k403, k404,       k405, k406, k407, k408, k409, k40A, k40B, k40C,       k411, k412, k413, k414, k415, k416, k417, k418,       k419, k41A, k41B, k41C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k401, k402, k403, k404,       k405, k406, k407, k408, k409, k40A, k40B, k40C,       k411, k412, k413, k414, k415, k416, k417, k418,       k419, k41A, k41B, k41C ) },\
-    { _KEYMAP_ROW( _LEFT_TYPE, _RIGHT_TYPE, k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A, k50B, k50C,       k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, k51C ) },\
+    { _LAYOUT_ROW( _LEFT_TYPE, _RIGHT_TYPE, k501, k502, k503, k504,       k505, k506, k507, k508, k509, k50A, k50B, k50C,       k511, k512, k513, k514, k515, k516, k517, k518,       k519, k51A, k51B, k51C ) },\
 }
-#endif // MATRIX_TYPES_H
-\ No newline at end of file
+#endif // MATRIX_TYPES_H
diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h
index 4cdfe03ed..5cd03cfcf 100644
--- a/keyboards/vitamins_included/vitamins_included.h
+++ b/keyboards/vitamins_included/vitamins_included.h
@@ -33,20 +33,4 @@
                { R30, R31, R32, R33, R34, R35 } \
  }
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    KEYMAP( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-#define KC_LAYOUT_ortho_4x12 LAYOUT_kc
 #define LAYOUT_ortho_4x12 LAYOUT
-#define KC_KEYMAP LAYOUT_kc
diff --git a/keyboards/ymd96/keymaps/epx/keymap.c b/keyboards/ymd96/keymaps/epx/keymap.c
index 09ec665a3..cb353a08b 100644
--- a/keyboards/ymd96/keymaps/epx/keymap.c
+++ b/keyboards/ymd96/keymaps/epx/keymap.c
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _AR 1
 #define _RAISE 2
-#define KEYMAP LAYOUT_default
+#define LAYOUT LAYOUT_default
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 0, default layer
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * (Fn-Num Lock operates as conventional Num Lock in case the keyboard needs to be used with Windows or Linux.)
   * Caps Lock operates normally but it takes FN to work, the key is Ctrl by default, like in Model F.
   */
-  [_DEFLT] = KEYMAP(
+  [_DEFLT] = LAYOUT(
    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_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_BSPC, \
    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,          TO(_AR), KC_PSLS, KC_PAST, KC_PMNS, \
    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_PPLS, \
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *  ... | End  | Down | Pg Dn |       |
   *  ... |     Ins     |  Del  | Enter |
   */
-  [_AR] = KEYMAP(
+  [_AR] = LAYOUT(
    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, \
    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,       TO(_DEFLT), _x_, _x_, _x_, \
    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,          KC_HOME, KC_UP,   KC_PGUP, _x_, \
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   *  |              |      |      |      |      |      |      |      |      |      |      |                   |      |      |      |       |
   *  |       |       |       |                                             | Win Menu  |      |        |      |             |      |       |
   */ 
-  [_RAISE] = KEYMAP(
+  [_RAISE] = LAYOUT(
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_PAUS,  KC_SLCK, KC_MUTE, KC_MSTP, KC_DEL, \
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            KC_NLCK, _______, _______, _______, \
    _______, RGB_TOG, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, \
diff --git a/keyboards/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymd96/keymaps/hgoel89/keymap.c
index f612f79ba..cb7a3eb1e 100644
--- a/keyboards/ymd96/keymaps/hgoel89/keymap.c
+++ b/keyboards/ymd96/keymaps/hgoel89/keymap.c
@@ -27,7 +27,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 #define _DEFLT 0
 #define _RAISE 1
-#define KEYMAP LAYOUT_custom
+#define LAYOUT LAYOUT_custom
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        *  | Ctrl  |  Win  |  Alt  |                  Space                      |  Fn  |  Win | Left | Down |  Up  | Right|   0  |   .  |      | 12 keys
        */
        
-    [_DEFLT] = KEYMAP(
+    [_DEFLT] = LAYOUT(
                        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_PSCR, KC_HOME,    KC_END,     KC_INSERT,   KC_DELETE,      KC_PGUP, \
                        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_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_PMNS, \
                        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_NO, \
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        *  |              |      |      |      |      |      |      |      | VolDn| VolUp| Mute |     Play/Pause    |      |      |      |      |
        *  |       |       |       |                                             |      |      |MPrev |      |      | MNext|      |      |      |
        */ 
-        [_RAISE] = KEYMAP(
+        [_RAISE] = LAYOUT(
                        RESET,RGB_TOG,  BL_TOGG,  BL_STEP,    ______,  ______,  ______,  ______,  ______,  ______,  ______, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
                        ______,  BL_INC,  BL_DEC,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, \
                        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_F22,  KC_F23,  KC_F24,  ______,  ______,  ______,  ______,  ______, \
diff --git a/keyboards/zlant/zlant.h b/keyboards/zlant/zlant.h
index 6310a14e3..5fbc968ad 100755
--- a/keyboards/zlant/zlant.h
+++ b/keyboards/zlant/zlant.h
@@ -27,18 +27,6 @@
    { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \
 }
-#define LAYOUT_kc_ortho_4x12( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) LAYOUT( \
-    KC_##K000,  KC_##K001,  KC_##K002,  KC_##K003,  KC_##K004,  KC_##K005,  KC_##K006,  KC_##K007,  KC_##K008,  KC_##K009,  KC_##K010,  KC_##K011, \
-    KC_##K100,  KC_##K101,  KC_##K102,  KC_##K103,  KC_##K104,  KC_##K105,  KC_##K106,  KC_##K107,  KC_##K108,  KC_##K109,  KC_##K110,  KC_##K111, \
-    KC_##K200,  KC_##K201,  KC_##K202,  KC_##K203,  KC_##K204,  KC_##K205,  KC_##K206,  KC_##K207,  KC_##K208,  KC_##K209,  KC_##K210,  KC_##K211, \
-    KC_##K300,  KC_##K301,  KC_##K302,  KC_##K303,  KC_##K304,  KC_##K305,  KC_##K306,  KC_##K307,  KC_##K308,  KC_##K309,  KC_##K310,  KC_##K311  \
-)
 #define LAYOUT LAYOUT_ortho_4x12
 #endif
diff --git a/layouts/community/ortho_4x12/rs/keymap.c b/layouts/community/ortho_4x12/rs/keymap.c
index c6d6f14ca..a8a057f3d 100644
--- a/layouts/community/ortho_4x12/rs/keymap.c
+++ b/layouts/community/ortho_4x12/rs/keymap.c
@@ -24,29 +24,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // |------+------+------+------+------+------+------+------+------+------+------+------|
       LSFT ,   Z  ,   X  ,   C  ,   V  ,   B  ,   N  ,   M  , COMM ,  DOT , SLSH , ENTS ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      , LCTL , LALT , LGUI , SPC  , SPC  , BCOD ,  FN  ,      , LEFT , RGHT
+       TRNS , TRNS , LCTL , LALT , LGUI , SPC  , SPC  , BCOD ,  FN  , TRNS , LEFT , RGHT
  // `-----------------------------------------------------------------------------------'
  ),
  [_CODE] = LAYOUT_kc(
  // ,-----------------------------------------------------------------------------------.
-       GRV  , EXLM ,  AT  , HASH , DLR  , PERC , CIRC , LPLT , ASTR , RPGT , NEQL ,      ,
+       GRV  , EXLM ,  AT  , HASH , DLR  , PERC , CIRC , LPLT , ASTR , RPGT , NEQL , TRNS ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  1   ,  2   ,  3   ,  4   ,  5   , MINS , LBRC ,  UP  , RBRC ,      , BSLS ,
+       TRNS ,  1   ,  2   ,  3   ,  4   ,  5   , MINS , LBRC ,  UP  , RBRC , TRNS , BSLS ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  6   ,  7   ,  8   ,  9   ,  0   , AMPR , LEFT , DOWN , RGHT ,      , PIPE ,
+       TRNS ,  6   ,  7   ,  8   ,  9   ,  0   , AMPR , LEFT , DOWN , RGHT , TRNS , PIPE ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      , DOT  ,      ,      ,      ,      ,      ,      
+       TRNS , TRNS , TRNS , TRNS , TRNS , DOT  , TRNS , TRNS , TRNS , TRNS , TRNS , TRNS 
  // `-----------------------------------------------------------------------------------'
  ),
  [_FN] = LAYOUT_kc(
  // ,-----------------------------------------------------------------------------------.
-            ,  F1  ,  F2  ,  F3  ,  F4  ,  F5  ,  F6  ,  F7  ,  F8  ,  F9  , F10  , F11  ,
+       TRNS ,  F1  ,  F2  ,  F3  ,  F4  ,  F5  ,  F6  ,  F7  ,  F8  ,  F9  , F10  , F11  ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLUP ,      ,      ,      , BRMU , VOLU ,      , PGUP ,      ,      ,      ,
+       BLTG , BLUP , TRNS , TRNS , TRNS , BRMU , VOLU , TRNS , PGUP , TRNS , TRNS , TRNS ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLDN ,      ,      , RST  , BRMD , VOLD , CTRA , PGDN , CTRE ,      ,      ,
+       BLTG , BLDN , TRNS , TRNS , RST  , BRMD , VOLD , CTRA , PGDN , CTRE , TRNS , TRNS ,
  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      ,      , MUTE ,      ,      ,      ,      ,      
+       TRNS , TRNS , TRNS , TRNS , TRNS , TRNS , MUTE , TRNS , TRNS , TRNS , TRNS , TRNS 
  // `-----------------------------------------------------------------------------------'
  ),
 };
diff --git a/quantum/config_common.h b/quantum/config_common.h
index d93477b27..661609ef2 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -24,4 +24,7 @@
 #define COL2ROW 0
 #define ROW2COL 1
+// Deprecated alias - avoid using
+#define KEYMAP LAYOUT
 #include "song_list.h"
diff --git a/users/rs/rs.h b/users/rs/rs.h
index 722d6ed19..fde8c3355 100644
--- a/users/rs/rs.h
+++ b/users/rs/rs.h
@@ -18,8 +18,6 @@ enum custom_keycodes {
 #endif
 };
-#define KC_ KC_TRNS
 #define KC_ESCC MT(MOD_LCTL, KC_ESC)
 #define KC_ENTS MT(MOD_LSFT, KC_ENT)
 #define KC_LTGT LTGT // > or < with shift
@@ -47,4 +45,4 @@ enum custom_keycodes {
 #define KC_LVAI RGB_VAI
 #define KC_LVAD RGB_VAD
 #define KC_LMOD RGB_MOD
-#endif
-\ No newline at end of file
+#endif