diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
index 123f2f3b..800e5b62 100644
--- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
+++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
@@ -6,13 +6,14 @@
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_rollow_wrapper ( \
+	          k32, k33, k34, k35, k36, k37,           \
+                      e01, e02                      \
+)                                                   \
+LAYOUT_rollow_wrapper (                             \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
+	          e01, k33, k34, k35, k36, e02            \
 )
 
 #define ROLLOW(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
@@ -39,8 +40,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_QWERTY]     = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
   [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
   [_GAME]       = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-  [_NAVIGATION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
-  [_NUMBER]     = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(FWD_TAB, BCK_TAB) },
+  [_NAVIGATION] = { ENCODER_CCW_CW(KC_RGHT, KC_LEFT), ENCODER_CCW_CW(___x___, ___x___) },
+  [_NUMBER]     = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(FWD_TAB, REV_TAB) },
   [_SYMBOL]     = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
   [_MOUSE_FUNC] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U), ENCODER_CCW_CW(ZOOMIN,  ZOOMOUT) },
   [_CONFIG]     = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(BASELYR, RBSELYR) }
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c
index 346b5f6b..43088d9d 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c
@@ -21,9 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_cnano_wrapper ( \
+	          k32, k33, k34, k35, k36, k37,           \
+                      e01, e02                      \
+)                                                   \
+LAYOUT_cnano_wrapper (                              \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
index 4f82f865..294316e3 100644
--- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
+++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
@@ -22,13 +22,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_swoop_wrapper ( \
+	          k32, k33, k34, k35, k36, k37,           \
+                      e01, e02                      \
+)                                                   \
+LAYOUT_swoop_wrapper (                              \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
+	          k32, k33, k34, k35, k36, e02            \
 )
 
 #define SWOOP(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
@@ -55,8 +56,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_QWERTY]     = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
   [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
   [_GAME]       = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-  [_NAVIGATION] = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(___x___, ___x___) },
-  [_NUMBER]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(BCK_TAB, FWD_TAB) },
+  [_NAVIGATION] = { ENCODER_CCW_CW(KC_LEFT,  KC_RGHT), ENCODER_CCW_CW(___x___, ___x___) },
+  [_NUMBER]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(REV_TAB, FWD_TAB) },
   [_SYMBOL]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(___x___, ___x___) },
   [_MOUSE_FUNC] = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(ZOOMOUT, ZOOMIN)  },
   [_CONFIG]     = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RBSELYR, BASELYR) }
diff --git a/keyboards/crkbd/keymaps/t4corun/keymap.c b/keyboards/crkbd/keymaps/t4corun/keymap.c
index 0e985d27..9379b469 100644
--- a/keyboards/crkbd/keymaps/t4corun/keymap.c
+++ b/keyboards/crkbd/keymaps/t4corun/keymap.c
@@ -18,12 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LAYOUT_crkbd_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
 
 #define LAYOUT_3x5_3_keymap( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_crkbd_wrapper ( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,               \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,               \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,               \
+	          k32, k33, k34, k35, k36, k37,                         \
+                      e01, e02                                    \
+)                                                                 \
+LAYOUT_crkbd_wrapper (                                            \
 	KC_NO, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, \
 	KC_NO, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, KC_NO, \
 	KC_NO, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, KC_NO, \
diff --git a/keyboards/klor/keymaps/t4corun/keymap.c b/keyboards/klor/keymaps/t4corun/keymap.c
index 602fb8de..f51804e6 100644
--- a/keyboards/klor/keymaps/t4corun/keymap.c
+++ b/keyboards/klor/keymaps/t4corun/keymap.c
@@ -3,16 +3,17 @@
 #define LAYOUT_klor_wrapper(...) KLOR_LAYOUT(__VA_ARGS__)
 
 #define LAYOUT_3x5_3_keymap( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_klor_wrapper ( \
-	k00, k01, k02,     k03, k04,           k05, k06, k07,    k08, k09, \
-	k10, k11, k12,     k13, k14,           k15, k16, k17,    k18, k19, \
-	k20, k21, k22,     k23, k24, k32, k37, k25, k26, k27,    k28, k29, \
-	          KC_BTN1, k33, k34,           k35, k36, KC_BTN4           \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,           \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,           \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,           \
+	          k32, k33, k34, k35, k36, k37,                     \
+                      e01, e02                                \
+)                                                             \
+LAYOUT_klor_wrapper (                                         \
+	k00, k01, k02, k03, k04,           k05, k06, k07, k08, k09, \
+	k10, k11, k12, k13, k14,           k15, k16, k17, k18, k19, \
+	k20, k21, k22, k23, k24, e01, e02, k25, k26, k27, k28, k29, \
+	          k32, k33, k34,           k35, k36, k37            \
 )
 
 #define KLOR(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
@@ -38,8 +39,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_QWERTY]     = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
   [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
   [_GAME]       = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-  [_NAVIGATION] = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(___x___, ___x___) },
-  [_NUMBER]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(BCK_TAB, FWD_TAB) },
+  [_NAVIGATION] = { ENCODER_CCW_CW(KC_LEFT,  KC_RGHT), ENCODER_CCW_CW(___x___, ___x___) },
+  [_NUMBER]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(REV_TAB, FWD_TAB) },
   [_SYMBOL]     = { ENCODER_CCW_CW(___x___,  ___x___), ENCODER_CCW_CW(___x___, ___x___) },
   [_MOUSE_FUNC] = { ENCODER_CCW_CW(KC_WH_U,  KC_WH_D), ENCODER_CCW_CW(ZOOMOUT, ZOOMIN)  },
   [_CONFIG]     = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RBSELYR, BASELYR) }
diff --git a/keyboards/planck/keymaps/t4corun/keymap.c b/keyboards/planck/keymaps/t4corun/keymap.c
index 9f9574f9..f162bb2d 100644
--- a/keyboards/planck/keymaps/t4corun/keymap.c
+++ b/keyboards/planck/keymaps/t4corun/keymap.c
@@ -3,12 +3,13 @@
 #define LAYOUT_planck_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__)
 
 #define LAYOUT_3x5_keymap( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-	          k32, k33, k34, k35, k36, k37            \
-) \
-LAYOUT_planck_wrapper ( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,                             \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,                             \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,                             \
+	          k32, k33, k34, k35, k36, k37,                                       \
+                      e01, e02                                                  \
+)                                                                               \
+LAYOUT_planck_wrapper (                                                         \
 	k00,   k01,   k02,   k03, k04, KC_NO, KC_NO, k05, k06,   k07,   k08,   k09,   \
 	k10,   k11,   k12,   k13, k14, KC_NO, KC_NO, k15, k16,   k17,   k18,   k19,   \
 	k20,   k21,   k22,   k23, k24, KC_NO, KC_NO, k25, k26,   k27,   k28,   k29,   \
diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c
index 26aa7b44..9adbe3d9 100644
--- a/users/t4corun/t4corun.c
+++ b/users/t4corun/t4corun.c
@@ -89,19 +89,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case BASELYR:
       if (record->event.pressed) {
-
         current_base_layer = (current_base_layer + 1) % NUM_DEFAULT_LAYERS; 
         set_single_persistent_default_layer(current_base_layer);
-
       }
       return false;
 
     case RBSELYR:
       if (record->event.pressed) { 
-
         current_base_layer = (current_base_layer - 1) % NUM_DEFAULT_LAYERS; 
         set_single_persistent_default_layer(current_base_layer);
-
       }
       return false;
 
@@ -118,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
 
-    case BCK_TAB:
+    case REV_TAB:
       if (record->event.pressed) {
         if (!hold_reverse_active || !(current_mods & MOD_MASK_SHIFT)) {
           hold_reverse_active = true;
diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h
index ed853598..5b2589e8 100644
--- a/users/t4corun/t4corun.h
+++ b/users/t4corun/t4corun.h
@@ -57,7 +57,7 @@ enum keycodes {
   TR_CKUP,  // CK_UP or CK_DOWN when shift is held
 
   FWD_TAB,
-  BCK_TAB,
+  REV_TAB,
 
   ZOOMIN,
   ZOOMOUT,
@@ -85,8 +85,9 @@ enum keycodes {
 #define SC_FILE LGUI(KC_E)
 #define SC_WIN  LGUI(KC_TAB)
 
-// Zoom for encoders
+// Encoders
 #define ZOOMRST LCTL(KC_0)
+#define SCR_TOP LCTL(KC_HOME)
 
 /*
 - Any keycodes with prefix TR has behavior dependent on if the feature is enabled.
@@ -149,7 +150,7 @@ enum keycodes {
 #define _UCCPR_L___________________________________ SC_UNDO, SC_CUT,  SC_COPY, SC_PAST, SC_REDO
 
 #define _BASE_L4_________________                   KC_BTN1, NUM,     TR_LSFT
-#define _BASE_R4_________________                   KC_SPC,  NAV,     KC_MUTE
+#define _BASE_R4_________________                   KC_SPC,  NAV,     ___x___
 #define _LAYER_TRANS_____________                   ___x___, _______, ___x___
 
 
@@ -159,53 +160,61 @@ enum keycodes {
   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    \
   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TR_QUOT, \
   MF_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TR_COMM, TR_DOT,  TR_MINS, \
-                    _BASE_L4_________________, _BASE_R4_________________
+                    _BASE_L4_________________, _BASE_R4_________________,                   \
+                                      SCR_TOP, KC_MUTE
 
 
 #define LAYER_COLEMAK_DH                                                                    \
   KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    TR_QUOT, \
   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    \
   MF_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    TR_COMM, TR_DOT,  TR_MINS, \
-                    _BASE_L4_________________, _BASE_R4_________________
+                    _BASE_L4_________________, _BASE_R4_________________,                   \
+                                      SCR_TOP, KC_MUTE
 
 
 #define LAYER_GAME                                                                          \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_7,    KC_8,    KC_9,    KC_ESC,  \
   KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_4,    KC_5,    KC_6,    KC_GRV,  \
   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LALT, KC_1,    KC_2,    KC_3,    CM_TOGG, \
-                    KC_ENT,  KC_SPC,  KC_LSFT, _BASE_R4_________________
+                    KC_ENT,  KC_SPC,  KC_LSFT, _BASE_R4_________________,                   \
+                                      SCR_TOP, KC_MUTE
 
 
 #define LAYER_NAVIGATION                                                                    \
   KC_ESC,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, ___x___, KC_APP,  ___x___, ___x___, CONFIG,  \
   ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \
   _UCCPR_L___________________________________, KC_DEL,  KC_TAB,  KC_VOLD, KC_VOLU, KC_MUTE, \
-                    ___x___, NUM,     KC_ENT,  _LAYER_TRANS_____________
+                    ___x___, NUM,     KC_ENT,  _LAYER_TRANS_____________,                   \
+                                      SCR_TOP, ___x___
 
 
 #define LAYER_NUMBER                                                                        \
   KC_ESC,  SC_SNIP, SC_FILE, MOU_FUN, KC_ENT,  ___x___, KC_7,    KC_8,    KC_9,    KC_COMM, \
   _GACS_MODS________________________, KC_TAB,  KC_BSPC, KC_4,    KC_5,    KC_6,    KC_DOT,  \
   _UCCPR_L___________________________________, KC_DEL,  KC_1,    KC_2,    KC_3,    KC_MINS, \
-                    _LAYER_TRANS_____________, KC_0,    NAV,     SC_WIN
+                    _LAYER_TRANS_____________, KC_0,    NAV,     ___x___,                   \
+                                      ___x___, SC_WIN
 
 
 #define LAYER_SYMBOL                                                                        \
   KC_ESC,  ___x___, KC_AT,   KC_DLR,  TR_GRV,  TR_EQL,  KC_HASH, KC_ASTR, ___x___, TR_DQUO, \
   KC_AMPR, TR_LCBR, KC_RCBR, TR_PIPE, TR_SCLN, KC_BSPC, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
   TR_PERC, TR_LABK, KC_RABK, TR_BSLS, KC_EXLM, KC_DEL,  TR_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \
-                    _LAYER_TRANS_____________, _LAYER_TRANS_____________
+                    _LAYER_TRANS_____________, _LAYER_TRANS_____________,                   \
+                                      ___x___, ___x___
 
 
 #define LAYER_MOUSE_FUNC                                                                    \
   MOU_FUN, KC_MPRV, KC_MNXT, KC_MPLY, ___x___, ___x___, KC_F7,   KC_F8,   KC_F9,   KC_F10,  \
   _GACS_MODS________________________, TR_DRGS, KC_CAPS, KC_F4,   KC_F5,   KC_F6,   KC_F11,  \
   _______, ___x___, KC_BTN5, KC_BTN4, TR_SNIP, ___x___, KC_F1,   KC_F2,   KC_F3,   KC_F12,  \
-                    KC_BTN1, KC_BTN3, KC_BTN2, TR_PDPI, TR_SDPI, ZOOMRST
+                    KC_BTN1, KC_BTN3, KC_BTN2, TR_PDPI, TR_SDPI, ___x___,                   \
+                                      SCR_TOP, ZOOMRST
 
 
 #define LAYER_CONFIG                                                                        \
   ___x___, HF_RST,  TR_HNXT, HF_FDBK, HF_TOGG, BASELYR, PN_BOOT, EE_CLR,  QK_BOOT, _______, \
   RGB_MOD, CK_RST,  TR_CKUP, CK_TOGG, AU_TOGG, ___x___, TR_LSFT, ___x___, ___x___, ___x___, \
   RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_TOG, ___x___, ___x___, ___x___, ___x___, ___x___, \
-                    ___x___, DM_REC1, DM_PLY1, ___x___, ___x___, ___x___
+                    ___x___, DM_REC1, DM_PLY1, ___x___, ___x___, ___x___,                   \
+                                      ___x___, ___x___