Remove KEYMAP and LAYOUT_kc (#12160)

* alias KEYMAP to LAYOUT

* remove KEYMAP and LAYOUT_kc

12 files changed, 30 insertions, 621 deletions

diff --git a/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h b/keyboards/keebio/levinson/keymaps/bakingpy2u/config.h
deleted file mode 100644
index 1db6ea433f..0000000000
--- 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 6a6ab496ab..0000000000
--- 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 d7463419b4..0000000000
--- 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 d3e598bd09..0000000000
--- 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 ba005c0b25..0000000000
--- 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 8dab1c2745..0000000000
--- 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 f882c98b0b..0000000000
--- 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 3540947ac5..0000000000
--- 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 4d3d9a4f64..55ac74e9d8 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 b7c6b0a7f5..0000000000
--- 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 cbe86db373..0000000000
--- 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 1f54b32c48..0000000000
--- a/keyboards/keebio/levinson/keymaps/valgrahf/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-AUDIO_ENABLE = no