diff --git a/.github/workflows/draw_keymaps.yaml b/.github/workflows/draw_keymaps.yaml
index e2c4cf2d..7e951484 100644
--- a/.github/workflows/draw_keymaps.yaml
+++ b/.github/workflows/draw_keymaps.yaml
@@ -160,6 +160,8 @@ jobs:
             , "&td_bore": "L_BASE L_EXTRA"
             , "&tdtb": "SCROLL TRACKBALL"
             , "&tdtb2": "SCROLL SNIPE"
+            , "&tdmt": "L1/BS LCLICK"
+            , "&tdbt": "L2/ESC RCLICK"
              }
         run: |
           get_args() {
diff --git a/config/charybdis.conf b/config/charybdis.conf
index c788e8f4..1c1fc601 100644
--- a/config/charybdis.conf
+++ b/config/charybdis.conf
@@ -11,4 +11,8 @@ CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
 CONFIG_ZMK_BATTERY_REPORTING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
-CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512
\ No newline at end of file
+CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512
+
+CONFIG_ZMK_RGB_UNDERGLOW=n
+CONFIG_WS2812_STRIP=n
+CONFIG_ZMK_EXT_POWER=n 
\ No newline at end of file
diff --git a/config/charybdis.keymap b/config/charybdis.keymap
index 8a4187e9..9aee1201 100644
--- a/config/charybdis.keymap
+++ b/config/charybdis.keymap
@@ -51,6 +51,18 @@
             #binding-cells = <0>;
             bindings = <&mo 6>, <&to 0>;
         };
+
+        tdmt: td_mid_thumb_lclick {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&lt 1 BACKSPACE>, <&mkp LCLK>;
+        };
+
+        tdbt: td_bottom_thumb_rclick {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&lt 2 ESCAPE>, <&mkp RCLK>;
+        };
     };
 
     combos {
@@ -95,18 +107,23 @@
 
         BASE {
             bindings = <
-&kp C_AC_SEARCH  &kp Q           &kp W                     &kp E                         &kp R             &kp T           &kp Y         &kp U             &kp I                             &kp O                          &kp P                    &to 4
-&hm LG(E) TAB    &hm LEFT_GUI A  &hm LEFT_ALT S            &hm LCTRL D                   &hm LEFT_SHIFT F  &kp G           &kp H         &hm LEFT_SHIFT J  &hm RCTRL K                       &hm RIGHT_ALT L                &hm LEFT_META SEMICOLON  &kp DEL
-&kp LA(LC(T))    &kp Z           &mt LC(LA(LEFT_SHIFT)) X  &mt LA(LC(LG(LEFT_SHIFT))) C  &kp V             &kp B           &kp N         &kp M             &mt LA(LC(LG(LEFT_SHIFT))) COMMA  &mt LC(LA(LEFT_SHIFT)) PERIOD  &kp FSLH                 &to 5
-                                                           &tdtb                         &lt 1 BACKSPACE   &lt 2 ESCAPE    &lt 7 RETURN  &lt 3 SPACE
+// ╭────────────────┬──────────────┬─────────────────────────┬─────────────────────────────┬──────────────────┬─────────╮  ╭──────────────┬─────────────────┬─────────────────────────────────┬──────────────────────────────┬────────────────────────┬───────╮
+    &kp C_AC_SEARCH  &kp Q           &kp W                     &kp E                         &kp R               &kp T       &kp Y         &kp U             &kp I                             &kp O                          &kp P                    &to 4
+// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼─────────┤  ├──────────────┼─────────────────┼─────────────────────────────────┼──────────────────────────────┼────────────────────────┼───────┤
+    &hm LG(E) TAB    &hm LEFT_GUI A  &hm LEFT_ALT S            &hm LCTRL D                   &hm LEFT_SHIFT F    &kp G       &kp H         &hm LEFT_SHIFT J  &hm RCTRL K                       &hm RIGHT_ALT L                &hm LEFT_META SEMICOLON  &kp DEL
+// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼─────────┤  ├──────────────┼─────────────────┼─────────────────────────────────┼──────────────────────────────┼────────────────────────┼───────┤
+    &kp LA(LC(T))    &kp Z           &hm LC(LA(LEFT_SHIFT)) X  &hm LA(LC(LG(LEFT_SHIFT))) C  &kp V               &kp B       &kp N         &kp M             &hm LA(LC(LG(LEFT_SHIFT))) COMMA  &hm LC(LA(LEFT_SHIFT)) PERIOD  &kp FSLH                 &to 5
+// ╰────────────────┴──────────────┴─────────────────────────┼─────────────────────────────┼──────────────────┼─────────┤  ├──────────────┼─────────────────┼─────────────────────────────────┴──────────────────────────────┴────────────────────────┴───────╯
+                                                               &tdtb                         &tdmt               &tdbt       &lt 7 RETURN  &lt 3 SPACE
+                                                             ╰─────────────────────────────┴──────────────────┴─────────╯  ╰──────────────┴───────────╯
             >;
         };
 
         NUM {
             bindings = <
-&none  &none  &none  &none  &none          &none    &kp SLASH  &hm F7 N7  &hm F8 N8  &hm F9 N9  &hm F10 MINUS  &none
-&none  &none  &none  &none  &kp BACKSPACE  &none    &kp ASTRK  &hm F4 N4  &hm F5 N5  &hm F6 N6  &hm F11 PLUS   &none
-&none  &none  &none  &none  &none          &none    &kp DOT    &hm F1 N1  &hm F2 N2  &hm F3 N3  &hm F12 EQUAL  &trans
+&none    &none  &none  &none  &none          &none    &kp SLASH  &hm F7 N7  &hm F8 N8  &hm F9 N9  &hm F10 MINUS  &none
+&kp TAB  &none  &none  &none  &kp BACKSPACE  &none    &kp ASTRK  &hm F4 N4  &hm F5 N5  &hm F6 N6  &hm F11 PLUS   &none
+&none    &none  &none  &none  &none          &none    &kp DOT    &hm F1 N1  &hm F2 N2  &hm F3 N3  &hm F12 EQUAL  &trans
                      &none  &none          &none    &kp N0     &none
             >;
         };
@@ -115,17 +132,17 @@
             bindings = <
 &none   &none   &none   &none   &none   &none     &none    &kp LS(LC(H))   &kp LS(LC(J))  &kp LS(LC(K))  &kp LS(LC(L))    &none
 &trans  &trans  &trans  &trans  &trans  &trans    &VSplit  &kp LEFT_ARROW  &kp DOWN       &kp UP         &kp RIGHT_ARROW  &none
-&none   &none   &none   &none   &none   &none     &HSplit  &kp HOME        &kp PG_DN      &kp PG_UP      &kp END          &trans
+&none   &none   &none   &none   &none   &none     &HSplit  &kp END         &kp PG_DN      &kp PG_UP      &kp HOME          &trans
                         &none   &none   &trans    &trans   &trans
             >;
         };
 
         SYM {
             bindings = <
-&none      &kp SQT                    &kp CARET        &kp PLUS      &kp ASTRK             &kp BSLH     &kp GRAVE      &kp TILDE             &kp LEFT_BRACE  &kp RIGHT_BRACE    &kp AMPS     &none
-&kp PRCNT  &hm LEFT_META EXCLAMATION  &hm LEFT_ALT LT  &hm LCTRL GT  &hm LEFT_SHIFT SPACE  &kp SLASH    &kp COLON      &mt LEFT_SHIFT SPACE  &hm LCTRL LPAR  &hm LEFT_ALT RPAR  &kp HASH     &none
-&none      &kp DQT                    &kp DLLR         &kp EQUAL     &kp MINUS             &kp PIPE     &kp SEMICOLON  &kp UNDERSCORE        &kp LBKT        &kp RBKT           &kp AT_SIGN  &trans
-                                                       &trans        &trans                &trans       &none          &trans
+&none      &kp SQT             &kp CARET        &kp PLUS      &kp ASTRK             &kp BSLH     &kp GRAVE      &kp TILDE             &kp LEFT_BRACE  &kp RIGHT_BRACE    &kp AMPS     &none
+&kp PRCNT  &hm LEFT_META EXCL  &hm LEFT_ALT LT  &hm LCTRL GT  &hm LEFT_SHIFT SPACE  &kp SLASH    &kp COLON      &hm LEFT_SHIFT SPACE  &hm LCTRL LPAR  &hm LEFT_ALT RPAR  &kp HASH     &none
+&none      &kp DQT             &kp DLLR         &kp EQUAL     &kp MINUS             &kp PIPE     &kp SEMICOLON  &kp UNDERSCORE        &kp LBKT        &kp RBKT           &kp AT_SIGN  &trans
+                                                &trans        &trans                &trans       &none          &trans
             >;
         };
 
@@ -158,28 +175,28 @@
 
         MOUSE {
             bindings = <
-&none  &msc MOVE_LEFT  &msc MOVE_UP    &mmv MOVE_UP    &msc MOVE_DOWN   &msc MOVE_RIGHT    &none  &none            &none      &none         &none          &none
-&none  &mkp MB4        &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT  &mkp MB5           &none  &kp RIGHT_SHIFT  &kp RCTRL  &kp LEFT_ALT  &kp LEFT_META  &none
-&none  &kp C_AC_UNDO   &kp C_AC_CUT    &kp C_AC_COPY   &kp C_AC_PASTE   &mkp MCLK          &none  &none            &none      &none         &none          &trans
-                                       &tdtb2          &mkp LCLK        &mkp RCLK          &none  &none
+&none    &msc MOVE_LEFT  &msc MOVE_UP    &mmv MOVE_UP    &msc MOVE_DOWN   &msc MOVE_RIGHT    &none  &none            &none      &none         &none          &none
+&kp TAB  &mkp MB4        &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT  &mkp MB5           &none  &kp RIGHT_SHIFT  &kp RCTRL  &kp LEFT_ALT  &kp LEFT_META  &none
+&none    &kp C_AC_UNDO   &kp C_AC_CUT    &kp C_AC_COPY   &kp C_AC_PASTE   &mkp MCLK          &none  &none            &none      &none         &none          &trans
+                                         &tdtb2          &mkp LCLK        &mkp RCLK          &kp RETURN            &lt 3 SPACE
             >;
         };
 
         SLOW {
             bindings = <
-&none  &msc MOVE_LEFT  &msc MOVE_UP    &mmv MOVE_UP    &msc MOVE_DOWN   &msc MOVE_RIGHT    &none  &none            &none      &none         &none          &none
-&none  &mkp MB4        &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT  &mkp MB5           &none  &kp RIGHT_SHIFT  &kp RCTRL  &kp LEFT_ALT  &kp LEFT_META  &none
-&none  &kp C_AC_UNDO   &kp C_AC_CUT    &kp C_AC_COPY   &kp C_AC_PASTE   &mkp MCLK          &none  &none            &none      &none         &none          &trans
-                                       &tdtb           &mkp LCLK        &mkp RCLK          &none  &none
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+                        &tdtb   &trans &trans          &trans  &trans
             >;
         };
 
         SCROLL {
             bindings = <
-&none  &msc MOVE_LEFT  &msc MOVE_UP    &mmv MOVE_UP    &msc MOVE_DOWN   &msc MOVE_RIGHT    &none  &none            &none      &none         &none          &none
-&none  &mkp MB4        &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT  &mkp MB5           &none  &kp RIGHT_SHIFT  &kp RCTRL  &kp LEFT_ALT  &kp LEFT_META  &none
-&none  &kp C_AC_UNDO   &kp C_AC_CUT    &kp C_AC_COPY   &kp C_AC_PASTE   &mkp MCLK          &none  &none            &none      &none         &none          &trans
-                                       &tog 9          &mkp LCLK        &mkp RCLK          &none  &none
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+&trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans        
+                        &trans  &trans  &trans          &trans  &trans
             >;
         };
     };