diff --git a/kube/qt.json b/kube/qt.json
index 2d9428f..ed924f0 100644
--- a/kube/qt.json
+++ b/kube/qt.json
@@ -1,365 +1,351 @@
 {
     "name": "qt",
     "cleanup": [ "/man",
                  "/share/man",
                  "/lib/systemd",
                  "*.la"],
     "build-options" : {
         "cflags": "-O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2",
         "cxxflags": "-O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2",
         "ldflags": "-fstack-protector-strong -Wl,-z,relro,-z,now",
         "env": {
             "V": "1"
         }
     },
     "modules": [
-        {
-            "name": "harfbuzz",
-            "config-opts": ["--disable-static",
-                            "--with-gobject",
-                            "--with-graphite2"
-                           ],
-            "sources": [
-                 {
-                     "type": "archive",
-                     "url": "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.8.tar.bz2",
-                     "sha256": "a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9"
-                 }
-            ]
-        },
         {
             "name": "qt5-qtbase",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "build-options" : {
                 "arch" : {
                     "x86_64" : {
                         "config-opts" : [
                             "-reduce-relocations", "-force-debug-info"
                         ]
                     },
                     "arm" : {
                         "config-opts" : [
                             "-no-reduce-relocations", "-optimize-size", "-opengl es2"
                         ]
                     },
                     "aarch64" : {
                         "config-opts" : [
                             "-no-reduce-relocations", "-optimize-size", "-opengl es2"
                         ]
                     }
                 }
             },
             "config-opts": [ "-confirm-license", "-opensource",
                              "-shared",
                              "-platform", "linux-g++",
                              "-optimized-qmake",
                              "-nomake", "examples",
                              "-nomake", "tests",
                              "-system-harfbuzz",
                              "-system-sqlite",
                              "-accessibility",
                              "-dbus-linked",
                              "-fontconfig",
                              "-glib",
                              "-icu",
                              "-openssl-linked",
                              "-no-pch",
                              "-no-rpath",
                              "-no-directfb",
                              "-no-linuxfb",
                              "-no-kms",
                              "-no-cups",
                              "-system-proxies",
                              "-gtk",
                              "-no-use-gold-linker"
                            ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtbase-everywhere-src-5.12.4.tar.xz",
                     "sha256": "20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195"
                 },
                 {
                     "type": "patch",
                     "path": "patch/qtbase-avoid-hardcoding-kernel-version.patch"
                 },
                 {
                     "type": "shell",
                     "commands": [ "mv configure configure.qt" ]
                 },
                 {
                     "type": "script",
                     "commands": [
                         "processed=`sed -e 's/--/-/g ; s/=/ /g' <<< $@`",
                         "./configure.qt $processed"
                     ],
                     "dest-filename": "configure"
                 }
             ]
         },
         {
             "name": "qt5-qtdeclarative",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs", "lib/plugins/qmltooling" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtdeclarative-everywhere-src-5.12.4.tar.xz",
                     "sha256": "614105ed73079d67d81b34fef31c9934c5e751342e4b2e0297128c8c301acda7"
                 }
             ]
         },
         {
             "name": "qt5-qttools",
             "buildsystem": "qmake",
             "cleanup-platform": [
                 "/mkspecs",
                 "/bin/assistant", "/bin/qhelpgenerator", "/bin/qcollectiongenerator", "/bin/qhelpconverter", "/bin/pixeltool", "/bin/designer",
                 "/bin/lrelease", "/bin/lupdate", "/bin/lconvert", "/bin/linguist", "/bin/qdoc", "/bin/qtattributionsscanner",
                 "/bin/qtplugininfo", "/bin/qtdiag", "/bin/qdbusviewer"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qttools-everywhere-src-5.12.4.tar.xz",
                     "sha256": "3b0e353860a9c0cd4db9eeae5f94fef8811ed7d107e3e5e97e4a557f61bd6eb6"
                 }
             ]
         },
         {
             "name": "qt5-qtscript",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtscript-everywhere-src-5.12.4.tar.xz",
                     "sha256": "7adb3fe77638c7a6f2a26bca850b0ff54f5fb7e5561d2e4141d14a84305c2b6a"
                 }
             ]
         },
         {
 
             "name": "qt5-webchannel",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtwebchannel-everywhere-src-5.12.4.tar.xz",
                     "sha256": "ab571a1b699e61a86be1a6b8d6ffd998d431c4850cc27e9a21f81fa5923bfdb7"
                 }
             ]
         },
         {
             "name": "qt5-qtlocation",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtlocation-everywhere-src-5.12.4.tar.xz",
                     "sha256": "127b40bd7679fead3fb98f4c9c1d71dde9d6d416e90a6000129b61a5f128b3a0"
                 }
             ]
         },
         {
             "name": "qt5-qtwebengine",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "config-opts": [ "--", "-system-ffmpeg",
                              "-webengine-proprietary-codecs",
                              "-webengine-icu",
                              "-webp" ],
             "modules": [
                 {
                     "name": "pciutils",
                     "no-autogen": true,
                     "make-args": ["SHARED=no", "ZLIB=no", "PREFIX=/app"],
                     "make-install-args": ["PREFIX=/app", "MANDIR=/tmp"],
                     "post-install": [
                         "make install-pcilib",
                         "make install-lib"
                     ],
                     "sources": [
                         { "type": "git", "url": "https://kernel.googlesource.com/pub/scm/utils/pciutils/pciutils", "branch": "v3.6.2" },
                         {
                             "type": "shell",
                             "commands": [
                                 "sed -i 's@PREFIX=/usr/local@PREFIX=/app@' Makefile"
                             ]
                         }
                     ]
                 },
                 {
                     "name": "opus",
                     "sources": [
                         { "type": "git", "url": "https://github.com/xiph/opus.git", "branch": "v1.2.1" }
                     ]
                 }
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtwebengine-everywhere-src-5.12.4.tar.xz",
                     "sha256": "fccf5c945412c19c3805323211b504ac8becbf191c638a2dc85ec91abfb1b331"
                 },
                 {
                     "type": "patch",
                     "path": "patch/qtwebengine-no-udev.patch"
                 }
             ]
         },
         {
             "name": "qt5-qtsvg",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtsvg-everywhere-src-5.12.4.tar.xz",
                     "sha256": "110812515a73c650e5ebc41305d9a243dadeb21f485aaed773e394dd84ce0d04"
                 }
             ]
         },
         {
             "name": "qt5-qtx11extras",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtx11extras-everywhere-src-5.12.4.tar.xz",
                     "sha256": "49cc009eaf4a01ca7dbe12651ef39de9a43860acb674aec372e70b209f9bae1e"
                 }
             ]
         },
         {
             "name": "qt5-qtquickcontrols",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtquickcontrols-everywhere-src-5.12.4.tar.xz",
                     "sha256": "32d4c2505337c67b0bac26d7f565ec8fabdc616e61247e98674820769dda9858"
                 }
             ]
         },
         {
             "name": "qt5-qtquickcontrols2",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtquickcontrols2-everywhere-src-5.12.4.tar.xz",
                     "sha256": "9a447eed38bc8c7d7be7bc407317f58940377c077ddca74c9a641b1ee6200331"
                 }
             ]
         },
         {
             "name": "qt5-qtgraphicaleffects",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtgraphicaleffects-everywhere-src-5.12.4.tar.xz",
                     "sha256": "0bc38b168fa724411984525173d667aa47076c8cbd4eeb791d0da7fe4b9bdf73"
                 }
             ]
         },
         {
             "name": "qt5-qtxmlpatterns",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtxmlpatterns-everywhere-src-5.12.4.tar.xz",
                     "sha256": "0bea1719bb948f65cbed4375cc3e997a6464f35d25b631bafbd7a3161f8f5666"
                 }
             ]
         },
         {
             "name": "qt5-qtimageformats",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtimageformats-everywhere-src-5.12.4.tar.xz",
                     "sha256": "2dee25c3eea90d172cbd40f41450153322b902da1daa7d2370a55124b2307bb3"
                 }
             ]
         },
         {
             "name": "qt5-wayland",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtwayland-everywhere-src-5.12.4.tar.xz",
                     "sha256": "2fade959c3927687134c597d85c12ba1af22129a60ab326c2dc77a648e74e6b7"
                 }
             ]
         },
         {
             "name": "qt5-qtnetworkauth",
             "buildsystem": "qmake",
             "cleanup-platform": [ "/bin", "/mkspecs" ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://download.qt.io/archive/qt/5.12/5.12.4/submodules/qtnetworkauth-everywhere-src-5.12.4.tar.xz",
                     "sha256": "e501eb46b8405a2b7db9fe90a1c224cf6676a07dc22c0662317ffe3dee1dbf55"
                 }
             ]
         },
         {
             "name": "extra-cmake-modules",
             "cleanup-platform": ["*"],
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/extra-cmake-modules.git", "branch": "v5.42.0" } ]
         },
         {
             "name": "ki18n",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/ki18n.git", "branch": "v5.38.0" } ]
         },
         {
             "name": "kconfig",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kconfig.git", "branch": "v5.38.0" } ]
         },
         {
             "name": "attica",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/attica.git", "branch": "v5.38.0" } ]
         },
         {
             "name": "kcoreaddons",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcoreaddons.git", "branch": "v5.38.0" } ]
         },
         {
             "name": "karchive",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=TRUE"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/karchive.git", "branch": "v5.38.0" } ]
         },
         {
             "name": "kcodecs",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcodecs.git", "branch": "v5.38.0" } ]
         }
     ]
 }