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

18 files changed, 555 insertions, 380 deletions

diff --git a/keyboards/atreus/keymaps/replicaJunction/config.h b/keyboards/atreus/keymaps/replicaJunction/config.h
index 8e786aa0da..a02f9a95db 100644
--- a/keyboards/atreus/keymaps/replicaJunction/config.h
+++ b/keyboards/atreus/keymaps/replicaJunction/config.h
@@ -1,11 +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
+// 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
 
-#define L_COLEMAK 0
-#define L_NUM     1
-#define L_EXTEND  2
-#define L_FUNC    3
-#define L_LL_R    4
-#define L_LL_E    5
-#define L_LL_I    6
+// "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/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index c3cc371151..32cc95d2fd 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,78 +1,95 @@
-/*
- * Keyboard: Atreus
- * 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 "replicaJunction.h"
 
+#define BSP_SYM LT(L_SYMBOLS, KC_BSPC)
+#define SPC_NAV LT(L_NAVIGATION, KC_SPC)
+#define EQL_FUN LT(L_FN, KC_EQL)
+
+#define ESC_SFT LSFT_T(KC_ESC)
+#define TAB_SFT RSFT_T(KC_TAB)
+
+#define DF_TYPE DF(L_BASE)
+#define DF_GAME DF(L_GAMING)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[L_COLEMAK] = LAYOUT(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    KC_R_LT, KC_S_LT, KC_T,    KC_G,                      KC_M,    KC_N,    KC_E_LT, KC_I_LT, KC_O,
-  KX_Z_MT, KX_X_MT, KX_C_MT, KX_D_MT, KC_V,                      KC_K,    KX_H_MT, KX_COMT, KX_DOMT, KX_SLMT,
-  TD_LAYR, KC_LGUI, KC_TAB,  KC_LSFT, KX_BKNM, KX_DCTL, KX_NALT, KX_SPAC, KC_RSFT, KC_MINS, KC_QUOT, KC_EQL
-)
-,
+[L_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,
+    KC_A,   KC_R,   KC_S,   KC_T,   KC_G,                   KC_M,   KC_N,   KC_E,   KC_I,   KC_O,
+    KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,                   KC_K,   KC_H,   KC_COMM,KC_DOT, KC_SLSH,
+    KC_ESC, KC_LGUI,KC_TAB, ESC_SFT,BSP_SYM,CTL_DEL,ALT_ENT,SPC_NAV,TAB_SFT,KC_MINS,KC_QUOT,EQL_FUN
+),
 
-[L_NUM] = LAYOUT(
-  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_SLSH,                   KC_COLN, KC_7,    KC_8,    KC_9,    KC_SLSH,
-  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_PIPE,                   KC_HASH, KC_4,    KC_5,    KC_6,    KC_ASTR,
-  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BSLS,                   KC_BSPC, KC_1,    KC_2,    KC_3,    KC_MINS,
-  _______, KC_AMPR, KC_TILD, KC_GRV,  ooooooo, _______, KC_ENT,  MO_FUNC, KC_0,    KC_DOT,  KC_EQL,  KC_PLUS
-)
-,
+[L_GAMING] = LAYOUT(
+    _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+    _______,_______,KC_C,   KC_D,   _______,                _______,_______,_______,_______,_______,
+    _______,KC_TAB, KC_LALT,KC_LSFT,KC_SPC, KC_LCTL,KC_LALT,KC_BSPC,KC_BTN1,KC_BTN2,KC_BTN3,_______
+),
 
-[L_EXTEND] = LAYOUT(
-  _______, _______, _______, KC_APP,  KX_CGR,                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,
-  KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______,                    KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
-  _______, _______, _______, KX_SRCH, KX_PAST,                    _______, KX_STAB, KC_TAB,  _______, KC_INS,
-  _______, _______, _______, _______, MO_FUNC,  KC_DEL,  KC_ENT,  _______, _______, _______, _______, KC_PSCR
-)
-,
+[L_NUMBERS] = LAYOUT(
+    _______,_______,_______,_______,_______,                KC_HASH,KC_7,   KC_8,   KC_9,   KC_SLSH,
+    _______,_______,_______,_______,_______,                KC_PLUS,KC_4,   KC_5,   KC_6,   KC_ASTR,
+    _______,_______,_______,_______,_______,                KC_MINS,KC_1,   KC_2,   KC_3,   KC_BSLS,
+    _______,_______,_______,_______,_______,_______,_______,_______,KC_0,   KC_0,   KC_DOT, KC_ENT
+),
 
-[L_FUNC] = LAYOUT(
-  _______, _______, M_LCLIK, M_RCLIK, M_MCLIK,                   KC_VOLU, KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, M_WHLUP,                   KC_MUTE, KC_F5,   KC_F6,   KC_F7,   KC_F8,
-  M_LEFT,  M_DOWN,  M_UP,    M_RIGHT, M_WHLDN,                   KC_VOLD, KC_F1,   KC_F2,   KC_F3,   KC_F4,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-,
+[L_SYMBOLS] = LAYOUT(
+    KC_AT,  KC_LT,  KC_DLR, KC_GT,  XXXXXXX,                XXXXXXX,KC_LBRC,KC_UNDS,KC_RBRC,XXXXXXX,
+    KC_BSLS,KC_LPRN,KC_DQUO,KC_RPRN,KC_HASH,                KC_PERC,KC_LCBR,KC_EQL, KC_RCBR,KC_PIPE,
+    KC_EXLM,KC_COLN,KC_ASTR,KC_PLUS,XXXXXXX,                XXXXXXX,KC_AMPR,KC_CIRC,KC_TILD,KC_GRV,
+    _______,_______,_______,_______,ooooooo,_______,_______,ooooooo,CAPWORD,_______,_______,_______
+),
 
-[L_LL_R] = LAYOUT(
-  _______, _______, _______, _______, _______,                   KC_COLN, KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
-  _______, ooooooo, KC_AMPR, KC_PIPE, _______,                   KC_HASH, KC_P4,   KC_P5,   KC_P6,   KC_PAST,
-  _______, _______, _______, _______, _______,                   KC_BSPC, KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_DOT,  KC_EQL,  KC_PLUS
-)
-,
+[L_NAVIGATION] = LAYOUT(
+    OS_UNDO,OS_CUT, OS_PAST,OS_COPY,OS_SALL,                KC_PGUP,KC_HOME,KC_UP,  KC_END, KC_DEL,
+    KC_LGUI,KC_LALT,KC_LSFT,KC_LCTL,_______,                KC_PGDN,KC_LEFT,KC_DOWN,KC_RGHT,KC_BSPC,
+    WIN_V,  _______,_______,OS_FIND,SEARCH,                 _______,SFT_TAB,KC_TAB, KC_APP, KC_PSCR,
+    _______,_______,_______,NUMWORD,ooooooo,_______,_______,ooooooo,_______,_______,_______,_______
+),
 
-[L_LL_E] = LAYOUT(
-  RJ_MAKE, RJ_EQ,   RJ_LEQ,  RJ_GEQ,  RJ_GEQR,                   _______, _______, _______, _______, _______,
-  _______, _______, RJ_SELS, RJ_DUND, _______,                   _______, _______, ooooooo, _______, _______,
-  _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-,
+[L_FN] = LAYOUT(
+    RESET,  _______,_______,_______,_______,                KC_VOLU,KC_F9,  KC_F10, KC_F11, KC_F12,
+    MS_JIGL,_______,_______,_______,_______,                KC_MUTE,KC_F5,  KC_F6,  KC_F7,  KC_F8,
+    _______,K_SECR1,K_SECR2,K_SECR3,K_SECR4,                KC_VOLD,KC_F1,  KC_F2,  KC_F3,  KC_F4,
+    DF_TYPE,DF_GAME,_______,_______,_______,KC_LCTL,KC_LALT,_______,_______,_______,_______,ooooooo
+),
 
-[L_LL_I] = LAYOUT(
-  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_SLSH,                   _______, KC_UNDS, KC_GRV,  _______, _______,
-  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_PIPE,                   _______, KC_MINS, KC_QUOT, ooooooo,  _______,
-  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BSLS,                   _______, KC_TILD, KC_DQT,  _______, _______,
-  _______, KC_AMPR, KC_LABK, KC_RABK, _______, _______, _______, _______, _______, _______, _______, _______
+[L_MACROS] = LAYOUT(
+    QK_MAKE,_______,DM_REC2,DM_REC1,DM_RSTP,                _______,SHEBANG,_______,_______,_______,
+    QK_FLSH,_______,DM_PLY2,DM_PLY1,_______,                PRG_NE, PRG_EQ, PRG_GEQ,PRG_LEQ,PRG_ARR,
+    QK_VERS,_______,_______,_______,_______,                _______,PS_ITEM,FS_PIPE,_______,FS_ARR,
+    _______,_______,_______,_______,ooooooo,_______,_______,ooooooo,_______,_______,_______,_______
 )
 
-};
 
-// Uncomment any of these to add keyboard-specific code. Otherwise, they
-// will use user defaults defined in the replicaJunction.h header file.
+// Template
+// [L_FUNC] = LAYOUT(
+//     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+//     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+// ),
 
-// bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-//   return true;
-// }
+};
 
-// void matrix_init_keymap(void) {};
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, L_SYMBOLS, L_NAVIGATION, L_MACROS);
+}
 
-// void matrix_scan_keymap(void) {};
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/base-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/base-layer.txt
deleted file mode 100644
index aec41316f2..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/base-layer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2},"F"],
-[{y:-0.65,x:1},"W",{x:1},"P"],
-[{y:-0.75},"Q"],
-[{y:-0.9,x:4},"B"],
-[{y:-0.7,x:2},"S"],
-[{y:-0.65,x:1,c:"#45b866"},"R",{x:1,c:"#cccccc"},"T"],
-[{y:-0.75},"A"],
-[{y:-0.9,x:4},"G"],
-[{y:-0.7,x:2},"C\n\n\n<i class='fa fa-windows'></i>"],
-[{y:-0.65,x:1},"X\n\n\nCtrl",{x:1},"D\n\n\nCtrlAlt"],
-[{y:-0.75},"Z"],
-[{y:-0.9,x:4},"V\n\n\nAlt"],
-[{y:-0.75,x:5,h:1.5},"Del\nCtrl"],
-[{y:-0.95,x:2},"Tab"],
-[{y:-0.65,x:1,a:7,fa:[7]},"<i class='fa fa-windows'></i>",{x:1,a:4,f:3},"Shift"],
-[{y:-0.75,f:3},"Layer tap"],
-[{y:-0.9,x:4,f:3},"<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>"],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2,f:3},"U"],
-[{y:-0.65,x:1,f:3},"L",{x:1,f:3},"Y"],
-[{y:-0.75,x:4,f:3},":\n;"],
-[{y:-0.9,f:3},"J"],
-[{y:-0.7,x:2,c:"#ffb07b",f:3},"E"],
-[{y:-0.65,x:1,c:"#cccccc",f:3},"N",{x:1,c:"#5dcde3",f:3},"I"],
-[{y:-0.75,x:4,c:"#cccccc",f:3},"O"],
-[{y:-0.9,f:3},"M"],
-[{y:-0.7,x:2,f:3},"<\n,\n\nCtrlAlt"],
-[{y:-0.65,x:1,f:3},"H\n\n\nAlt",{x:1,f:3},">\n.\n\n<i class='fa fa-windows'></i>"],
-[{y:-0.75,x:4,f:3},"?\n/\n\nCtrl"],
-[{y:-0.9,f:3},"K"],
-[{y:-0.75,x:-1,f:3,h:1.5},"Enter\nAlt"],
-[{y:-0.95,x:2,f:3},"_\n-"],
-[{y:-0.65,x:1,f:3},"Shift",{x:1,f:3},"\"\n'"],
-[{y:-0.75,x:4,f:3},"+\n="],
-[{y:-0.9,c:"#ffe08d",f:3},"Space"]
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/e-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/e-layer.txt
deleted file mode 100644
index 2b4105b2b4..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/e-layer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2},"<="],
-[{y:-0.65,x:1},"==",{x:1},">="],
-[{y:-0.75},"make"],
-[{y:-0.9,x:4},"=>"],
-[{y:-0.7,x:2},"select *"],
-[{y:-0.65,x:1,a:7},"",{x:1,a:4},"$_"],
-[{y:-0.75,a:7},""],
-[{y:-0.9,x:4},""],
-[{y:-0.7,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{y:-0.75,x:5,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""],
-[{y:-0.7,x:2,c:"#ffb07b"},""],
-[{y:-0.65,x:1,c:"#cccccc"},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""],
-[{y:-0.7,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""],
-[{y:-0.75,x:-1,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""]
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/fn-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/fn-layer.txt
deleted file mode 100644
index d45fb7e97d..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/fn-layer.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2},"RClick"],
-[{y:-0.65,x:1,a:7},"",{x:1,a:4},"LClick"],
-[{y:-0.75,a:7},""],
-[{y:-0.9,x:4,a:4},"MClick"],
-[{y:-0.7,x:2},"Alt"],
-[{y:-0.65,x:1},"Shift",{x:1},"Ctrl"],
-[{y:-0.75,a:7,fa:[7]},"<i class='fa fa-windows'></i>"],
-[{y:-0.9,x:4,a:4,fa:[5,0,0,0,0,0,0,0,0,0,7]},"<i class='kb kb-Unicode-Scroll-1'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Top-4'></i>"],
-[{y:-0.7,x:2,fa:[0,0,0,0,0,0,0,0,0,0,7]},"<i class='fa fa-mouse-pointer'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Up'></i>"],
-[{y:-0.65,x:1},"<i class='fa fa-mouse-pointer'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Down'></i>",{x:1},"<i class='fa fa-mouse-pointer'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Right'></i>"],
-[{y:-0.75},"<i class='fa fa-mouse-pointer'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Left'></i>"],
-[{y:-0.9,x:4,fa:[5,0,0,0,0,0,0,0,0,0,7]},"<i class='kb kb-Unicode-Scroll-1'></i>\n\n\n\n\n\n\n\n\n\n<i class='kb kb-Arrows-Bottom-4'></i>"],
-[{y:-0.75,x:5,a:7,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4,c:"#ffe08d"},""],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2,c:"#cccccc",a:4,f:3},"F10"],
-[{y:-0.65,x:1,f:3},"F9",{x:1,f:3},"F11"],
-[{y:-0.75,x:4,f:3},"F12"],
-[{y:-0.9,a:7},""],
-[{y:-0.7,x:2,a:4,f:3},"F6"],
-[{y:-0.65,x:1,f:3},"F5",{x:1,f:3},"F7"],
-[{y:-0.75,x:4,f:3},"F8"],
-[{y:-0.9,a:7},""],
-[{y:-0.7,x:2,a:4,f:3},"F2"],
-[{y:-0.65,x:1,f:3},"F1",{x:1,f:3},"F3"],
-[{y:-0.75,x:4,f:3},"F4"],
-[{y:-0.9,a:7},""],
-[{y:-0.75,x:-1,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9,c:"#ffe08d"},""]
-
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/i-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/i-layer.txt
deleted file mode 100644
index 45bef783a3..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/i-layer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2},"{"],
-[{y:-0.65,x:1},"@",{x:1},"}"],
-[{y:-0.75},"!"],
-[{y:-0.9,x:4},"/"],
-[{y:-0.7,x:2},"("],
-[{y:-0.65,x:1},"$",{x:1},")"],
-[{y:-0.75},"#"],
-[{y:-0.9,x:4},"|"],
-[{y:-0.7,x:2},"["],
-[{y:-0.65,x:1},"^",{x:1},"]"],
-[{y:-0.75},"%"],
-[{y:-0.9,x:4},"\\"],
-[{y:-0.75,x:5,a:7,h:1.5},""],
-[{y:-0.95,x:2,a:4},"<"],
-[{y:-0.65,x:1},"&",{x:1},">"],
-[{y:-0.75,a:7},""],
-[{y:-0.9,x:4},""],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2,a:4},"`"],
-[{y:-0.65,x:1},"_",{x:1,a:7},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""],
-[{y:-0.7,x:2,a:4},"'"],
-[{y:-0.65,x:1},"-",{x:1,c:"#5dcde3",a:7},""],
-[{y:-0.75,x:4,c:"#cccccc"},""],
-[{y:-0.9},""],
-[{y:-0.7,x:2,a:4},"\""],
-[{y:-0.65,x:1},"~",{x:1,a:7},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""],
-[{y:-0.75,x:-1,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4},""],
-[{y:-0.9},""]
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/r-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/r-layer.txt
deleted file mode 100644
index 3d44383863..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/r-layer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2,a:7},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{y:-0.7,x:2,a:4},"&"],
-[{y:-0.65,x:1,c:"#45b866",a:7},"",{x:1,c:"#cccccc",a:4},"|"],
-[{y:-0.75,a:7},""],
-[{y:-0.9,x:4},""],
-[{y:-0.7,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{y:-0.75,x:5,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2,a:4},"8"],
-[{y:-0.65,x:1},"7",{x:1},"9"],
-[{y:-0.75,x:4},"/"],
-[{y:-0.9},":"],
-[{y:-0.7,x:2},"5"],
-[{y:-0.65,x:1},"4",{x:1},"6"],
-[{y:-0.75,x:4},"*"],
-[{y:-0.9},"#"],
-[{y:-0.7,x:2},"2"],
-[{y:-0.65,x:1},"1",{x:1},"3"],
-[{y:-0.75,x:4},"-"],
-[{y:-0.9},"<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>"],
-[{y:-0.75,x:-1,a:7,h:1.5},""],
-[{y:-0.95,x:2,a:4},"."],
-[{y:-0.65,x:1},"0",{x:1},"="],
-[{y:-0.75,x:4},"+"],
-[{y:-0.9},"Space"]
diff --git a/keyboards/atreus/keymaps/replicaJunction/kle/space-layer.txt b/keyboards/atreus/keymaps/replicaJunction/kle/space-layer.txt
deleted file mode 100644
index d1ffa35f89..0000000000
--- a/keyboards/atreus/keymaps/replicaJunction/kle/space-layer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-[{r:10,rx:1,y:-0.1,x:2,a:7},""],
-[{y:-0.65,x:1},"",{x:1,fa:[7]},"<i class='kb kb-Hamburger-Menu'></i>"],
-[{y:-0.75},""],
-[{y:-0.9,x:4},"<i class='fa fa-terminal'></i>"],
-[{y:-0.7,x:2,a:4,f:3},"Alt"],
-[{y:-0.65,x:1,f:3},"Shift",{x:1,f:3},"Ctrl"],
-[{y:-0.75,a:7},"<i class='fa fa-windows'></i>"],
-[{y:-0.9,x:4},""],
-[{y:-0.7,x:2},""],
-[{y:-0.65,x:1},"",{x:1},"<i class='fa fa-search'></i>"],
-[{y:-0.75},""],
-[{y:-0.9,x:4},"<i class='fa fa-clipboard'></i>"],
-[{y:-0.75,x:5,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75},""],
-[{y:-0.9,x:4},""],
-[{r:-10,rx:7,ry:0.965,y:-0.2,x:2},"<i class='kb kb-Arrows-Up'></i>"],
-[{y:-0.65,x:1,a:4,f:3},"Home",{x:1,f:3},"End"],
-[{y:-0.75,x:4,f:3},"Delete"],
-[{y:-0.9,f:3},"PgUp"],
-[{y:-0.7,x:2,a:7},"<i class='kb kb-Arrows-Down'></i>"],
-[{y:-0.65,x:1},"<i class='kb kb-Arrows-Left'></i>",{x:1},"<i class='kb kb-Arrows-Right'></i>"],
-[{y:-0.75,x:4,a:4,f:3},"Bksp"],
-[{y:-0.9,f:3},"PgDn"],
-[{y:-0.7,x:2,f:3},"Tab"],
-[{y:-0.65,x:1,f:3},"Shift+\n\n\n\n\n\nTab",{x:1,a:7},""],
-[{y:-0.75,x:4,a:4,f:3},"Insert"],
-[{y:-0.9,a:7},""],
-[{y:-0.75,x:-1,h:1.5},""],
-[{y:-0.95,x:2},""],
-[{y:-0.65,x:1},"",{x:1},""],
-[{y:-0.75,x:4,a:4,f:3},"Prnt Scrn"],
-[{y:-0.9,c:"#ffe08d",a:7},""]
diff --git a/keyboards/atreus/keymaps/replicaJunction/readme.md b/keyboards/atreus/keymaps/replicaJunction/readme.md
index f1d6c47b13..6aa356f4f7 100644
--- a/keyboards/atreus/keymaps/replicaJunction/readme.md
+++ b/keyboards/atreus/keymaps/replicaJunction/readme.md
@@ -1,103 +1,7 @@
 # replicaJunction - Atreus Layout
 
-This layout is designed to make the absolute most out of the Atreus 40% keyboard.
+I no longer actively use this keyboard. I've replaced it with the [Keyboardio Atreus](../../../keyboardio/atreus/keymaps/replicaJunction/readme.md).
 
-This layout is probably not perfect for you. That's okay! Use it for ideas as you design your own perfect layout.
+I still try to make sure the layout compiles, but I'm no longer tweaking it or adding new features.
 
-Most of the custom logic in this keyboard is actually not in these files. Instead, it's in the directory `/users/replicaJunction` (from the root of the QMK repo). This allows me to share macros and custom logic between multiple keyboards. A `process_record_keyboard()` function defined weakly in `replicaJunction.h` allows keyboards to process records individually as well without overriding the `process_record_user()` function. (My Ergodox uses this to handle its LEDs, for example.)
-
-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:
-
-* 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).
-
-### 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.
-
-## 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
-
-Combined with Shift keys on the thumbs, this makes all modifiers quick to access on either hand.
-
-### Layer 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.
-* 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.
-
-## Layout Images
-
-Colored keys indicate keys that swap to another layer when held.
-
-These images are located in the `kle` folder of this directory. Also included is the "raw data" from Keyboard-Layout-Editor in a corresponding text file.
-
-### Base layer
-
-![Base layer](kle/base-layer.png)
-
-### R layer
-
-![R layer](kle/r-layer.png)
-
-### E layer
-
-![E layer](kle/i-layer.png)
-
-### I layer
-
-![I layer](kle/i-layer.png)
-
-### Space layer
-
-![Space layer](kle/space-layer.png)
-
-### Function layer
-
-![Function layer](kle/fn-layer.png)
-
-## 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
+Most of the interesting features in this layout are defined in [my userspace folder](../../../../users/replicaJunction/readme.md). Refer to the documentation and code there for more details.
diff --git a/keyboards/atreus/keymaps/replicaJunction/rules.mk b/keyboards/atreus/keymaps/replicaJunction/rules.mk
index 9ff9c3fbb2..13730aec65 100644
--- a/keyboards/atreus/keymaps/replicaJunction/rules.mk
+++ b/keyboards/atreus/keymaps/replicaJunction/rules.mk
@@ -1,12 +1,28 @@
-# https://docs.qmk.fm/getting_started_make_guide.html
+# Userspace options
+USER_CAPS_WORD_ENABLE = yes
+USER_MOUSE_JIGGLE_ENABLE = yes
+USER_NUM_WORD_ENABLE = yes
+USER_SECRETS_ENABLE = yes
 
-MOUSEKEY_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-# KEY_LOCK_ENABLE = yes
-# CONSOLE_ENABLE = no
-# COMMAND_ENABLE = no
+DYNAMIC_MACRO_ENABLE = yes
 
-# Use the "Unicode map" method
-# UNICODE_ENABLE = no
-# UNICODEMAP_ENABLE = yes
+# 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
diff --git a/keyboards/keyboardio/atreus/keymaps/replicaJunction/config.h b/keyboards/keyboardio/atreus/keymaps/replicaJunction/config.h
new file mode 100644
index 0000000000..a02f9a95db
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/config.h
@@ -0,0 +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
+
+// 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/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
new file mode 100644
index 0000000000..9e47155f44
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
@@ -0,0 +1,94 @@
+/* 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 "replicaJunction.h"
+
+#define BSP_SYM LT(L_SYMBOLS, KC_BSPC)
+#define SPC_NAV LT(L_NAVIGATION, KC_SPC)
+#define EQL_FUN LT(L_FN, KC_EQL)
+
+#define ESC_SFT LSFT_T(KC_ESC)
+#define TAB_SFT RSFT_T(KC_TAB)
+
+#define DF_TYPE DF(L_BASE)
+#define DF_GAME DF(L_GAMING)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[L_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,
+    KC_A,   KC_R,   KC_S,   KC_T,   KC_G,                   KC_M,   KC_N,   KC_E,   KC_I,   KC_O,
+    KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,   SALTTAB,KC_BSLS,KC_K,   KC_H,   KC_COMM,KC_DOT, KC_SLSH,
+    KC_ESC, KC_LGUI,KC_TAB, ESC_SFT,BSP_SYM,CTL_DEL,ALT_ENT,SPC_NAV,TAB_SFT,KC_MINS,KC_QUOT,EQL_FUN
+),
+
+[L_GAMING] = LAYOUT(
+    _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
+    _______,_______,KC_C,   KC_D,   _______,_______,KC_LOCK,_______,_______,_______,_______,_______,
+    _______,KC_TAB, KC_LALT,KC_LSFT,KC_SPC, KC_LCTL,KC_LALT,KC_BSPC,KC_BTN1,KC_BTN2,KC_BTN3,_______
+),
+
+[L_NUMBERS] = LAYOUT(
+    _______,_______,_______,_______,_______,                KC_HASH,KC_7,   KC_8,   KC_9,   KC_SLSH,
+    _______,_______,_______,_______,_______,                KC_PLUS,KC_4,   KC_5,   KC_6,   KC_ASTR,
+    _______,_______,_______,_______,_______,_______,_______,KC_MINS,KC_1,   KC_2,   KC_3,   KC_BSLS,
+    _______,_______,_______,_______,_______,_______,_______,_______,KC_0,   KC_0,   KC_DOT, KC_ENT
+),
+
+[L_SYMBOLS] = LAYOUT(
+    KC_AT,  KC_LT,  KC_DLR, KC_GT,  XXXXXXX,                XXXXXXX,KC_LBRC,KC_UNDS,KC_RBRC,XXXXXXX,
+    KC_BSLS,KC_LPRN,KC_DQUO,KC_RPRN,KC_HASH,                KC_PERC,KC_LCBR,KC_EQL, KC_RCBR,KC_PIPE,
+    KC_EXLM,KC_COLN,KC_ASTR,KC_PLUS,XXXXXXX,_______,_______,XXXXXXX