diff --git a/panels/mouse/cc-mouse-panel.ui b/panels/mouse/cc-mouse-panel.ui
index 58c7b1046..4a6e9d555 100644
--- a/panels/mouse/cc-mouse-panel.ui
+++ b/panels/mouse/cc-mouse-panel.ui
@@ -52,10 +52,13 @@
True
none
-
@@ -184,131 +141,42 @@
True
none
-
+
True
True
false
+ Mouse Speed
-
+
True
- False
- 0
- 32
- 20
- 20
- 8
- 8
- center
-
-
- True
- False
- 0
- end
- Mouse Speed
- True
- mouse_speed_scale
+ True
+ mouse_speed_adjustment
+ False
+ 300
+ end
+ True
+
+
+ Double-click timeout
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- mouse_speed_adjustment
- False
- 300
- end
- True
-
-
- Double-click timeout
-
-
-
-
- 1
- 0
- 1
- 2
-
-
+
True
True
false
+ Natural Scrolling
+ Scrolling moves the content, not the view.
-
+
True
- False
- 2
- 16
- 20
- 20
- 6
- 6
+ True
+ end
center
-
-
- True
- False
- True
- 0
- Natural Scrolling
- True
- mouse_natural_scrolling_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- False
- 0
- Scrolling moves the content, not the view.
-
-
-
-
-
-
- 0
- 1
- 1
- 1
-
-
-
-
- True
- True
- end
- center
-
-
- 1
- 0
- 1
- 2
-
-
@@ -353,341 +221,108 @@
True
none
-
+
True
True
false
+ Touchpad
-
+
True
- False
- 0
- 32
- 20
- 20
- 12
- 12
+ True
+ end
center
-
-
- True
- False
- True
- 0
- end
- Touchpad
- True
- touchpad_toggle_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- end
- center
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 0
- 1
- 2
-
-
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
+
True
True
false
+ Natural Scrolling
+ Scrolling moves the content, not the view.
-
+
True
- False
- 2
- 16
- 20
- 20
- 6
- 6
+ True
+ end
center
-
-
- True
- False
- True
- 0
- Natural Scrolling
- True
- touchpad_natural_scrolling_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- False
- 0
- Scrolling moves the content, not the view.
-
-
-
-
-
-
- 0
- 1
- 1
- 1
-
-
-
-
- True
- True
- end
- center
-
-
- 1
- 0
- 1
- 2
-
-
-
+
True
True
false
+ Touchpad Speed
-
+
True
- False
- 0
- 16
- 20
- 20
- 8
- 8
- center
-
-
- True
- False
- 0
- end
- Touchpad Speed
- True
- touchpad_speed_scale
+ True
+ touchpad_speed_adjustment
+ False
+ True
+ end
+
+
+ Double-click timeout
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- touchpad_speed_adjustment
- False
- True
- end
-
-
- Double-click timeout
-
-
-
-
- 1
- 0
- 1
- 2
-
-
+
False
True
false
+ Tap to Click
-
+
True
- False
- 0
- 32
- 20
- 20
- 12
- 12
+ True
+ end
center
-
-
- True
- False
- True
- 0
- end
- Tap to Click
- True
- tap_to_click_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- end
- center
-
-
- 1
- 0
- 1
- 2
-
-
-
+
False
True
false
+ Two-finger Scrolling
-
+
True
- False
- 0
- 32
- 20
- 20
- 12
- 12
+ True
+ end
center
-
-
- True
- False
- True
- 0
- end
- Two-finger Scrolling
- True
- two_finger_scrolling_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- end
- center
-
-
-
- 1
- 0
- 1
- 2
-
-
+
-
+
False
True
false
+ Edge Scrolling
-
+
True
- False
- 0
- 32
- 20
- 20
- 12
- 12
+ True
+ end
center
-
-
- True
- False
- True
- 0
- end
- Edge Scrolling
- True
- edge_scrolling_switch
-
-
- 0
- 0
- 1
- 1
-
-
-
-
- True
- True
- end
- center
-
-
-
- 1
- 0
- 1
- 2
-
-
+