diff --git a/config/cradio.keymap b/config/cradio.keymap
index d901317..234ea27 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -148,15 +148,17 @@
             mods = <(MOD_LCTL)>;
         };
         
-        thumb_shift: thumb_shift { // Allows for space/shift+space for scrolling up with the left hand on the keyboard and the right one on the mouse
+        tshift: thumb_shift { // Allows for space/shift+space for scrolling up with the left hand on the keyboard and the right one on the mouse
             compatible = "zmk,behavior-hold-tap";
-            #binding-cells = <2>;
             label = "THUMB_SHIFT";
             bindings = <&kp>, <&kp>;
+            
+            #binding-cells = <2>;
             flavor = "hold-preferred";
+            tapping-term-ms = <200>;
+            quick-tap-ms = <175>;
             hold-while-undecided;
         };
-        #define THUMB_SHIFT &thumb_shift RSHFT SPACE
 
         swapper: swapper_for_apple_cmd_tab {
             compatible = "zmk,behavior-tri-state"; // requires tri-state module (https://github.com/urob/zmk-tri-state)
@@ -261,16 +263,16 @@
   &kp Q          &kp W         &kp E          &kp R         &kp T           &kp Y           &kp U         &kp I          &kp O         &kp P
   &hrml LCTRL A  &hrml LALT S  &hrml LSHFT D  &hrml LGUI F  &hrml GLOBE G   &hrmr GLOBE H   &hrmr RGUI J  &hrmr LSHFT K  &hrmr RALT L  &hrmr RCTRL SQT
   &hrml GLOBE Z  &kp X         &kp C          &kp V         &kp B           &kp N           &kp M         &kp COMMA      &kp DOT       &kp SEMI
-                                              &lc NAV       THUMB_SHIFT     &kp SPACE       &lc SYM
+                                              &lc NAV   &tshift RSHFT SPACE &kp SPACE       &lc SYM
             >;
         };
 
         NMT {
             bindings = <
-  &kp Q  &kp W  &kp E  &kp R    &kp T        &kp Y      &kp U  &kp I      &kp O    &kp P
-  &kp A  &kp S  &kp D  &kp F    &kp G        &kp H      &kp J  &kp K      &kp L    &kp SQT
-  &kp Z  &kp X  &kp C  &kp V    &kp B        &kp N      &kp M  &kp COMMA  &kp DOT  &kp SEMI
-                       &lc NAV  THUMB_SHIFT  &kp SPACE  &lc SYM
+  &kp Q  &kp W  &kp E  &kp R    &kp T               &kp Y      &kp U  &kp I      &kp O    &kp P
+  &kp A  &kp S  &kp D  &kp F    &kp G               &kp H      &kp J  &kp K      &kp L    &kp SQT
+  &kp Z  &kp X  &kp C  &kp V    &kp B               &kp N      &kp M  &kp COMMA  &kp DOT  &kp SEMI
+                       &lc NAV  &tshift RSHFT SPACE &kp SPACE  &lc SYM
             >;
         };