diff --git a/.docker/Dockerfile-ubuntu-amd64 b/.docker/Dockerfile-ubuntu-amd64
new file mode 100644
index 00000000..0484b44f
--- /dev/null
+++ b/.docker/Dockerfile-ubuntu-amd64
@@ -0,0 +1,12 @@
+FROM multiarch/ubuntu-core:amd64-xenial
+
+RUN apt-get update
+# toolchain
+RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
+# kf5 and qt5 libraries
+RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
+      libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
+      plasma-framework
+
+# required by tests
+RUN apt-get install -y xvfb
diff --git a/.docker/Dockerfile-ubuntu b/.docker/Dockerfile-ubuntu-i386
similarity index 90%
rename from .docker/Dockerfile-ubuntu
rename to .docker/Dockerfile-ubuntu-i386
index ee841fae..4fa89235 100644
--- a/.docker/Dockerfile-ubuntu
+++ b/.docker/Dockerfile-ubuntu-i386
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM multiarch/ubuntu-core:i386-xenial
 
 RUN apt-get update
 # toolchain
diff --git a/.docker/build-ubuntu-package.sh b/.docker/build-ubuntu-package.sh
new file mode 100755
index 00000000..a0427fae
--- /dev/null
+++ b/.docker/build-ubuntu-package.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+rm -rf build-ubuntu
+mkdir build-ubuntu
+
+# patches
+git apply patches/qt5.6-qversionnumber.patch
+git apply patches/qt5.5-qstringlist-and-qinfo.patch
+
+# build
+cd build-ubuntu
+cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON ../sources
+make package
+
diff --git a/CHANGELOG b/CHANGELOG
index 481a1892..252848fe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Ver.3.3.3:
++ add custom keys support (#101)
+* DBus interface improvements
+* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
+- fix issue with invalid (up|down)total($|kb) calculation (#127)
+- fix issue with wrong applet identation (#125)
+
 Ver.3.3.2:
 - fix bug with invalid DP colour configuration
 - fix bug with invalid HTML tags operation
diff --git a/packages/PKGBUILD b/packages/PKGBUILD
index 34e20d37..5ce62ec8 100644
--- a/packages/PKGBUILD
+++ b/packages/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor"
 makedepends=('cmake' 'extra-cmake-modules' 'python')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('490c62c8085e532f9428f7534eff5ddd')
+md5sums=('ce2413868cbb230e358e75a15975a1e5')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {
diff --git a/patches/fix-mpris-engine.patch b/patches/fix-mpris-engine.patch
deleted file mode 100644
index 342a32e6..00000000
--- a/patches/fix-mpris-engine.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
-index b8a0ec1..17d90bc 100644
---- a/sources/extsysmonsources/playersource.cpp
-+++ b/sources/extsysmonsources/playersource.cpp
-@@ -73,8 +73,10 @@ QString PlayerSource::getAutoMpris() const
- {
-     QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
-         QDBus::BlockWithGui, "ListNames");
--    if (listServices.arguments().isEmpty())
-+    if (listServices.arguments().isEmpty()) {
-+        qCWarning(LOG_ESS) << "Could not find any DBus service";
-         return "";
-+    }
-     QStringList arguments = listServices.arguments().first().toStringList();
- 
-     for (auto &arg : arguments) {
-@@ -353,7 +355,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
-         = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
-     QDBusMessage request = QDBusMessage::createMethodCall(
-         QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
--        "/org/mpris/MediaPlayer2", "", "Get");
-+        "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
-     request.setArguments(args);
-     QDBusMessage response
-         = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
diff --git a/patches/qt5.5-qstringlist-and-qinfo.patch b/patches/qt5.5-qstringlist-and-qinfo.patch
index 3b9e19d9..c350a888 100644
--- a/patches/qt5.5-qstringlist-and-qinfo.patch
+++ b/patches/qt5.5-qstringlist-and-qinfo.patch
@@ -1,14 +1,15 @@
 diff --git a/sources/awdebug.h b/sources/awdebug.h
-index 8447c65..9f8e298 100644
+index 8447c65..4eef49a 100644
 --- a/sources/awdebug.h
 +++ b/sources/awdebug.h
-@@ -23,10 +23,14 @@
+@@ -23,10 +23,15 @@
  
  #include "version.h"
  
 +#ifndef qCInfo
 +#define qCInfo qCDebug
 +#endif
++
 +
  namespace AWDebug
  {
@@ -19,7 +20,7 @@ index 8447c65..9f8e298 100644
                            "fatal}FF%{endif}][%{category}][%{function}] "
                            "%{message}";
 diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
-index d29672e..f15a729 100644
+index d6d5d1a..ee301df 100644
 --- a/sources/awesome-widget/plugin/awkeysaggregator.h
 +++ b/sources/awesome-widget/plugin/awkeysaggregator.h
 @@ -21,6 +21,7 @@
@@ -28,5 +29,5 @@ index d29672e..f15a729 100644
  #include <QObject>
 +#include <QStringList>
  
- #include "version.h"
  
+ class AWFormatterHelper;
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index f012425b..f7209f00 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
 set(PROJECT_VERSION_MAJOR "3")
 set(PROJECT_VERSION_MINOR "3")
-set(PROJECT_VERSION_PATCH "2")
+set(PROJECT_VERSION_PATCH "3")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop
index 286ef22d..7a33208f 100644
--- a/sources/awesome-widget/package/metadata.desktop
+++ b/sources/awesome-widget/package/metadata.desktop
@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=3.3.2
+X-KDE-PluginInfo-Version=3.3.3
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop
index daef9047..86200008 100644
--- a/sources/desktop-panel/package/metadata.desktop
+++ b/sources/desktop-panel/package/metadata.desktop
@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
-X-KDE-PluginInfo-Version=3.3.2
+X-KDE-PluginInfo-Version=3.3.3
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=