diff --git a/kube/com.kolabnow.kube.json b/kube/com.kolabnow.kube.json
index 18ee9f9..bf58ca8 100644
--- a/kube/com.kolabnow.kube.json
+++ b/kube/com.kolabnow.kube.json
@@ -1,62 +1,61 @@
 {
     "id": "com.kolabnow.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
-    "rename-desktop-file": "com.kolabnow.kube.desktop",
     "tags": ["kolabnow"],
     "desktop-file-name-prefix": "Kolab Now ",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
         "--env=SASL_PATH=/usr/lib/sasl2/"
     ],
     "separate-locales": false,
     "cleanup": ["/include", "*.a", "*.la", "*.prl"],
     "modules": [
         "kubedeps.json",
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib",
                             "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
             "config-opts": [
                 "-DENABLE_TESTING=OFF",
                 "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DAVAILABLE_ACCOUNT_PLUGINS=kolabnow",
-                "-DKUBE_APPLICATION_ID=\"com.kolabnow.kube\"",
+                "-DKUBE_APPLICATION_ID=com.kolabnow.kube",
                 "-DKUBE_DESKTOPFILE_COMMENT=\"Send, receive and manage your Kolab Now mail with Kube\"",
-                "-DKUBE_DESKTOPFILE_CATEGORIES=\"Qt;Office;Network;Email;\""
+                "-DKUBE_DESKTOPFILE_CATEGORIES=Qt;Office;Network;Email;"
             ],
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ]
         },
         {
             "name": "kubewrapper",
             "buildsystem": "simple",
             "build-commands": [
                 "cp kubewrapper.sh /app/bin/kubewrapper.sh",
                 "chmod +x /app/bin/kubewrapper.sh"
             ],
             "sources": [
                 {
                     "type": "script",
                     "commands": ["gpg-agent --homedir ~/.gnupg/ --daemon --pinentry-program /app/bin/pinentry-qt", "kube"],
                     "dest-filename": "kubewrapper.sh"
                 }
             ]
         }
     ]
 }
diff --git a/kube/org.kolab.kube.json b/kube/org.kolab.kube.json
index 72ad80a..1288c2f 100644
--- a/kube/org.kolab.kube.json
+++ b/kube/org.kolab.kube.json
@@ -1,58 +1,62 @@
 {
     "id": "org.kolab.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
-    "rename-desktop-file": "org.kde.kube.desktop",
     "desktop-file-name-prefix": "(Nightly) ",
     "tags": ["nightly"],
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
         "--env=SASL_PATH=/usr/lib/sasl2/"
     ],
     "separate-locales": false,
 
     "modules": [
         "kubedeps.json",
         {
             "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
-            "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
+            "config-opts": [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DCMAKE_C_COMPILER=/usr/bin/clang",
+                "-DCMAKE_CXX_COMPILER=/usr/bin/clang++",
+                "-DKUBE_APPLICATION_ID=org.kolab.kube"
+            ],
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ],
             "post-install": [
                 "rm -rf /app/include",
                 "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl "
             ]
         },
         {
             "name": "kubewrapper",
             "buildsystem": "simple",
             "build-commands": [
                 "cp kubewrapper.sh /app/bin/kubewrapper.sh",
                 "chmod +x /app/bin/kubewrapper.sh"
             ],
             "sources": [
                 {
                     "type": "script",
                     "commands": ["gpg-agent --homedir ~/.gnupg/ --daemon --pinentry-program /app/bin/pinentry-qt", "kube"],
                     "dest-filename": "kubewrapper.sh"
                 }
             ]
         }
     ]
 }