diff --git a/config/cradio.keymap b/config/cradio.keymap
index e3bceef..969691a 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -12,7 +12,7 @@
 #define AOE 5 // AOE 2 layers with easier access for default shortcuts on main layer
 #define AGS 6
 #define ABS 7
-#define MOU 9
+#define MOU 8
 
 #define HYPER LG(LS(LC(LALT))) // HYPER key for another shortcut layer
 
@@ -79,9 +79,8 @@
         };
 
         toggle_mouse_emulation_layer {
-            bindings = <&tog MOU>;
             key-positions = <6 7 8>;
-            require-prior-idle-ms = <200>;
+            bindings = <&tog MOU>;
             layers = <DEF MOU>;
         };
 
@@ -316,7 +315,7 @@
 
         MOU {
             bindings = <
-&kp TAB           &swapper   &kp LS(LC(TAB))  &kp LC(TAB)  &kp LG(RBKT) &msc SCRL_UP    &msc SCRL_LEFT  &mmv MOVE_UP    &msc SCRL_RIGHT &kp BSPC
+&kp TAB           &kp LC(UP) &kp LS(LC(TAB))  &kp LC(TAB)  &kp LG(RBKT) &msc SCRL_UP    &msc SCRL_LEFT  &mmv MOVE_UP    &msc SCRL_RIGHT &kp BSPC
 &kp LCTRL         &kp LALT   &kp LSHFT        &kp LGUI     &kp LG(LBKT) &msc SCRL_DOWN  &mmv MOVE_LEFT  &mmv MOVE_DOWN  &mmv MOVE_RIGHT &kp ENTER
 &hrml GLOBE LG(Z) &kp LG(X)  &kp LG(C)        &kp LG(V)    &kp F18      &kp LC(UP)      &mkp MB4        &mkp MCLK       &mkp MB4        &kp DEL
                                               &tog MOU     &kp RSHFT    &mkp LCLK       &mkp RCLK            
diff --git a/config/mouse.dtsi b/config/mouse.dtsi
index 609073c..1ed260f 100644
--- a/config/mouse.dtsi
+++ b/config/mouse.dtsi
@@ -5,8 +5,6 @@
 #define ZMK_POINTING_DEFAULT_SCRL_VAL 20  // 10
 
 #include <dt-bindings/zmk/pointing.h>
-#include <input/processors.dtsi>
-#include <zephyr/dt-bindings/input/input-event-codes.h>
 
 // Based on @caksoylar's config, defaults in comments
 &mmv {
@@ -22,10 +20,9 @@
 };
 
 // Add these lines to cradio.conf
-// # Mouse config, requires PR #778
+// # Mouse config
 // CONFIG_ZMK_MOUSE=y
-// CONFIG_ZMK_MOUSE_TICK_DURATION=8
-
+// CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y
 
 // Add the bellow lines do cradio.keymap