Merge remote-tracking branch 'origin/master' into develop

4 files changed, 419 insertions, 494 deletions

diff --git a/layouts/community/ergodox/replicaJunction/config.h b/layouts/community/ergodox/replicaJunction/config.h
index 9ffd74dccd..a02f9a95db 100644
--- a/layouts/community/ergodox/replicaJunction/config.h
+++ b/layouts/community/ergodox/replicaJunction/config.h
@@ -1,13 +1,51 @@
+/* Copyright 2021 Joshua T.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
-// Layer definitions
-
-#define L_COLEMAK 0
-#define L_QWERTY  1
-#define L_NUM     2
-#define L_EXTEND  3
-#define L_FUNC    4
-#define L_GAMING  5
-#define L_LL_R    6
-#define L_LL_E    7
-#define L_LL_I    8
+// Do not allow one macro to contain the other macro
+#define DYNAMIC_MACRO_NO_NESTING
+
+// "THE most important tap hold configuration setting"
+// https://precondition.github.io/home-row-mods#ignore-mod-tap-interrupt
+// https://docs.qmk.fm/#/tap_hold?id=ignore-mod-tap-interrupt
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// This one is a style choice. Play with it both on and off to see which
+// one suits you better.
+// https://precondition.github.io/home-row-mods#permissive-hold
+// https://docs.qmk.fm/#/tap_hold?id=permissive-hold
+#define PERMISSIVE_HOLD
+
+// If you press a dual-role key for longer than TAPPING_TERM, then
+// release it without pressing another key, without this setting nothing
+// would happen. With this setting, it sends the key's tap function.
+// https://precondition.github.io/home-row-mods#retro-tapping
+#define RETRO_TAPPING
+
+// Disable some unused features to save space
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+
+/////
+// Flags for stuff in my userspace
+
+#define USER_INCLUDE_GAMING_LAYER
+#define USER_INCLUDE_MACRO_LAYER
+
+// "Super Alt-Tab"
+// https://docs.qmk.fm/#/feature_macros?id=super-alt%E2%86%AFtab
+#define USER_SUPER_ALT_TAB_TIMEOUT 500
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index ce0400be5c..0c36abcf74 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -1,427 +1,378 @@
-/*
- * Keyboard: Ergodox
- * Keymap:   replicaJunction
- * Version:  2.1
+/* Copyright 2021 Joshua T.
+ *
+ * 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 "config.h"
 #include "replicaJunction.h"
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// Most layers are defined in my userspace, but this keyboard has
+// an extra one.
+enum additional_keyboard_layers {
+    L_SYSLEDS = _LAYER_SAFE_RANGE
+};
 
-[L_COLEMAK] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_GRV  ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KX_ECTL ,KC_Q    ,KC_W    ,KC_F    ,KC_P    ,KC_B    ,KC_LBRC ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_TAB  ,KC_A    ,KC_R_LT ,KC_S_LT ,KC_T    ,KC_G,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_LSFT ,KX_Z_MT ,KX_X_MT ,KX_C_MT ,KX_D_MT ,KC_V    ,KC_RBRC ,
-//--------|--------|--------|--------|--------|--------|--------|
-  TD_LAYR ,KC_LGUI ,KC_HYPR ,KX_CTSF ,KC_LCTL ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               KC_HOME ,KC_END  ,
-//                                            |--------|--------|
-                                                        KC_PGUP ,
-//                                   |--------|--------|--------|
-                                      KX_BKNM ,KX_DCTL ,KC_PGDN ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|-------|
-  TG_GAME ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_EQL ,
-//--------|--------|--------|--------|--------|--------|-------|
-  KC_DEL  ,KC_J    ,KC_L    ,KC_U    ,KC_Y    ,KC_SCLN ,KC_BSLS,
-//--------|--------|--------|--------|--------|--------|-------|
-           KC_M    ,KC_N    ,KC_E_LT ,KC_I_LT ,KC_O    ,KC_QUOT,
-//--------|--------|--------|--------|--------|--------|-------|
-  KC_LOCK ,KC_K    ,KX_H_MT ,KX_COMT ,KX_DOMT ,KX_SLMT ,KC_RSFT,
-//--------|--------|--------|--------|--------|--------|-------|
-                    KC_LALT ,KC_MINS ,KC_QUOT ,KC_EQL  ,TT_NUM ,
-//--------|--------|--------|--------|--------|--------|-------|
-  KC_LEFT ,KC_RGHT ,
-//--------|--------|
-  KC_UP   ,
-//--------|--------|--------|
-  KC_DOWN ,KX_NALT ,KX_SPAC
-//--------|--------|--------|
+#define BSP_SYM LT(L_SYMBOLS, KC_BSPC)
+#define SPC_NAV LT(L_NAVIGATION, KC_SPC)
 
-),
+#define MO_FN MO(L_FN)
+#define MO_MAC MO(L_MACROS)
+#define MO_SLED MO(L_SYSLEDS)
+
+#define TG_GAME TG(L_GAMING)
+
+#define ESC_SFT  LSFT_T(KC_ESC)
+#define TAB_SFT  RSFT_T(KC_TAB)
 
 
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
 
-[L_QWERTY] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_EQL  ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_LOCK ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSPC ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    KC_RALT ,KC_MINS ,KC_QUOT ,KC_EQL  ,TT_NUM  ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_LEFT ,KC_RGHT ,
-//--------|--------|
-  KC_UP   ,
-//--------|--------|--------|
-  KC_DOWN ,KX_NALT ,KX_SPAC
-//--------|--------|--------|
+[L_BASE] = LAYOUT_ergodox(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,
+    KC_EQL,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    NUMWORD,
+    KC_MINS, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_RBRC,
+    KC_LCTL, KC_LGUI ,KC_LALT, MO_FN,   ESC_SFT,
+                                                 KC_HOME, KC_END,
+                                                          KC_PGUP,
+                                        BSP_SYM, CTL_DEL, KC_PGDN,
+
+    TG_GAME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+    CAPWORD, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+             KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LOCK, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                      TAB_SFT, MO_FN,   KC_RALT, KC_RGUI, MO_SLED,
+    KC_LEFT, KC_RGHT,
+    KC_UP,
+    KC_DOWN, ALT_ENT, SPC_NAV
 ),
 
 
+[L_GAMING] = LAYOUT_ergodox(
+    KC_GRV, _______,_______,_______,_______,_______,_______,
+    KC_TAB, _______,_______,_______,_______,_______,_______,
+    KC_ESC, KC_A,   KC_R,   KC_S,   KC_T,   _______,
+    KC_LSFT,_______,_______,KC_C,   KC_D,   _______,_______,
+    _______,_______,KC_TAB, KC_LALT,KC_LCTL,
+                                            KC_LOCK,_______,
+                                                    _______,
+                                    KC_SPC, KC_LSFT,_______,
+
+    ooooooo,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,
+            _______,KC_N,   KC_E,   KC_I,   KC_O,   _______,
+    _______,_______,_______,_______,_______,_______,_______,
+                    MO_FN,  KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,
+    KC_BTN3,_______,
+    KC_BTN2,
+    KC_BTN1,KC_ENT, KC_BSPC
+),
+
 
-[L_NUM] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_SLSH ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_PIPE,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_BSLS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KC_AMPR ,KC_LABK ,KC_RABK,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_COLN ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PSLS ,KC_F12  ,
-//--------|--------|--------|--------|--------|--------|--------|
-           KC_HASH ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PAST ,KC_BSPC ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_BSPC ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PMNS ,KC_TAB  ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    KC_P0   ,KC_PDOT ,KC_PEQL ,KC_PPLS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|
-  _______ ,
-//--------|--------|--------|
-  _______ ,KC_PENT ,MO_FUNC
-//--------|--------|--------|
+[L_NUMBERS] = LAYOUT_ergodox(
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,KC_LGUI,KC_LALT,KC_LSFT,KC_LCTL,_______,
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,
+                                            _______,_______,
+                                                    _______,
+                                    _______,_______,_______,
+
+    _______,KC_NLCK,_______,_______,_______,_______,_______,
+    KC_NLCK,KC_HASH,KC_P7,  KC_P8,  KC_P9,  KC_PSLS,SFT_TAB,
+            KC_PPLS,KC_P4,  KC_P5,  KC_P6,  KC_PAST,KC_TAB,
+    _______,KC_PMNS,KC_P1,  KC_P2,  KC_P3,  KC_BSLS,KC_EQL,
+                    KC_P0,  KC_P0,  KC_PDOT,KC_PENT,_______,
+    _______,_______,
+    _______,
+    _______,_______,_______
 ),
 
 
+[L_SYMBOLS] = LAYOUT_ergodox(
+    _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
+    _______,KC_AT,  KC_LT,  KC_DLR, KC_GT,  XXXXXXX,_______,
+    _______,KC_BSLS,KC_LPRN,KC_DQUO,KC_RPRN,KC_HASH,
+    _______,KC_EXLM,KC_COLN,KC_ASTR,KC_PLUS,XXXXXXX,_______,
+    _______,_______,_______,_______,_______,
+                                            _______,_______,
+                                                    _______,
+                                    ooooooo,_______,_______,
+
+    _______,KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,
+    _______,XXXXXXX,KC_LBRC,KC_UNDS,KC_RBRC,XXXXXXX,KC_F12,
+            KC_PERC,KC_LCBR,KC_EQL, KC_RCBR,KC_PIPE,_______,
+    _______,XXXXXXX,KC_AMPR,KC_CIRC,KC_TILD,KC_GRV, _______,
+                    _______,_______,_______,_______,_______,
+    _______,_______,
+    _______,
+    _______,_______,ooooooo
+),
+
 
-[L_EXTEND] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,KC_APP  ,KX_CGR,  KC_VOLU,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,KX_SRCH, KX_PAST, KC_VOLD,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                   |--------|--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      MO_FUNC, _______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KX_STAB, KC_TAB,  _______ ,KC_INS, KC_PSCR,
-//--------|--------|--------|--------|--------|--------|--------|
-                    _______ ,_______ ,_______ ,KC_PSCR, _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______
-//--------|--------|--------|--------|--------|--------|--------|
+[L_NAVIGATION] = LAYOUT_ergodox(
+    _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
+    _______,OS_UNDO,OS_CUT, OS_PAST,OS_COPY,OS_SALL,_______,
+    _______,KC_LGUI,KC_LSFT,KC_LALT,KC_LCTL,_______,
+    _______,WIN_V,  _______,_______,OS_FIND,SEARCH, _______,
+    _______,_______,_______,_______,_______,
+                                            _______,_______,
+                                                    _______,
+                                    _______,_______,_______,
+
+    _______,KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,
+    _______,KC_PGUP,KC_HOME,KC_UP,  KC_END, KC_DEL, KC_F12,
+            KC_PGDN,KC_LEFT,KC_DOWN,KC_RGHT,KC_BSPC,_______,
+    _______,_______,SFT_TAB,KC_TAB, KC_APP, KC_PSCR,_______,
+                    _______,_______,_______,_______,_______,
+    _______,_______,
+    _______,
+    _______,_______,ooooooo
 ),
 
 
+[L_FN] = LAYOUT_ergodox(
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,QK_VERS,_______,DM_REC2,DM_REC1,DM_RSTP,_______,
+    _______,QK_MAKE,_______,DM_PLY2,DM_PLY1,_______,
+    _______,QK_FLSH,K_SECR1,K_SECR2,K_SECR3,K_SECR4,_______,
+    _______,_______,_______,ooooooo,_______,
+                                            _______,_______,
+                                                    _______,
+                                    KC_LCTL,_______,_______,
+
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,KC_VOLU,KC_F9,  KC_F10, KC_F11, KC_F12, _______,
+            KC_MUTE,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,
+    _______,KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,  _______,
+                    _______,ooooooo,_______,_______,_______,
+    _______,RESET,
+    _______,
+    _______,_______,KC_LALT
+),
 
-[L_FUNC] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_F11  ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,M_LCLIK, M_RCLIK, M_MCLIK, _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, M_WHLUP,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,M_LEFT,  M_DOWN,  M_UP    ,M_RIGHT, M_WHLDN, _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                   |--------|--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_F16  ,KC_F17  ,KC_F18  ,KC_F19  ,KC_F20  ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_VOLU, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           KC_MUTE, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_VOLD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______
-//--------|--------|--------|--------|--------|--------|--------|
+
+[L_MACROS] = LAYOUT_ergodox(
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,DM_REC2,DM_REC1,_______,_______,
+    _______,_______,_______,DM_PLY2,DM_PLY1,DM_RSTP,
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,
+                                            _______,_______,
+                                                    _______,
+                                    ooooooo,_______,_______,
+
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,SHEBANG,_______,_______,_______,_______,
+            PRG_NE, PRG_EQ, PRG_GEQ,PRG_LEQ,PRG_ARR,_______,
+    _______,_______,PS_ITEM,FS_PIPE,_______,FS_ARR, _______,
+                    _______,_______,_______,_______,_______,
+    _______,_______,
+    _______,
+    _______,_______,ooooooo
 ),
 
 
 
-[L_GAMING] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_ESC  ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KC_R    ,KC_S    ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  KC_LSFT, _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,KC_LALT ,KC_LCTL ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      KC_SPC,  KC_LSFT, _______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           _______ ,_______ ,KC_E    ,KC_I    ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,KC_UP,   KC_SLSH,
-//--------|--------|--------|--------|--------|--------|--------|
-                    _______ ,_______ ,KC_LEFT, KC_DOWN, KC_RGHT,
-//--------|--------|--------|--------|--------|--------|--------|
-  M_MCLIK ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  M_RCLIK ,
-//--------|--------|--------|--------|--------|--------|--------|
-  M_LCLIK ,KC_ENT  ,KC_BSPC
-//--------|--------|--------|--------|--------|--------|--------|
-)
-,
-
-// "Letter Layers"
-
-[L_LL_R] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,ooooooo ,KC_AMPR ,KC_PIPE ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_COLN ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PSLS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           KC_HASH ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PAST ,KC_TAB  ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_BSPC ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PMNS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    KC_P0   ,KC_PDOT ,KC_PEQL ,KC_PPLS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|
-  _______ ,
-//--------|--------|--------|
-  _______ ,KC_PENT ,MO_FUNC
-//--------|--------|--------|
-)
-,
-
-[L_LL_E] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  RJ_QMKV ,RJ_MAKE ,RJ_EQ   ,RJ_LEQ  ,RJ_GEQ  ,RJ_GEQR ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,RJ_SELS ,RJ_DUND ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           _______ ,_______ ,ooooooo ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|
-  _______ ,
-//--------|--------|--------|
-  _______ ,_______ ,_______
-//--------|--------|--------|
-)
-,
-
-[L_LL_I] = LAYOUT_ergodox(
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_SLSH ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_PIPE,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_BSLS ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KC_AMPR ,KC_LABK ,KC_RABK,
-//--------|--------|--------|--------|--------|--------|--------|
-                                               _______ ,_______ ,
-//                                            |--------|--------|
-                                                        _______ ,
-//                                   |--------|--------|--------|
-                                      _______ ,_______ ,_______ ,
-//                                   |--------|--------|--------|
-
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KC_UNDS, KC_GRV  ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-           _______ ,KC_MINS ,KC_QUOT ,ooooooo ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,KC_TILD, KC_DQT  ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-                    _______ ,_______ ,_______ ,_______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,
-//--------|--------|--------|--------|--------|--------|--------|
-  _______ ,_______ ,_______
-//--------|--------|--------|--------|--------|--------|--------|
+[L_SYSLEDS] = LAYOUT_ergodox(
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,
+                                            _______,_______,
+                                                    _______,
+                                    _______,_______,_______,
+
+    KC_NLCK,_______,_______,_______,_______,_______,_______,
+    KC_CAPS,_______,_______,_______,_______,_______,_______,
+            _______,_______,_______,_______,_______,_______,
+    KC_SLCK,_______,_______,_______,_______,_______,_______,
+                    _______,_______,_______,_______,ooooooo,
+    _______,_______,
+    _______,
+    _______,_______,_______
 )
 
+// Template
+// [_NUMBERS] = LAYOUT_ergodox(
+//     _______,_______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,
+//                                             _______,_______,
+//                                                     _______,
+//                                     _______,_______,_______,
+
+//     _______,_______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,
+//             _______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,
+//                     _______,_______,_______,_______,_______,
+//     _______,_______,
+//     _______,
+//     _______,_______,_______
+// ),
 
 };
 
-// The normal QMK functions ending in _user are overridden in the
-// replicaJunction userspace. Those functions handle my global
-// settings, and redirect to these _keymap functions if something
-// is unhandled. This allows me to keep most of my global preferences
-// in one place while still allowing keyboard-specific code.
+void keyboard_post_init_user_kb(void) {
+    ergodox_right_led_1_on();
+}
+
+
+////////////////////////////////////////////////////////////
+// System LED code
+////////////////////////////////////////////////////////////
+
+// We need to track both the layer state and the system LED state in
+// order to update the LEDs appropriately when either one changes.
+// These are both represented as a bitmask.
+//
+// There is a global 'layer_state' variable but it is set after the call
+// to layer_state_set_user(), so it doesn't work properly for our
+// purposes.
+static uint32_t current_layer_state = 0;
+static uint8_t sys_led_state = 0;
+
+// Whether the given layer (one of the constant defined at the top) is active.
+#define LAYER_ON(state, layer) (state & (1<<layer))
+
+// Brightness of LEDs (0-255)
+// Default value is 255. Use a lesser value for dimmer LEDs.
+static const uint8_t max_led_value = 255;
+
+void led_1_on(void) {
+    ergodox_right_led_1_on();
+    ergodox_right_led_1_set(max_led_value);
+}
+
+void led_2_on(void) {
+    ergodox_right_led_2_on();
+    ergodox_right_led_2_set(max_led_value);
+}
+
+void led_3_on(void) {
+    ergodox_right_led_3_on();
+    ergodox_right_led_3_set(max_led_value);
+}
+
+// The onboard LED doesn't support brightness, but this function keeps
+// things consistent.
+void led_board_on(void) {
+    ergodox_board_led_on();
+}
+
+void led_1_off(void) {
+    ergodox_right_led_1_off();
+}
+
+void led_2_off(void) {
+    ergodox_right_led_2_off();
+}
+
+void led_3_off(void) {
+    ergodox_right_led_3_off();
+}
+
+void led_board_off(void) {
+    ergodox_board_led_off();
+}
 
-// The idea was shamelessly copied from the amazing Drashna.
+void set_leds_by_system_state(uint8_t led_state) {
+    led_t host_led_state = host_keyboard_led_state();
 
-// Nothing to do here, so I've commented it out.
-// bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-//   return true;
-// }
+    if (led_state & host_led_state.num_lock) {
+        led_1_on();
+    }
+    else {
+        led_1_off();
+    }
+
+    if (led_state & host_led_state.caps_lock) {
+        led_2_on();
+    }
+    else {
+        led_2_off();
+    }
+
+    if (led_state & host_led_state.scroll_lock) {
+        led_3_on();
+    }
+    else {
+        led_3_off();
+    }
+}
+
+void set_leds_by_layer_state(uint32_t layer_state) {
+    if (LAYER_ON(layer_state, L_FN)) {
+        led_1_on();
+        led_2_on();
+        led_3_on();
+        led_board_off();
+    }
+    else if (LAYER_ON(layer_state, L_GAMING)) {
+        led_1_off();
+        led_2_off();
+        led_3_off();
+        led_board_on();
+    }
+    else if (LAYER_ON(layer_state, L_NUMBERS)) {
+        led_1_on();
+        led_2_off();
+        led_3_off();
+        led_board_off();
+    }
+    else if (LAYER_ON(layer_state, L_NAVIGATION)) {
+        led_1_off();
+        led_2_on();
+        led_3_off();
+        led_board_off();
+    }
+    else {
+        led_1_on();
+        led_2_off();
+        led_3_off();
+        led_board_off();
+    }
+}
 
-// void matrix_init_keymap(void) {};
+void led_set_kb(uint8_t usb_led) {
+    sys_led_state = usb_led;
 
-void matrix_scan_keymap(void) {
+    if (LAYER_ON(current_layer_state, L_SYSLEDS)) {
+        set_leds_by_system_state(sys_led_state);
+    }
+    else {
+        set_leds_by_layer_state(current_layer_state);
+    }
 
-    uint8_t layer = biton32(layer_state);
-    // uint8_t default_layer = biton32(layer_state);
+    led_set_user(usb_led);
+}
 
-    ergodox_board_led_off();
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    current_layer_state = state;
 
-    switch (layer) {
-        case L_COLEMAK:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_off();
-            ergodox_right_led_3_off();
-            break;
-        case L_NUM:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_off();
-            break;
-        case L_EXTEND:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_off();
-            ergodox_right_led_3_on();
-            break;
-        case L_FUNC:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case L_GAMING:
-            ergodox_right_led_1_off();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            // none
-            break;
+    if (LAYER_ON(state, L_SYSLEDS)) {
+        set_leds_by_system_state(sys_led_state);
+    }
+    else {
+        set_leds_by_layer_state(state);
     }
 
-};
+    return update_tri_layer_state(state, L_SYMBOLS, L_NAVIGATION, L_MACROS);
+}
diff --git a/layouts/community/ergodox/replicaJunction/readme.md b/layouts/community/ergodox/replicaJunction/readme.md
index 9a1c09550a..57e4480474 100644
--- a/layouts/community/ergodox/replicaJunction/readme.md
+++ b/layouts/community/ergodox/replicaJunction/readme.md
@@ -1,94 +1,5 @@
 # replicaJunction - Ergodox (EZ) Layout
 
-This keymap is designed to complement my Atreus keyboard layout, found in keyboards/atreus. The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. Since I use both keyboards, I've designed these layouts in an effort to make switching between the two as easy as possible.
+Most of the goodies in this layout are defined in [my userspace folder](../../../../users/replicaJunction/readme.md). Better explanations of the interesting features are provided there.
 
-I've also tried to make use of the extra keys on the Ergodox in as logical of a manner as possible, adding to the layers in the Atreus config without disturbing what's there already. This allows for things like F11-F20, the Application (Menu) key, and better media key placement.
-
-Because of this design philosophy, there are several cases where functionality is duplicated and keys are available in more than one place. I don't find that a bad thing.
-
-This layout makes heavy use of dual-role keys. Dual-role keys seemed to affect my typing speed for quite some time until I discovered the [`USE_PERMISSIVE_HOLD` flag](https://docs.qmk.fm/features/advanced-keycodes#permissive-hold). After applying this flag, I haven't had an issue with dual-role keys and typing quickly.
-
-The default letter layout in this keymap is [Colemak-ModDH](https://colemakmods.github.io/mod-dh/). I use the "matrix version" of that layout, which retains the M key on the home row as in normal Colemak.
-
-## Design Goals
-
-I designed this layout with the following goals in mind:
-
-* Atreus layout compatibility.
-* Nothing may interfere with ordinary typing.
-* Symbols need to be accessible quickly and organized in a manner I can remember.
-* Limit more difficult finger movements (and pinky usage in general).
-* Gaming should be easy.
-
-### Atreus layout compatibility
-
-Most of the functionality in this layout isn't strictly necessary - the Ergodox is a 76-key keyboard, and it's got plenty of room for extra keys and functionality compared to smaller boards like the Atreus. However, I've replicated a lot of 40% functionality on this layout in order to preserve my muscle memory.
-
-The biggest deviation is the Shift keys. My Atreus uses thumb keys for Shift, but the Ergodox doesn't have corresponding thumb keys in a comfortable enough location. I briefly tried using the outermost 1u keys in the bottom row as Shift keys, but they take a large enough thumb movement that it interfered with typing.
-
-### Nothing may interfere with ordinary typing
-
-For a long time, this meant that I couldn't use letters or home row keys as dual-role keys. I'm a fast typer, and I'm sometimes already typing the next letter before I've fully released the previous one. Normal keyboards don't care about this, but if I started adding dual-role functionality to letters, I found that I would sometimes type the next letter before releasing the layer toggle, and the letter I tried to send would still be sent under the layer I thought I'd left off.
-
-Fortunately, though, QMK has addressed this with the `PERMISSIVE_HOLD` flag. [Details are on the QMK docs page.](https://docs.qmk.fm/#/feature_advanced_keycodes?id=permissive-hold)
-
-Using that flag, I'm comfortable having layer shift keys on the home row, and this goes a long way to eliminate finger stress.
-
-### Sympols need to be accessible quickly
-
-Symbols are available under my left hand by holding the I key (on my right hand). I've grouped parenthesis, slashes, and braces together; the remaining symbols are ordered in the same way as they appear on USA keycap legends (for example, 1 is !, so that symbol is first in my lineup). Practically, I just had to get used to these other "misc" symbols.
-
-This also means that some symbols are accessible in more than one way. For example, the carats (greater than and less than) are available both in the "normal" location (Shift+Comma / Shift+Period) and on the symbol layer. I make regular changes to some of the symbols I don't use as commonly as I think of them.
-
-### Limit more difficult finger movements
-
-This is why I kept trying to put layer toggles on the home row keys instead of just placing them on random thumb keys. I suffer from RSI, and it's important for me to watch out for more "stressful" finger movements.
-
-The home row is the easiest row for your fingers to hit, followed by the upper row, and the lower row is noticeably more difficult to press. Because of this, I favored the upper row over the lower one any time I had the option to do so.
-
-### Gaming should be easy
-
-I've added a dedicated gaming layer accessible by pressing the upper-right key on the right hand (next to the 6 key). This layer disables most of the tap/hold functionality to allow keys to act normally. This layer also reverses Backspace and Space (so Space is available on the left thumb while the right hand is on the mouse).
-
-I've also added a lock key on the right hand's bottom 1.5u key and mouse keys on the right thumb cluster. This has been amazingly helpful for games that involve holding keys for extended times (for example, I can hold the left mouse button in Minecraft to continually mine).
-
-I strongly recommend using ESDF (QWERTY positions) for movement on the Ergodox rather than WASD. This makes the thumb keys much more accessible.
-
-Finally, I considered having the gaming layer revert to a QWERTY layout, but decided against it because it really threw me off when I needed to type in chat. I've accepted that I will need to rebind keys in most games as a reasonable compromise.
-
-## Features
-
-### ZXC Mods
-
-Keys on the bottom row of each half of this keyboard can be held to send modifier keys. I've tried to map this in a relatively logical manner:
-
-* Z / Slash: Ctrl
-* X / Period: GUI
-* C / Comma: Ctrl+Alt
-* D / H: Alt
-
-This is an example of maintaining compatibility with the Atreus layout. An Ergodox doesn't really need these keys, but I've grown accustomed to them on the Atreus, so they're copied here to preserve compatibility.
-
-### Layer Switching - Tap Dance
-
-The lower-left key on the left hand can be used to apply or remove layers based on a number of taps:
-
-* 1 tap sends Escape, and also disables any persistent layers.
-* 2 taps enables the Number pad layer.
-* 3 taps enables the QWERTY layer.
-* 5 or more taps resets the keyboard.
-
-## Extend Layer
-
-[Originally found on the Colemak forums](https://forum.colemak.com/topic/2014-extend-extra-extreme/), having a QMK-powered keyboard allows a super easy implementation of this concept. The idea is to place commonly-used keys under easy reach of your hands. Since I work with text often, my most common needs are things like Ctrl+Shift+arrow keys, and they're easy to access using this layer. (While technically it's four keypresses instead of just three, since it takes one key to enter the layer, that one key is a thumb button and the other three are all on the home row, so I find it much more comfortable than modifiers on a traditional keyboard.)
-
-Also featured in this layer is easy access to Tab, plus a Shift+Tab key. Alt-Tabbing back and forth, along with Ctrl-Tab, are super easy and friendly. When I need Ctrl+Alt+Delete, I typically use the ones found on this layer.
-
-## Credits
-
-* [Drashna](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme.md)
-  * User / keymap function ideas
-* [Jeremy](https://github.com/qmk/qmk_firmware/blob/master/keyboards/atreus/keymaps/jeremy/readme.md)
-  * Sanity check on the Function keys (_of course they should be in rows of 4, not rows of 3 like a number pad. Why did I ever use anything else?_)
-* [DreymaR of the Colemak forums](https://forum.colemak.com/topic/2014-extend-extra-extreme/)
-  * Original idea of the Extend layer
+One feature is worth pointing out here, since it's keyboard-specific: handling of the LEDs. Normally, I use the LEDs to indicate layer state, but it's occasionally useful to be able to view the system state as well (num lock, caps lock, scroll lock). The final layer in the keymap, `L_SYSLEDS`, is used to indicate this. I have a MO key that temporarily switches the LED behavior to show system state, and on this layer, the three keys with LEDs are each used to toggle the respective lock. 
diff --git a/layouts/community/ergodox/replicaJunction/rules.mk b/layouts/community/ergodox/replicaJunction/rules.mk
index 8a719766cd..523639cc46 100644
--- a/layouts/community/ergodox/replicaJunction/rules.mk
+++ b/layouts/community/ergodox/replicaJunction/rules.mk
@@ -1,8 +1,33 @@
 # https://docs.qmk.fm/getting_started_make_guide.html
 
-MOUSEKEY_ENABLE = yes
-TAP_DANCE_ENABLE = yes
+# Userspace options
+USER_CAPS_WORD_ENABLE = yes
+USER_NUM_WORD_ENABLE = yes
+USER_SECRETS_ENABLE = yes
+USER_SUPER_ALT_TAB_ENABLE = yes
+
+# Features to enable
+DYNAMIC_MACRO_ENABLE = yes
 KEY_LOCK_ENABLE = yes
-RGBLIGHT_ENABLE = no
-# CONSOLE_ENABLE = no
-# COMMAND_ENABLE = no
+
+# Extra features that are nice but takes space. Enable only if they're
+# used in the layout.
+WPM_ENABLE = no
+# EXTRAKEY_ENABLE = no        # For volume keys and similar
+# MOUSEKEY_ENABLE = no        # Them mouse keys yo
+KEY_OVERRIDE_ENABLE = no
+LEADER_ENABLE = no
+TAP_DANCE_ENABLE = no
+# RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
+RGB_MATRIX_ENABLE = no
+
+# Features I definitely don't care aboud
+LTO_ENABLE = yes
+CONSOLE_ENABLE = no
+VERBOSE = no
+DEBUG_MATRIX_SCAN_RATE  = no
+DEBUG_MATRIX = no
+MAGIC_ENABLE = no
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+