Merge lp:~l-admin-3/switchboard-plug-mouse-touchpad/frontend-update into lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/trunk

[Marcus Wichelmann]

Frontend update.

This branch updates the gui of the plug like shown in the mockup together with some code improvements.

[Danielle Foré (danrabbit)]

I can confirm that the settings work as expected here :)

review: Approve (ux)

[Felipe Escoto (philip.scott)]

review: Approve

[Felipe Escoto (philip.scott)]

review: Approve (code)

=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file 'AUTHORS' (properties changed: -x to +x)
--- AUTHORS	2014-07-22 05:50:56 +0000
+++ AUTHORS	2015-08-23 23:11:04 +0000
@@ -1,4 +1,5 @@
-Copyright (c) 2014 by XXX Developers
+Copyright (c) 2015 by elementary Developers
 
-Written by XXX Developers:
-* YOUR NAME <[e-mail]>
+Written by elementary Developers:
+* Keith Gonyon
+* Marcus Wichelmann <[e-mail]>
 
=== modified file 'CMakeLists.txt' (properties changed: -x to +x)
=== modified file 'COPYING' (properties changed: -x to +x)
=== removed file 'COPYRIGHT'
--- COPYRIGHT	2014-07-22 05:50:56 +0000
+++ COPYRIGHT	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-Sample
-Copyright (C) 2014 by the following:
-
-If you have contributed to this project then you deserve to be on this list.
-Contact us (see: AUTHORS) and we'll add you.
 
=== modified file 'INSTALL' (properties changed: -x to +x)
=== modified file 'cmake/FindGirCompiler.cmake' (properties changed: -x to +x)
=== modified file 'cmake/FindVala.cmake' (properties changed: -x to +x)
=== modified file 'cmake/GObjectIntrospectionMacros.cmake' (properties changed: -x to +x)
=== modified file 'cmake/GSettings.cmake' (properties changed: -x to +x)
=== modified file 'cmake/ParseArguments.cmake' (properties changed: -x to +x)
=== modified file 'cmake/README' (properties changed: -x to +x)
=== modified file 'cmake/README.Vala.rst' (properties changed: -x to +x)
=== modified file 'cmake/Tests.cmake' (properties changed: -x to +x)
=== modified file 'cmake/Translations.cmake' (properties changed: -x to +x)
=== modified file 'cmake/ValaPrecompile.cmake' (properties changed: -x to +x)
=== modified file 'cmake/ValaVersion.cmake' (properties changed: -x to +x)
=== modified file 'config.vala.cmake' (properties changed: -x to +x)
=== modified file 'debian/changelog' (properties changed: -x to +x)
=== modified file 'debian/compat' (properties changed: -x to +x)
=== modified file 'debian/control' (properties changed: -x to +x)
=== modified file 'debian/copyright' (properties changed: -x to +x)
=== modified file 'debian/source/format' (properties changed: -x to +x)
=== modified file 'plug.plugin' (properties changed: -x to +x)
=== modified file 'po/CMakeLists.txt' (properties changed: -x to +x)
=== modified file 'po/ca.po' (properties changed: -x to +x)
=== modified file 'po/eo.po' (properties changed: -x to +x)
=== modified file 'po/es.po' (properties changed: -x to +x)
=== modified file 'po/fi.po' (properties changed: -x to +x)
=== modified file 'po/fr.po' (properties changed: -x to +x)
=== modified file 'po/it.po' (properties changed: -x to +x)
=== modified file 'po/pantheon-mouse-touchpad.pot' (properties changed: -x to +x)
--- po/pantheon-mouse-touchpad.pot	2014-07-25 05:27:41 +0000
+++ po/pantheon-mouse-touchpad.pot	2015-08-23 23:11:04 +0000
@@ -1,3 +1,4 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-24 22:24-0700\n"
+"POT-Creation-Date: 2015-08-24 01:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,73 +17,78 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/mouse-touchpad.vala:25
+#: ../src/mouse-touchpad.vala:34
 msgid "Mouse & Touchpad"
 msgstr ""
 
-#: ../src/mouse-touchpad.vala:26
+#: ../src/mouse-touchpad.vala:35
 msgid "Set your mouse and touchpad preferences"
 msgstr ""
 
-#: ../src/mouse-touchpad.vala:41 ../src/Pages/Touchpad/touchpad-page.vala:46
-msgid "<b>General:</b>"
-msgstr ""
-
-#: ../src/mouse-touchpad.vala:43
-msgid "Left-handed"
-msgstr ""
-
-#: ../src/mouse-touchpad.vala:45
-msgid "Right-handed"
-msgstr ""
-
-#: ../src/mouse-touchpad.vala:47
-msgid "Pointer Reveal"
-msgstr ""
-
-#: ../src/mouse-touchpad.vala:104
+#: ../src/Widgets/GeneralSection.vala:27
+msgid "General"
+msgstr ""
+
+#: ../src/Widgets/GeneralSection.vala:37
+msgid "Left"
+msgstr ""
+
+#: ../src/Widgets/GeneralSection.vala:38
+msgid "Right"
+msgstr ""
+
+#: ../src/Widgets/GeneralSection.vala:43
+msgid "Primary Button:"
+msgstr ""
+
+#: ../src/Widgets/GeneralSection.vala:44
+msgid "Reveal pointer:"
+msgstr ""
+
+#: ../src/Widgets/GeneralSection.vala:44
+msgid "Pressing the control key will highlight the position of the pointer"
+msgstr ""
+
+#: ../src/Widgets/MouseSection.vala:26
 msgid "Mouse"
 msgstr ""
 
-#: ../src/mouse-touchpad.vala:105
+#: ../src/Widgets/MouseSection.vala:40 ../src/Widgets/TouchpadSection.vala:64
+msgid "Pointer speed:"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:31
 msgid "Touchpad"
 msgstr ""
 
-#: ../src/Pages/Mouse/mouse-page.vala:16
-#: ../src/Pages/Touchpad/touchpad-page.vala:41
-msgid "<b>Pointer Speed:</b>"
-msgstr ""
-
-#: ../src/Pages/Mouse/mouse-page.vala:17
-#: ../src/Pages/Touchpad/touchpad-page.vala:42
-msgid "<i>Slow</i>"
-msgstr ""
-
-#: ../src/Pages/Mouse/mouse-page.vala:18
-#: ../src/Pages/Touchpad/touchpad-page.vala:43
-msgid "<i>Fast</i>"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:47
-msgid "Disable while typing"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:48
-msgid "Tap to click"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:50
-msgid "<b>Scrolling:</b>"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:52
-msgid "Natural scrolling"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:53
-msgid "Horizontal scrolling"
-msgstr ""
-
-#: ../src/Pages/Touchpad/touchpad-page.vala:54
-msgid "Two finger scrolling"
+#: ../src/Widgets/TouchpadSection.vala:52
+msgid "Two-finger"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:53
+msgid "Edge"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:54
+msgid "Disabled"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:62
+msgid "Disable while typing:"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:63
+msgid "Tap to click:"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:65
+msgid "Scrolling:"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:66
+msgid "Horizontal scrolling:"
+msgstr ""
+
+#: ../src/Widgets/TouchpadSection.vala:67
+msgid "Natural scrolling:"
 msgstr ""
 
=== modified file 'po/pl.po' (properties changed: -x to +x)
=== added directory 'src/Backend'
=== added file 'src/Backend/MouseSettings.vala'
--- src/Backend/MouseSettings.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/MouseSettings.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Backend.MouseSettings : Granite.Services.Settings {
+    public bool left_handed { get; set; }
+    public bool locate_pointer { get; set; }
+    public double motion_acceleration { get; set; }
+    public int motion_threshold { get; set; }
+
+    public MouseSettings () {
+        base ("org.gnome.settings-daemon.peripherals.mouse");
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Backend/TouchpadSettings.vala'
--- src/Backend/TouchpadSettings.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/TouchpadSettings.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Backend.TouchpadSettings : Granite.Services.Settings {
+    public bool disable_while_typing { get; set; }
+    public bool tap_to_click { get; set; }
+    public double motion_acceleration { get; set; }
+    public int motion_threshold { get; set; }
+    public string scroll_method { get; set; }
+    public bool horiz_scroll_enabled { get; set; }
+    public bool natural_scroll { get; set; }
+
+    public TouchpadSettings () {
+        base ("org.gnome.settings-daemon.peripherals.touchpad");
+    }
+}
 \ No newline at end of file
 
=== modified file 'src/CMakeLists.txt' (properties changed: -x to +x)
--- src/CMakeLists.txt	2014-07-23 01:13:33 +0000
+++ src/CMakeLists.txt	2015-08-23 23:11:04 +0000
@@ -4,6 +4,7 @@
 pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0 granite)
 
 add_definitions (${DEPS_CFLAGS})
+add_definitions ("-w")
 link_directories (${DEPS_LIBRARY_DIRS})
 
 find_package (Vala REQUIRED)
@@ -14,14 +15,12 @@
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
     mouse-touchpad.vala
-    page.vala
-
-    Pages/Mouse/mouse-page.vala
-    Pages/Mouse/mouse-settings.vala
-
-    Pages/Touchpad/touchpad-page.vala
-    Pages/Touchpad/touchpad-settings.vala
-
+    Backend/MouseSettings.vala
+    Backend/TouchpadSettings.vala
+    Widgets/Section.vala
+    Widgets/GeneralSection.vala
+    Widgets/MouseSection.vala
+    Widgets/TouchpadSection.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0
 
=== removed directory 'src/Pages'
=== removed directory 'src/Pages/Mouse'
=== removed file 'src/Pages/Mouse/mouse-page.vala'
--- src/Pages/Mouse/mouse-page.vala	2014-07-25 19:34:08 +0000
+++ src/Pages/Mouse/mouse-page.vala	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-namespace MouseTouchpad {
-	public class MousePage : AbstractPage {
-        /* ---- Layout Variables ---- */
-
-        Gtk.Grid pointer_scale_grid;
-
-        /* ---- Widget Variables ---- */
-
-        Gtk.Label pointer_speed_label;
-        Gtk.Label acceleration_slow_label;
-        Gtk.Label acceleration_fast_label;
-        Gtk.Scale acceleration_scale;
-
-        private MouseSettings mouse_settings;
-
-		public MousePage () {
-            /* ---- Init Settings ---- */
-
-			mouse_settings = new MouseSettings ();
-
-            /* ---- Init Widgets ---- */
-
-            // Pointer speed
-            pointer_scale_grid      = new Gtk.Grid ();
-            pointer_speed_label     = new Gtk.Label (_("<b>Pointer Speed:</b>"));
-            acceleration_slow_label = new Gtk.Label(_("<i>Slow</i>"));
-            acceleration_fast_label = new Gtk.Label(_("<i>Fast</i>"));
-            acceleration_scale      = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 10, 1);
-
-            setup_widgets ();
-            setup_signals ();
-
-            /* ---- Attach widgets ---- */
-
-            // Pointer speed
-            pointer_scale_grid.attach (acceleration_slow_label, 0, 1, 1, 1);
-            pointer_scale_grid.attach (acceleration_scale,      1, 1, 3, 1);
-            pointer_scale_grid.attach (acceleration_fast_label, 4, 1, 1, 1);
-            this.attach (pointer_speed_label,     0, 0, 1, 1);
-            this.attach (pointer_scale_grid,      0, 1, 1, 1);
-		}
-
-		public override void reset () {
-
-		}
-
-		private void setup_widgets () {
-            /* ---- Grids ---- */
-
-            // Pointer Scale
-            pointer_scale_grid.column_spacing     = 12;
-            pointer_scale_grid.margin_top         = 12;
-            pointer_scale_grid.margin_start       = 12;
-            pointer_scale_grid.column_homogeneous = false;
-            pointer_scale_grid.row_homogeneous    = false;
-
-            /* ---- Widgets ---- */
-
-            // Pointer speed
-            pointer_speed_label.halign         = Gtk.Align.START;
-            pointer_speed_label.use_markup     = true;
-            acceleration_fast_label.use_markup = true;
-            acceleration_slow_label.use_markup = true;
-            acceleration_scale.draw_value      = false;
-            acceleration_scale.hexpand         = true;
-            acceleration_scale.set_value (mouse_settings.motion_acceleration);
-
-		}
-
-		private void setup_signals () {
-            // Pointer Speed
-            acceleration_scale.value_changed.connect (() => {
-                mouse_settings.motion_acceleration = acceleration_scale.adjustment.value;
-                mouse_settings.motion_threshold    = (int) (11.0 - acceleration_scale.adjustment.value);
-            });
-
-            mouse_settings.changed["motion-acceleration"].connect (() => {
-                acceleration_scale.adjustment.value = mouse_settings.motion_acceleration;
-            });
-
-		}
-	}
-}
 \ No newline at end of file
 
=== removed file 'src/Pages/Mouse/mouse-settings.vala'
--- src/Pages/Mouse/mouse-settings.vala	2014-07-27 22:49:48 +0000
+++ src/Pages/Mouse/mouse-settings.vala	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-namespace MouseTouchpad {
-	class MouseSettings : Granite.Services.Settings {
-		public double motion_acceleration { get; set; }
-		public int motion_threshold       { get; set; }
-		public bool left_handed           { get; set; }
-		public bool locate_pointer        { get; set; }
-
-		public MouseSettings () {
-			base ("org.gnome.settings-daemon.peripherals.mouse");
-		}
-
-		// public void reset_all () {
-		// 	schema.reset ("motion-acceleration");
-		// 	schema.reset ("motion-threshold");
-		// 	schema.reset ("left-handed");
-		// 	schema.reset ("locate-pointer");
-		// }
-	}
-}
 \ No newline at end of file
 
=== removed directory 'src/Pages/Touchpad'
=== removed file 'src/Pages/Touchpad/touchpad-page.vala'
--- src/Pages/Touchpad/touchpad-page.vala	2014-07-27 22:49:48 +0000
+++ src/Pages/Touchpad/touchpad-page.vala	1970-01-01 00:00:00 +0000
@@ -1,280 +0,0 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-namespace MouseTouchpad {
-	public class TouchpadPage : AbstractPage {
-		/* ---- Layout variables ---- */
-
-        // Pointer Speed
-        Gtk.Grid pointer_speed_grid;
-        Gtk.Grid pointer_scale_grid;
-
-        // General
-        Gtk.Grid general_grid;
-
-        // Scrolling
-        Gtk.Grid scrolling_grid;
-        Gtk.Grid scrolling_label_grid;
-
-        /* ---- Widget Variables ---- */
-
-        // Pointer speed variables
-        Gtk.Label pointer_speed_label;
-        Gtk.Label acceleration_slow_label;
-        Gtk.Label acceleration_fast_label;
-        Gtk.Scale acceleration_scale;
-
-        // General variables
-        Gtk.Label       general_label;
-        Gtk.CheckButton disable_while_typing_check;
-        Gtk.CheckButton tap_to_click_check;
-
-        // Scrolling variables
-        Gtk.Label       scrolling_label;
-        Gtk.Switch      scrolling_switch;
-        Gtk.CheckButton natural_scrolling_check;
-        Gtk.CheckButton horizontal_scrolling_check;
-        Gtk.CheckButton scrolling_two_finger_radio;
-
-
-        private TouchpadSettings touchpad_settings;
-        private string previous_scroll_method;
-
-		public TouchpadPage () {
-            touchpad_settings    = new TouchpadSettings ();
-            /* ---- Init Grids ---- */
-
-            scrolling_grid       = new Gtk.Grid ();
-            scrolling_label_grid = new Gtk.Grid ();
-            general_grid         = new Gtk.Grid ();
-            pointer_speed_grid   = new Gtk.Grid ();
-            pointer_scale_grid   = new Gtk.Grid ();
-
-            /* ---- Init Widgets ---- */
-
-            // Pointer speed
-            pointer_speed_label     = new Gtk.Label (_("<b>Pointer Speed:</b>"));
-            acceleration_slow_label = new Gtk.Label(_("<i>Slow</i>"));
-            acceleration_fast_label = new Gtk.Label(_("<i>Fast</i>"));
-            acceleration_scale      = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 10, 1);
-
-            //General
-            general_label              = new Gtk.Label (_("<b>General:</b>"));
-            disable_while_typing_check = new Gtk.CheckButton.with_label (_("Disable while typing"));
-            tap_to_click_check         = new Gtk.CheckButton.with_label (_("Tap to click"));
-
-            // Scrolling
-            scrolling_label            = new Gtk.Label (_("<b>Scrolling:</b>"));
-            scrolling_switch           = new Gtk.Switch ();
-            natural_scrolling_check    = new Gtk.CheckButton.with_label (_("Natural scrolling"));
-            horizontal_scrolling_check = new Gtk.CheckButton.with_label (_("Horizontal scrolling"));
-            scrolling_two_finger_radio = new Gtk.CheckButton.with_label (_("Two finger scrolling"));
-
-            setup_widgets ();
-            setup_signals ();
-
-            /* ---- Attach widgets ---- */
-
-            // Pointer speed
-            pointer_scale_grid.attach (acceleration_slow_label, 0, 1, 1, 1);
-            pointer_scale_grid.attach (acceleration_scale,      1, 1, 3, 1);
-            pointer_scale_grid.attach (acceleration_fast_label, 4, 1, 1, 1);
-            pointer_speed_grid.attach (pointer_speed_label,     0, 0, 1, 1);
-            pointer_speed_grid.attach (pointer_scale_grid,      0, 1, 1, 1);
-
-            // General
-            general_grid.attach(disable_while_typing_check, 0, 0, 1, 1);
-            general_grid.attach(tap_to_click_check,         0, 1, 1, 1);
-
-            // Scrolling
-            scrolling_label_grid.attach (scrolling_label,      0, 0, 1, 1);
-            scrolling_label_grid.attach (scrolling_switch,     1, 0, 1, 1);
-            scrolling_grid.attach (natural_scrolling_check,    0, 0, 1, 1);
-            scrolling_grid.attach (horizontal_scrolling_check, 0, 1, 1, 1);
-            scrolling_grid.attach (scrolling_two_finger_radio, 0, 2, 1, 1);
-
-            // Main
-            this.attach (pointer_speed_grid,   0, 0, 2, 1);
-            this.attach (general_label,        0, 1, 1, 1);
-            this.attach (general_grid,         0, 2, 1, 1);
-            this.attach (scrolling_label_grid, 1, 1, 1, 1);
-            this.attach (scrolling_grid,       1, 2, 1, 1);
-		}
-
-		public override void reset () {
-
-		}
-
-		private void setup_widgets () {
-            /* ---- Grids ---- */
-
-            // Pointer Speed
-            pointer_scale_grid.row_spacing        = 12;
-            pointer_scale_grid.column_spacing     = 12;
-            pointer_scale_grid.margin_top         = 12;
-            pointer_scale_grid.margin_start       = 12;
-            pointer_scale_grid.column_homogeneous = false;
-            pointer_scale_grid.row_homogeneous    = false;
-            pointer_speed_grid.row_spacing        = 12;
-            pointer_speed_grid.column_spacing     = 12;
-            pointer_speed_grid.column_homogeneous = false;
-            pointer_speed_grid.row_homogeneous    = false;
-
-            //General
-            general_grid.margin_start       = 12;
-            general_grid.row_spacing        = 12;
-            general_grid.column_spacing     = 12;
-            general_grid.column_homogeneous = false;
-            general_grid.row_homogeneous    = false;
-
-            //Scrolling
-            scrolling_grid.margin_start       = 12;
-            scrolling_grid.row_spacing        = 12;
-            scrolling_grid.column_spacing     = 12;
-            scrolling_grid.column_homogeneous = false;
-            scrolling_grid.row_homogeneous    = false;
-            scrolling_label_grid.hexpand      = false;
-            scrolling_label_grid.column_homogeneous = false;
-            scrolling_label_grid.column_spacing = 12;
-
-            /* ---- Widgets ---- */
-
-            // Pointer speed
-            pointer_speed_label.halign         = Gtk.Align.START;
-            pointer_speed_label.use_markup     = true;
-            acceleration_fast_label.use_markup = true;
-            acceleration_slow_label.use_markup = true;
-            acceleration_scale.draw_value      = false;
-            acceleration_scale.hexpand         = true;
-            acceleration_scale.set_value (touchpad_settings.motion_acceleration);
-
-            // General
-            general_label.halign              = Gtk.Align.START;
-            general_label.use_markup          = true;
-            tap_to_click_check.active         = touchpad_settings.tap_to_click;
-            disable_while_typing_check.active = touchpad_settings.disable_while_typing;
-            
-            // Scrolling
-            scrolling_label.halign            = Gtk.Align.START;
-            scrolling_label.use_markup        = true;
-            natural_scrolling_check.active    = touchpad_settings.natural_scroll;
-            horizontal_scrolling_check.active = touchpad_settings.horiz_scroll_enabled;
-
-            var scroll_method = touchpad_settings.scroll_method;
-            if (scroll_method == TouchpadSettings.SCROLL_METHOD_DISABLED) {
-                scrolling_switch.active              = false;
-                scrolling_two_finger_radio.sensitive = false;
-                natural_scrolling_check.sensitive    = false;
-                horizontal_scrolling_check.sensitive = false;
-                previous_scroll_method = TouchpadSettings.SCROLL_METHOD_EDGE;
-            }
-            else if (scroll_method == TouchpadSettings.SCROLL_METHOD_EDGE) {
-                scrolling_switch.active           = true;
-                scrolling_two_finger_radio.active = false;
-            }
-            else if (scroll_method == TouchpadSettings.SCROLL_METHOD_TWO_FINGER) {
-                scrolling_switch.active           = true;
-                scrolling_two_finger_radio.active = true;
-            }
-		}
-
-		private void setup_signals () {
-            // Pointer Speed
-            acceleration_scale.value_changed.connect (() => {
-                touchpad_settings.motion_acceleration = acceleration_scale.adjustment.value;
-                touchpad_settings.motion_threshold    = (int) (11 - acceleration_scale.adjustment.value);
-            });
-
-            touchpad_settings.changed["motion-acceleration"].connect (() => {
-                acceleration_scale.adjustment.value = touchpad_settings.motion_acceleration;
-            });
-
-            //General
-            touchpad_settings.changed["disable-while-typing"].connect (() => {
-                disable_while_typing_check.active = touchpad_settings.disable_while_typing;
-            });
-
-            touchpad_settings.changed["tap-to-click"].connect (() => {
-                tap_to_click_check.active = touchpad_settings.tap_to_click;
-            });
-
-            disable_while_typing_check.notify["active"].connect (() => {
-                touchpad_settings.disable_while_typing = disable_while_typing_check.active;
-            });
-
-            tap_to_click_check.notify["active"].connect (() => {
-                touchpad_settings.tap_to_click = tap_to_click_check.active;
-            });
-
-            // Scrolling
-            touchpad_settings.changed["natural-scroll"].connect (() => {
-                natural_scrolling_check.active = touchpad_settings.natural_scroll;
-            });
-
-            touchpad_settings.changed["horiz-scroll-enabled"].connect (() => {
-                horizontal_scrolling_check.active = touchpad_settings.horiz_scroll_enabled;
-            });
-
-            touchpad_settings.changed["scroll-method"].connect (() => {
-                var scroll_method = touchpad_settings.scroll_method;
-                if (scroll_method == TouchpadSettings.SCROLL_METHOD_DISABLED) 
-                    scrolling_switch.active = false;
-                else if (scroll_method == TouchpadSettings.SCROLL_METHOD_EDGE) {
-                    scrolling_switch.active           = true;
-                    scrolling_two_finger_radio.active = false;
-                }
-                else {
-                    scrolling_switch.active           = true;
-                    scrolling_two_finger_radio.active = true;
-                }
-            });
-
-            natural_scrolling_check.notify["active"].connect (() => {
-                touchpad_settings.natural_scroll = natural_scrolling_check.active;
-            });
-
-            horizontal_scrolling_check.notify["active"].connect (() => {
-                touchpad_settings.horiz_scroll_enabled = horizontal_scrolling_check.active;
-            });
-
-            scrolling_switch.notify["active"].connect (() => {
-                var active = scrolling_switch.active;
-                scrolling_two_finger_radio.sensitive = active;
-                natural_scrolling_check.sensitive    = active;
-                horizontal_scrolling_check.sensitive = active;
-
-                if (!active) {
-                    if (scrolling_two_finger_radio.active)
-                        previous_scroll_method = TouchpadSettings.SCROLL_METHOD_TWO_FINGER;
-                    else 
-                        previous_scroll_method = TouchpadSettings.SCROLL_METHOD_EDGE;
-                    touchpad_settings.scroll_method = TouchpadSettings.SCROLL_METHOD_DISABLED;
-                }
-                else {
-                    touchpad_settings.scroll_method = previous_scroll_method;
-                    if (previous_scroll_method == TouchpadSettings.SCROLL_METHOD_EDGE)
-                        scrolling_two_finger_radio.active = false;
-                    else
-                        scrolling_two_finger_radio.active = true;
-                }
-            });
-
-            scrolling_two_finger_radio.notify["active"].connect (() => {
-                if (scrolling_two_finger_radio.active)
-                    touchpad_settings.scroll_method = TouchpadSettings.SCROLL_METHOD_TWO_FINGER;
-                else 
-                    touchpad_settings.scroll_method = TouchpadSettings.SCROLL_METHOD_EDGE;
-
-            });
-	   }
-	}
-}
 \ No newline at end of file
 
=== removed file 'src/Pages/Touchpad/touchpad-settings.vala'
--- src/Pages/Touchpad/touchpad-settings.vala	2014-07-27 22:49:48 +0000
+++ src/Pages/Touchpad/touchpad-settings.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-namespace MouseTouchpad {
-	class TouchpadSettings : Granite.Services.Settings {
-		public static string SCROLL_METHOD_DISABLED   = "disabled";
-		public static string SCROLL_METHOD_EDGE       = "edge-scrolling";
-		public static string SCROLL_METHOD_TWO_FINGER = "two-finger-scrolling";
-
-		public bool   natural_scroll       { get; set; }
-		public bool   horiz_scroll_enabled { get; set; }
-		public bool   tap_to_click         { get; set; }
-		public bool   disable_while_typing { get; set; }
-		public double motion_acceleration  { get; set; }
-		public int    motion_threshold     { get; set; }
-		public string scroll_method        { get; set; }
-
-		public TouchpadSettings () {
-			base ("org.gnome.settings-daemon.peripherals.touchpad");
-		}
-
-		// public void reset_all () {
-		// 	schema.reset ("natural-scroll");
-		// 	schema.reset ("horiz_scroll-enabled");
-		// 	schema.reset ("tab-to-click");
-		// 	schema.reset ("disable_while_typeing");
-		// 	schema.reset ("motion_acceleration");
-		// 	schema.reset ("motion_threshold");
-		// 	schema.reset ("scroll_method");
-		// }
-	}
-}
 \ No newline at end of file
 
=== added directory 'src/Widgets'
=== added file 'src/Widgets/GeneralSection.vala'
--- src/Widgets/GeneralSection.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/GeneralSection.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Widgets.GeneralSection : Section {
+    private Backend.MouseSettings mouse_settings;
+
+    private Granite.Widgets.ModeButton primary_button_switcher;
+    private Gtk.Switch reveal_pointer_switch;
+
+    public GeneralSection (Backend.MouseSettings mouse_settings) {
+        base (_("General"));
+
+        this.mouse_settings = mouse_settings;
+
+        build_ui ();
+        create_bindings ();
+    }
+
+    private void build_ui () {
+        primary_button_switcher = new Granite.Widgets.ModeButton ();
+        primary_button_switcher.append_text (_("Left"));
+        primary_button_switcher.append_text (_("Right"));
+
+        reveal_pointer_switch = new Gtk.Switch ();
+        reveal_pointer_switch.halign = Gtk.Align.START;
+
+        this.add_entry (_("Primary Button:"), primary_button_switcher);
+        this.add_entry (_("Reveal pointer:"), reveal_pointer_switch, _("Pressing the control key will highlight the position of the pointer"));
+    }
+
+    private void create_bindings () {
+        mouse_settings.bind_property ("left-handed",
+                                      primary_button_switcher,
+                                      "selected",
+                                      BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        mouse_settings.bind_property ("locate-pointer",
+                                      reveal_pointer_switch,
+                                      "state",
+                                      BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Widgets/MouseSection.vala'
--- src/Widgets/MouseSection.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/MouseSection.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Widgets.MouseSection : Section {
+    private Backend.MouseSettings mouse_settings;
+
+    private Gtk.Scale pointer_speed_scale;
+
+    public MouseSection (Backend.MouseSettings mouse_settings) {
+        base (_("Mouse"));
+
+        this.mouse_settings = mouse_settings;
+
+        build_ui ();
+        create_bindings ();
+    }
+
+    private void build_ui () {
+        pointer_speed_scale = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 10, 1);
+        pointer_speed_scale.digits = 2;
+        pointer_speed_scale.draw_value = false;
+        pointer_speed_scale.set_size_request (160, -1);
+
+        this.add_entry (_ ("Pointer speed:"), pointer_speed_scale);
+    }
+
+    private void create_bindings () {
+        mouse_settings.bind_property ("motion-acceleration",
+                                      pointer_speed_scale.adjustment,
+                                      "value",
+                                      BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        pointer_speed_scale.adjustment.bind_property ("value",
+                                                      mouse_settings,
+                                                      "motion-threshold",
+                                                      BindingFlags.SYNC_CREATE,
+                                                      pointer_speed_scale_transform_func);
+    }
+
+    private bool pointer_speed_scale_transform_func (Binding binding, Value source_value, ref Value target_value) {
+        int val = 11 - (int)source_value.get_double ();
+        target_value.set_int (val);
+
+        return true;
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Widgets/Section.vala'
--- src/Widgets/Section.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Section.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Widgets.Section : Gtk.Grid {
+    private Gtk.Label title_label;
+
+    private int row_count = 0;
+
+    public Section (string title) {
+        build_ui (title);
+    }
+
+    public void add_entry (string option, Gtk.Widget widget, string description = "") {
+        int row = row_count++;
+
+        Gtk.Label option_label = new Gtk.Label (option);
+        option_label.halign = Gtk.Align.END;
+
+        this.attach (option_label, 0, row, 1, 1);
+
+        if (description == "") {
+            this.attach (widget, 1, row, 1, 1);
+        } else {
+            Gtk.Box widget_container = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            widget_container.hexpand = false;
+
+            Gtk.Image help_icon = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
+            help_icon.tooltip_text = description;
+
+            widget_container.add (widget);
+            widget_container.add (help_icon);
+
+            this.attach (widget_container, 1, row, 1, 1);
+        }
+    }
+
+    private void build_ui (string title) {
+        this.row_spacing = 12;
+        this.column_spacing = 12;
+        this.column_homogeneous = true;
+
+        title_label = new Gtk.Label (title);
+        title_label.halign = Gtk.Align.START;
+        title_label.get_style_context ().add_class ("h4");
+
+        this.attach (title_label, 0, row_count++, 2, 1);
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Widgets/TouchpadSection.vala'
--- src/Widgets/TouchpadSection.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/TouchpadSection.vala	2015-08-23 23:11:04 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class MouseTouchpad.Widgets.TouchpadSection : Section {
+    private Backend.TouchpadSettings touchpad_settings;
+
+    private Gtk.Switch disable_while_typing_switch;
+    private Gtk.Switch tap_to_click_switch;
+    private Gtk.Scale pointer_speed_scale;
+    private Gtk.ComboBoxText scrolling_combobox;
+    private Gtk.Switch horizontal_scrolling_switch;
+    private Gtk.Switch natural_scrolling_switch;
+
+    public TouchpadSection (Backend.TouchpadSettings touchpad_settings) {
+        base (_("Touchpad"));
+
+        this.touchpad_settings = touchpad_settings;
+
+        build_ui ();
+        create_bindings ();
+    }
+
+    private void build_ui () {
+        disable_while_typing_switch = new Gtk.Switch ();
+        disable_while_typing_switch.halign = Gtk.Align.START;
+
+        tap_to_click_switch = new Gtk.Switch ();
+        tap_to_click_switch.halign = Gtk.Align.START;
+
+        pointer_speed_scale = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 10, 1);
+        pointer_speed_scale.digits = 2;
+        pointer_speed_scale.draw_value = false;
+        pointer_speed_scale.set_size_request (160, -1);
+
+        scrolling_combobox = new Gtk.ComboBoxText ();
+        scrolling_combobox.append ("two-finger-scrolling", _("Two-finger"));
+        scrolling_combobox.append ("edge-scrolling", _("Edge"));
+        scrolling_combobox.append ("disabled", _("Disabled"));
+
+        horizontal_scrolling_switch = new Gtk.Switch ();
+        horizontal_scrolling_switch.halign = Gtk.Align.START;
+
+        natural_scrolling_switch = new Gtk.Switch ();
+        natural_scrolling_switch.halign = Gtk.Align.START;
+
+        this.add_entry (_("Disable while typing:"), disable_while_typing_switch);
+        this.add_entry (_("Tap to click:"), tap_to_click_switch);
+        this.add_entry (_("Pointer speed:"), pointer_speed_scale);
+        this.add_entry (_("Scrolling:"), scrolling_combobox);
+        this.add_entry (_("Horizontal scrolling:"), horizontal_scrolling_switch);
+        this.add_entry (_("Natural scrolling:"), natural_scrolling_switch);
+    }
+
+    private void create_bindings () {
+        touchpad_settings.bind_property ("disable-while-typing",
+                                         disable_while_typing_switch,
+                                         "state",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        touchpad_settings.bind_property ("tap-to-click",
+                                         tap_to_click_switch,
+                                         "state",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        touchpad_settings.bind_property ("motion-acceleration",
+                                         pointer_speed_scale.adjustment,
+                                         "value",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        pointer_speed_scale.adjustment.bind_property ("value",
+                                                      touchpad_settings,
+                                                      "motion-threshold",
+                                                      BindingFlags.SYNC_CREATE,
+                                                      pointer_speed_scale_transform_func);
+
+        touchpad_settings.bind_property ("scroll-method",
+                                         scrolling_combobox,
+                                         "active-id",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        touchpad_settings.bind_property ("horiz-scroll-enabled",
+                                         horizontal_scrolling_switch,
+                                         "state",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+
+        touchpad_settings.bind_property ("natural-scroll",
+                                         natural_scrolling_switch,
+                                         "state",
+                                         BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
+    }
+
+    private bool pointer_speed_scale_transform_func (Binding binding, Value source_value, ref Value target_value) {
+        int val = 11 - (int)source_value.get_double ();
+        target_value.set_int (val);
+
+        return true;
+    }
+}
 \ No newline at end of file
 
=== modified file 'src/mouse-touchpad.vala' (properties changed: -x to +x)
--- src/mouse-touchpad.vala	2014-07-27 22:49:48 +0000
+++ src/mouse-touchpad.vala	2015-08-23 23:11:04 +0000
@@ -1,35 +1,32 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 namespace MouseTouchpad {
     public class Plug : Switchboard.Plug {
-        /* ---- Layout Variables ---- */
-        Gtk.Grid          main_grid;
-        Gtk.Grid          separator_grid;
-        Gtk.Separator     left_separator;
-        Gtk.Separator     right_separator;
-        Gtk.Stack         pages;
-        Gtk.StackSwitcher page_switcher;
-
-        /* ----- General settings variables ---- */
-        Gtk.Label       general_settings_label;
-        Gtk.ButtonBox   handed_buttons;
-        Gtk.RadioButton left_handed_button;
-        Gtk.RadioButton right_handed_button;
-        Gtk.Grid        pointer_reveal_grid;
-        Gtk.CheckButton pointer_reveal_check;
-
-        // Settings
-        MouseSettings mouse_settings;
+        private Backend.MouseSettings mouse_settings;
+        private Backend.TouchpadSettings touchpad_settings;
+
+        private Gtk.Grid main_grid;
+
+        private Widgets.GeneralSection general_section;
+        private Widgets.MouseSection mouse_section;
+        private Widgets.TouchpadSection touchpad_section;
 
         public Plug () {
             Object (category: Category.HARDWARE,
@@ -37,120 +34,58 @@
                     display_name: _("Mouse & Touchpad"),
                     description: _("Set your mouse and touchpad preferences"),
                     icon: "preferences-desktop-peripherals");
-
-            mouse_settings = new MouseSettings ();
         }
 
         public override Gtk.Widget get_widget () {
             if (main_grid == null) {
-                // Initialize variables
-                // Main
-                main_grid      = new Gtk.Grid ();
-                separator_grid = new Gtk.Grid ();
-                pages          = new Gtk.Stack ();
-                page_switcher  = new Gtk.StackSwitcher ();
-                // General
-                general_settings_label = new Gtk.Label (_("<b>General:</b>"));
-                handed_buttons         = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-                left_handed_button     = new Gtk.RadioButton.with_label (null, _("Left-handed"));
-                right_handed_button    = new Gtk.RadioButton.with_label (left_handed_button.get_group(), 
-                                                                         _("Right-handed"));
-                pointer_reveal_grid    = new Gtk.Grid ();
-                pointer_reveal_check   = new Gtk.CheckButton.with_label (_("Pointer Reveal"));
-                left_separator         = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
-                right_separator        = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
-
-                setup_widgets ();
-                setup_signals ();
-
-                // Attach
-                // General
-                handed_buttons.add (left_handed_button);
-                handed_buttons.add (right_handed_button);
-                pointer_reveal_grid.attach (pointer_reveal_check, 0, 0, 1, 1);
-                // Separator
-                separator_grid.add (left_separator);
-                separator_grid.add (page_switcher);
-                separator_grid.add (right_separator);
-                // Main
-                main_grid.attach (general_settings_label, 0, 0, 1, 1);
-                main_grid.attach (pointer_reveal_grid,    0, 1, 1, 1);
-                main_grid.attach (handed_buttons,         0, 2, 1, 1);
-                main_grid.attach (separator_grid,         0, 4, 1, 1);
-                main_grid.attach (pages,                  0, 5, 1, 1);
+                load_settings ();
+                build_ui ();
             }
 
-            main_grid.show_all ();
             return main_grid;
         }
 
         public override void shown () {
-            
         }
 
         public override void hidden () {
-            
         }
 
         public override void search_callback (string location) {
-            
         }
 
-        // 'search' returns results like ("Keyboard → Behavior → Duration", "keyboard<sep>behavior")
+        /* 'search' returns results like ("Keyboard → Behavior → Duration", "keyboard<sep>behavior") */
         public override async Gee.TreeMap<string, string> search (string search) {
             return new Gee.TreeMap<string, string> (null, null);
         }
 
-        private void setup_widgets () {
-            // Grid
-            main_grid.margin      = 12;
+        private void load_settings () {
+            mouse_settings = new Backend.MouseSettings ();
+            touchpad_settings = new Backend.TouchpadSettings ();
+        }
+
+        private void build_ui () {
+            main_grid = new Gtk.Grid ();
+            main_grid.margin = 12;
             main_grid.row_spacing = 12;
-
-            separator_grid.hexpand = true;
-            left_separator.hexpand = true;
-            right_separator.hexpand = true;
-
-            // Pages
-            page_switcher.set_stack(pages);
-            page_switcher.halign = Gtk.Align.CENTER;
-            pages.add_titled (new MousePage (), "mouse", _("Mouse"));
-            pages.add_titled (new TouchpadPage (), "touchpad", _("Touchpad"));
-
-            // General
-            general_settings_label.use_markup  = true;
-            general_settings_label.halign      = Gtk.Align.START;
-            handed_buttons.layout_style        = Gtk.ButtonBoxStyle.START;
-            handed_buttons.margin_start        = 12;
-            pointer_reveal_grid.margin_start   = 12;
-            pointer_reveal_grid.column_spacing = 12;
-
-            left_handed_button.active  = mouse_settings.left_handed;
-            right_handed_button.active = !mouse_settings.left_handed;
-        }
-
-        private void setup_signals () {
-            mouse_settings.changed["left-handed"].connect (() => {
-                left_handed_button.active  = mouse_settings.left_handed;
-                right_handed_button.active = !mouse_settings.left_handed;
-            });
-
-            mouse_settings.changed["locate-pointer"].connect (() => {
-                pointer_reveal_check.active = mouse_settings.locate_pointer;
-            });
-
-            left_handed_button.notify["active"].connect (() => {
-                mouse_settings.left_handed = left_handed_button.active;
-            });
-
-            pointer_reveal_check.notify["active"].connect (() => {
-                mouse_settings.locate_pointer = pointer_reveal_check.active;
-            });
+            main_grid.halign = Gtk.Align.CENTER;
+
+            general_section = new Widgets.GeneralSection (mouse_settings);
+            mouse_section = new Widgets.MouseSection (mouse_settings);
+            touchpad_section = new Widgets.TouchpadSection (touchpad_settings);
+
+            main_grid.attach (general_section, 0, 0, 1, 1);
+            main_grid.attach (mouse_section, 0, 1, 1, 1);
+            main_grid.attach (touchpad_section, 0, 2, 1, 1);
+            main_grid.show_all ();
         }
     }
 }
 
 public Switchboard.Plug get_plug (Module module) {
     debug ("Activating Mouse-Touchpad plug");
+
     var plug = new MouseTouchpad.Plug ();
+
     return plug;
 }
 \ No newline at end of file
 
=== removed file 'src/page.vala'
--- src/page.vala	2014-07-25 19:34:08 +0000
+++ src/page.vala	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/***
-  Copyright (C) 2014 Keith Gonyon <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-namespace MouseTouchpad {
-	public abstract class AbstractPage : Gtk.Grid {
-		public AbstractPage () {
-
-            this.row_spacing        = 24;
-            this.column_spacing     = 12;
-            this.margin_top         = 12;
-            this.margin_bottom      = 12;
-            this.column_homogeneous = true;
-            this.row_homogeneous    = false;
-		}
-
-		public abstract void reset ();
-	}
-}
 \ No newline at end of file