diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
index 8e3e6c5e..3fd540dc 100644
--- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
+++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_NAVIGATION]      = { ENCODER_CCW_CW(ZOOMIN,  ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___)  },
   [_NUMBER]          = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT)  },
   [_SYMBOL]          = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___)  },
-  [_CONFIG]          = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(TR_RMOD, TR_RRMD)  }
+  [_CONFIG]          = { ENCODER_CCW_CW(TR_RMOD, TR_RRMD), ENCODER_CCW_CW(BASELYR, RBSELYR)  }
 };
 
 #endif
\ No newline at end of file
diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
index a303cfad..245bb39a 100644
--- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
+++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_NAVIGATION]      = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN),  ENCODER_CCW_CW(___x___, ___x___)  },
   [_NUMBER]          = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT)  },
   [_SYMBOL]          = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___)  },
-  [_CONFIG]          = { ENCODER_CCW_CW(RBSELYR, BASELYR), ENCODER_CCW_CW(TR_RRMD, TR_RMOD)  }
+  [_CONFIG]          = { ENCODER_CCW_CW(TR_RRMD, TR_RMOD), ENCODER_CCW_CW(RBSELYR, BASELYR)  }
 };
 
 #endif //ENCODER_MAP_ENABLE
diff --git a/keymap-drawer.yml b/keymap-drawer.yml
index 852a75a3..543a40f9 100644
--- a/keymap-drawer.yml
+++ b/keymap-drawer.yml
@@ -27,18 +27,18 @@ layers:
     - [Ctrl, A, S, D, F, G, "4", "5" ,"6", "`"]
     - [Z, X, C, V, B, Alt, "1", "2" ,"3", Combo Toggle]
     - {t: Enter, type: ghost}
-    - Shift
     - Space
+    - Shift
     - Space
     - {h: "NAV", t: "0"}
     - {t: Mute, type: ghost}
   NAV:
-    - [Escape, Home, ▲, End, Page Up, Mouse Wheel Up, null, Sniper Toggle, Sniper DPI, Pointer DPI ]
-    - [Caps Lock, ◄, ▼, ►, Page Down, Mouse Wheel down, Shift, Ctrl, Alt, Gui ]
+    - [null, Home, ▲, End, Page Up, Mouse Wheel Up, null, Sniper Toggle, Sniper DPI, Pointer DPI ]
+    - [null, ◄, ▼, ►, Page Down, Mouse Wheel down, Shift, Ctrl, Alt, Gui ]
     - [Undo, Cut, Copy, Paste, Redo, null, App, Vol-, Vol+, Mute ]
     - {t: Zoom Reset, type: ghost}
     - NUM
-    - Enter
+    - Space
     - null
     - {type: held}
     - {t: Mute, type: ghost}
@@ -51,9 +51,9 @@ layers:
     - null
     - Space
     - {h: "NAV", t: "0"}
-    - {type: ghost}
+    - {t: Mute, type: ghost}
   SYM:
-    - [null, null, "@", "$", {h: "~", t: "`"}, {h: "==", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}]
+    - [CONFIG, null, "@", "$", {h: "~", t: "`"}, {h: "==", t: "="}, "#", "*", null, {h: "\"\"", t: "\""}]
     - ["&", {h: "{}", t: "{"}, "}", {h: "||", t: "|"}, {h: ":", t: ";"}, {h: "++", t: "+"}, "?", {h: "[]", t: "]"}, "]", {h: "''", t: "'"}]
     - [{h: "^", t: "%"}, {h: "<>", t: "<"}, ">", "\\", {h: "!=", t: "!"}, null, "/", {h: "()", t: "("}, ")", {h: "_", t: "-"}]
     - {type: ghost}
@@ -63,27 +63,26 @@ layers:
     - {type: held}
     - {type: ghost}
   CONFIG:
-    - [F10, F7, F8, F9, null, null, null, null, EEPROM Clear, Boot Loader]
-    - [F11, F4, F5, F6, null, Base Layer Toggle, Shift, null, null, RGB Mode]
-    - [F12, F1, F2, F3, null, RGB Hue, RGB Sat, RGB Vib, RGB Spd, RGB Toggle ]
-    - {type: ghost}
-    - Macro Record
+    - [{type: held}, null, null, null, null, null, F7, F8, F9, F10]
+    - [null, null, null, Shift, null, Caps Lock, F4, F5, F6, F11]
+    - [RGB Hue, RGB Sat, RGB Vib, RGB Spd, null, null, F1, F2, F3, F12]
+    - {t: RGB Toggle, type: ghost}
+    - EEPROM Clear
+    - Boot Loader
     - Macro Play
-    - {type: held}
-    - {type: held}
-    - {type: ghost}
+    - Macro Rec
+    - {t: Base Layer, type: ghost}
 combos:
   - { p: [0, 1], k: Esc, l: [base_QWERTY] }
   - { p: [12, 13], k: MB1, l: [base_QWERTY] }
   - { p: [11, 12], k: MB2, l: [base_QWERTY] }
-  - { p: [13, 14], k: MB3, l: [base_QWERTY] }
+  - { p: [14, 24], k: MB3, l: [base_QWERTY] }
   - { p: [3, 13], k: MB4, l: [base_QWERTY] }
   - { p: [4, 14], k: MB5, l: [base_QWERTY] }
-  - { p: [22, 23], k: DrgScr Tog, l: [base_QWERTY] }
+  - { p: [21, 22], k: DrgScr Tog, l: [base_QWERTY] }
   - { p: [6, 7], k: Tab, l: [base_QWERTY] }
-  - { p: [21, 22], k: Enter, l: [base_QWERTY] }
+  - { p: [22, 23], k: Enter, l: [base_QWERTY] }
   - { p: [26, 27], k: Bksp, l: [base_QWERTY] }
   - { p: [27, 28], k: Del, l: [base_QWERTY] }
-  - { p: [33, 34], k: CONFIG, l: [base_QWERTY], align: top }
 draw_config:
   small_pad: 6
\ No newline at end of file
diff --git a/my_keymap.png b/my_keymap.png
index 15b4d74a..b42f0ef3 100644
Binary files a/my_keymap.png and b/my_keymap.png differ
diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h
index d68eb872..651809e8 100644
--- a/users/t4corun/t4corun.h
+++ b/users/t4corun/t4corun.h
@@ -216,8 +216,8 @@ enum keycodes {
 
 #define LAYER_NAVIGATION \
   ___x___, KC_HOME, KC_UP,   KC_END,  KC_PGUP, TR_MWHU, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \
-  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \
-  _UCCPR_L___________________________________, CONFIG,  KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, \
+  ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \
+  _UCCPR_L___________________________________, ___x___, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE, \
                     ZOOMRST, _______, KC_SPC,  _LAYER_TRANS_____________
 
 
@@ -229,17 +229,17 @@ enum keycodes {
 
 
 #define LAYER_SYMBOL \
-  ___x___, ___x___, KC_AT,   KC_DLR,  TR_GRV,  TR_EQL,  KC_HASH, KC_ASTR, ___x___, TR_DQUO, \
+  CONFIG,  ___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, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
   TR_PERC, TR_LABK, KC_RABK, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \
                     _LAYER_TRANS_____________, _LAYER_TRANS_____________
 
 
 #define LAYER_CONFIG \
-  KC_F10,  KC_F7,   KC_F8,   KC_F9,   ___x___, ___x___, ___x___, ___x___, EE_CLR,  QK_BOOT, \
-  KC_F11,  KC_F4,   KC_F5,   KC_F6,   ___x___, ___x___, TR_LSFT, ___x___, ___x___, TR_RMOD, \
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   ___x___, _______, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, \
-                    BASELYR, TR_DMR1, TR_DMP1, TR_RMOD, _______, TR_RTOG
+  _______, ___x___, ___x___, ___x___, ___x___, ___x___, KC_F7,   KC_F8,   KC_F9,   KC_F10,  \
+  ___x___, ___x___, ___x___, TR_LSFT, ___x___, KC_CAPS, KC_F4,   KC_F5,   KC_F6,   KC_F11,  \
+  TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, ___x___, KC_F1,   KC_F2,   KC_F3,   KC_F12,  \
+                    TR_RTOG, EE_CLR,  QK_BOOT, TR_DMP1, TR_DMR1, BASELYR
 
 /*
 If I was going to combine number and symbols together, it'd look like this