diff --git a/README.md b/README.md
index bab19b91..13936c38 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ My userspace for building QMK firmware via GitHub Actions. This does not require
 
 ## Layout
 
-The custom layout optimizes for programming (SQL, Powershell, C) and minimizes holds for comfort. It started from [Manna Harbor Miryoku](https://github.com/manna-harbour/miryoku) and took heavy influence from [Jonas Hietala T-34](https://www.jonashietala.se/series/t-34/). The keymap designed for split 3x5, two thumbs keys, dual encoders, and combined with a Ploopy Nano trackball mouse. Design themes:
+The custom layout optimizes for programming (SQL, Powershell, C) and minimizes holds for comfort. It started from [Manna Harbor Miryoku](https://github.com/manna-harbour/miryoku), took heavy influence from [Jonas Hietala T-34](https://www.jonashietala.se/series/t-34/), and trying to achieve [Callum's Minimal Layout](https://github.com/qmk/qmk_firmware/tree/user-keymaps-still-present/users/callum). The keymap designed for split 3x5, two thumbs keys, dual encoders, and combined with a Ploopy Nano trackball mouse. Design themes:
 
 - Releasing all keys always brings you back to base layer
 - Keeping certain keys consistent on all layers for better muscle memory
@@ -33,7 +33,7 @@ In this userspace, the base split 3x5_3 layout can be adapted for other split ke
 
 ### Tri-Layer
 
-Hold both thumb momentary layer keys `NUMBER` and `NAVIGATION` to access the `SYMBOL` layer
+Hold both thumb momentary layer keys `NAVIGATION` and `SYMBOL` to access the `NUMBER` layer
 
 ### One Shot Mods
 
@@ -55,15 +55,11 @@ Certain keys have different behaviors when held vs tapped allowing commonly type
 | Keycode   | When tapped | When held               | Comments                          |
 | --------- | ----------- | ----------------------- | --------------------------------- |
 | `TR_LBRC` | `[`         | `[]` with cursor inside |                                   |
-| `TH_LCBR` | `{`         | `{}` with cursor inside |                                   |
 | `TR_LABK` | `<`         | `<>` with cursor inside |                                   |
 | `TR_LPRN` | `(`         | `()` with cursor inside |                                   |
 | `TR_SQUO` | `'`         | `''` with cursor inside |                                   |
-| `TR_DQUO` | `"`         | `""` with cursor inside |                                   |
 | `TR_EQL`  | `=`         | `==`                    |                                   |
-| `TR_PLUS` | `+`         | `++`                    |                                   |
-| `TR_PIPE` | `\|`        | `\|\|`                  |                                   |
-| `TR_EXLM` | `!`         | `!=`                    |                                   |
+| `TR_EXLM` | `!`         | `$`                     |                                   |
 | `TR_COMM` | `,`         | `(`                     | enables parenthesis on base layer |
 | `TR_DOT`  | `.`         | `)`                     |                                   |
 | `TR_PERC` | `%`         | `^`                     |                                   |
@@ -71,6 +67,7 @@ Certain keys have different behaviors when held vs tapped allowing commonly type
 | `TR_GRV`  | `           | `~`                     |                                   |
 | `TR_SCLN` | `;`         | `:`                     |                                   |
 | `TR_QUOT` | `'`         | `"`                     |                                   |
+| `TR_AT`   | `@`         | `&`                     |                                   |
 
 ### Combos
 
diff --git a/keymap-drawer.yml b/keymap-drawer.yml
index cadf5040..7dec2a58 100644
--- a/keymap-drawer.yml
+++ b/keymap-drawer.yml
@@ -4,8 +4,8 @@ layout:
 layers:
   base_QWERTY:
     - [Q, W, E, R, T, Y, U, I ,O, P]
-    - [A, S, D, F, G, H, J, K ,L, {h: "\"", t: "'"}]
-    - [Z, X, C, V, B, N, M, {h: "(", t: ","} , {h: ")", t: "."}, {h: "_", t: "-"}]
+    - [A, S, D, F, G, H, J, K ,L, {h: '"', t: ''''}]
+    - [Z, X, C, V, B, N, M, {h: '(', t: ','} , {h: ')', t: '.'}, {h: '_', t: '-'}]
     - {type: ghost}
     - NUM
     - Shift
@@ -13,9 +13,9 @@ layers:
     - NAV
     - {t: Mute, type: ghost}
   base_COLEMAK_DH:
-    - [Q, W, F, P, B, J, L, U ,Y, {h: "\"", t: "'"}]
+    - [Q, W, F, P, B, J, L, U ,Y, {h: '"', t: ''''}]
     - [A, R, S, T, G, M, N, E ,I, O]
-    - [Z, X, C, D, V, K, H, {h: "(", t: ","} , {h: ")", t: "."}, {h: "_", t: "-"}]
+    - [Z, X, C, D, V, K, H, {h: '(', t: ','} , {h: ')', t: '.'}, {h: '_', t: '-'}]
     - {type: ghost}
     - NUM
     - Shift
@@ -23,39 +23,39 @@ layers:
     - NAV
     - {t: Mute, type: ghost}
   base_GAME:
-    - [Tab, Q, W, E, R, T, "7", "8" ,"9", Esc]
-    - [Ctrl, A, S, D, F, G, "4", "5" ,"6", "`"]
-    - [Z, X, C, V, B, Alt, "1", "2" ,"3", Combo Toggle]
+    - [Tab, Q, W, E, R, T, '7', '8' ,'9', Esc]
+    - [Ctrl, A, S, D, F, G, '4', '5' ,'6', '`']
+    - [Z, X, C, V, B, Alt, '1', '2' ,'3', Combo Toggle]
     - {t: Enter, type: ghost}
     - Space
     - Shift
     - Space
-    - {h: "NAV", t: "0"}
+    - NAV
     - {t: Mute, type: ghost}
   NAV:
-    - [null, Home, ▲, End, Page Up, null, null, Sniper Toggle, Sniper DPI, Pointer DPI ]
-    - [null, ◄, ▼, ►, Page Down, null, Shift, Ctrl, Alt, Gui ]
-    - [Undo, Cut, Copy, Paste, Redo, null, App, Vol-, Vol+, Mute ]
+    - [null, Home, ▲, End, Page Up, Caps Lock, Tab, null, Print Screen, CONFIG ]
+    - [null, ◄, ▼, ►, Page Down, Back Space, Shift, Ctrl, Alt, Gui ]
+    - [Undo, Cut, Copy, Paste, Redo, Delete, App, Sniper Toggle, Sniper DPI, Pointer DPI ]
     - {t: Zoom Reset, type: ghost}
     - NUM
     - Space
     - null
     - {type: held}
     - {t: Mute, type: ghost}
-  NUM:
-    - [CONFIG, Win Snip, Win File, null, null, null, "7", "8" ,"9", {h: "<", t: ","} ]
-    - [Gui, Alt, Ctrl, Shift, null, null, "4", "5" ,"6", {h: ">", t: "."}]
-    - [Undo, Cut, Copy, Paste, Redo, null, "1", "2" ,"3", {h: "_", t: "-"}]
+  SYM:
+    - [Esc, Mouse 3, Mouse 2, Mouse 1, {h: '~', t: '`'}, {h: '==', t: '='}, '#', {h: '<>', t: '<'}, '>', {h: '^', t: '%'}]
+    - [Gui, Alt, Ctrl, Shift, {h: ':', t: ';'}, {h: '&', t: '@'}, '*', {h: '[]', t: '['}, ']', {h: '''''', t: ''''}]
+    - [Undo, Cut, Copy, Paste, Redo, {h: '\\', t: "\\"}, {h: '//', t: '/'}, {h: '()', t: '('}, ')', {h: '_', t: '-'}]
     - {type: ghost}
     - {type: held}
     - null
-    - Space
-    - {h: "NAV", t: "0"}
-    - {t: Mute, type: ghost}
-  SYM:
-    - [Caps Lock, Print Screen, "@", "$", {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: "-"}]
+    - null
+    - NAV
+    - {type: ghost}
+  NUM:
+    - ['7', '5', '3', '1', '9', '8', '0', '2' , '4', '6' ]
+    - [Gui, Alt, Ctrl, Shift, F11, F12, null, Vol- , Vol+, Mute]
+    - [F7, F5, F3, F1, F9, F8, F10, F2 , F4, F6]
     - {type: ghost}
     - {type: held}
     - null
@@ -63,20 +63,19 @@ layers:
     - {type: held}
     - {type: ghost}
   CONFIG:
-    - [{type: held}, null, null, null, null, null, F7, F8, F9, F10]
-    - [null, null, null, Shift, null, null, 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
+    - [null, null, null, null, null, null, null, EEPROM Clear, Boot Loader, {type: held}]
+    - [null, null, null, null, null, null, Shift, null, null, RGB Mode]
+    - [null, null, null, null, null, RGB Toggle, RGB Hue, RGB Sat, RGB Vib, RGB Spd]
+    - {t: Base Layer, type: ghost}
+    - null
+    - null
     - Macro Play
     - Macro Rec
-    - {t: Base Layer, type: ghost}
+    - {t: RGB Toggle, 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: [14, 24], k: MB3, l: [base_QWERTY] }
+  - { p: [13, 14], k: MB3, l: [base_QWERTY] }
   - { p: [3, 13], k: MB4, l: [base_QWERTY] }
   - { p: [4, 14], k: MB5, l: [base_QWERTY] }
   - { p: [21, 22], k: DrgScr Tog, l: [base_QWERTY] }
diff --git a/my_keymap.png b/my_keymap.png
index 680ec6f0..fac6f828 100644
Binary files a/my_keymap.png and b/my_keymap.png differ
diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h
index d8d2ff8f..ebdf2bc8 100644
--- a/users/t4corun/features/combo.h
+++ b/users/t4corun/features/combo.h
@@ -6,7 +6,7 @@
 #if defined(MOUSEKEY_ENABLE)
 const uint16_t PROGMEM mou_btn1_combo[] = { KC_D,    KC_F,    COMBO_END };
 const uint16_t PROGMEM mou_btn2_combo[] = { KC_S,    KC_D,    COMBO_END };
-const uint16_t PROGMEM mou_btn3_combo[] = { KC_G,    KC_B,    COMBO_END };
+const uint16_t PROGMEM mou_btn3_combo[] = { KC_F,    KC_G,    COMBO_END };
 const uint16_t PROGMEM mou_btn4_combo[] = { KC_F,    KC_R,    COMBO_END };
 const uint16_t PROGMEM mou_btn5_combo[] = { KC_T,    KC_G,    COMBO_END };
 const uint16_t PROGMEM mou_drg_combo[]  = { KC_X,    KC_C,    COMBO_END };