diff --git a/50-touchpad-cmt-eve.conf b/50-touchpad-cmt-eve.conf
index a6c73f7..8d09116 100644
--- a/50-touchpad-cmt-eve.conf
+++ b/50-touchpad-cmt-eve.conf
@@ -19,6 +19,14 @@
     Option          "Finger Moving Energy" "0.0008"
     Option          "Finger Moving Hysteresis" "0.0004"
 
+    # Avoid accidental scroll/move on finger lift
+    Option          "Max Stationary Move Speed" "47"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
+
+    Option          "Box Width" "0.2"
+    Option          "Box Height" "0.2"
+
     Option          "Filter Low Pressure" "1"
     Option          "Pinch Enable" "1"
     Option          "Palm Pressure" "220.0"
diff --git a/50-touchpad-cmt-glimmer.conf b/50-touchpad-cmt-glimmer.conf
index a2f12ac..f5313ea 100644
--- a/50-touchpad-cmt-glimmer.conf
+++ b/50-touchpad-cmt-glimmer.conf
@@ -38,8 +38,7 @@
     Option          "Two Finger Vertical Close Distance Thresh" "35.0"
     Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
 
-    Option          "Min Scroll Dead Reckoning Distance" "0.1"
     Option          "Max Stationary Move Speed" "47"
-    Option          "Max Stationary Move Speed Hysteresis" "2"
-    Option          "Max Stationary Move Suppress Distance" "1"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
 EndSection
diff --git a/50-touchpad-cmt-gnawty.conf b/50-touchpad-cmt-gnawty.conf
index f7d5851..80e5f70 100644
--- a/50-touchpad-cmt-gnawty.conf
+++ b/50-touchpad-cmt-gnawty.conf
@@ -12,8 +12,7 @@
     Option          "Pressure Calibration Slope" "3.523495034"
     Option          "Tap Minimum Pressure" "25.0"
 
-    Option          "Min Scroll Dead Reckoning Distance" "0.1"
     Option          "Max Stationary Move Speed" "47"
-    Option          "Max Stationary Move Speed Hysteresis" "2"
-    Option          "Max Stationary Move Suppress Distance" "2"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
 EndSection
diff --git a/50-touchpad-cmt-samus.conf b/50-touchpad-cmt-samus.conf
index dd4dfe8..235e81b 100644
--- a/50-touchpad-cmt-samus.conf
+++ b/50-touchpad-cmt-samus.conf
@@ -27,7 +27,9 @@
     Option          "Box Height" "0.5"
 
     # Fix to prevent flings from stationary lifting fingers
-    Option          "Min Scroll Dead Reckoning Distance" "0.01"
+    Option          "Max Stationary Move Speed" "47"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
 
     Option          "Max Finger Stationary Speed" "50"
 
diff --git a/50-touchpad-cmt-swanky.conf b/50-touchpad-cmt-swanky.conf
index 4fb883d..2fa87df 100644
--- a/50-touchpad-cmt-swanky.conf
+++ b/50-touchpad-cmt-swanky.conf
@@ -10,8 +10,7 @@
     Option          "Pressure Calibration Slope" "3.119649569"
     Option          "Tap Minimum Pressure" "15.0"
     Option          "Max Allowed Pressure Change Per Sec" "2500"
-    Option          "Min Scroll Dead Reckoning Distance" "0.1"
     Option          "Max Stationary Move Speed" "47"
-    Option          "Max Stationary Move Speed Hysteresis" "2"
-    Option          "Max Stationary Move Suppress Distance" "2"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.4"
 EndSection
diff --git a/60-touchpad-cmt-veyron_jaq.conf b/60-touchpad-cmt-veyron_jaq.conf
index 8e8d99e..151e1f7 100644
--- a/60-touchpad-cmt-veyron_jaq.conf
+++ b/60-touchpad-cmt-veyron_jaq.conf
@@ -21,10 +21,9 @@
     Option          "Fling Buffer Suppress Zero Length Scrolls" "1"
 
     # Avoid accidental scroll/move on finger lift
-    Option          "Min Scroll Dead Reckoning Distance" "0.1"
     Option          "Max Stationary Move Speed" "47"
-    Option          "Max Stationary Move Speed Hysteresis" "2"
-    Option          "Max Stationary Move Suppress Distance" "2"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
 
     # Avoid janky cursor moves due to large pressure changes
     Option          "Max Allowed Pressure Change Per Sec" "4000"
diff --git a/60-touchpad-cmt-veyron_mighty.conf b/60-touchpad-cmt-veyron_mighty.conf
index 32f522b..7a16312 100644
--- a/60-touchpad-cmt-veyron_mighty.conf
+++ b/60-touchpad-cmt-veyron_mighty.conf
@@ -30,10 +30,9 @@
     Option          "Fling Buffer Suppress Zero Length Scrolls" "1"
 
     # Avoid accidental scroll/move on finger lift
-    Option          "Min Scroll Dead Reckoning Distance" "0.1"
     Option          "Max Stationary Move Speed" "47"
-    Option          "Max Stationary Move Speed Hysteresis" "2"
-    Option          "Max Stationary Move Suppress Distance" "2"
+    Option          "Max Stationary Move Speed Hysteresis" "1"
+    Option          "Max Stationary Move Suppress Distance" "0.2"
 
     # Avoid janky cursor moves due to large pressure changes
     Option          "Max Allowed Pressure Change Per Sec" "4000"