diff --git a/plugins/battery/batteryplugin.h b/plugins/battery/batteryplugin.h
--- a/plugins/battery/batteryplugin.h
+++ b/plugins/battery/batteryplugin.h
@@ -38,7 +38,6 @@
     explicit BatteryPlugin(QObject *parent, const QVariantList &args);
     ~BatteryPlugin() override;
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/clipboard/clipboardplugin.h b/plugins/clipboard/clipboardplugin.h
--- a/plugins/clipboard/clipboardplugin.h
+++ b/plugins/clipboard/clipboardplugin.h
@@ -37,10 +37,9 @@
 public:
     explicit ClipboardPlugin(QObject *parent, const QVariantList &args);
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override { }
-    
+
 private Q_SLOTS:
     void propagateClipboard(const QString& content);
 
diff --git a/plugins/findmyphone/findmyphoneplugin.h b/plugins/findmyphone/findmyphoneplugin.h
--- a/plugins/findmyphone/findmyphoneplugin.h
+++ b/plugins/findmyphone/findmyphoneplugin.h
@@ -39,7 +39,6 @@
     
     Q_SCRIPTABLE void ring();
 
-public Q_SLOTS:
     void connected() override;
     bool receivePackage(const NetworkPackage& np) override;
 
diff --git a/plugins/findmyphone/findmyphoneplugin.cpp b/plugins/findmyphone/findmyphoneplugin.cpp
--- a/plugins/findmyphone/findmyphoneplugin.cpp
+++ b/plugins/findmyphone/findmyphoneplugin.cpp
@@ -50,7 +50,7 @@
 
 void FindMyPhonePlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableInvokables);
 }
 
 QString FindMyPhonePlugin::dbusPath() const
diff --git a/plugins/lockdevice/lockdeviceplugin.cpp b/plugins/lockdevice/lockdeviceplugin.cpp
--- a/plugins/lockdevice/lockdeviceplugin.cpp
+++ b/plugins/lockdevice/lockdeviceplugin.cpp
@@ -91,7 +91,7 @@
 
 void LockDevicePlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllProperties);
 
     NetworkPackage np(PACKAGE_TYPE_LOCK_REQUEST, {{"requestLocked", QVariant()}});
     sendPackage(np);
diff --git a/plugins/mpriscontrol/mpriscontrolplugin.h b/plugins/mpriscontrol/mpriscontrolplugin.h
--- a/plugins/mpriscontrol/mpriscontrolplugin.h
+++ b/plugins/mpriscontrol/mpriscontrolplugin.h
@@ -40,7 +40,6 @@
 public:
     explicit MprisControlPlugin(QObject *parent, const QVariantList &args);
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override { }
 
diff --git a/plugins/mprisremote/mprisremoteplugin.h b/plugins/mprisremote/mprisremoteplugin.h
--- a/plugins/mprisremote/mprisremoteplugin.h
+++ b/plugins/mprisremote/mprisremoteplugin.h
@@ -57,19 +57,18 @@
     void setPosition(int position);
     void setPlayer(const QString& player);
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
-    void seek(int offset) const;
-    void requestPlayerStatus();
-    void requestPlayerList();
-    void sendAction(const QString& action);
+    Q_SCRIPTABLE void seek(int offset) const;
+    Q_SCRIPTABLE void requestPlayerList();
+    Q_SCRIPTABLE void sendAction(const QString& action);
 
 Q_SIGNALS:
     void propertiesChanged();
 
 private:
+    void requestPlayerStatus();
     QString dbusPath() const;
 
     QString m_player;
diff --git a/plugins/notifications/notificationsplugin.h b/plugins/notifications/notificationsplugin.h
--- a/plugins/notifications/notificationsplugin.h
+++ b/plugins/notifications/notificationsplugin.h
@@ -44,7 +44,6 @@
     explicit NotificationsPlugin(QObject *parent, const QVariantList &args);
     ~NotificationsPlugin() override;
     
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/pausemusic/pausemusicplugin.h b/plugins/pausemusic/pausemusicplugin.h
--- a/plugins/pausemusic/pausemusicplugin.h
+++ b/plugins/pausemusic/pausemusicplugin.h
@@ -35,10 +35,10 @@
 public:
     explicit PauseMusicPlugin(QObject *parent, const QVariantList &args);
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override { }
 
+public Q_SLOTS:
     /**
      * @returns 0 if not muted, 1 if muted or -1 if there was an error
      */
diff --git a/plugins/ping/pingplugin.h b/plugins/ping/pingplugin.h
--- a/plugins/ping/pingplugin.h
+++ b/plugins/ping/pingplugin.h
@@ -40,7 +40,6 @@
     Q_SCRIPTABLE void sendPing();
     Q_SCRIPTABLE void sendPing(const QString& customMessage);
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp
--- a/plugins/ping/pingplugin.cpp
+++ b/plugins/ping/pingplugin.cpp
@@ -76,7 +76,7 @@
 
 void PingPlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableInvokables);
 }
 
 QString PingPlugin::dbusPath() const
diff --git a/plugins/remotecommands/remotecommandsplugin.h b/plugins/remotecommands/remotecommandsplugin.h
--- a/plugins/remotecommands/remotecommandsplugin.h
+++ b/plugins/remotecommands/remotecommandsplugin.h
@@ -41,16 +41,16 @@
     explicit RemoteCommandsPlugin(QObject *parent, const QVariantList &args);
     ~RemoteCommandsPlugin() override;
 
-    Q_INVOKABLE void triggerCommand(const QString &key);
+    Q_SCRIPTABLE void triggerCommand(const QString &key);
     QByteArray commands() const { return m_commands; }
 
+    bool receivePackage(const NetworkPackage& np) override;
+    void connected() override;
+
 Q_SIGNALS:
     void commandsChanged(const QByteArray& commands);
 
 private:
-    bool receivePackage(const NetworkPackage& np) override;
-    void connected() override;
-
     QString dbusPath() const;
     void setCommands(const QByteArray &commands);
 
diff --git a/plugins/remotecommands/remotecommandsplugin.cpp b/plugins/remotecommands/remotecommandsplugin.cpp
--- a/plugins/remotecommands/remotecommandsplugin.cpp
+++ b/plugins/remotecommands/remotecommandsplugin.cpp
@@ -59,7 +59,7 @@
 
 void RemoteCommandsPlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllProperties | QDBusConnection::ExportScriptableInvokables);
 
     NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND_REQUEST, {{"requestCommandList", true}});
     sendPackage(np);
diff --git a/plugins/remotecontrol/remotecontrolplugin.h b/plugins/remotecontrol/remotecontrolplugin.h
--- a/plugins/remotecontrol/remotecontrolplugin.h
+++ b/plugins/remotecontrol/remotecontrolplugin.h
@@ -40,8 +40,8 @@
     bool receivePackage(const NetworkPackage& /*np*/) override { return false; }
     void connected() override;
 
-    Q_INVOKABLE void moveCursor(const QPoint &p);
-    Q_INVOKABLE void sendCommand(const QString &name, bool val);
+    Q_SCRIPTABLE void moveCursor(const QPoint &p);
+    Q_SCRIPTABLE void sendCommand(const QString &name, bool val);
 
 private:
     QString dbusPath() const;
diff --git a/plugins/remotecontrol/remotecontrolplugin.cpp b/plugins/remotecontrol/remotecontrolplugin.cpp
--- a/plugins/remotecontrol/remotecontrolplugin.cpp
+++ b/plugins/remotecontrol/remotecontrolplugin.cpp
@@ -59,7 +59,7 @@
 
 void RemoteControlPlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableInvokables);
 }
 
 QString RemoteControlPlugin::dbusPath() const
diff --git a/plugins/runcommand/runcommandplugin.h b/plugins/runcommand/runcommandplugin.h
--- a/plugins/runcommand/runcommandplugin.h
+++ b/plugins/runcommand/runcommandplugin.h
@@ -39,8 +39,6 @@
     explicit RunCommandPlugin(QObject *parent, const QVariantList &args);
     ~RunCommandPlugin() override;
 
-
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/screensaver-inhibit/screensaverinhibitplugin.h b/plugins/screensaver-inhibit/screensaverinhibitplugin.h
--- a/plugins/screensaver-inhibit/screensaverinhibitplugin.h
+++ b/plugins/screensaver-inhibit/screensaverinhibitplugin.h
@@ -34,7 +34,6 @@
     explicit ScreensaverInhibitPlugin(QObject *parent, const QVariantList &args);
     ~ScreensaverInhibitPlugin() override;
 
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/sendnotifications/sendnotificationsplugin.h b/plugins/sendnotifications/sendnotificationsplugin.h
--- a/plugins/sendnotifications/sendnotificationsplugin.h
+++ b/plugins/sendnotifications/sendnotificationsplugin.h
@@ -42,7 +42,6 @@
     explicit SendNotificationsPlugin(QObject *parent, const QVariantList &args);
     ~SendNotificationsPlugin() override;
     
-public Q_SLOTS:
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/sftp/sftpplugin.h b/plugins/sftp/sftpplugin.h
--- a/plugins/sftp/sftpplugin.h
+++ b/plugins/sftp/sftpplugin.h
@@ -38,15 +38,15 @@
     explicit SftpPlugin(QObject *parent, const QVariantList &args);
     ~SftpPlugin() override;
 
+    bool receivePackage(const NetworkPackage& np) override;
+    void connected() override;
+
 Q_SIGNALS:
     void packageReceived(const NetworkPackage& np);
     Q_SCRIPTABLE void mounted();
     Q_SCRIPTABLE void unmounted();
-    
-public Q_SLOTS:
-    bool receivePackage(const NetworkPackage& np) override;
-    void connected() override;
 
+public Q_SLOTS:
     Q_SCRIPTABLE void mount();
     Q_SCRIPTABLE void unmount();
     Q_SCRIPTABLE bool mountAndWait();
diff --git a/plugins/share/shareplugin.h b/plugins/share/shareplugin.h
--- a/plugins/share/shareplugin.h
+++ b/plugins/share/shareplugin.h
@@ -39,7 +39,7 @@
 
     ///Helper method, QDBus won't recognize QUrl
     Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url)); }
-public Q_SLOTS:
+
     bool receivePackage(const NetworkPackage& np) override;
     void connected() override;
 
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -163,7 +163,7 @@
 
 void TelephonyPlugin::connected()
 {
-    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents);
+    QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableInvokables);
 }
 
 QString TelephonyPlugin::dbusPath() const