diff --git a/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
index 33204a3..ec7e5be 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's a11y-settings plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-a11y-settings
+Exec=/usr/libexec/gsd-a11y-settings
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop
deleted file mode 100644
index 07a7797..0000000
--- a/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's clipboard plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-clipboard
-OnlyShowIn=Pantheon;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop
index b267495..2b57f7f 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's color plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-color
+Exec=/usr/libexec/gsd-color
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
index 16539b4..0ce1736 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's datetime plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-datetime
+Exec=/usr/libexec/gsd-datetime
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
index 961c07e..c3c74dc 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's housekeeping plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-housekeeping
+Exec=/usr/libexec/gsd-housekeeping
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
index 04136e9..953805d 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's keyboard plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-keyboard
+Exec=/usr/libexec/gsd-keyboard
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
index 5a0b067..f4a3c2a 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's media-keys plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-media-keys
+Exec=/usr/libexec/gsd-media-keys
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop
deleted file mode 100644
index f459ec4..0000000
--- a/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's mouse plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-mouse
-OnlyShowIn=Pantheon;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop
index e7d5a9c..1fac252 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's power plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-power
+Exec=/usr/libexec/gsd-power
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
index 57d3d05..3a3dd7e 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's print-notifications plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-print-notifications
+Exec=/usr/libexec/gsd-print-notifications
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
index dbdcf3b..71e87e0 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's rfkill plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-rfkill
+Exec=/usr/libexec/gsd-rfkill
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
index 5a21ddf..2803ef7 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's sharing plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-sharing
+Exec=/usr/libexec/gsd-sharing
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
index 37197b1..8996b18 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's smartcard plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-smartcard
+Exec=/usr/libexec/gsd-smartcard
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop
index b8c4cf8..db5f73b 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's sound plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-sound
+Exec=/usr/libexec/gsd-sound
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
index c9d8496..835baa1 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's wacom plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-wacom
+Exec=/usr/libexec/gsd-wacom
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization
diff --git a/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
index 78acfce..a9ba582 100644
--- a/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
+++ b/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME Settings Daemon's xsettings plugin
-Exec=/usr/lib/gnome-settings-daemon/gsd-xsettings
+Exec=/usr/libexec/gsd-xsettings
 OnlyShowIn=Pantheon;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization