diff --git a/kube/com.kolabnow.kube.json b/kube/com.kolabnow.kube.json
index 67895d0..4ddfb13 100644
--- a/kube/com.kolabnow.kube.json
+++ b/kube/com.kolabnow.kube.json
@@ -1,61 +1,47 @@
 {
     "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",
     "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_DESKTOPFILE_COMMENT=\"Send, receive and manage your Kolab Now mail with Kube\"",
                 "-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 --lockfile", "gpg-connect-agent killagent /bye"],
-                    "dest-filename": "kubewrapper.sh"
-                }
-            ]
-        }
+        "wrapperscript.json"
     ]
 }
diff --git a/kube/com.kubeproject.kube.json b/kube/com.kubeproject.kube.json
index ee83d02..8c2f498 100644
--- a/kube/com.kubeproject.kube.json
+++ b/kube/com.kubeproject.kube.json
@@ -1,61 +1,47 @@
 {
     "id": "com.kubeproject.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
     "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++",
                 "-DKUBE_APPLICATION_ID=com.kubeproject.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 --lockfile", "gpg-connect-agent killagent /bye"],
-                    "dest-filename": "kubewrapper.sh"
-                }
-            ]
-        }
+        "wrapperscript.json"
     ]
 }
diff --git a/kube/gpgme.json b/kube/gpgme.json
index 820c649..e52b61e 100644
--- a/kube/gpgme.json
+++ b/kube/gpgme.json
@@ -1,47 +1,47 @@
 {
     "name": "gpgme",
     "sources": [ { "type": "git", "url": "git://git.gnupg.org/gpgme.git", "branch": "gpgme-1.9.0"} ],
     "modules": [
         {
             "name": "libgpg-error",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.22.tar.bz2",
                     "sha256": "f2a04ee6317bdb41a625bea23fdc7f0b5a63fb677f02447c647ed61fb9e69d7b"
                 }
             ],
             "cleanup": [
                 "/lib/libgpg-error.la"
             ]
         },
         {
             "name": "libassuan",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.4.2.tar.bz2",
                     "sha256": "bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20"
                 }
             ],
             "cleanup": [
                 "/lib/libassuan.la"
             ]
         },
         {
             "name": "pinentry",
-            "config-opts": ["-enable-pinentry-qt"],
+            "config-opts": ["--enable-pinentry-qt", "--disable-fallback-curses"],
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2",
                     "sha256": "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
                 }
             ]
         }
     ],
     "cleanup": [
         "/lib/libgpgme*.la",
         "/lib/libqgpgme.la"
     ]
 }
diff --git a/kube/wrapperscript.json b/kube/wrapperscript.json
new file mode 100644
index 0000000..2758269
--- /dev/null
+++ b/kube/wrapperscript.json
@@ -0,0 +1,15 @@
+{
+    "name": "kubewrapper",
+    "buildsystem": "simple",
+    "build-commands": [
+        "cp kubewrapper.sh /app/bin/kubewrapper.sh",
+        "chmod +x /app/bin/kubewrapper.sh"
+    ],
+    "sources": [
+        {
+            "type": "script",
+            "commands": ["gpg-connect-agent killagent /bye", "gpg-agent --homedir ~/.gnupg --daemon --pinentry-program /app/bin/pinentry-qt", "kube --lockfile", "gpg-connect-agent killagent /bye"],
+            "dest-filename": "kubewrapper.sh"
+        }
+    ]
+}