diff --git a/org.kde.kdeconnect.json b/org.kde.kdeconnect.json
index 91edd1f..23bf13d 100644
--- a/org.kde.kdeconnect.json
+++ b/org.kde.kdeconnect.json
@@ -1,47 +1,44 @@
 {
     "id": "org.kde.kdeconnect",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "master",
     "sdk": "org.kde.Sdk",
+    "command": "kdeconnect-indicator",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
-    "rename-desktop-file": "org.kde.kdeconnect.kcm.desktop",
-    "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--share=network", "--own-name=org.kde.kdeconnectd",
-                    "--talk-name=org.mpris.MediaPlayer2", "--talk-name=org.mpris.MediaPlayer2.Player", "--env=QT_QPA_PLATFORM=flatpak" ],
+    "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--share=network", "--own-name=org.kde.kdeconnectd", "--own-name=org.kde.kdeconnect-indicator",
+                    "--talk-name=org.mpris.MediaPlayer2", "--talk-name=org.mpris.MediaPlayer2.Player",
+                    "--env=QT_QPA_PLATFORM=flatpak" ],
+    "rename-desktop-file": "org.kde.kdeconnect.nonplasma.desktop",
 
     "modules": [
         {
             "name": "libfakekey",
             "buildsystem": "simple",
             "build-commands": [
                 "./configure --prefix=/app --sysconfdir=/etc --localstatedir=/var --disable-static",
                 "make AM_LDFLAGS=-lX11",
                 "make install"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2",
                     "sha256": "c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194"
                 }
             ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "qca",
             "cmake": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/qca.git" } ]
         },
-        {
-            "name": "kde-cli-tools",
-            "cmake": true,
-            "sources": [ { "type": "git", "url": "git://anongit.kde.org/kde-cli-tools.git" } ]
-        },
         {
             "name": "kdeconnect",
-            "cmake": true,
+            "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeconnect-kde.git" } ]
         }
     ]
 }