`develop` -> `master`, 2023q4 edition

119 files changed, 0 insertions, 13671 deletions

diff --git a/users/ericgebhart/base_layers/accents.h b/users/ericgebhart/base_layers/accents.h
deleted file mode 100644
index ad575da65c..0000000000
--- a/users/ericgebhart/base_layers/accents.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// probably best to have e and é on different fingers.
-
-// doesnt work, oled displays garbage
-/* #define CARTE_ACCENTED                          \ */
-/*   carte_de_map(" æœêùì  ¿ïüöë ",                \ */
-/*                " àôèéî  ûçñß^",                 \ */
-/*                " âöíúí       ") */
-
-// need to figure out a better way to display these on the oled.
-#define CARTE_ACCENTED                          \
-  carte_de_map(" aoeui  ?iuoe ",                \
-               " aoeei  ucnS^",                 \
-               " aoiúi       ")
-
-#define ___ACCENTED___                                                  \
-  LANG_MAP(_AE,   _OE,   _ECIR, _UGRV, _IGRV,   _IQUE, _IIAE, _UIAE, _OIAE, _EIAE, \
-           _AGRV, _OCIR, _EGRV, _EACU, _ICIR,   _UCIR, _CCED, _NTIL, _SS,   _DCIR, \
-           _AACU, _ODIA, _IACU, _UACU, _IACU,   _SPC,  _SPC,  _SPC , _SPC,  _SPC)
-
-
-// A dead key layer, optimized for Most common,
-// western european.
-#define CARTE_MORTE                             \
-  carte_de_map(" ˝˘̉   ̛ ˙° ",                    \
-               "/`^´  ¸¨~¤",                    \
-               " ,ˇ.  ˛µ¯")
-
-#define ___MORTE___                                                     \
-  LANG_MAP(_,     _DACU, _BREV, _HOKA, _,   _, _HORN, _DOTA, _RNGA, _,  \
-           _DSLS, _DGRV, _DCIR, _ACUT, _,   _, _CEDL, _DIAE, _DTIL, _CURR, \
-           _,     _DCMM, _CARN, _DOTB, _,   _, _OGON, _DGRK, _MACR, _)
-
-// Just taking a guess and putting the things I know are most
-// used in easy to use places., not sure about ntil and ss, put
-// them in their dvorak spots on the home row.
-
-/* #define CARTE_ACCENTS_MORTE                     \ */
-/*   carte_de_map(" æœêùì  ¿`^´ë ",                \ */
-/*                " àôèéî  ¸çñß~",                 \ */
-/*                " âö,úí   ¨ˇ°   ") */
-
-#define CARTE_ACCENTS_MORTE                     \
-  carte_de_map(" aoeui  ?`^'e ",                \
-               " aoeei  ,cnS~",                 \
-               " ao,ui   \"^o")
-
-#define ___ACCENTS_MORTE___                                             \
-  LANG_MAP(_AE,   _OE,    _ECIR,  _UGRV,  _IGRV,    _IQUE, _DGRV, _DCIR, _ACUT, _EIAE, \
-           _AGRV, _OCIR,  _EGRV,  _EACU,  _ICIR,    _CEDL, _CCED, _NTIL, _SS,   _DTIL, \
-           _AACU, _OIAE,  _DCMM,  _UACU,  _IACU,    _OGON, _DIAE, _CARN, _RNGA, _HORN)
-
-/* // DEAD layer. */
-/* BP_DCIR // ^ (dead) */
-/* BP_ACUT // ´ (dead) */
-/* BP_DGRV // ` (dead) */
-/* BP_CARN // ˇ (dead) */
-/* BP_DSLS // / (dead) */
-/* BP_BREV // ˘ (dead) */
-/* BP_DIAE // ¨ (dead) */
-/* BP_DTIL // ~ (dead) */
-/* BP_MACR // ¯ (dead) */
-/* BP_CEDL // ¸ (dead) */
-/* BP_RNGA // ° (dead) */
-/* BP_DGRK // µ (dead Greek key) */
-/* BP_OGON // ˛ (dead) */
-/* BP_DACU // ˝ (dead) */
-/* BP_DOTA // ˙ (dead) */
-/* BP_CURR // ¤ (dead) */
-/* BP_HORN // ̛  (dead) */
-/* BP_DCMM // , (dead) */
-/* BP_HOKA // ̉  (dead) */
-/* BP_DOTB // ̣  (dead) */
diff --git a/users/ericgebhart/base_layers/alt.h b/users/ericgebhart/base_layers/alt.h
deleted file mode 100644
index 28cf5ab738..0000000000
--- a/users/ericgebhart/base_layers/alt.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// e goes on the left thumb
-#define CARTE_MALTRON                           \
-  carte_de_map("   qpycb  vmuzl",               \
-               "   anisf  ctdor",               \
-               "   ;/jg,  .wk-x e")
-
-#define ___MALTRON___                                                   \
-  LANG_MAP(_Q,      _P,      _Y, _C, _B,       _V,     _M, _U, _Z,      _L, \
-           _A,      _N,      _I, _S, _F,       _D,     _T, _D, _O,      _R, \
-           TL_SCLN, TL_SLSH, _J, _G, TL_COMM,  TL_DOT, _W, _K, TL_MINS, _X)
-
-#define CARTE_EUCALYN                           \
-  carte_de_map("   /,.fq  aoeiu",               \
-               "   zxcvw  mrdyp",               \
-               "   gtksn  bhjl;")
-
-#define ___EUCALYN___                                                   \
-  LANG_MAP(TL_SLSH, TL_COMM, TL_DOT, _F, _Q,   _A, _O, _E, _I, _U,      \
-           _Z,      _X,      _C,     _V, _W,   _M, _R, _D, _Y, _P,      \
-           _G,      _T,      _K,     _S, _N,   _B, _H, _J, _L, TL_SCLN)
-
-
-
-// RSTHD
-/* j c y f k | z l , u q = */
-/* r s t h d | m n a i o - */
-/* / v g p b | x w . ; ' */
-/* e */
-
-// need a thumb cluster for this.
-// removed = and -, edge keys if you've got them.
-// e goes on left thumb
-
-#define CARTE_RSTHD                           \
-  carte_de_map("   jcyfk  zl,uq",             \
-               "   rsthd  mnaio",             \
-               "   /vgpb  xw.;' e")
-
-#define ___RSTHD___                                                     \
-  LANG_MAP(_J, _C, _Y, _F, _K,   _Z, _L, TL_COMM, _U,      _Q,          \
-           _R, _S, _T, _H, _D,   _M, _N, _A,      _I,      _O,          \
-           _/, _V, _G, _P, _B,   _X, _W, TL_DOT,  TL_SCLN, TL_QUOT)
-
-#define CARTE_HANDS_UP                    \
-  carte_de_map("  fyou,  kwclp",          \
-               "  hiea.  dtsrn",          \
-               "  bj'z;  vmgxq")
-
-#define ___HANDS_UP___                                         \
-  LANG_MAP(_F, _Y, _O,      _U, TL_COMM,   _K, _W, _C, _L, _P, \
-           _H, _I, _E,      _A, TL_DOT ,   _D, _T, _S, _R, _N, \
-           _B, _J, TL_QUOT, _Z, TL_SCLN,   _V, _M, _G, _X, _Q)
-
-#define CARTE_WHITE                             \
-  carte_de_map("  vyd,'  jmlu-",                \
-               "  atheb  csnoi",                \
-               "  pkgwq  xrf.z")
-
-#define ___WHITE___                                                     \
-  LANG_MAP(_V, _Y, _D, TL_COMM, TL_QUOT,   _J, _M, _L, _U,     _MINS,   \
-           _A, _T, _H, _E,      _B,        _C, _S, _N, _O,     _I,      \
-           _P, _K, _G, _W,      _Q,        _X, _R, _F, TL_DOT, _Z)
-
-
-#define CARTE_ISRT                              \
-  carte_de_map("  yclmk  zfu,'",                \
-               "  isrtg  pneao",                \
-               "  qvwdj  bh/.x")
-
-#define ___ISRT___                                                      \
-  LANG_MAP(_Y, _C, _L, _M, _K,   _Z, _F, _U,      TL_COMM, TL_QUOT,     \
-           _I, _S, _R, _T, _G,   _P, _N, _E,      _A,      _O,          \
-           _Q, _V, _W, _D, _J,   _B, _H, TL_SLSH, TL_DOT,  _X)
-
-#define CARTE_SOUL                              \
-  carte_de_map("  qwldp  kmuy;",                \
-               "  srtg   fneio",                \
-               "  zxcvj  bh,./")
-
-#define ___SOUL___                                                      \
-  LANG_MAP(_Q, _W, _L, _D, _P,   _K, _M, _U,      _Y,     TL_SCLN,      \
-           _A, _S, _R, _T, _G,   _F, _N, _E,      _I,     _O,           \
-           _Z, _X, _C, _V, _J,   _B, _H, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_NIRO                              \
-  carte_de_map("  qwudp  jfyl;",                \
-               "  asetg  hniro",                \
-               "  zxcvb  km,./")
-
-#define ___NIRO___                                                      \
-  LANG_MAP(_Q, _W, _U, _D, _P,   _J, _F, _Y,      _L,     TL_SCLN,      \
-           _A, _S, _E, _T, _G,   _H, _N, _I,      _R,     _O,           \
-           _Z, _X, _C, _V, _B,   _K, _M, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_ASSET                             \
-  carte_de_map("  qwjfg   ypul;",               \
-               "  asetd   hnior",               \
-               "  zxcvb   km,./")
-
-#define ___Asset___                                                     \
-  LANG_MAP(_Q, _W, _J, _F, _G,    _Y, _P, _U,      _L,     TL_SCLN,     \
-           _A, _S, _E, _T, _D,    _H, _N, _I,      _O,     _R,          \
-           _Z, _X, _C, _V, _B,    _K, _M, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_WHORF                             \
-  carte_de_map("flhdm  vwou,",                  \
-               "srntk  gyaei",                  \
-               "xjbzq  pc';. ")
-
-#define ___WHORF___                                                    \
-  LANG_MAP(_F, _L, _H, _D, _M,   _V, _W, _O,      _U,      TL_COMM,    \
-           _S, _R, _N, _T, _K,   _G, _Y, _A,      _E,      _I,         \
-           _X, _J, _B, _Z, _Q,   _P, _C, TL_QUOT, TL_SCLN, TL_DOT )
-
-#define CARTE_WHORF6                            \
-  carte_de_map("vlhkj  gwou.",                  \
-               "srntk  ydeai",                  \
-               "xqbfz  pc',; ")
-
-#define ___WHORF6___                                                    \
-  LANG_MAP(_V, _L, _H, _D, _M,   _G, _W, _O,      _U,      TL_DOT,      \
-           _S, _R, _N, _T, _K,   _Y, _D, _E,      _A,      _I,          \
-           _X, _Q, _B, _F, _Z,   _P, _C, TL_QUOT, TL_COMM, TL_SCLN )
-
-/* rsht/iena */
-/* jfldv @uopq */
-/* zrshtg   .iena: */
-/* xcmwk  /y,b?       */
-
-// pine
-/* y l r d w  j m o u ,  */
-/* c s n t g  p h a e i  */
-/* x z q v k  b f ' / .  */
diff --git a/users/ericgebhart/base_layers/base_layers.h b/users/ericgebhart/base_layers/base_layers.h
deleted file mode 100644
index ee784473fb..0000000000
--- a/users/ericgebhart/base_layers/base_layers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "keycodes.h"
-#include "lang_map.h"
-#include "oled_stuff.h"
-
-
-// an empty template.
-
-/* #define CARTE_EMPTY                \ */
-/*   carte_de_map("  ",               \ */
-/*                "  ",               \ */
-/*                "  ") */
-/*                      */
-/* #define ___EMPTY___                             \ */
-/*   LANG_MAP(_, _, _, _, _,   _, _, _, _, _,      \ */
-/*            _, _, _, _, _,   _, _, _, _, _,      \ */
-/*            _, _, _, _, _,   _, _, _, _, _)        */
-
-
-// dvorak, capewell-dvorak, ahei, and boo.
-#include "dvorak.h"
-//qwerty, workman, norman,
-#include "qwerty.h"
-// Colemak, halmak, minimak, etc.
-#include "maks.h"
-// eucalyn, maltron
-#include "alt.h"
-// mtgap, ctgap, apt
-#include "gap.h"
-// some hands down.
-#include "hands_down.h"
-// some beakls.
-#include "beakl.h"
-// bepo, optimot, beakl19bis, godox-fr?.
-#include "bepo.h"
-// some carpalxs.
-#include "carpalx.h"
-// The symbol, number function rows for all the above.
-#include "toprows.h"
-// some layers with accents and dead keys.
-#include "accents.h"
diff --git a/users/ericgebhart/base_layers/beakl.h b/users/ericgebhart/base_layers/beakl.h
deleted file mode 100644
index 58b5fa4371..0000000000
--- a/users/ericgebhart/base_layers/beakl.h
+++ /dev/null
@@ -1,158 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// beakl, balanced effort key layout.
-// Beakl 15 and 19 are somewhat more related.
-// Beakl-wi is the latest. It feels a little bit more like a system.
-
-
-// Remember the - and ; outside pinky keys.
-// Or use the 6 size.
-// Both are on the symbol layer too. So you
-// wont lose them at least.
-// KC_BK_COMM, KC_BK_QUOT, KC_BK_DOT - Beakl->Qwerty
-// BP_BK_COMM, BP_BK_QUOT, BP_BK_DOT - Beakl->Bepo
-// take care of the different shifted chars.
-
-
-/* BEAKL 27 (main layer): */
-/* // altered shifted pairs: dot = .`  comma = ,?   dquot = !" */
-/* Alt target is BK2 */
-
-/* 32104 76598 */
-/* qhoux gcmrv */
-/* yiea. dstnb */
-/* j",k' wflpz */
-
-/* BEAKL 27 (shift layer): */
-/*   !@$#% ^(*)& */
-/*   QHOUX GCMRV */
-/*   YIEA` DSTNB */
-/*   J!?K' WFLPZ */
-
-
-#define CARTE_BEAKL27                           \
-  carte_de_map(" qhoux gcmrz ",                 \
-               " yiea. dstnb ",                 \
-               " j\",k' wflpv ")
-
-// Alt target is BK
-#define ___BEAKL27___                                                   \
-  LANG_MAP(_Q, _H,      _O,      _U, _X,      _G, _C, _M, _R, _Z,       \
-           _Y, _I,      _E,      _A, TL_DOT,  _D, _S, _T, _N, _B,       \
-           _J, TL_EXLM, TL_COMM, _K, TL_QUOT, _W, _F, _L, _P, _V)
-
-/* BEAKL 15 (main layer): */
-// altered shifted pairs: quot = '`  comma = ,!   dot = .@
-/*   40123 76598   */
-#define CARTE_BEAKL15                           \
-  carte_de_map(" qhoux gcrfz ",                 \
-               " yiea. dstnb ",                 \
-               " j/,k' wmlpv ")
-
-// Alt target is BK
-#define ___BEAKL15___                                           \
-  LANG_MAP(_Q, _H,    _O,      _U, _X,      _G, _C, _R, _F, _Z, \
-           _Y, _I,    _E,      _A, TL_DOT,  _D, _S, _T, _N, _B, \
-           _J, _SLSH, TL_COMM, _K, TL_QUOT, _W, _M, _L, _P, _V)
-
-/* BEAKL 19    */
-// Beakl 19.  scores better than 15, better in french also.
-// Both are lots better than dvorak or bepo.
-
-/* same symbols and keypad as 15 */
-/* number row is different */
-/*  32104 76598  */
-
-// Alt target is BK
-#define CARTE_BEAKL19                           \
-  carte_de_map(" q.ouj wdnm, ",                 \
-               " haeik gsrtp ",                 \
-               " z'/yx bclfv ")
-
-#define ___BEAKL19___                                                   \
-  LANG_MAP(_Q, _DOT,  _O,    _U, _J, _W,    _D, _N, _M, TL_COMM,        \
-           _H, _A,    _E,    _I, _K, _G,    _S, _R, _T, _P,             \
-           _Z, _QUOT, _SLSH, _Y, _X, _B,    _C, _L, _F, _V)
-
-//BEAKL 19bis - original.
-// the é and è were simply added for analysis not real use.
-// even so, this layout scores well for french, better than
-// bepo and mtgap
-/*  qyouz  wdnck   */
-/* -hiea,  gtrsp; */
-/* èj'é.x  vmlfb   */
-
-// A 3x12
-//BEAKL 19bis mod z.
-// French optimised with some english.
-// This version rearranges things a little based on fequency.
-// Since it needs 3x12, I filled in the corners and removed ;.
-// Leaving y where it is. the o and the e might cause sfbs.
-// Put é on a different finger from e.
-// swap z, e's, add à, ^, and ê, swap ; for -.
-// it might be beneficial to swap w and à, as à is much more frequent than w
-#define CARTE_BEAKL19bis                        \
-  carte_de_map(" àqyoué  wdnck^ ",              \
-               " ;hiea,  gtrsp- ",              \
-               " zj'è.x  vmlfbê  ")
-
-#define ___BEAKL19bis_3x12___                                           \
-  LANG_MAP6(                                                            \
-            _AGRV, _Q, _Y,    _O,    _U,   _EACU,   _W, _D, _N, _C, _K, _DCIR, \
-            _SCLN, _H, _I,    _E,    _A,   _COMM,   _G, _T, _R, _S, _P, _MINS, \
-            _Z,    _J, _QUOT, _EGRV, _DOT, _X,      _V, _M, _L, _F, _B, _ECIR)
-
-
-// Beakl Wi.   This is the most current beakl this size. 18/01/2022.
-// Nothing on the 6th outer columns but layer toggle buttons. All 6.
-// altered shifted pairs: dot = .` comma = ,~  colon = :;
-// i is on the left thumb.
-/* ;you- ctrsv */
-/* qheaw gdnmz */
-/* j,.k' bplfx */
-/*    i        */
-
-#define CARTE_BEAKLWI                           \
-  carte_de_map(" ;you- ctrsv ",                 \
-               " qheaw gdnmz ",                 \
-               " j,.k' bplfx i")
-
-#define ___BEAKLWI___                                                   \
-  LANG_MAP(TL_COLN, _Y,      _O,     _U, _MINS,   _C, _T, _R, _S, _V,   \
-           _Q,      _H,      _E,     _A, _W,      _G, _D, _N, _M, _Z,   \
-           _J,      TL_COMM, TL_DOT, _K, _QUOT,   _B, _P, _L, _F, _X)
-
-// Thumbs.
-#define ___BEAKLWI_CRKBD_THUMBS___ LT_ESC, LT_I, LT_TAB,  LT_ENT, LT_SPC, LT_BSPC
-
-// My version, loses KC_mins, because it's easier on my symbol layer.
-// put I in it's dvorak spot instead of thumbs, move W up to make room for I.
-// I'd rather have w and i on different fingers. One domino...
-
-// beakl-wi - mod iw-
-
-#define CARTE_BEAKLWIa                          \
-  carte_de_map(" ;youw ctrsv ",                 \
-               " qheai gdnmz ",                 \
-               " j,.k' bplfx ")
-
-// Alt target is BKW
-#define ___BEAKLWIa___                                                  \
-  LANG_MAP(TL_COLN, _Y,      _O,     _U, _W,      _C, _T, _R, _S, _V,   \
-           _Q,      _H,      _E,     _A, _I,      _G, _D, _N, _M, _Z,   \
-           _J,      TL_COMM, TL_DOT, _K, _QUOT,   _B, _P, _L, _F, _X)
diff --git a/users/ericgebhart/base_layers/bepo.h b/users/ericgebhart/base_layers/bepo.h
deleted file mode 100644
index 64f56ec9ab..0000000000
--- a/users/ericgebhart/base_layers/bepo.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Maps based on BEPO  Mostly 3x12
-
-// BEAKL 19bis - English with French optimisations.
-// Least used letters in french xzykw QJÀ are fairly high.
-// XZ are good choices for pushing out, from english and french,
-// or using chords in both languages.
-
-// Note: The percentages came from different sources so do not
-// match between languages.
-// French
-/* Q	0.89 % */
-/* J	0.71 % */
-/* À	0.54 % */
-/*-------------*/
-/* X	0.42 % */
-/* È	0.35 % */
-/* Ê	0.24 % */
-/* Z	0.21 % */
-/* Y	0.19 % */
-/* K	0.16 % */
-/* Ô	0.07 % */
-/* Û	0.05 % */
-/* W	0.04 % */
-
-/* Least used letters in english. */
-/* X	0.2902%	1.48 */
-/* Z	0.2722%	1.39 */
-/* J	0.1965%	1.00 */
-/* Q	0.1962%	(1) */
-
-
-// OPtimot by @Pyjam.
-/*  àjoéb fdl’qxz */
-/*  aieu, ptsrn^ç */
-/* êkyè.w gcmhvz */
-
-// -- rearranged z, and ç to get 3x12
-#define CARTE_OPTIMOT                           \
-  carte_de_map(" çàjoéb fdl’qx ",               \
-               "  aieu, ptsrn^ ",               \
-               " êkyè.w gcmhvz ")
-
-#define ___OPTIMOT_3x12___                                              \
-  LANG_MAP6(                                                            \
-            _CCED, _AGRV, _J, _O,    _EACU, _B,     _F, _D, _L, _QUOT, _Q,  _X, \
-            _TAB,  _A,    _I, _E,    _U,    _COMM,  _P, _T, _S, _R,    _N,  _DCIR, \
-            _ECIR, _K,    _Y, _EGRV, _DOT,  _W,     _G, _C, _M, _H,    _V,  _Z)
-
-// no z or x. combos exist for them.
-#define CARTE_OPTIMOT_COMPACT                  \
-  carte_de_map(" àjoéb fdl’q ",                \
-               " aieu, ptsrn ",                \
-               " kyè.w gcmhv ")
-
-#define ___OPTIMOT_3x10___                                             \
-  LANG_MAP6(                                                           \
-            _AGRV, _J, _O,    _EACU, _B,     _F, _D, _L, _QUOT, _Q,    \
-            _A,    _I, _E,    _U,    _COMM,  _P, _T, _S, _R,    _N,    \
-            _K,    _Y, _EGRV, _DOT,  _W,     _G, _C, _M, _H,    _V,)
-
-// Maybe Use this for C
-//BP_C_CCED = MT(BP_CCED, BP_C)
-
-// BEPO
-
-// No quot, à or ç
-/* bépoè vdljz */
-/* auie, ctsrn */
-/* myx.k qghfw */
-#define CARTE_BEPOc                             \
-  carte_de_map("   bépoè  vdljz",               \
-               "   auie,  ctsrn",               \
-               "   myx.k  qghfw")
-
-#define ___BEPOc_3x10___                                        \
-  LANG_MAP(                                                     \
-           _B, _EACU, _P, _O,   _EGRV,    _V, _D, _L, _J, _Z,   \
-           _A, _U,    _I, _E,   _COMM,    _C, _T, _S, _R, _N,   \
-           _M, _Y,    _X, _DOT, _K,       _Q, _G, _H, _F, _W)
-
-
-#define CARTE_BEPO                              \
-  carte_de_map(" çbépoè ^vdljz ",               \
-               "  auie, ctsrnm ",               \
-               " êàyx.k ’qghfw ")
-
-#define ___BEPO_3x12___                                                 \
-  LANG_MAP6(_CCED, _B,    _EACU, _P, _O,   _EGRV,    _DCIR, _V, _D, _L, _J, _Z, \
-            _TAB,  _A,    _U,    _I, _E,   _COMM,    _C,    _T, _S, _R, _N, _M, \
-            _ECIR, _AGRV, _Y,    _X, _DOT, _K,       _QUOT, _Q, _G, _H, _F, _W)
-
-// dont like this one much.
-/* #define ___GODOX_3x12___                                                \ */
-/*   LANG_MAP6(___, _AGRV, _B, _EACU, _dot, _mins,    _DCIR, _V, _L,  _M, _X, _CCED, \ */
-/*             ___,  _O,   _U, _I,    _A,   _J,       _G,    _T, _S,  _N, _R, _F, \ */
-/*             ___, _Q,    _Y, _EGRV, _P,   _K,       _W,    _D, _UP, _H, _C, _Z) */
-/* // E goes on left thumb. */
diff --git a/users/ericgebhart/base_layers/carpalx.h b/users/ericgebhart/base_layers/carpalx.h
deleted file mode 100644
index ae2ed708a5..0000000000
--- a/users/ericgebhart/base_layers/carpalx.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#define CARTE_CARPALX_QFMLWY                    \
-  carte_de_map("   qfmlw  yuobj",               \
-               "   dstnr  iaeh;",               \
-               "   zvgcx  pk,./")
-
-#define ___CARPALX_QFMLWY___                                            \
-  LANG_MAP(_Q, _F, _M, _L, _W,   _Y, _U, _O,      _B,     _J,           \
-           _D, _S, _T, _N, _R,   _I, _A, _E,      _H,     TL_SCLN,      \
-           _Z, _V, _G, _C, _X,   _P, _K, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_CARPALX_QFMLWB                    \
-  carte_de_map("   qgmlw  byuv;",               \
-               "   dstnr  iaeoh",               \
-               "   zxcfj  kp,./")
-
-#define ___CARPALX_QGMLWB___                                            \
-  LANG_MAP(_Q, _G, _M, _L, _W,   _B, _Y, _U,      _V,     TL_SCLN,      \
-           _D, _S, _T, _N, _R,   _I, _A, _E,      _O,     _H,           \
-           _Z, _X, _C, _F, _J,   _K, _P, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_CARPALX_QGMLWY                    \
-  carte_de_map("   qgmlw  yfub;",               \
-               "   dstnr  iaeoh",               \
-               "   zxcvj  kp,./")
-
-#define ___CARPALX_QGMLWY___                                            \
-  LANG_MAP(_Q, _G, _M, _L, _W,   _Y, _F, _U,      _B,     TL_SCLN,      \
-           _D, _S, _T, _N, _R,   _I, _A, _E,      _O,     _H,           \
-           _Z, _X, _C, _V, _J,   _K, _P, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/dvorak.h b/users/ericgebhart/base_layers/dvorak.h
deleted file mode 100644
index 8deee2005c..0000000000
--- a/users/ericgebhart/base_layers/dvorak.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-#define CARTE_DVORAK                            \
-  carte_de_map(" ',.py fgcrl ",                 \
-               " aoeui dhtns ",                 \
-               " ;qjkx bmwvz ")
-
-#define ___DVORAK___                                                    \
-  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _C, _R, _L,    \
-           _A,       _O,      _E,     _U,  _I,   _D, _H, _T, _N, _S,    \
-           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
-
-#define CARTE_DVORAK_RLC_IU                     \
-  carte_de_map(" ',.py fgrlc ",                 \
-               " aoeiu dhtns ",                 \
-               " ;qjkx bmwvz ")
-
-#define ___DVORAK_RLC_IU___                                             \
-  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _R, _L, _C,    \
-           _A,       _O,      _E,     _I,  _U,   _D, _H, _T, _N, _S,    \
-           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
-
-#define CARTE_BOO                               \
-  carte_de_map("  ,.ucv  qfdly",                \
-               "  aoesg  bntri",                \
-               "  ;x'wz  phmkj")
-
-#define ___BOO___                                                       \
-  LANG_MAP( TL_COMM, TL_DOT, _U,      _C, _V,   _Q, _F, _D, _L, _Y,     \
-            _A,      _O,     _E,      _S, _G,   _B, _N, _T, _R, _I,     \
-            TL_SCLN, _X,     TL_QUOT, _W, _Z,   _P, _H, _M, _K, _J)
-
-#define CARTE_CAPEWELL_DVORAK                   \
-  carte_de_map( "  ',.py  qfgrk",               \
-                "  oaeiu  dhtns",               \
-                "  zxcvj  lmwb;")
-
-#define ___CAPEWELL_DVORAK___                                           \
-  LANG_MAP(TL_QUOT, TL_COMM, TL_DOT, _P, _Y,   _Q, _F, _G, _R, _K,      \
-           _O,      _A,      _E,     _I, _U,   _D, _H, _T, _N, _S,      \
-           _Z,      _X,      _C,     _V, _J,   _L, _M, _W, _B, TL_SCLN)
-
-//ahei - derived from dvorak.
-// x moved to left side. j on pinky.
-/*;pouyq gdlm/= */
-/* ahei, fstnr- */
-/* j'k.x bcwvz */
-
-#define CARTE_AHEI                              \
-  carte_de_map("pouyq  gdlm/",                  \
-               "ahei,  fstnr",                  \
-               "j'k.x  bcwvz")
-
-#define ___AHEI___                                                      \
-LANG_MAP(_P, _O,      _U, _Y,     _Q,       _G, _D, _L, _M, TL_SLSH, \
-         _A, _H,      _E, _I,     TL_COMM,  _F, _S, _T, _N, _R,      \
-         _J, TL_QUOT, _K, TL_DOT, _X,       _B, _C, _W, _V, _Z)
diff --git a/users/ericgebhart/base_layers/gap.h b/users/ericgebhart/base_layers/gap.h
deleted file mode 100644
index 76310bc6f9..0000000000
--- a/users/ericgebhart/base_layers/gap.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// an alternate I found.
-/* Reference: MTGAP */
-/* y p o u - | b d l c k j */
-/* i n e a , | m h t s r v */
-/* ( " ' . _ | ) f w g x */
-/*   z */
-
-#define CARTE_MTGAP                             \
-  carte_de_map("   ypouj  kdlcw",               \
-               "   inea,  mhtsr",               \
-               "   qz/.;  bfgvx")
-
-#define ___MTGAP___                                                     \
-  LANG_MAP(_Y, _P, _O,      _U,     _J,        _K, _D, _L, _C, _W,      \
-           _I, _N, _E,      _A,     TL_COMM,   _M, _H, _T, _S, _R,      \
-           _Q, _Z, TL_SLSH, TL_DOT, TL_SCLN,   _B, _F, _G, _V, _X)
-
-/* //APT v3*/
-/* https://github.com/Apsu/APT */
-#define CARTE_APT                               \
-  carte_de_map("   wgdfb  qluoy",               \
-               "   rsthk  jneai; ",             \
-               "   xcmpv  z,.'/")
-
-#define ___APT___                                                       \
-  LANG_MAP(_W, _G, _D, _F, _B,    _Q, _L, _U, _O, _Y,                   \
-           _R, _S, _T, _H, _K,    _J, _N, _E, _A, _I, TL_SCLN,          \
-           _X, _C, _M, _P, _V,    _Z, TL_COMM, TL_DOT, TL_QUOT, TL_SLSH)
-
-
-#define CARTE_CTGAP                             \
-  carte_de_map("  vplcf  kuoyj",                \
-               "  rntsd  'aeih",                \
-               "  zbmgw  x,.;q")
-
-#define ___CTGAP___                                                     \
-  LANG_MAP(_V, _P, _L, _C, _F,   _K,      _U,      _O,     _Y,      _J, \
-           _R, _N, _T, _S, _D,   TL_QUOT, _A,      _E,     _I,      _H, \
-           _Z, _B, _M, _G, _W,   _X,      TL_COMM, TL_DOT, TL_SCLN, _Q)
-
-#define CARTE_CANARY                                           \
-  carte_de_map( "  wlypb   zfou'",                                 \
-                "  crstg   mneia",                                 \
-                "  qjvd    kxh/,.")
-
-#define ___CANARY___                                                    \
-  LANG_MAP(_W, _L, _Y, _P, _B, _Z, _F, _O,      _U,      TL_QUOT,       \
-           _C, _R, _S, _T, _G, _M, _N, _E,      _I,      _A,            \
-           _Q, _J, _V, _D, _K, _X, _H, TL_SLSH, TL_COMM, TL_DOT)
diff --git a/users/ericgebhart/base_layers/hands_down.h b/users/ericgebhart/base_layers/hands_down.h
deleted file mode 100644
index 0841a358d2..0000000000
--- a/users/ericgebhart/base_layers/hands_down.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// https://sites.google.com/alanreiser.com/handsdown/home
-
-// The only 3x12 layout. The rest are 3x10.
-#define CARTE_HD_NEU                            \
-  carte_de_map( "  wfmpv  /.q\"'z",            \
-                "  rsntb  ,aeihj",             \
-                "  xcldg  -uoykK")
-
-#define ___HD_NEU___                                                    \
-  LANG_MAP(_SML_NAV,   _W, _F, _M, _P, _V , TL_SLSH, TL_DOT, _Q, TL_DQUO, TL_QUOT, _Z, \
-           _TAB,       _R, _S, _N, _T, _B , TL_COMM, _A,     _E, _I,      _H,    _J, \
-           _OS_ACCENT, _X, _C, _L, _D, _G , TL_MINS, _U,     _O, _Y,      _K, _SML_KEYPAD)
-
-
-// modified to fit 3x10.
-#define CARTE_HD_NEU_NARROW                     \
-  carte_de_map("   xcldb  zuoyq",               \
-               "   rsntg  ,aeih",               \
-               "   wfmpv  ;./jk")
-
-#define ___HD_NEU_NARROW___                                             \
-  LANG_MAP(_X, _C, _L, _D, _B,   _Z,      _U,     _O,      _Y, _Q,      \
-           _R, _S, _N, _T, _G,   TL_COMM, _A,     _E,      _I, _H,      \
-           _W, _F, _M, _P, _V,   _SCLN, TL_DOT, TL_SLSH, _J, _K)
-
-
-#define CARTE_HD_REF                            \
-  carte_de_map("    qchpv   kyoj/",             \
-               "    rsntg   wueia",             \
-               "    xmldb   zf',.")
-
-#define ___HD_REF___                                                    \
-  LANG_MAP(_Q, _C, _H, _P, _V,   _K, _Y, _O,      _J,       TL_SLSH,    \
-           _R, _S, _N, _T, _G,   _W, _U, _E,      _I,       _A,         \
-           _X, _M, _L, _D, _B,   _Z, _F, TL_QUOT, TL_COMM,  TL_DOT )
-
-
-// All of these have a consonant or vowel on the thumb keys.
-
-/* alt shift keys "? '!  dash and elan */
-/* (< {[  - elan                       */
-/* dash has thumbs of ,; and .:        */
-/* dash and the rest get these too.    */
-/* alt shifts   ;: .& /\* '? "! ,| -+  */
-/* COMBOS - z = jg, z=vg, q=uk, q=mp.  */
-
-
-// no z or q, use combos.
-#define CARTE_HD_TITANIUM                       \
-  carte_de_map("  jgmpv  ;./\"' ",              \
-               "  csntw  ,aeih ",               \
-               "  xfldb  -uoyk  r")
-
-#define ___HD_TITANIUM___                                               \
-  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_DQUO, TL_QUOT, \
-           _C, _S, _N, _T, _W , TL_COMM, _A, _E, _I, _H,                \
-           _X, _F, _L, _D, _B , TL_MINS, _U, _O, _Y, _K)
-
-
-#define CARTE_HD_GOLD                                           \
-  carte_de_map("  jgmpv  ;./\"' ",                              \
-               "  rsndb  ,aeih ",                               \
-               "  xflcw  -uoyk  t")
-
-#define ___HD_GOLD___                                                   \
-  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_DQUO, TL_QUOT, \
-           _R, _S, _N, _D, _B , TL_COMM, _A, _E, _I, _H,                \
-           _X, _F, _L, _C, _W , TL_MINS, _U, _O, _Y, _K)
-/* t, ␣ */
-
-/* jz pq alt shifts   ;: .& /\* '? "! ,| -+ */
-
-#define CARTE_HD_PLATINUM                       \
-  carte_de_map( "jghpv   ;./'\"",               \
-                "rsntb   ,aeic",                \
-                "xfmdk   -uowy  l")
-/* l   ␣   */
-
-#define ___HD_PLATINUM___                                               \
-  LANG_MAP(_J, _G, _H, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_QUOT, TL_DQUO, \
-           _R, _S, _N, _T, _B,  TL_COMM, _A, _E, _I, _C,                \
-           _X, _F, _M, _D, _K,  TL_MINS, _U, _O, _W, _Y)
-
-#define CARTE_HD_SILVER                         \
-  carte_de_map("jgmpv   ;./'\"",                \
-               "rshtb   ,aeic",                 \
-               "xfldk   -uowy  n")
-/* n   ␣   */
-
-#define ___HD_SILVER___                                 \
-  LANG_MAP(_J, _G, _M, _P, _V,  TL_SCLN, TL_DOT, TL_SLSH, TL_QUOT, TL_DQUO, \
-           _R, _S, _H, _T, _B,  TL_COMM, _A, _E, _I, _C,                \
-           _X, _F, _L, _D, _K,  TL_MINS, _U, _O, _W, _Y)
-
-#define CARTE_HD_BRONZE                         \
-  carte_de_map("jgmpv   ;./'\"",                \
-               "rsntb   ,aeic",                 \
-               "xfldk   -uowy  h")
-/* h   ␣   */
-
-#define ___HD_BRONZE___                                 \
-  LANG_MAP(_J, _G , _M, _P, _V , TL_SCLN, TL_DOT, TL_SLSH , TL_QUOT, TL_DQUO, \
-           _R, _S, _N, _T, _B , TL_COMM, _A, _E, _I, _C,                \
-           _X, _F, _L, _D, _K , TL_MINS, _U, _O, _W, _Y)
-
-#define CARTE_HD_ELAN                          \
-  carte_de_map("vghpk   /({'\"",               \
-               "rsntf   jaeci",                \
-               "xmldb   -uowy")
-/* ,; .:  ␣  ⏎ */
-
-/* vz g  h  p  kq  /\* (< {[ '! "? */
-/* TL_COMM; TL_DOT:  _␣  ⏎ */
-#define ___HD_ELAN___                                                   \
-  LANG_MAP(_V, _G, _H, _P, _K,   TL_SLSH, TL_LPRN, TL_LCBR, TL_QUOT, TL_DQUO, \
-           _R, _S, _N, _T, _F,   _J, _A, _E, _C, _I,                    \
-           _X, _M, _L, _D, _B,   TL_MINS, _U, _O, _W, _Y)
-
-
-#define CARTE_HD_DASH                          \
-    carte_de_map("jgmpv   ;.'\"/",             \
-                 "rsntb   ,haoi",              \
-                 "xcldw   -fuky  e")
-    /*   e   ␣   */
-
-#define ___HD_DASH___                                                   \
-  LANG_MAP(_J, _G, _M, _P, _V , TL_SCLN, TL_DOT, TL_QUOT, TL_DQUO, TL_SLSH, \
-           _R, _S, _N, _T, _B , TL_COMM, _H, _A, _O, _I,                \
-           _X, _C, _L, _D, _W , TL_MINS, _F, _U, _K, _Y)
diff --git a/users/ericgebhart/base_layers/keymaps.txt b/users/ericgebhart/base_layers/keymaps.txt
deleted file mode 100644
index 56dc7d79e3..0000000000
--- a/users/ericgebhart/base_layers/keymaps.txt
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-This file can be commented by blocks or single lines using //
-Blank lines are ignored
-*/
-/*
-Bigram frequencies in stats.csv
-*/
-
-[keys]
-L21 L22 L23 L24 L25 L26 R26 R25 R24 R23 R22 R21
-L31 L32 L33 L34 L35 L36 R36 R35 R34 R33 R32 R31
-L41 L42 L43 L44 L45 L46 R46 R45 R44 R43 R42 R41
-
-[weights]
-5.0 3.6 2.4 1.8 2.2 3.5 3.5 2.2 1.8 2.4 3.6 5.0
-4.0 1.6 1.2 1.0 1.0 3.0 3.0 1.0 1.0 1.2 1.6 4.0
-5.0 3.4 2.6 2.2 1.8 4.0 4.0 1.8 2.2 2.6 3.4 5.0
-
-/*
-Weights should:
-- limit weak fingers
-- limit bottom row
-- increase home row
-- limit finger travel distance
-
-https://colemakmods.github.io/mod-dh/compare.html
-*/
-
-[penalties]
-  ,same_row,row_jump1,row_jump2
-ii,      2.5,     3.5,      4.5  // same finger
-im,      0.5,     1.0,      2.0
-ir,      0.5,     0.8,      1.5
-ip,      0.5,     0.8,      1.1
-mi,     -1.5,    -0.5,      1.5  // inward roll
-mm,      2.5,     3.5,      4.5  // same finger
-mr,      0.5,     1.0,      2.0
-mp,      0.5,     0.8,      1.5
-ri,     -1.5,    -0.5,      1.5  // inward roll
-rm,     -2.0,    -0.5,      1.2  // inward roll
-rr,      2.5,     3.5,      4.5  // same finger
-rp,      1.0,     1.5,      2.5
-pi,     -1.0,     0.0,      1.0  // inward roll
-pm,     -1.0,     0.0,      1.5  // inward roll
-pr,     -1.0,     0.0,      1.5  // inward roll
-pp,      3.0,     4.0,      5.5  // same finger
-
-/*
-Only apply if not the same letter, and both letters on the same hand.
-
-i, m, r, and p refer to the fingers (index, middle, ring, pinky)
-The columns refer to how many rows separate the two keys
-
-Penalties should:
-- limit same finger typing (except same key twice)
-- balance hands
-- favor inward rolling
-(last 2 in opposition with each other)
-*/
-
-[layouts]
-
->>Qwerty
-# q w e r t y i o u p #
-é a s d f g h j k l ; '
-è z x c v b n m , . / -
-
->>Azerty
-è a z e r t y u i o p ^
-' q s d f g h j k l m ù
-é w x c v b n , . : ! -
-
->>Qwertz
-# q w e r t z u i o p ü
-é a s d f g h j k l ö ä
-è y x c v b n m , . - '
-
->>Bépo 40%
-# b é p o è ^ v d l j z
-- a u i e , c t s r n m
-ç à y x . k ' q g h f w
-
-// https://github.com/TeXitoi/keyberon#whats-the-layout
->>Bépo keyberon
-# b é p o è ^ v d l j z
-w a u i e , c t s r n m
-- à y x . k ' q g h f ç
-
->>Dvorak
-- ' , . p y f g c r l #
-é a o e u i d h t n s #
-è ; q j k x b m w v z #
-
->>Colemak
-# q w f p g j l u y ; #
-é a r s t d h n e i o '
-è z x c v b k m , . / -
-
->>Colemak DH
-# q w f p b j l u y ; #
-é a r s t g m n e i o '
-è z x c d v k h , . / -
-
->>Colemak DH mod
-# q w f p b j l u y é è
-# a r s t g m n e i o -
-# z x c d v k h , . ' /
-
->>Workman
-# q d r w b j f u p ; #
-é a s h t g y n e o i '
-è z x m c v k l , . / -
-
->>Norman
-# q w d f k j u r l ; #
-é a s e t g y n i o h '
-è z x c v b p m , . / -
-
->>Carpalx
-# q g m l w b y u v ; é
-è d s t n r i a e o h '
-# z x c f j k p , . / -
-
->>Neo
-- x v l c w k h g f q ß
-é u i a e o s n r t d y
-è ü ö ä p z b m , . j '
-
-// http://mkweb.bcgsc.ca/carpalx/?full_optimization
->>qgmlwyfub
-# q g m l w y f u b ; é
-è d s t n r i a e o h '
-# z x c v j k p , . / -
-
-// https://mathematicalmulticore.wordpress.com/the-keyboard-layout-project/
->>MTGAP
-# y p o u j k d l c w #
-é i n e a , m h t s r '
-è q z / . : b f g v x -
-
-// http://mtgap.bilfo.com/official_keyboard.html
-// http://mtgap.bilfo.com/completed_keyboard.html
->>MTGAP 2.0
-# , f h d k j c u l . #
-é o a n t g m s e r i -
-è q x b p z y w ' v ; #
-
->>MTGAP "Easy"
-# q w l d b j f u k p #
-é a s r t g h n e o i -
-è z x c v ; y m , . / '
-
->>MTGAP "shortcuts"
-# k g l d b j h u f . #
-é r o t s w m n e a i -
-è z x v c q y p , ' ; #
-
->>MTGAP "standard"
-# k l h c b j d u f . #
-é o r n s g w t e a i -
-è x q v m z y p , ' ; #
-
->>MTGAP "ergonomic"
-# . f u d j q h c w k #
-é i a e t p l n s r o -
-è ' , y g z - m b v x #
-
-// https://geekhack.org/index.php?topic=67604.0
->>Oneproduct
-# p l d w g j x o y q è
-- n r s t m u a e i h '
-# z c f v b , . ? ; k é
-
-// https://bepo.fr/wiki/Utilisateur:Bibidibop
->>Coeur
-# é w o p y b ' d l j z
-x a u e i , c t s r n h
-# - à è . k g m f q v #
-
-// https://geekhack.org/index.php?topic=98275.0
->>Kaehi
-# q w l d g j u o p / é
-è n r s t m k a e h i '
-# z x c v b y f , . ; -
-
-// https://deskthority.net/wiki/BEAKL
->>BEAKL 15
-é q h o u x g c r f z #
-- y i e a . d s t n b ;
-è j / , k ' w m l p v #
-
-// https://web.archive.org/web/20190906220509/http://shenafu.com/smf/index.php?topic=89.msg2566#msg2566
->>BEAKL 19
-é q . o u j w d n m , #
-- h a e i k g s r t p ;
-è z ' / y x b c l f v #
-
-// https://www.reddit.com/r/ErgoDoxEZ/comments/gsvpug/layout_of_the_month_beakl_15/ftcan68/?context=3
->>BEAKL 19bis
-# q y o u z w d n c k #
-- h i e a , g t r s p ;
-è j ' é . x v m l f b #
-
-// https://www.reddit.com/r/ErgoMechKeyboards/comments/j1eopm/hands_down_layout_is_ready_for_daily_use/g7bjmr7/?context=3
->>BEAKL 19 Opt French
-# w m r d v y u o q x #
-# g s n t p , i e a h -
-# k f l c b j é ' . z è
-
-// http://millikeys.sourceforge.net/asset/
->>ASSET
-# q w j f g y p u l ; #
-é a s e t d h n i o r '
-è z x c v b k m , . / -
-
-// https://sourceforge.net/projects/qwpr/
->>Qwpr
-# q w p r f y u k l ; #
-é a s d t g h n i o e '
-è z x c v b j m , . / -
-
-// http://www.minimak.org/
->>Minimak-8key
-# q w d r k y u i l p #
-é a s t f g h n e o ; '
-è z x c v b j m , . / -
-
-// https://github.com/mw8/white_keyboard_layout
-// adapted to ergo keyboard
->>White
-# v y d , ' j m l u ( )
-é a t h e b c s n o i -
-è p k g w q x r f . z #
-
-// https://github.com/jackrosenthal/threelayout
->>Three
-# q f u y z x k c w b #
-é o h e a i d r t n s -
-è , m . j ; g l p v ' #
-
-//https://sites.google.com/alanreiser.com/handsdown
->>Hands down
-# q c h g j y f o b ' #
-é s n r t p w u e i a #
-è x m l d z v k . , ; -
-
-//https://sites.google.com/alanreiser.com/handsdown
->>Notarize
-# q w d f p y u k l ' #
-é a s t e g h n i o r #
-è z x c v b j m . , ; -
-
-// http://kennetchaz.github.io/symmetric-typing/soul.html
->>Soul mod
-# q w l d p k m u y ; '
-è a s r t g f n e i o é
-# j z x c v b h , . / -
-
-// http://kennetchaz.github.io/symmetric-typing/niro.html
->>Niro mod
-# q w u d p j f y l ; #
-é a s e t g h n i r o '
-è b z x c v k m , . / -
-
-// https://docs.google.com/document/d/1yiCnIi1oagV1D8ZouMt-TRFRG8d6AfSBIwQkBvSflvY/edit
->>The-1
-# k m l u ? v d r ' q #
-é a t h e . c s n o i -
-è z p f j , b g w x y /
-
-// https://engram.dev
->>Engram 2.0
-# b y o u ' " l d w v z
-é c i e a , . h t s n q
-è g x j k - ? r m f p #
-
-// https://github.com/MadRabbit/halmak
->>Halmak
-# w l r b z ; q u d j #
-é s h n t , . a e o i '
-è f m v c / g p x k y -
-
-// https://keyboard-design.com/letterlayout.html?layout=optimal-digram.en.ansi
->>Optimal digram
-# q y u . , f m l d p z
-é s i e a o h n r t c g
-è j ) ' ? ( x v w k b -
-
-// https://keyboard-design.com/letterlayout.html?layout=uciea-keyboard.en.ansi
->>Uciea
-# p y u o - k d h f x q
-é c i e a ' g t n s r v
-è z " , . ; w m l b j -
-
-// https://keyboard-design.com/letterlayout.html?layout=x1.en.ergodox
-// . and , moved
->>x1
-# k y o ' ! f c l p q z
-é h i e a u d s t n r v
-è j ? . , # w g m b x -
diff --git a/users/ericgebhart/base_layers/maks.h b/users/ericgebhart/base_layers/maks.h
deleted file mode 100644
index 6f78819421..0000000000
--- a/users/ericgebhart/base_layers/maks.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#define CARTE_COLEMAK                           \
-  carte_de_map("   qwfpg  jluy;",               \
-               "   arstd  hneio",               \
-               "   zxcvb  km,./")
-
-#define ___COLEMAK___                                                   \
-  LANG_MAP(_Q, _W, _F, _P, _G,    _J, _L,  _U,      _Y,     TL_SCLN,    \
-           _A, _R, _S, _T, _D,    _H, _N,  _E,      _I,     _O,         \
-           _Z, _X, _C, _V, _B,    _K, _M,  TL_COMM, TL_DOT, TL_SLSH)
-
-
-#define CARTE_COLEMAK_DH                        \
-  carte_de_map("   qwfpb  jluy;",               \
-               "   arstg  mneio",               \
-               "   zxcdv  kh,./")
-
-#define ___COLEMAK_DH___                                                \
-  LANG_MAP(_Q, _W, _F, _P, _B,    _J, _L, _U,      _Y,     TL_SCLN,     \
-           _A, _R, _S, _T, _G,    _M, _N, _E,      _I,     _O,          \
-           _Z, _X, _C, _D, _V,    _K, _H, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_HALMAK                            \
-  carte_de_map("  wlrbz  ;qudj",                \
-               "  shnt,  .aeoi",                \
-               "  fmvc/  gpxky")
-
-#define ___HALMAK___                                            \
-  LANG_MAP(_W, _L, _R, _B, _Z,        TL_SCLN, _Q, _U, _D, _J,  \
-           _S, _H, _N, _T, TL_COMM,   _DOT,    _A, _E, _O, _I,  \
-           _F, _M, _V, _C, TL_SLSH,   _G,      _P, _X, _K, _Y)
-
-#define CARTE_MINIMAK                           \
-  carte_de_map("  qwdrk  yuiop",                \
-               "  astfg  hjel;",                \
-               "  zxcvb  nm,./")
-
-#define ___MINIMAK___                                                   \
-  LANG_MAP(_Q, _W, _D, _R, _K,   _Y, _U, _I,      _O,     _P,           \
-           _A, _S, _T, _F, _G,   _H, _J, _E,      _L,     TL_SCLN,      \
-           _Z, _X, _C, _V, _B,   _N, _M, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_MINIMAK_8                         \
-  carte_de_map("  qwdrk  yuilp",                \
-               "  astfg  hneo;",                \
-               "  zxcvb  jm,./")
-
-#define ___MINIMAK_8___                                                 \
-  LANG_MAP(_Q, _W, _D, _R, _K,   _Y, _U, _I,      _L,     _P,           \
-           _A, _S, _T, _F, _G,   _H, _N, _E,      _O,     TL_SCLN,      \
-           _Z, _X, _C, _V, _B,   _J, _M, TL_COMM, TL_DOT, TL_SLSH)
-
-
-#define CARTE_MINIMAK_12                        \
-  carte_de_map("  qwdfk  yuil;",                \
-               "  astrg  hneop",                \
-               "  zxcvb  jm,./")
-
-#define ___MINIMAK_12___                                                \
-  LANG_MAP(_Q, _W, _D, _F, _K,   _Y, _U, _I,      _L,     _SCLN,        \
-           _A, _S, _T, _R, _G,   _H, _N, _E,      _O,     _P,           \
-           _Z, _X, _C, _V, _B,   _J, _M, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/qwerty.h b/users/ericgebhart/base_layers/qwerty.h
deleted file mode 100644
index 47aead197c..0000000000
--- a/users/ericgebhart/base_layers/qwerty.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// Layer for combo reference. Make more than one by changing lang is.
-#define ___COMBO_REF___                                                 \
-  LANG_MAP(_1L1,  _1L2, _1L3, _1L4,  _1L5,   _1R1, _1R2, _1R3, _1R4, _1R5, \
-           _2L1,  _2L2, _2L3, _2L4,  _2L5,   _2R1, _2R2, _2R3, _2R4, _2R5, \
-           _3L1,  _3L2, _3L3, _3L4,  _3L5,   _3R1, _3R2, _3R3, _3R4, _3R5)
-
-
-#define CARTE_QWERTY                            \
-  carte_de_map("   qwert  yuiop",               \
-               "   asdfg  hjkl;",               \
-               "   zxcvb  nm,./")
-
-// Need TLKC around comm, dot, and quot, and scln
-// Qwerty based layers that I don't really use.
-#define ___QWERTY___                                                    \
-  LANG_MAP(_Q, _W, _E, _R, _T, _Y,  _U,  _I,      _O,     _P,           \
-           _A, _S, _D, _F, _G, _H,  _J,  _K,      _L,     TL_SCLN,      \
-           _Z, _X, _C, _V, _B, _N,  _M,  TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_AZERTY                           \
-  carte_de_map("   azert  yuiop",               \
-               "   qsdfg  hjkl;",               \
-               "   wxcvb  nm,./")
-
-// Need TLKC around comm, dot, and quot, and scln
-// Qwerty based layers that I don't really use.
-#define ___AZERTY___                                                    \
-  LANG_MAP(_A, _Z, _E, _R, _T, _Y,  _U,  _I,      _O,     _P,           \
-           _Q, _S, _D, _F, _G, _H,  _J,  _K,      _L,     TL_SCLN,      \
-           _W, _X, _C, _V, _B, _N,  _M,  TL_COMM, TL_DOT, TL_SLSH)
-
-
-
-#define CARTE_WORKMAN                           \
-  carte_de_map("   qdrwb  jfup;",               \
-               "   ashtg  yneio",               \
-               "   zxmcv  kl,./")
-
-#define ___WORKMAN___                                                   \
-  LANG_MAP(_Q, _D, _R, _W, _B,   _J, _F, _U,      _P,     _SCLN,        \
-           _A, _S, _H, _T, _G,   _Y, _N, _E,      _O,     _I,           \
-           _Z, _X, _M, _C, _V,   _K, _L, TL_COMM, TL_DOT, TL_SLSH)
-
-#define CARTE_NORMAN                            \
-  carte_de_map("   qwdfk  jurl;",               \
-               "   asetg  yniou",               \
-               "   zxcvb  pm,./")
-#define ___NORMAN___                                                    \
-  LANG_MAP(_Q, _W, _D, _F, _K,   _J, _U, _R,      _L,     TL_SCLN,      \
-           _A, _S, _E, _T, _G,   _Y, _N, _I,      _O,     _U,           \
-           _Z, _X, _C, _V, _B,   _P, _M, TL_COMM, TL_DOT, TL_SLSH)
diff --git a/users/ericgebhart/base_layers/toprows.h b/users/ericgebhart/base_layers/toprows.h
deleted file mode 100644
index ba32118537..0000000000
--- a/users/ericgebhart/base_layers/toprows.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-/*******************************************************************/
-/** TOP ROWS  Func,Symbols, Numbers you find there.               **/
-/*******************************************************************/
-// ltkc  language target keycode DV, BK, BKW, NONE
-//   _1 = DV_1 or _1 = BP_DV_1 or KC_1
-#define ___10_NUMBERS___                                \
-  LANG_ROW(_1, _2, _3, _4, _5, _6, _7, _8, _9, _0)
-
-/*  40123 76598  */
-#define ___10_NUMBERS_BEAKL15___                        \
-  LANG_ROW(_4, _0, _1, _2, _3, _7, _6, _5, _9, _8)
-
-/*  32104 76598  */
-#define ___10_NUMBERS_BEAKL19___                        \
-  LANG_ROW(_3, _2, _1, _0, _4, _7, _6, _5, _9, _8)
-
-// a top symbol row if someone wants it.
-#define ___10_SYMBOLS___                                                \
-  LANG_ROW(_EXLM, _AT, _HASH, _DLR, _PERC, _CIRC, _AMPR, _ASTR, _LPRN, _RPRN)
-
-// standard bepo top row
-#define ___10_SYMBOLS_BEPO___                                           \
-  LANG_ROW(_DQUO, _LDAQ, _RDAQ, _LPRN, _RPRN, _AT, _PLUS, _MINS, _SLSH, _ASTR)
-
-#define ___12_SYMBOLS_BEPO___                           \
-  LANG_ROW12(_DLR, _DQUO, _LDAQ, _RDAQ, _LPRN, _RPRN,   \
-             _AT,  _PLUS, _MINS, _SLSH, _ASTR, _EQL)
-
-// function key rows work for everyone.
-#define ___10_FUNCS___                                                  \
-  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
-
-#define ___12_FUNCS___ ___10_FUNCS___, KC_F11, KC_F12
-
-#define ___10_FUNCS_BEAKL15___                  \
-  KC_F4,   KC_F10,   KC_F1,   KC_F2,   KC_F3,   \
-    KC_F7,   KC_F6,   KC_F5,   KC_F9,   KC_F8
-
-#define ___12_FUNCS_BEAKL15___ KC_F11, ___10_FUNCS_BEAKL15___, KC_F12
diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h
deleted file mode 100644
index fe0f41327d..0000000000
--- a/users/ericgebhart/config.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 USERSPACE_CONFIG_H
-#define USERSPACE_CONFIG_H
-
-// pro-micro v3's don't always detect otherwise.
-/* #define SPLIT_USB_DETECT */
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-// Sets good default for the speed of the mouse.
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#undef MOUSEKEY_WHEEL_DELAY
-
-#define MOUSEKEY_WHEEL_MAX_SPEED    5
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
-#define MOUSEKEY_WHEEL_DELAY        100
-
-#undef TAPPING_TOGGLE
-#undef TAPPING_TERM
-
-#define TAPPING_TOGGLE  2
-#define TAPPING_TERM    200
-
-
-#define TAP_HOLD_TERM    200
-#define COMBO_MUST_HOLD_MODS
-#define COMBO_HOLD_TERM 150
-#define TAP_CODE_DELAY 5  // for send string with delay
-
-// change the behavior of Mod taps for HRMs.
-// #define GLOBAL_QUICK_TAP
-
- /* Control switches for my keymaps. */
- /* if needed, this goes in the keyboard's config.h */
- /* Alternately, fix the number row in the layout template. */
-/* #define BASE_NUMBER_ROW    // turn on 4 row base templates. */
-
-// Extensions, turn them on and off.
-#define USERSPACE_H "ericgebhart.h"
-
-// Layout definitions, which language, thumb cluster, mod layer.
-// Columns in and out.
-
-// the default. set it, use it, set it back.
-// US_INT // EN, BEPO, US_INT
-#define LANG_IS US_INT
-#define DEFAULT_LANG US_INT
-#define DEFAULT_LANG_NAME " us"
-
-// Enable a second locale, for another set of layers.
-// This will add bepo versions of all layers chosen.
-/* #define SECOND_LOCALE BEPO */
-/* #define SECOND_LOCALE_NAME " bepo" */
-
-// Choose a mod layer. Can be changed per layer.
-// TRNS, ALT, HRS_NAV HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
-#define MODS_ARE HRS_NAV
-#define DEFAULT_MODS MODS_ARE
-
-// Choose a thumb cluster.
-// WI, WIa, DEFAULT, TEST, TRNS, MODS, LAYERS, MODS_LAYERS,
-// MIRYOKU, MIRYOKU_TR, MODS_LAYERS_NAV,
-// The following use THUMB_LETTER to place a letter on the Thumbs.
-// for use with the hands down metals, maltron, and rsthd.
-// HD, HDA, HD_SIMPLE, TH_LTR, HD_DASH,
-// MIRYOKU_TR_LTR, MIRYOKU_LTR
-#define THUMBS_ARE DEFAULT
-#define DEFAULT_THUMBS DEFAULT
-
-// pick the edge key set. normie, no kc, smart locks or test.
-// NORM, NOKC, SML, TEST
-#define EDGE_KEY_SET_IS SML
-#define DEFAULT_EDGE_SET SML
-
-// for the base layers which need a thumb cluster which takes a letter.
-#define HANDS_DOWN_LTR_THUMBS_ARE TH_LTR
-#define MALTRON_LTR_THUMBS_ARE TH_LTR
-#define RSTHD_LTR_THUMBS_ARE TH_LTR
-
-// layout io, matrix size.
-// a reasonable default for most keyboards.
-// give a 3x10 and get a 3x12, managed in keyboards/keyboards.h
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// OLED STUFF.
-#define OLED_CUSTOM_ENABLE // custom oled here.
-//#define OLED_LOGO_ENABLE // turn on/off the logo.
-#define KEYLOGGER_ENABLE // 1500 bytes, track and print keypress info to oled.
-//#define SPLIT_LAYER_STATE_ENABLE  // to sync state between sides.
-
-// EXTENSIONS
-
-// Combos
-#define COMBO_REF_LAYER_ENABLE
-// #define COMBO_REF_LAYER_TWO_ENABLE
-// works if you know the number of your layer.
-// otherwise set and use them later.
-// #define COMBO_ONLY_FROM_LAYER 2
-// #define COMBO_REF_DEFAULT 2
-
-
-// Console key logging for creation of heatmaps, etc.
-// CONSOLE must be enabled for this to work.
-// To create Precondition's heat maps, from console key logging
-// with hid_listen or qmk console
-//#define CONSOLE_KEY_LOGGER_ENABLE  // turn on keylogging for heat maps.
-
-#define ALT_LOCAL_ENABLE // alternate key combinations, with mods as needed.
-#define ACCENTED_KEYS_ENABLE // direct access to altgr keys.
-
-#define SMART_LOCK_ENABLE // smart lock layers and mods.
-//#define MOD_LOCK_ENABLE  // smart lock mods, similar/overlapping with Smart lock.
-#define NSHOT_ENABLE // smart n-shot for count.
-//#define ONESHOT_MOD_ENABLE  // oneshot mods, similar/overlapping with nshots
-
-#define TAP_HOLD_ENABLE // tap for one thing, hold for tapping term to get another.
-//#define SWAPPER_ENABLE // enable swapper keys.
-#define NOT_DEAD_ENABLE // make undead versions (US_DQUO_ND) of dead keys.
-//#define ALT_SHIFT_ENABLE // alternate shift behaviors for existing keys.
-//#define SEND_STRING_ENABLE // Turn on send string keys
-//#define SEND_UNICODE_ENABLE // Unicode must be enabled for this to work.
-
-
-// Turn on the base layers do not exceed 4 if doing two locales.
-// That will likely push a layer past 15 and then it will
-// no longer work with the LT macro.
-
-// dvorak and relatives
-#define DVORAK_LAYER_ENABLE
-//#define DVORAK_RLC_IU_LAYER_ENABLE
-//#define CAPEWELL_DVORAK_LAYER_ENABLE
-//#define AHEI_LAYER_ENABLE
-//#define BOO_LAYER_ENABLE
-
-// qwerty and derivitives
-//#define QWERTY_LAYER_ENABLE
-//#define AZERTY_LAYER_ENABLE
-//#define WORKMAN_LAYER_ENABLE
-//#define NORMAN_LAYER_ENABLE
-
-// COLEMAK and relatives
-//#define COLEMAK_LAYER_ENABLE
-//#define COLEMAK_DH_LAYER_ENABLE
-//#define HALMAK_LAYER_ENABLE
-//#define MINIMAK_LAYER_ENABLE
-//#define MINIMAK_8_LAYER_ENABLE
-//#define MINIMAK_12_LAYER_ENABLE
-
-// BEAKL
-// #define BEAKL15_LAYER_ENABLE
-//#define BEAKL19_LAYER_ENABLE
-//#define BEAKL27_LAYER_ENABLE
-//#define BEAKLWI_LAYER_ENABLE
-
-// carpalx layouts
-//#define CARPALX_QFMLWY_LAYER_ENABLE
-//#define CARPALX_QGMLWB_LAYER_ENABLE
-//#define CARPALX_QGMLWY_LAYER_ENABLE
-
-// alternate layouts
-//#define MALTRON_LAYER_ENABLE
-//#define EUCALYN_LAYER_ENABLE
-//#define HANDS_UP_LAYER_ENABLE
-//#define RSTHD_LAYER_ENABLE
-//#define HANDS_UP_LAYER_ENABLE
-//#define WHITE_LAYER_ENABLE
-//#define ISRT_LAYER_ENABLE
-//#define SOUL_LAYER_ENABLE
-//#define NIRO_LAYER_ENABLE
-//#define ASSET_LAYER_ENABLE
-//#define WHORF_LAYER_ENABLE
-//#define WHORF6_LAYER_ENABLE
-
-// mtgap and relatives
-//#define MTGAP_LAYER_ENABLE
-//#define CTGAP_LAYER_ENABLE
-//#define APT_LAYER_ENABLE
-//#define CANARY_LAYER_ENABLE
-
-// Hands down
-#define HD_NEU_NARROW_LAYER_ENABLE
-//#define HD_REF_LAYER_ENABLE
-//#define HD_DASH_LAYER_ENABLE
-//#define HD_ELAN_LAYER_ENABLE
-//#define HD_BRONZE_LAYER_ENABLE
-//#define HD_SILVER_LAYER_ENABLE
-//#define HD_PLATINUM_LAYER_ENABLE
-//#define HD_GOLD_LAYER_ENABLE
-//#define HD_TITANIUM_LAYER_ENABLE
-
-// A compact optimot for 3x10.
-// requires accent characters.
-//#define OPTIMOT_COMPACT_LAYER_ENABLE
-
-// 3x12 sized base layers
-//--------------------------
-//#define HD_NEU_LAYER_ENABLE
-
-// Optimized for french
-// All these have accent characters on base layer.
-// so these dont work for En, but do for US-international and Bepo.
-
-//#define BEPO_LAYER_ENABLE
-//#define OPTIMOT_LAYER_ENABLE
-//#define BEAKL19bis_LAYER_ENABLE
-
-
-// enable transient function layers.
-#define SYMBOL_LAYER_ENABLE
-#define NAV_LAYER_ENABLE
-// #define MOUSE_LAYER_ENABLE
-#define TOPROWS_LAYER_ENABLE
-// #define LAYERS_LAYER_ENABLE - defunct. always on.
-#define KEYPAD_LAYER_ENABLE
-//#define ADJUST_LAYER_ENABLE
-//#define RGB_LAYER_ENABLE
-//#define MEDIA_LAYER_ENABLE
-//#define FUNC_LAYER_ENABLE
-
-
-// define alternate thumb definitions for the transient layers.
-#define MEDIA_LAYER_THUMBS MEDIA_THUMBS
-#define MOUSE_LAYER_THUMBS MOUSE_THUMBS
-#define NAV_LAYER_THUMBS TRNS_THUMBS
-#define KEYPAD_LAYER_THUMBS KEYPAD_THUMBS
-#define SYMB_LAYER_THUMBS SYMB_THUMBS
-#define TOPROWS_LAYER_THUMBS DEFAULT
-
-// Extra character layers.
-// Bepo has dead keys (altgr) and accented keycodes
-// A layer of accented keys
-// #define ACCENTS_LAYER_ENABLE
-// A layer of dead keys
-// #define MORTE_LAYER_ENABLE
-// A layer of the most popular accented keys and dead keys
-#define ACCENTS_MORTE_LAYER_ENABLE
-
-// Functional layer choices.
-/* configure the function layers. */
-/* They have to be turned on above. */
-/* Choose one of each as desired. */
-/* There are reasonable defaults */
-/* for each if nothing is defined. */
-
-/* nav */
-//#define NAV_FULL  // monolithic, two sided nav with mouse and arrows.
-#define NAV_FULL_LOCK_MODS // Replace left mouse buttons with lockmods.
-
-// Just the non mouse bits, with lock mods, n-shot mods on the left.
-// if mousekeys enabled, adds a mouse layer accessible via smart lock.
-// #define NAV_NO_MOUSE
-// #define NAV_MIRYOKU
-// #define NAV_MOUSE_MIRYOKU
-
-
-/* keypads */
-// beakl keypads are usual, if not chosen, regular keypads will be used.
-// left side is the default.
-// Beakl, except for WI, is only on the left side.
-// Miryoku is on the left also.
-
-//#define KEYPAD_RIGHT
-#define KEYPAD_BEAKL        // beakl doesn't have a rightside, swap hands?
-//#define KEYPAD_MODS      //  give mods on the other side instead of funcs.
-//#define KEYPAD_BEAKL_WI  //  right side with hexpad on left.
-//#define KEYPAD_MIRYOKU   //  use the miryoku keypad
-// the default if nothing chosen,
-// is a functionpad on the left and normal keypad on the right.
-
-// funcpad from miryoku
-// #define FUNCPAD_MIRYOKU
-
-
-/* symbols */
-// pick one of these or get the default.
-//#define SYMBOL_BEAKL         // original - the default if nothing else.
-//#define SYMBOL_BEAKL_EXT     // extended for non beakl base layers.
-//#define SYMBOL_BEAKL_EXT_VI  // extended with vi keybinding in mind.
-#define SYMBOL_BEAKL_C         // more alterations by frequency
-// #define SYMBOL_NEO             // The symbol layer from the Neo layout.
-// #define SYMBOL_MIRYOKU      // minimalist symbols after miryoku
-//#define SYMBOL_BEAKL_WI      // original wi
-
-
-/* toprows. */
-// The default, if not defined, is a standard qwerty set of rows.
-// symbols, numbers, function keys. Numbers on the home row.
-
-// #define TOPROWS_BKL_15_NUMS  // center row with Beakl15 order. 40123 76598.
-// #define TOPROWS_BKL_19_NUMS // Beakl 19 order: 32104  76598
-#define TOPROWS_MOD  // beakl 15 nums, oneshot and smart lock mods. no Fkeys.
-
-
-#endif
diff --git a/users/ericgebhart/defs/accented_keys.def b/users/ericgebhart/defs/accented_keys.def
deleted file mode 100644
index a0b203be93..0000000000
--- a/users/ericgebhart/defs/accented_keys.def
+++ /dev/null
@@ -1,101 +0,0 @@
-// Accented keys.
-// add them to the custom keys enum.
-// List them here, with their keycode and the accent keycode
-// that are needed to create them.
-
-
-// Last, most frequent letters in french.
-// é is further up.
-// 24	x	3 588 990	0.38%
-// 25	j	3 276 064	0.34%
-// 26	è	2 969 466	0.31%
-// 27	à	2 966 029	0.31%
-// 28	k	2 747 547	0.29%
-// 29	w	1 653 435	0.17%
-// 30	z	1 433 913	0.15%
-// 31	ê	802 211	0.08%
-// 32	ç	544 509	0.06%
-// 33	ô	357 197	0.04%
-// 34	â	320 837	0.03%
-// 35	î	280 201	0.03%
-// 36	û	164 516	0.02%
-// 37	ù	151 236	0.02%
-// 38	ï	138 221	0.01%
-// 39	á	73 751	0.01%	 - absent.
-// 79	ü	55 172	0.01%
-// 82	ë	53 862	0.01%
-//absent.
-// 83	ö	51 020	0.01%
-// 84	í	48 391	0.01%
-
- // ACCENT
-// Custom key code,  Keycode, altgr accent keycode.
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
-ACCENTED(BP_OCIR, BP_O, BP_DCIR)
-ACCENTED(BP_ACIR, BP_A, BP_DCIR)
-ACCENTED(BP_ICIR, BP_I, BP_DCIR)
-ACCENTED(BP_UCIR, BP_U, BP_DCIR)
-//ACCENTED(BP_CCIR, BP_C, BP_DCIR)
-//ACCENTED(BP_GCIR, BP_G, BP_DCIR)
-//ACCENTED(BP_HCIR, BP_H, BP_DCIR)
-#endif
-
-ACCENTED(US_OCIR, US_O, US_DCIR)
-ACCENTED(US_ACIR, US_A, US_DCIR)
-ACCENTED(US_ICIR, US_I, US_DCIR)
-ACCENTED(US_UCIR, US_U, US_DCIR)
-ACCENTED(US_ECIR, US_E, US_DCIR)
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
-ACCENTED(BP_AACU, BP_A, BP_ACUT)
-ACCENTED(BP_OACU, BP_O, BP_ACUT)
-ACCENTED(BP_IACU, BP_I, BP_ACUT)
-ACCENTED(BP_UACU, BP_U, BP_ACUT)
-
-//ACCENTED(BP_OGRV, BP_O, BP_DGRV)
-ACCENTED(BP_IGRV, BP_I, BP_DGRV)
-#endif
-
-ACCENTED(US_IGRV, US_I, US_DGRV)
-ACCENTED(US_UGRV, US_U, US_DGRV)
-ACCENTED(US_EGRV, US_E, US_DGRV)
-ACCENTED(US_AGRV, US_A, US_DGRV)
-
-// ACCENTED(BP_NTIL, BP_N, BP_DTIL)
-// ACCENTED(BP_ATIL, BP_A, BP_DTIL)
-// ACCENTED(BP_OTIL, BP_O, BP_DTIL)
-// ACCENTED(BP_UTIL, BP_U, BP_DTIL)
-
-ACCENTED(US_IIAE, US_I, US_DIAE)
-ACCENTED(US_UIAE, US_U, US_DIAE)
-ACCENTED(US_EIAE, US_E, US_DIAE)
-ACCENTED(US_OIAE, US_O, US_DIAE)
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
-ACCENTED(BP_IIAE, BP_I, BP_DIAE)
-ACCENTED(BP_UIAE, BP_U, BP_DIAE)
-ACCENTED(BP_EIAE, BP_E, BP_DIAE)
-ACCENTED(BP_OIAE, BP_O, BP_DIAE)
-// ACCENTED(BP_AIAE, BP_A, BP_DIAE)
-#endif
-
-  // ACCENTED(E_ACUTE, SK_E, SK_ACUT)
-  // ACCENTED(R_ACUTE, SK_R, SK_ACUT)
-  // ACCENTED(U_ACUTE, SK_U, SK_ACUT)
-  // ACCENTED(I_ACUTE, SK_I, SK_ACUT)
-  // ACCENTED(O_ACUTE, SK_O, SK_ACUT)
-  // ACCENTED(A_ACUTE, SK_A, SK_ACUT)
-  // ACCENTED(L_ACUTE, SK_L, SK_ACUT)
-  // ACCENTED(Y_ACUTE, SK_Z, SK_ACUT)
-  // ACCENTED(T_CARON, SK_T, SK_CARN)
-  // ACCENTED(Z_CARON, SK_Y, SK_CARN)
-  // ACCENTED(O_CARON, SK_O, SK_CARN)
-  // ACCENTED(S_CARON, SK_S, SK_CARN)
-  // ACCENTED(D_CARON, SK_D, SK_CARN)
-  // ACCENTED(L_CARON, SK_L, SK_CARN)
-  // ACCENTED(C_CARON, SK_C, SK_CARN)
-  // ACCENTED(N_CARON, SK_N, SK_CARN)
-  // ACCENTED(U_UMLAU, SK_U, SK_DIAE
-  // ACCENTED(O_UMLAU,SK_O, SK_DIAE)
-  // // napis o s vokanom cez vokan rather than normalne aby sa dalo velke uo
-  // ACCENTED(O_CCIRC, SK_O, SK_CIRC)
diff --git a/users/ericgebhart/defs/alt_shift.def b/users/ericgebhart/defs/alt_shift.def
deleted file mode 100644
index 52d9cf11f4..0000000000
--- a/users/ericgebhart/defs/alt_shift.def
+++ /dev/null
@@ -1,6 +0,0 @@
-// alt shift. Give an existing key code,
-// and maybe an alternate shift keycode.
-
-ALT_SHIFT(US_EXLM, US_PERC)
-SHIFT_FOR_2(US_AT)
-SHIFT_FOR_3(US_DLR)
diff --git a/users/ericgebhart/defs/altlocal_keys.def b/users/ericgebhart/defs/altlocal_keys.def
deleted file mode 100644
index 20d1e99b40..0000000000
--- a/users/ericgebhart/defs/altlocal_keys.def
+++ /dev/null
@@ -1,208 +0,0 @@
-// These are to create keys which don't exist in a locale.
-// so that we can create alternate maps to qwerty, azerty, or whatever.
-// Key name,
-// unshifted key and it's required mods.
-// the desired shifted keys and it's required mods.
-
-// for dvorak on bepo
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
-  MK_KEY(BP_DV_1,    BP_DQUO, MOD_LSFT,      BP_DCIR, MOD_LSFT)
-  MK_KEY(BP_DV_2,    BP_LDAQ, MOD_LSFT,      BP_AT, MOD_NONE)
-  MK_KEY(BP_DV_3,    BP_RDAQ, MOD_LSFT,      BP_DLR, MOD_LSFT)
-  MK_KEY(BP_DV_4,    BP_LPRN, MOD_LSFT,      BP_DLR, MOD_NONE)
-  MK_KEY(BP_DV_5,    BP_RPRN, MOD_LSFT,      BP_PERC, MOD_NONE)
-  MK_KEY(BP_DV_6,    BP_AT, MOD_LSFT,        BP_AT, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_7,    BP_PLUS, MOD_LSFT,      BP_P, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_8,    BP_MINS, MOD_LSFT,      BP_ASTR, MOD_NONE)
-  MK_KEY(BP_DV_9,    BP_SLSH, MOD_LSFT,      BP_LPRN, MOD_NONE)
-  MK_KEY(BP_DV_0,    BP_ASTR, MOD_LSFT,      BP_RPRN, MOD_NONE)
-
-  MK_KEY(BP_DV_GRV,  BP_PERC, MOD_LSFT,      BP_K, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_SCLN, BP_COMM, MOD_LSFT,      BP_DOT, MOD_LSFT)
-  MK_KEY(BP_DV_SLSH, BP_SLSH, MOD_NONE,     BP_QUOT, MOD_LSFT)
-  //MK_KEY(BP_DV_BSLS, BP_AGRV, MOD_BIT(KC_RALT), BP_B, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_EQL,  BP_EQL, MOD_NONE,       BP_PLUS, MOD_NONE)
-  MK_KEY(BP_DV_COMM, BP_COMM, MOD_NONE,      BP_LDAQ, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_DOT,  BP_DOT, MOD_NONE,       BP_RDAQ, MOD_BIT(KC_RALT))
-  MK_KEY(BP_DV_QUOT, BP_QUOT, MOD_NONE,      BP_DQUO, MOD_NONE)
-  MK_KEY(BP_DV_MINS, BP_MINS, MOD_NONE,      KC_SPC, MOD_BIT(KC_RALT))
-#endif
-
-#if defined(BEAKL15_LAYER_ENABLE) || defined(BEAKL19_LAYER_ENABLE)
-  // Keys for BEAKL 15, 19 on Qwerty
-  MK_KEY(KC_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
-  MK_KEY(KC_BK_COMM, KC_COMM, MOD_NONE,  KC_1, MOD_LSFT)
-  MK_KEY(KC_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
-
-  MK_KEY(US_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
-  MK_KEY(US_BK_COMM, KC_COMM, MOD_NONE,  KC_1, MOD_LSFT)
-  MK_KEY(US_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
-
-  // Keys for BEAKL WI on Qwerty
-  MK_KEY(KC_BKW_DOT,  KC_DOT, MOD_NONE,   KC_GRV, MOD_NONE)
-  MK_KEY(KC_BKW_COMM, KC_COMM, MOD_NONE,  KC_TILD, MOD_NONE)
-  MK_KEY(KC_BKW_COLN, KC_SCLN, MOD_LSFT,  KC_SCLN, MOD_NONE)
-
-#  if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-  // Keys for BEAKL on BEPO
-  MK_KEY(BP_BK_DOT,  BP_DOT, MOD_NONE,    BP_AT, MOD_NONE)
-  MK_KEY(BP_BK_COMM, BP_COMM, MOD_NONE,   BP_EXLM, MOD_NONE)
-  MK_KEY(BP_BK_QUOT, BP_QUOT, MOD_NONE,   BP_PERC, MOD_LSFT)
-
-
-#    ifdef BEAKLWI_LAYER_ENABLE
-  // Keys for BEAKL WI on BEPO
-  MK_KEY(BP_BKW_DOT,  BP_DOT, MOD_NONE,   BP_GRV, MOD_NONE)
-  MK_KEY(BP_BKW_COMM, BP_COMM, MOD_NONE,  BP_TILD, MOD_NONE)
-  MK_KEY(BP_BKW_COLN, BP_COLN, MOD_LSFT,  BP_SCLN, MOD_NONE)
-#    endif
-
-  // Keys for BEAKL 27 on BEPO
-#    ifdef BEAKL27_LAYER_ENABLE
-  MK_KEY(BP_BK2_DOT,  BP_DOT, MOD_NONE,    BP_GRV, MOD_NONE)
-  MK_KEY(BP_BK2_COMM, BP_COMM, MOD_NONE,   BP_QUES, MOD_NONE)
-  MK_KEY(BP_BK2_EXLM, BP_EXLM, MOD_NONE,   BP_PERC, MOD_LSFT)
-  MK_KEY(BP_BK2_QUOT, BP_QUOT, MOD_NONE,   BP_QUOT, MOD_NONE)
-#    endif
-#  endif
-#endif
-
-#ifdef BEAKL27_LAYER_ENABLE
-  // Keys for BEAKL 27 on Qwerty
-  /* // altered shifted pairs: dot = .`  comma = ,?   dquot = "! */
-  MK_KEY(KC_BK2_DOT, KC_DOT, MOD_NONE,    KC_GRV, MOD_NONE)
-  MK_KEY(KC_BK2_COMM, KC_COMM, MOD_NONE,  KC_QUES, MOD_NONE)
-  MK_KEY(KC_BK2_EXLM, KC_EXLM, MOD_NONE,   KC_DQUO, MOD_NONE)
-  MK_KEY(KC_BK2_QUOT, KC_QUOT, MOD_NONE,   KC_QUOT, MOD_NONE)
-
-  MK_KEY(US_BK2_DOT, US_DOT, MOD_NONE,    US_GRV, MOD_NONE)
-  MK_KEY(US_BK2_COMM, US_COMM, MOD_NONE,  US_QUES, MOD_NONE)
-  MK_KEY(US_BK2_EXLM, US_EXLM, MOD_NONE,   US_DQUO, MOD_NONE)
-  MK_KEY(US_BK2_QUOT, US_QUOT, MOD_NONE,   US_QUOT, MOD_NONE)
-#endif
-
-
-// shifted pairs: dot = .` comma = ,~  colon = :;
-
-#if defined(HD_NEU_LAYER_ENABLE) ||        \
-    defined(HD_NEU_NARROW_LAYER_ENABLE) || \
-    defined(HD_GOLD_LAYER_ENABLE) ||       \
-    defined(HD_SILVER_LAYER_ENABLE) ||     \
-    defined(HD_BRONZE_LAYER_ENABLE) ||     \
-    defined(HD_PLATINUM_LAYER_ENABLE) ||   \
-    defined(HD_REF_LAYER_ENABLE)
-
-// hands down alterations.
-/* alt shifts   ;: .& /\* '? "! ,| -+ */
-// for en qwerty
-  MK_KEY(KC_HD_DQUO, KC_QUOT, MOD_LSFT, KC_1,     MOD_LSFT) // "!
-  MK_KEY(KC_HD_QUOT, KC_QUOT, MOD_NONE, KC_SLSH,  MOD_LSFT) // '?
-
-  MK_KEY(KC_HD_DOT,  KC_DOT,  MOD_NONE, KC_7,     MOD_LSFT) // .&
-  MK_KEY(KC_HD_SCLN, KC_SCLN, MOD_NONE, KC_SCLN,     MOD_LSFT) // ;:
-  MK_KEY(KC_HD_COMM, KC_COMM, MOD_NONE, KC_BSLS,  MOD_LSFT) // ,|
-  MK_KEY(KC_HD_MINS, KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
-  MK_KEY(KC_HD_SLSH, KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
-
-  // for us international
-  MK_KEY(US_HD_DQUO, US_QUOT, MOD_LSFT, US_1,     MOD_LSFT)
-  MK_KEY(US_HD_QUOT, US_QUOT, MOD_NONE, KC_SLSH,  MOD_LSFT)
-
-  MK_KEY(US_HD_DOT,  US_DOT,  MOD_NONE, US_7,     MOD_LSFT)
-  MK_KEY(US_HD_SCLN, KC_SCLN, MOD_NONE, KC_SCLN,  MOD_LSFT) // ;:
-  MK_KEY(US_HD_COMM, US_COMM, MOD_NONE, US_BSLS,  MOD_LSFT)
-  MK_KEY(US_HD_MINS, US_MINS, MOD_NONE, US_EQL, MOD_LSFT)
-  MK_KEY(US_HD_SLSH, US_SLSH, MOD_NONE, US_8,     MOD_LSFT)
-
-// for bepo
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-  MK_KEY(BP_HD_DQUO, BP_DQUO, MOD_NONE, BP_QUES, MOD_NONE)
-  MK_KEY(BP_HD_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
-  MK_KEY(BP_HD_SCLN, BP_SCLN, MOD_NONE, BP_COLN, MOD_NONE) // ;:
-
-  MK_KEY(BP_HD_DOT,  BP_DOT,  MOD_NONE, BP_AMPR, MOD_NONE)
-  MK_KEY(BP_HD_COMM, BP_COMM, MOD_NONE, BP_PIPE, MOD_NONE)
-  MK_KEY(BP_HD_MINS, BP_MINS, MOD_NONE, BP_PLUS, MOD_NONE)
-  MK_KEY(BP_HD_SLSH, BP_SLSH, MOD_NONE, BP_ASTR, MOD_NONE)
-#endif
-
-#endif
-
-
-/* alt shifts   ;: .& /\* '? "! ,| -+  */
-#ifdef HD_DASH_LAYER_ENABLE
-// DASH and Elan have these reversed from the metals.
-/* //alt shift keys. "? '! */
-  MK_KEY(KC_HD_D_DQUO, KC_DQUO, MOD_NONE, KC_SLSH, MOD_LSFT) // "?
-  MK_KEY(KC_HD_D_QUOT, KC_QUOT, MOD_NONE, KC_1,    MOD_LSFT) // '!
-
-  MK_KEY(KC_HD_D_DOT,  KC_DOT,  MOD_NONE, KC_7,     MOD_LSFT) // .&
-  MK_KEY(KC_HD_D_COMM, KC_COMM, MOD_NONE, KC_BSLS,  MOD_LSFT) // ,|
-  MK_KEY(KC_HD_D_MINS, KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
-  MK_KEY(KC_HD_D_SLSH, KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
-
-  // for us international
-  MK_KEY(US_HD_D_DQUO, US_QUOT, MOD_LSFT, KC_SLSH,  MOD_LSFT)
-  MK_KEY(US_HD_D_QUOT, US_QUOT, MOD_NONE, US_1,     MOD_LSFT)
-
-  MK_KEY(US_HD_D_DOT,  US_DOT,  MOD_NONE, US_7,     MOD_LSFT)
-  MK_KEY(US_HD_D_COMM, US_COMM, MOD_NONE, US_BSLS,  MOD_LSFT)
-  MK_KEY(US_HD_D_MINS, US_MINS, MOD_NONE, US_EQL, MOD_LSFT)
-  MK_KEY(US_HD_D_SLSH, US_SLSH, MOD_NONE, US_8,     MOD_LSFT)
-
-// for bepo
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-  MK_KEY(BP_HD_D_DQUO, BP_DQUO, MOD_NONE, BP_QUES, MOD_NONE)
-  MK_KEY(BP_HD_D_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
-
-  MK_KEY(BP_HD_D_DOT,  BP_DOT,  MOD_NONE, BP_AMPR, MOD_NONE)
-  MK_KEY(BP_HD_D_COMM, BP_COMM, MOD_NONE, BP_PIPE, MOD_NONE)
-  MK_KEY(BP_HD_D_MINS, BP_MINS, MOD_NONE, BP_PLUS, MOD_NONE)
-  MK_KEY(BP_HD_D_SLSH, BP_SLSH, MOD_NONE, BP_ASTR, MOD_NONE)
-#endif
-
-#endif
-
-#ifdef HD_ELAN_LAYER_ENABLE
-// Elan has alt shift of comma and dot on the thumb.
-// en
-  MK_KEY(KC_HD_E_DQUO, KC_QUOT, MOD_LSFT, KC_SLSH, MOD_LSFT)
-  MK_KEY(KC_HD_E_QUOT, KC_QUOT, MOD_NONE, KC_1, MOD_LSFT)
-// the rest is the same
-  MK_KEY(KC_HD_E_MINS,    KC_MINS, MOD_NONE, KC_EQL, MOD_LSFT) // -+
-  MK_KEY(KC_HD_E_SLSH,    KC_SLSH, MOD_NONE, KC_8,     MOD_LSFT) // /*
-// until .: and ,;
-  MK_KEY(KC_HD_E_DOT,   KC_DOT,  MOD_NONE, KC_SCLN, MOD_LSFT) // .:
-  MK_SKEY(KC_HD_E_COMM, KC_COMM, KC_SCLN) // ,;
-/* (< {[ */
-  MK_KEY(KC_HD_E_LPRN, KC_LPRN, MOD_NONE, KC_COMM, MOD_LSFT)
-  MK_KEY(KC_HD_E_LCBR, KC_LCBR, MOD_NONE, KC_LBRC, MOD_NONE )
-
-// US-intl
-  MK_KEY(US_HD_E_DQUO, US_QUOT, MOD_LSFT, KC_SLSH, MOD_LSFT)
-  MK_KEY(US_HD_E_QUOT, US_QUOT, MOD_NONE, US_1, MOD_LSFT)
-// the rest is the same
-  MK_KEY(US_HD_E_MINS,    US_MINS, MOD_NONE, US_EQL, MOD_LSFT) // -+
-  MK_KEY(US_HD_E_SLSH,    US_SLSH, MOD_NONE, US_8,     MOD_LSFT) // /*
-// until .: and ,;
-  MK_KEY(US_HD_E_DOT,   KC_DOT,  MOD_NONE, US_SCLN, MOD_LSFT) // .:
-  MK_SKEY(US_HD_E_COMM, US_COMM, US_SCLN) // ,;
-/* (< {[ */
-  MK_KEY(US_HD_E_LPRN, US_LPRN, MOD_NONE, US_COMM, MOD_LSFT)
-  MK_KEY(US_HD_E_LCBR, US_LCBR, MOD_NONE, US_LBRC, MOD_NONE )
-
-// bepo
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-  MK_KEY(BP_HD_E_DQUO, BP_DQUO, MOD_NONE, BP_SLSH, MOD_NONE)
-  MK_KEY(BP_HD_E_QUOT, BP_QUOT, MOD_NONE, BP_EXLM, MOD_NONE)
-// the rest is the same
-  MK_KEY(BP_HD_E_MINS,    BP_MINS, MOD_NONE,   BP_EQL, MOD_NONE) // -+
-  MK_KEY(BP_HD_E_SLSH,    BP_SLSH, MOD_NONE,   BP_ASTR,  MOD_NONE) // /*
-// until .: and ,;
-  MK_KEY(BP_HD_E_DOT,   KC_DOT,  MOD_NONE, BP_SCLN, MOD_LSFT) // .:
-  MK_SKEY(BP_HD_E_COMM, BP_COMM, BP_SCLN) // ,;
-/* (< {[ */
-  MK_KEY(BP_HD_E_LPRN, BP_LPRN, MOD_NONE, BP_COMM, MOD_LSFT)
-  MK_KEY(BP_HD_E_LCBR, BP_LCBR, MOD_NONE, BP_LBRC, MOD_NONE )
-#endif
-#endif
diff --git a/users/ericgebhart/defs/combos.def b/users/ericgebhart/defs/combos.def
deleted file mode 100644
index 85b5d2d588..0000000000
--- a/users/ericgebhart/defs/combos.def
+++ /dev/null
@@ -1,139 +0,0 @@
-// Per layer combo reference layers.
-// Default is current layer, or COMBO_REF_DEFAULT if set.
-// _COMBO_REF is the default if enabled.
-
-//COMBO_REF_LAYER(_DVORAK_BP, _COMBO_REF2)
-COMBO_REF_LAYER(_NAV, _NAV)
-
-
-// COMBOS
-//   name      result           chord keys
-
-// sml nav, sml keypad, zqxj, onshot accents, oneshot symbols
-// home, end, caps word, accents? -> aeeecio oe, ao,
-
-
-// reference COMBO_REF
-COMB(TSCTL,      TS_LCTL,       CB_1L3, CB_1L4)
-COMB(SMLNAV1,    SML_NAV,       CB_1L2, CB_1L3)
-COMB(OSACCENTMT, SML_KEYPAD,    CB_1L2, CB_1R4)
-
-#ifdef TOPROWS_LAYER_ENABLE
-COMB(OSTOPROWS,  SML_TOPROWS,   CB_1L3, CB_1R3)
-#endif
-
-//COMB(OSlsftT,    OS_LSFT,       CB_1L4, CB_1R2)
-COMB(OSSFT,      OS_LSFT,        CB_2L4, CB_2R2)
-COMB(TSCTL2,     TS_LCTL,       CB_1L4, CB_1R2)
-
-// COMB(SMLNAV,  SML_NAV,        CB_2L4, CB_2R2)
-COMB(OSCTL,      OS_LCTL,        CB_2L2, CB_2R4)
-
-COMB(OSACCENTM, OSL_ACCENTS_MORTE,  CB_2L3, CB_2R3)
-
-COMB(capsword,  CAPS_WORD,      CB_3L4, CB_3R2)
-COMB(OSRALT,    OS_RALT,        CB_3L3, CB_3R3)
-COMB(OSLALT2,   OS_LALT,        CB_3L2, CB_3R4)
-
-COMB(OSLAYER,   LAYER_OSL,      CB_3L1, CB_3R5)
-COMB(OSLSYMB,   OSL_SYMB,       CB_TH2, CB_TH5)
-COMB(LNAV,      SML_NAV,        CB_TH3, CB_TH4)
-
-COMB(_Q,  KC_Q, CB_3L2, CB_3L3)
-COMB(_X,  KC_X, CB_3L3, CB_3L4)
-COMB(_Z,  KC_Z, CB_3R3, CB_3R4)
-
-// vertical thumb combos for the kyria
-//COMB(xxx,      xxx,            CB_TH2, CB_0TH1)
-
-#ifdef MEDIA_LAYER_ENABLE
-COMB(SMLMEDIA,      SML_MEDIA,            CB_TH3, CB_0TH2)
-#endif
-
-COMB(OSLACCENT2,    OSL_ACCENTS_MORTE,        CB_TH4, CB_0TH3)
-COMB(KEYPAD,   SML_KEYPAD,     CB_TH5, CB_0TH4)
-
-
-
-// reference COMBO_REF2
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
-COMB(TSCTL_BP,     TS_LCTL,        CB_1L3, CB_1L4)
-COMB(SMLNAV1_bp,   SML_NAV,        CB_1L2, CB_1L3)
-
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-COMB(OSLACCENT_bp, OSL(_ACCENTS_MORTE_BP),  CB2_2L1, CB2_2L2)
-#endif
-
-COMB(SMLNAV_BP,    SML_NAV,        CB2_2L2, CB2_2L3)
-COMB(OSCTL_BP,     OS_LCTL,        CB2_2L3, CB2_2L4)
-
-COMB(OSSFT_BP,     OS_LSFT,        CB2_2R2, CB2_2R3)
-// COMB(SMLKEYPAD_BP, SML_KEYPAD_BP,  CB2_2R3, CB2_2R4)
-
-COMB(capsword_BP,  CAPS_WORD_ON,   CB2_3L4, CB2_3R2)
-
-// COMB(OSLSYMBP_BP,  OSL(_SYMB_BP),  CB2_TH2, CB2_TH5)
-COMB(LNAV_BP,      SML_NAV,        CB2_TH3, CB2_TH4)
-
-COMB(_Qbp,  BP_Q, CB2_3L2, CB2_3L3)
-COMB(_Xbp,  BP_X, CB2_3L3, CB2_3L4)
-COMB(_Zbp,  BP_Z, CB2_3R3, CB2_3R4)
-#endif
-
-
-// Reference nav layer
-COMB(END_nav,   KC_END,  KC_PGUP, KC_PGDN)
-COMB(HOME_nav,  KC_HOME, KC_UP,   KC_DOWN)
-
-
-//COMB(JKL_SPC,  KC_SPC,   KC_J,  KC_X)
-//SUBS(TH_THE,   "the",    KC_T,  KC_H) // SUBS uses SEND_STRING to output the given string.
-
-// from possum vibes to review.
-/*    COMBO NAME       | OUTPUT    | PARAMS    */
-
-// /*---- TOP ROW ----*/
-// COMB(turbonav,          NAV_TG,     KC_W, KC_R)         // Nav access
-// COMB(save,              S_SAVE,     KC_E, KC_R)         // Save
-// COMB(back_fwd,          BCK_FWD,    KC_R, KC_T)         // Back/Fwd (shifted)
-
-// COMB(undo_redo,         UND_RED,    KC_Y, KC_U)         // Undo/Redo (shifted)
-// COMB(esc,               KC_ESC,     KC_U, KC_O)         // Esc
-
-// #ifdef IS_PINKY_CLUSTER
-// COMB(delete,            KC_DEL,     KC_A, KC_SCLN)
-// COMB(caps,              KC_CAPS,    KC_Q, KC_P)
-// #endif
-
-// /*---- HOME ROW ----*/
-// COMB(cut,               S_CUT,      KC_S, KC_F)         // Shift+Del (cut)
-// COMB(copy,              S_COPY,     KC_S, KC_D)         // Ctrl+Ins (copy)
-// COMB(paste,             S_PASTE,    KC_D, KC_F)         // Shift+Del (paste)
-// COMB(panic,             PANIC,      KC_D, KC_K)         // panic!
-
-// COMB(nummode,           NUMMODE,    KC_J, KC_K)         // Nummode toggle
-// COMB(symmode,           SYM_TG,     KC_K, KC_L)         // Sym layer
-// COMB(tab,               KC_TAB,     KC_K, KC_M)         // Tab
-
-
-// /*---- BOTTOM ROW ----*/
-// COMB(hash,              KC_HASH,    KC_X, KC_C)         // #
-// COMB(fslash,            KC_SLSH,    KC_C, KC_V)         // /
-
-// COMB(dash,              KC_MINS,    KC_M, KC_COMM)      // -
-// COMB(asterisk,          KC_ASTR,    KC_COMM, KC_DOT)    // *
-// COMB(at,                KC_AT,      KC_M, KC_DOT)       // @
-
-
-// /*---- THUMBS ----*/
-// COMB(sys_lthm,          SYS_OSL,    KC_B, KC_ENT)       // Sys OSL
-
-// COMB(space_shift,       SPC_SFT,    KC_TAB, KC_SPC)     // space and activate oss
-
-// COMB(underscore_rthm,   KC_UNDS,    KC_SPC, KC_N)       // _
-
-// /*---- THUMB+ALPHAS ----*/
-// // COMB(os_fun,            FUN_OSL,    KC_ENT, KC_C)       // OS Func
-// // COMB(os_num,            NUM_OSL,    KC_A, KC_F)         // OSL num
-// // COMB(os_sym,            SYM_OSL,    KC_SPC, KC_M)       // OSL sym
diff --git a/users/ericgebhart/defs/custom_keys.def b/users/ericgebhart/defs/custom_keys.def
deleted file mode 100644
index 075b7de0c1..0000000000
--- a/users/ericgebhart/defs/custom_keys.def
+++ /dev/null
@@ -1,86 +0,0 @@
-// custom key codes.
-  EPRM,
-  //VRSN,
-  CAPS_WORD_ON,
-
-  // LAYERStuff.
-  KC_NEXT_LOCALE,
-  KC_NEXT_BASE_LAYER,
-  KC_SET_BASE,
-  // Misc.
-  KC_MAKE,
-  KC_RESET,
-  KC_RGB_T,
-  RGB_IDL,
-  KC_SECRET_1,
-  KC_SECRET_2,
-  KC_SECRET_3,
-  KC_SECRET_4,
-  KC_SECRET_5,
-
-  KC_SPACETEST,
-
-  /// Need to evaluate which to keep.
-  BCK_FWD,  // Alt left and right
-  CLEAR,    // Clears all mods, does not change layers.
-  LOCKSCR,  // locks screen per is_windows value
-  PANIC,    // Clears all One-Shot keys and returns to base layer.
-  UND_RED,  // Ctrl Z and Y
-
-  // macros
-  QMKCOMP,  // qmk compile
-  QMKFLSH,  // qmk flash
-
-  // Swapper keys - just the swapper key, maybe gets reused.
-  SW_REV,  // Dead key, reverse direction for swapper
-
-// for the combo ref layers.
-  CB_0M1, CB_0M2, CB_0M3,
-  CB_1M1, CB_1M2, CB_1M3,
-  CB_2M1, CB_2M2, CB_2M3,
-  CB_3M1, CB_3M2, CB_3M3,
-  CB_4M1, CB_4M2, CB_4M3, CB_4M4, CB_4M5,
-
-  CB_1,  CB_2, CB_3, CB_4, CB_5, CB_6, CB_7, CB_8, CB_9, CB_0,
-
-  CB_1R1, CB_1R2, CB_1R3, CB_1R4, CB_1R5,
-  CB_1L1, CB_1L2, CB_1L3, CB_1L4, CB_1L5,
-  CB_2R1, CB_2R2, CB_2R3, CB_2R4, CB_2R5,
-  CB_2L1, CB_2L2, CB_2L3, CB_2L4, CB_2L5,
-  CB_3R1, CB_3R2, CB_3R3, CB_3R4, CB_3R5,
-  CB_3L1, CB_3L2, CB_3L3, CB_3L4, CB_3L5,
-  CB_4L1, CB_4L2, CB_4L3, CB_4L4, CB_4L5,
-  CB_4R1, CB_4R2, CB_4R3, CB_4R4, CB_4R5,
-
-  CB2_0M1, CB2_0M2, CB2_0M3,
-  CB2_1M1, CB2_1M2, CB2_1M3,
-  CB2_2M1, CB2_2M2, CB2_2M3,
-  CB2_3M1, CB2_3M2, CB2_3M3,
-  CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4, CB2_4M5,
-
-  CB2_1, CB2_2, CB2_3, CB2_4, CB2_5, CB2_6, CB2_7, CB2_8, CB2_9, CB2_0,
-
-  CB2_1R1, CB2_1R2, CB2_1R3, CB2_1R4, CB2_1R5,
-  CB2_1L1, CB2_1L2, CB2_1L3, CB2_1L4, CB2_1L5,
-  CB2_2R1, CB2_2R2, CB2_2R3, CB2_2R4, CB2_2R5,
-  CB2_2L1, CB2_2L2, CB2_2L3, CB2_2L4, CB2_2L5,
-  CB2_3R1, CB2_3R2, CB2_3R3, CB2_3R4, CB2_3R5,
-  CB2_3L1, CB2_3L2, CB2_3L3, CB2_3L4, CB2_3L5,
-  CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4, CB2_4L5,
-  CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4, CB2_4R5,
-
-// core 6 thumb keys for combo reference layer
- CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6,
- CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6,
- CB_1TH1,  CB_1TH2, CB_1TH3, CB_1TH4, CB_1TH5, CB_1TH6,
- CB2_1TH1, CB2_1TH2, CB2_1TH3, CB2_1TH4, CB2_1TH5, CB2_1TH6,
-
- // for the extra thumb keys on the kyria
- CB_0TH1 , CB_0TH2, CB_0TH3, CB_0TH4,
- CB_THA, CB_THB, CB_THC, CB_THD,
-
-// edge keys for the combo reference layer
- L0_CB, L1_CB, L2_CB, L3_CB,
- R0_CB, R1_CB, R2_CB, R3_CB,
- L0_CB2, L1_CB2, L2_CB2, L3_CB2,
- R0_CB2, R1_CB2, R2_CB2, R3_CB2,
diff --git a/users/ericgebhart/defs/encoders.def b/users/ericgebhart/defs/encoders.def
deleted file mode 100644
index 638d3fbf4b..0000000000
--- a/users/ericgebhart/defs/encoders.def
+++ /dev/null
@@ -1,65 +0,0 @@
-// Layer/none, encoder index 0/1, CW_KC, CCW_KC, Qualifying mod or none
-// LAYER_NONE and MOD_NONE for a single use.
-// LEFT and RIGHT for index. 0 and 1...
-
-// default encoders, all layers no mods.
-ENCODER_ACTION(LAYER_NONE, RIGHT,  KC_PGDN, KC_PGUP, MOD_NONE)
-ENCODER_ACTION(LAYER_NONE, LEFT,   KC_DOWN, KC_UP,   MOD_NONE)
-ENCODER_ACTION(LAYER_NONE, LEFT,   KC_PGDN, KC_PGUP, MOD_LSFT)
-
-// Symbol layer encoders.
-// left and right.
-ENCODER_ACTION(_SYMB_EN, LEFT, KC_LEFT,       KC_RIGHT,       MOD_NONE)
-// word left or right.
-ENCODER_ACTION(_SYMB_EN, LEFT, LCTL(KC_LEFT), LCTL(KC_RIGHT), MOD_NONE)
-
-// Nav layer encoders.
-ENCODER_ACTION(_NAV, LEFT, KC_TAB,  S(KC_TAB), MOD_NONE)
-ENCODER_ACTION(_NAV, RIGHT, A(KC_TAB),  A(S(KC_TAB)), MOD_NONE)
-ENCODER_ACTION(_NAV, RIGHT, KC_VOLU, KC_VOLD,   MOD_NONE)
-
-// RGB functions for the RGB layer.
-#ifdef RGB_MATRIX_ENABLE
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgb_matrix_increase_speed_noeeprom,
-                rgb_matrix_decrease_speed_noeeprom, MOD_NONE)
-
-    ENCODER_FUNCTION(_RGB, RIGHT,
-                rgb_matrix_increase_hue_noeeprom,
-                rgb_matrix_decrease_hue_noeeprom, MOD_NONE)
-
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgb_matrix_increase_sat_noeeprom,
-                rgb_matrix_decrease_sat_noeeprom, MOD_LSFT)
-
-    ENCODER_FUNCTION(_RGB, RIGHT,
-                rgb_matrix_increase_val_noeeprom,
-                rgb_matrix_decrease_val_noeeprom, MOD_LSFT)
-
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgb_matrix_step_noeeprom;
-                rgb_matrix_step_reverse_noeeprom, MOD_LCTL)
-
-#elif defined(RGBLIGHT_ENABLE)
-
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgblight_increase_speed_noeeprom,
-                rgblight_decrease_speed_noeeprom, MOD_NONE)
-
-    ENCODER_FUNCTION(_RGB, RIGHT,
-                rgblight_increase_hue_noeeprom,
-                rgblight_decrease_hue_noeeprom, MOD_NONE)
-
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgblight_increase_sat_noeeprom,
-                rgblight_decrease_sat_noeeprom, MOD_LSFT)
-
-    ENCODER_FUNCTION(_RGB, RIGHT,
-                rgblight_increase_val_noeeprom,
-                rgblight_decrease_val_noeeprom, MOD_LSFT)
-
-
-    ENCODER_FUNCTION(_RGB, LEFT,
-                rgblight_step_noeeprom,
-                rgblight_step_reverse_noeeprom, MOD_LCTL)
-    #endif // RGB_MATRIX_ENABLE || RGBLIGHT_ENABLE
diff --git a/users/ericgebhart/defs/key_overrides.def b/users/ericgebhart/defs/key_overrides.def
deleted file mode 100644
index 159e02e87e..0000000000
--- a/users/ericgebhart/defs/key_overrides.def
+++ /dev/null
@@ -1,23 +0,0 @@
-//KOL -> name, mod_mask, keycode, sendkeycode, layer to apply.
-
-// // these are actually handled by alt_local_keys, in a more universal
-// // and adaptable way.
-// KOL(slash_pipe,      MOD_MASK_SHIFT, KC_SLSH, KC_PIPE, _DVORAK_EN)
-
-// this one is interesting.
-KOL(slash_backslash, MOD_MASK_ALT,   KC_SLSH, KC_BSLS, _DVORAK_EN)
-
-// KOL(N2_dot,          MOD_MASK_SHIFT, KC_2,    KC_DOT,   _KEYPAD_EN)
-// KOL(N3_comma,        MOD_MASK_SHIFT, KC_3,    KC_COMMA, _KEYPAD_EN)
-
-// KOL(hash_at,         MOD_MASK_SHIFT, KC_HASH,    KC_AT,          _CDH)
-// KOL(dot_colon,       MOD_MASK_SHIFT, KC_DOT,     KC_COLN,        _CDH)
-// KOL(comma_semicolon, MOD_MASK_SHIFT, KC_COMMA,   KC_SCLN,        _CDH)
-// KOL(space_unds,      MOD_MASK_SHIFT, KC_SPACE,   KC_UNDS,        _CDH)
-// KOL(mins_exlm,       MOD_MASK_SHIFT, KC_MINS,    KC_EXLM,        _CDH)
-
-// KOL(bspc_del,        MOD_MASK_SHIFT, KC_BSPC,    KC_DEL,         _NAV)
-
-// KOL(zero_degree,     MOD_MASK_SHIFT, KC_0,       DEGREE,         _KEYPAD_EN)
-
-// KOL(eur_pnd,         MOD_MASK_SHIFT, KC_EUR,     KC_PND,         _SYMB_EN)
diff --git a/users/ericgebhart/defs/mod_lock.def b/users/ericgebhart/defs/mod_lock.def
deleted file mode 100644
index da53ea0503..0000000000
--- a/users/ericgebhart/defs/mod_lock.def
+++ /dev/null
@@ -1,19 +0,0 @@
-// mod lock keys. takes keymods not mods.
-// keycode should be defined in custom_keys.def.
-// custom key,  modkey to activate
-MODL(ML_LSFT, KC_LSFT)
-MODL(ML_LCTL, KC_LCTL)
-MODL(ML_LALT, KC_LALT)
-MODL(ML_LGUI, KC_LGUI)
-
-// Keycodes which will NOT cancel mod lock mode.
-IGNORE_KC( KC_LEFT)
-IGNORE_KC( KC_RGHT)
-IGNORE_KC( KC_UP)
-IGNORE_KC( KC_DOWN)
-IGNORE_KC( KC_HOME)
-IGNORE_KC( KC_END)
-IGNORE_KC( ML_LALT)
-IGNORE_KC( ML_LCTL)
-IGNORE_KC( ML_LGUI)
-IGNORE_KC( ML_LSFT)
diff --git a/users/ericgebhart/defs/not_dead.def b/users/ericgebhart/defs/not_dead.def
deleted file mode 100644
index 66023ec523..0000000000
--- a/users/ericgebhart/defs/not_dead.def
+++ /dev/null
@@ -1,19 +0,0 @@
-// Make not dead keys from dead keys.
-// Not dead keycode, dead key
-NOT_DEAD(KC_DQUO_ND, KC_DQUO)
-NOT_DEAD(KC_GRV_ND,  KC_GRV)
-NOT_DEAD(KC_QUOT_ND, KC_QUOT)
-NOT_DEAD(KC_CIRC_ND, KC_CIRC)
-NOT_DEAD(KC_TILD_ND, KC_TILD)
-
-NOT_DEAD(US_DQUO_ND, US_DQUO)
-NOT_DEAD(US_GRV_ND,  US_GRV)
-NOT_DEAD(US_QUOT_ND, US_QUOT)
-NOT_DEAD(US_CIRC_ND, US_CIRC)
-NOT_DEAD(US_TILD_ND, US_TILD)
-
-NOT_DEAD(BP_DQUO_ND, BP_DQUO)
-NOT_DEAD(BP_GRV_ND,  BP_GRV)
-NOT_DEAD(BP_QUOT_ND, BP_QUOT)
-NOT_DEAD(BP_CIRC_ND, BP_CIRC)
-NOT_DEAD(BP_TILD_ND, BP_TILD)
diff --git a/users/ericgebhart/defs/nshot.def b/users/ericgebhart/defs/nshot.def
deleted file mode 100644
index 79559534c7..0000000000
--- a/users/ericgebhart/defs/nshot.def
+++ /dev/null
@@ -1,45 +0,0 @@
-// Define keycodes in custom keys.
-// KEYCode, mod keycode, to set for n-shot.
-// ONESHOT is for one.
-// NSHOT takes a count.
-
-// oneshots
-ONESHOT(OS_LSFT, KC_LSFT)
-ONESHOT(OS_LCTL, KC_LCTL)
-ONESHOT(OS_LALT, KC_LALT)
-ONESHOT(OS_LGUI, KC_LGUI)
-
-ONESHOT(OS_RSFT, KC_RSFT)
-ONESHOT(OS_RCTL, KC_RCTL)
-ONESHOT(OS_RALT, KC_RALT)
-ONESHOT(OS_RGUI, KC_RGUI)
-
-// N-Shots
-NSHOT(TS_LCTL, KC_LCTL, 2)
-NSHOT(TS_RCTL, KC_RCTL, 2)
-
-// Keys which will cancel the n-shots.
-CANCEL_KEY( PANIC)
-CANCEL_KEY( CLEAR)
-//CANCEL_KEY( THM_LH0)
-//CANCEL_KEY( THM_LH1)
-//CANCEL_KEY( THM_RH0)
-//CANCEL_KEY( THM_RH1)
-
-// inherited from @possumvibes, keeping for now.
-// Keys which will be ignored by n-shots.
-//IGNORE_KEY( THM_LH0)
-//IGNORE_KEY( THM_LH1)
-//IGNORE_KEY( THM_RH0)
-//IGNORE_KEY( THM_RH1)
-//IGNORE_KEY( SYM_OSL)
-//IGNORE_KEY( SYM_TG)
-//IGNORE_KEY( NAV_TG)
-//IGNORE_KEY( NUM_OSL)
-//IGNORE_KEY( NUM_TO)
-//IGNORE_KEY( FUN_OSL)
-//IGNORE_KEY( ALPHA)
-IGNORE_KEY( SML_NAV)
-IGNORE_KEY( SPC_TOPR)
-// IGNORE_KEY( SML_KEYPAD)
-//IGNORE_KEY( SML_TOPROWS)
diff --git a/users/ericgebhart/defs/oneshot.def b/users/ericgebhart/defs/oneshot.def
deleted file mode 100644
index c54215234f..0000000000
--- a/users/ericgebhart/defs/oneshot.def
+++ /dev/null
@@ -1,17 +0,0 @@
-// custom-key, Oneshot name.
-  ONESHOT( OS_LSFT, ONESHOT_LSFT)
-  ONESHOT( OS_LCTL, ONESHOT_LCTL)
-  ONESHOT( OS_LALT, ONESHOT_LALT)
-  ONESHOT( OS_LGUI, ONESHOT_LGUI)
-
-// keys to cancel
-  CANCEL_KEY( KC_ESC)
-
-//  CANCEL_KEY( KC_FNAV)
-//  CANCEL_KEY( KC_FNUM)
-//  CANCEL_KEY( KC_FCAPS)
-
-// keys to ignore.
-IGNORE_KEY( SPC_NAV)
-//  IGNORE_KEY( KC_FNAV)
-//  IGNORE_KEY( KC_FSYM)
diff --git a/users/ericgebhart/defs/send_string.def b/users/ericgebhart/defs/send_string.def
deleted file mode 100644
index 455d25bfb1..0000000000
--- a/users/ericgebhart/defs/send_string.def
+++ /dev/null
@@ -1,7 +0,0 @@
-// key to be defined and string to send.
-
-//SEND_STR(MYKEY, "this is a test")
-//SEND_STR_DELAY(MYKEY4, "this is another test")
-
-SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE)
-// SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " # @ " QMK_VERSION)
diff --git a/users/ericgebhart/defs/smart_lock.def b/users/ericgebhart/defs/smart_lock.def
deleted file mode 100644
index 8202feb0d9..0000000000
--- a/users/ericgebhart/defs/smart_lock.def
+++ /dev/null
@@ -1,123 +0,0 @@
-// Define smart layers here.
-// SMLL = smart lock layer.
-// SMLM = smart lock mod.
-
-// Keycode, layer/mod.
-// list of keycodes to ignore.
-
-SMLM(SMLM_LSFT, MOD_LSFT,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_LCTL, MOD_LCTL,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_LALT, MOD_LALT,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_LGUI, MOD_LGUI,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_RSFT, MOD_RSFT,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_RCTL, MOD_RCTL,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_RALT, MOD_RALT,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLM(SMLM_RGUI, MOD_RGUI,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLL(SML_NAV, _NAV, ___NAV_3x10___)
-
-#ifdef MEDIA_LAYER_ENABLE
-SMLL(SML_MEDIA, _MEDIA, ___MEDIA_3x10___)
-#endif
-
-#ifdef MOUSEKEY_ENABLE
-SMLL(SML_NAVm, _NAVm, ___NAVm_3x10___)
-#endif
-
-SMLL(SML_KEYPAD, _KEYPAD_EN,
-  KC_1,
-  KC_2,
-  KC_3,
-  KC_4,
-  KC_5,
-  KC_6,
-  KC_7,
-  KC_8,
-  KC_9,
-  KC_0,
-  KC_PERC,
-  KC_DLR,
-  KC_COMM,
-  KC_DOT,
-  KC_SLSH,
-  KC_MINS,
-  KC_ASTR,
-  KC_PLUS,
-  KC_COLN,
-  KC_SCLN,
-  KC_EQL,
-  // KC_UNDS,
-  KC_BSPC,
-  KC_X,
-  SYM_MO)
-
-// SMLL(SML_KEYPAD_BP, _KEYPAD_BP,
-//   BP_1,
-//   BP_2,
-//   BP_3,
-//   BP_4,
-//   BP_5,
-//   BP_6,
-//   BP_7,
-//   BP_8,
-//   BP_9,
-//   BP_0,
-//   BP_PERC,
-//   BP_DLR,
-//   BP_COMM,
-//   BP_DOT,
-//   BP_SLSH,
-//   BP_MINS,
-//   BP_ASTR,
-//   BP_PLUS,
-//   BP_COLN,
-//   BP_SCLN,
-//   BP_EQL,
-//   // KC_UNDS,
-//   KC_BSPC,
-//   BP_X,
-//   SYM_MO)
-
-#ifdef TOPROWS_LAYER_ENABLE
-SMLL(SML_TOPROWS, _TOPROWS_EN, ___10_SYMBOLS___, ___10_NUMBERS___)
-#endif
-//SMLL(SML_SYMB, _SYMB_EN, ___SYMB_BEAKLB_3x10___)
diff --git a/users/ericgebhart/defs/swapper.def b/users/ericgebhart/defs/swapper.def
deleted file mode 100644
index 64a51910cb..0000000000
--- a/users/ericgebhart/defs/swapper.def
+++ /dev/null
@@ -1,3 +0,0 @@
-// KEYCODE, Reverseit kc, KC to send, KC to send in reverse, MODs to apply.
-SWAPPER_KEY(SW_WIN, SW_REV, KC_TAB, S(KC_TAB), KC_LALT)
-SWAPPER_KEY(SW_TAB, SW_REV, KC_TAB, S(KC_TAB), KC_LCTL)
diff --git a/users/ericgebhart/defs/tap_hold.def b/users/ericgebhart/defs/tap_hold.def
deleted file mode 100644
index 54140b99f8..0000000000
--- a/users/ericgebhart/defs/tap_hold.def
+++ /dev/null
@@ -1,68 +0,0 @@
-// tap or long tap for different key.
-
-// One key copy/paste
-TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V))
-// New TaB/Window
-TP_TPL(KC_CTCN, LCTL(KC_T), LCTL(KC_N))
-// Close Tab-window/Quit
-TP_TPL(KC_CWCQ, LCTL(KC_W), LCTL(KC_Q))
-// Xmonad scratch pads or desktop
-//TP_TPL(KC_XM_PORD, LGUI(KC_E), LGUI(KC_T))
-
-//TP_SML(ENTNAV, KC_ENTER, SML_NAV)
-
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-TP_TPL(BP_CCCV, LCTL(BP_C), LCTL(BP_V))
-TP_TPL(BP_CTCN, LCTL(BP_T), LCTL(BP_N))
-TP_TPL(BP_CWCQ, LCTL(BP_W), LCTL(BP_Q))
-TP_TPL(BP_XM_PORD, LGUI(BP_E), LGUI(BP_T))
-
-TP_TPL(BP_C_CCED, BP_C, BP_CCED)
-#endif
-
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == US_INT) || (DEFAULT_LANG == US_INT)
-TP_TPL(US_CCCV, LCTL(US_C), LCTL(US_V))
-TP_TPL(US_CTCN, LCTL(US_T), LCTL(US_N))
-TP_TPL(US_CWCQ, LCTL(US_W), LCTL(US_Q))
-TP_TPL(US_XM_PORD, LGUI(US_E), LGUI(US_T))
-
-TP_TPL(US_C_CCED, US_C, US_CCED)
-#endif
-
-// Open on tap and Open with close and back arrow on hold.
-// (){}[]""''``<>
-#  if defined(SECOND_LOCALE) && (SECOND_LOCALE == EN) || (DEFAULT_LANG == EN)
-OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN)
-OPEN_OCL(KC_OCBRC, KC_LBRC, KC_RBRC)
-OPEN_OCL(KC_OCCBR, KC_LCBR, KC_RCBR)
-OPEN_OCL(KC_OCDQUO, KC_DQUO, KC_DQUO)
-OPEN_OCL(KC_OCQUOT, KC_QUOT, KC_QUOT)
-OPEN_OCL(KC_OCGRV, KC_GRAVE, KC_GRAVE)
-OPEN_OCL(KC_OCLTGT, KC_LT, KC_GT)
-#endif
-
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO) || (DEFAULT_LANG == BEPO)
-OPEN_OCL(BP_OCPRN, BP_LPRN, BP_RPRN)
-OPEN_OCL(BP_OCBRC, BP_LBRC, BP_RBRC)
-OPEN_OCL(BP_OCCBR, BP_LCBR, BP_RCBR)
-OPEN_OCL(BP_OCDQUO, BP_DQUO, BP_DQUO)
-OPEN_OCL_ND(BP_OCQUOT, BP_QUOT, BP_QUOT)
-OPEN_OCL(BP_OCGRV, BP_GRV, BP_GRV)
-OPEN_OCL(BP_OCLTGT, BP_LT, BP_GT)
-#endif
-
-
-
-#if defined(SECOND_LOCALE) && (SECOND_LOCALE == US_INT) || (DEFAULT_LANG == US_INT)
-OPEN_OCL(US_OCPRN, US_LPRN, US_RPRN)
-OPEN_OCL(US_OCBRC, US_LBRC, US_RBRC)
-OPEN_OCL(US_OCCBR, US_LCBR, US_RCBR)
-OPEN_OCL(US_OCDQUO, US_DQUO, US_DQUO)
-
-OPEN_OCL_ND(US_OCQUOT, US_QUOT, US_QUOT)
-OPEN_OCL(US_OCGRV, US_GRV, US_GRV)
-OPEN_OCL(US_OCLTGT, US_LT, US_GT)
-#endif
diff --git a/users/ericgebhart/defs/unicode.def b/users/ericgebhart/defs/unicode.def
deleted file mode 100644
index ee8dbecead..0000000000
--- a/users/ericgebhart/defs/unicode.def
+++ /dev/null
@@ -1,5 +0,0 @@
-// define keys to send unicode strings.
- UC_STR(UC_FLIP, "(ノಠ痊ಠ)ノ彡┻━┻")
- UC_STR(UC_TABL, "┬─┬ノ( º _ ºノ)")
- UC_STR(UC_SHRG, "¯\\_(ツ)_/¯")
- UC_STR(UC_DISA, "ಠ_ಠ")
diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c
deleted file mode 100755
index 965456e56c..0000000000
--- a/users/ericgebhart/ericgebhart.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-
-#include "quantum.h"
-#include "version.h"
-#include "action.h"
-#include "action_layer.h"
-#include "process_keycode/process_tap_dance.h"
-
-// Add reconfigurable functions here, for keymap customization
-// This allows for a global, userspace functions, and continued
-// customization of the keymap.  Use _keymap instead of _user
-// functions in the keymaps
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
-
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
-
-__attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
-  return state;
-}
-
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h
deleted file mode 100755
index 4721b85ebd..0000000000
--- a/users/ericgebhart/ericgebhart.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 ericgebhart
-#define ericgebhart
-
-#include "layer_names.h"
-
-#ifdef CONSOLE_ENABLE
-#include "print.h"
-#endif
-
-#endif
diff --git a/users/ericgebhart/extensions/accented_keys.c b/users/ericgebhart/extensions/accented_keys.c
deleted file mode 100644
index 2569bffea8..0000000000
--- a/users/ericgebhart/extensions/accented_keys.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-#include "accented_keys.h"
-#include <stdint.h>
-#include <stdbool.h>
-
-static inline void tap_accented_letter(uint16_t letter, uint16_t dead_key) {
-    uint8_t mod_state = get_mods();
-    uint8_t oneshot_mod_state = get_oneshot_mods();
-    del_mods(MOD_MASK_SHIFT);
-    del_oneshot_mods(MOD_MASK_SHIFT);
-    tap_code16(dead_key);
-    set_mods(mod_state);
-    set_oneshot_mods(oneshot_mod_state);
-    tap_code(letter);
-}
-
-#undef ACCENTED
-#define ACCENTED(KC, K1, DEAD_KEY)              \
-  case KC:                                      \
-  if (record->event.pressed) {                  \
-    tap_accented_letter(K1, DEAD_KEY);          \
-  }                                             \
-  return false;
-
-
-bool process_accent_keys(uint16_t keycode, keyrecord_t* record) {
-  switch(keycode){
-#ifdef ACCENTED_KEYS_ENABLE
-#include "accented_keys.def"
-#endif
-  }
-  return true;
-}
diff --git a/users/ericgebhart/extensions/accented_keys.h b/users/ericgebhart/extensions/accented_keys.h
deleted file mode 100644
index 017c6fa312..0000000000
--- a/users/ericgebhart/extensions/accented_keys.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-bool process_accent_keys(uint16_t keycode, keyrecord_t* record);
diff --git a/users/ericgebhart/extensions/alt_shift.c b/users/ericgebhart/extensions/alt_shift.c
deleted file mode 100644
index 002adec230..0000000000
--- a/users/ericgebhart/extensions/alt_shift.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include USERSPACE_H
-#include <stdbool.h>
-#include <stdint.h>
-
-bool shift_for_two(uint16_t keycode, keyrecord_t *record){
-  uint16_t mod_state = get_mods();
-
-  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
-    (get_oneshot_mods() & MOD_MASK_SHIFT);
-
-  if(record ->event.pressed) {
-    // If shifted, double these common punctuation marks.
-    if(is_shifted){
-      // clear shift temporarily
-      del_mods(MOD_MASK_SHIFT);
-      del_oneshot_mods(MOD_MASK_SHIFT);
-
-      tap_code16(keycode);
-      tap_code16(keycode);
-
-      // restore previous shift state
-      set_mods(mod_state);
-      return false;
-    }
-  }
-  return true;
-}
-
-bool shift_for_three(uint16_t keycode, keyrecord_t *record){
-  uint16_t mod_state = get_mods();
-
-  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
-    (get_oneshot_mods() & MOD_MASK_SHIFT);
-
-  if(record ->event.pressed) {
-    // If shifted, double these common punctuation marks.
-    if(is_shifted){
-      // clear shift temporarily
-      del_mods(MOD_MASK_SHIFT);
-      del_oneshot_mods(MOD_MASK_SHIFT);
-
-      tap_code16(keycode);
-      tap_code16(keycode);
-      tap_code16(keycode);
-
-      // restore previous shift state
-      set_mods(mod_state);
-      return false;
-    }
-  }
-  return true;
-  }
-
-bool override_shift(uint16_t keycode,
-                    uint16_t shift_keycode,
-                    keyrecord_t *record
-                    ) {
-
-  bool is_shifted = (get_mods() & MOD_MASK_SHIFT) ||
-    (get_oneshot_mods() & MOD_MASK_SHIFT);
-
-  if (record->event.pressed) {
-    if (is_shifted) {
-      uint8_t mod_state = get_mods();
-      del_mods(MOD_MASK_SHIFT);
-      del_oneshot_mods(MOD_MASK_SHIFT);
-
-      tap_code16(shift_keycode);
-
-      set_mods(mod_state);
-    } else {
-      //tap_code16(keycode);
-    }
-  }
-  return false;
-}
-
-// macros for use in alt_shift.defs.
-#define ALT_SHIFT(KCKEY, KC01)            \
-  case KCKEY:                                   \
-  return override_shift(KCKEY, KC01, record);   \
-  break;
-
-#define SHIFT_FOR_2(KCKEY)                      \
-  case KCKEY:                                   \
-  return shift_for_two(KCKEY, record);          \
-  break;
-
-#define SHIFT_FOR_3(KCKEY)                \
-  case KCKEY:                                   \
-  return shift_for_three(KCKEY, record);        \
-  break;
-
-bool process_alt_shift_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode){
-#include "alt_shift.def"
-  }
-  return true;
-}
diff --git a/users/ericgebhart/extensions/altlocal_keys.c b/users/ericgebhart/extensions/altlocal_keys.c
deleted file mode 100644
index 569a2076b5..0000000000
--- a/users/ericgebhart/extensions/altlocal_keys.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// Create custom keycodes with arbitrary shifted and unshifted keys.
-// originally for dvorak on bepo. But used by beakl on qwerty now too.
-
-// Why?: Because the keycodes are actually defined on the computer. So
-// if you are trying to have dvorak, or beakl on bepo-fr, the shifted keys
-// are wrong. But, I want my dvorak, so this allows the pairing of keys into
-// a keycode that has shifted and non shifted behavior, outside of what the
-// locale map says on the computer.
-//
-// These are the keys for dvorak on bepo.  column one is the keycode and mods for
-// the unshifted key, the second column is the keycode and mods for the shifted key.
-// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
-// reasonably sized array without difficulties. The macro is for the constant declarations
-// the function is for when we use it.
-
-//make an alt_local_keys.def   - see the example.
-// Include this file where you have your process_record_user function,
-// call process_alt_local_key inside your process_record_user.
-
-#include USERSPACE_H
-#include "altlocal_keys.h"
-
-const uint16_t key_translations[][2][2] = {
-#include "altlocal_keys.def"
-};
-
-uint8_t gr(uint16_t kc){
-  return (kc - SAFE_RANGE);
-}
-
-// send the right keycode for the right mod.
-// remove the mods we are taking care of,
-// send our keycodes then restore them.
-// all so we can make dvorak keys from bepo keycodes.
-void send_keycode(uint16_t kc){
-  uint8_t tmp_mods = get_mods();
-  bool is_shifted = ( tmp_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
-
-  // need to turn of the shift if it is on.
-  unregister_mods((MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)));
-  if(is_shifted){
-    register_mods(SHIFTED_MODS(kc));
-    register_code16(SHIFTED_KEY(kc));
-    unregister_code16(SHIFTED_KEY(kc));
-    unregister_mods(SHIFTED_MODS(kc));
-  } else{
-    register_mods(UNSHIFTED_MODS(kc));
-    register_code16(UNSHIFTED_KEY(kc));
-    unregister_code16(UNSHIFTED_KEY(kc));
-    unregister_mods(UNSHIFTED_MODS(kc));
-  }
-  clear_mods();
-  register_mods(tmp_mods);
-}
-
-bool process_alt_local_key(uint16_t keycode, keyrecord_t* record) {
-  switch(keycode){
-  case ALT_LOCAL_KEYS_START ... ALT_LOCAL_KEYS_END:
-    if(record->event.pressed)
-      send_keycode(keycode);
-    unregister_code(keycode);
-    break;
-  }
-  return (true);
-}
diff --git a/users/ericgebhart/extensions/altlocal_keys.h b/users/ericgebhart/extensions/altlocal_keys.h
deleted file mode 100644
index 8e30472081..0000000000
--- a/users/ericgebhart/extensions/altlocal_keys.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// Create custom keycodes with arbitrary shifted and unshifted keys.
-// originally for dvorak on bepo. But used by beakl on qwerty now too.
-
-// Why?: Because the keycodes are actually defined on the computer. So
-// if you are trying to have dvorak, or beakl on bepo-fr, the shifted keys
-// are wrong. But, I want my dvorak, so this allows the pairing of keys into
-// a keycode that has shifted and non shifted behavior, outside of what the
-// locale map says on the computer.
-//
-// These are the keys for dvorak on bepo.  column one is the keycode and mods for
-// the unshifted key, the second column is the keycode and mods for the shifted key.
-// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
-// reasonably sized array without difficulties. The macro is for the constant declarations
-// the function is for when we use it.
-
-//make an alt_local_keys.def   - see the example.
-// Include this file where you have your process_record_user function,
-// call process_alt_local_key inside your process_record_user.
-
-uint8_t gr(uint16_t);
-void send_keycode(uint16_t);
-bool process_alt_local_key(uint16_t keycode, keyrecord_t* record);
-
-#define MOD_NONE 0x00
-
-#define GR(x) (x-SAFE_RANGE)
-// indexs for the keycode translation table.
-
-#define MK_KEY(KCNAME, KC1, MOD1, KC2, MOD2)    \
-  [GR(KCNAME)] = {{KC1, MOD1}, {KC2, MOD2}},
-
-#define MK_SKEY(KCNAME, KC1, KC2)   \
-  [GR(KCNAME)] = {{KC1, MOD_NONE}, {KC2, MOD_NONE}},
-
-#define UNSHIFTED_KEY(key)  key_translations[gr(key)][0][0]
-#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1]
-#define SHIFTED_KEY(key)    key_translations[gr(key)][1][0]
-#define SHIFTED_MODS(key)   key_translations[gr(key)][1][1]
diff --git a/users/ericgebhart/extensions/console_key_logger.c b/users/ericgebhart/extensions/console_key_logger.c
deleted file mode 100644
index 074673bd06..0000000000
--- a/users/ericgebhart/extensions/console_key_logger.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
-
-#include USERSPACE_H
-#include "print.h"
-#include "console_key_logger.h"
-
-void process_console_key_logger(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    uprintf("0x%04X,%u,%u,%u,%b,0x%02X,0x%02X,%u\n",
-            keycode,
-            record->event.key.row,
-            record->event.key.col,
-            get_highest_layer(layer_state),
-            record->event.pressed,
-            get_mods(),
-            get_oneshot_mods(),
-            record->tap.count
-            );
-  }
-}
-#endif
diff --git a/users/ericgebhart/extensions/console_key_logger.h b/users/ericgebhart/extensions/console_key_logger.h
deleted file mode 100644
index 5e7e2d5bc0..0000000000
--- a/users/ericgebhart/extensions/console_key_logger.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-void process_console_key_logger(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/encoders.c b/users/ericgebhart/extensions/encoders.c
deleted file mode 100644
index 9a3d90b82f..0000000000
--- a/users/ericgebhart/extensions/encoders.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef ENCODER_ENABLE
-#include "encoders.h"
-#include USERSPACE_H
-
-encoder_action_t encoder_actions[] = {
-#include "encoders.def"
-};
-uint8_t  NUM_ENCODER_ACTIONS = sizeof(encoder_actions) / sizeof(encoder_action_t);
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  // do it twice, once for layer actions, once for non layer specific actions.
-  if (!do_encoder_action(index, clockwise, true)){
-    do_encoder_action(index, clockwise, false);
-  }
-  return false;
-}
-
-bool do_encoder_action(uint8_t index, bool clockwise, bool layer_actions) {
-  uint8_t mods = get_mods();
-  encoder_action_t *action;
-
-  // look for a match.
-  // on the layer, not on any layer.
-  // with the mods, or no mods.
-  for (int i = 0; i < NUM_ENCODER_ACTIONS; ++i) {
-    action = &encoder_actions[i];
-
-    // this encoder, or another.
-    if (action->index != index)
-              continue;
-
-    // skip non layer specific actions and visa versa
-    // two pass system, once for layers, again for
-    // actions without layers.
-    if (layer_actions){
-      if (action->layer == LAYER_NONE ||
-          action->layer != biton32(layer_state)){
-        continue;
-      }
-    }else if (action->layer != LAYER_NONE)
-      continue;
-
-    // no mods, or these mods.
-    if ((mods && (action->mods == MOD_NONE)) ||
-        (mods && (mods != action->mods)))
-    continue;
-
-    // found one.
-    if (clockwise) {
-      if (action->clockwise != 0) {
-        tap_code16(action->clockwise);
-      } else if (action->cw_func != NULL) {
-        action->cw_func();
-      }
-    } else {
-      if (action->counter_clockwise != 0) {
-        tap_code16(action->counter_clockwise);
-      } else if (action->ccw_func != NULL) {
-        action->ccw_func();
-      }
-    }
-  }
-  return false;
-}
-
-#endif
diff --git a/users/ericgebhart/extensions/encoders.h b/users/ericgebhart/extensions/encoders.h
deleted file mode 100644
index 458c5c541d..0000000000
--- a/users/ericgebhart/extensions/encoders.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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
-
-typedef struct {
-  uint16_t layer;
-  uint16_t index;  // 0 or 1, left/right.
-  uint16_t clockwise;
-  uint16_t counter_clockwise;
-  uint16_t mods;
-  void (*cw_func)(void);
-  void (*ccw_func)(void);
-} encoder_action_t;
-extern encoder_action_t encoder_actions[];
-extern uint8_t         NUM_ENCODER_ACTIONS;
-
-// haven't looked at the real values for index, but I know
-// 0 and 1 are left and right on my kyria.
-#define LEFT 0
-#define RIGHT 1
-#define LAYER_NONE -1
-#define MOD_NONE 0x00
-
-#define ENCODER_ACTION(LAYER, INDEX, CW_KC, CCW_KC, MOD)        \
-  {LAYER, INDEX, CW_KC, CCW_KC, MOD, NULL, NULL},
-
-#define ENCODER_FUNCTION(LAYER, INDEX, CW_FUNC, CCW_FUNC, MOD)  \
-  {LAYER, INDEX, 0, 0, MOD, CW_FUNC, CCW_FUNC},
-
-bool do_encoder_action(uint8_t index, bool clockwise, bool layer_actions);
diff --git a/users/ericgebhart/extensions/extensions.c b/users/ericgebhart/extensions/extensions.c
deleted file mode 100644
index f71e615a00..0000000000
--- a/users/ericgebhart/extensions/extensions.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-
-#include "extensions.h"
-#include "keymap_combo.h"
-#include "altlocal_keys.h"
-#include "tap_hold.h"
-#include "accented_keys.h"
-#include "process_smart_lock.h"
-#include "mod_lock.h"
-#include "oneshot.h"
-#include "process_nshot.h"
-#include "process_locales.h"
-#include "unicode.h"
-#include "key_overrides.h"
-#include "console_key_logger.h"
-
-// should make header files maybe. being lazy.
-void process_not_dead(uint16_t keycode, keyrecord_t *record);
-bool process_alt_shift_user(uint16_t keycode, keyrecord_t *record);
-void process_send_strs(uint16_t keycode, keyrecord_t *record);
-//bool process_alt_local_key(uint16_t keycode, keyrecord_t* record);
-bool process_global_quick_tap(uint16_t keycode, keyrecord_t *record);
-
-// call this from the top of process records before the switch.
-
-bool process_extensions(uint16_t keycode, keyrecord_t *record){
-  if (!process_locales(keycode, record)) { return false; }
-
-#ifdef GLOBAL_QUICK_TAP_ENABLE
-  if (!process_global_quick_tap(keycode, record)) {return false; }
-#endif
-#ifdef CAPS_WORD_ENABLE
- if (!process_caps_word(keycode, record)) { return false; }
-#endif
-#ifdef ALT_LOCAL_ENABLE
-  if (!process_alt_local_key(keycode, record)) { return false; }
-#endif
-#ifdef ACCENTED_KEYS_ENABLE
-  if (!process_accent_keys(keycode, record)) { return false; }
-#endif
-#ifdef TAP_HOLD_ENABLE
-  process_tap_hold_user(keycode, record);
-#endif
-#ifdef SMART_LOCK_ENABLE
-  process_smart_lock(keycode, record);
-#endif
-#ifdef MOD_LOCK_ENABLE
-  process_mod_lock(keycode, record);
-#endif
-#ifdef NSHOT_ENABLE
-  if(!process_nshot_state(keycode, record)) {return false;}
-#endif
-#ifdef SEND_UNICODE_ENABLE
-  process_unicode_strs(keycode, record);
-#endif
-#ifdef SEND_STRING_ENABLE
-  process_send_strs(keycode, record);
-#endif
-#ifdef NOT_DEAD_ENABLE
-  process_not_dead(keycode, record);
-#endif
-#ifdef ALT_SHIFT_ENABLE
-  if(!process_alt_shift_user(keycode, record)) {return false;}
-#endif
-#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
-  process_console_key_logger(keycode, record);
-#endif
-#ifdef ONESHOT_MOD_ENABLE
-  int8_t keycode_consumed = 0;
-  keycode_consumed += update_oneshot_modifiers(keycode, record, keycode_consumed);
-#endif
-  return true;
-
-}
diff --git a/users/ericgebhart/extensions/extensions.h b/users/ericgebhart/extensions/extensions.h
deleted file mode 100644
index 899dbdd3d6..0000000000
--- a/users/ericgebhart/extensions/extensions.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-bool process_extensions(uint16_t keycode, keyrecord_t *record);
-
-#define PROCESS_EXTENSIONS                                      \
-  if (!process_extensions(keycode, record)) {return false;}
diff --git a/users/ericgebhart/extensions/key_overrides.h b/users/ericgebhart/extensions/key_overrides.h
deleted file mode 100644
index 3fb0c9a5bb..0000000000
--- a/users/ericgebhart/extensions/key_overrides.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef KEY_OVERRIDE_ENABLE
-
-#define KO_NAME(name, ...) &name,
-#define KO_T(name) const key_override_t name
-
-#undef KOL
-#define KOL(name, mods, modded_key, replacement, layer)                 \
-  KO_T(name) = ko_make_with_layers(mods, modded_key, replacement, (1 << layer));
-
-#define KO(name, mods, key, replacement)                \
-  KO_T(name) = ko_make_basic(mods, key, replacement)
-
-#define KOLN(name, mods, key, replacement, layers, neg_mods)            \
-  KO_T(name) = ko_make_with_layers_and_negmods(mods, key, replacement, layers, neg_mods)
-
-#define KOLNO(name, mods, key, replacement, layers, neg_mods, options)  \
-  KO_T(name) = ko_make_with_layers_negmods_and_options                  \
-    (mods, key, replacement, layers, neg_mods, options)
-
-#include "key_overrides.def"
-
-#undef KO
-#undef KOL
-#undef KOLN
-#undef KOLNO
-#define KO KO_NAME
-#define KOL KO_NAME
-#define KOLN KO_NAME
-#define KOLNO KO_NAME
-
-// This globally defines all key overrides to be used
-const key_override_t **key_overrides = (const key_override_t *[]){
-#include "key_overrides.def"
-  NULL // Null terminate the array of overrides!
-};
-#endif
diff --git a/users/ericgebhart/extensions/keycodes.h b/users/ericgebhart/extensions/keycodes.h
deleted file mode 100755
index eafdfbad43..0000000000
--- a/users/ericgebhart/extensions/keycodes.h
+++ /dev/null
@@ -1,523 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "quantum.h"
-#include "process_keycode/process_tap_dance.h"
-#include "eeconfig.h"
-#include "keymap_bepo.h"
-//#include "keymap_us_international.h"
-#include "keymap_us_international_linux.h"
-#include "lang.h"
-#include "ericgebhart.h"
-
-//#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
-
-// #define DEFAULT_LANG EN // US_INT // EN, BEPO, US_INT, EURkey
-
-#define KEY_NAME(NAME, ...) NAME,
-#define BLANK(...)
-
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
-
-enum userspace_custom_keycodes {
-  // Get all the custom keys from the defs if we can.
-  ALT_LOCAL_KEYS_START = SAFE_RANGE,
-#ifdef ALT_LOCAL_ENABLE
-#undef MK_KEY
-#define MK_KEY KEY_NAME
-#undef MK_SKEY
-#define MK_SKEY KEY_NAME
-#include "altlocal_keys.def"
-#undef MK_KEY
-#undef MK_SKEY
-#endif
-  ALT_LOCAL_KEYS_END,
-
-#ifdef ACCENTED_KEYS_ENABLE
-#undef ACCENTED
-#define ACCENTED KEY_NAME
-#include "accented_keys.def"
-#undef ACCENTED
-#endif
-
-#ifdef TAP_HOLD_ENABLE
-#undef TP_TPL
-#define TP_TPL KEY_NAME
-#undef TP_SML
-#define TP_SML KEY_NAME
-#undef OPEN_OCL
-#define OPEN_OCL KEY_NAME
-#undef OPEN_OCL_ND
-#define OPEN_OCL_ND KEY_NAME
-#include "tap_hold.def"
-#undef OPEN_OCL
-#undef OPEN_OCL_ND
-#undef TP_TPL
-#undef TP_SML
-#endif
-
-#ifdef UNICODE_ENABLE
-#undef UC_STR
-#define UC_STR KEY_NAME
-#include "unicode.def"
-#undef UC_STR
-#endif
-
-#ifdef SEND_STRING_ENABLE
-#undef SEND_STR
-#define SEND_STR KEY_NAME
-#undef SEND_STR_DELAY
-#define SEND_STR_DELAY KEY_NAME
-#include "send_string.def"
-#undef SEND_STR
-#undef SEND_STR_DELAY
-#endif
-
-#ifdef SMART_LOCK_ENABLE
-#undef SMLM
-#define SMLM KEY_NAME
-#undef SMLL
-#define SMLL KEY_NAME
-#include "smart_lock.def"
-#undef SMLM
-#undef SMLL
-#endif
-
-#ifdef MOD_LOCK_ENABLE
-#undef IGNORE_KC
-#define IGNORE_KC BLANK
-#undef MODL
-#define MODL KEY_NAME
-#include "mod_lock.def"
-#undef IGNORE_KC
-#undef MODL
-#endif
-
-
-#undef IGNORE_KEY
-#define IGNORE_KEY BLANK
-#undef CANCEL_KEY
-#define CANCEL_KEY BLANK
-#undef ONESHOT
-#undef NSHOT
-#define ONESHOT KEY_NAME
-#define NSHOT KEY_NAME
-
-#ifdef NSHOT_ENABLE
-#include "nshot.def"
-#else
-  TS_RCTL,
-  TS_LCTL,
-#endif
-
-#ifdef ONESHOT_MOD_ENABLE
-#include "oneshot.def"
-#endif
-
-#undef IGNORE_KEY
-#undef CANCEL_KEY
-#undef ONESHOT
-#undef NSHOT
-
-#ifdef SWAPPER_ENABLE
-#undef SWAPPER_KEY
-#define SWAPPER_KEY KEY_NAME
-#include "swapper.def"
-#undef SWAPPER_KEY
-#endif
-
-#ifdef NOT_DEAD_ENABLE
-#undef NOT_DEAD
-#define NOT_DEAD KEY_NAME
-#include "not_dead.def"
-#undef NOT_DEAD
-#endif
-
-#include "custom_keys.def"
-  NEW_SAFE_RANGE
-};
-
-#define FIRST_LAYER (BEGINNING_OF_BASE_LAYERS + 1)
-
-#define TL_DQUO TLKC(_DQUO)
-#define TL_QUOT TLKC(_QUOT)
-#define TL_COMM TLKC(_COMM)
-#define TL_DOT  TLKC(_DOT)
-#define TL_SCLN TLKC(_SCLN)
-#define TL_SLSH TLKC(_SLSH)
-#define TL_EXLM TLKC(_EXLM)
-#define TL_MINS TLKC(_MINS)
-#define TL_LPRN TLKC(_LPRN)
-#define TL_LCBR TLKC(_LCBR)
-#ifdef SYMBOL_LAYER_ENABLE
-#define TL_DOT_SYMB LT(LN_SYMB, LANG_KC(TL_DOT))
-#endif
-
-
-#define BP_LT BP_LABK
-#define BP_GT BP_RABK
-#define BP_TAB KC_TAB
-#define US_GT US_RABK
-#define US_LT US_LABK
-#define US_TAB KC_TAB
-#define US_DCMM KC_COMM // us doesn't have this dead key.
-
-// this is odd, there is interplay between this and
-// the not-dead extension. - and tap-hold not-dead.
-#undef US_TILD
-#define US_TILD KC_TILD
-// redefine us_circ so we actually get a circ.
-#undef US_CIRC
-#define US_CIRC KC_CIRC
-#define US_EQUAL KC_EQUAL
-// redefine us_quote so we actually get a quote.
-#undef US_QUOT
-#define US_QUOT KC_QUOT
-
-#define US_PRINT_SCREEN KC_PRINT_SCREEN
-#define US_SCROLL_LOCK KC_SCROLL_LOCK
-#define US_PAUSE KC_PAUSE
-#define BP_PRINT_SCREEN KC_PRINT_SCREEN
-#define BP_SCROLL_LOCK KC_SCROLL_LOCK
-#define BP_PAUSE KC_PAUSE
-
-#define BP_F1 KC_F1
-#define BP_F2 KC_F2
-#define BP_F3 KC_F3
-#define BP_F4 KC_F4
-#define BP_F5 KC_F5
-#define BP_F6 KC_F6
-#define BP_F7 KC_F7
-#define BP_F8 KC_F8
-#define BP_F9 KC_F9
-#define BP_F10 KC_F10
-#define BP_F11 KC_F11
-#define BP_F12 KC_F12
-#define BP_TRNS KC_TRNS
-
-#define US_F1 KC_F1
-#define US_F2 KC_F2
-#define US_F3 KC_F3
-#define US_F4 KC_F4
-#define US_F5 KC_F5
-#define US_F6 KC_F6
-#define US_F7 KC_F7
-#define US_F8 KC_F8
-#define US_F9 KC_F9
-#define US_F10 KC_F10
-#define US_F11 KC_F11
-#define US_F12 KC_F12
-#define US_TRNS KC_TRNS
-
-#ifdef KEYPAD_LAYER_ENABLE
-#define TT_KEYPAD TT(LANG_N(_KEYPAD))
-#define MO_KEYPAD MO(LANG_N(_KEYPAD))
-#else
-#define TT_KEYPAD ___
-#define MO_KEYPAD ___
-#endif
-
-#ifdef SYMBOL_LAYER_ENABLE
-#define TT_SYMB TT(LANG_N(_SYMB))
-#define MO_SYMB MO(LANG_N(_SYMB))
-#define OSL_SYMB OSL(LANG_N(_SYMB))
-#else
-#define TT_SYMB ___
-#define MO_SYMB ___
-#define OSL_SYMB ___
-#endif
-
-#ifdef TOPROWS_LAYER_ENABLE
-#define TT_TOPROWS TT(LANG_N(_TOPROWS))
-#define MO_TOPROWS MO(LANG_N(_TOPROWS))
-#else
-#define TT_TOPROWS ___
-#define MO_TOPROWS ___
-#endif
-
-#ifdef RGB_LAYER_ENABLE
-#define MO_RGB MO(_RGB)
-#else
-#define MO_RGB ___
-#endif
-
-#ifdef ADJUST_LAYER_ENABLE
-#define MO_ADJUST MO(_ADJUST)
-#else
-#define MO_ADJUST ___
-#endif
-
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-//#define LN_ACCENTS_MORTE LANG_N(_ACCENTS_MORTE)
-#define OSL_ACCENTS_MORTE OSL(LANG_N(_ACCENTS_MORTE))
-#else
-#define OSL_ACCENTS_MORTE ___
-#endif
-
-#ifdef ACCENTS_LAYER_ENABLE
-#define LN_ACCENTS LANG_N(_ACCENTS)
-#define OSL_ACCENTS OSL(LN_ACCENTS)
-#else
-#define OSL_ACCENTS ___
-#endif
-
-#ifdef MORTE_LAYER_ENABLE
-#define LN_MORTE LANG_N(_MORTE)
-#define OSL_MORTE OSL(LN_MORTE)
-#else
-#define OSL_MORTE ___
-#endif
-
-#define CTLGUI_T(kc) MT(MOD_LGUI | MOD_LCTL, kc)
-#define SFTGUI_T(kc) MT(MOD_LGUI | MOD_LSFT, kc)
-#define ALTGUI_T(kc) MT(MOD_LGUI | MOD_LALT, kc)
-
-#define ALT_ENT     ALGR_T(KC_ENT)       // Alt oor nter
-#define CTL_ENT     CTL_T(KC_ENT)       // ctrl or space
-#define CTL_SPC     CTL_T(KC_SPC)       // ctrl or space
-#define CTL_BSPC    CTL_T(KC_BSPC)      // ctrl or backspace
-#define ALT_DEL     ALT_T(KC_DEL)       // Alt or delete
-#define GUI_ESC     GUI_T(KC_ESC)       // Gui or escape
-#define ALGR_SYMB   ALGR_T(TG(LANG_N(_SYMB))) // Alt gre or toggle symbol layer
-
-// one shot on tap, or hold like usual
-#define OSLCTL_CTL CTL_T(OS_LCTL)
-#define OSLSFT_SFT SFT_T(OS_LSFT)
-#define OSLALT_ALT ALT_T(OS_LALT)
-#define OSLGUI_GUI GUI_T(OS_LGUI)
-
-/* miryoku */
-/*   esc_media, space_navnm, tab_navm,  ENT_SYM, BSPC_TOPR, del_fun */
-/* hands down */
-/* TL_COMM, TL_DOT_SYMB, GUI_ESC, ALT_ENT, SPC_TOPR, BSPC */
-
-// Lots of LT options.  My thumb keys.
-#ifdef TOPROWS_LAYER_ENABLE
-#define LN_TOPROWS LANG_N(_TOPROWS)
-#else
-#define LN_TOPROWS KC_NO
-#endif
-
-#ifdef SYMBOL_LAYER_ENABLE
-#  define LN_SYMB LANG_N(_SYMB)
-#  define TH_LTR_SYM LT(LN_SYMB, THUMB_LETTER)
-#else
-#  define TH_LTR_SYM THUMB_LETTER
-#endif
-
-#define TH_LTR_NAV LT(_NAV, THUMB_LETTER)
-
-#define LN_KEYPAD LANG_N(_KEYPAD)
-
-#define ACCENTS_RALT MT(MOD_RALT, OSL_ACCENTS)
-#define ACCENTS_CTL MT(MOD_LCTL, OSL_ACCENTS)
-#define ENT_SYM LT(LN_SYMB, KC_ENT)
-#define ENT_NAV LT(_NAV, KC_ENT)
-#define ENT_TOPR LT(LN_TOPROWS, KC_ENT)
-
-#define ESC_TOPR LT(LN_TOPROWS, KC_ESC)
-#define ESC_SYMB LT(LN_SYMB, KC_ESC)
-#define ESC_NUM LT(LN_KEYPAD, KC_ESC)
-#define ESC_MEDIA LT(_MEDIA, KC_ESC)
-
-#define DEL_FUN LT(_FUN, KC_DEL)
-#define TAB_NAVM LT(_NAVm, KC_TAB)
-#define TAB_NUM LT(LN_KEYPAD, KC_TAB)
-#define I_SYMB LT(LN_SYMB, KC_I)
-
-#define SPC_NAVm   LT(_NAVm, KC_SPC)
-#define SPC_NAVnm  LT(_NAVnm, KC_SPC)
-#define SPC_NAV    LT(_NAV, KC_SPC)
-#define SPC_SYMB   LT(LN_SYMB, KC_SPC)
-#define SPC_TOPR   LT(LN_TOPROWS, KC_SPC)
-#define SPC_LAYR   LT(_LAYERS, KC_SPC)
-#define SPC_ADJ    LT(_ADJUST, KC_SPC)
-#define SPC_NUM    LT(LN_KEYPAD, KC_SPC)
-
-#define BSPC_NAVm  LT(_NAVm, KC_BSPC)
-#define BSPC_NAV   LT(_NAV, KC_BSPC)
-#ifdef SYMBOL_LAYER_ENABLE
-#define BSPC_SYMB  LT(LN_SYMB, KC_BSPC)
-#else
-#define BSPC_SYMB  KC_BSPC
-#endif
-#define BSPC_TOPR  LT(LN_TOPROWS, KC_BSPC)
-#define BSPC_NUM   LT(LN_KEYPAD, KC_BSPC)
-#define BSPC_ALT   MT(MOD_LALT, KC_BSPC)
-#define BSPC_MEDIA LT(_MEDIA, KC_BSPC)
-
-#define KC_BKTAB    LSFT(KC_TAB)
-
-// layer toggles
-#define LAYER_OSL   OSL(_LAYERS)
-#define SYM_OSL     OSL(LN_SYMB)
-#define SYM_TG      TG(LN_SYMB)
-#define SYM_MO      MO(LN_SYMB)
-#define NAV_TG      TG(_NAV)
-#define COMBO_REF_TG_EN TG(_COMBO_REF)
-#define NUM_OSL     OSL(LN_KEYPAD)
-#define NUM_TO      TO(LN_KEYPAD)
-#define FUN_OSL     OSL(LN_FUNC)
-#define SYS_OSL     OSL(LN_SYSTEM)
-#define SYS_TG      TG(LN_SYSTEM)
-
-// Shortcuts
-#define S_CUT       S(KC_DEL)
-#define S_COPY      C(KC_INS)
-#define S_PASTE     S(KC_INS)
-#define S_UNDO      C(KC_Z)
-#define S_REDO      C(KC_Y)
-#define S_SAVE      C(KC_S)
-#define S_ALL       C(KC_A)
-#define S_BACK      A(KC_LEFT)
-#define S_FWD       A(KC_RIGHT)
-#define C_BSPC      C(KC_BSPC)
-#define SCREEN      S(C(KC_PSCR))
-
-// One Shot Mods keycodes,
-#define KC_MLSF OSM(MOD_LSFT)
-#define KC_MRSF OSM(MOD_RSFT)
-#define OS_LGUI OSM(MOD_LGUI)
-#define OS_RGUI OSM(MOD_RGUI)
-#define OS_LSFT OSM(MOD_LSFT)
-#define OS_RSFT OSM(MOD_RSFT)
-#define OS_LCTL OSM(MOD_LCTL)
-#define OS_RCTL OSM(MOD_RCTL)
-#define OS_LALT OSM(MOD_LALT)
-#define OS_RALT OSM(MOD_RALT)
-#define ALT_APP ALT_T(KC_APP)
-
-#define MG_NKRO MAGIC_TOGGLE_NKRO
-
-#define UC_IRNY UC(0x2E2E)
-#define UC_CLUE UC(0x203D)
-
-
-////  TAP DANCE
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tdtap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //send two single taps
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7
-};
-
-//Tap Dance Declarations
-enum {
-  TD_ESC_CAPS = 0,
-  TD_TAB_BKTAB = 1,
-  TD_MDIA_SYMB = 2,
-  TD_HOME_END = 3,
-  TD_XMONAD_ESC = 4,
-  TD_DEF_LAYER_SW = 5,
-  TD_DEF_OS_LAYER_SW = 6,
-  TD_MOUSE_BTNS = 7,
-  TD_DVORAK_BEPO = 8,
-  TD_UP_HOME = 9,
-  TD_DOWN_END = 10,
-  TD_RIGHT_TAB = 11,
-  TD_LEFT_BACKTAB = 12
-};
-
-
-// Tap dance
-#define TAB_BKTAB       TD(TD_TAB_BKTAB)  // Tab or backtab tapdance.
-#define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB)  // MDIA, symb, keypad, layouts layer tapdance toggle.
-#define DEF_LAYER_SW    TD(TD_DEF_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
-#define DEF_OS_LAYER_SW TD(TD_DEF_OS_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
-#define HOME_END        TD(TD_HOME_END)  // home or end tapdance.
-#define XMONAD_ESC      TD(TD_XMONAD_ESC)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
-#define DVORAK_ET_BEPO  TD(TD_DVORAK_BEPO)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
-#define TDMOUSE_BTNS    TD(TD_MOUSE_BTNS)  // hmmm. 1-5
-#define RIGHT_TAB       TD(TD_RIGHT_TAB)   // Bad idea these 4. Maybe with good timing...
-#define LEFT_BACKTAB    TD(TD_LEFT_BACKTAB)
-#define UP_HOME         TD(TD_UP_HOME)
-#define DOWN_END        TD(TD_DOWN_END)  //  No! Down Down Not End....
-
-// HOME ROW LAYER TOGGLE (LT) and Shift.
-// both sides of the home row have  "shift, ___, media , symb, ___"  and  "___, symb, media, ___, shift".
-// so pinky fingers are shift when held and the index and second fingers are symbol and
-// media layers when held.
-
-// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
-// The KC_CCCV key takes care of the last two...
-#define MK_CUT    LSFT(KC_DEL)  // shift + delete
-#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
-#define MK_PASTE  LSFT(KC_INS)  // shift + insert
-#define EOT     LCTL(KC_D)
-#define NAK     LCTL(KC_U)
-#define XPASTE   LCTL(LSFT(KC_V))
-#define UNDO    LCTL(KC_Z)
-#define XCOPY   LCTL(LSFT(KC_C))
-
-#undef ___ //kint defines it as KC_NO
-#define ___ KC_TRNS
-#define XXX KC_NO
-#define ____ _TRNS
-
-// Blocking keys
-#define _X_ XXX
-#define ___X___ XXX
-#define ___X2___ XXX, XXX
-#define ___X3___ ___X2___, XXX
-#define ___X4___ ___X3___, XXX
-#define ___X5___ ___X4___, XXX
-#define ___X6___ ___X5___, XXX
-#define ___X12___ ___X6___, ___X6___
-#define ___X15___ ___X5___, ___X5___,  ___X5___
-
-// Transparent keys
-#define ___2___ ___, ___
-#define ___3___ ___2___, ___
-#define ___4___ ___3___, ___
-#define ___5___ ___4___, ___
-#define ___6___ ___5___, ___
-#define ___10___ ___6___, ___4___
-#define ___12___ ___6___, ___6___
-#define ___14___ ___5___, ___4___,  ___5___
-#define ___15___ ___5___, ___5___,  ___5___
-#define ___16___ ___15___, ___
-
-#define ____2_ ____, ____
-#define ____3_ ____2_, ____
-#define ____4_ ____3_, ____
-#define ____5_ ____4_, ____
-#define ____6_ ____5_, ____
-#define ____10_ ____6_, ____4_
-#define ____12_ ____6_, ____6_
-#define ____14_ ____5_, ____4_,  ____5_
-#define ____15_ ____5_, ____5_,  ____5_
-#define ____16_ ____15_, ____
-
-int on_qwerty(void);
-
-#ifdef TAP_DANCES_ENABLE
-int cur_dance (tap_dance_state_t *state);
-
-//for the x tap dance. Put it here so it can be used in any keymap
-void x_finished (tap_dance_state_t *state, void *user_data);
-void x_reset (tap_dance_state_t *state, void *user_data);
-#endif
diff --git a/users/ericgebhart/extensions/keymap_combo.h b/users/ericgebhart/extensions/keymap_combo.h
deleted file mode 100644
index e918fa08ea..0000000000
--- a/users/ericgebhart/extensions/keymap_combo.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Keymap helpers
-void process_combo_event(uint16_t combo_index, bool pressed);
-
-
-// define reference layers per layer.
-#define REF_LAYER(LAYER, REF_LAYER)             \
-  case LAYER: return REF_LAYER;
-
-#define K_ENUM(name, key, ...) name,
-#define K_DATA(name, key, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END};
-#define K_COMB(name, key, ...) [name] = COMBO(cmb_##name, key),
-
-#define A_ENUM(name, string, ...) name,
-#define A_DATA(name, string, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END};
-#define A_COMB(name, string, ...) [name] = COMBO_ACTION(cmb_##name),
-#define A_ACTI(name, string, ...)         \
-    case name:                            \
-        if (pressed) SEND_STRING(string); \
-        break;
-
-#define A_TOGG(name, layer, ...)          \
-    case name:                            \
-        if (pressed) layer_invert(layer); \
-        break;
-
-#define BLANK(...)
-// Generate data needed for combos/actions
-// Create Enum
-#define COMBO_REF_LAYER BLANK
-#undef COMB
-#undef SUBS
-#undef TOGG
-#define COMB K_ENUM
-#define SUBS A_ENUM
-#define TOGG A_ENUM
-enum combos {
-#include "combos.def"
-};
-
-// Bake combos into mem
-#undef COMB
-#undef SUBS
-#undef TOGG
-#define COMB K_DATA
-#define SUBS A_DATA
-#define TOGG A_DATA
-#include "combos.def"
-#undef COMB
-#undef SUBS
-#undef TOGG
-
-// Fill combo array
-#define COMB K_COMB
-#define SUBS A_COMB
-#define TOGG A_COMB
-combo_t key_combos[] = {
-#include "combos.def"
-};
-#undef COMB
-#undef SUBS
-#undef TOGG
-
-// Fill QMK hook
-#define COMB BLANK
-#define SUBS A_ACTI
-#define TOGG A_TOGG
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-#if defined( CONSOLE_ENABLE) && defined(CONSOLE_KEY_LOGGER_ENABLE)
-  if (pressed) {
-    combo_t *combo = &key_combos[combo_index];
-    uint8_t idx = 0;
-    uint16_t combo_keycode;
-    while ((combo_keycode = pgm_read_word(&combo->keys[idx])) != COMBO_END) {
-      uprintf("0x%04X,NA,NA,%u,%u,0x%02X,0x%02X,0\n",
-              combo_keycode,
-              /* <missing row information> */
-              /* <missing column information> */
-              get_highest_layer(layer_state),
-              pressed,
-              get_mods(),
-              get_oneshot_mods()
-              );
-      idx++;
-    }
-  }
-#endif
-  switch (combo_index) {
-#include "combos.def"
-  }
-
-  // Allow user overrides per keymap
-#if __has_include("inject.h")
-# include "inject.h"
-#endif
-}
-
-#undef COMB
-#undef SUBS
-#undef TOGG
-
-#define COMB BLANK
-#define SUBS BLANK
-#define TOGG BLANK
-
-#undef COMBO_REF_LAYER
-#define COMBO_REF_LAYER REF_LAYER
-
-uint16_t combo_ref_from_layer(uint16_t layer){
-  switch (biton32(layer_state)){
-#include "combos.def"
-
-#ifdef COMBO_REF_DEFAULT
-  default: return COMBO_REF_DEFAULT;
-#else
-  default: return layer;
-#endif
-  }
-}
diff --git a/users/ericgebhart/extensions/mod_lock.c b/users/ericgebhart/extensions/mod_lock.c
deleted file mode 100644
index c78f7cdfe8..0000000000
--- a/users/ericgebhart/extensions/mod_lock.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
-
-  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/>.
-*/
-// Derived from mod_lock by @possumvibes.
-
-#include "mod_lock.h"
-
-#undef MODL
-#define MODL(KEYCODE, MODKC)                    \
-  {false, MODKC, KEYCODE},
-
-#define A_KEY(KEYCODE) case KEYCODE:
-#define BLANK(...)
-
-#undef IGNORE_KC
-#define IGNORE_KC BLANK
-
-mod_lock_state_t modlock_states[] = {
-#ifdef MOD_LOCK_ENABLE
-#include "mod_lock.def"
-#endif
-};
-uint8_t        NUM_MODLOCK_STATES = sizeof(modlock_states) / sizeof(mod_lock_state_t);
-
-void process_mod_lock(uint16_t keycode, keyrecord_t *record) {
-#ifdef MOD_LOCK_ENABLE
-  mod_lock_state_t *curr_state = NULL;
-
-  for (int i = 0; i < NUM_MODLOCK_STATES; ++i) {
-    curr_state = &modlock_states[i];
-
-    if (keycode == curr_state->trigger) {
-      if (record->event.pressed) {
-        if (curr_state->locking) {
-          unregister_code(curr_state->mod);
-        } else {
-          register_code(curr_state->mod);
-        }
-
-        curr_state->locking = !curr_state->locking;
-      }
-    } else {
-      // check for cancel condition on keydown and keyup
-      if (curr_state->locking && is_mod_lock_cancel_key(keycode)) {
-        unregister_code(curr_state->mod);
-        curr_state->locking = false;
-      }
-    }
-  }
-#endif
-}
-
-#undef MODL
-#undef IGNORE_KC
-#define MODL BLANK
-#define IGNORE_KC A_KEY
-bool is_mod_lock_cancel_key(uint16_t keycode) {
-    // Mod locks are exclusively used on the nav layer.
-    // any key besides nav keys should cancel the lock.
-    switch (keycode) {
-#ifdef MOD_LOCK_ENABLE
-#include "mod_lock.def"
-#endif
-      return false;
-    default:
-            return true;
-    }
-}
diff --git a/users/ericgebhart/extensions/mod_lock.h b/users/ericgebhart/extensions/mod_lock.h
deleted file mode 100644
index d9e6106c4e..0000000000
--- a/users/ericgebhart/extensions/mod_lock.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-
-typedef struct {
-    bool          locking;
-    uint16_t      mod;
-    uint16_t      trigger;
-} mod_lock_state_t;
-
-extern mod_lock_state_t mod_lock_states[];
-extern uint8_t          NUM_MODLOCK_STATES;
-
-// Custom mod-locking functionality that registers the mod and
-// keeps it registered until the trigger key is tapped again
-// or until a specified cancel key is tapped.
-void process_mod_lock(uint16_t keycode, keyrecord_t *record);
-
-bool is_mod_lock_cancel_key(uint16_t keycode);
-
-#undef IGNORE_KC
-#define IGNORE_KC(KC)                           \
-  case KC:
diff --git a/users/ericgebhart/extensions/not_dead.c b/users/ericgebhart/extensions/not_dead.c
deleted file mode 100644
index 8369edd52d..0000000000
--- a/users/ericgebhart/extensions/not_dead.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-
-inline void not_dead(uint16_t kc1, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_code16(kc1);
-    tap_code16(KC_SPACE);
-  }
-}
-
-#define NOT_DEAD(KCKEY, KC01)             \
-  case KCKEY:                             \
-  not_dead(KC01, record);                 \
-  break;                                  \
-
-void process_not_dead(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode){
-#include "not_dead.def"
-  }
-}
diff --git a/users/ericgebhart/extensions/nshot_mod.c b/users/ericgebhart/extensions/nshot_mod.c
deleted file mode 100644
index 1346f7eba6..0000000000
--- a/users/ericgebhart/extensions/nshot_mod.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
-
-  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/>.
-*/
-// Derived from nshot_mod by @possumvibes.
-// Derived from one shot_mod by @Callum.
-
-#include "nshot_mod.h"
-#include USERSPACE_H
-
-#undef NSHOT
-#define NSHOT(KEYCODE, MOD, COUNT)              \
-  {KEYCODE, MOD, COUNT, os_up_unqueued, 0},
-
-#undef ONESHOT
-#define ONESHOT(KEYCODE, MOD) NSHOT(KEYCODE, MOD, 1)
-#define A_KEY(KEYCODE) case KEYCODE:
-#define BLANK(...)
-
-#define CANCEL_KEY BLANK
-#define IGNORE_KEY BLANK
-nshot_state_t  nshot_states[] = {
-#include "nshot.def"
-};
-uint8_t        NUM_NSHOT_STATES = sizeof(nshot_states) / sizeof(nshot_state_t);
-
-bool process_nshot_state(uint16_t keycode, keyrecord_t *record) {
-  nshot_state_t *curr_state = NULL;
-
-  switch(keycode){
-  case CLEAR: {
-    clear_oneshot_mods();
-    clear_mods();
-    return false;
-  }
-  case PANIC: {
-    clear_oneshot_mods();
-    clear_mods();
-    if (get_oneshot_layer() != 0) {
-      clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-    }
-    layer_move(0);
-    return false;
-  }
-  }
-
-  for (int i = 0; i < NUM_NSHOT_STATES; ++i) {
-    curr_state = &nshot_states[i];
-
-    if (keycode == curr_state->trigger) {
-      if (record->event.pressed) {
-        // Trigger keydown
-        if (curr_state->state == os_up_unqueued) {
-          register_code(curr_state->mod);
-        }
-        curr_state->state = os_down_unused;
-        curr_state->count = 0;
-      } else {
-        // Trigger keyup
-        switch (curr_state->state) {
-        case os_down_unused:
-          // If we didn't use the mod while trigger was held, queue it.
-          curr_state->state = os_up_queued;
-          break;
-        case os_down_used:
-          // If we did use the mod while trigger was held, unregister it.
-          curr_state->state = os_up_unqueued;
-          unregister_code(curr_state->mod);
-          break;
-        default:
-          break;
-        }
-      }
-} else {
-       if (record->event.pressed) {
-         if (is_nshot_cancel_key(keycode) && curr_state->state != os_up_unqueued) {
-           // Cancel oneshot on designated cancel keydown.
-           curr_state->state = os_up_unqueued;
-           curr_state->count = 0;
-           unregister_code(curr_state->mod);
-         }
-       } else {
-         if (!is_nshot_ignored_key(keycode)) {
-           // On non-ignored keyup, consider the oneshot used.
-           switch (curr_state->state) {
-           case os_down_unused:
-             // The mod key is being held as a normal mod.
-             curr_state->state = os_down_used;
-             break;
-           case os_up_queued:
-             // The mod key is being used as an n-shot.
-             // Increment the keys-used count.
-             curr_state->count = curr_state->count + 1;
-
-             // If the n-shot max has been reached, complete the n-shot.
-             if (curr_state->count == curr_state->max_count) {
-               curr_state->state = os_up_unqueued;
-               curr_state->count = 0;
-               unregister_code(curr_state->mod);
-             }
-             break;
-           default:
-             break;
-           }
-         }
-       }
-     }
-   }
-  return true;
-}
-
-// turn off the nshot/oneshot macros
-#undef ONESHOT
-#undef NSHOT
-#define ONESHOT BLANK
-#define NSHOT BLANK
-
-#undef CANCEL_KEY
-#undef IGNORE_KEY
-#define IGNORE_KEY BLANK
-#define CANCEL_KEY A_KEY
-bool is_nshot_cancel_key(uint16_t keycode) {
-  switch (keycode) {
-#include "nshot.def"
-    return true;
-  default:
-    return false;
-  }
-}
-
-#undef CANCEL_KEY
-#undef IGNORE_KEY
-#define CANCEL_KEY BLANK
-#define IGNORE_KEY A_KEY
-bool is_nshot_ignored_key(uint16_t keycode) {
-    switch (keycode) {
-#include "nshot.def"
-      return true;
-    default:
-            return false;
-    }
-}
diff --git a/users/ericgebhart/extensions/nshot_mod.h b/users/ericgebhart/extensions/nshot_mod.h
deleted file mode 100644
index c5840e6bef..0000000000
--- a/users/ericgebhart/extensions/nshot_mod.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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
-
-// Represents the four states an n-shot key can be in (from users/callum)
-typedef enum {
-    os_up_unqueued,
-    os_up_queued,
-    os_down_unused,
-    os_down_used,
-} oneshot_state;
-
-typedef struct {
-    uint16_t      trigger;
-    uint16_t      mod;
-    uint8_t       max_count;
-    oneshot_state state;
-    uint8_t       count;
-} nshot_state_t;
-
-extern nshot_state_t nshot_states[];
-extern uint8_t             NUM_NSHOT_STATES;
-
-
-// Keys that should cancel the n-shot mod if tapped
-bool is_nshot_cancel_key(uint16_t keycode);
-
-// Keys that should not count towards n-shot usage (e.g., layer toggles)
-bool is_nshot_ignored_key(uint16_t keycode);
diff --git a/users/ericgebhart/extensions/oneshot.c b/users/ericgebhart/extensions/oneshot.c
deleted file mode 100644
index 8d4dc2f29c..0000000000
--- a/users/ericgebhart/extensions/oneshot.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#include QMK_KEYBOARD_H
-#include USERSPACE_H
-#include "oneshot.h"
-
-#ifdef ONESHOT_MOD_ENABLE
-
-/* -------------------------------------------- */
-// Add to process_record_user.
-/* int8_t keycode_consumed = 0; */
-
-/* #ifdef ONESHOT_ENABLE */
-/* keycode_consumed += update_oneshot_modifiers(keycode, record, keycode_consumed); */
-/* #endif */
-/* -------------------------------------------- */
-
-#define ONESHOT(KEYCODE, MOD) case KEYCODE: return MOD;
-
-#define A_KEY(KEYCODE) case KEYCODE:
-#define BLANK(...)
-
-#define CANCEL_KEY BLANK
-#define IGNORE_KEY BLANK
-
-// the basic states a oneshot modifier can be in
-typedef enum {
-    ONESHOT_STATE_OFF          = 0,
-    ONESHOT_STATE_PRESSED      = 1,
-    ONESHOT_STATE_QUEUED       = 2,
-    ONESHOT_STATE_CAPSWORD     = 3,
-    ONESHOT_STATE_LOCK         = 4,
-    ONESHOT_STATE_END_PRESSED  = 5,
-} oneshot_state;
-
-oneshot_state modifiers_state_transitions_normal[5] = {ONESHOT_STATE_PRESSED, ONESHOT_STATE_QUEUED, ONESHOT_STATE_LOCK, ONESHOT_STATE_END_PRESSED, ONESHOT_STATE_END_PRESSED};
-
-static oneshot_state modifiers_with_state[ONESHOT_MOD_COUNT] = {
-    ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF, ONESHOT_STATE_OFF,
-};
-
-// oneshot mods always get registered immediately to the operating system, but we also
-// need to keep track if the mod(s) got combined with a normal key (applied)
-static bool unapplied_mods_present = false;
-
-// keycode of the last pressed 'normal' key which haven't been released yet
-static uint16_t repeating_normal_key = 0;
-
-// utility functions (implemented at the bottom of this file)
-static void          set_modifier_state(oneshot_mod osmod, oneshot_state new_state);
-static int8_t        set_modifier_state_all(oneshot_state new_state);
-static void          set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_state oneshot_state_to);
-static bool          all_modifiers_are_off(void);
-
-int8_t turnoff_oneshot_modifiers(void) {
-    return set_modifier_state_all(ONESHOT_STATE_OFF);
-}
-
-// see comment in corresponding headerfile
-int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t keycode_consumed) {
-
-    // cancel keys
-  if (is_oneshot_modifier_cancel_key(keycode) && record->event.pressed) {
-    if (keycode_consumed == 0) {
-      unapplied_mods_present = false;
-      keycode_consumed += set_modifier_state_all(ONESHOT_STATE_OFF);
-    } else {
-      keycode_consumed = 0;
-    }
-    return keycode_consumed;
-  }
-
-  // ignored keys
-  if (is_oneshot_modifier_ignored_key(keycode)) {
-    return keycode_consumed;
-  }
-
-  oneshot_mod osmod = get_modifier_for_trigger_key(keycode);
-
-  // trigger keys
-  if (osmod != ONESHOT_NONE) {
-    oneshot_state state = modifiers_with_state[osmod];
-    if (record->event.pressed) {
-      if (state == ONESHOT_STATE_OFF) {
-        unapplied_mods_present = (repeating_normal_key == 0);
-      }
-      oneshot_state tostate = modifiers_state_transitions_normal[state];
-      set_modifier_state(osmod, tostate);
-    } else {
-      if (state == ONESHOT_STATE_PRESSED) {
-        if (!unapplied_mods_present) {
-          set_modifier_state(osmod, ONESHOT_STATE_OFF);
-        } else {
-          set_modifier_state(osmod, ONESHOT_STATE_QUEUED);
-        }
-      } else if (state == ONESHOT_STATE_END_PRESSED) {
-        set_modifier_state(osmod, ONESHOT_STATE_OFF);
-      }
-    }
-  }
-  // normal keys
-  else {
-    if (record->event.pressed) {
-      if (!all_modifiers_are_off()) {
-        if (unapplied_mods_present) {
-          unapplied_mods_present = false;
-        } else {
-          unregister_code(repeating_normal_key);
-          set_modifier_state_all_from_to(ONESHOT_STATE_QUEUED, ONESHOT_STATE_OFF);
-        }
-      }
-      repeating_normal_key = keycode;
-    } else {
-      if (!all_modifiers_are_off()) {
-        unregister_code(keycode);
-        set_modifier_state_all_from_to(ONESHOT_STATE_QUEUED, ONESHOT_STATE_OFF);
-      }
-      repeating_normal_key = 0;
-    }
-  }
-
-  return 0;
-}
-
-// implementation of utility functions
-
-// registers/unregisters a mod to the operating system on state change if necessary
-void update_modifier(oneshot_mod osmod, oneshot_state previous_state, oneshot_state current_state) {
-    if (previous_state == ONESHOT_STATE_OFF) {
-        register_code(KC_LCTL + osmod);
-    } else {
-        if (current_state == ONESHOT_STATE_OFF) {
-            unregister_code(KC_LCTL + osmod);
-        }
-    }
-}
-
-void set_modifier_state(oneshot_mod osmod, oneshot_state new_state) {
-    oneshot_state previous_state = modifiers_with_state[osmod];
-    if (previous_state != new_state) {
-        modifiers_with_state[osmod] = new_state;
-        update_modifier(osmod, previous_state, new_state);
-    }
-}
-
-int8_t set_modifier_state_all(oneshot_state new_state) {
-    int8_t c = 0;
-    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
-        oneshot_state previous_state = modifiers_with_state[i];
-        if (previous_state != new_state) {
-            modifiers_with_state[i] = new_state;
-            update_modifier(i, previous_state, new_state);
-            c += 1;
-        }
-    }
-    return c;
-}
-
-void set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_state oneshot_state_to) {
-    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
-        if (modifiers_with_state[i] == oneshot_state_from) {
-            modifiers_with_state[i] = oneshot_state_to;
-            update_modifier(i, oneshot_state_from, oneshot_state_to);
-        }
-    }
-}
-
-bool all_modifiers_are_off(void) {
-    for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) {
-        if (modifiers_with_state[i] != ONESHOT_STATE_OFF) {
-            return false;
-        }
-    }
-    return true;
-}
-
-oneshot_mod get_modifier_for_trigger_key(uint16_t keycode)
-{
-  switch (keycode)
-    {
-#include "oneshot.def"
-      return true;
-    default:
-      return ONESHOT_NONE;
-    }
-}
-
-// turn off the oneshot macros
-#undef ONESHOT
-#define ONESHOT BLANK
-#define NSHOT BLANK
-
-#undef CANCEL_KEY
-#undef IGNORE_KEY
-#define CANCEL_KEY A_KEY
-#define IGNORE_KEY BLANK
-bool is_oneshot_modifier_cancel_key(uint16_t keycode) {
-  switch (keycode) {
-#include "oneshot.def"
-    return true;
-  default:
-    return false;
-  }
-}
-
-#undef CANCEL_KEY
-#undef IGNORE_KEY
-#define CANCEL_KEY BLANK
-#define IGNORE_KEY A_KEY
-bool is_oneshot_modifier_ignored_key(uint16_t keycode) {
-  switch (keycode) {
-#include "oneshot.def"
-    return true;
-  default:
-    return false;
-  }
-}
-
-#endif
diff --git a/users/ericgebhart/extensions/oneshot.h b/users/ericgebhart/extensions/oneshot.h
deleted file mode 100644
index 774dc4ab39..0000000000
--- a/users/ericgebhart/extensions/oneshot.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#define ENABLE_ONESHOT
-#ifdef ENABLE_ONESHOT
-#pragma once
-
-typedef enum {
-  ONESHOT_LCTL = 0,
-  ONESHOT_LSFT = 1,
-  ONESHOT_LALT = 2,
-  ONESHOT_LGUI = 3,
-  ONESHOT_RCTL = 4,
-  ONESHOT_RSFT = 5,
-  ONESHOT_RALT = 6,
-  ONESHOT_RGUI = 7,
-  ONESHOT_NONE = 8,
-  ONESHOT_MOD_COUNT = 8,
-} oneshot_mod;
-
-
-// This function should be called inside proces_record_user and does everything needed to get one shot modifiers working.
-// Returns true if the keycode needs further handling, false otherwise.
-int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t keycode_consumed);
-int8_t turnoff_oneshot_modifiers(void);
-
-// TO BE IMPLEMENTED BY THE USER
-// This function should return one of the oneshot_mod enumerations (see keymap.c implementation)
-oneshot_mod get_modifier_for_trigger_key(uint16_t keycode);
-
-// TO BE IMPLEMENTED BY THE USER
-// This function should return true for keycodes that must be ignored in the oneshot modifier behaviour.
-// You probably want to ignore layer keys. Trigger keys don't need to be specified here.
-bool is_oneshot_modifier_ignored_key(uint16_t keycode);
-
-// TO BE IMPLEMENTED BY THE USER
-// This function should return true for keycodes that should reset all oneshot modifiers.
-bool is_oneshot_modifier_cancel_key(uint16_t keycode);
-
-#endif
diff --git a/users/ericgebhart/extensions/process_locales.h b/users/ericgebhart/extensions/process_locales.h
deleted file mode 100644
index d0f7af53bf..0000000000
--- a/users/ericgebhart/extensions/process_locales.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-
-// Stuff we need for locale and layer switching
-// there can be more but we need to know where they start and end.
-// remember there's limitations on layers.
-// Our locales. so it's easy to switch between them.
-
-bool process_locales(uint16_t keycode, keyrecord_t *record);
-
-#define PROCESS_LOCALES                                         \
-  if (!process_locales(keycode, record)) { return false; }
diff --git a/users/ericgebhart/extensions/process_nshot.h b/users/ericgebhart/extensions/process_nshot.h
deleted file mode 100644
index 1ec42db478..0000000000
--- a/users/ericgebhart/extensions/process_nshot.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Custom one-or-more-shot implementation that does not rely on timers
-// and persists across layer changes. Based on the users/callum implementation
-// at https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
-bool process_nshot_state(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/process_smart_lock.h b/users/ericgebhart/extensions/process_smart_lock.h
deleted file mode 100644
index b8e2fb2735..0000000000
--- a/users/ericgebhart/extensions/process_smart_lock.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-///* -------- Process Record -------- */
-void process_smart_lock(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/quick_tap.c b/users/ericgebhart/extensions/quick_tap.c
deleted file mode 100644
index 8c25f153bd..0000000000
--- a/users/ericgebhart/extensions/quick_tap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com>, @possumvibes
-
-  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/>.
-*/
-
-// written by @dnaq.
-#if defined( global_quick_tap) && defined(CONSOLE_KEY_LOGGER_ENABLE)
-    bool process_global_quick_tap(uint16_t keycode, keyrecord_t *record) {
-      static uint16_t global_quick_tap_timer = 0;
-      if (keycode < QK_MOD_TAP || keycode > QK_MOD_TAP_MAX) {
-        global_quick_tap_timer = timer_read();
-        return true;
-      }
-      if (timer_elapsed(global_quick_tap_timer) > TAPPING_TERM) {
-        return true;
-      }
-      if (record->event.pressed) {
-        keycode = keycode & 0xFF;
-        global_quick_tap_timer = timer_read();
-        tap_code(keycode);
-        return false;
-      }
-      return true;
-    }
-#endif
diff --git a/users/ericgebhart/extensions/send_string.c b/users/ericgebhart/extensions/send_string.c
deleted file mode 100644
index 50237f5143..0000000000
--- a/users/ericgebhart/extensions/send_string.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-#include "version.h"
-
-#define SEND_STR(KEYC, STRING)                  \
-  case KEYC:                                    \
-  if (record->event.pressed) {                  \
-    SEND_STRING(STRING);                        \
-  }                                             \
-  break;
-
-#define SEND_STR_DELAY(KEYC, STRING)                    \
-  case KEYC:                                            \
-  if (record->event.pressed) {                          \
-    SEND_STRING_DELAY(STRING, TAP_CODE_DELAY);     \
-  }                                                \
-  break;
-
-void process_send_strs(uint16_t keycode, keyrecord_t *record){
-#ifdef SEND_STRING_ENABLE
-  switch (keycode) {
-#include "send_string.def"
-  }
-#endif
-}
diff --git a/users/ericgebhart/extensions/smart_lock.c b/users/ericgebhart/extensions/smart_lock.c
deleted file mode 100644
index 5b3dc0ecb2..0000000000
--- a/users/ericgebhart/extensions/smart_lock.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Derived from smart_layers by @Possumvibes
-// Derived from one shot_mod by @Callum.
-
-#include "smart_lock.h"
-#include USERSPACE_H
-
-/* print("string"): Print a simple string. */
-/* uprintf("%s string", var) */
-
-bool ignore_key(uint16_t keycode,
-                const uint16_t *cond_keys){
-
-  // look for non-cancel condition.
-  // look for keys to ignore, if we match, we do nothing.
-  for (; pgm_read_word(cond_keys) != COND_KEYS_END ; ++cond_keys){
-    if (pgm_read_word(cond_keys) == keycode){
-      return true;
-    }
-  }
-  return false;
-}
-
-void deactivate_sml_layer(smart_lock_t *sml){
-  layer_off(sml->thing);
-    sml->active = false;
-}
-void deactivate_sml_mod(smart_lock_t *sml){
-  unregister_mods(sml->thing);
-  sml->active = false;
-}
-
-void deactivate_sml(smart_lock_t *sml){
-  switch(sml->type){
-  case sml_layer:
-    deactivate_sml_layer(sml);
-  case sml_mod:
-    deactivate_sml_mod(sml);
-  }
-}
-
-
-void sml_activate_layer(smart_lock_t *sml){
-  sml->active = true;
-  layer_on(sml->thing);
-}
-
-void sml_maybe_activate_mod(smart_lock_t *sml ){
-  if (sml->active) {
-    unregister_mods(sml->thing);
-  } else {
-    register_mods(sml->thing);
-  }
-  sml->active = !sml->active;
-}
-
-void sml_activate(smart_lock_t *sml){
-  switch(sml->type){
-  case sml_layer:
-    sml_activate_layer(sml);
-    break;
-  case sml_mod:
-sml_maybe_activate_mod(sml);
-      break;
-    }
-}
-
-
-
-void update_smart_lock(uint16_t keycode) {
-
-#ifdef SMART_LOCK_ENABLE
-  bool deactivate = false;
-  smart_lock_t *sml;
-
-    for (int i = 0; i < SML_LEN; ++i){
-      sml = &smart_locks[i];
-
-      // if it's a match,
-      // maybe activate/deactivate it if we got it's keycode.
-      if (sml->keycode == keycode){
-        sml_activate(sml);
-        return;
-      }
-
-      // deactivate what we need to.
-      if(sml->active){
-        deactivate = !ignore_key(keycode,  &sml->keys[0]);
-        if (deactivate){
-          deactivate_sml(sml);
-        }
-      }
-  }
-#endif
-  return;
-}
-
-void process_smart_lock(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    update_smart_lock(keycode);
-  }
-}
diff --git a/users/ericgebhart/extensions/smart_lock.h b/users/ericgebhart/extensions/smart_lock.h
deleted file mode 100644
index 0102d611cd..0000000000
--- a/users/ericgebhart/extensions/smart_lock.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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
-#include USERSPACE_H
-
-#ifdef SMART_LOCK_ENABLE
-typedef enum {
-  sml_layer,
-  sml_mod
-} smart_lock_type;
-
-typedef struct {
-  bool     active;
-  const uint16_t *keys;
-  uint16_t keycode;
-  uint16_t thing;
-  smart_lock_type type;
-} smart_lock_t;
-
-
-// smart layer, smart mods
-#undef SMLL
-#undef SMLM
-#define SMLL(key, layer, ...)
-#define SMLM(key, mod, ...)  // to replace mod_lock..
-#define COND_KEYS_END 0
-
-#define CONCATENATE_SA(a, ...) a ## __VA_ARGS__
-#define CONCATENATE_S(a, ...) a ## __VA_ARGS__
-#define CAT_S(a, ...) CONCATENATE_S(a, __VA_ARGS__)
-#define MK_SKEY(KC) CONCATENATE_S(sml_, KC)
-#define MK_ARRAY(KC)                                    \
-  const uint16_t PROGMEM CONCATENATE_SA(sml_, KC)[]
-
-// to create an enum and find how many...
-#define S_ENUM(kc, layer, ...) CAT_S(sml__, kc),
-// create a const array of the condkeys for each SML
-#define S_DATA(kc, thing, ...) MK_ARRAY(kc) = {__VA_ARGS__, COND_KEYS_END};
-
-// create a list of smart_lock structs. Two names, one for mod one for layer to be concise.
-#define S_SMART_LOCK(kc, layer, ...) {false, MK_SKEY(kc), kc, layer, sml_layer},
-#define M_SMART_LOCK(kc, mod, ...)   {false, MK_SKEY(kc), kc, mod,   sml_mod},
-
-#define SML(sk, sa, st, stype)                                          \
-  { .keys = &(sk)[0], .keycode = (sa), .thing = (st), .smart_lock_type = stype}
-#define K_SMLM(key, mod...)   [MK_SKEY(key)] = SML(MK_SKEY(key), key, mod, sml_mod),
-#define K_SMLL(key, layer...) [MK_SKEY(key)] = SML(MK_SKEY(key), key, layer, sml_layer),
-
-// Set everything up
-// - Create enum of names, (sml_keycode). Used as indexes in the arrays.
-//    avoids using the keycodes which would create a sparse/large array.
-// - Create array of conditional locks..
-// - Create array of the conditional keys for the locks, by name.
-
-// Create Enum
-#undef SMLL
-#undef SMLM
-#define SMLL S_ENUM
-#define SMLM S_ENUM
-
-// find how many
-enum smart_locks {
-#include "smart_lock.def"
-  SML_LENGTH
-};
-uint16_t SML_LEN = SML_LENGTH;
-
-// Bake locks into mem, name, ignore/cancel keys
-#undef SMLL
-#undef SMLM
-#undef TOGG
-#define SMLL S_DATA
-#define SMLM S_DATA
-#include "smart_lock.def"
-#undef SMLL
-#undef SMLM
-
-// Fill array of locks by name, kc, layer/mod.
-#define SMLL S_SMART_LOCK
-#define SMLM M_SMART_LOCK
-
-smart_lock_t smart_locks[] = {
-#include "smart_lock.def"
-};
-#undef SMLL
-#undef SMLM
-
-#endif
diff --git a/users/ericgebhart/extensions/swapper.c b/users/ericgebhart/extensions/swapper.c
deleted file mode 100644
index 988a99e602..0000000000
--- a/users/ericgebhart/extensions/swapper.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@gmail.com, @possumvibes,@Callum.
-
-  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/>.
-*/
-// Derived from swapper by @Possumvibes and @Callum
-
-#include "swapper.h"
-
-swapper_state_t swapper_states[] = {
-#ifdef SWAPPER_ENABLE
-#include "swapper.def"
-#endif
-};
-uint8_t         NUM_SWAPPER_STATES = sizeof(swapper_states) / sizeof(swapper_state_t);
-
-// Based on https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
-void process_swappers(uint16_t keycode, keyrecord_t *record) {
-#ifdef SWAPPER_ENABLE
-  swapper_state_t *curr_state = NULL;
-  for (int i = 0; i < NUM_SWAPPER_STATES; ++i) {
-    curr_state = &swapper_states[i];
-
-    if (keycode == curr_state->forward_trigger) {
-      if (record->event.pressed) {
-        if (!curr_state->active) {
-          curr_state->active = true;
-          register_code16(curr_state->mod);
-        }
-        register_code16(curr_state->forward);
-      } else {
-        unregister_code16(curr_state->forward);
-        // Don't unregister curr_state->mod until some other key is hit or released.
-      }
-    } else if (curr_state->active && keycode == curr_state->reverse_trigger) {
-      if (record->event.pressed) {
-        register_code16(curr_state->reverse);
-      } else {
-        unregister_code16(curr_state->reverse);
-      }
-    } else if (curr_state->active) {
-      unregister_code16(curr_state->mod);
-      curr_state->active = false;
-    }
-  }
-#endif
-}
diff --git a/users/ericgebhart/extensions/swapper.h b/users/ericgebhart/extensions/swapper.h
deleted file mode 100644
index fb7774f37a..0000000000
--- a/users/ericgebhart/extensions/swapper.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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
-#include USERSPACE_H
-
-typedef struct {
-    bool     active;
-    uint16_t mod;
-    uint16_t forward;
-    uint16_t reverse;
-    uint16_t forward_trigger;
-    uint16_t reverse_trigger;
-} swapper_state_t;
-extern swapper_state_t swapper_states[];
-extern uint8_t         NUM_SWAPPER_STATES;
-
-#undef SWAPPER_KEY
-#define SWAPPER_KEY(KC, REVERSE_IT_KC, FWD_KC, REV_KC, MOD)     \
-  {false, MOD, FWD_KC, REV_KC, KC, REVERSE_IT_KC},
-
-void process_swappers(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/extensions/tap_dances.c b/users/ericgebhart/extensions/tap_dances.c
deleted file mode 100755
index 8b1fea15e8..0000000000
--- a/users/ericgebhart/extensions/tap_dances.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef TAP_DANCES_ENABLE
-
-#include "tap_dances.h"
-
-#include "action.h"
-#include "action_layer.h"
-#include "process_keycode/process_tap_dance.h"
-
-void tap_dance_mouse_btns (tap_dance_state_t *state, void *user_data) {
-    switch(state->count){
-    case 1:
-        register_code(KC_BTN1);
-        break;
-    case 2:
-        register_code(KC_BTN2);
-        break;
-    case 3:
-        register_code(KC_BTN3);
-        break;
-    case 4:
-        register_code(KC_BTN4);
-        break;
-    case 5:
-        register_code(KC_BTN5);
-        break;
-    default:
-        break;
-    }
-    reset_tap_dance(state);
-}
-
-// counting on all the qwerty layers to be less than dvorak_on_bepo
-int on_qwerty(){
-    uint8_t deflayer = (biton32(default_layer_state));
-    switch(deflayer){
-    case _DVORAK_BP:
-    case _BEAKL_BP:
-    case _BEPO:
-      return (false);
-    default:
-      break;
-    }
-    return (true);
-}
-
-static void switch_default_layer(uint8_t layer) {
-  default_layer_set(1UL<<layer);
-  clear_keyboard();
-}
-
-// so the keyboard remembers which layer it's in after power disconnect.
-/*
-  uint32_t default_layer_state_set_kb(uint32_t state) {
-  eeconfig_update_default_layer(state);
-  return state;
-  }
-*/
-
-void tap_dance_df_bepo_layers_switch (tap_dance_state_t *state, void *user_data) {
-  switch(state->count){
-  case 1:
-    switch_default_layer(_DVORAK_BP);
-    break;
-  case 2:
-    switch_default_layer(_BEPO);
-    break;
-  case 3:
-    layer_invert(_LAYERS);
-    break;
-  default:
-    break;
-  }
-  reset_tap_dance(state);
-}
-
-void tap_dance_layer_switch (tap_dance_state_t *state, void *user_data) {
-  switch(state->count){
-  case 1:
-    if(on_qwerty())
-      layer_invert(_SYMB);
-    else
-      layer_invert(_SYMB_BP);
-    break;
-  case 2:
-    layer_invert(_NAV);
-    break;
-  case 3:
-    layer_invert(_LAYERS);
-    break;
-  case 4:
-    if(on_qwerty())
-      layer_invert(_KEYPAD);
-    else
-      layer_invert(_KEYPAD_BP);
-    break;
-  default:
-    break;
-  }
-  reset_tap_dance(state);
-}
-
-void tap_dance_default_layer_switch (tap_dance_state_t *state, void *user_data) {
-    switch(state->count){
-    case 1:
-      switch_default_layer(_DVORAK);
-      break;
-    case 2:
-      switch_default_layer(_DVORAK_BP);
-      break;
-    case 3:
-      switch_default_layer(_BEPO);
-      break;
-    default:
-        break;
-    }
-    reset_tap_dance(state);
-}
-
-// switch the default layer to another qwerty based layer.
-void switch_default_layer_on_qwerty(int count) {
-    switch(count){
-    case 1:
-      switch_default_layer(_DVORAK);
-      break;
-    case 2:
-      switch_default_layer(_QWERTY);
-      break;
-    case 3:
-      switch_default_layer(_COLEMAK);
-      break;
-
-      /* case 4: */
-      /*   switch_default_layer(_WORKMAN); */
-      /*   break; */
-      /* case 5: */
-      /*   switch_default_layer(_NORMAN); */
-      /*   break; */
-
-    default:
-      switch_default_layer(_DVORAK);
-      break;
-    }
-}
-
-// switch the default layer to another bepo based layer.
-void switch_default_layer_on_bepo(int count) {
-    switch(count){
-    case 1:
-      switch_default_layer(_DVORAK_BP);
-      break;
-    case 2:
-      switch_default_layer(_BEPO);
-      break;
-    default:
-      switch_default_layer(_DVORAK_BP);
-      break;
-    }
-}
-
-
-// tap to change the default layer. Distinguishes between layers that are based on
-// a qwerty software keyboard and a bepo software keyboard.
-// if shifted, choose layers based on the other software keyboard, otherwise choose only
-// layers that work on the current software keyboard.
-void tap_dance_default_os_layer_switch (tap_dance_state_t *state, void *user_data) {
-    //uint8_t shifted = (get_mods() & MOD_BIT(KC_LSFT|KC_RSFT));
-    bool shifted = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
-    int qwerty = on_qwerty();
-
-
-    // shifted, choose between layers on the other software keyboard
-    if(shifted){
-        if (qwerty)
-            switch_default_layer_on_bepo(state->count);
-        else
-            switch_default_layer_on_qwerty(state->count);
-
-        // not shifted, choose between layers on the same software keyboard
-    } else {
-        if (qwerty)
-            switch_default_layer_on_qwerty(state->count);
-        else
-            switch_default_layer_on_bepo(state->count);
-    }
-
-    reset_tap_dance(state);
-}
-
-
-/* Return an integer that corresponds to what kind of tap dance should be executed.
- *
- * How to figure out tap dance state: interrupted and pressed.
- *
- * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
- *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
- *
- * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
- *  has ended, but the key is still being pressed down. This generally means the key is being "held".
- *
- * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
- *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
- *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
- *
- * Good places to put an advanced tap dance:
- *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
- *
- * Criteria for "good placement" of a tap dance key:
- *  Not a key that is hit frequently in a sentence
- *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
- *    in a web form. So 'tab' would be a poor choice for a tap dance.
- *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
- *    letter 'p', the word 'pepper' would be quite frustating to type.
- *
- * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
- *
- */
-int cur_dance (tap_dance_state_t *state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed)  return SINGLE_TAP;
-        //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
-        else return SINGLE_HOLD;
-    }
-    else if (state->count == 2) {
-        /*
-         * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-         * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-         * keystrokes of the key, and not the 'double tap' action/macro.
-         */
-        if (state->interrupted) return DOUBLE_SINGLE_TAP;
-        else if (state->pressed) return DOUBLE_HOLD;
-        else return DOUBLE_TAP;
-    }
-    //Assumes no one is trying to type the same letter three times (at least not quickly).
-    //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-    //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
-    if (state->count == 3) {
-        if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
-        else return TRIPLE_HOLD;
-    }
-    else return 8; //magic number. At some point this method will expand to work for more presses
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-    //Tap once for Esc, twice for Caps Lock
-    [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
-    [TD_TAB_BKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LSFT(KC_TAB)),
-    [TD_RIGHT_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_RIGHT, KC_TAB),
-    [TD_LEFT_BACKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, LSFT(KC_TAB)),
-    [TD_UP_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_HOME),
-    [TD_DOWN_END] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_END),
-    [TD_MDIA_SYMB] = ACTION_TAP_DANCE_FN(tap_dance_layer_switch),
-    [TD_DVORAK_BEPO] = ACTION_TAP_DANCE_FN(tap_dance_df_bepo_layers_switch),
-    [TD_DEF_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_layer_switch),
-    [TD_DEF_OS_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_os_layer_switch),
-    [TD_HOME_END]  = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
-    [TD_MOUSE_BTNS] = ACTION_TAP_DANCE_FN(tap_dance_mouse_btns)
-
-};
-
-#endif
diff --git a/users/ericgebhart/extensions/tap_dances.h b/users/ericgebhart/extensions/tap_dances.h
deleted file mode 100755
index 745446756e..0000000000
--- a/users/ericgebhart/extensions/tap_dances.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
diff --git a/users/ericgebhart/extensions/tap_hold.c b/users/ericgebhart/extensions/tap_hold.c
deleted file mode 100644
index 041b961e11..0000000000
--- a/users/ericgebhart/extensions/tap_hold.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-/* This is variations on custom tap hold functionality. It makes it easy */
-/* to maintain tap_hold keys and combinations. These combinations go into */
-/* the file "tap_hold.def". Here are two examples. */
-/*  */
-/* This example is tap or tap for TAP_HOLD_TERM, It defines a key */
-/* KC_CCCV, which sends Control-c on tap, and Control-v on hold. */
-/*  */
-/*  TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V)) */
-/*  */
-/* This is an example of Open - Open and Close. */
-/* It defines a key, KC_OCPRN which when tapped gives an '(' and */
-/* when held gives '()' followed by a backarrow. */
-/* Which places the cursor between them.*/
-/*  */
-/* OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN) */
-/*  */
-/* To use this, add it to your src in rules.mk, and include */
-/* tap_hold.h in your code above process_record_user. */
-/*  */
-/* Add a call like this to use it. */
-/* process_tap_hold_user(keycode, record); */
-/*  */
-/* Note: You must add any custom keycodes to your keycodes enum */
-/* otherwise they will not exist. */
-
-
-#include USERSPACE_H
-#include "stdint.h"
-#include "tap_hold.h"
-void update_smart_lock(uint16_t keycode);
-
-
-void tap_taplong(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  } else {
-    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
-      tap_code16(kc2);
-    } else {
-      tap_code16(kc1);
-    }
-  }
-}
-
-void tap_sml(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  } else {
-    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
-      update_smart_lock(kc2);
-    } else {
-      tap_code16(kc1);
-    }
-  }
-}
-
-/* for (){}[]""''<>``. tap for open. Hold for open and close, ending inbetween. */
-/* Assumes a one character length.                                              */
-void open_openclose(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  }else{
-    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
-      tap_code16(kc1);
-      tap_code16(kc2);
-      tap_code16(KC_LEFT);
-
-    } else {
-      // is shifted
-      uint16_t mod_state = get_mods();
-      if ((mod_state & MOD_MASK_SHIFT) ||
-          (get_oneshot_mods() & MOD_MASK_SHIFT)){
-        del_mods(MOD_MASK_SHIFT);
-        del_oneshot_mods(MOD_MASK_SHIFT);
-
-        tap_code16(kc1);
-        tap_code16(kc1);
-        tap_code16(kc1);
-
-        set_mods(mod_state);
-      }else{
-        tap_code16(kc1);
-      }
-    }
-  }
-}
-
-// open and open close for dead keys.
-void open_openclose_not_dead(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tap_taplong_timer = timer_read();
-  }else{
-    if (timer_elapsed(tap_taplong_timer) > TAP_HOLD_TERM) {
-      tap_code16(kc1);
-      tap_code16(KC_SPACE);
-      tap_code16(kc2);
-      tap_code16(KC_SPACE);
-      tap_code16(KC_LEFT);
-    } else {
-      // is shifted - give a triple
-      uint16_t mod_state = get_mods();
-      if ((mod_state & MOD_MASK_SHIFT) ||
-          (get_oneshot_mods() & MOD_MASK_SHIFT)){
-        del_mods(MOD_MASK_SHIFT);
-        del_oneshot_mods(MOD_MASK_SHIFT);
-
-        tap_code16(kc1);
-        tap_code16(KC_SPACE);
-        tap_code16(kc1);
-        tap_code16(KC_SPACE);
-        tap_code16(kc1);
-        tap_code16(KC_SPACE);
-
-        set_mods(mod_state);
-      }else{
-        tap_code16(kc1);
-        tap_code16(KC_SPACE);
-      }
-    }
-  }
-}
-
-// macros for use in tap_hold.defs.
-#define TP_TPL(KCKEY, KC01, KC02)               \
-  case KCKEY:                                   \
-  tap_taplong(KC01, KC02, record);              \
-  break;
-
-#define TP_SML(KCKEY, KC01, KC02)        \
-  case KCKEY:                            \
-  tap_sml(KC01, KC02, record);           \
-  break;
-
-#define OPEN_OCL(KCKEY, KC01, KC02)             \
-  case KCKEY:                                   \
-  open_openclose(KC01, KC02, record);           \
-  break;
-
-#define OPEN_OCL_ND(KCKEY, KC01, KC02)          \
-  case KCKEY:                                   \
-  open_openclose_not_dead(KC01, KC02, record);  \
-  break;
-
-void process_tap_hold_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode){
-#include "tap_hold.def"
-  }
-}
diff --git a/users/ericgebhart/extensions/tap_hold.h b/users/ericgebhart/extensions/tap_hold.h
deleted file mode 100644
index e5b3c42d8a..0000000000
--- a/users/ericgebhart/extensions/tap_hold.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-void process_tap_hold_user(uint16_t keycode, keyrecord_t* record);
-uint16_t tap_taplong_timer;
diff --git a/users/ericgebhart/extensions/unicode.c b/users/ericgebhart/extensions/unicode.c
deleted file mode 100644
index fe44c69b1c..0000000000
--- a/users/ericgebhart/extensions/unicode.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 USERSPACE_H
-#include "process_unicode_common.h"
-
-#undef UC_STR
-#define UC_STR(KEYC, STRING)                    \
-  case KEYC:                                    \
-  if (record->event.pressed) {                  \
-    send_unicode_string(STRING);                \
-  }                                             \
-  break;
-
-void process_unicode_strs(uint16_t keycode, keyrecord_t *record){
-#if defined(UNICODE_ENABLE) && defined(SEND_UNICODE_ENABLE)
-  switch (keycode) {
-#include "unicode.def"
-      }
-#endif
-}
diff --git a/users/ericgebhart/extensions/unicode.h b/users/ericgebhart/extensions/unicode.h
deleted file mode 100644
index eecf05d1bc..0000000000
--- a/users/ericgebhart/extensions/unicode.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Custom one-or-more-shot implementation that does not rely on timers
-// and persists across layer changes. Based on the users/callum implementation
-// at https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum
-// make it easy to put unicode keys into process_record
-
-
-void process_unicode_strs(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/keyboards/keyboards.h b/users/ericgebhart/keyboards/keyboards.h
deleted file mode 100644
index 8a6371af5e..0000000000
--- a/users/ericgebhart/keyboards/keyboards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-
-// Kyria
-#ifdef KEYBOARD_splitkb_kyria
-#define BASE Base_2x6_8_5
-#define BASEt6 Base_2x6_8_5t6
-#define TRANS Transient_2x6_8_5
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-#endif
-
-// Corne
-#ifdef KEYBOARD_crkbd
-#define BASE Base_3x6_3
-#define BASEt6 Base_3x6_3t6
-#define TRANS Transient_3x6_3
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-#endif
-
-// Ergodox ez.
-#ifdef KEYBOARD_ergodox_ez
-#define BASE Base_dox
-#define BASEt6 Base_doxt6
-#define TRANS Transient_dox
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-// tell the keymap we want to specify number rows.
-// 4x10 input instead 3x10.
-#define BASE_NUMBER_ROW    // turn on 4 row base templates.
-#endif
-
-// XD75
-#ifdef KEYBOARD_xiudi_xd75
-#define BASE Base_5x15
-#define BASEt6 Base_5x15t6
-#define TRANS Transient_5x15
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// tell the keymap we want to specify number rows.
-// 4x10 input instead 3x10.
-#define BASE_NUMBER_ROW    // turn on 4 row base templates.
-#endif
-
-// Viterbi
-#ifdef KEYBOARD_keebio_viterbi
-#define BASE Base_5x14
-#define BASEt6 Base_5x14t6
-#define TRANS Transient_5x14
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// tell the keymap we want to specify number rows.
-// 4x10 input instead 3x10.
-#define BASE_NUMBER_ROW    // turn on 4 row base templates.
-#endif
-
-// Rebound
-#ifdef KEYBOARD_montsinger_rebound
-#define BASE Base_rebound
-#define BASEt6 Base_reboundt6
-#define TRANS Rebound_transient
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-#endif
-
-// Kinesis
-#if defined(KEYBOARD_kinesis_alvicstep)         \
-  || defined(KEYBOARD_kinesis_stapelberg)       \
-  || defined(KEYBOARD_kinesis_kint2pp)          \
-  || defined(KEYBOARD_kinesis_nguyenvietyen)    \
-  || defined(KEYBOARD_kinesis_kint36)           \
-  || defined(KEYBOARD_kinesis_kint41)           \
-  || defined(KEYBOARD_kinesis_kintlc)
-
-#undef LAYOUT_PVARG
-#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
-// Base layers 4x10, so numbers are enabled, and a 3x10 for the keymap.
-// Transient function layers are all 3x10.
-#define BASE Base_4x6_4_6
-#define BASEt6 Base_4x6_4_6t6
-#define TRANS Transient_4x6_4_6
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// tell the keymap we want to specify number rows.
-// 4x10 input instead 3x10.
-#define BASE_NUMBER_ROW    // turn on 4 row base templates.
-#endif
-
-// My Morpho Dactyl
-#ifdef KEYBOARD_gebhart_morpho
-#undef LAYOUT_PVARG
-#define LAYOUT_PVARG(...)  LAYOUT_split_4x6_5_8(__VA_ARGS__)
-
-#define BASE Base_4x6_5_8
-#define BASEt6 Base_4x6_5_8t6
-#define TRANS Transient_4x6_5_8
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// tell the keymap we want to specify number rows.
-// 4x10 input instead 3x10.
-#define BASE_NUMBER_ROW    // turn on 4 row base templates.
-#endif
diff --git a/users/ericgebhart/keyboards/layouts.h b/users/ericgebhart/keyboards/layouts.h
deleted file mode 100644
index b77d5a3de6..0000000000
--- a/users/ericgebhart/keyboards/layouts.h
+++ /dev/null
@@ -1,771 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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 "base_layers.h"
-#include "mod_layer.h"
-#include "edge_keys.h"
-#include "thumbs.h"
-#include QMK_KEYBOARD_H
-
-/******************************************************************/
-/* This is where I put my Keyboard layouts.                       */
-/* The mod layer can be modified in mod_layer.h                   */
-/* can be applied here. The physical shape of the keyboard is     */
-/* also accounted for here. This makes it very simple to add a    */
-/* new keyboard and reuse all of my layouts and layers            */
-/*                                                                */
-/* With all of that in hand, we then create a LAYOUT wrapper      */
-/* macro that takes a list of keys, to create a keyboard matrix   */
-/* that fits the keyboard. Simple.                                */
-/*                                                                */
-/* The thumb keys, the bottom rows, etc.                          */
-/*                                                                */
-/* An attempt has been made to adapt the kinesis and ergodox      */
-/* Thumb keys to the rectangular shapes of the xd75, viterbi,     */
-/* and rebound.                                                   */
-/******************************************************************/
-
-/******************************************************************/
-/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
-/*       keys inbetween the usual left and right hand keys        */
-/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
-/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
-/*       thumbkeys. It is missing middle keys on (home) row 3.    */
-/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
-/*       extra middle keys                                        */
-/* * The Kinesis is 4x6 + 4 and 6 thumb keys.                     */
-/* * My Dactyl is 4x6 + 5 and 8 thumb keys.                     */
-/******************************************************************/
-
-
-/******************************************************************/
-/*   In all cases these keyboards are defined in a matrix which is */
-/*   a set of rows. Maybe like so, or not.                         */
-/*                                                                 */
-/*   -------------------------|------------------------ */
-/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
-/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
-/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
-/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
-/*   | Row5L                  |                    Row5R | */
-/*   |               ThumbsL  | ThumbsR                  | */
-/*   -------------------------|------------------------ */
-
-/* Generally speaking, the keys on the right and left don't change. */
-/* Neither does the bottom row or the thumbs. Frequently the numbers */
-/* row is identical across layers. Mostly, we want our Base layers to */
-/* be predctable.                                                     */
-
-
-// Since our quirky block definitions are basically a list of comma separated
-// arguments, we need a wrapper in order for these definitions to be
-// expanded before being used as arguments to the LAYOUT_xxx macro.
-#if (!defined(LAYOUT) && defined(KEYMAP))
-#define LAYOUT KEYMAP
-#endif
-
-// every keyboard has it's Layout. We start there and make a var args
-// out of it.
-
-#define LVARG_ergodox(...)    LAYOUT_ergodox(__VA_ARGS__)
-#define LVARG_edox(...)       LAYOUT_ergodox_pretty(__VA_ARGS__)
-#define LAYOUT_VARG(...)      LAYOUT(__VA_ARGS__)
-#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
-
-#define LVARG_4x12(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
-#define LVARG_5x12(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
-#define LVARG_5x14(...)       LAYOUT_ortho_5x14(__VA_ARGS__)
-#define LVARG_5x15(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
-
-/*
-  | Left | Numbers L | middle | numbers R | Right |
-  | Left | keys0-5   | middle | Keys6-10  | Right |
-  | Left | keys11-15 | middle | Keys16-20 | Right |
-  | Left | keys20-25 | middle | Keys25-30 | Right |
-  |Row5L                                  Row5R   |
-  |ThumbsL                                ThumbsR |
-*/
-
-/* Assuming that left, midddle, right, row5, and thumbs stay the same, */
-/* numbers, no numbers, numbers never change, whatever.                */
-/*   we can have a layout macro that takes a nice rectangle of keys.   */
-
-
-/*Some keyboards need number rows, some don't. there is a setting for that */
-/* the keymap will give number rows if BASE_NUMBER_ROW is defined.*/
-/* in that case, the layout should take 4 rows of 10. */
-/* If all the layouts you might ever want would have the same top row,*/
-/* Then it could be defined like that here, and it could take 3x10.*/
-/* All layouts are relatively simple to make. */
-/* The ROW macros add a universal mod layer so that mods can be defined once */
-/* and used everywhere. No matter the keymap or layer. this allows actual maps */
-/* like dvorak, qwerty, colemak, beakl, etc., to be defined simply. */
-
-
-/* Additional, usage examples can be found in keyboards.*/
-/* crkbd/keymaps/ericgebhart */
-/* kinesis/keymaps/ericgebhart */
-/* ergodox_ez/keymaps/ericgebhart */
-/* keebio/viterbi/keymaps/ericgebhart */
-/* xiudi/xd75/keymaps/ericgebhart */
-/* montsinger/rebound/rev4/keymaps/ericgebhart */
-
-
-
-/********************************************************************/
-/* xiudi/xd75  - Ortholinear 5x15  */
-/********************************************************************/
-/// These first two base layout templates take sets of 5 keys, left and right.
-// Using 4 sets allows for changing the number row if you have one.
-// if you never change the number row, then use 3 sets of left and right.
-// and define the number row here.
-#define Base_5x15(                                                \
-                  K01, K02, K03, K04, K05,                        \
-                  K06, K07, K08, K09, K0A,                        \
-                  K11, K12, K13, K14, K15,                        \
-                  K16, K17, K18, K19, K1A,                        \
-                  K21, K22, K23, K24, K25,                        \
-                  K26, K27, K28, K29, K2A,                        \
-                  K31, K32, K33, K34, K35,                        \
-                  K36, K37, K38, K39, K3A)                        \
-  LVARG_5x15(                                                     \
-             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
-             MAP_CHUNK(___3_MIDDLE_T),                               \
-             MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                   \
-                                                                        \
-             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
-             MAP_CHUNK(___3_MIDDLE_1),                                \
-             MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                   \
-                                                                        \
-             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
-             MAP_CHUNK(___3_MIDDLE_2),                                \
-             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
-                                                                        \
-             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
-             MAP_CHUNK(___3_MIDDLE_3),                                  \
-             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
-             MAP_CHUNK(___15_BOTTOM)                                    \
-                                                                  )
-
-#define Base_5x15t6(                                                    \
-                    K01, K02, K03, K04, K05, K06,                       \
-                    K07, K08, K09, K0A, K0B, K0C,                       \
-                    K11, K12, K13, K14, K15, K16,                       \
-                    K17, K18, K19, K1A, K1B, K1C,                       \
-                    K21, K22, K23, K24, K25, K26,                       \
-                    K27, K28, K29, K2A, K2B, K2C,                       \
-                    K31, K32, K33, K34, K35, K36,                       \
-                    K37, K38, K39, K3A, K3B, K3C)                  \
-  LVARG_5x15(                                                           \
-             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),              \
-             MAP_CHUNK(___3_MIDDLE_T),                               \
-             MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),              \
-             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),              \
-             MAP_CHUNK(___3_MIDDLE_1),                                  \
-             MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),              \
-             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),              \
-             MAP_CHUNK(___3_MIDDLE_2),                                  \
-             MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),              \
-             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),              \
-             MAP_CHUNK(___3_MIDDLE_3),                                  \
-             MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),              \
-             MAP_CHUNK(___15_BOTTOM)                                    \
-                                                                        )
-
-// 4  rows of 12. 3 columns transparent in the middle.
-#define Transient_5x15(                                             \
-                       K01, K02, K03, K04, K05,                     \
-                       K07, K08, K09, K0A, K0B,                     \
-                       K11, K12, K13, K14, K15,                     \
-                       K17, K18, K19, K1A, K1B,                 \
-                       K21, K22, K23, K24, K25,                     \
-                       K27, K28, K29, K2A, K2B                     \
-                                                              )    \
-  LVARG_5x15(                                                      \
-             ___15___,                                             \
-             ___, K01, K02, K03, K04, K05,                         \
-             ___3___,                                              \
-             K07, K08, K09, K0A, K0B, ___,                         \
-             ___, K11, K12, K13, K14, K15,                         \
-             ___3___,                                              \
-             K17, K18, K19, K1A, K1B, ___,                         \
-             ___, K21, K22, K23, K24, K25,                         \
-             ___3___,                                              \
-             K27, K28, K29, K2A, K2B, ___,                         \
-             MAP_CHUNK(___15_BOTTOM)                                    \
-             )                                                  \
-
-/********************************************************************/
-
-
-/********************************************************************/
-/* viterbi  - Ortholinear 5x14  */
-/********************************************************************/
-#define Base_5x14(                                                 \
-                  K01, K02, K03, K04, K05,                              \
-                        K06, K07, K08, K09, K0A,                        \
-                        K11, K12, K13, K14, K15,                        \
-                        K16, K17, K18, K19, K1A,                        \
-                        K21, K22, K23, K24, K25,                        \
-                        K26, K27, K28, K29, K2A,                        \
-                        K31, K32, K33, K34, K35,                        \
-                        K36, K37, K38, K39, K3A)                        \
-  LVARG_5x14(                                                           \
-             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
-             MAP_CHUNK(___2_MIDDLE_T),                                  \
-             MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                   \
-                                                                       \
-             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
-             MAP_CHUNK(___2_MIDDLE_1),                                  \
-             MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                   \
-                                                                        \
-             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
-             MAP_CHUNK(___2_MIDDLE_2),              \
-             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
-                                                                        \
-             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
-             MAP_CHUNK(___2_MIDDLE_3),    \
-             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
-             MAP_CHUNK(___14_BOTTOM)                                    \
-                                                                        )
-#define Base_5x14t6(                                    \
-                    K01, K02, K03, K04, K05, K06,       \
-                    K07, K08, K09, K0A, K0B, K0C,       \
-                    K11, K12, K13, K14, K15, K16,       \
-                    K17, K18, K19, K1A, K1B, K1C,       \
-                    K21, K22, K23, K24, K25, K26,       \
-                    K27, K28, K29, K2A, K2B, K2C,       \
-                    K31, K32, K33, K34, K35, K36,       \
-                    K37, K38, K39, K3A, K3B, K3C)       \
-  LVARG_5x15(                                           \
-    MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),         \
-    MAP_CHUNK(___2_MIDDLE_T),                             \
-    MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),       \
-    MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),       \
-    MAP_CHUNK(___2_MIDDLE_1),                                           \
-    MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),       \
-    MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),       \
-    MAP_CHUNK(___2_MIDDLE_2),                           \
-    MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),       \
-    MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),       \
-    MAP_CHUNK(___2_MIDDLE_3),                                   \
-    MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),               \
-    MAP_CHUNK(___14_BOTTOM)                                     \
-                                                        )
-
-// 4  rows of 12. 2 columns transparent in the middle.
-#define Transient_5x14(                                            \
-                       K01, K02, K03, K04, K05,                    \
-                       K07, K08, K09, K0A, K0B,                    \
-                       K11, K12, K13, K14, K15,                         \
-                       K17, K18, K19, K1A, K1B,                         \
-                       K21, K22, K23, K24, K25,                     \
-                       K27, K28, K29, K2A, K2B                     \
-                                                              )         \
-  LVARG_5x14(                                                           \
-             ___14___,                                                  \
-             ___, K01, K02, K03, K04, K05,                              \
-             ___2___,                                                   \
-             K07, K08, K09, K0A, K0B, ___,                              \
-                                                                        \
-             ___, K11, K12, K13, K14, K15,                              \
-             ___2___,                                                   \
-             K17, K18, K19, K1A, K1B, ___,                              \
-                                                                        \
-             ___, K21, K22, K23, K24, K25,                              \
-             ___2___,                                                   \
-             K27, K28, K29, K2A, K2B, ___,                              \
-             MAP_CHUNK(___14_BOTTOM)                                    \
-                                                                        ) \
-
-/********************************************************************/
-/* Ortholinear 4x12  */
-/********************************************************************/
-#define LAYOUT_4x12_base(                                               \
-                         K01, K02, K03, K04, K05,                       \
-                         K06, K07, K08, K09, K0A,                       \
-                         K11, K12, K13, K14, K15,                       \
-                         K16, K17, K18, K19, K1A,                       \
-                         K21, K22, K23, K24, K25,                       \
-                         K26, K27, K28, K29, K2A                        \
-                                                                        ) \
-  LVARG_4x12(                                                     \
-             MOD_CORE_3x5(K01, K02, K03, K04, K05,                \
-                          K06, K07, K08, K09, K0A,                \
-                          K11, K12, K13, K14, K15,                \
-                          K16, K17, K18, K19, K1A,                \
-                          K21, K22, K23, K24, K25,                \
-                          K26, K27, K28, K29, K2A),               \
-             ___12_BOTTOM___                                            \
-                                                                  )
-
-// Just for bepo because it's a 3x6 matrix on each side.
-// So 3 pairs of 6 keys, left and right.
-
-// takes 3 makes 4  rows of 12.
-#define LAYOUT_4x12_transient(                                          \
-                              K01, K02, K03, K04, K05, K06,             \
-                              K07, K08, K09, K0A, K0B, K0C,             \
-                              K11, K12, K13, K14, K15, K16,             \
-                              K17, K18, K19, K1A, K1B, K1C,             \
-                              K21, K22, K23, K24, K25, K26,             \
-                              K27, K28, K29, K2A, K2B, K2C              \
-                                                                        ) \
-  LVARG_4x12(                                                           \
-             K01, K02, K03, K04, K05, K06,                              \
-             K07, K08, K09, K0A, K0B, K0C,                              \
-             K11, K12, K13, K14, K15, K16,                              \
-             K17, K18, K19, K1A, K1B, K1C,                              \
-             K21, K22, K23, K24, K25, K26,                              \
-             K27, K28, K29, K2A, K2B, K2C,                              \
-             ___12_BOTTOM___                                            \
-             )                                                  \
-
-/********************************************************************/
-/* CRKBD  Corne or any other 3x5/6 with 3 thumbs on each side.      */
-/*    The Corne has  3x6 matrix on both sides with 6 thumbs total   */
-/* This Macro takes 2x3x5 and gives it pinkies, and thumbs.         */
-/* Arg chunks are in the middle with the passthrough modifiers as   */
-/* needed.  Sama Sama apres cette fois.                             */
-/********************************************************************/
-
-#define Base_3x6_3(                                                     \
-                   K01, K02, K03, K04, K05,                             \
-                   K06, K07, K08, K09, K0A,                             \
-                   K11, K12, K13, K14, K15,                             \
-                   K16, K17, K18, K19, K1A,                             \
-                   K21, K22, K23, K24, K25,                             \
-                   K26, K27, K28, K29, K2A)                             \
-  LAYOUT_VARG(                                                          \
-              MOD_CORE_3x5(K01, K02, K03, K04, K05,                     \
-                           K06, K07, K08, K09, K0A,                     \
-                           K11, K12, K13, K14, K15,                     \
-                           K16, K17, K18, K19, K1A,                     \
-                           K21, K22, K23, K24, K25,                     \
-                           K26, K27, K28, K29, K2A),                    \
-              ___6_ERGO_THUMBS___                                       \
-                                                                        )
-
-#define Base_3x6_3t6(                                                   \
-                     K01, K02, K03, K04, K05, K06,                      \
-                     K07, K08, K09, K0A, K0B, K0C,                      \
-                     K11, K12, K13, K14, K15, K16,                      \
-                     K17, K18, K19, K1A, K1B, K1C,                      \
-                     K21, K22, K23, K24, K25, K26,                      \
-                     K27, K28, K29, K2A, K2B, K2C)                      \
-  LAYOUT_VARG(                                                          \
-              MOD_CORE_3x6(                                             \
-                           K01, K02, K03, K04, K05, K06,                \
-                           K07, K08, K09, K0A, K0B, K0C,                \
-                           K11, K12, K13, K14, K15, K16,                \
-                           K17, K18, K19, K1A, K1B, K1C,                \
-                           K21, K22, K23, K24, K25, K26,                \
-                           K27, K28, K29, K2A, K2B, K2C),               \
-              ___6_ERGO_THUMBS___                                       \
-                                                        )
-
-  // All we really need is to add the see through thumbs to the end.
-#define Transient_3x6_3(                                                \
-                        K01, K02, K03, K04, K05,                        \
-                        K07, K08, K09, K0A, K0B,                        \
-                        K11, K12, K13, K14, K15,                        \
-                        K17, K18, K19, K1A, K1B,                        \
-                        K21, K22, K23, K24, K25,                        \
-                        K27, K28, K29, K2A, K2B                         \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              ___, K01, K02, K03, K04, K05,                             \
-              K07, K08, K09, K0A, K0B, ___,                             \
-              ___, K11, K12, K13, K14, K15,                             \
-              K17, K18, K19, K1A, K1B, ___,                             \
-              ___, K21, K22, K23, K24, K25,                             \
-              K27, K28, K29, K2A, K2B, ___,                             \
-              ___6_ERGO_THUMBS___                                       \
-                                                                        )
-
-//___6_ERGO_THUMBS___
-
-/********************************************************************/
-/* Kinesis*/
-/********************************************************************/
-// A 4x6 on each side, with a 4 column fifth row, and 6 thumbs on
-// each side.  - 4x6_4_6.
-// Then a giant row up top, 9 keys on each side, for function keys.
-#define Base_4x6_4_6(                                                   \
-                     K01, K02, K03, K04, K05, \
-                     K06, K07, K08, K09, K0A,                           \
-                     K11, K12, K13, K14, K15,                           \
-                     K16, K17, K18, K19, K1A,                           \
-                     K21, K22, K23, K24, K25,                           \
-                     K26, K27, K28, K29, K2A,                           \
-                     K31, K32, K33, K34, K35,                           \
-                     K36, K37, K38, K39, K3A                            \
-                                                                        ) \
-  LAYOUT_PVARG(                                                         \
-               ___KINTFUNC_L___, ___KINTFUNC_R___, \
-               MOD_CORE_4x5(K01, K02, K03, K04, K05,                    \
-                            K06, K07, K08, K09, K0A,                    \
-                            K11, K12, K13, K14, K15,                    \
-                            K16, K17, K18, K19, K1A,                    \
-                            K21, K22, K23, K24, K25,                    \
-                            K26, K27, K28, K29, K2A,                    \
-                            K31, K32, K33, K34, K35,                    \
-                            K36, K37, K38, K39, K3A),                   \
-               MAP_CHUNK(___4_BOTTOM_LEFT),                             \
-               MAP_CHUNK(___4_BOTTOM_RIGHT),                            \
-               MAP_CHUNK(___12_DOX_ALL_THUMBS)                          \
-                                                                        )
-
-
-#define Base_4x6_4_6t6(                                                 \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C,                    \
-                       K31, K32, K33, K34, K35, K36,                    \
-                       K37, K38, K39, K3A, K3B, K3C)                    \
-  LAYOUT_PVARG(                                                         \
-               MOD_CORE_4x6(                                            \
-                            K01, K02, K03, K04, K05, K06,              \
-                            K07, K08, K09, K0A, K0B, K0C,              \
-                            K11, K12, K13, K14, K15, K16,              \
-                            K17, K18, K19, K1A, K1B, K1C,              \
-                            K21, K22, K23, K24, K25, K26,              \
-                            K27, K28, K29, K2A, K2B, K2C,             \
-                            K31, K32, K33, K34, K35, K36,               \
-                            K37, K38, K39, K3A, K3B, K3C),              \
-                MAP_CHUNK(___4_BOTTOM_LEFT),                            \
-                MAP_CHUNK(___4_BOTTOM_RIGHT),                           \
-                MAP_CHUNK(___12_DOX_ALL_THUMBS)                         \
-                                                                        )
-
-#define Transient_4x6_4_6(                                         \
-                          K01, K02, K03, K04, K05,                 \
-                          K07, K08, K09, K0A, K0B,                 \
-                          K11, K12, K13, K14, K15,                 \
-                          K17, K18, K19, K1A, K1B,                 \
-                          K21, K22, K23, K24, K25,                 \
-                          K27, K28, K29, K2A, K2B                 \
-                                                                       ) \
-                LAYOUT_PVARG(                                           \
-            ___12___, ___6___,                                                  \
-            ___12___,                                                   \
-            ___, K01, K02, K03, K04, K05,                               \
-            K07, K08, K09, K0A, K0B, ___,                               \
-            ___, K11, K12, K13, K14, K15,                               \
-            K17, K18, K19, K1A, K1B, ___,                               \
-            ___, K21, K22, K23, K24, K25,                               \
-            K27, K28, K29, K2A, K2B, ___,                               \
-            ___4___, ___4___,                                           \
-            MAP_CHUNK(___12_DOX_ALL_THUMBS)                             \
-                                                                        )
-
-/* ___KINTFUNC_L___, ___KINTFUNC_R___,                      \ */
-
-/* This keyboard is a split, 4x6 + a row of 5 and a thumb cluster of 8. */
-/* So We need Base_4x6_5_8 As a layout template to add mods, and fill */
-/* out the perimeter keys of the keyboard. Perimeter keys being the */
-/* number row, outside pinky keys, the 5th row, and thumbs. */
-
-/********************************************************************/
-/* Dactyl with 8 thumb keys*/
-/********************************************************************/
-// Basically an ergodox ez without the 3 pairs of middle keys.
-// electrically 7 columns in the 5th row. 6 in the rest.
-// Left, right, bottom, and thumbs all stay the same.
-
-#define Base_4x6_5_8(                                                   \
-                     K01, K02, K03, K04, K05,                           \
-                     K06, K07, K08, K09, K0A,                           \
-                     K11, K12, K13, K14, K15,                           \
-                     K16, K17, K18, K19, K1A,                           \
-                     K21, K22, K23, K24, K25,                           \
-                     K26, K27, K28, K29, K2A,                           \
-                     K31, K32, K33, K34, K35,                           \
-                     K36, K37, K38, K39, K3A                            \
-                                                                      ) \
-  LAYOUT_PVARG(                                                         \
-  MOD_CORE_4x5(K01, K02, K03, K04, K05,                           \
-               K06, K07, K08, K09, K0A,                           \
-               K11, K12, K13, K14, K15,                           \
-               K16, K17, K18, K19, K1A,                           \
-               K21, K22, K23, K24, K25,                           \
-               K26, K27, K28, K29, K2A,                           \
-               K31, K32, K33, K34, K35,                           \
-               K36, K37, K38, K39, K3A                            \
-               ),                                                       \
-  MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT),            \
-  MAP_CHUNK(___16_ALL_THUMBSa)                                          \
-                                                                        )
-
-#define Base_4x6_5_8t6(                                                 \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C,                    \
-                       K31, K32, K33, K34, K35, K36,                    \
-                       K37, K38, K39, K3A, K3B, K3C)                    \
-  LAYOUT_PVARG(                                                         \
-               MOD_CORE_4x6(                                            \
-                            K01, K02, K03, K04, K05, K06,               \
-                            K07, K08, K09, K0A, K0B, K0C,               \
-                            K11, K12, K13, K14, K15, K16,               \
-                            K17, K18, K19, K1A, K1B, K1C,               \
-                            K21, K22, K23, K24, K25, K26,               \
-                            K27, K28, K29, K2A, K2B, K2C,               \
-                            K31, K32, K33, K34, K35, K36,               \
-                            K37, K38, K39, K3A, K3B, K3C),              \
-               MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT), \
-               MAP_CHUNK(___16_ALL_THUMBSa)                             \
-                                                                        )
-
-
-// so far no need for mods on the transient layers.
-// switching to 3x5 transients. 10 column defines.
-// I like 3x10 maps even on big keyboards.
-# define Transient_4x6_5_8(                                             \
-                           K01, K02, K03, K04, K05,                     \
-                           K06, K07, K08, K09, K0A,                     \
-                           K11, K12, K13, K14, K15,                     \
-                           K16, K17, K18, K19, K1A,                \
-                           K21, K22, K23, K24, K25,                 \
-                           K26, K27, K28, K29, K2A                 \
-                                                                        ) \
-  LAYOUT_PVARG(                                                         \
-               ___6___, ___6___,                                        \
-               ___, K01, K02, K03, K04, K05,                            \
-               K06, K07, K08, K09, K0A, ___,                       \
-               ___, K11, K12, K13, K14, K15,                            \
-               K16, K17, K18, K19, K1A, ___,                       \
-               ___, K21, K22, K23, K24, K25,                            \
-               K26, K27, K28, K29, K2A, ___,                       \
-               ___5___, ___5___,                                        \
-               MAP_CHUNK(___16_ALL_THUMBSa)                          \
-                                                                        )
-
-/********************************************************************/
-/* Ergodox EZ                                                       */
-/********************************************************************/
-// This one is is set up to pass in the number row.
-// Beakl and bepo both change the number row.
-// Left, middle, right, bottom, and thumbs all stay the same.
-#define Base_dox(                                                       \
-                 K01, K02, K03, K04, K05,                               \
-                 K06, K07, K08, K09, K0A,                               \
-                 K11, K12, K13, K14, K15,                               \
-                 K16, K17, K18, K19, K1A,                               \
-                 K21, K22, K23, K24, K25,                               \
-                 K26, K27, K28, K29, K2A,                               \
-                 K31, K32, K33, K34, K35,                               \
-                 K36, K37, K38, K39, K3A                                \
-                                                                        ) \
-  LVARG_edox(                                                           \
-             MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                   \
-               MAP_CHUNK(___2_MIDDLE_1),                                \
-               MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                 \
-                                                                        \
-             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15),                   \
-               MAP_CHUNK(___2_MIDDLE_2),                                \
-               MOD_ROW(ROW1R)(K16, K17, K18, K19, K1A),                 \
-                                                                        \
-             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25),                   \
-             MOD_ROW(ROW2R)(K26, K27, K28, K29, K2A),                   \
-                                                                        \
-             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35),                   \
-             MAP_CHUNK(___2_MIDDLE_3),                                  \
-             MOD_ROW(ROW3R)(K36, K37, K38, K39, K3A),                   \
-             MAP_CHUNK(___5_BOTTOM_LEFT), MAP_CHUNK(___5_BOTTOM_RIGHT), \
-             MAP_CHUNK(___12_DOX_ALL_THUMBS)                           \
-                                                                        )
-
-#define Base_doxt6(                                                     \
-                   K01, K02, K03, K04, K05, K06, \
-                   K07, K08, K09, K0A, K0B, K0C,                        \
-                   K11, K12, K13, K14, K15, K16,                        \
-                   K17, K18, K19, K1A, K1B, K1C,                        \
-                   K21, K22, K23, K24, K25, K26,                        \
-                   K27, K28, K29, K2A, K2B, K2C,                        \
-                   K31, K32, K33, K34, K35, K36,                        \
-                   K37, K38, K39, K3A, K3B, K3C)                        \
-  LVARG_edox(MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),              \
-             MAP_CHUNK(___2_MIDDLE_1),                                  \
-             MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),              \
-             MOD_ROW(ROW1L)(K11, K12, K13, K14, K15, K16),              \
-             MAP_CHUNK(___2_MIDDLE_2),                                  \
-             MOD_ROW(ROW1R)(K17, K18, K19, K1A, K1B, K1C),              \
-             MOD_ROW(ROW2L)(K21, K22, K23, K24, K25, K26),              \
-             MOD_ROW(ROW2R)(K27, K28, K29, K2A, K2B, K2C),              \
-             MOD_ROW(ROW3L)(K31, K32, K33, K34, K35, K36),              \
-             MAP_CHUNK(___2_MIDDLE_3),                                  \
-             MOD_ROW(ROW3R)(K37, K38, K39, K3A, K3B, K3C),              \
-             MAP_CHUNK(___5_BOTTOM_LEFT),                              \
-             MAP_CHUNK(___5_BOTTOM_RIGHT),                             \
-             MAP_CHUNK(___12_DOX_ALL_THUMBS))
-
-#define Transient_dox(                                                  \
-                      K01, K02, K03, K04, K05,                          \
-                      K07, K08, K09, K0A, K0B,                          \
-                      K11, K12, K13, K14, K15,                          \
-                      K17, K18, K19, K1A, K1B,                          \
-                      K21, K22, K23, K24, K25,                          \
-                      K27, K28, K29, K2A, K2B)                          \
-  LVARG_edox(                                                           \
-             ___14___,                                                  \
-             ___, K01, K02, K03, K04, K05,                              \
-             ___2___,                                                   \
-             K07, K08, K09, K0A, K0B, ___,                              \
-             ___, K11, K12, K13, K14, K15,                              \
-             K17, K18, K19, K1A, K1B, ___,                              \
-             ___, K21, K22, K23, K24, K25,                              \
-             ___2___,                                                   \
-             K27, K28, K29, K2A, K2B, ___,                              \
-             ___5___, ___5___,                                          \
-             MAP_CHUNK(___12_DOX_ALL_THUMBS)                            \
-                                                                        )
-
-
-/********************************************************************/
-/* Rebound 4 rows, 1x12, 3x13  */
-/********************************************************************/
-#define LVARG_rebound(...)    LAYOUT_all(__VA_ARGS__)
-#define Base_rebound(                                                   \
-                     K01, K02, K03, K04, K05,                           \
-                     K06, K07, K08, K09, K0A,                           \
-                     K11, K12, K13, K14, K15,                           \
-                     K16, K17, K18, K19, K1A,                           \
-                     K21, K22, K23, K24, K25,                           \
-                     K26, K27, K28, K29, K2A                            \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),                \
-                MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),                \
-                                                                        \
-                MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),                \
-                KC_CCCV,                                                \
-                MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),                \
-                                                                        \
-                MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),                \
-                MO_ADJUST,                                              \
-                MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A),                \
-                MAP_CHUNK(___13_BOTTOM)                                 \
-                                                                        )
-#define Base_reboundt6(                                                 \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C                     \
-                                                                        ) \
-  LVARG_rebound(                                                        \
-                MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),           \
-                MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),           \
-                MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),           \
-                KC_CCCV,                                                \
-                MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),           \
-                MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),           \
-                MO_ADJUST,                                              \
-                MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C),              \
-                MAP_CHUNK(___13_BOTTOM)                                 \
-                                                                        )
-
-#define Rebound_transient(                                              \
-                          K01, K02, K03, K04, K05,                      \
-                          K07, K08, K09, K0A, K0B,                      \
-                          K11, K12, K13, K14, K15,                      \
-                          K17, K18, K19, K1A, K1B,                      \
-                          K21, K22, K23, K24, K25,                      \
-                          K27, K28, K29, K2A, K2B                       \
-                                                                       ) \
-  LVARG_rebound(                                                        \
-                ___, K01, K02, K03, K04, K05,                           \
-                K07, K08, K09, K0A, K0B, ___,                           \
-                ___, K11, K12, K13, K14, K15,                           \
-                ___,                                                    \
-                K17, K18, K19, K1A, K1B, ___,                           \
-                ___, K21, K22, K23, K24, K25,                           \
-                ___,                                                    \
-                K27, K28, K29, K2A, K2B, ___,                           \
-                MAP_CHUNK(___13_BOTTOM)                            \
-                                                                        )
-
-/********************************************************************/
-/* Kyria  or any other 3x5/6 with 4 keys in the middle of the last  */
-/* Row. Followed by 5 thumb keys on each side. 7 thumb keys total.  */
-/********************************************************************/
-#define Base_2x6_8_5(                                                   \
-                     K01, K02, K03, K04, K05, \
-                     K06, K07, K08, K09, K0A,                           \
-                     K11, K12, K13, K14, K15,                           \
-                     K16, K17, K18, K19, K1A,                           \
-                     K21, K22, K23, K24, K25,                           \
-                     K26, K27, K28, K29, K2A)                           \
-  LAYOUT_VARG(                                                          \
-              MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),                  \
-              MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),                  \
-                                                                        \
-              MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),                  \
-              MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),                  \
-                                                                        \
-              MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),                  \
-              MAP_CHUNK(___4_THUMBS),                                   \
-              MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A),                  \
-              MAP_CHUNK(___10_ERGO_THUMBS)                              \
-                                                                        )
-
-#define Base_2x6_8_5t6(                                                \
-                       K01, K02, K03, K04, K05, K06,                    \
-                       K07, K08, K09, K0A, K0B, K0C,                    \
-                       K11, K12, K13, K14, K15, K16,                    \
-                       K17, K18, K19, K1A, K1B, K1C,                    \
-                       K21, K22, K23, K24, K25, K26,                    \
-                       K27, K28, K29, K2A, K2B, K2C)                    \
-  LAYOUT_VARG(                                                          \
-              MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),            \
-              MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),            \
-              MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),            \
-              MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),            \
-              MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),            \
-              MAP_CHUNK(___4_THUMBS),                                   \
-              MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C),             \
-              MAP_CHUNK(___10_ERGO_THUMBS)                              \
-              )
-
-// All we really need is to add the see through thumbs to the end.
-#define Transient_2x6_8_5(                                              \
-                          K01, K02, K03, K04, K05,                      \
-                          K07, K08, K09, K0A, K0B,                      \
-                          K11, K12, K13, K14, K15,                      \
-                          K17, K18, K19, K1A, K1B,                      \
-                          K21, K22, K23, K24, K25,                      \
-                          K27, K28, K29, K2A, K2B                       \
-                                                                        ) \
-  LAYOUT_VARG(                                                          \
-              ___, K01, K02, K03, K04, K05,                             \
-              K07, K08, K09, K0A, K0B, ___,                             \
-              ___, K11, K12, K13, K14, K15,                             \
-              K17, K18, K19, K1A, K1B, ___,                             \
-              ___, K21, K22, K23, K24, K25,                             \
-              ___4___,                                                \
-              K27, K28, K29, K2A, K2B, ___,                           \
-              MAP_CHUNK(___10_ERGO_THUMBS)                             \
-                                                                        )
diff --git a/users/ericgebhart/keymap/keymap.c b/users/ericgebhart/keymap/keymap.c
deleted file mode 100644
index bee8538e26..0000000000
--- a/users/ericgebhart/keymap/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-/* This is my keymap. Enable the layers you want in config.h. */
-
-#include QMK_KEYBOARD_H
-#include "ericgebhart.h"
-#include "layouts.h"
-
-#include "keyboards.h"
-
-// set up the wrapper macros.
-#define BASE_LAYER(NAME, ...)  [NAME] = BASE(__VA_ARGS__)
-#define BASE_LAYERt6(NAME, ...)  [NAME] = BASEt6(__VA_ARGS__)
-#define T_LAYER(LNAME, ...)  [LNAME] = TRANS(__VA_ARGS__)
-
-
-// One that takes 5 and one that takes 6 for bepo and other big maps
-// that need 3x12 instead of 3x10.
-#ifdef BASE_NUMBER_ROW
-#define B_LAYER(LNAME, NUMS, LAYOUT) BASE_LAYER(LNAME, NUMS, LAYOUT)
-#define B_LAYERt6(LNAME, NUMS, LAYOUT) BASE_LAYERt6(LNAME, NUMS, LAYOUT)
-#else
-// if there is no number row, don't give it one.
-#define B_LAYER(LNAME, NUMS, LAYOUT) BASE_LAYER(LNAME, LAYOUT)
-#define B_LAYERt6(LNAME, NUMS, LAYOUT) BASE_LAYERt6(LNAME, LAYOUT)
-#endif
-
-// Find alt local key definitions.
-// DV for dvorak/qwerty maps on bepo.
-// BK, BKW for beakl maps on en-qwerty and bepo.
-// BKW is automatic in map_beakl.h
-#define ALT_TARGET_IS NONE // NONE, DV=dvorak, BK=Beakl, BK2, BKW=Beaklwi.
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // Default lang, Base layers
-#include "map_dvorak.h"
-#include "map_maks.h"
-#include "map_qwerty.h"
-#include "map_beakl.h"
-#include "map_alt.h"
-#include "map_gap.h"
-#include "map_carpalx.h"
-#include "map_hd.h"
-#include "map_bepo.h"
-
-  // create a set of layers for a second locale.
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-  // changes alt target for us, because both en-qwerty and fr-bepo
-  // need a beakl alt target.
-#include "map_beakl.h"
-
-  // Qwerty based layers. Need a DV alt target to get the right shifted keys.
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS DV // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
-
-#include "map_dvorak.h"
-#include "map_maks.h"
-#include "map_qwerty.h"
-#include "map_alt.h"
-#include "map_gap.h"
-#include "map_carpalx.h"
-#include "map_hd.h"
-
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS NONE // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
-
-#include "map_bepo.h"
-
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#endif // bepo
-
-
-// SYMBOL LAYER
-#include "map_symbols.h"
-
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-#include "map_symbols.h"
-
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#endif
-
-
-  // KEYPAD LAYER
-#include "map_keypads.h"
-
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-#include "map_keypads.h"
-
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#endif
-
-
-// TOPROWS LAYER
-#include "map_toprows.h"
-
-#include "map_accented.h"
-
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-#include "map_toprows.h"
-
-#include "map_accented.h"
-
-#undef LANG_IS
-#define LANG_IS EN
-#endif
-
-// functional non language based layers.
-#include "map_funcs.h"
-
-};
diff --git a/users/ericgebhart/keymap/map_accented.h b/users/ericgebhart/keymap/map_accented.h
deleted file mode 100644
index 98ff8a34f1..0000000000
--- a/users/ericgebhart/keymap/map_accented.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Accented character and dead key layers.
-#ifdef ACCENTS_LAYER_ENABLE
-  T_LAYER(LANG_N(_ACCENTS), ___ACCENTS___),
-#endif
-#ifdef MORTE_LAYER_ENABLE
-  T_LAYER(LANG_N(_MORTE), ___MORTE___),
-#endif
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-  T_LAYER(LANG_N(_ACCENTS_MORTE), ___ACCENTS_MORTE___),
-#endif
diff --git a/users/ericgebhart/keymap/map_alt.h b/users/ericgebhart/keymap/map_alt.h
deleted file mode 100644
index 5fb0a12135..0000000000
--- a/users/ericgebhart/keymap/map_alt.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-#ifdef MALTRON_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE MALTRON_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_E)
-    B_LAYER(LANG_N(_MALTRON), ___10_NUMBERS___, ___MALTRON___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-
-
-#ifdef RSTHD_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE RSTHD_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_E)
-    B_LAYER(LANG_N(_RSTHD), ___10_NUMBERS___, ___RSTHD___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef EUCALYN_LAYER_ENABLE
-    B_LAYER(LANG_N(_EUCALYN), ___10_NUMBERS___, ___EUCALYN___),
-#endif
-
-#ifdef HANDS_UP_LAYER_ENABLE
-    B_LAYER(LANG_N(_HANDS_UP), ___10_NUMBERS___, ___HANDS_UP___),
-#endif
-#ifdef WHITE_LAYER_ENABLE
-    B_LAYER(LANG_N(_WHITE), ___10_NUMBERS___, ___WHITE___),
-#endif
-#ifdef ISRT_LAYER_ENABLE
-    B_LAYER(LANG_N(_ISRT), ___10_NUMBERS___, ___ISRT___),
-#endif
-#ifdef SOUL_LAYER_ENABLE
-    B_LAYER(LANG_N(_SOUL), ___10_NUMBERS___, ___SOUL___),
-#endif
-#ifdef NIRO_LAYER_ENABLE
-    B_LAYER(LANG_N(_NIRO), ___10_NUMBERS___, ___NIRO___),
-#endif
-#ifdef ASSET_LAYER_ENABLE
-    B_LAYER(LANG_N(_ASSET), ___10_NUMBERS___, ___ASSET___),
-#endif
-#ifdef WHORF_LAYER_ENABLE
-    B_LAYER(LANG_N(_WHORF), ___10_NUMBERS___, ___WHORF___),
-#endif
-#ifdef WHORF6_LAYER_ENABLE
-    B_LAYER(LANG_N(_WHORF6), ___10_NUMBERS___, ___WHORF6___),
-#endif
diff --git a/users/ericgebhart/keymap/map_beakl.h b/users/ericgebhart/keymap/map_beakl.h
deleted file mode 100644
index e477790fbc..0000000000
--- a/users/ericgebhart/keymap/map_beakl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// choose your beakl,
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS BK // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
-
-#ifdef BEAKL15_LAYER_ENABLE
-B_LAYER(LANG_N(_BEAKL15), ___10_NUMBERS_BEAKL15___, ___BEAKL15___),
-#endif
-
-#ifdef BEAKL19_LAYER_ENABLE
-  B_LAYER(LANG_N(_BEAKL19), ___10_NUMBERS_BEAKL19___, ___BEAKL19___),
-#endif
-
-#ifdef BEAKL27_LAYER_ENABLE
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS BK2 // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
-
-  B_LAYER(LANG_N(_BEAKL27), ___10_NUMBERS_BEAKL19___, ___BEAKL27___),
-#endif
-
-#ifdef BEAKLWI_LAYER_ENABLE
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS BKW // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
-
-#undef THUMBS_ARE   // change the default thumbs to WI.
-#define THUMBS_ARE WIa
-  B_LAYER(LANG_N(_BEAKLWI), ___10_NUMBERS_BEAKL19___, ___BEAKLWI___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#endif
-
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS NONE // NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi.
diff --git a/users/ericgebhart/keymap/map_bepo.h b/users/ericgebhart/keymap/map_bepo.h
deleted file mode 100644
index 8371096053..0000000000
--- a/users/ericgebhart/keymap/map_bepo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// beginning of 3x12 base layers.
-
-#undef BASE_COLS_IN_OUT
-#define BASE_COLS_IN_OUT 6 // 5, 5_6, 6
-
-#ifdef BEPO_LAYER_ENABLE
-    B_LAYERt6(LANG_N(_BEPO), ___12_SYMBOLS_BEPO___, ___BEPO_3x12___),
-#endif
-
-#ifdef OPTIMOT_LAYER_ENABLE
-    B_LAYERt6(LANG_N(_OPTIMOT), ___12_SYMBOLS_BEPO___, ___OPTIMOT_3x12___),
-#endif
-
-#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
-      B_LAYER(LANG_N(_OPTIMOT), ___10_SYMBOLS_BEPO___, ___OPTIMOT_3x10___),
-#endif
-
-#ifdef BEAKL19bis_LAYER_ENABLE
-    B_LAYERt6(LANG_N(_BEAKL19bis), ___12_SYMBOLS_BEPO___, ___BEAKL19bis_3x12___),
-#endif
-
-// end of 3x12 base layers.
-#undef BASE_COLS_IN_OUT
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
diff --git a/users/ericgebhart/keymap/map_carpalx.h b/users/ericgebhart/keymap/map_carpalx.h
deleted file mode 100644
index e36ca1caef..0000000000
--- a/users/ericgebhart/keymap/map_carpalx.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef CARPALX_QFMLWY_LAYER_ENABLE
-B_LAYER(LANG_N(_CARPALX_QFMLWY), ___10_NUMBERS___, ___CARPALX_QFMLWY___),
-#endif
-#ifdef CARPALX_QGMLWB_LAYER_ENABLE
-  B_LAYER(LANG_N(_CARPALX_QGMLWB), ___10_NUMBERS___, ___CARPALX_QGMLWB___),
-#endif
-#ifdef CARPALX_QGMLWY_LAYER_ENABLE
-  B_LAYER(LANG_N(_CARPALX_QGMLWY), ___10_NUMBERS___, ___CARPALX_QGMLWY___),
-#endif
diff --git a/users/ericgebhart/keymap/map_dvorak.h b/users/ericgebhart/keymap/map_dvorak.h
deleted file mode 100644
index 40afe827cc..0000000000
--- a/users/ericgebhart/keymap/map_dvorak.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef DVORAK_LAYER_ENABLE
-B_LAYER(LANG_N(_DVORAK), ___10_NUMBERS___, ___DVORAK___),
-#endif
-#ifdef DVORAK_RLC_IU_LAYER_ENABLE
-  B_LAYER(LANG_N(_DVORAK_RLC_IU), ___10_NUMBERS___, ___DVORAK_RLC_IU___),
-#endif
-#ifdef BOO_LAYER_ENABLE
-  B_LAYER(LANG_N(_BOO), ___10_NUMBERS___, ___BOO___),
-#endif
-#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
-  B_LAYER(LANG_N(_CAPEWELL_DVORAK), ___10_NUMBERS___, ___CAPEWELL_DVORAK___),
-#endif
-#ifdef AHEI_LAYER_ENABLE
-  B_LAYER(LANG_N(_AHEI), ___10_NUMBERS___, ___AHEI___),
-#endif
diff --git a/users/ericgebhart/keymap/map_funcs.h b/users/ericgebhart/keymap/map_funcs.h
deleted file mode 100644
index 0bf20610f3..0000000000
--- a/users/ericgebhart/keymap/map_funcs.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// navigation.  Mouse keys, arrows, home,end, etc.
-#ifdef NAV_LAYER_ENABLE
-#  ifdef MOUSEKEY_ENABLE
-#      undef THUMBS_ARE
-#      define THUMBS_ARE MOUSE_LAYER_THUMBS
-
-#    ifdef NAV_FULL_LOCK_MODS
-T_LAYER(_NAV, ___NAVA_3x10___),
-#    endif
-
-#    ifdef NAV_FULL
-  T_LAYER(_NAV, ___NAV_3x10___),
-#    endif
-
-#    ifdef NAV_NO_MOUSE
-  T_LAYER(_NAV, ___NAVnm_3x10___),
-  T_LAYER(_NAVm, ___NAVm_3x10___),
-#    endif
-
-// give a default
-#    if !defined(NAV_FULL) &&           \
-        !defined(NAV_NO_MOUSE) &&       \
-        !defined(NAV_FULL_LOCK_MODS)    \
-
-  T_LAYER(_NAV, ___NAVA_3x10___),
-#    endif
-
-#    ifdef MOUSE_LAYER_ENABLE
-  T_LAYER(_NAVm, ___NAVm_3x10___),
-#    endif
-
-#    undef THUMBS_ARE
-#    define THUMBS_ARE DEFAULT_THUMBS
-
-#  else // no mouse enable.
-  T_LAYER(_NAV, ___NAVnm_3x10___),
-#  endif // mousekey end.
-#endif //nav end.
-
-#ifdef MEDIA_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE MEDIA_LAYER_THUMBS
-  T_LAYER(_MEDIA, ___MEDIA_3x10___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#endif
-
-#ifdef FUN_LAYER_ENABLE
-
-#ifdef FUNCPAD_MIRYOKU_ENABLE
-  T_LAYER(_FUN, ___FUN_3x10___),
-#else
-  T_LAYER(_FUN, ___FUN_MIRYOKU_3x10___),
-#endif
-
-#endif
-
-// A layer for layers. to set the default, etc.
-  T_LAYER(_LAYERS, ___LAYERS_3x10___),
-
-// control the RGB if there are any.
-#ifdef RGB_LAYER_ENABLE
-  T_LAYER(_RGB, ___RGB_3x10___),
-#endif
-
-// control and adjust stuff.
-#ifdef ADJUST_LAYER_ENABLE
-  T_LAYER(_ADJUST, ___ADJUST_3x10___),
-#endif
-
-
-// put the combo reference layers at the end.
-#ifdef COMBO_REF_LAYER_ENABLE
-#undef LANG_IS
-#define LANG_IS COMBO
-#undef EDGE_KEY_SET_IS
-#define EDGE_KEY_SET_IS REF1
-#undef THUMBS_ARE
-#define THUMBS_ARE COMBO
-#undef MODS_ARE
-#define MODS_ARE TRNS
-  B_LAYER(_COMBO_REF, ___10_NUMBERS___, ___COMBO_REF___),
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#undef EDGE_KEY_SET_IS
-#define EDGE_KEY_SET_IS DEFAULT_EDGE_SET
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef MODS_ARE
-#define MODS_ARE DEFAULT_MODS
-#endif
-
-#ifdef COMBO_REF_LAYER_TWO_ENABLE
-#undef LANG_IS
-#define LANG_IS COMBO2
-#undef EDGE_KEY_SET_IS
-#define EDGE_KEY_SET_IS REF2
-#undef THUMBS_ARE
-#define THUMBS_ARE COMBO2
-#undef MODS_ARE
-#define MODS_ARE TRNS
-  B_LAYER(_COMBO_REF2, ___10_NUMBERS___, ___COMBO_REF___),
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#undef EDGE_KEY_SET_IS
-#define EDGE_KEY_SET_IS DEFAULT_EDGE_SET
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef MODS_ARE
-#define MODS_ARE DEFAULT_MODS
-#endif
diff --git a/users/ericgebhart/keymap/map_gap.h b/users/ericgebhart/keymap/map_gap.h
deleted file mode 100644
index af0855c983..0000000000
--- a/users/ericgebhart/keymap/map_gap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef MTGAP_LAYER_ENABLE
-B_LAYER(LANG_N(_MTGAP), ___10_NUMBERS___, ___MTGAP___),
-#endif
-
-#ifdef CTGAP_LAYER_ENABLE
-  B_LAYER(LANG_N(_CTGAP), ___10_NUMBERS___, ___CTGAP___),
-#endif
-
-#ifdef APT_LAYER_ENABLE
-  B_LAYER(LANG_N(_APT), ___10_NUMBERS___, ___APT___),
-#endif
-
-#ifdef CANARY_LAYER_ENABLE
-  B_LAYER(LANG_N(_CANARY), ___10_NUMBERS___, ___CANARY___),
-#endif
diff --git a/users/ericgebhart/keymap/map_hd.h b/users/ericgebhart/keymap/map_hd.h
deleted file mode 100644
index 1123e88074..0000000000
--- a/users/ericgebhart/keymap/map_hd.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS HD
-// NONE, DV = dvorak, BK=Beakl, BKW=Beaklwi, HD=Hands down.
-// HD_ELAN,
-
-#ifdef HD_NEU_LAYER_ENABLE
-B_LAYERt6(LANG_N(_HD_NEU), ___12_NUMBERS___, ___HD_NEU___),
-#endif
-
-#ifdef HD_NEU_NARROW_LAYER_ENABLE
-  B_LAYER(LANG_N(_HD_NEU_NARROW), ___10_NUMBERS___, ___HD_NEU_NARROW___),
-#endif
-
-#ifdef HD_REF_LAYER_ENABLE
-  B_LAYER(LANG_N(_HD_REF), ___10_NUMBERS___, ___HD_REF___),
-#endif
-
-#ifdef HD_TITANIUM_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_R)
-  B_LAYER(LANG_N(_HD_TITANIUM), ___10_NUMBERS___, ___HD_TITANIUM___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_GOLD_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_T)
-  B_LAYER(LANG_N(_HD_GOLD), ___10_NUMBERS___, ___HD_GOLD___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_PLATINUM_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_L)
-  B_LAYER(LANG_N(_HD_PLATINUM), ___10_NUMBERS___, ___HD_PLATINUM___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_SILVER_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_N)
-  B_LAYER(LANG_N(_HD_SILVER), ___10_NUMBERS___, ___HD_SILVER___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_BRONZE_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_H)
-  B_LAYER(LANG_N(_HD_BRONZE), ___10_NUMBERS___, ___HD_BRONZE___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_ELAN_LAYER_ENABLE
-#undef THUMBS_ARE
-#define THUMBS_ARE HANDS_DOWN_LTR_THUMBS_ARE
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(TL_DOT)
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS HD_ELAN
-  B_LAYER(LANG_N(_HD_ELAN), ___10_NUMBERS___, ___HD_ELAN___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS NONE
-#undef THUMB_LETTER
-#endif
-
-#ifdef HD_DASH_LAYER_ENABLE
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS HD_DASH
-#undef THUMBS_ARE
-#define THUMBS_ARE HD_DASH
-#undef THUMB_LETTER
-#define THUMB_LETTER LANG_KC(_E)
-  B_LAYER(LANG_N(_HD_DASH), ___10_NUMBERS___, ___HD_DASH___),
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#undef ALT_TARGET_IS
-#define ALT_TARGET_IS NONE
-#undef THUMB_LETTER
-#endif
diff --git a/users/ericgebhart/keymap/map_keypads.h b/users/ericgebhart/keymap/map_keypads.h
deleted file mode 100644
index 7b76731b83..0000000000
--- a/users/ericgebhart/keymap/map_keypads.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef KEYPAD_LAYER_ENABLE
-#  undef THUMBS_ARE
-#  define THUMBS_ARE KEYPAD_LAYER_THUMBS
-
-#  ifdef KEYPAD_BEAKL
-#    ifdef KEYPAD_BEAKL_WI
-T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_WI_3x10___),
-#    else
-#      ifdef KEYPAD_MODS
-  T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_MODS_3x10___),
-#      else
-  T_LAYER(LANG_N(_KEYPAD), ___KP_BKL_FUNC_3x10___),
-#      endif
-#    endif
-
-#  else  //not beakl
-
-#    ifdef KEYPAD_MIRYOKU
-  T_LAYER(LANG_N(_KEYPAD), ___KP_MIRYOKU_3x10___),
-#    else
-
-#      ifdef KEYPAD_RIGHT
-#        ifdef KEYPAD_MODS
-  T_LAYER(LANG_N(_KEYPAD), ___MODS_KP_3x10___),
-#        else
-  T_LAYER(LANG_N(_KEYPAD), ___FP_KP_3x10___),
-#        endif
-
-#      else // kp Left
-#        ifdef KEYPAD_MODS
-  T_LAYER(LANG_N(_KEYPAD), ___KP_MODS_3x10___),
-#        else
-  T_LAYER(LANG_N(_KEYPAD), ___KP_FP_3x10___),
-#        endif
-#      endif
-#    endif
-
-#  endif // not beakl
-
-#undef THUMBS_ARE
-#define THUMBS_ARE DEFAULT_THUMBS
-#endif
-
-#ifdef FUNC_LAYER_ENABLE
-#  ifdef FUNCPAD_MIRYOKU
-  T_LAYER(_FUN, ___FP_MIRYOKU_3x10___),
-#  else
-  T_LAYER(_FUN, ___FUN_3x10___),
-#  endif
-#endif
diff --git a/users/ericgebhart/keymap/map_maks.h b/users/ericgebhart/keymap/map_maks.h
deleted file mode 100644
index 3290b2b772..0000000000
--- a/users/ericgebhart/keymap/map_maks.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef COLEMAK_LAYER_ENABLE
-B_LAYER(LANG_N(_COLEMAK), ___10_NUMBERS___, ___COLEMAK___),
-#endif
-#ifdef COLEMAK_DH_LAYER_ENABLE
-  B_LAYER(LANG_N(_COLEMAK_DH), ___10_NUMBERS___, ___COLEMAK_DH___),
-#endif
-#ifdef HALMAK_LAYER_ENABLE
-  B_LAYER(LANG_N(_HALMAK), ___10_NUMBERS___, ___HALMAK___),
-#endif
-#ifdef MINIMAK_LAYER_ENABLE
-  B_LAYER(LANG_N(_MINIMAK), ___10_NUMBERS___, ___MINIMAK___),
-#endif
-#ifdef MINIMAK_8_LAYER_ENABLE
-  B_LAYER(LANG_N(_MINIMAK_8), ___10_NUMBERS___, ___MINIMAK___),
-#endif
-#ifdef MINIMAK_12_LAYER_ENABLE
-  B_LAYER(LANG_N(_MINIMAK_12), ___10_NUMBERS___, ___MINIMAK___),
-#endif
diff --git a/users/ericgebhart/keymap/map_qwerty.h b/users/ericgebhart/keymap/map_qwerty.h
deleted file mode 100644
index db74bdeb39..0000000000
--- a/users/ericgebhart/keymap/map_qwerty.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef QWERTY_LAYER_ENABLE
-B_LAYER(LANG_N(_QWERTY), ___10_NUMBERS___, ___QWERTY___),
-#endif
-#ifdef NORMAN_LAYER_ENABLE
-  B_LAYER(LANG_N(_NORMAN), ___10_NUMBERS___, ___NORMAN___),
-#endif
-#ifdef WORKMAN_LAYER_ENABLE
-  B_LAYER(LANG_N(_WORKMAN), ___10_NUMBERS___, ___WORKMAN___),
-#endif
diff --git a/users/ericgebhart/keymap/map_symbols.h b/users/ericgebhart/keymap/map_symbols.h
deleted file mode 100644
index 7908e95262..0000000000
--- a/users/ericgebhart/keymap/map_symbols.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef SYMBOL_LAYER_ENABLE
-#  undef THUMBS_ARE
-#  define THUMBS_ARE SYMB_LAYER_THUMBS
-
-#  ifdef SYMBOL_BEAKL_C
-T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLC_3x10___),
-#  else
-
-#    ifdef SYMBOL_BEAKL_EXT_VI
-      T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLB_3x10___),
-#    else
-
-#      ifdef SYMBOL_BEAKL_EXT
-      T_LAYER(LANG_N(_SYMB ), ___SYMB_BEAKLA_3x10___),
-#      else
-
-#        ifdef SYMBOL_BEAKL_WI
-  T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKLWI_3x10___),
-#        else
-
-#          ifdef SYMBOL_MIRYOKU
-  T_LAYER(LANG_N(_SYMB), ___SYMB_MIRYOKU_3x10___),
-#          else
-
-#            ifdef SYMBOL_NEO
-  T_LAYER(LANG_N(_SYMB), ___SYMB_NEO_3x10___),
-#            else
-
-// basic beakl, the default if nothing chosen.
-           T_LAYER(LANG_N(_SYMB), ___SYMB_BEAKL_3x10___),
-
-#            endif //neo
-#          endif //miryoku
-#        endif //beakl wi
-#      endif //beakl ext
-#    endif //beakl ext vi
-#  endif //beaklc
-#  undef THUMBS_ARE
-#  define THUMBS_ARE DEFAULT_THUMBS
-#endif
diff --git a/users/ericgebhart/keymap/map_toprows.h b/users/ericgebhart/keymap/map_toprows.h
deleted file mode 100644
index 893541e8a0..0000000000
--- a/users/ericgebhart/keymap/map_toprows.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Top Rows  commonly called Raise
-#ifdef TOPROWS_LAYER_ENABLE
-
-#  undef THUMBS_ARE
-#  define THUMBS_ARE TOPROWS_LAYER_THUMBS
-
-#  ifdef TOPROWS_BKL_15_NUMS
-T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_3x10___),
-#  endif
-
-#  ifdef TOPROWS_BKL_19_NUMS
-  T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_BKL19_3x10___),
-#  endif
-
-#  ifdef TOPROWS_MOD
-  T_LAYER(LANG_N(_TOPROWS), ___TOPROWS_MOD_3x10___),
-#  endif
-
-// Not beakl numbers. Give a basic en-qwerty toprows layer.
-#if !defined(TOPROWS_BKL_15_NUMS) &&            \
-  !defined(TOPROWS_BKL_19_NUMS) &&              \
-  !defined(TOPROWS_MOD)
-
-  T_LAYER(LANG_N(_TOPROWS), ___RAISE_3x10___),
-#endif
-
-#  undef THUMBS_ARE
-#  define THUMBS_ARE DEFAULT_THUMBS
-#endif // toprows.
diff --git a/users/ericgebhart/lang/lang.h b/users/ericgebhart/lang/lang.h
deleted file mode 100644
index 32172a935e..0000000000
--- a/users/ericgebhart/lang/lang.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Language macros to change the names of things to
-// match the value of LANG_IS, and EDGE_COLS.
-// it would be nice to have consistency, but there isn't.
-// Keys need a prefix, layer chunks need a different suffix,
-// defines that are are opposite, of keys.
-//
-// In order to change layer and other names to match lang.
-// foo --> foo_bp or foo.
-
-// A new language just needs entries to match so
-// that it will create the proper names when LANG_IS
-// set to the appropriate values.
-// sonly the pfx and sfx functions need additions for
-// another language.
-// The rest is making sure there are keymap chunks
-// defined as needed.
-#define COMMA ,
-
-#define CONCATENATE(a, ...) a ## __VA_ARGS__
-#define CAT(a, ...) CONCATENATE(a, __VA_ARGS__)
-
-// We need another one with a different name.
-// The macros are painted blue otherwise.
-// Cat gets used at a low level, around keys, or layers basically.
-// Cat 2 is used for thumb cluster choices, any of which can contain
-// a number of CATS down at the bottom. -- nested macros of the same
-// name get painted blue.  So here we are. :-).  look in edge_keys.h
-// for THUMBS
-#define CONCATENATE2(a, ...) a ## __VA_ARGS__
-#define CAT2(a, ...) CONCATENATE2(a, __VA_ARGS__)
-
-#define CONCATENATE3(a, ...) a ## __VA_ARGS__
-#define CAT3(a, ...) CONCATENATE3(a, __VA_ARGS__)
-
-
-#define EMPTY()
-#define DEFER(id) id EMPTY()
-#define OBSTRUCT(...) __VA_ARGS__ DEFER(EMPTY)()
-#define EXPAND(...) __VA_ARGS__
-
-// Give the right keycode prefix by LANG_IS
-#define LANG_PFX CAT(LANG_IS, KC)
-#define COMBOKC CB
-#define COMBO2KC CB2
-#define BEPOKC BP
-#define ENKC KC
-#define US_INTKC US
-
-// Give the right symbol suffix by LANG_IS
-#define LANG_SFX CAT(CAT(LANG_IS, _), SFX)
-#define LOCALE_LAYERS_SFX _LL // for counting the base layers.
-#define COMBO_SFX _CB
-#define COMBO2_SFX _CB2
-#define BEPO_SFX _BP
-#define EN_SFX _EN
-#define US_INT_SFX _EN
-
-// Give the right map chunk suffix by LANG_IS
-#define LANG_MAPSFX CAT(CAT(LANG_IS, _), MAPSFX)
-#define COMBO_MAPSFX _CB___
-#define COMBO2_MAPSFX _CB2___
-#define BEPO_MAPSFX _BP___
-#define EN_MAPSFX _EN___
-#define US_INT_MAPSFX _EN___
-
-// These use the mapping above to get their job done.
-
-// In order to create keycode names to match lang.
-// A  --> BP_A or KC_A,US_A
-#define LANG_KC(NAME) CAT(LANG_PFX, NAME)
-
-// _SYMB -> _SYMB_EN
-// _SYMB -> _SYMB_BP
-#define LANG_N(NAME) CAT(NAME, LANG_SFX)
-
-// In order to map chunk names to match lang.
-// MAP_CHUNK(___15_BOTTOM) --> ___15_BOTTOM_EN___ or ___15_BOTTOM_BP___
-#define MAP_CHUNK(NAME) CAT3(NAME, LANG_MAPSFX)
-
-
-// for the oled layer map switch
-#ifdef SECOND_LOCALE
-#define LCASE(NAME)                          \
-  case CAT2(NAME, _EN):                      \
-  case CAT2(NAME, _BP):
-#else
-#define LCASE(NAME)                          \
-  case CAT2(NAME, _EN):
-#endif
diff --git a/users/ericgebhart/lang/lang_map.h b/users/ericgebhart/lang/lang_map.h
deleted file mode 100644
index 16226f64fd..0000000000
--- a/users/ericgebhart/lang/lang_map.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#define CONCATENATEKC(a, ...) a ## __VA_ARGS__
-#define CATKC(a, ...) CONCATENATEKC(a, __VA_ARGS__)
-#define LKC(NAME) CATKC(LANG_PFX, NAME)
-
-// NONE, DV = dvorak, BK=Beakl, BK2=Beakl27, BKW=Beaklwi.
-// Give the right keycode prefix by Alt target _IS
-#define ALT_TARGET_IS NONE
-#define TARGET_PFX CATKC(ALT_TARGET_IS, KC)
-#define NONEKC
-#define DVKC _DV
-#define BKKC _BK
-#define BKWKC _BKW
-#define BK2KC _BK2
-#define HDKC _HD
-#define HD_ELANKC _HD_E
-#define HD_DASHKC _HD_D
-
-#define CONCATENATETKC(a, ...) a ## __VA_ARGS__
-#define CATTKC(a, ...) CONCATENATETKC(a, __VA_ARGS__)
-
-// depending on the value of ALT_TARGET_IS and LANG_IS.
-// TL_COMM -> TLKC(_COMM)
-// TLKC(_COMM) -> _BK_COMM, _DV_COMM, _BK2_COMM, _BK_COMM, _HD_COMM...
-#define TLKC(NAME) CATTKC(TARGET_PFX, NAME)
-
-#define LANG_ROW(K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A)      \
-  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05),                     \
-    LKC(K06), LKC(K07), LKC(K08), LKC(K09), LKC(K0A)                    \
-
-#define LANG_ROW12(K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C) \
-  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05), LKC(K06),           \
-    LKC(K07), LKC(K08), LKC(K09), LKC(K0A), LKC(K0B), LKC(K0C)          \
-
-// takes a 3x10
-#define LANG_MAP(K01, K02, K03, K04, K05,               \
-                 K06, K07, K08, K09, K0A,               \
-                 K11, K12, K13, K14, K15,               \
-                 K16, K17, K18, K19, K1A,               \
-                 K21, K22, K23, K24, K25,               \
-                 K26, K27, K28, K29, K2A)               \
-  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05),     \
-    LKC(K06), LKC(K07), LKC(K08), LKC(K09), LKC(K0A),   \
-    LKC(K11), LKC(K12), LKC(K13), LKC(K14), LKC(K15),   \
-    LKC(K16), LKC(K17), LKC(K18), LKC(K19), LKC(K1A),   \
-    LKC(K21), LKC(K22), LKC(K23), LKC(K24), LKC(K25),   \
-    LKC(K26), LKC(K27), LKC(K28), LKC(K29), LKC(K2A)
-
-
-// takes a 3x12
-#define LANG_MAP6(K01, K02, K03, K04, K05, K06,                 \
-                  K07, K08, K09, K0A, K0B, K0C,                 \
-                  K11, K12, K13, K14, K15, K16,                 \
-                  K17, K18, K19, K1A, K1B, K1C,                 \
-                  K21, K22, K23, K24, K25, K26,                 \
-                  K27, K28, K29, K2A, K2B, K2C)                 \
-  LKC(K01), LKC(K02), LKC(K03), LKC(K04), LKC(K05), LKC(K06),   \
-    LKC(K07), LKC(K08), LKC(K09), LKC(K0A), LKC(K0B), LKC(K0C), \
-    LKC(K11), LKC(K12), LKC(K13), LKC(K14), LKC(K15), LKC(K16), \
-    LKC(K18), LKC(K18), LKC(K19), LKC(K1A), LKC(K1B), LKC(K1C), \
-    LKC(K21), LKC(K22), LKC(K23), LKC(K24), LKC(K25), LKC(K26), \
-    LKC(K27), LKC(K28), LKC(K29), LKC(K2A), LKC(K2B), LKC(K2C)
diff --git a/users/ericgebhart/lang/locale_layers.h b/users/ericgebhart/lang/locale_layers.h
deleted file mode 100644
index 103c1c4ed9..0000000000
--- a/users/ericgebhart/lang/locale_layers.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#define LOCALE_DEFAULT CAT(LOCALE_, DEFAULT_LANG)
-#define LOCALE_TWO CAT(LOCALE_, SECOND_LOCALE)
-
-enum locales {
-  LOCALE_DEFAULT = 0,
-#ifdef SECOND_LOCALE
-  LOCALE_TWO,
-#endif
-  LOCALES_END,
-};
diff --git a/users/ericgebhart/lang/locales.c b/users/ericgebhart/lang/locales.c
deleted file mode 100644
index 560dec13b7..0000000000
--- a/users/ericgebhart/lang/locales.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-#include "locales.h"
-
-bool process_locales(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-  case KC_SET_BASE:
-    // set the current default base to eeprom.
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(get_highest_layer(default_layer_state));
-    }
-    break;
-
-    // choose a different set of default layers based on locales.
-  case KC_NEXT_LOCALE:
-    // choose another locale and set the default base to the first layer.
-    if (!record->event.pressed) {
-      if (current_locale + 1 < LOCALES_END){
-        current_locale++;
-      }else{
-        current_locale = 0;
-      }
-      default_layer_set(1UL << LOCALE_LAYER_RANGE[0]);
-    }
-    return false;
-    break;
-
-    // choose a different base layer based on locales.
-    // simply iterates over the list and sets the default layer.
-  case KC_NEXT_BASE_LAYER:
-    if (!record->event.pressed) {
-      uint8_t current = get_highest_layer(default_layer_state);
-      if (current < LOCALE_LAYER_RANGE[1]){
-        current++;
-      }else{
-        current = LOCALE_LAYER_RANGE[0];
-      }
-      default_layer_set(1UL << current);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
diff --git a/users/ericgebhart/lang/locales.h b/users/ericgebhart/lang/locales.h
deleted file mode 100644
index e38f5aeb72..0000000000
--- a/users/ericgebhart/lang/locales.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-/*
-  Copyright 2022 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-
-// Stuff we need for locale and layer switching
-// there can be more but we need to know where they start and end.
-// remember there's limitations on layers.
-// Our locales. so it's easy to switch between them.
-
-
-const uint16_t base_layer_count = BASE_NAME_COUNT - 1;
-
-const uint16_t locale_layers[][2] = {
-  [LOCALE_DEFAULT] =      {0, base_layer_count},
-#ifdef SECOND_LOCALE
-  [LOCALE_TWO] =    {BASE_NAME_COUNT, BASE_NAME_COUNT + base_layer_count},
-#endif
-};
-
-uint32_t current_locale = LOCALE_DEFAULT;
-#define LOCALE_LAYER_RANGE locale_layers[current_locale]
-
-bool process_locales(uint16_t keycode, keyrecord_t *record);
-
-#define PROCESS_LOCALES                                         \
-  if (!process_locales(keycode, record)) { return false; }
diff --git a/users/ericgebhart/layer_names/base_names.h b/users/ericgebhart/layer_names/base_names.h
deleted file mode 100644
index 1fef1efed0..0000000000
--- a/users/ericgebhart/layer_names/base_names.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef DVORAK_LAYER_ENABLE
-    LANG_N(_DVORAK),
-#endif
-#ifdef DVORAK_RLC_IU_LAYER_ENABLE
-      LANG_N(_DVORAK_RLC_IU_),
-#endif
-#ifdef BOO_LAYER_ENABLE
-        LANG_N(_BOO),
-#endif
-#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
-        LANG_N(_CAPEWELL_DVORAK),
-#endif
-#ifdef AHEI_LAYER_ENABLE
-        LANG_N(_AHEI),
-#endif
-
-
-#ifdef QWERTY_LAYER_ENABLE
-      LANG_N(_QWERTY),
-#endif
-#ifdef WORKMAN_LAYER_ENABLE
-      LANG_N(_WORKMAN),
-#endif
-#ifdef NORMAN_LAYER_ENABLE
-      LANG_N(_NORMAN),
-#endif
-
-
-#ifdef COLEMAK_LAYER_ENABLE
-      LANG_N(_COLEMAK),
-#endif
-#ifdef COLEMAK_DH_LAYER_ENABLE
-      LANG_N(_COLEMAK_DH),
-#endif
-#ifdef HALMAK_LAYER_ENABLE
-      LANG_N(_COLEMAK),
-#endif
-#ifdef MINIMAK_LAYER_ENABLE
-      LANG_N(_MINIMAK),
-#endif
-#ifdef MINIMAK_8_LAYER_ENABLE
-      LANG_N(_MINIMAK_8),
-#endif
-#ifdef MINIMAK_12_LAYER_ENABLE
-      LANG_N(_MINIMAK_12),
-#endif
-
-
-#ifdef BEAKL15_LAYER_ENABLE
-      LANG_N(_BEAKL15),
-#endif
-#ifdef BEAKL19_LAYER_ENABLE
-      LANG_N(_BEAKL19),
-#endif
-#ifdef BEAKL27_LAYER_ENABLE
-      LANG_N(_BEAKL27),
-#endif
-#ifdef BEAKLWI_LAYER_ENABLE
-      LANG_N(_BEAKLWI),
-#endif
-
-#ifdef MALTRON_LAYER_ENABLE
-        LANG_N(_MALTRON),
-#endif
-#ifdef EUCALYN_LAYER_ENABLE
-        LANG_N(_EUCALYN),
-#endif
-#ifdef RSTHD_LAYER_ENABLE
-        LANG_N(_RSTHD),
-#endif
-#ifdef HANDS_UP_LAYER_ENABLE
-        LANG_N(_HANDS_UP),
-#endif
-#ifdef WHITE_LAYER_ENABLE
-        LANG_N(_WHITE),
-#endif
-#ifdef ISRT_LAYER_ENABLE
-        LANG_N(_ISRT),
-#endif
-#ifdef SOUL_LAYER_ENABLE
-        LANG_N(_SOUL),
-#endif
-#ifdef NIRO_LAYER_ENABLE
-        LANG_N(_NIRO),
-#endif
-#ifdef ASSET_LAYER_ENABLE
-        LANG_N(_ASSET),
-#endif
-#ifdef WHORF_LAYER_ENABLE
-        LANG_N(_WHORF),
-#endif
-#ifdef WHORF6_LAYER_ENABLE
-        LANG_N(_WHORF6),
-#endif
-
-#ifdef CARPALX_QFMLWY_LAYER_ENABLE
-        LANG_N(_CARPALX_QFMLWY),
-#endif
-#ifdef CARPALX_QGMLWB_LAYER_ENABLE
-        LANG_N(_CARPALX_QGMLWB),
-#endif
-#ifdef CARPALX_QGMLWY_LAYER_ENABLE
-        LANG_N(_CARPALX_QGMLWY),
-#endif
-
-
-#ifdef MTGAP_LAYER_ENABLE
-        LANG_N(_MTGAP),
-#endif
-#ifdef CTGAP_LAYER_ENABLE
-        LANG_N(_CTGAP),
-#endif
-#ifdef APT_LAYER_ENABLE
-        LANG_N(_APT),
-#endif
-#ifdef CANARY_LAYER_ENABLE
-        LANG_N(_CANARY),
-#endif
-
-
-#ifdef HD_NEU_LAYER_ENABLE
-        LANG_N(_HD_NEU),
-#endif
-#ifdef HD_NEU_NARROW_LAYER_ENABLE
-        LANG_N(_HD_NEU_NARROW),
-#endif
-#ifdef HD_GOLD_LAYER_ENABLE
-        LANG_N(_HD_GOLD),
-#endif
-#ifdef HD_PLATINUM_LAYER_ENABLE
-        LANG_N(_HD_PLATINUM),
-#endif
-#ifdef HD_SILVER_LAYER_ENABLE
-        LANG_N(_HD_SILVER),
-#endif
-#ifdef HD_BRONZE_LAYER_ENABLE
-        LANG_N(_HD_BRONZE),
-#endif
-#ifdef HD_ELAN_LAYER_ENABLE
-        LANG_N(_HD_ELAN),
-#endif
-#ifdef HD_DASH_LAYER_ENABLE
-        LANG_N(_HD_DASH),
-#endif
-#ifdef HD_REF_LAYER_ENABLE
-        LANG_N(_HD_REF),
-#endif
-
-#ifdef BEPO_LAYER_ENABLE
-        LANG_N(_BEPO),
-#endif
-#ifdef OPTIMOT_LAYER_ENABLE
-        LANG_N(_OPTIMOT),
-#endif
-#ifdef BEAKL19bis_LAYER_ENABLE
-        LANG_N(_BEAKL19bis),
-#endif
diff --git a/users/ericgebhart/layer_names/func_names.h b/users/ericgebhart/layer_names/func_names.h
deleted file mode 100644
index e1b061a145..0000000000
--- a/users/ericgebhart/layer_names/func_names.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// functional layers that would be different by language
-
-#ifdef ACCENTS_LAYER_ENABLE
-LANG_N(_ACCENTS),
-#endif
-#ifdef MORTE_LAYER_ENABLE
-  LANG_N(_MORTE),
-#endif
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-    LANG_N(_ACCENTS_MORTE),
-#endif
-
-#ifdef SYMBOL_LAYER_ENABLE
-  LANG_N(_SYMB),
-#endif
-#ifdef KEYPAD_LAYER_ENABLE
-  LANG_N(_KEYPAD),
-#endif
-#ifdef TOPROWS_LAYER_ENABLE
-  LANG_N(_TOPROWS),
-#endif
diff --git a/users/ericgebhart/layer_names/layer_names.h b/users/ericgebhart/layer_names/layer_names.h
deleted file mode 100644
index 69d9d50d32..0000000000
--- a/users/ericgebhart/layer_names/layer_names.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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
-#include "base_layers.h"
-#include "layouts.h"
-#include "layers.h"
-#if defined(OLED_CUSTOM_ENABLE)
-#    include "oled_stuff.h"
-#endif
-
-#define MO_LAYERS MO(_LAYERS)
-
-#undef LANG_IS
-#define LANG_IS LOCALE_LAYERS
-
-enum base_layer_names{
-#include "base_names.h"
-  BASE_NAME_COUNT
-};
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-
-
-// Get the enums for the layers.
-enum userspace_layers {
-
-#include "base_names.h"
-
-  // get them again if we have another locale.
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-#include "base_names.h"
-
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#endif
-
-  _LAYERS,
-
-#include "func_names.h"
-
-  // get them again if we have another locale.
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-
-#include "func_names.h"
-
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#endif
-
-#include "util_names.h"
-
-};
-
-
-// find the beginning and end of each locale.
-#include "locale_layers.h"
diff --git a/users/ericgebhart/layer_names/util_names.h b/users/ericgebhart/layer_names/util_names.h
deleted file mode 100644
index 55597385fe..0000000000
--- a/users/ericgebhart/layer_names/util_names.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// transient layers which are language agnostic.
-
-
-#ifdef NAV_LAYER_ENABLE
-  _NAV,
-#ifdef MOUSEKEY_ENABLE
-  _NAVm,
-#endif
-#endif
-
-#ifdef MEDIA_LAYER_ENABLE
-  _MEDIA,
-#endif
-
-#ifdef FUNC_LAYER_ENABLE
-    _FUN,
-#endif
-
-#ifdef RGB_LAYER_ENABLE
-  _RGB,
-#define TO_RGB MO(_RGB)
-#else
-#define TO_RGB ___
-#endif
-
-#ifdef ADJUST_LAYER_ENABLE
-  _ADJUST,
-#define MO_ADJUST MO(_ADJUST)
-#else
-#define MO_ADJUST ___
-#endif
-
-
-#ifdef COMBO_REF_LAYER_ENABLE
-  _COMBO_REF,
-// set the combo reference layer if we have one.
-#undef COMBO_REF_DEFAULT
-#define COMBO_REF_DEFAULT _COMBO_REF
-#endif
-#ifdef COMBO_REF_LAYER_TWO_ENABLE
-  _COMBO_REF2,
-#endif
diff --git a/users/ericgebhart/layers/edge_keys.h b/users/ericgebhart/layers/edge_keys.h
deleted file mode 100644
index 107434750b..0000000000
--- a/users/ericgebhart/layers/edge_keys.h
+++ /dev/null
@@ -1,420 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-/******************************************************************/
-/* This is where I put my Keyboard layouts, Everything on the     */
-/* edges, the functions on keys like LT() and SFT_T()             */
-/* can be applied here. The physical shape of the keyboard is     */
-/* also accounted for here. This makes it very simple to add a    */
-/* new keyboard and reuse all of my layouts and layers            */
-/*                                                                */
-/* The particular pieces we define here (as needed) are:          */
-/*     * Edge pinky keys, */
-/*     * Middle section keys */
-/*     * Bottom/5th row */
-/*     * Thumbkeys */
-/*     * Any functional additions to wrap the keys. ie. LT()      */
-/*                                                                */
-/* With all of that in hand, we then create a LAYOUT wrapper      */
-/* macro that takes a list of keys, to create a keyboard matrix   */
-/* that fits the keyboard. Simple.                                */
-/*                                                                */
-/* The thumb keys, the bottom rows, etc.                          */
-/*                                                                */
-/* An attempt has been made to adapt the kinesis and ergodox      */
-/* Thumb keys to the rectangular shapes of the xd75 and viterbi.  */
-/* which are 15x and 14x matrices respectively.                   */
-/* The Corne was a perfect fit                                    */
-/******************************************************************/
-
-/******************************************************************/
-/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
-/*       keys inbetween the usual left and right hand keys        */
-/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
-/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
-/*       thumbkeys. It is missing middle keys on (home) row 3.    */
-/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
-/*       extra middle keys                                        */
-/*                                                                */
-/******************************************************************/
-
-
-/******************************************************************/
-/*   In all cases these keyboards are defined in a matrix which is */
-/*   a set of rows. Maybe like so, or not.                         */
-/*                                                                 */
-/*   -------------------------|------------------------ */
-/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
-/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
-/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
-/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
-/*   | Row5L                  |                    Row5R | */
-/*   |               ThumbsL  | ThumbsR                  | */
-/*   -------------------------|------------------------ */
-
-/* Generally speaking, the keys on the right and left don't change. */
-/* Neither does the bottom row or the thumbs. Frequently the numbers */
-/* row is identical across layers. Mostly, we want our Base layers to */
-/* be predctable.                                                     */
-
-// Edge columns. N rows by 6 columns per side.
-// Outside pinky keys are 'yes'
-// Should be undef/def'd by the keyboard's keymap if no.
-//#define EDGE_COLS yes
-
-// BEPO or EN. Used in map.h
-//#define LANG_IS EN
-
-
-#define CONCATENATEE(a, ...) a ## __VA_ARGS__
-#define CATE(a, ...) CONCATENATEE(a, __VA_ARGS__)
-// EDGES
-// outside pinky keys row 0-3.
-// Qwerty and Bepo, - Applies
-// to foreign layouts on bepo. dvorak_bp, beakl_bp.
-// Use by Wrapping the root like so. LANG_N(LEFT0)
-// Add more languages by adding more definitions.
-#define EDGE_KEY(KNAME) CATE(LANG_N(KNAME), EDGE_KEY_SFX)
-#define LEFT_0 EDGE_KEY(LEFT0)
-#define LEFT_1 EDGE_KEY(LEFT1)
-#define LEFT_2 EDGE_KEY(LEFT2)
-#define LEFT_3 EDGE_KEY(LEFT3)
-#define RIGHT_0 EDGE_KEY(RIGHT0)
-#define RIGHT_1 EDGE_KEY(RIGHT1)
-#define RIGHT_2 EDGE_KEY(RIGHT2)
-#define RIGHT_3 EDGE_KEY(RIGHT3)
-
-
-#define EDGE_KEY_SFX CATE(CATE(EDGE_KEY_SET_IS, _), SFX)
-#define SML_SFX _sml
-#define NOKC_SFX _nokc
-#define NORM_SFX _norm
-#define TEST_SFX _test
-#define REF1_SFX _ref1
-#define REF2_SFX _ref2
-
-// Edge key sets
-// a mostly normalish set of edge keys.
-#define LEFT0_EN_norm KC_GRV
-#define LEFT1_EN_norm KC_GRV
-#define LEFT2_EN_norm KC_TAB
-#define LEFT3_EN_norm KC_BSLS
-
-#define RIGHT0_EN_norm KC_EQL
-#define RIGHT1_EN_norm KC_EQL
-#define RIGHT2_EN_norm KC_MINS
-#define RIGHT3_EN_norm KC_SLSH
-
-// smart lock edges mostly
-#define LEFT0_EN_sml SML_NAV
-#define LEFT1_EN_sml SML_NAV
-#define LEFT2_EN_sml KC_TAB
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-#define LEFT3_EN_sml TT(_ACCENTS_MORTE_EN)
-#else
-#define LEFT3_EN_sml ___
-#endif
-
-#define RIGHT0_EN_sml SML_KEYPAD
-#define RIGHT1_EN_sml SML_KEYPAD
-#define RIGHT2_EN_sml KC_MINS
-#define RIGHT3_EN_sml TT(_LAYERS)
-
-// empty no kc edges
-#define LEFT0_EN_nokc KC_NO
-#define LEFT1_EN_nokc KC_NO
-#define LEFT2_EN_nokc KC_NO
-#define LEFT3_EN_nokc KC_NO
-
-#define RIGHT0_EN_nokc KC_NO
-#define RIGHT1_EN_nokc KC_NO
-#define RIGHT2_EN_nokc KC_NO
-#define RIGHT3_EN_nokc KC_NO
-
-//test edge keys
-#define LEFT0_EN_test KC_NO
-#define LEFT1_EN_test KC_NO
-#define LEFT2_EN_test KC_NO
-#define LEFT3_EN_test KC_NO
-
-#define RIGHT0_EN_test KC_NO
-#define RIGHT1_EN_test KC_NO
-#define RIGHT2_EN_test KC_NO
-#define RIGHT3_EN_test KC_NO
-
-// bepo
-// mostly normal expected things
-#define LEFT0_BP_norm BP_GRV
-#define LEFT1_BP_norm BP_GRV
-#define LEFT2_BP_norm BP_TAB
-#define LEFT3_BP_norm BP_BSLS
-
-#define RIGHT0_BP_norm BP_EQL
-#define RIGHT1_BP_norm BP_EQL
-#define RIGHT2_BP_norm BP_DV_MINS
-#define RIGHT3_BP_norm BP_SLSH
-
-// smart locks mostly, tab, mins
-#define LEFT0_BP_sml SML_NAV
-#define LEFT1_BP_sml SML_NAV
-#define LEFT2_BP_sml KC_TAB
-#define LEFT3_BP_sml TT(_ACCENTS_MORTE_BP)
-
-#define RIGHT0_BP_sml SML_KEYPAD_BP
-#define RIGHT1_BP_sml SML_KEYPAD_BP
-#define RIGHT2_BP_sml BP_MINS
-#define RIGHT3_BP_sml TT(_LAYERS)
-
-// empty nokc edges
-#define LEFT0_BP_nokc KC_NO
-#define LEFT1_BP_nokc KC_NO
-#define LEFT2_BP_nokc KC_NO
-#define LEFT3_BP_nokc KC_NO
-
-#define RIGHT0_BP_nokc KC_NO
-#define RIGHT1_BP_nokc KC_NO
-#define RIGHT2_BP_nokc KC_NO
-#define RIGHT3_BP_nokc KC_NO
-
-// test edges
-#define LEFT0_BP_test KC_NO
-#define LEFT1_BP_test KC_NO
-#define LEFT2_BP_test KC_NO
-#define LEFT3_BP_test KC_NO
-
-#define RIGHT0_BP_test KC_NO
-#define RIGHT1_BP_test KC_NO
-#define RIGHT2_BP_test KC_NO
-#define RIGHT3_BP_test KC_NO
-
-
-// Edges for the combo reference layers.
-#define LEFT0_CB_ref1 L0_CB
-#define LEFT1_CB_ref1 L1_CB
-#define LEFT2_CB_ref1 L2_CB
-#define LEFT3_CB_ref1 L3_CB
-
-#define RIGHT0_CB_ref1 R0_CB
-#define RIGHT1_CB_ref1 R1_CB
-#define RIGHT2_CB_ref1 R2_CB
-#define RIGHT3_CB_ref1 R3_CB
-
-#define LEFT0_CB_ref2 L0_CB2
-#define LEFT1_CB_ref2 L1_CB2
-#define LEFT2_CB_ref2 L2_CB2
-#define LEFT3_CB_ref2 L3_CB2
-
-#define RIGHT0_CB_ref2 R0_CB2
-#define RIGHT1_CB_ref2 R1_CB2
-#define RIGHT2_CB_ref2 R2_CB2
-#define RIGHT3_CB_ref2 R3_CB2
-
-/******************************************************************/
-/* Middle Keysets for various keyboards                           */
-// MIDDLES
-/// Middle left and right keys.
-/******************************************************************/
-#define ___MIDDLE_LT___ OSL(_LAYERS)
-#define ___MIDDLE_L1___ LANG_KC(_CCCV)
-#define ___MIDDLE_L2___ TO(LN_SYMB)
-#define ___MIDDLE_L3___ TO(_NAV)
-
-#define ___MIDDLE_RT___ _X_
-#define ___MIDDLE_R1___ LANG_KC(_CCCV)
-#define ___MIDDLE_R2___ TO(LN_TOPROWS)
-#define ___MIDDLE_R3___ ___
-
-// 3 keys in the middle of a 15x matrix
-#define ___3_MIDDLE_T___ ___MIDDLE_LT___,    LCTL(LANG_KC(_A)), ___MIDDLE_RT___
-#define ___3_MIDDLE_1___ ___MIDDLE_L1___,    LCTL(LANG_KC(_X)), ___MIDDLE_R1___
-#define ___3_MIDDLE_2___ ___MIDDLE_L2___,    TO_RGB,            ___MIDDLE_R2___
-#define ___3_MIDDLE_3___ ___MIDDLE_L3___,    TO(LN_SYMB),       ___MIDDLE_R3___
-
-// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
-#define ___2_MIDDLE_T___ ___MIDDLE_LT___,    ___MIDDLE_RT___
-#define ___2_MIDDLE_1___ ___MIDDLE_L1___,    ___MIDDLE_R1___
-#define ___2_MIDDLE_2___ ___MIDDLE_L2___,    ___MIDDLE_R2___
-#define ___2_MIDDLE_3___ ___MIDDLE_L3___,    ___MIDDLE_R3___
-
-// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
-#define ___3_MIDDLE_T_EN___ ___3_MIDDLE_T___
-#define ___3_MIDDLE_1_EN___ ___3_MIDDLE_1___
-#define ___3_MIDDLE_2_EN___ ___3_MIDDLE_2___
-#define ___3_MIDDLE_3_EN___ ___3_MIDDLE_3___
-
-#define ___2_MIDDLE_T_EN___ ___2_MIDDLE_T___
-#define ___2_MIDDLE_1_EN___ ___2_MIDDLE_1___
-#define ___2_MIDDLE_2_EN___ ___2_MIDDLE_2___
-#define ___2_MIDDLE_3_EN___ ___2_MIDDLE_3___
-
-#define ___3_MIDDLE_T_BP___ ___3_MIDDLE_T___
-#define ___3_MIDDLE_1_BP___ ___3_MIDDLE_1___
-#define ___3_MIDDLE_2_BP___ ___3_MIDDLE_2___
-#define ___3_MIDDLE_3_BP___ ___3_MIDDLE_3___
-
-#define ___2_MIDDLE_T_BP___ ___2_MIDDLE_T___
-#define ___2_MIDDLE_1_BP___ ___2_MIDDLE_1___
-#define ___2_MIDDLE_2_BP___ ___2_MIDDLE_2___
-#define ___2_MIDDLE_3_BP___ ___2_MIDDLE_3___
-
-#define ___2_MIDDLE_T_CB___ CB_0M1, CB_0M2
-#define ___2_MIDDLE_1_CB___ CB_1M1, CB_1M2
-#define ___2_MIDDLE_2_CB___ CB_2M1, CB_2M2
-#define ___2_MIDDLE_3_CB___ CB_3M1, CB_3M2
-#define ___2_MIDDLE_4_CB___ CB_4M1, CB_4M2
-
-#define ___3_MIDDLE_T_CB___ CB_0M1, CB_0M2, CB_0M3
-#define ___3_MIDDLE_1_CB___ CB_1M1, CB_1M2, CB_1M3
-#define ___3_MIDDLE_2_CB___ CB_2M1, CB_2M2, CB_2M3
-#define ___3_MIDDLE_3_CB___ CB_3M1, CB_3M2, CB_3M3
-#define ___3_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3
-
-#define ___4_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3, CB_4M4
-#define ___5_MIDDLE_4_CB___ CB_4M1, CB_4M2, CB_4M3, CB_4M4, CB_4M5
-
-#define ___2_MIDDLE_T_CB2___ CB2_0M1, CB2_0M2
-#define ___2_MIDDLE_1_CB2___ CB2_1M1, CB2_1M2
-#define ___2_MIDDLE_2_CB2___ CB2_2M1, CB2_2M2
-#define ___2_MIDDLE_3_CB2___ CB2_3M1, CB2_3M2
-#define ___2_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2
-
-#define ___3_MIDDLE_T_CB2___ CB2_0M1, CB2_0M2, CB2_0M3
-#define ___3_MIDDLE_1_CB2___ CB2_1M1, CB2_1M2, CB2_1M3
-#define ___3_MIDDLE_2_CB2___ CB2_2M1, CB2_2M2, CB2_2M3
-#define ___3_MIDDLE_3_CB2___ CB2_3M1, CB2_3M2, CB2_3M3
-#define ___3_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3
-
-#define ___4_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4
-#define ___5_MIDDLE_4_CB2___ CB2_4M1, CB2_4M2, CB2_4M3, CB2_4M4, CB2_4M5
-
-#define ___4_LEFT_4_CB___  CB_4L1, CB_4L2, CB_4L3, CB_4L4
-#define ___4_RIGHT_4_CB___ CB_4R1, CB_4R2, CB_4R3, CB_4R4
-
-#define ___4_LEFT_4_CB2___ CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4
-#define ___4_RIGHT_4_CB2___ CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4
-
-#define ___5_LEFT_4_CB___  CB_4L1, CB_4L2, CB_4L3, CB_4L4, CB_4L5
-#define ___5_RIGHT_4_CB___ CB_4R1, CB_4R2, CB_4R3, CB_4R4, CB_4R5
-
-#define ___5_LEFT_4_CB2___ CB2_4L1, CB2_4L2, CB2_4L3, CB2_4L4, CB2_4L5
-#define ___5_RIGHT_4_CB2___ CB2_4R1, CB2_4R2, CB2_4R3, CB2_4R4, CB2_4R5
-
-#define ___13_BOTTOM_CB___ ___5_LEFT_4_CB___,    \
-    ___3_MIDDLE_4_CB___,                         \
-    ___5_RIGHT_4_CB___
-
-#define ___12_BOTTOM_CB___ ___5_LEFT_4_CB___,    \
-    ___2_MIDDLE_4_CB___,                         \
-    ___5_RIGHT_4_CB___
-
-#define ___13_BOTTOM_CB2___ ___5_LEFT_4_CB2___,  \
-    ___3_MIDDLE_4_CB2___,                        \
-    ___5_RIGHT_4_CB2___
-
-#define ___12_BOTTOM_CB2___ ___5_LEFT_4_CB2___,  \
-    ___2_MIDDLE_4_CB2___,                 \
-    ___5_RIGHT_4_CB2___
-
-/* BOTTOMS, sorta like THUMBS                                       */
-/********************************************************************/
-// for xd75 or other layouts with a center column.
-// #define ___5_MIDDLE_THUMBS___ CTL_BSPC,    ALT_DEL,     XMONAD_ESC,  ALT_ENT,   CTL_SPC
-#define ___5_MIDDLE_THUMBS___ ALT_DEL, BSPC_TOPR, ESC_SYMB, ENT_NAV, SPC_TOPR
-
-  // for a last, 4th thumb row. for rebound.
-  // backtab, home end, ----, pgup, pgdn, tab ?
-#define ___13_BOTTOM___                                           \
-  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,      \
-    OSL(_LAYERS),                                               \
-    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
-
-#define ___13_BOTTOM_EN___ ___13_BOTTOM___
-#define ___13_BOTTOM_BP___ ___13_BOTTOM___
-
-#define ___12_BOTTOM___                                         \
-  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,    \
-    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
-
-#define ___12_BOTTOM_EN___ ___12_BOTTOM___
-#define ___12_BOTTOM_BP___ ___12_BOTTOM___
-
-// becomes the upper thumbs, the real 4th row if we throw away
-// the number row at the top.
-// this is the 4th row on the viterbi above the thumbrow if the number
-// row is not used for numbers.
-#define ___4_MIDDLE_4___    LSFT(KC_TAB),    HOME_END,    KC_PGDN, KC_TAB
-#define ___4_MIDDLE_4b___   TAB_BKTAB,       HOME_END,    KC_PGDN, KC_PGUP
-
-/********************************************************************/
-/*  The bottom row and thumbs as needed.                            */
-/********************************************************************/
-// Only the 14 and 15 wide bottom rows have bepo versions.
-// all others are handled through macros.
-
-#define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLS, ___X2___
-
-#define ___5_BOTTOM_LEFT_EN___  ___5_BOTTOM_LEFT___
-#define ___5_BOTTOM_RIGHT_EN___  ___5_BOTTOM_RIGHT___
-
-#define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
-#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLS, LCTL(KC_C)
-
-#define ___4_BOTTOM_LEFT_EN___  ___4___ //___4_BOTTOM_LEFT___
-#define ___4_BOTTOM_RIGHT_EN___  ___4___ //___4_BOTTOM_RIGHT___
-
-// the bottom rows  for keyboards on bepo.
-// bepo on bepo - not enough space to go around....
-#define ___5_BOTTOM_LEFT_BP___  _X_,    BP_EACU,  _X_,           KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN,  BP_BSLS,  BP_CCED,  BP_PERC
-
-#define ___4_BOTTOM_LEFT_BP___  LCTL(BP_C),  BP_EACU,  KC_LEFT, KC_RIGHT
-#define ___4_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN, BP_BSLS,  BP_CCED
-
-// for combo ref layers for kinesis, dactyl and kinesis.
-#define ___5_BOTTOM_LEFT_FR___  ___X3___,  KC_LEFT, KC_RIGHT
-#define ___5_BOTTOM_RIGHT_FR___ KC_UP,  KC_DOWN,  BP_BSLS, ___X2___
-
-#define ___4_BOTTOM_LEFT_CB___ ___4_LEFT_4_CB___
-#define ___4_BOTTOM_RIGHT_CB___ ___4_RIGHT_4_CB___
-
-#define ___4_BOTTOM_LEFT_CB2___ ___4_LEFT_4_CB2___
-#define ___4_BOTTOM_RIGHT_CB2___ ___4_RIGHT_4_CB2___
-
-#define ___5_BOTTOM_LEFT_CB___ ___5_LEFT_4_CB___
-#define ___5_BOTTOM_RIGHT_CB___ ___5_RIGHT_4_CB___
-
-#define ___5_BOTTOM_LEFT_CB2___ ___5_LEFT_4_CB2___
-#define ___5_BOTTOM_RIGHT_CB2___ ___5_RIGHT_4_CB2___
-
-// basically a 5th row in a 5x matrix. but maybe a 4th if there isnt a number row.
-// need an en, because we a have a BP and we used it directly in the layout.
-#define ___15_BOTTOM_EN___  ___5_BOTTOM_LEFT___,    ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT___
-#define ___15_BOTTOM_FR___  ___5_BOTTOM_LEFT_FR___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_FR___
-#define ___15_BOTTOM_BP___  ___5_BOTTOM_LEFT_BP___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_BP___
-#define ___15_BOTTOM_CB___  ___5_LEFT_4_CB___,    ___5_MIDDLE_4_CB___, ___5_RIGHT_4_CB___
-#define ___15_BOTTOM_CB2___  ___5_LEFT_4_CB2___,    ___5_MIDDLE_4_CB2___, ___5_RIGHT_4_CB2___
-
-// need an en, because we a have a BP and we used it directly in the layout.
-#define ___14_BOTTOM_EN___    ___5_BOTTOM_LEFT___,    ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT___
-#define ___14_BOTTOM_FR___ ___5_BOTTOM_LEFT_FR___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_FR___
-#define ___14_BOTTOM_BP___ ___5_BOTTOM_LEFT_BP___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_BP___
-#define ___14_BOTTOM_CB___ ___5_LEFT_4_CB___, ___4_MIDDLE_4_CB___, ___5_RIGHT_4_CB___
-#define ___14_BOTTOM_CB2___ ___5_LEFT_4_CB2___, ___4_MIDDLE_4_CB2___, ___5_RIGHT_4_CB2___
-
-#define ___14_THUMBS_BOTTOM___   ___X4___, ___6_ERGO_THUMBS___, ___X4___
diff --git a/users/ericgebhart/layers/keypads.h b/users/ericgebhart/layers/keypads.h
deleted file mode 100644
index ab4100594d..0000000000
--- a/users/ericgebhart/layers/keypads.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-/**********************************************_**********************************/
-/*  KEYPADS.  Mostly all in Bepo and Qwerty versions                            */
-/*      4 row Pads:                                                             */
-/*         * The BEAKL 15,19 Number pad, for the left hand.                     */
-/*         * The BEAKL Wi hex pad, Number pad.                                  */
-/*         * Regular Number pad, for the right hand.                            */
-/*         * 12 Function pad.                                                   */
-/*      3 row pads:                                                             */
-/*         keypad                                                               */
-/*         function pad - 3x4, 12 function keys.                                */
-/*                                                                              */
-/*  LAYERS:                                                                     */
-/*      4 Row:                                                                  */
-/*         * BEAKL with a compact FuncPad on the right.                         */
-/*         * Funcpad on the left, keypad on the right.                          */
-/*      3 Row:                                                                  */
-/*         * Funcpad on the left, keypad on the right.                          */
-/*         * BEAKL with a compact FuncPad on the right.                         */
-/*                                                                              */
-/********************************************************************************/
-
-// BEAKL 15 (numpad layer):
-/*    +=*   ^%~ */
-/*   ↹523:      */
-/* - 7.104      */
-/*   /698,      */
-
-/* BEAKL27 (numpad layer): */
-/*   ↹+/\*=  yxz */
-/*    -523: ~FED */
-/*    7.104 {CBA} */
-/*    ,698⏎  []% */
-
-// Keypads
-#define ___KEYPAD_BEAKL_L1___  ___,    _PLUS,  _SLSH,  _ASTR, _EQL
-#define ___KEYPAD_BEAKL_L2___  _MINS,  _5,     _2,     _3,   _COLN
-#define ___KEYPAD_BEAKL_L3___  _7,     _DOT,   _1,     _0,   _4
-#define ___KEYPAD_BEAKL_L4___  _COMM,  _6,     _9,     _8,   _COMM
-
-#define ___6KEYPAD_BEAKL_L1___     ___, KEYPAD_BEAKL_L1
-#define ___6KEYPAD_BEAKL_L2___     ___, KEYPAD_BEAKL_L2
-#define ___6KEYPAD_BEAKL_L3___ KC_MINS, KEYPAD_BEAKL_L3
-#define ___6KEYPAD_BEAKL_L4___     ___, KEYPAD_BEAKL_L4
-
-// if there's room. the top row on the right.
-#define ___KEYPAD_BEAKL_R1___     ___, KC_CIRC,  KC_PERC,  KC_TILD, ___
-
-
-
-/// parts is parts.
-
-#define ___KP_BKL_WI_L1___ _X_,    HEX_A,  HEX_B,  HEX_C,   _X_
-#define ___KP_BKL_WI_L2___ _X_,    HEX_D,  HEX_E,  HEX_F,   _X_
-#define ___KP_BKL_WI_L3___ _X_,    L_BRKT, R_BRKT, DELIM,   _X_
-
-#define ___KP_BKL_WI_R1___ _SLSH, _4, _5, _9, _ASTR
-#define ___KP_BKL_WI_R2___ _DOT , _1, _2, _3, _MINS
-#define ___KP_BKL_WI_R3___ _COMM, _8, _6, _7, _PLUS
-
-#define ___KEYPAD_1___ ___,  _7,  _8,    _9,     _PSLS
-#define ___KEYPAD_2___ _DOT, _4,  _5,    _6,     _PAST
-#define ___KEYPAD_3___ _0,   _1,  _2,    _3,     _PMNS
-
-#define ___KEYPAD_miryoku_1___ _LBRC, _7,  _8,  _9,  _RBRC, ____5_
-#define ___KEYPAD_miryoku_2___ _SCLN, _4,  _5,  _6,  _EQUAL, ____5_
-#define ___KEYPAD_miryoku_3___ _GRV,  _1,  _2,  _3,  _BSLS, ____5_
-
-// 4 Row keypads
-#define ___5KEYPAD_1___ _X_, ___KEYPAD_1___
-#define ___5KEYPAD_2___ _X_, ___KEYPAD_2___
-#define ___5KEYPAD_3___ _X_, ___KEYPAD_3___
-#define ___5KEYPAD_4___ _X_, _0,  _DOT,  _PEQL,  _PPLS
-
-// Function pad.  Same idea as above, but for function keys.
-
-// Funcpads are a bit weird. THey are KC values, so for
-// this to work, there are BP_ versions of the F keys.
-// I don't really use this, so maybe it'll go away in favor
-// of something more useful.
-// 4x3 and 3x4 funcpads.
-// Only 4 columns, so the fifth can be added to either end.
-#define ___4_FUNCPAD_1___   _F9, _F10, _F11, _F12
-#define ___4_FUNCPAD_2___   _F5, _F6,  _F7,  _F8
-#define ___4_FUNCPAD_3___   _F1, _F2,  _F3,  _F4
-
-#define ___FUNCPAD_miryoku_1___   KC_F12, KC_F7, KC_F8, KC_F9, KC_PRINT_SCREEN
-#define ___FUNCPAD_miryoku_2___   KC_F11, KC_F4, KC_F5, KC_F6, KC_SCROLL_LOCK
-#define ___FUNCPAD_miryoku_3___   KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUSE
-
-// For the left or right side.
-#define ___5x4_FUNCPAD_T___   _TRNS, _F10,  _F11,  _F12, _TRNS
-#define ___5x4_FUNCPAD_1___   _TRNS, _F7,   _F8,   _F9,  _TRNS
-#define ___5x4_FUNCPAD_2___   _TRNS, _F4,   _F5,   _F6,  _TRNS
-#define ___5x4_FUNCPAD_3___   _TRNS, _F1,   _F2,   _F3,  _TRNS
-
-
-/********************************************************************************/
-/* FUNCPAD and Keypad Layer chunks                                              */
-/********************************************************************************/
-// beakl wi is a hexpad numpad.
-/* Beakle Wi, Hexpad and keypad - needs a zero somewhere.*/
-#define CARTE_KP_BKL_WI                         \
-  carte_de_map( "  ABC  /459* ",                \
-                "  DEF  .123- ",                \
-                "  {}|  ,867+ ")
-
-#define ___KP_BKL_WI_3x10___                                    \
-  CHUNK_LANG_MAP(___KP_BKL_WI_L1___, ___KP_BKL_WI_R1___,        \
-                 ___KP_BKL_WI_L2___, ___KP_BKL_WI_R2___,        \
-                 ___KP_BKL_WI_L3___, ___KP_BKL_WI_R3___)
-
-
-// BEAKL 15 and a f1-f12 funcpad
-#define CARTE_KP_BKL_FUNC                       \
-  carte_de_map("    523:  F9-12",               \
-               "  -7.104  F5-8",                \
-               "   /798,  F1-4")
-
-#define ___KP_BKL_FUNC_3x10___                                          \
-  CHUNK_LANG_MAP(___KEYPAD_BEAKL_L2___, _TRNS, ___4_FUNCPAD_1___,       \
-                 ___KEYPAD_BEAKL_L3___, _TRNS, ___4_FUNCPAD_2___,       \
-                 ___KEYPAD_BEAKL_L4___, _TRNS, ___4_FUNCPAD_3___)
-
-// BEAKL 15 and mods.
-#define CARTE_KP_BKL_MODS                          \
-  carte_de_map("    523:  SL Mods",                \
-               "  -7.104  OS Mods",                \
-               "   /798,   Enter")
-
-
-#define ___KP_BKL_MODS_3x10___                                          \
-  CHUNK_LANG_MAP(___KEYPAD_BEAKL_L2___, _TRNS, ___SML_MODS_R___,        \
-                 ___KEYPAD_BEAKL_L3___, ___OS_MODS_R___,                \
-                 ___KEYPAD_BEAKL_L4___, _TRNS, _ENT, _ENT, _ENT, _TRNS)
-
-// 4 rows, BEAKL 15 and a f1-f12 funcpad
-#define ___KP_BKL_FUNC_4x10___                                  \
-  CHUNK_LANG_ROW(___KEYPAD_BEAKL_L1___, ___KEYPAD_BEAKL_R1___), \
-    CHUNK_LANG_MAP(___KP_BKL_FUNC_3x10___)
-
-// 4 rows, funcpad, regular keypad on right.
-#define ___FP_KP_4x10___                                        \
-  CHUNK_LANG_ROW(___5x4_FUNCPAD_T___,  ___5KEYPAD_1___),        \
-    CHUNK_LANG_MAP(___5x4_FUNCPAD_1___,  ___5KEYPAD_2___,       \
-                   ___5x4_FUNCPAD_2___,  ___5KEYPAD_3___,       \
-                   ___5x4_FUNCPAD_3___,  ___5KEYPAD_4___)
-
-#define CARTE_FP_KP                             \
-  carte_de_map("  F9-12   789+",                \
-               "  F5-8   .456*",                \
-               "  F1-4   0123-")
-
-// funcpad, regular keypad on right.
-#define ___FP_KP_3x10___                                        \
-  CHUNK_LANG_MAP(___4_FUNCPAD_1___, ___, ___5KEYPAD_1___,       \
-                 ___4_FUNCPAD_2___, ___,  ___5KEYPAD_2___,      \
-                 ___4_FUNCPAD_3___, ___,  ___5KEYPAD_3___)
-
-#define CARTE_KP_FP                             \
-  carte_de_map("   789+  F9-12",                \
-               "  .456*  F5-8",                 \
-               "  0123-  F1-4")
-// regular keypad on left.
-#define ___KP_FP_3x10___                                        \
-  CHUNK_LANG_MAP(___5KEYPAD_1___,  ___, ___4_FUNCPAD_1___,      \
-                 ___5KEYPAD_2___,  ___, ___4_FUNCPAD_2___,      \
-                 ___5KEYPAD_3___,  ___, ___4_FUNCPAD_3___)
-
-#define CARTE_MODS_KP                           \
-  carte_de_map("  SMods   789+",                \
-               "  OSMods .456*",                \
-               "  F1-4   0123-")
-
-// funcpad, regular keypad on right.
-#define ___MODS_KP_3x10___                                    \
-  CHUNK_LANG_MAP(___SML_MODS_L___, ___, ___5KEYPAD_1___,        \
-                 ___OS_MODS_L___,       ___5KEYPAD_2___,     \
-                 ___5___,               ___5KEYPAD_3___)
-
-#define CARTE_KP_MODS                           \
-  carte_de_map("   789+  SMods",                \
-               "  .456*  OSMods",                 \
-               "  0123-  ")
-
-// regular keypad on left.
-#define ___KP_MODS_3x10___                                      \
-  CHUNK_LANG_MAP(___5KEYPAD_1___,  ___, ___SML_MODS_R___,       \
-                 ___5KEYPAD_2___,  ___OS_MODS_L___,        \
-                 ___5KEYPAD_3___,  ___, ___4___)
-
-#define CARTE_FUN                           \
-  carte_de_map("  F9-F12  SMods",                \
-               "  F5-F8   OSMods",               \
-               "  F1-F4   ")
-
-#define ___FUN_3x10___                                                  \
-  CHUNK_LANG_MAP(___4_FUNCPAD_1___, ___,  ___, ___SML_MODS_R___,        \
-                 ___4_FUNCPAD_2___, ___,  ___OS_MODS_R___,              \
-                 ___4_FUNCPAD_3___, ___,  ___5___)
-
-#define CARTE_FUN_MIRYOKU                       \
-  carte_de_map("F12 F7-F9 prt  SMods",          \
-               "F11 F4-F6 scr  OSMods",         \
-               "F10 F1-F3 pse  ")
-
-#define ___FP_MIRYOKU_3x10___                           \
-  ___FUNCPAD_miryoku_1___,  ___, ___SML_MODS_R___,     \
-    ___FUNCPAD_miryoku_2___,  ___OS_MODS_R___,         \
-    ___FUNCPAD_miryoku_3___,  ___5___
-
-// wants . and 0 on left thumb.
-#define CARTE_KP_MIRYOKU      \
-  carte_de_map(" [789]",      \
-               " ;456=",      \
-               " `123\\")
-
-#define ___KP_MIRYOKU_3x10___                                     \
-  CHUNK_LANG_MAP(___KEYPAD_miryoku_1___,                          \
-                 ___KEYPAD_miryoku_2___,                             \
-                 ___KEYPAD_miryoku_3___)
diff --git a/users/ericgebhart/layers/layers.h b/users/ericgebhart/layers/layers.h
deleted file mode 100755
index 0f09d0cfc3..0000000000
--- a/users/ericgebhart/layers/layers.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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
-
-  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 "keycodes.h"
-/*********************************************************************/
-/* Non-Base Layer Definitions.                                       */
-/*                                                                   */
-/* Keypads, sympads, funcpads, symbols, RGB, Layers, Controls, etc.  */
-/* Qwerty and Bepo versions exist as needed.                         */
-/*                                                                   */
-/* This file defines every auxillary layer I use on every keyboard   */
-/* Ergodox, keebio/viterbi, xd75, rebound, crkbd, morpho, dactyl,..  */
-/*********************************************************************/
-/********************************************************************************/
-/* The following Transient/Non-Base Layers are provided within.                 */
-/* Each layer is named with the size of Keymatrix it has entries for.           */
-/* 3x10 are usual for these.  I had 3x12's but I didn't need the edges really.  */
-/* It was an attempt to accommodate Bepo which is 13 columns wide.              */
-/* Even in a 3x12 Bepo is wonky. So I gave up on it. I also gave up on 4 row    */
-/* layers, I really want my keys in that 3x5 space. Everything on the edges can */
-/* stay as it is.  Splitting is managed in the macros as                        */
-/* needed. BP indicates the Bepo equivalent to the Qwerty layer when needed.    */
-/********************************************************************************/
-/*                                                                              */
-/* Explore below to see what they all are.                                      */
-/* Naming gives the sizes of things, a prefix number is the length.             */
-/* BP is the bepo version of things.                                            */
-/* BKL is the beakl 15 version of a layout or chunk.                            */
-/* C on the end of a name means its a compact version of something.             */
-/* Compact meaning for use on a 3 row layout.                                   */
-/*                                                                              */
-/* TOPROWS - numbers, symbols, functions, all on one layer.                     */
-/* ___TOPROWS_3x10___                                                           */
-/* ___TOPROWS_BP_3x10___                                                        */
-/*                                                                              */
-/* KEYPADS/FUNCPADS.                                                            */
-/* ___KP_C_3x10___                                                              */
-/* ___KP_C_BP_3x10___                                                           */
-/* ___KP_C_BKL_FUNC_3x10___  -- BEAKL key/func pads.                            */
-/* ___KP_C_BKL_FUNC_BP_3x10___                                                  */
-/*                                                                              */
-/* SYMBOLS   -Beakl or Beakl extended                                           */
-/* ___SYMB_BEAKL_3x10___                                                        */
-/* ___SYMB_BEAKL_BP_3x10___                                                     */
-/*                                                                              */
-/* Beakl extended symbol layer with additional corner symbols.                  */
-/* For use with non-beakl base layers.                                          */
-/* ___SYMB_BEAKLA_3x10___                                                       */
-/* ___SYMB_BEAKLA_BP_3x10___                                                    */
-/* For use with vi bindings optimized                                           */
-/* ___SYMB_BEAKLB_3x10___                                                       */
-/* ___SYMB_BEAKLB_BP_3x10___                                                    */
-/*                                                                              */
-/* NAVIGATION                                                                   */
-/* ___NAV_3x10___                                                               */
-/*                                                                              */
-/* CONTROLS                                                                     */
-/* ___RGB_3x10___                                                               */
-/* ___ADJUST_3x10___                                                            */
- /* ___LAYERS_3x10___                                                            */
- /********************************************************************************/
- /*********************************************************************/
- /* XXXXXX Layer chunk  -- These are the final layers.                */
- /*                                                                   */
-/* Each section defines the necessary pieces to create a layer.      */
-/* It builds them up into consistently shaped lists for the layout   */
-/* wrapper.                                                          */
-/*                                                                   */
-/* Each Section ends with a _Layer Chunk_. This is so the            */
-/* layer can be easily given to the Layout Wrapper macros which      */
-/* takes a list of keys in lengths of 2x3x5, 2x3x6, 2x4x5, or 2x4x6. */
-/*                                                                   */
-/* All of my keyboard definitions use these same chunks with similar */
-/* macros. The differences between keyboards are all managed in the  */
-/* macro. Here we just have nice rectangular sets of keys to         */
-/* complete a layout.                                                */
-/*********************************************************************/
-
-// these are needed so that groups of defined keys will unravel
-// into their values. The Base layers don't need them becuse the
-// keys are explicit in their passing. Here, chunks are made for
-// convenience and reuse. They don't unravel unless we wrap these
-// in var args.
-#define CHUNK_LANG_MAP(...) LANG_MAP(__VA_ARGS__)
-#define CHUNK_LANG_ROW(...) LANG_ROW(__VA_ARGS__)
-
-// 5 wide, with the two shot control.
-#define ___OS_MODS_L___   OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, TS_LCTL
-#define ___OS_MODS_R___   TS_RCTL, OS_RSFT, OS_RCTL, OS_RALT, OS_RGUI
-// 4 wide.
-#define ___SML_MODS_L___  SMLM_LGUI, SMLM_LALT, SMLM_LCTL, SMLM_LSFT
-#define ___SML_MODS_R___  SMLM_RSFT, SMLM_RCTL, SMLM_RALT, SMLM_RGUI
-
-#include "keypads.h"
-#include "nav.h"
-#include "symbols.h"
-#include "toprows.h"
-#include "utility.h"
diff --git a/users/ericgebhart/layers/nav.h b/users/ericgebhart/layers/nav.h
deleted file mode 100644
index 97243872e2..0000000000
--- a/users/ericgebhart/layers/nav.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-/********************************************************************************/
-/* NAVIGATION  - MOUSE, Scroll, Buttons, Arrows, Tab, Home, page up/down, End   */
-/* Navigation layers:                                                           */
-/*    3 row Layer                                                               */
-/*    4 Row Layer with repeated and swapped VI arrows, and Scroll wheel.        */
-/********************************************************************************/
-/*                                                                              */
-/* Navigation layer with optional 4th Row....                                   */
-/*                                                                              */
-/* M = Mouse                                                                    */
-/* B = Button                                                                   */
-/* W = Wheel                                                                    */
-/* AC   = Acceleration                                                          */
-/* CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V                 */
-/* CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N                 */
-/* CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q                 */
-/* HOME = TAB & PGDN                                                            */
-/* END =  BKTAB & PGUP -- See combos.                                           */
-/*                                                                              */
-/* MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 */
-/* TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB */
-/*      WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  TAB    PGDN   PGUP BKTAB       */
-/*                                                                              */
-/*      Left   Down   Up   Right   CCCV  |  CCCV   MLeft  MDown  MUp  MRight    */
-/*                                                                              */
-/********************************************************************************/
-
-#ifdef MOUSEKEY_ENABLE
-#define ___MOUSE_LDUR___      KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R
-#define ___MWHEEL_LDUR___     KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R
-//  really BTN 1, 2, 3, 8, 9 - according to xev.
-#define ___MOUSE_BTNS_R___    KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4,  KC_BTN5
-#define ___4MOUSE_BTNS_R___   KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4
-#define ___3MOUSE_BTNS_R___   KC_BTN1,  KC_BTN3,  KC_BTN2
-//  really BTN 9, 8, 3, 2, 1 - according to xev
-#define ___4MOUSE_BTNS_L___   KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
-#define ___MOUSE_BTNS_L___    KC_BTN5,  KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
-#define ___MOUSE_ACCL_012___  KC_ACL0,  KC_ACL1,  KC_ACL2
-#define ___MACCL___ ___MOUSE_ACCL_012___
-#endif
-
-#define ___VI_ARROWS___           KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-#define ___HOME_PGDN_PGUP_END___  KC_HOME,  KC_PGDN, KC_PGUP, KC_END
-#define ___TAB_PGDN_PGUP_BKTAB___ KC_TAB,  KC_PGDN, KC_PGUP, KC_BKTAB
-// home and end are combos.  tab/pgdn = home, bktab/pgup = end.
-
-#define ___REDO_CUT_COPY_PASTE_UNDO___ S_REDO, S_CUT, S_COPY, S_PASTE, S_UNDO
-
-#ifdef MOUSEKEY_ENABLE
-#define ___NAV_La_1___ ___SML_MODS_L___, KC_ACL0
-#define ___NAV_L_1___ ___4MOUSE_BTNS_L___, KC_ACL0
-#define ___NAV_L_2___ ___MOUSE_LDUR___,  KC_ACL1
-#define ___NAV_L_3___ ___MWHEEL_LDUR___, KC_ACL2
-#define ___NAV_L_4___ ___VI_ARROWS___,   KC_CCCV
-
-#define ___NAV_R_1___  KC_CTCN, ___4MOUSE_BTNS_R___
-#define ___NAV_R_4___  KC_CCCV, ___MOUSE_LDUR___
-
-#else
-
-#define ___NAV_La_1___ ___NAV_L_1___
-#define ___NAV_L_1___  ___OS_MODS_L___
-#define ___NAV_L_2___  ___SML_MODS_L___, ___
-#define ___NAV_L_3___  ___5___
-#define ___NAV_L_4___  ___VI_ARROWS___,   KC_CCCV
-
-#define ___NAV_R_1___  KC_CTCN, ___SML_MODS_R___
-#define ___NAV_R_4___  KC_CCCV, ___4___
-
-#endif // end mousekey
-
-#define ___NAV_R_2___  KC_CCCV, ___VI_ARROWS___
-#define ___NAV_R_3___  KC_CWCQ, ___HOME_PGDN_PGUP_END___
-#define ___NAV_Ra_3___ KC_CWCQ, ___TAB_PGDN_PGUP_BKTAB___
-
-#ifdef MOUSEKEY_ENABLE
-
-#define ___6NAV_L_1___ ___MOUSE_BTNS_L___,           KC_ACL0
-#define ___6NAV_L_2___ TAB_BKTAB, ___MOUSE_LDUR___,  KC_ACL1
-#define ___6NAV_L_3___ ___,       ___MWHEEL_LDUR___, KC_ACL2
-#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
-
-#define ___6NAV_R_1___ KC_CTCN, ___MOUSE_BTNS_R___
-#define ___6NAV_R_4___ KC_CCCV, ___MOUSE_LDUR___, ___
-
-#else
-
-#define ___6NAV_L_1___ ___6___
-#define ___6NAV_L_2___ TAB_BKTAB, ___SML_MODS_L___, ___
-
-#define ___6NAV_L_3___ ___,       ___5___
-#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
-
-#define ___6NAV_R_1___ KC_CTCN, ___SML_MODS_R___
-#define ___6NAV_R_4___ KC_CCCV, ___4___, ___
-
-#endif // end mousekey
-
-#define ___6NAV_R_2___ KC_CCCV, ___VI_ARROWS___,          TAB_BKTAB
-#define ___6NAV_R_3___ KC_CWCQ, ___HOME_PGDN_PGUP_END___, ___
-
-// compact. 3x10 per layer.
-#define ___10_NAV_1a___ ___NAV_La_1___, ___NAV_R_1___
-#define ___10_NAV_1___ ___NAV_L_1___, ___NAV_R_1___
-#define ___10_NAV_2___ ___NAV_L_2___, ___NAV_R_2___
-#define ___10_NAV_3___ ___NAV_L_3___, ___NAV_Ra_3___
-
-// designed without mouse, mods on left.
-#define ___NAVnm_La_1___ ___NAV_L_1___
-#define ___NAVnm_L_1___  ___SML_MODS_L___
-#define ___NAVnm_L_2___  ___OS_MODS_L___, ___
-#ifdef MOUSEKEY_ENABLE
-#define ___NAVnm_L_3___  ___2___, SML_NAVm, ___2___  // get to mouse layer if enabled.
-#else
-#define ___NAVnm_L_3___  ___5___
-#endif
-
-#define ___10_NAVnm_1___ ___SML_MODS_L___, ___, ___NAV_R_1___
-#define ___10_NAVnm_2___ ___OS_MODS_L___, ___NAV_R_2___
-#define ___10_NAVnm_3___ ___NAVnm_L_3___, ___NAV_R_3___
-
-#ifdef MOUSEKEY_ENABLE
-// Mouse layer only. mods on right.
-#define ___10_NAVm_1___ ___NAV_L_1___, ___NAV_R_1___
-#define ___10_NAVm_2___ ___NAV_L_2___, ___NAV_R_2___
-#define ___10_NAVm_3___ ___NAV_L_3___, ___NAV_R_3___
-#endif
-
-/********************************************************************************/
-/* The Navigation LAYER Chunks                                                  */
-/********************************************************************************/
-// A Navigation Layer
-#define CARTE_NAV                               \
-  carte_de_map("54321 0  ctn 12345",            \
-               " ldur 1  ccv ldur",             \
-               " ldur 2  cwq tdubt")
-
-#define CARTE_NAVA                              \
-  carte_de_map(" gacs 0  ctn 12345",             \
-               " ldur 1  ccv ldur",              \
-               " ldur 2  cwq tdubt")
-
-#define CARTE_NAVnm                             \
-  carte_de_map(" gacsc2 ctn cscag ",            \
-               " gacs   ccv ldur",              \
-               " __M_   cwq tdubt")
-
-// currently the same as NAVA
-#define CARTE_NAVm                                 \
-  carte_de_map(" gacs 0  ctn 12345",               \
-               " ldur 1  ccv ldur",                \
-               " ldur 2  cwq tdubt")
-
-#define CARTE_NAV_miryoku                       \
-  carte_de_map("  rdo  ccp undo",               \
-               "  Caps ldur",                   \
-               "  Ins  HDUE")
-
-#define CARTE_NAVm_miryoku                      \
-  carte_de_map("  rdo ccp undo",               \
-               "      ldur",                   \
-               "      ldur")
-
-
-#ifdef MOUSEKEY_ENABLE
-#define ___NAVm_3x10___ ___10_NAVm_1___, ___10_NAVm_2___, ___10_NAVm_3___
-#endif
-
-#define ___NAVnm_3x10___ ___10_NAVnm_1___, ___10_NAVnm_2___, ___10_NAVnm_3___
-#define ___NAVA_3x10___ ___10_NAV_1a___, ___10_NAV_2___, ___10_NAV_3___
-#define ___NAV_3x10___ ___10_NAV_1___, ___10_NAV_2___, ___10_NAV_3___
-#define ___NAV_3x12___ ___12_NAV_1___, ___12_NAV_2___, ___12_NAV_3___
-#define ___NAV_miryoku___ \
-  ___5___, ___redo_cut_copy_paste_undo___,                              \
-    ___5___, KC_CAPS, ___VI_ARROWS___,                                  \
-    ___5___, KC_INSERT, ___HOME_PGDN_PGUP_END___
-
-#ifdef MOUSEKEY_ENABLE
-#define ___NAVm_miryoku___                                              \
-  ___5___, ___redo_cut_copy_paste_undo___,                              \
-    ___5___, ___, ___MOUSE_LDUR___,                                     \
-    ___5___, ___, ___MWHEEL_LDUR___,
-#endif
diff --git a/users/ericgebhart/layers/symbols.h b/users/ericgebhart/layers/symbols.h
deleted file mode 100644
index 272bd9b850..0000000000
--- a/users/ericgebhart/layers/symbols.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-/******************************************************************/
-/*                                                                */
-/* Symbol layers:                                                 */
-/*                                                                */
-/* The BEAKL15 Symbol layer with or without additions.            */
-/*                                                                */
-/* There is the offical beakl symbol layer, an extended symbol    */
-/* layer which is expanded with: !?@`'/-;.                        */
-/*                                                                */
-/* Placing these 8 keys in the pinky and index corners            */
-/* at the edges of the, 3x3, BEAKL home Region.                   */
-/*                                                                */
-/* Beakl has these keys in it's base layer which isn't the case   */
-/* for other layouts like dvorak, colemak, etc.                   */
-/*                                                                */
-/* The third layer moves /:? to more accessible places.           */
-/* to make vi keybindings more accessible.                        */
-/*                                                                */
-/* Note that there are 2 widths. 12 and 10. The wider layer adds  */
-/* - and ; to the middle row edges.                               */
-/*                                                                */
-/* Official:                                                      */
-/*         <$>   [_]                                              */
-/*      - \(")# %{=}| ;                                           */
-/*         :*+   &^~                                              */
-/*                                                                */
-/*   not yet implemented                                          */
-/* BEAKL27 (punctuation layer):                                   */
-/*   ↹@$#↹  ~^`                                                  */
-/*   ↹<=>   [_]                                                   */
-/*   \(-)+ %{;}!                                                  */
-/*    *:/⏎  |~&                                                   */
-/*                                                                */
-/*                                                                */
-/* BEAKL Extended symbol layer                                    */
-/* Expanded with: !?@`'/-;                                        */
-/*                                                                */
-/* A:                                                             */
-/*        `<$>' ?[_]-                                             */
-/*      - \(")# %{=}| ;                                           */
-/*        @:*+; !&^~/                                             */
-/*                                                                */
-/* Optimized for Vi.                                              */
-/* B:                                                             */
-/*                                                                */
-/*        `<$>' ?[_]-                                             */
-/*      - \(")# !{:}/ ;                                           */
-/*        @=*+; %&^~|                                             */
-/*                                                                */
-/* C:                                                             */
-/*                                                                */
-/*        `<$>' ?[_-]                                             */
-/*      - \("#) !{:/} ;                                           */
-/*        @=*+; %&^~|                                             */
-/*                                                                */
-/*                                                                */
-/* Both ; and ' could have found their dvorak positions. Analysis showed */
-/* that only caused pinky overuse. Rotating the symbols around Put better */
-/* keys on the index finger which showed a huge improvement in efficiency. */
-/* The same is true of the exclamation point.                     */
-/*                                                                */
-
-/* Beakl Wi */
-
-/* This Symbol layer does not improve on the above extended symbol */
-/* layers in my opinon, for my usage. */
-
-/* The original symbol was the Left side with defined/but/transparent */
-/* right. The regex layer was the opposite. I combined them into one, I am */
-/* not sure of the functionality that might be lost due to that, but they */
-/* are defined as original sans extra tap dance functions. It would be easy to */
-/* make two layers with transparent right and left. There is duplication */
-/* of | and *. */
-
-/* Symbols on the left */
-/* .*&+ */
-/* ?!/| */
-/* <>%@ */
-
-// regex on the right
-/* *[^] */
-/* ?($) */
-/* |{#} */
-
-// Altogether
-/* .*&+  *[^] */
-/* ?!/|  ?($) */
-/* <>%@  |{#} */
-/******************************************************************/
-
-// Left
-#define ___SB_L1___          _OCLTGT, _DLR,    _GT
-#define ___SB_L2___  _BSLS,  _OCPRN,  _OCDQUO, _RPRN, _HASH
-#define ___SB_L2c___ _BSLS,  _OCPRN,  _OCDQUO, _HASH, _RPRN
-#define ___SB_L3___          _COLN,   _ASTR,   _PLUS
-
-// Right
-#define ___SB_R1___          _OCBRC,   _UNDS,     _RBRC
-#define ___SB_R1c___         _OCBRC,   _UNDS,     _MINS
-#define ___SB_R2___  _PERC,  _OCCBR,   _EQL,      _RCBR,  _PIPE
-#define ___SB_R3___          _AMPR,    _CIRC_ND,  _TILD_ND
-
-// a and b... left and right.
-#define ___SB_L3b___          _EQL,    _ASTR,   _PLUS
-
-#define ___SB_R2a___ _PERC,  _OCCBR,   _EXLM,  _RCBR,  _PIPE
-#define ___SB_R2b___ _EXLM,  _OCCBR,   _COLN,  _RCBR,  _SLSH
-#define ___SB_R2c___ _EXLM,  _OCCBR,   _COLN,  _SLSH,  _RCBR
-
-// ---------------------------
-// ---------------------------
-#define CARTE_SYMB_BEAKL                        \
-  carte_de_map("  <$>   [_]   ",                \
-               "-\\(\")# %{=}|;",               \
-               "  :*+   &^~   ")
-
-#define ___SYMB_BEAKL_3x10___                                           \
-  CHUNK_LANG_MAP(_TRNS,   ___SB_L1___, _TRNS,    _TRNS,  ___SB_R1___, _TRNS, \
-                 ___SB_L2___,                    ___SB_R2___,           \
-                 _TRNS,   ___SB_L3___, _TRNS,    _TRNS, ___SB_R3___, _TRNS)
-
-// ---------------------------
-// A: Extended.
-#define CARTE_SYMB_BEAKLA                       \
-  carte_de_map("   `<$>'  ?[_]-",               \
-               "  -\\(\")#  %{:}|;",            \
-               "   @=*+;  !&^~/")
-
-#define ___SYMB_BEAKLA_3x10___                                          \
-  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___, _OCQUOT,   _QUES,  ___SB_R1___, _MINS, \
-                 ___SB_L2___,                    ___SB_R2a___,          \
-                 _AT,    ___SB_L3___, _SCLN,     _EXLM, ___SB_R3___, _SLSH)
-
-// ---------------------------
-// B: Extended & Vi
-#define CARTE_SYMB_BEAKLB                       \
-  carte_de_map("   `<$>'  ?[_]-",               \
-               "  -\\(\")#  !{:}/;",            \
-               "   @=*+;  %&^~|")
-
-#define ___SYMB_BEAKLB_3x10___                                          \
-  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___,  _OCQUOT,   _QUES,  ___SB_R1___, _MINS, \
-                 ___SB_L2___,                     ___SB_R2b___,         \
-                 _AT,    ___SB_L3b___, _SCLN,     _PERC, ___SB_R3___, _PIPE)
-
-// ---------------------------
-// C: Extended & Vi, move closing braces to pinky, seldom used.
-// because of tap hold - open_openclose feature.
-// Also emacs which mostly closes them.
-#define CARTE_SYMB_BEAKLC                       \
-  carte_de_map("   `<$>'  ?[_-]",               \
-               "  -\\(\"#)  !{:/};",            \
-               "   @=*+;  %&^~|")
-
-#define ___SYMB_BEAKLC_3x10___                                          \
-  CHUNK_LANG_MAP(_OCGRV, ___SB_L1___,  _OCQUOT,   _QUES,  ___SB_R1c___, _RBRC, \
-                 ___SB_L2c___,                     ___SB_R2c___,        \
-                 _AT,    ___SB_L3b___, _SCLN,     _PERC, ___SB_R3___, _PIPE)
-
-// wants ( and ) on the left thumb.
-#define CARTE_SYMB_MIRYOKU                                  \
-  carte_de_map("  {&.(} ",                                  \
-               "  :$%^+ ",                                  \
-               "  ~!@#| ")
-
-#define ___SYMB_MIRYOKU_3x10___                         \
-  CHUNK_LANG_MAP(_OCCBR,   _AMPR, _DOT,  _OCPRN,   _RCBR, ____5_,     \
-                 _COLN,    _DLR,  _PERC, _CIRC_ND, _PLUS, ____5_,     \
-                 _TILD_ND, _EXLM, _AT,   _HASH,    _PIPE, ____5_)
-
-// ---------------------------
-// WI: the Beakl Wi definition.
-#define ___SYMB_BKL_WI_L1___ ___,   _DOT,  _ASTR, _AMPR, _PLUS
-#define ___SYMB_BKL_WI_L2___ ___,   _QUES, _EXLM, _SLSH, _PIPE
-#define ___SYMB_BKL_WI_L3___ ___,   _LT,   _GT,   _PERC, _AT
-
-#define ___SYMB_BKL_WI_R1___ _ASTR, _OCBRC, _CIRC_ND, _RBRC, ___
-#define ___SYMB_BKL_WI_R2___ _QUES, _OCPRN, _DLR ,    _RPRN, ___
-#define ___SYMB_BKL_WI_R3___ _PIPE, _OCCBR, _HASH,    _RCBR, ___
-
-#define CARTE_SYMB_BEAKLWI                      \
-  carte_de_map(" .*&+  *[^] ",                  \
-               " ?!/|  ?($) ",                  \
-               " <>%@  |{#} ")
-
-#define ___SYMB_BEAKL_WI_3x10___                                \
-  CHUNK_LANG_MAP(___SYMB_BKL_WI_L1___, ___SYMB_BKL_WI_R1___,    \
-                 ___SYMB_BKL_WI_L2___, ___SYMB_BKL_WI_R2___,    \
-                 ___SYMB_BKL_WI_L3___, ___SYMB_BKL_WI_R3___)
-
-// ---------------------------
-// Neo symbol layer
-#define ___SYMB_NEO_L1___ ___,  _OCDQUOT, _UNDS,  _OCLBRC, _RBRC, _CIRC_ND
-#define ___SYMB_NEO_L2___ ___,  _SLSH,  _MINS,  _OCLCBR, _RCBR, _ASTR
-#define ___SYMB_NEO_L3___ ___,  _HASH,  _DLR,   _PIPE, _TILD_ND, _OCGRV
-
-#define ___SYMB_NEO_R1___ _EXLM, _LT,    _GT,    _EQL,  _AMPR
-#define ___SYMB_NEO_R2___ _QUES, _OCPRN, _RPRN , _QUOT, _COLN
-#define ___SYMB_NEO_R3___ _PLUS, _PERC,  _BSLS,  _AT,   ___
-
-#define CARTE_SYMB_NEO                          \
-  carte_de_map("\"_[]^  !<>=&",                 \
-               "/-{}*  ?()':",                  \
-               "#$|~`  +%\@")
-
-#define ___SYMB_NEO_3x10___                                     \
-  CHUNK_LANG_MAP(___SYMB_NEO_L1___, ___SYMB_NEO_R1___,          \
-                 ___SYMB_NEO_L2___, ___SYMB_NEO_R2___,          \
-                 ___SYMB_NEO_L3___, ___SYMB_NEO_R3___)
diff --git a/users/ericgebhart/layers/thumbs.h b/users/ericgebhart/layers/thumbs.h
deleted file mode 100644
index a78b3a9532..0000000000
--- a/users/ericgebhart/layers/thumbs.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// Split thumbs.
-
-// Split these down the middle to think in left and right hand.
-// Top row on kinesis, ergodox, etc.
-#define ___THUMBS_1___                                  \
-  ___X___  , MO_ADJUST,   MO_LAYERS, OSL(LN_TOPROWS)
-
-// Middle row on kinesis, ergodox, etc.
-#define ___THUMBS_2___   HOME_END,   KC_PGUP
-
-#define ___4_THUMBS_1___  ___X___, KC_HOME, KC_PGUP, OSL(LN_TOPROWS)
-#define ___6_THUMBS_2___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
-#define ___6_THUMBS_2_CB___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
-
-#define ___6_THUMBS_2a___ BSPC_SYMB, ESC_TOPR, ESC_TOPR, ENT_NAV, ENT_NAV, SPC_TOPR
-#define ___6_THUMBS_2a_CB___ BSPC_SYMB, ESC_TOPR, ESC_TOPR, ENT_NAV, ENT_NAV, SPC_TOPR
-
-
-// This has become the default center group of thumbs for all
-// So here's the beakl wi thumbs adapted to this combined layer system.
-//
-#define ___6_ERGO_THUMBS_WI___                                  \
-  ESC_TOPR, I_SYMB, TAB_NUM,  ENT_NAV, SPC_SYMB, BSPC_NAV
-
-// Like my other thumb rows. With an I.
-#define ___6_ERGO_THUMBS_WIa___                                 \
-  BSPC_NAV, I_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, TAB_NUM
-
-#define ___6_ERGO_THUMBS_layers___                              \
-  SML_NAV, BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, ACCCENTS_RALT
-
-#define ___6_ERGO_THUMBS_COMBO___ CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6
-#define ___6_ERGO_THUMBS_COMBO2___ CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6
-
-// Transparent.
-#define ___6_ERGO_THUMBS_trns___ ___6___
-
-// A place to test stuff.
-#define ___6_ERGO_THUMBS_tst___                                 \
-  TT_KEYPAD, BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, KC_XM_PORD
-
-#define ___6_ERGO_THUMBS_mods___                                \
-  ALT_DEL, CTL_BSPC, GUI_ESC,  ALT_ENT, CTL_SPC, XC_XM_PORD
-
-#define ___6_ERGO_THUMBS_mod_layers___                          \
-  ALT_DEL, BSPC_SYMB, GUI_ESC,  CTL_ENT, SPC_TOPR, ACCENTS_RALT
-
-#define ___6_ERGO_THUMBS_mod_layers_nav___                      \
-  ALT_DEL, BSPC_SYMB, GUI_ESC,  ENT_NAV, SPC_TOPR, ACCENTS_RALT
-
-// for keymaps that need a letter on the thumb.
-#define ___6_ERGO_THUMBS_left_letter___                                 \
-  BSPC_ALT, TH_LTR_SYM, GUI_ESC,  ENT_NAV, SPC_TOPR, KC_TAB
-
-// an attempt at an approximation of the HD thumbs as they are on the site.
-// really should be expected to be a starting point that doesnt strand you.
-#define ___6_ERGO_THUMBS_hd___                                  \
-  BSPC_ALT, TH_LTR_SYM, GUI_ESC, ENT_NAV, SPC_TOPR, ACCENTS_CTL
-#define ___6_ERGO_THUMBS_hd_a___                                        \
-  OS_LSHIFT, TH_LTR_SYM, GUI_ESC, BSPC_ALT, SPC_TOPR, ACCENTS_CTL
-#define ___6_ERGO_THUMBS_hd_simple___                   \
-  MO_SYMB, THUMB_LETTER, KC_ENT, KC_BSPC, KC_SPC, MO_TOPROWS
-/* HD dash has thumbs of ,; and .:        */
-#define ___6_ERGO_THUMBS_hd_dash___                                     \
-  LANG_KC(TL_COMM), TL_DOT_SYMB, GUI_ESC, ENT_NAV, SPC_TOPR, BSPC_NUM
-
-#define ___6_ERGO_THUMBS_media___ ___3___, ___STOP_PLAY_MUTE___
-#define ___6_ERGO_THUMBS_mouse___ ___3___, ___3MOUSE_BTNS_R___
-#define ___6_ERGO_THUMBS_keypad___ \
-  LANG_KC(_DOT), LANG_KC(_0), LANG_KC(_MINS), ___3___
-#define ___6_ERGO_THUMBS_symb___                                \
-  LANG_KC(_OCPRN), LANG_KC(_RPRN), LANG_KC(_UNDS), ___3___
-
-// miryoku thumbs, either its toprows or keypad for numbers.
-#define ___6_ERGO_THUMBS_miryoku_tr___                          \
-  ESC_MEDIA, SPACE_NAV, TAB_NAVM,  ENT_SYM, BSPC_TOPR, DEL_FUN
-#define ___6_ERGO_THUMBS_miryoku___                             \
-  ESC_MEDIA, SPACE_NAV, TAB_NAVM,  ENT_SYM, BSPC_NUM, DEL_FUN
-// lose the tab key, put a letter where space was.
-// move space to the right side, put backspace where tab was.
-#define ___6_ERGO_THUMBS_miryoku_ltr___                         \
-  ESC_MEDIA, TH_LTR_NAV, BSPC_NAVm,  ENT_SYM, SPC_NUM, DEL_FUN
-#define ___6_ERGO_THUMBS_miryoku_tr_ltr___                      \
-  ESC_MEDIA, TH_LTR_NAV, BSPC_NAVm,  ENT_SYM, SPC_TOPR, DEL_FUN
-
-#define ___6_ERGO_THUMBS_miryoku_ltr_tab___                      \
-  BSPC_MEDIA, TH_LTR_NAV, TAB_NAVM,    ENT_SYM, SPC_NUM, DEL_FUN
-
-#define ___6_ERGO_THUMBS_miryoku_tr_ltr_tab___                   \
-  BSPC_MEDIA, TH_LTR_NAV, TAB_NAVM,    ENT_SYM, SPC_TOPR, DEL_FUN
-
-// Give the right symbol suffix by the value of THUMBS_ARE
-// Basically we choose the right cluster here, so the layout
-// level doesn't know or care.
-//
-// ___foo  --> ___foo_WI___, or ___foo_WIa___, or ___foo_def___.
-// THUMBS_ARE = WI, or WIa, or DEFAULT, TEST, TRNS, MOD_LAYERS, etc.
-// the value of THUMB_LETTER is the key used when needed.
-#define THUMB_EXT CAT(THUMBS_ARE, _EXT)
-#define WI_EXT _WI___
-#define WIa_EXT _WIa___
-#define DEFAULT_EXT _mod_layers_nav___  //change this to change the default.
-#define TEST_EXT _tst___
-#define TRNS_EXT _trns___
-#define MODS_EXT _mods___
-#define LAYERS_EXT _layers___
-#define MODS_LAYERS_EXT _mod_layers___
-#define MODS_LAYERS_NAV_EXT _mod_layers_nav___
-#define MIRYOKU_EXT _miryoku___
-#define MIRYOKU_TR_EXT _miryoku_tr___
-#define MIRYOKU_LTR_EXT _miryoku_ltr___  // miryoku versions with a letter
-#define MIRYOKU_LTR_TAB_EXT _miryoku_ltr_tab___
-#define MIRYOKU_TR_LTR_EXT _miryoku_tr_ltr___
-#define MIRYOKU_TR_LTR_TAB_EXT _miryoku_tr_ltr_tab___
-#define TH_LTR_EXT _left_letter___ // takes a letter for the left thumb.
-#define HD_DASH_EXT _hd_dash___
-#define HD_EXT _hd___  // takes a letter for the left thumb.
-#define HDA_EXT _hd_a___  // relocate backspace
-#define HD_SIMPLE_EXT _hd_simple___  // no LTs or MT´s.
-// for the function layers
-#define COMBO_EXT _COMBO___
-#define COMBO2_EXT _COMBO2___
-#define MEDIA_THUMBS_EXT _media___
-#define MOUSE_THUMBS_EXT _mouse___
-#define KEYPAD_THUMBS_EXT _keypad___
-#define SYMB_THUMBS_EXT _symb___
-
-#define ___6_ERGO_THUMBS___ CAT2(___6_ERGO_THUMBS, THUMB_EXT)
-// for the kyria, mostly for the combo reference layers.
-#define ___10_ERGO_THUMBS___ CATR(___10_ERGO_THUMBS, EXP_THUMB_EXT)
-#define ___4_THUMBS___ CAT2(___4_THUMBS, EXP_THUMB_EXT)
-
-/* #define ___6_ERGO_THUMBS___ ___6_ERGO_THUMBS_def___ */
-
-/* #define ___ERGODOX_THUMB_LEFT___                \ */
-/*   OSL(SYMB), OSM(KC_LGUI),                      \ */
-/*     HOME_END,                                   \ */
-/*     CTL_BSPC, ALT_DEL, XMONAD_ESC */
-
-/* #define ___ERGODOX_THUMB_RIGHT___               \ */
-/*   XXX, OSL(KEYPAD),                             \ */
-/*     KC_PGUP,                                    \ */
-/*     KC_PGDN, ALT_ENT, CTL_SPC */
-
-// Translation of LT thumb keys from beakl wi where function layers
-// have separate left and right to here, where I'm defining left and right in
-// one layer and using it that way. I don't feel that having both halves
-// on one layer hurts, if I invoke a layer, I'm not trying to use a non
-// layer part of the keyboard. I don't have an edit layer, might be a good idea.
-// have most of it on the Navigation layer.
-// use the keycodes on that original layer, so It's not defined here.
-// The wi keypad has a hexpad instead of a funcpad. All the other keypads
-// have a funcpad on the opposite side.
-
-// translation of the original wi layers to those here.
-// BSPC_NAV
-// SPC_SYMB
-// TAB_NUM
-// ESC_func ->  ESC_TOPR
-// I_regex   -> I_SYMB
-// ENT_edit  -> ENT_NAV
-
-/* // consolidated for kinesis, ergodox, and dactyl */
-/* //for the ergodox and kinesis. */
-/* #define ___12_DOX_ALL_THUMBS___                 \ */
-/*   ___4___,                                      \ */
-/*     ___2___,                                    \ */
-/*     ___6___ */
-
-#define ___12_DOX_ALL_THUMBS___ ___12___
-
-/* ___THUMBS_1___,                             \ */
-/* ___xTHUMBS_2___,                            \ */
-/* ___6_ERGO_THUMBS___ */
-
-#define ___12_DOX_ALL_THUMBS_EN___ ___12_DOX_ALL_THUMBS___
-#define ___12_DOX_ALL_THUMBS_BP___ ___12_DOX_ALL_THUMBS___
-
-#define ___16_ALL_THUMBS___                     \
-  ___4_THUMBS_1___,                             \
-    ___6_THUMBS_2___,                           \
-    ___6_ERGO_THUMBS___
-
-#define ___16_ALL_THUMBS_EN___ ___16_ALL_THUMBS___
-#define ___16_ALL_THUMBS_BP___ ___16_ALL_THUMBS___
-#define ___16_ALL_THUMBSa___                    \
-  ___4_THUMBS_1___,                             \
-    ___6_THUMBS_2a___,                          \
-    ___6_ERGO_THUMBS___
-
-#define ___16_ALL_THUMBSa_EN___ ___16_ALL_THUMBSa___
-#define ___16_ALL_THUMBSa_BP___ ___16_ALL_THUMBSa___
-
-
-// For the Kyria
-#define ___4_THUMBS_def___       OS_LALT, OS_LCTL, SML_NAV, OS_LSFT
-#define ___10_ERGO_THUMBS_def___ _X_, _X_, ___6_ERGO_THUMBS___, _X_, _X_
-
-#define ___4_THUMBS_EN___ ___4_THUMBS_def___
-#define ___4_THUMBS_BP___ ___4_THUMBS_def___
-#define ___10_ERGO_THUMBS_EN___ ___10_ERGO_THUMBS_def___
-#define ___10_ERGO_THUMBS_BP___ ___10_ERGO_THUMBS_def___
-
-// combo reference layer thumbs for the kyria.
-// for the kyria, note the odd numbering...a 0 row, and a,b,c,d for the extras
-// on either side of the central 6 thumbs.
-#define ___2_THUMBS_CB___       CB_1TH1,   CB_1TH2
-#define ___4_THUMBS_CB___       CB_0TH1,   CB_0TH2, CB_0TH3, CB_0TH4
-#define ___6_THUMBS_CB___       CB_1TH1,   CB_1TH2, CB_1TH3, CB_1TH4, CB_1TH5, CB_1TH6
-#define ___10_ERGO_THUMBS_CB___ CB_THA,    CB_THB,      \
-    ___6_ERGO_THUMBS___, CB_THC, CB_THD
-#define ___12_ERGO_THUMBS_CB___ ___2_THUMBS_CB___,              \
-    CB_THA,    CB_THB,  ___6_ERGO_THUMBS___, CB_THC, CB_THD
-#define ___12_DOX_ALL_THUMBS_CB___ ___4_THUMBS_CB___, ___2_THUMBS_CB___, ___6_ERGO_THUMBS___
-#define ___16_DOX_ALL_THUMBS_CB___ ___4_THUMBS_CB___, ___6_THUMBS_2_CB___, ___6_ERGO_THUMBS___
-#define ___16_DOX_ALL_THUMBSa_CB___ ___4_THUMBS_CB___, ___6_THUMBS_2a_CB___, ___6_ERGO_THUMBS___
-
-
-#define ___2_THUMBS_CB2___       CB2_1TH1, CB2_1TH2
-#define ___4_THUMBS_CB2___       CB2_0TH1, CB2_0TH2, CB2_0TH3, CB2_0TH4
-#define ___6_THUMBS_CB2___       CB2_1TH1, CB2_1TH2, CB2_1TH3, CB2_1TH4, CB2_1TH5, CB2_1TH6
-#define ___10_ERGO_THUMBS_CB2___ CB2_THA,  CB2_THB,     \
-    ___6_ERGO_THUMBS___, CB2_THC, CB2_THD
-#define ___12_ERGO_THUMBS_CB2___ ___2_THUMBS_CB2___,      \
-    CB2_THA,  CB2_THB, ___6_ERGO_THUMBS___, CB2_THC, CB2_THD
-#define ___12_DOX_ALL_THUMBS_CB2___ ___4_THUMBS_CB2___, ___2_THUMBS_CB2___, ___6_ERGO_THUMBS___
-#define ___16_DOX_ALL_THUMBS_CB2___ ___4_THUMBS_CB2___, ___6_THUMBS_2_CB2___, ___6_ERGO_THUMBS___
-#define ___16_DOX_ALL_THUMBSa_CB2___ ___4_THUMBS_CB2___, ___6_THUMBS_2a_CB2___, ___6_ERGO_THUMBS___
-
-// Basically give the same 4 top thumbs and bottom outer 4 thumbs for everyone.
-// Could be different for every one, but the core 6 is enough for now I think.
-// Everyone is the same except the combo reference layers.
-// Let 6 ERGO_THUMBS do it´s thing inside.
-#define EXP_THUMB_EXT CAT(THUMBS_ARE, _EXP_EXT)
-#define WI_EXP_EXT _def___
-#define WIa_EXP_EXT _def___
-#define DEFAULT_EXP_EXT _def___
-#define TEST_EXP_EXT _def___
-#define TRNS_EXP_EXT _def___
-#define MODS_EXP_EXT _def___
-#define LAYERS_EXP_EXT _def___
-#define MODS_LAYERS_EXP_EXT _def___
-#define MODS_LAYERS_NAV_EXP_EXT _def___
-#define MIRYOKU_EXP_EXT _def___
-#define MIRYOKU_TR_EXP_EXT _def___
-#define MIRYOKU_LTR_EXP_EXT _def___
-#define MIRYOKU_TR_LTR_EXP_EXT _def___
-#define TH_LTR_EXP_EXT _def___
-#define HD_DASH_EXP_EXT _def___
-#define HD_EXP_EXT _def___
-#define HDA_EXP_EXT _def___
-#define HD_SIMPLE_EXP_EXT _def___
-// for the function layers
-#define COMBO_EXP_EXT _COMBO___
-#define COMBO2_EXT _COMBO2___
-#define MEDIA_THUMBS_EXP_EXT _def___
-#define MOUSE_THUMBS_EXP_EXT _def___
-#define KEYPAD_THUMBS_EXP_EXT _def___
-#define SYMB_THUMBS_EXP_EXT _def___
diff --git a/users/ericgebhart/layers/toprows.h b/users/ericgebhart/layers/toprows.h
deleted file mode 100644
index 3ae1c4665b..0000000000
--- a/users/ericgebhart/layers/toprows.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "keycodes.h"
-/*******************************************************************/
-/* A Top Rows layer.  Pick your parts.  Bepo and Qwerty            */
-/*                                                                 */
-/* This is, to me, a stop gap layer. If I need symbols, numbers or */
-/* function keys these rows are nicely predictable to most people. */
-/* I currently use the beakl number row with regular symbols.      */
-/* I never use function keys for anything.                         */
-/*******************************************************************/
-// Kinesis function key row. I don't use them. but might as well define them.
-#define ___KINTFUNC_L___ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8
-// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_FN0, QK_BOOT
-#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, QK_BOOT
-
-// A TOPROWS Layer.
-// set it how you like it, if you like it.
-
-
-//#define ___MODS_ROW___ ___OS_MODS_L___, ___, ___SML_MODS_R___
-#define ___MODS_ROW___ ___SML_MODS_L___, ___, ___OS_MODS_R___
-/********************************************************************************/
-/* TOPROWS Layer chunk                                                          */
-/********************************************************************************/
-// These rows have already been langed, at their creation.
-// altogether in a chunk.
-#define CARTE_TOPROWS                           \
-  carte_de_map("   !@#$%  ^&*()",               \
-               "   40123  76598",               \
-               " F1-    --    -F12")
-
-#define ___TOPROWS_3x10___                      \
-  ___10_SYMBOLS___,                             \
-    ___10_NUMBERS_BEAKL15___,                   \
-    ___10_FUNCS___
-
-#define CARTE_TOPROWS_MOD                       \
-  carte_de_map("   !@#$%  ^&*()",               \
-               "   40123  76598",               \
-               "  SLMods  OSMods")
-
-#define ___TOPROWS_MOD_3x10___                  \
-  ___10_SYMBOLS___,                             \
-    ___10_NUMBERS_BEAKL15___,                   \
-    ___MODS_ROW___
-
-#define CARTE_TOPROWS_BKL19                     \
-  carte_de_map("   !@#$%  ^&*()",               \
-               "   32104  76598",               \
-               " F1-    --    -F12")
-
-#define ___TOPROWS_BKL19_3x10___                \
-  ___10_SYMBOLS___,                             \
-    ___10_NUMBERS_BEAKL19___,                   \
-    ___10_FUNCS___
-
-#define CARTE_RAISE                             \
-  carte_de_map("   !@#$%  ^&*()",               \
-               "   12345  67890",               \
-               " F1-    --    -F12")
-
-#define ___RAISE_3x10___                        \
-  ___10_SYMBOLS___,                             \
-    ___10_NUMBERS___,                           \
-    ___10_FUNCS___
diff --git a/users/ericgebhart/layers/utility.h b/users/ericgebhart/layers/utility.h
deleted file mode 100644
index a3008cc442..0000000000
--- a/users/ericgebhart/layers/utility.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-/********************************************************************************/
-/* MEDIA  - Mute, Vol, play, pause, stop, next, prev, etc.   */
-/********************************************************************************/
-#define ___PRV_PLAY_NXT_STOP___ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU
-
-#define ___PRV_VDN_VUP_NXT___ KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-#define ___STOP_PLAY_MUTE___ KC_MSTP, KC_MPLY, KC_MUTE
-
-#define ___MUTE_PRV_PLAY_NXT_STOP___  KC_MUTE,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___MUTE_PLAY_STOP___  KC_MUTE,  KC_MPLY,  KC_MSTP
-
-#define CARTE_MEDIA                      \
-  carte_de_map(" ",                      \
-               "  < vdn vup >",          \
-               "  stp play mute")
-
-// miryoku, to be used with stop play mute on thumbs. - MEDIA thumbs.
-#define ___MEDIA_3x10___                        \
-  ___5___, ___5___,                             \
-    ___5___, ___, ___PRV_VDN_VUP_NXT___,        \
-    ___5___, ___5___
-
-
-/********************************************************************************/
-/* RGB  - Control those lights.                                                 */
-
-/* ___, HUE SAT_INT MOD (UP),            | */
-/* ___, HUE SAT INT MOD (DOWN), RGB_TOG  | P_B_R_SW_SN___, ___ */
-/* ___6___,                              | ___, ___RGB_KXGT___, ___ */
-/********************************************************************************/
-// RGB FUNCTION Keysets
-// RGB row for the _FN layer from the redo of the default keymap.c
-#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD
-#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD
-#define ___RGB_MODE_PRV_NXT___   RGB_RMOD, RGB_MOD
-#define ___RGB_TOGGLE___         RGB_TOG
-#define ___RGB_P_B_R_SW_SN___    RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN
-#define ___RGB_KXGT___           RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T
-
-/// An RGB Layer
-#define ___10_RGB_1___ ___RGB_HUE_SAT_INT_UP___, ___,     ___5___
-#define ___10_RGB_2___ ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___RGB_P_B_R_SW_SN___
-#define ___10_RGB_3___ ___5___,                                ___, ___RGB_KXGT___
-
-/********************************************************************************/
-/* The RGB LAYER Chunk                                                          */
-/********************************************************************************/
-#define ___RGB_3x10___ ___10_RGB_1___, ___10_RGB_2___, ___10_RGB_3___
-
-
-/********************************************************************************/
-/* ADJUST - Miscellaneous Melange.                                              */
-/********************************************************************************/
-// For an Adjust layer. Like RBB with audio, flash, etc.
-#define ___ADJUST_L1___ ___RGB_HUE_SAT_INT_UP___,       RGB_TOG
-#define ___ADJUST_L2___ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, CG_NORM
-#define ___ADJUST_L3___ ___RGB_HUE_SAT_INT_DN___,       KC_RGB_T
-
-#define ___ADJUST_R1___  ___, KC_MAKE, VRSN, MG_NKRO, KC_RESET
-#define ___ADJUST_R2___  EE_CLR, ___PRV_PLAY_NXT_STOP___,
-#define ___ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, RGB_IDL
-/********************************************************************************/
-/* The Adjust LAYER Chunks                                                      */
-/********************************************************************************/
-#define ___ADJUST_3x10___  ___ADJUST_L1___, ___ADJUST_R1___,    \
-    ___ADJUST_L2___, ___ADJUST_R2___,                           \
-    ___ADJUST_L3___, ___ADJUST_R3___
-
-
-/********************************************************************************/
-/* LAYERS - Define a base layer, switch to any layer. Get around. Experiment.   */
-/*                                                                              */
-/* Base Layers on the left hand,                                                */
-/* transient layers on the right. Centered on the home region.                  */
-/* A good place to attach an experimental layer.                                */
-/*                                                                              */
-/********************************************************************************/
-//  Base Layers
-// this was kc_dvorak et al. But since its configurable as to who would be here
-// that no longer makes sense. So next keys for locale and base layer. and a set to
-// make it permanent. Cycling of layers is based on current locale.
-#define ___BASE_LAYERS___ ___, KC_SET_BASE, KC_NEXT_BASE_LAYER, KC_NEXT_LOCALE, ___
-
-// transient layers.
-#define ___5_LAYERS_T___     ___, MO(_NAV),  MO_SYMB,  MO_KEYPAD,  MO_TOPROWS
-#ifdef SECOND_LOCALE
-#undef LANG_IS
-#define LANG_IS SECOND_LOCALE
-#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  MO_SYMB,  MO_KEYPAD,  MO_TOPROWS
-#undef LANG_IS
-#define LANG_IS DEFAULT_LANG
-#else
-#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  ___3___
-#endif
-
-#define ___5_LAYERS_T_CTL___ ___, MO_RGB, ___, ___, MO_ADJUST
-
-
-#define CARTE_LAYERS                            \
-  carte_de_map("          |Nv S K TR",          \
-               "  EE Bs Ln|Nv S K TR",          \
-               " ")
-
-/// A Layers Layer
-#define ___LAYERS_3x10___                       \
-  ___5___,            ___5_LAYERS_T_BP___,      \
-    ___BASE_LAYERS___,  ___5_LAYERS_T___,       \
-    ___5___,            ___5_LAYERS_T_CTL___
diff --git a/users/ericgebhart/listen_keylogger.sh b/users/ericgebhart/listen_keylogger.sh
deleted file mode 100755
index 71773d19af..0000000000
--- a/users/ericgebhart/listen_keylogger.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo ./hid_listen | egrep --line-buffered "(0x[A-F0-9]+,)?(NA|[0-9]+),(NA|[0-9]+),[0-9]{1,2}" | tee -a keylog.csv
diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h
deleted file mode 100644
index 9eafdd2a5a..0000000000
--- a/users/ericgebhart/miryoku_hd_gold_config.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-
-/* This configuration creates a miryoku system with */
-/* Qwerty and Hands Down Gold. as base layers. */
-
-/* It also usess layers which are the same or very closely resemble */
-/* the layers of miryoku. These can be swapped out for other choices */
-/* as desired. */
-
-/* The language is set to EN, so KC_ keycodes are used.  */
-/* The oled is on, rgb is off, see below. */
-
-
-#ifndef USERSPACE_CONFIG_H
-#define USERSPACE_CONFIG_H
-
-// pro-micro v3's don't always detect otherwise.
-/* #define SPLIT_USB_DETECT */
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-// Sets good default for the speed of the mouse.
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#undef MOUSEKEY_WHEEL_DELAY
-
-#define MOUSEKEY_WHEEL_MAX_SPEED    5
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
-#define MOUSEKEY_WHEEL_DELAY        100
-
-#undef TAPPING_TOGGLE
-#undef TAPPING_TERM
-
-#define TAPPING_TOGGLE  2
-#define TAPPING_TERM    200
-
-
-#define TAP_HOLD_TERM    200
-#define COMBO_MUST_HOLD_MODS
-#define COMBO_HOLD_TERM 150
-#define TAP_CODE_DELAY 5  // for send string with delay
-
-
-/* Control switches for my keymaps. */
-/* if needed, this goes in the keyboard's config.h */
-/* Alternately, fix the number row in the layout template. */
-/* #define BASE_NUMBER_ROW    // turn on 4 row base templates. */
-
-// Extensions, turn them on and off.
-#define USERSPACE_H "ericgebhart.h"
-
-// Layout definitions, which language, thumb cluster, mod layer.
-// Columns in and out.
-
-// the default. set it, use it, set it back.
-// US_INT // EN, BEPO, US_INT
-#define LANG_IS EN
-#define DEFAULT_LANG EN
-#define DEFAULT_LANG_NAME " en"
-
-// Enable a second locale, for another set of layers.
-// This will add bepo versions of all layers chosen.
-/* #define SECOND_LOCALE BEPO */
-/* #define SECOND_LOCALE_NAME " bepo" */
-
-// Choose a mod layer. Can be changed per layer.
-// TRNS, ALT, HRS_NAV HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
-#define MODS_ARE MIRYOKU_HRM_GACS
-#define DEFAULT_MODS MODS_ARE
-
-// Choose a thumb cluster.
-// WI, WIa, DEFAULT, TEST, TRNS, MODS, LAYERS, MODS_LAYERS,
-// MIRYOKU, MIRYOKU_TR, MODS_LAYERS_NAV,
-// The following use THUMB_LETTER to place a letter on the Thumbs.
-// for use with the hands down metals, maltron, and rsthd.
-// HD, HDA, HD_SIMPLE, TH_LTR, HD_DASH,
-// MIRYOKU_TR_LTR, MIRYOKU_LTR
-// MIRYOKU_TR_LTR_TAB, MIRYOKU_LTR_TAB
-#define THUMBS_ARE DEFAULT
-#define DEFAULT_THUMBS DEFAULT
-
-// pick the edge key set. normie, no kc, smart locks or test.
-// NORM, NOKC, SML, TEST
-#define EDGE_KEY_SET_IS SML
-#define DEFAULT_EDGE_SET SML
-
-// for the base layers which need a thumb cluster which takes a letter.
-#define HANDS_DOWN_LTR_THUMBS_ARE MIRYOKU_LTR_TAB
-#define MALTRON_LTR_THUMBS_ARE TH_LTR
-#define RSTHD_LTR_THUMBS_ARE TH_LTR
-
-// layout io, matrix size.
-// a reasonable default for most keyboards.
-// give a 3x10 and get a 3x12, managed in keyboards/keyboards.h
-#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-// OLED STUFF.
-#define OLED_CUSTOM_ENABLE // custom oled here.
-//#define OLED_LOGO_ENABLE // turn on/off the logo.
-//#define KEYLOGGER_ENABLE // 1500 bytes, track and print keypress info to oled.
-//#define SPLIT_LAYER_STATE_ENABLE  // to sync state between sides.
-
-// EXTENSIONS
-
-// Combos
-#define COMBO_REF_LAYER_ENABLE
-// #define COMBO_REF_LAYER_TWO_ENABLE
-// works if you know the number of your layer.
-// otherwise set and use them later.
-// #define COMBO_ONLY_FROM_LAYER 2
-// #define COMBO_REF_DEFAULT 2
-
-
-// Console key logging for creation of heatmaps, etc.
-// CONSOLE must be enabled for this to work.
-// To create Precondition's heat maps, from console key logging
-// with hid_listen or qmk console
-//#define CONSOLE_KEY_LOGGER_ENABLE  // turn on keylogging for heat maps.
-
-#define ALT_LOCAL_ENABLE // alternate key combinations, with mods as needed.
-//#define ACCENTED_KEYS_ENABLE // direct access to altgr keys.
-
-#define SMART_LOCK_ENABLE // smart lock layers and mods.
-//#define MOD_LOCK_ENABLE  // smart lock mods, similar/overlapping with Smart lock.
-#define NSHOT_ENABLE // smart n-shot for count.
-//#define ONESHOT_MOD_ENABLE  // oneshot mods, similar/overlapping with nshots
-
-#define CAPS_WORD_ENABLE // caps word. both shifts to caps a word.
-#define TAP_HOLD_ENABLE // tap for one thing, hold for tapping term to get another.
-//#define SWAPPER_ENABLE // enable swapper keys.
-#define NOT_DEAD_ENABLE // make undead versions (US_DQUO_ND) of dead keys.
-//#define ALT_SHIFT_ENABLE // alternate shift behaviors for existing keys.
-//#define SEND_STRING_ENABLE // Turn on send string keys
-//#define SEND_UNICODE_ENABLE // Unicode must be enabled for this to work.
-
-
-// Turn on the base layers do not exceed 4 if doing two locales.
-// That will likely push a layer past 15 and then it will
-// no longer work with the LT macro.
-
-// dvorak and relatives
-//#define DVORAK_LAYER_ENABLE
-//#define CAPEWELL_DVORAK_LAYER_ENABLE
-//#define AHEI_LAYER_ENABLE
-//#define BOO_LAYER_ENABLE
-
-// qwerty and derivitives
-#define QWERTY_LAYER_ENABLE
-//#define AZERTY_LAYER_ENABLE
-//#define WORKMAN_LAYER_ENABLE
-//#define NORMAN_LAYER_ENABLE
-
-// COLEMAK and relatives
-//#define COLEMAK_LAYER_ENABLE
-//#define COLEMAK_DH_LAYER_ENABLE
-//#define HALMAK_LAYER_ENABLE
-//#define MINIMAK_LAYER_ENABLE
-//#define MINIMAK_8_LAYER_ENABLE
-//#define MINIMAK_12_LAYER_ENABLE
-
-// BEAKL
-// #define BEAKL15_LAYER_ENABLE
-//#define BEAKL19_LAYER_ENABLE
-//#define BEAKL27_LAYER_ENABLE
-//#define BEAKLWI_LAYER_ENABLE
-
-// carpalx layouts
-//#define CARPALX_QFMLWY_LAYER_ENABLE
-//#define CARPALX_QGMLWB_LAYER_ENABLE
-//#define CARPALX_QGMLWY_LAYER_ENABLE
-
-// alternate layouts
-//#define MALTRON_LAYER_ENABLE
-//#define EUCALYN_LAYER_ENABLE
-//#define HANDS_UP_LAYER_ENABLE
-//#define RSTHD_LAYER_ENABLE
-//#define HANDS_UP_LAYER_ENABLE
-//#define WHITE_LAYER_ENABLE
-//#define ISRT_LAYER_ENABLE
-//#define SOUL_LAYER_ENABLE
-//#define NIRO_LAYER_ENABLE
-//#define ASSET_LAYER_ENABLE
-//#define WHORF_LAYER_ENABLE
-//#define WHORF6_LAYER_ENABLE
-
-// mtgap and relatives
-//#define MTGAP_LAYER_ENABLE
-//#define CTGAP_LAYER_ENABLE
-//#define APT_LAYER_ENABLE
-
-// Hands down
-//#define HD_NEU_NARROW_LAYER_ENABLE
-//#define HD_REF_LAYER_ENABLE
-//#define HD_DASH_LAYER_ENABLE
-//#define HD_ELAN_LAYER_ENABLE
-//#define HD_BRONZE_LAYER_ENABLE
-//#define HD_SILVER_LAYER_ENABLE
-//#define HD_PLATINUM_LAYER_ENABLE
-#define HD_GOLD_LAYER_ENABLE
-
-// 3x12 sized base layers
-//--------------------------
-//#define HD_NEU_LAYER_ENABLE
-
-// additionally all these have accent characters on base layer.
-//#define BEPO_LAYER_ENABLE
-//#define OPTIMOT_LAYER_ENABLE
-//#define BEAKL19bis_LAYER_ENABLE
-
-
-// enable transient function layers.
-#define SYMBOL_LAYER_ENABLE
-#define NAV_LAYER_ENABLE
-// #define MOUSE_LAYER_ENABLE
-//#define TOPROWS_LAYER_ENABLE
-// #define LAYERS_LAYER_ENABLE - defunct. always on.
-#define KEYPAD_LAYER_ENABLE
-//#define ADJUST_LAYER_ENABLE
-//#define RGB_LAYER_ENABLE
-#define MEDIA_LAYER_ENABLE
-#define FUNC_LAYER_ENABLE
-
-
-// define alternate thumb definitions for the transient layers.
-#define MEDIA_LAYER_THUMBS MEDIA_THUMBS
-#define MOUSE_LAYER_THUMBS MOUSE_THUMBS
-#define NAV_LAYER_THUMBS TRNS_THUMBS
-#define KEYPAD_LAYER_THUMBS KEYPAD_THUMBS
-#define SYMB_LAYER_THUMBS SYMB_THUMBS
-#define TOPROWS_LAYER_THUMBS DEFAULT
-
-// Extra character layers.
-// Bepo has dead keys (altgr) and accented keycodes
-// A layer of accented keys
-// #define ACCENTS_LAYER_ENABLE
-// A layer of dead keys
-// #define MORTE_LAYER_ENABLE
-// A layer of the most popular accented keys and dead keys
-// #define ACCENTS_MORTE_LAYER_ENABLE
-
-// Functional layer choices.
-/* configure the function layers. */
-/* They have to be turned on above. */
-/* Choose one of each as desired. */
-/* There are reasonable defaults */
-/* for each if nothing is defined. */
-
-/* nav */
-//#define NAV_FULL  // monolithic, two sided nav with mouse and arrows.
-//#define NAV_FULL_LOCK_MODS // Replace left mouse buttons with lockmods.
-
-// Just the non mouse bits, with lock mods, n-shot mods on the left.
-// if mousekeys enabled, adds a mouse layer accessible via smart lock.
-// #define NAV_NO_MOUSE
-#define NAV_MIRYOKU
-#define NAV_MOUSE_MIRYOKU
-
-
-/* keypads */
-// beakl keypads are usual, if not chosen, regular keypads will be used.
-// left side is the default.
-// Beakl, except for WI, is only on the left side.
-// Miryoku is on the left also.
-
-//#define KEYPAD_RIGHT
-//#define KEYPAD_BEAKL        // beakl doesn't have a rightside, swap hands?
-//#define KEYPAD_MODS      //  give mods on the other side instead of funcs.
-//#define KEYPAD_BEAKL_WI  //  right side with hexpad on left.
-#define KEYPAD_MIRYOKU   //  use the miryoku keypad
-// the default if nothing chosen,
-// is a functionpad on the left and normal keypad on the right.
-
-// funcpad from miryoku
-#define FUNCPAD_MIRYOKU
-
-
-/* symbols */
-// pick one of these or get the default.
-//#define SYMBOL_BEAKL         // original - the default if nothing else.
-//#define SYMBOL_BEAKL_EXT     // extended for non beakl base layers.
-//#define SYMBOL_BEAKL_EXT_VI  // extended with vi keybinding in mind.
-//#define SYMBOL_BEAKL_C         // more alterations by frequency
-// #define SYMBOL_NEO             // The symbol layer from the Neo layout.
-#define SYMBOL_MIRYOKU      // minimalist symbols after miryoku
-//#define SYMBOL_BEAKL_WI      // original wi
-
-
-/* toprows. */
-// The default, if not defined, is a standard qwerty set of rows.
-// symbols, numbers, function keys. Numbers on the home row.
-
-// #define TOPROWS_BKL_15_NUMS  // center row with Beakl15 order. 40123 76598.
-// #define TOPROWS_BKL_19_NUMS // Beakl 19 order: 32104  76598
-//#define TOPROWS_MOD  // beakl 15 nums, oneshot and smart lock mods. no Fkeys.
-
-
-#endif
diff --git a/users/ericgebhart/mod_layers/alt_mods.h b/users/ericgebhart/mod_layers/alt_mods.h
deleted file mode 100644
index db13ee041d..0000000000
--- a/users/ericgebhart/mod_layers/alt_mods.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-//
-// non Home row mods, mod layer.
-
-// MOD_ROW variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// L_5  Left                 R_5 Right.
-// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
-// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_alt(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW0L_5_alt(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW0L_6_alt(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_alt(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_alt(K01, K02, K03, K04, K05, K06)       \
-  ROW0R_5_alt(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW0R_6_alt(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_alt(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW1L_5_alt(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW1L_6_alt(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_alt(K01, K02, K03, K04, K05)                            \
-  K01, K02, K03, K04, K05                                               \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_alt(K01, K02, K03, K04, K05, K06)       \
-  ROW1R_5_alt(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW1R_6_alt(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-// HOME ROW - ROW2
-// LEFT.
-#define ROW2L_5_alt(K01, K02, K03, K04, K05)            \
-  K01, K02, LT(_NAV, K03), MT(MOD_LSFT, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW2L_5_alt(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW2L_6_alt(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_alt(K01, K02, K03, K04, K05)                            \
-  K01, MT(MOD_LSFT, K02),  LT(_NAV, K03), K04, K05                      \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_alt(K01, K02, K03, K04, K05, K06)       \
-  ROW2R_5_alt(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW2R_6_alt(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_alt(K01, K02, K03, K04, K05)            \
-  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW3L_5_alt(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW3L_6_alt(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_alt(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW3R_5_alt(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_alt(K01, K02, K03, K04, K05)          \
-  ROW3R_6_alt(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs.h b/users/ericgebhart/mod_layers/hrm_gacs.h
deleted file mode 100644
index 4bcf092732..0000000000
--- a/users/ericgebhart/mod_layers/hrm_gacs.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Home row mods variant of mod layers.
-
-// MOD_ROW
-// variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW0L_5_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW0L_6_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, LT(_NAV, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW1L_5_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW1L_6_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-
-// HOME ROW - ROW2
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-
-// LEFT.
-#define ROW2L_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW2L_5_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW2L_6_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3L_5_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW3L_6_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3R_5_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h b/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
deleted file mode 100644
index 0238e9a567..0000000000
--- a/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Home row mods variant of mod layers.
-
-// MOD_ROW
-// variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW0L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW0L_6_miryoku_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, LT(_NAV, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW1L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW1L_6_miryoku_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-
-// HOME ROW - ROW2
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-
-// LEFT.
-#define ROW2L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW2L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW2L_6_miryoku_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
-  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_LALT, K04), MT(MOD_RGUI, K05) \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
-  ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, MT(MOD_RALT, K02), K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW3L_6_miryoku_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, MT(MOD_RALT, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3R_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
-  ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gasc.h b/users/ericgebhart/mod_layers/hrm_gasc.h
deleted file mode 100644
index 6eacb13ad6..0000000000
--- a/users/ericgebhart/mod_layers/hrm_gasc.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Home row mods variant of mod layers.
-
-// MOD_ROW
-// variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW0L_5_hrm_gasc(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW0L_6_hrm_gasc(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
-  ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, LT(_NAV, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW1L_5_hrm_gasc(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW1L_6_hrm_gasc(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
-  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
-  ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-
-// HOME ROW - ROW2
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-
-// LEFT.
-#define ROW2L_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
-  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LSFT, K03), MT(MOD_LCTL, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW2L_5_hrm_gasc(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW2L_6_hrm_gasc(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
-  K01, MT(MOD_RCTL, K02),  MT(MOD_RSFT, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
-  ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3L_5_hrm_gasc(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW3L_6_hrm_gasc(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
-  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3R_5_hrm_gasc(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
-  ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_sacg.h b/users/ericgebhart/mod_layers/hrm_sacg.h
deleted file mode 100644
index f4408f78fb..0000000000
--- a/users/ericgebhart/mod_layers/hrm_sacg.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-// Home row mods variant of mod layers.
-
-// MOD_ROW
-// variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW0L_5_hrm_sacg(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW0L_6_hrm_sacg(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
-  ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, LT(_NAV, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW1L_5_hrm_sacg(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW1L_6_hrm_sacg(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
-  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
-  ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-
-// HOME ROW - ROW2
-// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
-// using MT so we can specify left and right.
-// caps_word needs left and right shift.
-
-// LEFT.
-#define ROW2L_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
-  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW2L_5_hrm_sacg(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW2L_6_hrm_sacg(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
-  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05) \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
-  ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3L_5_hrm_sacg(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW3L_6_hrm_sacg(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
-  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
-    ROW3R_5_hrm_sacg(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
-  ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrs_nav.h b/users/ericgebhart/mod_layers/hrs_nav.h
deleted file mode 100644
index 3075a37768..0000000000
--- a/users/ericgebhart/mod_layers/hrs_nav.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-//
-// shift on home row pinkies, nav on home row middle finger.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// L_5  Left                 R_5 Right.
-// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
-// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_hrs_nav(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW0L_5_hrs_nav(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW0L_6_hrs_nav(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_hrs_nav(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
-  ROW0R_5_hrs_nav(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_hrs_nav(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW1L_5_hrs_nav(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW1L_6_hrs_nav(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
-  K01, K02, K03, K04, K05                                               \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
-  ROW1R_5_hrs_nav(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-// HOME ROW - ROW2
-// LEFT.
-#define ROW2L_5_hrs_nav(K01, K02, K03, K04, K05)            \
-  MT(MOD_LSFT, K01), K02, LT(_NAV, K03), K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW2L_5_hrs_nav(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW2L_6_hrs_nav(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
-  K01, K02,  LT(_NAV, K03), K04, MT(MOD_LSFT, K05)                      \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
-  ROW2R_5_hrs_nav(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
-  ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_hrs_nav(K01, K02, K03, K04, K05)        \
-  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
-    ROW3L_5_hrs_nav(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
-  ROW3L_6_hrs_nav(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_hrs_nav(K01, K02, K03, K04, K05)        \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
-    ROW3R_5_hrs_nav(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
-  ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/mod_layer.h b/users/ericgebhart/mod_layers/mod_layer.h
deleted file mode 100644
index 2345d30c5b..0000000000
--- a/users/ericgebhart/mod_layers/mod_layer.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#pragma once
-
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-// define our rows for the mod layer
-// takes 5 keycodes, adds mods, and left and right edge keys.
-// So we get keycodes in groups of 6.
-//
-// #define LANG_IS BEPO // to get Bepo substititions for keys and LTs.
-// #define NO_EDGE_COL  // for 5 column keyboards with no sixth column.
-//
-// wrap layers that have alternates for other locales with LANG_N
-// this will change the name, from _SYMB to _SYMB_BP as needed.
-//
-// Home Row mods and other things like that go here.
-
-#include "keycodes.h"
-#include "alt_mods.h"
-#include "hrm_sacg.h"
-#include "hrm_gacs.h"
-#include "hrm_gacs_miryoku.h"
-#include "hrm_gasc.h"
-#include "hrs_nav.h"
-#include "trns_mods.h"
-
-// redefined by the map as needed.
-//#base_cols_in_out 5_6 // 5, 5_6, 6
-// MOD_ROW
-// variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-#define CONCATENATER(a, ...) a ## __VA_ARGS__
-#define CATR(a, ...) CONCATENATER(a, __VA_ARGS__)
-#define CONCATENATER2(a, ...) a ## __VA_ARGS__
-#define CATR2(a, ...) CONCATENATER2(a, __VA_ARGS__)
-#define CONCATENATER3(a, ...) a ## __VA_ARGS__
-#define CATR3(a, ...) CONCATENATER3(a, __VA_ARGS__)
-
-// mod layer name construction. add new layer extensions here.
-// TRNS, ALT, HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
-#define MOD_EXT CATR3(MODS_ARE, _MOD)
-#define TRNS_MOD _trns
-#define HRM_SCAG_MOD _hrm_scag
-#define HRM_GACS_MOD _hrm_gacs
-#define HRM_GASC_MOD _hrm_gasc
-#define MIRYOKU_HRM_GACS_MOD _miryoku_hrm_gacs
-#define ALT_MOD _alt
-#define HRS_NAV_MOD _hrs_nav
-
-// MOD_COL_NAME(ROW0L) -- > ROW0L_5, ROW0L_6, ROW0L_5_6
-#define MOD_COL_NAME(NAME) CATR2(CATR(NAME, _), BASE_COLS_IN_OUT)
-// MOD_ROW(ROW0L) -- > ROW0L_5_alt, ROW0L_6_alt, ROW0L_5_6_alt
-#define MOD_ROW(NAME) CATR3(MOD_COL_NAME(NAME), MOD_EXT)
-
-// change the columns in/out according to the map and the keyboard.
-//#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
-
-
-// These make it easier to create base layer layouts.
-// They take 3x10, or 3x12 and make a 3x12 with mods.
-// this isnt always useful, sometimes rows need to be
-// specified explicitly in the layout. ie. layouts with
-// extra keys in the middle.
-
-
-#define MOD_CORE_3x5(                           \
-                     K01, K02, K03, K04, K05,   \
-                     K06, K07, K08, K09, K0A,   \
-                     K11, K12, K13, K14, K15,   \
-                     K16, K17, K18, K19, K1A,   \
-                     K21, K22, K23, K24, K25,   \
-                     K26, K27, K28, K29, K2A)   \
-  MOD_ROW(ROW1L)(K01, K02, K03, K04, K05),      \
-    MOD_ROW(ROW1R)(K06, K07, K08, K09, K0A),     \
-    MOD_ROW(ROW2L)(K11, K12, K13, K14, K15),     \
-    MOD_ROW(ROW2R)(K16, K17, K18, K19, K1A),     \
-    MOD_ROW(ROW3L)(K21, K22, K23, K24, K25),     \
-    MOD_ROW(ROW3R)(K26, K27, K28, K29, K2A)
-
-
-#define MOD_CORE_3x6(K01, K02, K03, K04, K05, K06,      \
-                     K07, K08, K09, K0A, K0B, K0C,      \
-                     K11, K12, K13, K14, K15, K16,      \
-                     K17, K18, K19, K1A, K1B, K1C,      \
-                     K21, K22, K23, K24, K25, K26,      \
-                     K27, K28, K29, K2A, K2B, K2C)      \
-  MOD_ROW(ROW1L)(K01, K02, K03, K04, K05, K06),         \
-    MOD_ROW(ROW1R)(K07, K08, K09, K0A, K0B, K0C),       \
-    MOD_ROW(ROW2L)(K11, K12, K13, K14, K15, K16),       \
-    MOD_ROW(ROW2R)(K17, K18, K19, K1A, K1B, K1C),       \
-    MOD_ROW(ROW3L)(K21, K22, K23, K24, K25, K26),       \
-    MOD_ROW(ROW3R)(K27, K28, K29, K2A, K2B, K2C)
-
-
-/// 4 rows for keyboards with number rows.
-#define MOD_CORE_4x5(                                   \
-                     K01, K02, K03, K04, K05,           \
-                     K06, K07, K08, K09, K0A,           \
-                     K11, K12, K13, K14, K15,           \
-                     K16, K17, K18, K19, K1A,           \
-                     K21, K22, K23, K24, K25,           \
-                     K26, K27, K28, K29, K2A,           \
-                     K31, K32, K33, K34, K35,           \
-                     K36, K37, K38, K39, K3A)           \
-  MOD_ROW(ROW0L)(K01, K02, K03, K04, K05),                              \
-    MOD_ROW(ROW0R)(K06, K07, K08, K09, K0A),                            \
-    MOD_CORE_3x5(K11, K12, K13, K14, K15,                               \
-                 K16, K17, K18, K19, K1A,                               \
-                 K21, K22, K23, K24, K25,                               \
-                 K26, K27, K28, K29, K2A,                               \
-                 K31, K32, K33, K34, K35,                               \
-                 K36, K37, K38, K39, K3A)
-
-
-
-#define MOD_CORE_4x6(K01, K02, K03, K04, K05, K06,                      \
-                     K07, K08, K09, K0A, K0B, K0C,                      \
-                     K11, K12, K13, K14, K15, K16,                      \
-                     K17, K18, K19, K1A, K1B, K1C,                      \
-                     K21, K22, K23, K24, K25, K26,                      \
-                     K27, K28, K29, K2A, K2B, K2C,                      \
-                     K31, K32, K33, K34, K35, K36,                      \
-                     K37, K38, K39, K3A, K3B, K3C                       \
-                     )                                                  \
-    MOD_ROW(ROW0L)(K01, K02, K03, K04, K05, K06),                       \
-      MOD_ROW(ROW0R)(K07, K08, K09, K0A, K0B, K0C),                     \
-      MOD_CORE_3x6(K11, K12, K13, K14, K15, K16,                        \
-                   K17, K18, K19, K1A, K1B, K1C,                        \
-                   K21, K22, K23, K24, K25, K26,                        \
-                   K27, K28, K29, K2A, K2B, K2C,                        \
-                   K31, K32, K33, K34, K35, K36,                        \
-                   K37, K38, K39, K3A, K3B, K3C)
diff --git a/users/ericgebhart/mod_layers/trns_mods.h b/users/ericgebhart/mod_layers/trns_mods.h
deleted file mode 100644
index 06dfb06edd..0000000000
--- a/users/ericgebhart/mod_layers/trns_mods.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-//
-// non Home row mods, mod layer.
-
-// MOD_ROW variants.
-// input 5 get six, left and right language specific outer edge keys.
-
-// no edge keys.
-// input 5 get 5 with mods applied.
-
-// input 6 get 6 with mods applied.
-
-// base cols in out.  5, 5_6, 6.
-// input column count, output column count, if different.
-
-// L_5  Left                 R_5 Right.
-// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
-// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
-
-// ROW0  - Number row.
-// LEFT.
-#define ROW0L_5_trns(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW0L_5_trns(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW0L_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW0L_6_trns(LEFT_0, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW0R_5_trns(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW0R_6_trns(K01, K02, K03, K04, K05, K06)       \
-  ROW0R_5_trns(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW0R_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW0R_6_trns(K01, K02, K03, K04, K05, RIGHT_0)
-
-
-// ROW1
-// LEFT.
-#define ROW1L_5_trns(K01, K02, K03, K04, K05)    \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW1L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW1L_5_trns(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW1L_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW1L_6_trns(LEFT_1, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW1R_5_trns(K01, K02, K03, K04, K05)                            \
-  K01, K02, K03, K04, K05                                  \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW1R_6_trns(K01, K02, K03, K04, K05, K06)       \
-  ROW1R_5_trns(K01, K02, K03, K04, K05), K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW1R_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW1R_6_trns(K01, K02, K03, K04, K05, RIGHT_1)
-
-
-// HOME ROW - ROW2
-// LEFT.
-#define ROW2L_5_trns(K01, K02, K03, K04, K05)            \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW2L_6_trns(K01, K02, K03, K04, K05, K06)  K01, \
-    ROW2L_5_trns(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW2L_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW2L_6_trns(LEFT_2, K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW2R_5_trns(K01, K02, K03, K04, K05)                            \
-  K01, K02,  K03, K04, K05                      \
-    // take and put an extra column in front. Mod K01 how you want it.
-#define ROW2R_6_trns(K01, K02, K03, K04, K05, K06)       \
-  ROW2R_5_trns(K01, K02, K03, K04, K05),  K06
-
-// 5 into 6, derivitive of the first two.
-#define ROW2R_5_6_trns(K01, K02, K03, K04, K05)          \
-  ROW2R_6_trns(K01, K02, K03, K04, K05, RIGHT_2)
-
-
-// ROW 3
-// LEFT.
-#define ROW3L_5_trns(K01, K02, K03, K04, K05)           \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3L_6_trns(K01, K02, K03, K04, K05, K06)  K01,        \
-    ROW3L_5_trns(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3L_5_6_trns(K01, K02, K03, K04, K05)         \
-  ROW3L_6_trns(LEFT_3,  K01, K02, K03, K04, K05)
-
-// RIGHT.
-#define ROW3R_5_trns(K01, K02, K03, K04, K05)   \
-  K01, K02, K03, K04, K05
-// take and put an extra column in front. Mod K01 how you want it.
-#define ROW3R_6_trns(K01, K02, K03, K04, K05, K06)  K01,        \
-    ROW3R_5_trns(K02, K03, K04, K05, K06)
-
-// 5 into 6, derivitive of the first two.
-#define ROW3R_5_6_trns(K01, K02, K03, K04, K05)         \
-  ROW3R_6_trns(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/oled/oled_cartes.c b/users/ericgebhart/oled/oled_cartes.c
deleted file mode 100644
index 8ab88e969e..0000000000
--- a/users/ericgebhart/oled/oled_cartes.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-#ifdef OLED_CUSTOM_ENABLE
-
-#include "ericgebhart.h"
-
-void oled_render_layer_map(void) {
-  uint8_t lyr = get_highest_layer(layer_state);
-  if (lyr < _LAYERS) {
-    switch (get_highest_layer(default_layer_state)) {
-
-#ifdef QWERTY_LAYER_ENABLE
-      SHOW_MAP(_QWERTY)
-#endif
-
-#ifdef COLEMAK_DH_LAYER_ENABLE
-        SHOW_MAP(_COLEMAK_DH)
-#endif
-
-#ifdef COLEMAK_LAYER_ENABLE
-        SHOW_MAP(_COLEMAK)
-#endif
-#ifdef HALMAK_LAYER_ENABLE
-        SHOW_MAP(_HALMAK)
-#endif
-#ifdef MINIMAK_LAYER_ENABLE
-        SHOW_MAP(_MINIMAK)
-#endif
-#ifdef MINIMAK_8_LAYER_ENABLE
-        SHOW_MAP(_MINIMAK_8)
-#endif
-#ifdef MINIMAK_12_LAYER_ENABLE
-        SHOW_MAP(_MINIMAK_12)
-#endif
-
-#ifdef DVORAK_LAYER_ENABLE
-        SHOW_MAP(_DVORAK)
-#endif
-#ifdef DVORAK_RLC_IU_LAYER_ENABLE
-        SHOW_MAP(_DVORAK_RLC_IU)
-#endif
-#ifdef BOO_LAYER_ENABLE
-        SHOW_MAP(_BOO)
-#endif
-#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
-        SHOW_MAP(_CAPEWELL_DVORAK)
-#endif
-#ifdef AHEI_LAYER_ENABLE
-        SHOW_MAP(_AHEI)
-#endif
-
-#ifdef BEAKL27_LAYER_ENABLE
-        SHOW_MAP(_BEAKL27)
-#endif
-
-#ifdef BEAKL15_LAYER_ENABLE
-        SHOW_MAP(_BEAKL15)
-#endif
-
-#ifdef BEAKL19_LAYER_ENABLE
-        SHOW_MAP(_BEAKL19)
-#endif
-
-#ifdef BEAKLWI_LAYER_ENABLE
-        SHOW_MAP(_BEAKLWI)
-#endif
-
-#ifdef CARPALX_QFMLWY_LAYER_ENABLE
-        SHOW_MAP(_CARPALX_QFMLWY)
-#endif
-
-#ifdef CARPALX_QGMLWB_LAYER_ENABLE
-        SHOW_MAP(_CARPALX_QGMLWB)
-#endif
-
-#ifdef CARPALX_QGMLWY_LAYER_ENABLE
-        SHOW_MAP(_CARPALX_QGMLWY)
-#endif
-
-#ifdef MTGAP_LAYER_ENABLE
-        SHOW_MAP(_MTGAP)
-#endif
-
-#ifdef CTGAP_LAYER_ENABLE
-        SHOW_MAP(_CTGAP)
-#endif
-
-#ifdef APT_LAYER_ENABLE
-        SHOW_MAP(_APT)
-#endif
-
-#ifdef CANARY_LAYER_ENABLE
-        SHOW_MAP(_CANARY)
-#endif
-
-
-#ifdef HD_NEU_LAYER_ENABLE
-        SHOW_MAP(_HD_NEU)
-#endif
-
-#ifdef HD_NEU_NARROW_LAYER_ENABLE
-        SHOW_MAP(_HD_NEU_NARROW)
-#endif
-
-#ifdef HD_TITANIUM_LAYER_ENABLE
-        SHOW_MAP(_HD_TITANIUM)
-#endif
-
-#ifdef HD_GOLD_LAYER_ENABLE
-        SHOW_MAP(_HD_GOLD)
-#endif
-
-#ifdef HD_PLATINUM_LAYER_ENABLE
-        SHOW_MAP(_HD_PLATINUM)
-#endif
-
-#ifdef HD_SILVER_LAYER_ENABLE
-        SHOW_MAP(_HD_SILVER)
-#endif
-
-#ifdef HD_BRONZE_LAYER_ENABLE
-        SHOW_MAP(_HD_BRONZE)
-#endif
-
-#ifdef HD_ELAN_LAYER_ENABLE
-        SHOW_MAP(_HD_ELAN)
-#endif
-
-#ifdef HD_DASH_LAYER_ENABLE
-        SHOW_MAP(_HD_DASH)
-#endif
-
-#ifdef HD_REF_LAYER_ENABLE
-        SHOW_MAP(_HD_REF)
-#endif
-
-#ifdef RSTHD_LAYER_ENABLE
-        SHOW_MAP(_RSTHD)
-#endif
-
-#ifdef HANDS_UP_LAYER_ENABLE
-        SHOW_MAP(_HANDS_UP)
-#endif
-#ifdef WHITE_LAYER_ENABLE
-        SHOW_MAP(_WHITE)
-#endif
-#ifdef ISRT_LAYER_ENABLE
-        SHOW_MAP(_ISRT)
-#endif
-#ifdef SOUL_LAYER_ENABLE
-        SHOW_MAP(_SOUL)
-#endif
-#ifdef NIRO_LAYER_ENABLE
-        SHOW_MAP(_NIRO)
-#endif
-#ifdef ASSET_LAYER_ENABLE
-        SHOW_MAP(_ASSET)
-#endif
-#ifdef WHORF_LAYER_ENABLE
-        SHOW_MAP(_WHORF)
-#endif
-#ifdef WHORF6_LAYER_ENABLE
-        SHOW_MAP(_WHORF6)
-#endif
-
-#ifdef BEPO_LAYER_ENABLE
-        SHOW_MAP(_BEPO)
-#endif
-
-#ifdef OPTIMOT_LAYER_ENABLE
-        SHOW_MAP(_OPTIMOT)
-#endif
-
-#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
-        SHOW_MAP(_OPTIMOT_COMPACT)
-#endif
-
-#ifdef BEAKL19bis_LAYER_ENABLE
-        SHOW_MAP(_BEAKL19bis)
-#endif
-
-        }
-
-  } else {
-
-    switch (lyr) {
-#ifdef TOPROWS_LAYER_ENABLE
-      LCASE(_TOPROWS)
-#  ifdef TOPROWS_BKL_NUMS
-#    ifdef TOPROWS_MOD
-        CARTE_TOPROWS_MOD
-#    else
-#      ifdef TOPROWS_BKL_19_NUMS
-        CARTE_TOPROWS_BKL19
-#      else
-        CARTE_TOPROWS
-#      endif
-#    endif
-#  else // not beakl nums.
-        CARTE_RAISE
-#  endif
-        break;
-#endif
-
-
-    case _NAV:
-#ifdef NAV_FULL_LOCK_MODS
-      CARTE_NAVA
-#endif
-#ifdef NAV_FULL
-        CARTE_NAV
-#endif
-#ifdef NAV_NO_MOUSE
-        CARTE_NAVnm
-#endif
-#ifdef NAV_MIRYOKU
-        CARTE_NAV_miryoku
-#endif
-    break;
-
-#ifdef MOUSE_LAYER_ENABLE
-    case _NAVm:
-#  ifdef NAV_MOUSE_MIRYOKU
-        CARTE_NAVm_miryoku
-#  else
-      CARTE_NAVm
-#  endif
-      break;
-#endif
-
-#ifdef MEDIA_LAYER_ENABLE
-          SHOW_MAP_S(_MEDIA)
-#endif
-          SHOW_MAP_S(_LAYERS)
-
-#ifdef SYMBOL_LAYER_ENABLE
-            LCASE(_SYMB)
-#  ifdef SYMBOL_BEAKL
-            CARTE_SYMB_BEAKL
-#  endif
-#  ifdef SYMBOL_BEAKL_EXT
-            CARTE_SYMB_BEAKLA
-#  endif
-#  ifdef SYMBOL_BEAKL_EXT_VI
-            CARTE_SYMB_BEAKLB
-#  endif
-#  ifdef SYMBOL_BEAKL_C
-            CARTE_SYMB_BEAKLC
-#  endif
-#  ifdef SYMBOL_MIRYOKU
-            CARTE_SYMB_MIRYOKU
-#  endif
-#  ifdef SYMBOL_BEAKL_WI
-            CARTE_SYMB_BEAKL_WI
-#  endif
-#  ifdef SYMBOL_BEAKL_WI
-            CARTE_SYMB_NEO
-#  endif
-            break;
-#endif
-
-#ifdef KEYAD_LAYER_ENABLE
-          LCASE(_KEYPAD)
-#ifdef KEYPAD_BEAKL
-#ifdef KEYPAD_BEAKL_WI
-      CARTE_KP_BKL_WI
-#endif
-#ifdef KEYPAD_MODS
-        CARTE_KP_BKL_MODS
-#endif
-#if !defined(KEYPAD_MODS) && !defined(KEYPAD_BEAKL_WI)
-        CARTE_KP_BKL_FUNC
-#endif
-#ifdef KEYPAD_MIRYOKU
-        CARTE_KP_MIRYOKU
-#endif
-
-#else // not beakl.
-#ifdef KEYPAD_RIGHT
-#ifdef KEYPAD_MODS
-        CARTE_MODS_KP
-#else
-        CARTE_FP_KP
-#endif
-
-#else // not keypad right.
-#ifdef KEYPAD_MODS
-        CARTE_KP_MODS
-#else
-        CARTE_KP_FP  // the final default.
-#endif
-#endif // end not keypad right.
-#endif // end not beakl
-        break;
-#endif // end keypad.
-
-#ifdef MORTE_LAYER_ENABLE
-         SHOW_MAP(_MORTE)
-#endif
-
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-         SHOW_MAP(_ACCENTS_MORTE)
-#endif
-
-#ifdef ACCENTS_LAYER_ENABLE
-         SHOW_MAP(_CARTE_ACCENTS)
-#endif
-          }
-  }
-}
-#endif
diff --git a/users/ericgebhart/oled/oled_layers.c b/users/ericgebhart/oled/oled_layers.c
deleted file mode 100644
index 57424d1d6c..0000000000
--- a/users/ericgebhart/oled/oled_layers.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-#include <stdio.h>
-
-#ifdef OLED_CUSTOM_ENABLE
-
-void oled_render_default_layer_state(void) {
-  //oled_write_P(PSTR("Layout: "), false);
-  uint16_t layer = get_highest_layer(default_layer_state);
-  char layer_str[8];
-  snprintf(layer_str, sizeof(layer_str), "%u ",layer);
-  oled_write(layer_str , false);
-  switch (layer) {
-#ifdef DVORAK_LAYER_ENABLE
-    WRITE_STR_LAYER(_DVORAK, "Dvorak")
-#endif
-#ifdef DVORAK_RLC_IU_LAYER_ENABLE
-      WRITE_STR_LAYER(_DVORAK_RLC_IU_, "Dvorak-rlc")
-#endif
-#ifdef BOO_LAYER_ENABLE
-      WRITE_STR_LAYER(_BOO, "Boo")
-#endif
-#ifdef CAPEWELL_DVORAK_LAYER_ENABLE
-      WRITE_STR_LAYER(_CAPEWELL_DVORAK, "Capewell Dvorak")
-#endif
-#ifdef AHEI_LAYER_ENABLE
-      WRITE_STR_LAYER(_AHEI, "Ahei")
-#endif
-
-#ifdef QWERTY_LAYER_ENABLE
-      WRITE_STR_LAYER(_QWERTY, "Qwerty")
-#endif
-#ifdef WORKMAN_LAYER_ENABLE
-      WRITE_STR_LAYER(_WORKMAN, "Workman")
-#endif
-#ifdef NORMAN_LAYER_ENABLE
-      WRITE_STR_LAYER(_NORMAN, "Norman")
-#endif
-
-#ifdef COLEMAK_LAYER_ENABLE
-      WRITE_STR_LAYER(_COLEMAK, "Colemak")
-#endif
-#ifdef COLEMAK_DH_LAYER_ENABLE
-      WRITE_STR_LAYER(_COLEMAK_DH, "Colemak")
-#endif
-#ifdef HALMAK_LAYER_ENABLE
-      WRITE_STR_LAYER(_HALMAK, "Halmak")
-#endif
-#ifdef MINIMAK_LAYER_ENABLE
-      WRITE_STR_LAYER(_MINIMAK, "Minimak")
-#endif
-#ifdef MINIMAK_8_LAYER_ENABLE
-      WRITE_STR_LAYER(_MINIMAK_8, "Minimak 8")
-#endif
-#ifdef MINIMAK_12_LAYER_ENABLE
-      WRITE_STR_LAYER(_MINIMAK_12, "Minimak 12")
-#endif
-
-#ifdef BEAKL15_LAYER_ENABLE
-      WRITE_STR_LAYER(_BEAKL15, "Beakl")
-#endif
-#ifdef BEAKL19_LAYER_ENABLE
-      WRITE_STR_LAYER(_BEAKL19, "Beakl19")
-#endif
-#ifdef BEAKL27_LAYER_ENABLE
-      WRITE_STR_LAYER(_BEAKL27, "Beakl27")
-#endif
-#ifdef BEAKLWI_LAYER_ENABLE
-      WRITE_STR_LAYER(_BEAKLWI, "BeaklWi")
-#endif
-
-#ifdef CARPALX_QFMLWY_LAYER_ENABLE
-      WRITE_STR_LAYER(_CARPALX_QFMLWY, "Carpalx qfmlwy")
-#endif
-
-#ifdef CARPALX_QGMLWB_LAYER_ENABLE
-      WRITE_STR_LAYER(_CARPALX_QGMLWB, "Carpalx qgmlwb")
-#endif
-
-#ifdef CARPALX_QGMLWY_LAYER_ENABLE
-      WRITE_STR_LAYER(_CARPALX_QGMLWY, "Carpalx qgmlwy")
-#endif
-
-#ifdef HD_NEU_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_NEU, "HD Neu")
-#endif
-#ifdef HD_NEU_NARROW_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_NEU_NARROW, "HD Neu N")
-#endif
-#ifdef HD_TITANIUM_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_TITANIUM, "HD Titanium")
-#endif
-#ifdef HD_GOLD_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_GOLD, "HD Gold")
-#endif
-#ifdef HD_SILVER_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_SILVER, "HD Silver")
-#endif
-#ifdef HD_PLATINUM_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_PLATINUM, "HD Platinum")
-#endif
-#ifdef HD_BRONZE_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_BRONZE, "HD Bronze")
-#endif
-#ifdef HD_ELAN_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_ELAN, "HD Elan")
-#endif
-#ifdef HD_DASH_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_DASH, "HD Dash")
-#endif
-#ifdef HD_REF_LAYER_ENABLE
-      WRITE_STR_LAYER(_HD_REF, "HD Ref")
-#endif
-
-#ifdef MTGAP_LAYER_ENABLE
-      WRITE_STR_LAYER(_MTGAP, "Mtgap")
-#endif
-#ifdef CTGAP_LAYER_ENABLE
-      WRITE_STR_LAYER(_CTGAP, "Ctgap")
-#endif
-#ifdef APT_LAYER_ENABLE
-      WRITE_STR_LAYER(_APT, "Apt")
-#endif
-#ifdef CANARY_LAYER_ENABLE
-      WRITE_STR_LAYER(_CANARY, "Canary")
-#endif
-
-#ifdef MALTRON_LAYER_ENABLE
-      WRITE_STR_LAYER(_MALTRON, "Maltron")
-#endif
-#ifdef EUCALYN_LAYER_ENABLE
-      WRITE_STR_LAYER(_EUCALYN, "Eucalyn")
-#endif
-#ifdef RSTHD_LAYER_ENABLE
-      WRITE_STR_LAYER(_RSTHD, "Rsthd")
-#endif
-#ifdef HAND_UP_LAYER_ENABLE
-      WRITE_STR_LAYER(_HANDS_UP, "Hands up")
-#endif
-#ifdef WHITE_LAYER_ENABLE
-      WRITE_STR_LAYER(_WHITE, "White")
-#endif
-#ifdef ISRT_LAYER_ENABLE
-      WRITE_STR_LAYER(_ISRT, "Isrt")
-#endif
-#ifdef SOUL_LAYER_ENABLE
-      WRITE_STR_LAYER(_SOUL, "Soul")
-#endif
-#ifdef NIRO_LAYER_ENABLE
-      WRITE_STR_LAYER(_NIRO, "Niro")
-#endif
-#ifdef ASSET_LAYER_ENABLE
-      WRITE_STR_LAYER(_ASSET, "Asset")
-#endif
-#ifdef WHORF_LAYER_ENABLE
-      WRITE_STR_LAYER(_WHORF, "Whorf")
-#endif
-#ifdef WHORF6_LAYER_ENABLE
-      WRITE_STR_LAYER(_WHORF6, "Whorf 6")
-#endif
-
-#ifdef OPTIMOT_LAYER_ENABLE
-      WRITE_STR_LAYER(_OPTIMOT, "Optimot")
-#endif
-#ifdef OPTIMOT_COMPACT_LAYER_ENABLE
-      WRITE_STR_LAYER(_OPTIMOT_COMPACT, "Optimot")
-#endif
-#ifdef BEAKL19bis_LAYER_ENABLE
-      WRITE_STR_LAYER(_BEAKL19bis, "Beakl19bis")
-#endif
-#ifdef BEPO_LAYER_ENABLE  // Bepo only works on bepo.
-      WRITE_STR_LAYER(_BEPO, "Bepo")
-#endif
-      }
-}
-
-void oled_render_layer_state(void) {
-  uint16_t layer = get_highest_layer(layer_state);
-  char layer_str[8];
-  snprintf(layer_str, sizeof(layer_str), "%u ",layer);
-  oled_write_P(PSTR(""), false);
-  if (layer > 0)
-    oled_write(layer_str , false);
-
-  switch (layer) {
-    // language variant layers.
-#ifdef TOPROWS_LAYER_ENABLE
-    WRITE_STR_LAYER(_TOPROWS, "TopRows");
-#endif
-
-#ifdef SYMBOL_LAYER_ENABLE
-    WRITE_STR_LAYER(_SYMB, "Symbols");
-#endif
-
-#ifdef KEYPAD_LAYER_ENABLE
-    WRITE_STR_LAYER(_KEYPAD, "Keypad");
-#endif
-
-    // single case, BP or no suffix.
-#ifdef ACCENTS_MORTE_LAYER_ENABLE
-    WRITE_STR_LAYER(_ACCENTS_MORTE, "Accents Morte");
-#endif
-#ifdef ACCENTS_LAYER_ENABLE
-    WRITE_STR_LAYER(_ACCENTS, "Accents");
-#endif
-#ifdef MORTE_LAYER_ENABLE
-    WRITE_STR_LAYER(_MORTE, "Morte");
-#endif
-
-
-    // language agnostic layers.
-#ifdef NAV_LAYER_ENABLE
-    WRITE_STR_CASE(_NAV, "Navigation");
-    WRITE_STR_CASE(_NAVm, "Mouse");
-#endif
-#ifdef MEDIA_LAYER_ENABLE
-    WRITE_STR_CASE(_MEDIA, "Media");
-#endif
-#ifdef FUNC_LAYER_ENABLE
-    WRITE_STR_CASE(_FUN, "Func");
-#endif
-
-    WRITE_STR_CASE(_LAYERS, "Layers");
-
-#ifdef RGB_LAYER_ENABLE
-    WRITE_STR_CASE(_RGB, "RGB");
-#endif
-#ifdef ADJUST_LAYER_ENABLE
-    WRITE_STR_CASE(_ADJUST, "Adjust");
-#endif
-#ifdef COMBO_REF_LAYER_ENABLE
-    WRITE_STR_CASE(_COMBO_REF, "COMBO Ref");
-#endif
-
-  }
-}
-#endif
diff --git a/users/ericgebhart/oled/oled_stuff.c b/users/ericgebhart/oled/oled_stuff.c
deleted file mode 100755
index 211fe4ab3e..0000000000
--- a/users/ericgebhart/oled/oled_stuff.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-#include <string.h>
-#include <stdio.h>
-
-#ifdef OLED_CUSTOM_ENABLE
-
-extern uint32_t current_locale;
-
-void oled_render_locale(void) {
-  // oled_write_P(PSTR("Layout: "), false);
-  switch (current_locale) {
-    WRITE_STR_CASE(LOCALE_DEFAULT, DEFAULT_LANG_NAME)
-#ifdef SECOND_LOCALE
-      WRITE_STR_CASE(LOCALE_TWO, SECOND_LOCALE_NAME)
-#endif
-    }
-}
-
-void oled_render_keylock_status(led_t led_state) {
-  oled_write_P(PSTR(" Lock:"), false);
-  oled_write_P(PSTR("N"), led_state.num_lock);
-  oled_write_P(PSTR("C"), led_state.caps_lock);
-  oled_write_P(PSTR("S"), led_state.scroll_lock);
-}
-
-void oled_render_mod_status(uint8_t modifiers) {
-  oled_write_P(PSTR("Mods:"), false);
-  oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-  oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-  oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
-  oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
-}
-
-void oled_render_mod_lock_status(void){
-  oled_render_mod_status(get_mods() | get_oneshot_mods());
-  oled_render_keylock_status(host_keyboard_led_state());
-}
-
-
-#ifdef KEYLOGGER_ENABLE
-char mkeylog_str[22] = {};
-
-const char mcode_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 oled_render_keylog(void) {
-  oled_write_ln(mkeylog_str, false);
-}
-
-
-void add_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-      (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-    keycode = keycode & 0xFF;
-  }
-  if (keycode < 60) {
-    name = mcode_to_name[keycode];
-  }
-
-  // update keylog
-  memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1);
-  snprintf(mkeylog_str, sizeof(mkeylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-#endif
-
-__attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-
-  // for the big screen.
-#ifdef OLED_DISPLAY_128X64
-  return OLED_ROTATION_180;
-#endif
-  // rotate the slave side of the corne to be bottom side in.
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;
-  }
-
-  return oled_init_keymap(rotation);
-}
-
-/* oled_rotation_t oled_init_user(oled_rotation_t rotation) { */
-/* memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1); */
-/*   if (is_keyboard_master()) { */
-/*     return OLED_ROTATION_270; */
-/*   } else { */
-/*     return OLED_ROTATION_180; */
-/*   } */
-/* } */
-
-
-void render_bootmagic_status(bool status) {
-  /* Show Ctrl-Gui Swap options */
-  static const char PROGMEM logo[][2][3] = {
-    {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-    {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-  };
-  if (status) {
-    oled_write_ln_P(logo[0][0], false);
-    oled_write_ln_P(logo[0][1], false);
-  } else {
-    oled_write_ln_P(logo[1][0], false);
-    oled_write_ln_P(logo[1][1], false);
-  }
-}
-
-
-__attribute__((weak)) void oled_render_logo(void) {
-  // clang-format off
-  static const char PROGMEM qmk_logo[] = {
-    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};
-  // clang-format on
-  oled_write_P(qmk_logo, false);
-}
-
-
-bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
-#ifdef KEYLOGGER_ENABLE
-  if (record->event.pressed) {
-    //oled_timer = timer_read32();
-    add_keylog(keycode, record);
-    //add_keylog(keycode);
-  }
-#endif
-  return true;
-}
-
-bool oled_task_user(void) {
-  //oled_clear();
-  if (is_keyboard_master()) {
-    oled_render_mod_lock_status();
-    oled_advance_page(false);
-    oled_render_default_layer_state();
-    oled_render_locale();
-    oled_write_ln_P(PSTR(" "), false);
-    oled_render_layer_state();
-    oled_write_ln_P(PSTR(" "), false);
-#ifdef OLED_DISPLAY_128X64
-    oled_render_layer_map();
-#endif
-#ifdef KEYLOGGER_ENABLE
-    oled_render_keylog();
-#endif
-
-  // slave side display.
-  } else {
-    oled_clear();
-#ifdef OLED_LOGO_ENABLE
-    oled_render_logo();
-#endif
-    oled_render_default_layer_state();
-    oled_render_locale();
-    oled_write_ln_P(PSTR(" "), false);
-#ifdef SPLIT_LAYER_STATE_ENABLE
-    oled_render_layer_state();
-    oled_render_layer_map();
-#endif
-  }
-  return(false);
-
-}
-#endif
diff --git a/users/ericgebhart/oled/oled_stuff.h b/users/ericgebhart/oled/oled_stuff.h
deleted file mode 100755
index 7824ec7d84..0000000000
--- a/users/ericgebhart/oled/oled_stuff.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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/>.
-*/
-
-#ifdef OLED_CUSTOM_ENABLE
-
-#include "quantum.h"
-//#include "oled_driver.h"
-
-void oled_render_mod_lock_status(void);
-void oled_driver_render_logo(void);
-bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
-void oled_render_layer_map(void);
-void oled_render_default_layer_state(void);
-void oled_render_layer_state(void);
-
-#define WRITE_STR_CASE(CASE, STRING)            \
-  case CASE:                                    \
-  oled_write_P(PSTR(STRING), false);            \
-  break;                                        \
-
-// kinda hacky for the moment.
-// assume bepo is enabled.
-#define WRITE_STR_LAYER(CASE, STRING)           \
-  LCASE(CASE)                                   \
-    oled_write_P(PSTR(STRING), false);          \
-  break;
-
-// make maps for the oled. code doc.
-#define carte_de_map(ROW1, ROW2, ROW3)          \
-  oled_write_ln_P(PSTR(ROW1), false);           \
-  oled_write_ln_P(PSTR(ROW2), false);           \
-  oled_write_ln_P(PSTR(ROW3), false);
-
-// generate Case for all locales for this map.
-#define SHOW_MAP(LAYER)                         \
-  LCASE(LAYER)                                  \
-    CAT(CARTE, LAYER)                           \
-    break;
-
-// a single case, for single locale layers.
-#define SHOW_MAP_S(LAYER)                       \
-  case LAYER:                                   \
-  CAT(CARTE, LAYER)                             \
-  break;
-
-#endif
diff --git a/users/ericgebhart/process_records.c b/users/ericgebhart/process_records.c
deleted file mode 100755
index bb4bc2563b..0000000000
--- a/users/ericgebhart/process_records.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@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 "ericgebhart.h"
-#include "extensions.h"
-
-__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
-
-__attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
-
-// Defines actions for my global custom keycodes. Defined in ericgebhart.h file
-// Then runs the _keymap's record handier if not processed here
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-#ifdef OLED_CUSTOM_ENABLE
-  process_record_user_oled(keycode, record);
-#endif
-
-  PROCESS_EXTENSIONS
-
-  if (process_record_keymap(keycode, record) && process_record_secrets(keycode, record)) {
-    switch (keycode) {
-
-    case KC_RESET:
-      if (!record->event.pressed) {
-        reset_keyboard();
-      }
-      return false;
-      break;
-
-    case KC_SPACETEST:  // test something.
-      // default_layer_set(1UL << _BEAKL);
-      // tap_code16(LSFT(KC_SPACE));
-      break;
-    }
-  }
-  return true;
-}
diff --git a/users/ericgebhart/readme.md b/users/ericgebhart/readme.md
deleted file mode 100755
index 446a1411b4..0000000000
--- a/users/ericgebhart/readme.md
+++ /dev/null
@@ -1,1584 +0,0 @@
-Overview
-========
-
-This is as much a keymap framework as it is a keymap. It can take many
-shapes with just a few configuration choices. Base layers, Mods, thumb clusters, 
-edge_keys, all can be changed with just a configuration option.
-There are over 50 base layouts to choose from, as well as multiple 
-choices of navigation, mouse, media, 
-symbols, and keypads. Home row mods come in a few flavors or none,
-in a mod layer which is easily understandable and can be turned on
-or off, or switched. There are Miryoku options for everything if
-that is your thing.
-
-If there is a oled of 64x128 the maps of each layer will be displayed, which
-helps a lot in remembering and learning.
-
-This is an easily configurable keymap for keymap exploration. It is for
-primarily for minimalist, ortho split keyboards but does support some rectangles.
-It´s first keyboard was an Ergodox-ez many years ago. My daily driver
-is now a Kyria or a Corne, but I still use an original dactyl, rebound 
-and ergodox-ez regularly although most of the love goes to the Kyria and Corne.
-
-The framework is Language
-agnostic, it supports having layers for different locales which can be
-cycled through.
-There are multiple mods layers to choose or
-not, home row mods or not, a variety of thumb layouts, mouse/no mouse,
-smart lock layers and mods, N-Shot mods like callum's, swapper. Combos,
-tap_hold, accented keys, alternate shifted keys, automatic custom
-keys, key overrides. Minimal or no C-code required for most things. 
-Language, mods, layouts and extensions are encapsulated, so that they 
-do not interact in the configuration which makes it much easier to modify 
-and grow. Mods and combos are by key location rather than specific key codes.
-
-Quick start
--------------
-
-Everything is encapsulated here. Base layers, functional layers, mods,
-or no mods, even the language. This means that anything can change 
-independently and easily.
-
-If you don't mind dvorak, beakl or hands down, you can probably 
-just use what is configured. Or just change it to a base layer
-of your choice. The fastest way to get started is to just change
-the base layers to the ones you want, compile and flash. 
-
-Edit _config.h_,
-  * Set the lang_is, probably to EN.
-    * US international and BEPO are also supported out of the box.
-  * Uncomment the base layers you wish to have.
-    * comment the ones you don't.
-    * keep the number below 5 if you enable a second locale.
-  * Set the thumb clusters
-  * Choose a mod layer
-  * Choose an edge key set if you need one.
-  * Choose the layer flavors that you want.
-  * For Miryoku, copy the `miryoku_hd_gold_config.h` over `config.h`
-    It is a complete config with miryoku choices. Choose the base
-    layers you wish if Hands Down Gold and Qwerty is not your thing.
-  
-  ** do not turn off extensions until you know them **
-  It will likely cause a stream of errors for the keycodes that
-  go missing when something is turned off. There are known
-  interactions between combos, smart locks, not_dead, and alt local keys.
-  Turning encoders or oled on and off certainly won´t break
-  anything.
-  
-  There are other interactions between your choices.
-  Edge keys, thumbs, combos, other extensions, 
-  may use the extensions that are enabled.
-  
-### Look here to see the parts
-  * Everything can be turned on and off in *config.h*
-  * Base layers are in *base_layers/*
-  * Edge keys are in *layers/edge_keys.h*
-  * Thumbs can be reviewed in *layers/thumbs.h*
-  * Mods are in *mod_layers/*
-  * All other layers are also in *layers/*
-
-
-The long version
------------------
-
-All can be turned on or off in the config. 
-supports en-us and fr-bepo Support for other languages is easily added.
-
-Layouts are human readable, all extensions are defined with def files.
-If an 128x64 oled is available, a map of the current layer is shown if enabled.
-
-I'm an Xmonad, emacs in vi emulation programmer, that 
-just means that _Gui, Esc, :/?!% and ._ are all easy access and I like my
-arrow and mouse keys in a 4 column row.
-
-I have also become minimalist in my keyboard choices. I don't use
-number rows, not even on my kinesis, dactyl, or ergodox_ez, which have them. 
-Although my maps do reasonably support these bigger keyboards as that is where
-it all started for me and I do still use them. My preference for keyboards 
-is more in line with the Kyria and Corne. I still use 6 columns, but have been
-looking to use only 5.
-
-Note: Combos at QMK master do not currently support multiple reference layers which this
-configuration uses. Combos still work as always, but do not support all the features
-found here. To get fully functioning multi-reference combos, see my *ericgebhart_dev*
-branch and pull request below.
-
-Actually, at the moment, the fix is in my ericgebhart branch, since I accidently
-pushed it.  I'll remedy that soon.
-
-A more current version of my QMK user can be found here in
-A sparse tree [of my QMK User Space ](https://github.com/EricGebhart/MyQMK/users/ericgebhart)
-
-For full multi-lingual combo functionality you will need my [pull request for fully functioning multi-reference combos which can found here.](https://github.com/qmk/qmk_firmware/pull/16699)
-
-Things which effect the thinking.
-  * No mouse. 
-  * Preference for 3x10 layouts. Corne, Kyria, etc.
-  * Still works with bigger keyboards like xd75, kinesis, dactyl, ergodox, viterbi.
-  * Change mods without changing any maps.
-  * No number row preference. - all layouts have them if needed.
-  * Xmonad window manager, GUI key is the entrance to the Xmonad world.
-  * Typing in other languages.
-  * Curious about keyboard layouts and experimenting.
-  * Must be easy to maintain, extend and modify.
-  * Minimize digging in code to add new things, or change old ones.
-  * Minimize process record user.
-  * Easy to add enums for keys and layers, as well as oled display.
-  * Easy to support multiple languages regardless of maps.
-  * Minimize the need to write C code.
-  * Encapsulate C code, so that it is extensible through data.
-
-
-Features:
-  * Everything is configurable from config.h and .def files.
-  * Def files for most things.
-  * Custom key codes are mostly defined automatically.
-  * Everything is chosen or turned on and off in config.h
-  * Lots of macros to make it easy to redefine things without a refactor.
-  * Multiple edge/outer pinky column sets.
-  * Multiple thumb clusters to choose from.
-  * Thumb clusters and mods can be changed on a map by map basis.
-  * Easily define thumb clusters with an alpha letter.
-  * Easily define thumb clusters for non-base layer.
-  * Multiple base layers to choose from.
-  * Several variations of function layers to choose from
-  * Miryoku layers, thumbs and mods if desired
-  * Miryoku hands down gold config can be swapped with config.h
-  * Navigation and mouse layers
-  * A selection of symbol, keypads, and other layers.
-  * Regular and Beakl keypad and number rows
-  * Multi language support, (locales in the code).
-  * Multiple mod layers to choose from. Easy to add more.
-    * home row mods - a selection 
-    * no mods
-    * alt mods 
-    * miryoku mods
-  * Extensions are easily defined in def files.
-    * N-shot mods
-    * One-shot mods
-    * swapper
-    * Smart lock mods 
-    * Smart lock layers.
-    * Accent keys
-    * Alternate shift keys
-    * Alternate local keys
-    * key overrides
-    * Tap hold
-    * Not dead keys
-    * Send unicode
-    * Send string
-    * Encoders
-  * Display a map of the current layer on the oled.
-  * Adding a new layer is painless.
-  * Adding or changing most things, is not difficult.
-  * Console key logging for [heatmap analysis.](https://precondition.github.io/qmk-heatmap)
-  
-  
-Layout shape and keyboard choices.
--------------------------------------
-
-   In all cases these keyboards are defined in a matrix which is
-   a set of rows. Maybe like so, or less. Kinesis has one more row.
-                                                       
-``` 
-   -------------------------|------------------------ */
-   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 |
-   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 |
-   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 |
-   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 |
-   | Row5L                  |                    Row5R |
-   |               ThumbsL  | ThumbsR                  |
-   -------------------------|------------------------ 
-```
-
-Generally speaking, the keys on the right and left and middle don't change.
-Neither do the bottom row or the thumbs, unless asked. Frequently the numbers 
-row is identical across layers. 
-
-For automatic edge columns set EDGE_COLS. 
-Outside pinky keys are 'yes'.  This is on by default.
-N rows by 6 columns per side.
-Should be undef/def'd by the keyboard's keymap if no.
-#define EDGE_COLS yes. this is all taken care of for supported keyboards.
-
-Thumbs and Edge keys are grouped into sets so that different sets can be chosen in
-the config. 
-
-All layer macros take 3x10 or 3x12 as needed. Edge columns are
-added as needed, and middle keys fill up the gap.
-Thumb keys are added as asked.
-
-keyboard shapes: 
-Matrix size + 5th row + thumbs.
-Matrix size + thumbs.
-
- * kinesis
-   4x6 + 4 + 6 - 18 func keys.
- * dactyl - Morpho handwire
-   4x6 + 5 + 6
- * ergodox_ez
-   4x6 + 5 + 6 & 3 pairs of center keys.
- * crkbd - corne
-   3x6 + 3 or 3x5 + 3
- * xiudi/xd75
-   5x15
- * keebio/viterbi
-   5x14
- * montsinger/rebound/rev4
-   4x12 + 3 center keys.
- * -- 4x12
- * splitkb/kyria
-   3x6 + 7 or 3x5 + 7
- 
-The parts of a keymap
----------------------
-
-  * keymap
-    * defined in _keymap/keymap.c_. 
-    * Completely configurable from config.h
-    * Separated into logical chunks.
-    * Uses a language setting to create all maps.
-    * Creates the same maps in multiple languages.
-    * More than one language simultaneously on one keyboard.
-    * Currently provides these languag settings and keycodes. 
-      * US - US-intl (US_)
-      * EN - US-en (KC_), 
-      * BEPO - fr-bepo (BP_).
-    * Choosing dvorak, and enabling bepo as the second locale, 
-    will produce two base layers to choose from on the keyboard. 
-    Dvorak on US and BEPO.
-   
- * Base layers
-   * Simple and compact definitions.
-   * Base layers are pure.
-   * Mods are defined separately.
-   * OLED Maps for 128x64 sized oleds.
-   * Language agnostic.
-   * Core layer chunks are 3x10.
-     * Except for few exceptions which are 3x12
-   * More than 50 base layers to choose from.
-   
-   **Caution: Choosing too many base layers will result in toprows or keypad layer LT's 
-   to stop working. If bepo is enabled, all base layers are doubled so it's
-   easy to hit the 16 layer limit for LT.**
-
- * Locales
-    * Locales, defines a set of layers for a locale.
-    * Layer definitions are language agnostic. - see lang.h.
-
- * Extensions - Defs.
-    * Can be selected in config.h
-    * Defined in easy to read .def files.
-    * Correspondance between *extensions/* and *defs/*
-
-    * accented_keys.def - direct access to altgr keys
-    * altlocal_keys.def - alternate un/shifted pairs.
-    * alt_shift.def - alternate shifting behaviors for existing keycodes.
-    * not_dead.def - definitions for non-dead dead keys.
-    * caps_word - no def file.
-    * combos.def - 
-    * custom_keys.def  - list of custom keys.
-    * encoders.def - encoder behaviors by mod/layer.
-    * key_overrides.def - Bigger more complex alt keys.
-    * mod_lock.def - smart locking mods with a set of ignore keys.
-    * nshot.def - N-shot locking mods
-    * oneshot.def - One-shot locking mods
-    * smart_lock.def - Smart lock layers and mods.
-    * swapper.def - key substitution, reverser.
-      * eg. toggle between tab, backtab on a key, with a reverse key.
-    * tap_hold.def - Define key for tap and hold for tapping term for qqc autre.
-    * unicode.def - keycodes to send unicode strings.
-    * send_string.def - keycodes to send strings.
-
-
- * Layers 
-    * Multiple selections of the Transient layers.
-    * Layer chunks are 3x10, with some options.
-    * Full Navigation layer - stable and well used.
-    * Mouse keys or without.
-    * 1 or 2 layer nav, 2nd for mouse. or all on one. - choices.
-    * Multiple choices of an easy to use _top rows_ layer similar 
-      to `raise` and `lower`. 
-    * A fully complete symbol layer, Used for coding and writing.
-    * Accented letters and dead key layers.
-    * Keypads and function pads.
-    * Beakl keypads and symbol layers.
-    * Control layers.
-        * Layers
-        * Adjust
-        * RGB
-   
- * OLED A simple, configurable implementation.
-   * Current base layer
-   * Current locale
-   * Current transient layer
-   * Last key, matrix location and value.
-   * Mods and locks
-   * Map of the current layer. (Oled 128x64)
-   * key logger
-
- * Keyboards
-    * nothing is needed in keymaps/*/keymap.c
-    * Layouts - keyboard matrix adaptation.
-        * Adaptive. Usually taking 3x10 maps and filling the edges and thumbs.
-        * 4x10 or whatever is possible. 
-        * 3 versions, thinking in a split kb, way.
-            * 5 columns in, 5 out. 
-            * 5 columns in, 6 out. 
-            * 6 columns in, 6 out. 
-   * per keyboard shape.
-   * There are layouts per keyboard.
-     * Base layout with mods and thumbs and edges added.
-     * Transient layout which can be KC_TRANS, in those same places.
-   * The number row addition can be turned on and off as needed by the layout.
-   * Layouts can hard code the number row, negating the need for giving one.
-     
- * Multiple edge key sets
- 
- * Multiple Thumb clusters - see config or thumbs.h for up to date choices.
-   * Support for multiple definitions. 
-     * mods
-     * layers
-     * mods_layers
-     * mods_layers_nav
-     * beakl wi
-     * beakl wi - official.
-     * test  - to play with.
-     * trans - transparent, could be used in the transient layout to allow alternates.
-     * miryoku with keypad
-     * miryoku with toprows
-     * mods_layers with left thumb letter
-     * hands down approximation with left thumb letter
-     * miryoku with keypad, letter on left, space on right. - no tab.
-     * miryoku with toprows, letter on left, space on right. - no tab.
-     
- * Mod Layers
-   * Completely independent of any layer or base layer definition.
-   * Easy to create a new one by copying the transparent version.
-   * Can be changed on a layer per layer basis.
-   * Based on position in the matrix.
-   * Chosen in config.
-   * Multiple choices.
-     * Home Row Mods. sacg, gacs, gasc
-       Left and right mods on left and right.
-     * Transparent - the default if not chosen.
-     * Alt - Non home row mod variant.
-     * miryoku HRMS is sacg plus right alt/altgr on third row.
-
- * Alternate language/locale support
-   * Happens at the lowest level
-   * All maps work with any of the [keymap extras.](https://docs.qmk.fm/#/reference_keymap_extras)
-   * Language support is simple to add with just a new, very simple macro.
-   
-The language keycodes can be found 
-[here.](https://github.com/qmk/qmk_firmware/tree/master/quantum/keymap_extras)
-
-
-Architecture
------------------
-The idea here is that most things don't change, and the things that do are
-easy to understand and change. The defs directory is where all the extras are,
-tap_hold, alternate shift keys, combos, keycodes, smart lock, one shot mods,etc.
-
-If layers exist that you want and like, then all other behaviors are defined in
-def files which are much nicer than working directly with C code. If there is
-need there is always the copy pasta way too.
-
-Things that are likely to be changed when adapting a layout to personal preferences
-are *layers/thumbs.h* and *mod_layers/*.  The function layers are all in the
-layers folder and should be easy to understand. Once added, it is only necessary to
-add the appropriate defines in _config.h_
-
-Adding new layers requires changes in layer_names, *oled/oled_layers.h* and *oled/oled_cartes.h* and the appropriate *keymap/ .h* file.
-
-Adding a new keyboard is done in keyboards and should be fairly obvious.
-```
-.
-├── base_layers
-│   ├── accents.h
-│   ├── alt.h
-│   ├── base_layers.h
-│   ├── beakl.h
-│   ├── bepo.h
-│   ├── carpalx.h
-│   ├── dvorak.h
-│   ├── gap.h
-│   ├── hands_down.h
-│   ├── keymaps.txt
-│   ├── maks.h
-│   ├── qwerty.h
-│   └── toprows.h
-├── config.h
-├── defs
-│   ├── accented_keys.def
-│   ├── altlocal_keys.def
-│   ├── alt_shift.def
-│   ├── combos.def
-│   ├── custom_keys.def
-│   ├── encoders.def
-│   ├── key_overrides.def
-│   ├── mod_lock.def
-│   ├── not_dead.def
-│   ├── nshot.def
-│   ├── oneshot.def
-│   ├── send_string.def
-│   ├── smart_lock.def
-│   ├── swapper.def
-│   ├── tap_hold.def
-│   └── unicode.def
-├── ericgebhart.c
-├── ericgebhart.h
-├── extensions
-│   ├── accented_keys.c
-│   ├── accented_keys.h
-│   ├── altlocal_keys.c
-│   ├── altlocal_keys.h
-│   ├── alt_shift.c
-│   ├── caps_word.c
-│   ├── caps_word.h
-│   ├── console_key_logger.c
-│   ├── console_key_logger.h
-│   ├── encoders.c
-│   ├── encoders.h
-│   ├── extensions.h
-│   ├── keycodes.h
-│   ├── keymap_combo.h
-│   ├── key_overrides.h
-│   ├── mod_lock.c
-│   ├── mod_lock.h
-│   ├── not_dead.c
-│   ├── nshot_mod.c
-│   ├── nshot_mod.h
-│   ├── oneshot.c
-│   ├── oneshot.h
-│   ├── process_locales.h
-│   ├── process_nshot.h
-│   ├── process_smart_lock.h
-│   ├── send_string.c
-│   ├── smart_lock.c
-│   ├── smart_lock.h
-│   ├── swapper.c
-│   ├── swapper.h
-│   ├── tap_dances.c
-│   ├── tap_dances.h
-│   ├── tap_hold.c
-│   ├── tap_hold.h
-│   ├── unicode.c
-│   └── unicode.h
-├── keyboards
-│   ├── keyboards.h
-│   └── layouts.h
-├── keymap
-│   ├── keymap.c
-│   ├── map_accented.h
-│   ├── map_alt.h
-│   ├── map_beakl.h
-│   ├── map_bepo.h
-│   ├── map_carpalx.h
-│   ├── map_dvorak.h
-│   ├── map_funcs.h
-│   ├── map_gap.h
-│   ├── map_hd.h
-│   ├── map_keypads.h
-│   ├── map_maks.h
-│   ├── map_qwerty.h
-│   ├── map_symbols.h
-│   └── map_toprows.h
-├── lang
-│   ├── lang.h
-│   ├── lang_map.h
-│   ├── locale_layers.h
-│   ├── locales.c
-│   └── locales.h
-├── layer_names
-│   ├── base_names.h
-│   ├── func_names.h
-│   ├── layer_names.h
-│   └── util_names.h
-├── layers
-│   ├── edge_keys.h
-│   ├── keypads.h
-│   ├── layers.h
-│   ├── nav.h
-│   ├── symbols.h
-│   ├── thumbs.h
-│   ├── toprows.h
-│   └── utility.h
-├── listen_keylogger.sh
-├── mod_layers
-│   ├── alt_mods.h
-│   ├── hrm_gacs.h
-│   ├── hrm_gacs_miryoku.h
-│   ├── hrm_gasc.h
-│   ├── hrm_sacg.h
-│   ├── hrs_nav.h
-│   ├── mod_layer.h
-│   └── trns_mods.h
-├── oled
-│   ├── oled_cartes.c
-│   ├── oled_layers.c
-│   ├── oled_stuff.c
-│   └── oled_stuff.h
-├── process_records.c
-├── readme.md
-└── rules.mk
-
-10 directories, 118 files
-```
-
-Locales
--------------------
-There are currently three locales.  LANG_IS defines the one in use.
-The map changes this value as it goes, to get the maps that are asked for.
-I have recently renamed some variables, such that it seems that only 2 locales
-are possible. It seems more than two might be too many. And keeping at 2 is
-a little easier.
-
- * EN - en-us, **KC_** keycodes.
- * US-INT - us-international variant, **US_** keycodes.
- * BEPO - bepo-fr, **BP_** keycodes.
-
-Switching LANG_IS before adding a new map will cause that map to 
-use LANG keycodes and keymap chunks when building the map.
-
-Enabling a second locale to bepo, will cause bepo versions of the chosen layers to
-be added to the keymap.
-
-### defining a locale.
-
-This is to manage BEPO and Qwerty Locale/language/Layers
-Each locale is defined with a start and end layer from the layers enum.
-
-This is only necessary to give contextual base layer choices based on
-the current locale setting, which the keyboard tracks.
-
-The first and last defines are all done with the magic of defines in 
-ericgebhart.h where the layers enum is defined.
-
-This could potentially hold multiple locales, The map turns on off the layers 
-and their enums if they are not enabled so that the layer array does not 
-fill up with too many base layers, or other layers because LT only works 
-up to layer 15.
-
-What this does is allow the keyboard to know which locales it has, and which
-layers go with them.
-
-If you have an oled, the locale will be displayed after the layout name. Currently
-en-us and bepo-fr are there.
-
-Locales are tracked, as to the layer ranges which belong to them in the layers enum.
-This allows for a `KC_NEXT_LOCALE` key and a `KC_NEXT_BASE_LAYER` key, on the _layers_
-layer. 
-`KC_SET_BASE` sets the default layer in the eeprom.
-
-When cycling through layers only the layers for the chosen local will appear.
-
-The layers are different keycode sets. 
-So there are two symbol layers, two toprows layers, two keypad layers. 
-One for Qwerty and one for bepo. The Navigation layer is not affected because
-it has only control keycodes which are independent of locale. 
-
-
-### Locales, how they work in layouts.
-
-This is done through consistent naming patterns and macros.
-Here are the macros that support creation of layout parts by locale.
-All are defined in **lang.h**
-
- * Keycode Prefix - KC or BP, etc. 
-    `LANG_KC(_A) -> KC_A or BP_A`
-
- * Defined key/layer Suffix - SYMB_EN, SYMB_BP, ... 
-    `LANG_N(NAME) -> NAME_EN, NAME_BP`
- 
- * Map chunk Suffix - _EN, SYMB_BP, etc.
-    `MAP_CHUNK(15_BOTTOM) --> ___15_BOTTOM_EN___ or ___15_BOTTOM_BP___`
-
-_lang.h_ has the macro definitions used in the keymap resolution,
-A new locale, will need a new set of macros that match the others.
-They use LANG_IS, Follow the patterns. It should be reasonably obvious.
-
-It is only necessary to create new base level macros that are used by these
-macros.  All of them are similar.
-
-**LANG_KC** uses these macros to resolve it's values.
-```
-    // Give the right keycode prefix by LANG_IS
-    #define LANG_PFX CAT(LANG_IS_, KC)
-    #define BEPO_KC BP_
-    #define EN_KC KC_
-```
-
-Adding a new one is just a matter of adding the a macro named with
-this format. `LANG_IS _Keycode prefix`.
-for Slovak, if the **LANG_IS** value is `SK` that would be,
-
-    `#define SK_KC SK_`
-
-LANG_N macro uses these similar macros for it's resolution.
-
-```
-    // Give the right symbol suffix by LANG_IS
-    #define LANG_SFX CAT(CAT(LANG_IS, _), SFX)
-    #define BEPO_SFX _BP
-    #define EN_SFX _EN
-```
-Adding Slovak support to the LANG_N macro looks like this.
-
-    `#define SK_SFX _SK`
-
-
-### Thumb clusters.
-
-Thumb clusters can be chosen by layer with the value of **THUMBS_ARE**.
-
-The easiest way to see them is to look in *layers/thumbs.h*.
-
-At the core of the thumb clusters are a set of six keys which
-can be changed to a one of a set of keys, with settings in the config. 
-Supporting a 4 key thumb cluster would just need a similar set.
-
-The newer Hands down variants also have need of thumb clusters which
-can take a letter.  A default can be given in config.h.
-Each keymap layer entry can give it's letter to change the thumb cluster.
-This is needed for hands down, maltron, rsthd, and beakl wi.
-
-These layouts use a special thumb cluster variant which will use the value
-of *THUMB_LETTER* to place a letter on one of the thumb keys.
-
-It is reasonably easy to add a new thumb cluster and use it. Add it to
-thumbs.h, add to the list of macros for it's suffix, and turn it on 
-by setting it to *THUMBS_ARE* in config.h
-
-Additionally a thumb cluster can be set for the various function layers as
-well. The transparent thumbs can be used, or something else. The nav and 
-mouse layers have the mouse buttons if mouse keys are enabled.
-
-It is also possible to use a Miryoku thumb cluster and layers 
-or mix the other layers in as desired.
-
-The language of thumb clusters is managed at the lowest level.
-These keys are mostly not language specific.
-
-Here is the definition for my space and symbol layer key. 
-This changes the name of the layer given like this.
-
-_SYMB becomes *_SYMB_EN* or *_SYMB_BP*. Depending on the value of *LANG_IS*
-
-    `#define SPC_SYMB LT(LANG_N(_SYMB), KC_SPC)`
-
-
-Edge key sets
-----------------
-Edge keys, or the 6th, and outer pinky column are often not specified
-in base keymaps and are not strictly necessary. There are a few sets
-to choose from here. A NOKC set with no keys, NORM which is sorta normal
-with grave, equal, tab, -, and \/. There is also a smart lock set
-which gives access to smart lock layers tab and -. Last there is 
-test, so its easy to try new things. Edge keys are defined in
-*layers/edge_keys.h*.
-
-
-Base Layers
------------------
-I like to experiment with layouts. So I have a few. 
-They can be turned on in config.h.
-
-To switch base layers there is a combo to raise the layers layer.
-Hold both pinkies on their lower row keys to get the layer.
-Tap the home row left middle finger to change layers.
-Tap the ring finger to set it to eeprom if you want it to stick.
-
-The left index finger will cycle through locales if you have them.
-
-Here is a list of some of the base layers..
-
- * Dvorakish
-    * Dvorak
-    * Capewell-Dvorak
-    * Ahei
-    * Boo
-    * Dvorak RLC-UI
- * Beakl
-    * 15
-    * 19
-    * 27
-    * WI
- * Qwertyish
-    * Qwerty
-    * Azerty
-    * Workman
-    * Norman
- * Maks
-    * Colemak
-    * Colemak_DH
-    * Halmak
-    * Minimak
-    * Minimak 8
-    * Minimak 12
- * Carpalx 
-    * QFMLWY
-    * QGMLWB
-    * QGMLWY
- * Hands Down
-    * Neu
-    * Neu narrow
-    * Titanium
-    * Gold
-    * Platinum
-    * Silver
-    * Bronze
-    * Elan
-    * Dash
-    * Ref
- * MTGAP
-    * Mtgap
-    * Ctgap
-    * Apt
-    * Canary
- * Others
-    * Maltron
-    * Eucalyn
-    * Rsthd
-    * Isrt
-    * Hands Up
-    * White
-    * Soul
-    * Niro
-    * Asset
-    * Whorf
-    * Whorf6
- * Bepo, layers with accented letters.
-    * Bepo
-    * Optimot
-    * Optimot compact
-    * Beakl19bis
-
-### Adding a new base layer, or any layer 
-
-Adding a new base layer is easy. They all live in *base_layers/*. A base layer
-entry looks like this. There is an empty template in *base_layers.h* which collects
-all the other maps. The name of the carte  de map, should be **CARTE** followed by
-the layer name that will be used. Layer names are usually an underscore followed by
-the name.  For dvorak, that is *_DVORAK*, which because of the language layer ultimately
-and magically becomes *_DVORAK_EN*, *_DVORAK_US*, *_DVORAK_BP* as needed. 
-
-```
-#define CARTE_DVORAK                            \
-  carte_de_map(" ',.py fgcrl ",                 \
-               " aoeui dhtns ",                 \
-               " ;qjkx bmwvz ")
-
-#define ___DVORAK___                                                    \
-  LANG_MAP(TL_QUOT,  TL_COMM, TL_DOT, _P,  _Y,   _F, _G, _C, _R, _L,               \
-           _A,       _O,      _E,     _U,  _I,   _D, _H, _T, _N, _S,    \
-           TL_SCLN,  _Q,      _J,     _K,  _X,   _B, _M, _W, _V, _Z)
-```
-
-#### TL_ keycodes 
-
-Use TL_ keycodes for any punctuation, this allows for targeting
-of these keys by language and by target layout as needed.
-for instance *TL_COMM* -> TLKC(_COMM). The *Target-Language-comma*, 
-becomes BP_BK_COMM, or KC_DV_COMM, US_HD_COMM, or whatever it
-needs to be based on current language and target layout. If your layer has special
-puncuation needs, 
-
-  * Add key entries to *altlocal_keys.def* 
-  * Edit to *lang/lang_map.h* to add the new *TARGET_PFX* entry.
-  * Set the appropriate value to *ALT_TARGET_IS* in the layer's keymap entry.
-
-#### Integration
-
-Integrating the new map into the rest of the framework is just a simple entry
-in a few places. 
-  * *layer_names* needs to know about the new name so we can use it, 
-  * The oled needs to know about it so it can display it.
-  * The config needs to know about it so we can turn it on.
-
-Follow these steps. Everything is very simple, and just one to 3 lines. 
-Just follow the same patterns as all the rest. 
-
-  * Add the layer definition and map of the definition in *base_layers/<appropiate>.h*.
-  * Add the layer name to *layer_names/base_names.h*
-  * Add the layer name to *keymap/<appropiate>.h*
-  * Add the layer entry to *oled/oled_layers.c*
-  * Add the layer map entry to *oled/oled_cartes.c*
-  * Add the define for the layer enable to *config.h*
-
-Adding a new functional layer follows the same patterns, although their
-keymap and oled entries may be more complex, since it is usually trying
-to pick one from a set of choices.
-
-### Adding a new thumb cluster configuration
-
-Adding a new thumb keys definition is done in *layers/thumbs.h*.
-The keys that change are just 6 and they all have the name of *___6_ERGO_THUMBS_...*.
-
-  * Define a new thumb definition with a nice suffix like all the rest.
-  * Add an entry to the *THUMB_EXT* list with the nice new suffix.
-  * Set the appropriate *THUMBS_ARE* defines in config.h to it's 
-  new thumb extension name.
-  
-### Adding a new mod layer
-
-This is also easy. Mod layers live in the mod_layers folder. Each file
-there is a separate mod layer, which is tracked in *mod_layers.h*
-The file, *trns_mods.h* is the transparent mods layer and by definition has
-no modifiers applied, providing a clean slate. 
-
-The steps are these:
-  * Make a new copy of an existing mod layer.
-  * Edit the new file and change the names to your new name.
-      * ie. *_trns* changes to *_my_new_mods*
-  * Add the mods you want. MT's and LT's, tap holds, etc. 
-  * Edit  *mod_layers/mod_layer.h*
-    * Add the include for the new mods file*
-    * Add the *MOD_EXT* entry for the new name
-  * Define *MODS_ARE* in _config.h_ to use the new name.
-
-
-Keymaps
------------
-I only have one. It's in keymap/keymap.c.  
-My config.h has all the current usable settings.
-Turn on the layers by enabling and choosing them in config.h. 
-Most keyboards don't need a keymap.c. 
-
-There are corresponding Bepo layers, as needed, which will arrive if *SECOND_LOCALE* is
-set to _BEPO_.
-This essentially doubles the number of keymaps.  
-Nav, mouse, media, layers, RGB, and Adjust are not duplicated as there is no 
-current need.
-
-## Mods, home row and otherwise.
-With all these layers it was a real pain to apply mods consistently and 
-easily with the old wrapper code. So I changed the way I use keymap macro 
-wrappers and added in my own mod layer. The only thing it has is the mods 
-to apply. No more editing keymaps to apply mods.  I do it once, and it 
-works everywhere I want by location.
-
-Multiple versions are possible. Just copy the trns_mod_layer.h to a new
-name and modify it with a new extension name, (replace '_trns'). Then add it's include to mod_layer.h, to be used when the config says.
-
-The defines for *MODS_ARE* and *DEFAULT_MODS* determine which mods are applied
-to a given keymap layer. 
-
-Keyboard matrix Layouts
------------
-This is where the keymap of the
-keyboard meets the mods and all the edge, middle and thumb keys, and makes 
-it easy to give just a 3x10 definition for most layers regardless of which 
-keyboard it is going to.
-
-To use an existing layout for a different keyboard, simply make an entry
-in *keyboards.h* to assign the proper layouts that fit that keyboard.
-So a planck could use the 4x12 layout out of the box. In the keyboards 
-keymap there is only a need for config.h or rules.mk if something needs
-changing. For the keyboard an empty keymap.c will do.
-
-The base layout can be anything really.
-The base layer sets the thumbs and anything outside of the 3x10.
-The mod layer is wrapped in the base layout and adds the mods, and a 6th 
-outer pinky column as needed.
-
-Some layouts take an extra number row.
-Layouts can be any shape, all of these take a 3x10, 3x12, 4x10 or 4x12, 
-and make it fit the keyboard.
-
-The layouts defined in _layouts.h_ take a list of keys. and give them
-to the keyboard's layout.  The Corne (crkbd), uses a layout called
-  `LAYOUT_split_3x6_3`. So for the corne, I have a `Base_3x6_6` that
-  is the same shape, in its resolution.
-  
-There are layouts for Corne, ergodox, kinesis, dactyl, viterbi, xd75, rebound.
-
-Currently, 3 layouts are needed per keyboard. 
- * A Base layout, for default/base layers, 
- * A transient layout for the function layers.
- * A version which takes 3x12 for the larger bepo base layers.
-
-The base layouts can take 3 or 4 rows by 10 columns as desired.
-They add in the mods, and any pieces of matrix outside of
-the 3x10 center, function, numbers, lower rows, outside pinky keys,
-and thumb clusters. 
-
-
-Functional layers
---------------------
-There are quite a few of these to choose from. The easiest way to see
-them all is to go look at them in _layers/_. They are logically divided
-into files, and their cartes/maps are easy to look at. There are 
-minimalist Miryoku versions as needed.
-
-## Navigation Layer
-I do not use a mouse. I use Xmonad as my window manager, and I have
-practically no use for one.  They are necessary however. So I have
-a Navigation layer which is all mouse, arrows, home, end, tab, page
-up, down,  5 mouse buttons and so on. 
-
-There are a growing number of choices, left and right sided mouse layers
-right side arrows etc, and some monolithic nav layers like the one shown
-below.
-
-There is also a split layer, with arrows etc on the right, and smart mods
-and N-shots on the other. A left side mouse layer is accessible from
-the first nav layer.  There are various choices at this point. It is
-best to look at the config.h for clues. 
-
-The miryoku nav and mouse layers are somewhat but not terribly different.
-
-
-#### One of the Navigation layers.
-                                                       
-```
-M = Mouse
-B = Button
-W = Wheel
-AC   = Acceleration
-CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V
-CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N
-CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q
-HOME = TAB & PGDN
-END = BKTAB & PGUP
-Lock/Unlock LAYER = PGDN & PGUP
- 
-MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 
-TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB 
-     WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  TAB    PGDN   PGUP BKTAB
-                                                                             
-     Left   Down   Up   Right   CCCV  |  CCCV  MLeft  MDown  MUp  MRight
-     
-     
-```
-                                                                            
-
-## Symbol Layer
-
-The symbol layer is based on the Beakl15 symbol layer. It was very similar to a symbol
-layer that I had before beakl, but this felt better, and has been through a few 
-iterations at this point. Vi likes using :/?! a lot. The = is not that important to
-me, as the : for the vi ex: command. The ! is very satisfying in this location.
-
-For US-intl and Bepo which have dead keys, the symbol layer uses the *not_dead* extension
-to give _'`"^~_ which are not dead.
-
-The beakl symbol layer is intuitive and fairly easy to remember. There are 3 versions.
-The original, an extended, and an extended and enhanced for vi.
-The primary purpose of the extension was to provide keys which might not be available
-elsewhere on the default layer. The vi version takes this further and moves :/? 
-to better places.
-
-I prefer a modified beakl15 symbol layer. here it is, left and right.
-This layer has some extra characters so it works with non-beakl base layouts.
-The beakl wi symbol layer is not an improvement on this IMO.
-Miryoku symbols layer is only left sided, and minimalist as well.
-This might be a little vi centric, with the : in the middle. ymmv.
-
-There are a few choices, this is one.
-
-```
-        `<$>'  ?[_-] 
-      - \("#)  !{:/} ;
-        @=*+;  %&^~|
-```
-
-
-## TopRows Layer
-
-The toprows layer is a nice way to transition to small keyboards.
-I think, truly this is the layer that makes tiny keyboards accessible in the beginning.
-Everything can remain familiar. I use this one with a beakl number row.
-The default, if no choices are made, aside from enabling toprows, will  
-have a normal qwerty number row, as in the second map.
-
-I do not use F keys, The latest addition has _smart_ and _nshot mods_ in the third row.
-There is a miryoku thumb cluster which uses this layer instead of a keypad.
-
-    ```
-    !@#$%   ^&*()
-    40123   76598
-    F1   ---  F10
-    ```
- or
-
-    ```
-    !@#$%   ^&*()
-    12345   67890
-    F1   ---  F10
-    ```
-
-## Keypad and Funcpad Layers
-
-There are several variations of keypads and function key pads in various sizes,
-and left and right. 
-There are also versions with smart and nshot mods instead of F-keys.
-There are monolithic, left and right, and also half keyboard left mostly...
-A miryoku version also exists.
-The keypad can be chosen in config.h.
-
-```
-    523:  F9-12 
-   7.104  F5-8
-   /698,  F1-4
-```
-## Media Layer
-
-A simple Miryoku, media layer, controls on the right.
-
-OLED
---------------------
-The oled shows the basic stuff I could find in most places. 
-* Default layer
-* Current layer
-* Locale
-* Mods 
-* Locks 
-* Last key pressed
-* Map of the current layer as simply as possible. (128x64)
-
-Process_records.c
---------------------
-This is where the keycodes are processed...
-It tends to be where cruft gathers. Mostly I try to keep it empty
-and do all my processing with the extensions.  The file, _extensions.h_ 
-takes care of inserting them in process_records with it's macro.
-
-
-Extensions
----------------------
-Extensions are all in the extensions directory and have a single 
-entry point via extensions.h which provides a macro to place in **process_record_user**. 
-The intention is that they are easy to copy and use as is without digging around
-in the C code. Custom keys are also defined there. Any keycodes defined by
-an extension are automatically added to the custom keys enumeration so there is no need to define them manually.
-
-A new extension can be added with a process record entry in
-extensions.h. Just follow the same code pattern. If an extension defines keycodes, 
-add it's include entry in *keycodes.h* so that they are automatically added to the enum. 
-Keycodes.h is also where all the miscellaneous short cut key defines are done. 
-
-To copy all the extensions, 
-  * Copy the extensions and defs folders, 
-  * Copy process_records.c file or adapt yours.
-  * Adapt your custom keycodes to custom_keys.def.
-  * Copy the pertinant parts of config.h so that everything can be enabled.
-  * Define _USERSPACE_H such that all the extensions can find your stuff.
-
-To adapt to your own process_record_user do this;
-Include extensions.h in your process_record_user,then add this 
-above the switch.
-```
-PROCESS_EXTENSIONS
-```
-This will cause process records to use whatever extensions are turned on.
-
-Many extensions have a _.def_ file in _/defs_ for any data that is needed.
-
-Because many of them use custom keycodes or layers in their definitions, 
-it is necessary to include your userspace .h such that keycodes and layer
-codes can be found. To simplify this, simply add a define to config.h
-to point at your .h or wherever your custom codes can be found.
-
-In my case;
-```c
-#define USERSPACE_H "ericgebhart.h"
-```
-
-
-Custom keys
--------------------
-The Custom keys are in __custom_keys.def__.
-
-__keycodes.h__ is an extension of sorts. It is the custom keys enumeration.
-The __custom_keys.def__ has a few random keycodes in it.
-
-All other keys are automatically generated from the other def files.
-
-For the extensions that have key definitions those keys are enumerated
-automatically. The keys are defined in the def files so there is no need
-to add them to the enumeration manually.
-
-It will complain as usual if there are duplicates.
-
-Mostly, __keycodes.h__ is key defines to make shortcuts, since the enumeration
-is done almost completely automatically. When adding a new extension
-which defines keycodes, that extension will also need an entry in 
-keycodes.h in order to automatically define the new key enumerations
-it´s def file creates.
-
-
-Accent keys
------------------
-This is a way to create keycodes which access keys
-which are normally only accessible with an Altgr/Ralt and a dead key.
-
-Each definition takes a keycode, the key to modify, and the dead key
-to apply to it.
-
-```
-ACCENTED(BP_OCIR, BP_O, BP_DCIR)
-ACCENTED(BP_ACIR, BP_A, BP_DCIR)
-```
-
-
-Alternate keycodes 
------------------------------
-Normally, a keycode has unshifted and shifted key values. These are defined
-by the OS and it's locale, not the keyboard. This feature allows a keycode 
-to be defined that uses arbitrary unshifted and shifted keycodes and their modifiers. 
-This is necessary, because, for instance, qwerty has , and ; paired. Other
-locales may not. Bepo, and Beakl both have different pairings as do many other
-layouts.
-
-Because of wanting dvorak and beakl on bepo there was the necessity to create keys
-from keycodes which were not combined. key overrides were not 
-sufficient because some keys are not actually keys that can be accessed
-without modifiers. Each keycode for the new key specifies it's own
-modifiers making any character available as an unshifted or shifted key.
-
-Alternate keys for a locale, are defined in **altlocal_keys.def**.
-These are to emulate a key, from 2 keycodes. 
-
-This is for emulating keys on another locale/language.
-Dvorak on Bepo-fr, or Qwerty on sk-SK, or de_DE.
-
-It is also good for alternate shifted and unshifted pairs like
-what is needed for beakl or hands down on en-us/qwerty.
-
-This feature is usually only needed for punctuation keys 
-and the top row number keys. Where the unshifted and shifted keys
-are not the same character as the keyboard local on the OS.
-
-It has turned out that most of these keys have a destination language,
-and a target language/layout. 
-The target is to emulate something on some language. QMK uses keycode prefixes,
-so this works pretty well and the names stay consistent with all the others,
-but with a middle name.
-
-The pattern is Language prefix, target language prefix, name.
-The target prefix is made up. BK -> beakl, DV -> dvorak, HD -> hands down, etc.
-
-The naming pattern is only important in that it works with all of the Lang
-macros elsewhere in this userspace. A macro is provided on a per key 
-basis, which can be used at the base layer definition, such that *TL_COMM*; 
-target-language-comma, becomes BP_BK_COMM, or KC_BK_COMM, or whatever it 
-needs to be based on 
-current language and target layout.
-
-Here is a def entry to create the 1/! keycode for dvorak in the Bepo-fr locale
-in *altlocal_keys.def*.
-```
-  MK_KEY(BP_DV_1,    BP_DQUO, MOD_LSFT,      BP_DCIR, MOD_LSFT)
-```
-
-Here is what some Beakl keys look like for en-us/qwerty.
-Beakl has dot with @, comma with ! and " with `.
-
-In *altlocal_keys.def*.
-```
-  // Keys for BEAKL on Qwerty
-  MK_KEY(KC_BK_DOT,  KC_DOT, MOD_NONE,    KC_2, MOD_LSFT)
-  MK_KEY(KC_BK_COMM, KC_COMMA, MOD_NONE,  KC_1, MOD_LSFT)
-  MK_KEY(KC_BK_QUOT, KC_QUOT, MOD_NONE,   KC_GRV, MOD_NONE)
-```
-
-Not Dead keys
---------------------
-As a writer dead keys give me access to accented letters in other languages,
-As a programmer they are a pain, especially for a vi user. This problem is
-limited to a few characters; "'`^ and ~. This extension helps to fix these
-characters and make them accessible as non-dead keys. It does this by adding
-a space afterward. The space is eaten by the OS keyboard driver and the letter
-emerges as needed. Here are some non dead keys for US-Intl.
-In use, I put these on the symbol layer, and let all the others remain dead.
-
-```
-NOT_DEAD(US_DQUO_ND, US_DQUO)
-NOT_DEAD(US_GRV_ND,  US_GRV)
-NOT_DEAD(US_QUOT_ND, US_QUOT)
-NOT_DEAD(US_CIRC_ND, US_CIRC)
-NOT_DEAD(US_TILD_ND, US_TILD)
-```
-
-Alternate shifts
----------------------
-The alt shift extension is very simple, it uses a usual keycode, it does
-not define custom keys. It allows for an existing key like dot or semi-colon 
-to have a different letter on its shifted value. 
-
-There are currently three types of shift mods.
-  * Give a different character than usual on shift.
-  * Give two of the usual character instead of one.
-  * Give three of the usual character instead of one.
-
-They are all defined in *defs/alt_shift.def*.
-Here are some silly examples.
-
-```
-ALT_SHIFT(US_EXLM, US_PERC)
-SHIFT_FOR_2(US_AT)
-SHIFT_FOR_3(US_DLR)
-```
-
-
-Key Overrides
--------------------
-These are the standard QMK key overrides. For un/shifted pair keys *altlocal_keys* is
-much, +3x, smaller and direct in that it makes keycodes that can be placed anywhere.
-However, if ko's are desired, this extension is an easy place to start.
-
-There are nice macros which take care of defining everything that is possible
-with the ?_ko() functions
-
-This first example is better done with **altlocal_keys**.
-
-```
-// KOL(slash_pipe,      MOD_MASK_SHIFT, KC_SLSH, KC_PIPE, _DVORAK_EN)
-```
-
-Other key overrides can be defined with these.
-
-```
-KO(name, mods, key, replacement)
-
-KOL(name, mods, modded_key, replacement, layer)
-
-KOLN(name, mods, key, replacement, layer, neg_mods)
-
-KOLNO(name, mods, key, replacement, layer, neg_mods, options)
-```
-
-Combos/Chords
-----------------------------
-
-The combos here use multiple reference layers which is a pending
-pull request in the dev branch of QMK. The combos here will still work
-to an extent if *COMBO_ONLY_FROM_LAYER* is set to the correct layer number.
-
-[See my pull request to enhance combos here](https://github.com/qmk/qmk_firmware/pull/16699)
-
-This pull request defines a hook function for combos to determine the
-reference layer for the current layer.  This allows for multiple reference
-layers to be used depending on the situation.
-
-Reference layers will be created and used according to the following
-defines. 
-If the reference layer is enabled, it will automatically be assigned to
-COMBO_REF_DEFAULT and that will be the default reference if none
-is specified. If not specified, the reference will be the current layer.
-
-  * #define COMBO_REF_LAYER_ENABLE // enable a reference layer.
-  * #define COMBO_REF_LAYER_TWO_ENABLE // enable a second reference layer
-  * #define COMBO_ONLY_FROM_LAYER 2
-  * #define COMBO_REF_DEFAULT 2
-    Works in config.h if you know the number of your layer.
-    Automatically set if ref layer is enabled.
-
-Defining layer specific combo reference layers by layer in combos.def
-In this case, the default will be _COMBO_REF, the NAV layer will
-reference it's self, while bepo dvorak will reference the second
-combo reference layer. Keys start or end with CB or CB2.
-    
-```
-COMBO_REF_LAYER(_DVORAK_BP, _COMBO_REF2)
-COMBO_REF_LAYER(_NAV, _NAV)
-```
-
-The combo reference layers follow an easy to remember keycode naming
-convention so that it is easy to define combos based on position.
-Keycodes are prefixed by CB or CB2, the first number is the row,
-followed by L or R for left and right, then the column number,
-for each hand left to right.
-
-Row 0 is the number row, there are 4 rows possible.
-
-`CB_1L1` is the left pinky, `CB_1R1` is the inside right hand index column.
-
-```
-  _1L1,  _1L2, _1L3, _1L4,  _1L5,   _1R1, _1R2, _1R3, _1R4, _1R5, 
-```
-
-If there are edge keys, they are named accordingly, left and right.
-
-```
-L0_CB, L1_CB, L2_CB, L3_CB
-R0_CB, R1_CB, R2_CB, R3_CB
-```
-
-Thumb keys use the COMBO and COMBO2 thumb settings which give keycodes
-like this.
-
-```
-#define ___6_ERGO_THUMBS_COMBO___  CB_TH1, CB_TH2, CB_TH3, CB_TH4, CB_TH5, CB_TH6
-#define ___6_ERGO_THUMBS_COMBO2___ CB2_TH1, CB2_TH2, CB2_TH3, CB2_TH4, CB2_TH5, CB2_TH6
-```
-
-Tap-Hold
------------------------
-
-Tap hold currently has *tap_taplong* and *open_openclose* functions.
-These are in *tap_hold.c*, *tap_hold.h* and *tap_hold.defs*.
-Both use **TAP_HOLD_TERM** as the hold duration.
-
-Tap_taplong sends one keycode on tap, and another after a hold of tapping term.
-Open_openclose, sends one keycode on tap, hold sends that, plus the second, 
-followed by a back arrow.
-
-Additionally, open_openclose will send a triple of the open keycode when tapped with
-the shift modifier on.
-
-There as also a __not dead__ version of open_openclose that accomodates using
-dead keys like quote so that the functionalty behaves as if the key were not
-a dead key, giving a quote, a pair of quotes or a triple of quotes.
-
-The file _tap_hold.defs_ contains all the definitions. Like combos,
-these entries are processed with a function call from **process_user_record**
-`process_tap_hold_user(keycode, record);`
-
-Define your keys in *tap_hold.defs*.
-
-Here is Ctrl-C, Ctrl-V, as tap and long tap.
-```
-TP_TPL(KC_CCCV, LCTL(KC_C), LCTL(KC_V))
-```
-
-For tap open, hold for open and close then a back arrow.
-Here is __(__ or __()__ with tap and long tap.
-
-```
-OPEN_OCL(KC_OCPRN, KC_LPRN, KC_RPRN)
-
-OPEN_OCL(KC_OCQUOT, KC_QUOT, KC_QUOT)
-// non dead version of quote.
-OPEN_OCL_ND(BP_OCQUOT, BP_QUOT, BP_QUOT)
-OPEN_OCL_ND(US_OCQUOT, US_QUOT, US_QUOT)
-```
-
-It is also possible to trigger a smart lock with a hold.
-This example creates a keycode, `ENTNAV` which can be used
-to type enter, or smart lock the nav layer.
-Note that `SML_NAV` should be defined in `smart_lock.defs`.
-
-__Caveat:__
-This does have the unfortunate behavior of delaying the action
-until key up. So it may not be that useful. I did not like it
-for this particular example.
-
-```
-TP_SML(ENTNAV, KC_ENTER, SML_NAV)
-```
-
-Caps Word
--------------
-This is a slightly modified version of caps word which adds a *CAPS_WORD_ON* keycode
-which can be used to turn caps word on explicitly. This is useful for mapping a
-single key or creating a combo.
-
-[As documented in here.](https://getreuer.info/posts/keyboards/caps-word/index.html)
-Holding both pinkies on home row for double tapping term, is effectively 
-right-shift and left-shift, invokes caps-word. The next word will be capitalized. 
-It continues until it shouldn't.
-
-Smart lock
-----------------
-They are defined in *smart_lock.def*. They need
-a custom keycode, and a layer or mods, not mod keycode, to apply, 
-followed by a list of keycodes to ignore and stay active. 
-This allows popping to layer which will stick until it doesn't. 
-Or to apply mods until it shouldn't. Each definition has it's
-own list of key codes to ignore. Derived from _smart_layers_
-by @possumvibes.
-
-Add a keycode to custom_keys.def then assign it to it's action in smart_lock.def.
-```
-// SMLL = smart lock layer.
-// SMLM = smart lock mod.
-
-// Keycode, layer/mod.
-// list of keycodes to ignore.
-
-SMLM(SMLM_LSFT, MOD_LSFT,
-  ___VI_ARROWS___,
-  ___HOME_PGDN_PGUP_END___,
-  ___TAB_PGDN_PGUP_BKTAB___,
-  ___SML_MODS_L___)
-
-SMLL(SML_NAV, _NAV, ___NAVA_3x10___)
-
-```
-
-Mod lock
-----------------
-Mod lock is originally from @possumvibes, it has ignore keys as well,
-but these keys apply to all locks defined. which gives a slightly smaller 
-memory footprint than smart locks. The mods, are keycodes, rather than mod codes.
-
-The behavior is the same as smart lock mods, but less flexible, and smaller.
-First create a keycode in custom_keys.def, then assign it to the mod you want.
-
-Ignore keys are universal for all mod locks.
-
-```
-// mod lock keys. takes keymods not mods.
-// keycode should be defined in custom_keys.def.
-// custom key,  modkey to activate
-MODL(ML_LSFT, KC_LSFT)
-MODL(ML_LCTL, KC_LCTL)
-MODL(ML_LALT, KC_LALT)
-MODL(ML_LGUI, KC_LGUI)
-
-// Keycodes which will NOT cancel mod lock mode.
-IGNORE_KC( KC_LEFT)
-IGNORE_KC( KC_RGHT)
-```
-
-N-shot mods
-----------------
-I simply modified N-shots to use a def file. This is essentially @possumvibes
-fancier version of @callum's one shot mods. It has ignore and cancel keys,
-and there are one shot mods or N shot mods. Ignore and cancel keys apply
-to all oneshot and n-shots.
-
-```
-// Define keycodes in custom keys.
-// KEYCode, mod keycode, to set for n-shot.
-// ONESHOT is for one.
-// NSHOT takes a count.
-
-// oneshots
-ONESHOT(OS_LSFT, KC_LSFT)
-
-// N-Shots
-NSHOT(TS_LCTL, KC_LCTL, 2)
-
-// Keys which will cancel the n-shots.
-CANCEL_KEY( PANIC)
-
-// Keys which will be ignored by n-shots.
-IGNORE_KEY( SML_NAV)
-```
-
-One-shot mods
-----------------
-This code came by way of @jurgen-kluft, I encapsulated the code and made 
-the user functions definable with a .def file. This is similar to N-shots. 
-This one keeps track of the last key consumed which helps it's decision making. 
-It also has cancel and ignore keys like N-shots.
-
-Essentially the same as n-shots, but with less elegant C code. Choose one or
-the other. 
-
-In evaluation.  The code for nshots is better.
-
-```
-// custom-key, Oneshot name.
-ONESHOT( OS_LSFT, ONESHOT_LSFT)
-
-// keys to cancel
-CANCEL_KEY( KC_ESC)
-
-// keys to ignore.
-IGNORE_KEY( SPC_NAV)
-```
-
-Swapper
-----------------
-I added the defs code so they are easy to define. This is a way to
-alternate between 2 keycodes for a key by sending another keycode. An
-example is tab or backtab on one key, which reverses when you press a
-second key. It also allows for mods to be applied. The following defines
-SW_WIN, which sends left alt-tab and shift- left alt- tab, when reversed
-by SW_REV.
-
-```
-SWAPPER_KEY(SW_WIN, SW_REV, KC_TAB, S(KC_TAB), KC_LALT)
-```
-Note: The switch key is not automatically defined in the custom keys enum in
-_keycodes.h_. It is convenient to use the same one which causes problems
-for automatically adding it. Add it to *custom_keys.def*
-
-Encoders
-----------------
-This is basic encoder stuff, modified to use a def file which makes it a lot easier
-to define and use. It can switch the encoder functions based on layers and mods.
-Give it a layer name and/or mods to match on, and the clockwise and counter 
-clockwise keycodes to send.
-
-I used LEFT and RIGHT, but really it's just 0-N, but I happen to have one
-on the left and one on the right. If you have one, use 0 or LEFT.
-
-The code scans the entries for matches on layer first, checking for a match for
-mods. If an encoder entry is not found it then scans for entries with
-layer set to LAYER_NONE.
-
-RGB light controls require calling the functions directly, for this
-there is a special macro and function that does this. The functions
-should take no arguments.
-
-```
-// Layer/none, encoder index 0/1, CW_KC, CCW_KC, Qualifying mod or none
-// LAYER_NONE and MOD_NONE for a single use.
-// LEFT and RIGHT for index. they go on from there, 2, 3, etc
-// if one encoder, LEFT/0, is the first one, on the master side.
-
-// default encoders, all layers no mods.
-ENCODER_ACTION(LAYER_NONE, RIGHT,  KC_PGDN, KC_PGUP, MOD_NONE)
-ENCODER_ACTION(LAYER_NONE, LEFT,  KC_DOWN, KC_UP, MOD_NONE)
-ENCODER_ACTION(LAYER_NONE, LEFT,  KC_PGDN, KC_PGUP, MOD_LSFT)
-
-// Symbol layer encoders.
-ENCODER_ACTION(_SYMB, LEFT, KC_LEFT, KC_RIGHT, MOD_NONE)
-
-// RGB function encoders
-ENCODER_FUNCTION(_RGB, LEFT,
-                rgb_matrix_increase_speed_noeeprom,
-                rgb_matrix_decrease_speed_noeeprom, MOD_NONE)
-```
-
-
-Unicode
-----------------
-This is just the basic unicode example everyone seems to have.
-Add your keys to send unicode strings like so.
-
-```
- UC_STR(UC_DISA, "ಠ_ಠ")
-```
-
-Send_string
---------------
-This is just basic send string functionality using *SEND_STRING* and 
-*SEND_STRING_DELAY*. Each entry defines a key to send a string.
-
-```
-SEND_STR(MYKEY, "this is a test")
-SEND_STR_DELAY(VRSN, QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE)
-```
-
-Console key logging - for heat maps.
-----------------------
-Both CONSOLE_ENABLE and CONSOLE_KEY_LOGGER_ENABLE must be enabled for this to work.
-
-This is a console key logger which can save keys typed for analysis of keymaps
-using Vlad/Precondition's heat map tool. The code for the logger came from
-[here](https://precondition.github.io/qmk-heatmap#how-to-collect-the-required-data)
-The explanation and use of the heatmap is [here](https://precondition.github.io/qmk-heatmap)
-
-There is a script ```listen_keylogger.sh``` which should be run to collect
-the keylogger data. 
-
-This does require **hid_listen** to be installed on the computer.
-On Arch linux this can by installed from the AUR with ```yay -S hid_listen```
-
-The output can also be seen just by using ```qmk console```.
-
-Note: _print.h_ is automatically included when CONSOLE_ENABLE is set. This allows 
-for debug messages anwhere in the code base as needed to see what might be going
-on.
-
-Tap Dance
---------------------
-I had a lot of tap dance, It's turned off. It's big. tap-hold works pretty well most of the time, instead.
-My favorites were tab-backtab,  home-end.
-
diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk
deleted file mode 100755
index 8ec481c17a..0000000000
--- a/users/ericgebhart/rules.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-INTROSPECTION_KEYMAP_C = keymap/keymap.c # keymaps
-SRC += ericgebhart.c
-SRC += process_records.c
-SRC += $(USER_PATH)/lang/locales.c
-SRC += $(USER_PATH)/extensions/extensions.c
-SRC += $(USER_PATH)/extensions/tap_hold.c
-SRC += $(USER_PATH)/extensions/accented_keys.c
-SRC += $(USER_PATH)/extensions/altlocal_keys.c
-SRC += $(USER_PATH)/extensions/tap_dances.c
-SRC += $(USER_PATH)/extensions/encoders.c
-SRC += $(USER_PATH)/extensions/swapper.c
-SRC += $(USER_PATH)/extensions/mod_lock.c
-SRC += $(USER_PATH)/extensions/smart_lock.c
-SRC += $(USER_PATH)/extensions/nshot_mod.c
-SRC += $(USER_PATH)/extensions/oneshot.c
-SRC += $(USER_PATH)/extensions/unicode.c
-SRC += $(USER_PATH)/extensions/send_string.c
-SRC += $(USER_PATH)/extensions/console_key_logger.c
-SRC += $(USER_PATH)/extensions/not_dead.c
-SRC += $(USER_PATH)/extensions/alt_shift.c
-SRC += $(USER_PATH)/extensions/quick_tap.c
-SRC += $(USER_PATH)/oled/oled_stuff.c
-SRC += $(USER_PATH)/oled/oled_cartes.c
-SRC += $(USER_PATH)/oled/oled_layers.c
-
-VPATH += $(USER_PATH)/layer_names
-VPATH += $(USER_PATH)/oled
-VPATH += $(USER_PATH)/extensions
-VPATH += $(USER_PATH)/base_layers
-VPATH += $(USER_PATH)/defs
-VPATH += $(USER_PATH)/keyboards
-VPATH += $(USER_PATH)/keymap
-VPATH += $(USER_PATH)/lang
-VPATH += $(USER_PATH)/layers
-VPATH += $(USER_PATH)/mod_layers
-VPATH += $(USER_PATH)/oled
-
-# MCU=STM32F411
-# BOARD=QMK_PROTON_C
-# SOFT_SERIAL_PIN=D2
-# # Bootloader selection
-# BOOTLOADER = stm32-dfu
-
-# WS2812_DRIVER = pwm
-# SERIAL_DRIVER = usart
-# AUDIO_ENABLE = no
-# LTO_ENABLE = no
-# CONVERT_TO=proton_c
-
-# so the keyboard's code doesn't add stuff we don't need.
-# when we use our own oled renders.
-# oled_custom_enable should also be set in config.h.
-OLED_ENABLE = yes
-OLED_CUSTOM_ENABLE = yes
-
-ifeq ($(strip $(OLED_CUSTOM_ENABLE)), yes)
-        SRC += $(USER_PATH)/oled/oled_stuff.c
-endif
-
-
-MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = no # Audio control and System control
-COMMAND_ENABLE   = no # Commands for debug and configuration
-NKRO_ENABLE      = no # Enable N-Key Rollover
-SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = no
-TAP_DANCE_ENABLE = no # Enable the tap dance feature.
-KEY_OVERRIDE_ENABLE = no
-CONSOLE_ENABLE   = no  # Console for debug or keylogging.
-
-
-BOOTMAGIC_ENABLE = no  # Enable Bootmagic Lite
-UNICODE_ENABLE   = no
-SLEEP_LED_ENABLE = no
-
-LTO_ENABLE = yes
-
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-COMBO_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-
-ENCODER_ENABLE = no
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no