diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh
index ea75a04f8..056e9bed1 100644
--- a/x11-packages/emacs-x/build.sh
+++ b/x11-packages/emacs-x/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more (with X11 support)"
 TERMUX_PKG_VERSION=26.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
-TERMUX_PKG_DEPENDS="giflib, gtk3, libandroid-shmem, libgnutls, libjpeg-turbo, libpng, librsvg, libtiff, libxml2, libxpm, littlecms, ncurses"
+TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk3, libandroid-shmem, libcairo-x, libgnutls, libice, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxpm, libxrandr, libxrender, littlecms, ncurses, pango-x"
 TERMUX_PKG_CONFLICTS="emacs"
 TERMUX_PKG_REPLACES="emacs"
 TERMUX_PKG_PROVIDES="emacs"
diff --git a/x11-packages/feh/build.sh b/x11-packages/feh/build.sh
index 40fafaff6..a812453c9 100644
--- a/x11-packages/feh/build.sh
+++ b/x11-packages/feh/build.sh
@@ -3,9 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://feh.finalrewind.org/
 TERMUX_PKG_DESCRIPTION="Fast and light imlib2-based image viewer"
 TERMUX_PKG_VERSION=2.28
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://feh.finalrewind.org/feh-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=13d22d7c5fe5057612ce3df88857aee89fcab9c8cd6fd4f95a42fe6bf851d3d9
-TERMUX_PKG_DEPENDS="imlib2, libandroid-shmem, libcurl, libexif, libxinerama, libxt"
+TERMUX_PKG_DEPENDS="imlib2, libandroid-shmem, libcurl, libexif, libpng, libx11, libxinerama"
+TERMUX_PKG_BUILD_DEPENDS="libxt"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="exif=1 help=1 verscmp=0"
 
diff --git a/x11-packages/fltk-editor/build.sh b/x11-packages/fltk-editor/build.sh
index 5b11cb572..8b4219f71 100644
--- a/x11-packages/fltk-editor/build.sh
+++ b/x11-packages/fltk-editor/build.sh
@@ -5,13 +5,15 @@ TERMUX_PKG_DEPENDS="fltk, libc++"
 TERMUX_PKG_VERSION=1.0-termux
 TERMUX_PKG_REVISION=6
 
-termux_step_make()
-{
-    "${CXX}" ${CXXFLAGS} -I"${TERMUX_PREFIX}/include" "${TERMUX_PKG_BUILDER_DIR}/fltk-editor.cxx" -o fltk-editor ${LDFLAGS} -lfltk
+termux_step_make() {
+    "${CXX}" \
+        ${CPPFLAGS} \
+        ${CXXFLAGS} \
+        "${TERMUX_PKG_BUILDER_DIR}/fltk-editor.cxx" \
+        -o fltk-editor \
+        ${LDFLAGS} -lfltk
 }
 
-termux_step_make_install()
-{
-    mkdir -p "${TERMUX_PREFIX}/bin"
-    cp -f fltk-editor "${TERMUX_PREFIX}/bin/fltk-editor"
+termux_step_make_install() {
+    install -Dm700 fltk-editor "${TERMUX_PREFIX}/bin/fltk-editor"
 }
diff --git a/x11-packages/fltk/build.sh b/x11-packages/fltk/build.sh
index c95dea506..bd4fff7b0 100644
--- a/x11-packages/fltk/build.sh
+++ b/x11-packages/fltk/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://www.fltk.org/
 TERMUX_PKG_DESCRIPTION="Graphical user interface toolkit for X"
 TERMUX_PKG_VERSION=1.3.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://fltk.org/pub/fltk/${TERMUX_PKG_VERSION/.2/}/fltk-${TERMUX_PKG_VERSION/.2/-2}-source.tar.gz
 TERMUX_PKG_SHA256=25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910
-TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, libxcursor, libxfixes, libxft, libxinerama, libxrender"
-TERMUX_PKG_REPLACES="fluid"
+TERMUX_PKG_DEPENDS="fontconfig, glu, libc++, libjpeg-turbo, libpng, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, mesa"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/fluxbox/build.sh b/x11-packages/fluxbox/build.sh
index 9ea00d703..e3e6eaaab 100644
--- a/x11-packages/fluxbox/build.sh
+++ b/x11-packages/fluxbox/build.sh
@@ -16,6 +16,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 
 termux_step_pre_configure() {
-    export CFLAGS="${CFLAGS} -I${TERMUX_PREFIX}/include/libandroid-support"
     export CXXFLAGS="${CXXFLAGS} -Wno-c++11-narrowing"
 }
diff --git a/x11-packages/galculator/build.sh b/x11-packages/galculator/build.sh
index bfe278e49..a0df5f79c 100644
--- a/x11-packages/galculator/build.sh
+++ b/x11-packages/galculator/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://galculator.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="GTK+ based scientific calculator"
 TERMUX_PKG_VERSION=2.1.4
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=http://galculator.mnim.org/downloads/galculator-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=01cfafe6606e7ec45facb708ef85efd6c1e8bb41001a999d28212a825ef778ae
-TERMUX_PKG_DEPENDS="gtk3"
+TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, libandroid-shmem, libcairo-x, pango-x"
 
 termux_step_pre_configure() {
     export LIBS="-landroid-shmem"
diff --git a/x11-packages/geany/build.sh b/x11-packages/geany/build.sh
index a9c1ff86e..0cb37b244 100644
--- a/x11-packages/geany/build.sh
+++ b/x11-packages/geany/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.geany.org/
 TERMUX_PKG_DESCRIPTION="Fast and lightweight IDE"
 TERMUX_PKG_VERSION=1.33.0
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://download.geany.org/geany-${TERMUX_PKG_VERSION/.0}.tar.bz2
 TERMUX_PKG_SHA256=66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2
-TERMUX_PKG_DEPENDS="gtk3, libandroid-glob, libc++"
+TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gtk3, harfbuzz, libandroid-glob, libandroid-shmem, libandroid-support, libbz2, libc++, libcairo-x, libffi, libgraphite, liblzma, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdmcp, libxext, libxml2, libxrender, pango-x, pcre"
 TERMUX_PKG_RECOMMENDS="clang, make"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gtk3"
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons/hicolor/icon-theme.cache"
diff --git a/x11-packages/i3/build.sh b/x11-packages/i3/build.sh
index fc97ae1a9..b0da689ce 100644
--- a/x11-packages/i3/build.sh
+++ b/x11-packages/i3/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://i3wm.org/
 TERMUX_PKG_DESCRIPTION="An improved dynamic tiling window manager"
 TERMUX_PKG_VERSION=4.15
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://i3wm.org/downloads/i3-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=217d524d1fbc85ae346b25f6848d1b7bcd2c23184ec88d29114bf5a621385326
-TERMUX_PKG_DEPENDS="i3status, libandroid-glob, libcairo-x, libev, libposix-shm, libxkbcommon, pango, pcre, perl, startup-notification, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl"
+TERMUX_PKG_DEPENDS="glib, i3status, libandroid-glob, libandroid-shmem, libcairo-x, libev, libposix-shm, libxcb, libxkbcommon, pango-x, pcre, perl, startup-notification, xcb-util, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl"
 
 TERMUX_PKG_CONFFILES="
 i3/config
diff --git a/x11-packages/i3status/build.sh b/x11-packages/i3status/build.sh
index c36dea625..aea2bf989 100644
--- a/x11-packages/i3status/build.sh
+++ b/x11-packages/i3status/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://i3wm.org/i3status/
 TERMUX_PKG_DESCRIPTION="Generates status bar to use with i3bar"
 TERMUX_PKG_VERSION=2.12
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://i3wm.org/i3status/i3status-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=6fc6881536043391ab4bed369d956f99d1088965d8bcebed18d1932de3ba791a
-TERMUX_PKG_DEPENDS="libconfuse, libnl, libpulseaudio, yajl"
+TERMUX_PKG_DEPENDS="libandroid-glob, libconfuse, libnl, libpulseaudio, yajl"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_CONFFILES="etc/i3status.conf"
 
diff --git a/x11-packages/libsm/build.sh b/x11-packages/libsm/build.sh
index 009f2f7e1..12aa5229d 100644
--- a/x11-packages/libsm/build.sh
+++ b/x11-packages/libsm/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Session Management library"
 TERMUX_PKG_VERSION=1.2.2
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libSM-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd
-TERMUX_PKG_DEPENDS="libice"
+TERMUX_PKG_DEPENDS="libice, libuuid"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros, xtrans"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xtrans"
diff --git a/x11-packages/libxaw/build.sh b/x11-packages/libxaw/build.sh
index 27fbdf00e..9f87d8344 100644
--- a/x11-packages/libxaw/build.sh
+++ b/x11-packages/libxaw/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Athena Widget library"
 TERMUX_PKG_VERSION=1.0.13
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXaw-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd
-TERMUX_PKG_DEPENDS="libxmu, libxpm"
+TERMUX_PKG_DEPENDS="libandroid-support, libice, libsm, libuuid, libx11, libxau, libxcb, libxdmcp, libxext, libxmu, libxpm, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/libxcomposite/build.sh b/x11-packages/libxcomposite/build.sh
index 2baa045d6..3ae0a8ff9 100644
--- a/x11-packages/libxcomposite/build.sh
+++ b/x11-packages/libxcomposite/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Composite extension library"
 TERMUX_PKG_VERSION=0.4.4
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXcomposite-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
-TERMUX_PKG_DEPENDS="libxfixes"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
diff --git a/x11-packages/libxcursor/build.sh b/x11-packages/libxcursor/build.sh
index 495920643..00e3f65a3 100644
--- a/x11-packages/libxcursor/build.sh
+++ b/x11-packages/libxcursor/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X cursor management library"
 TERMUX_PKG_VERSION=1.1.15
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXcursor-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b
-TERMUX_PKG_DEPENDS="libxcb, libxfixes, libxrender"
+TERMUX_PKG_DEPENDS="libx11, libxfixes, libxrender"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/libxdamage/build.sh b/x11-packages/libxdamage/build.sh
index ae71afbd6..78ab18dea 100644
--- a/x11-packages/libxdamage/build.sh
+++ b/x11-packages/libxdamage/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 damaged region extension library"
 TERMUX_PKG_VERSION=1.1.4
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXdamage-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
-TERMUX_PKG_DEPENDS="libxfixes"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp, libxfixes"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
diff --git a/x11-packages/libxext/build.sh b/x11-packages/libxext/build.sh
index 42973f5a7..ca5b5b7fb 100644
--- a/x11-packages/libxext/build.sh
+++ b/x11-packages/libxext/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 miscellaneous extensions library"
 TERMUX_PKG_VERSION=1.3.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXext-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
-TERMUX_PKG_DEPENDS="libx11"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
diff --git a/x11-packages/libxft/build.sh b/x11-packages/libxft/build.sh
index bd1ab99d1..f56ead052 100644
--- a/x11-packages/libxft/build.sh
+++ b/x11-packages/libxft/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="FreeType-based font drawing library for X"
 TERMUX_PKG_VERSION=2.3.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXft-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c
-TERMUX_PKG_DEPENDS="libxrender"
+TERMUX_PKG_DEPENDS="fontconfig, freetype, libandroid-support, libbz2, liblzma, libpng, libuuid, libx11, libxau, libxcb, libxdmcp, libxml2, libxrender"
diff --git a/x11-packages/libxi/build.sh b/x11-packages/libxi/build.sh
index c99774371..2c15863e7 100644
--- a/x11-packages/libxi/build.sh
+++ b/x11-packages/libxi/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Input extension library"
 TERMUX_PKG_VERSION=1.7.9
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXi-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45
-TERMUX_PKG_DEPENDS="libxext, libxfixes"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp, libxext"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/libxinerama/build.sh b/x11-packages/libxinerama/build.sh
index f32230a64..b3dce1d17 100644
--- a/x11-packages/libxinerama/build.sh
+++ b/x11-packages/libxinerama/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Xinerama extension library"
 TERMUX_PKG_VERSION=1.1.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXinerama-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720
-TERMUX_PKG_DEPENDS="libxext"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp, libxext"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/libxkbfile/build.sh b/x11-packages/libxkbfile/build.sh
index 655afe7f7..0229f4f35 100644
--- a/x11-packages/libxkbfile/build.sh
+++ b/x11-packages/libxkbfile/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 keyboard file manipulation library"
 TERMUX_PKG_VERSION=1.0.9
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libxkbfile-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a
-TERMUX_PKG_DEPENDS="libx11"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/libxmu/build.sh b/x11-packages/libxmu/build.sh
index 9e9c654d5..ae110bcb0 100644
--- a/x11-packages/libxmu/build.sh
+++ b/x11-packages/libxmu/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 miscellaneous micro-utility library"
 TERMUX_PKG_VERSION=1.1.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXmu-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b
-TERMUX_PKG_DEPENDS="libxext, libxt"
+TERMUX_PKG_DEPENDS="libandroid-support, libice, libsm, libuuid, libx11, libxau, libxcb, libxdmcp, libxext, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/libxpm/build.sh b/x11-packages/libxpm/build.sh
index af395334c..c0a37ed3b 100644
--- a/x11-packages/libxpm/build.sh
+++ b/x11-packages/libxpm/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 pixmap library"
 TERMUX_PKG_VERSION=3.5.12
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXpm-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec
-TERMUX_PKG_DEPENDS="libxext, libxt"
+TERMUX_PKG_DEPENDS="libx11, libxext, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/libxrandr/build.sh b/x11-packages/libxrandr/build.sh
index 368ffe989..66c71a5e7 100644
--- a/x11-packages/libxrandr/build.sh
+++ b/x11-packages/libxrandr/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 RandR extension library"
 TERMUX_PKG_VERSION=1.5.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXrandr-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a
-TERMUX_PKG_DEPENDS="libxext, libxrender"
+TERMUX_PKG_DEPENDS="libx11, libxext, libxrender"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/libxrender/build.sh b/x11-packages/libxrender/build.sh
index cbd67e311..f9c7f68e0 100644
--- a/x11-packages/libxrender/build.sh
+++ b/x11-packages/libxrender/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X Rendering Extension client library"
 TERMUX_PKG_VERSION=0.9.10
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXrender-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949
-TERMUX_PKG_DEPENDS="fontconfig, libx11"
+TERMUX_PKG_DEPENDS="libx11"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/libxss/build.sh b/x11-packages/libxss/build.sh
index a2f1f7edc..30e280a29 100644
--- a/x11-packages/libxss/build.sh
+++ b/x11-packages/libxss/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 Screen Saver extension library"
 TERMUX_PKG_VERSION=1.2.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8
-TERMUX_PKG_DEPENDS="libx11, libxext"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp, libxext"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/libxt/build.sh b/x11-packages/libxt/build.sh
index 67dad1738..9cc326b24 100644
--- a/x11-packages/libxt/build.sh
+++ b/x11-packages/libxt/build.sh
@@ -3,12 +3,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 toolkit intrinsics library"
 TERMUX_PKG_VERSION=1.1.5
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXt-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
-TERMUX_PKG_DEPENDS="libx11, libsm"
+TERMUX_PKG_DEPENDS="libandroid-support, libice, libsm, libuuid, libx11, libxau, libxcb, libxdmcp"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
 
 termux_step_pre_configure () {
     export CFLAGS_FOR_BUILD=" "
diff --git a/x11-packages/libxxf86vm/build.sh b/x11-packages/libxxf86vm/build.sh
index 62d6d299e..f61b26130 100644
--- a/x11-packages/libxxf86vm/build.sh
+++ b/x11-packages/libxxf86vm/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X11 XFree86 video mode extension library"
 TERMUX_PKG_VERSION=1.1.4
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57
-TERMUX_PKG_DEPENDS="libxext"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxau, libxcb, libxdmcp, libxext"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
diff --git a/x11-packages/mtpaint/build.sh b/x11-packages/mtpaint/build.sh
index 3cce6aa3d..dec4c5398 100644
--- a/x11-packages/mtpaint/build.sh
+++ b/x11-packages/mtpaint/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://mtpaint.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Simple paint program for creating icons and pixel based artwork"
 TERMUX_PKG_VERSION=3.40
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/mtpaint/mtpaint-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890
-TERMUX_PKG_DEPENDS="giflib, gtk2, libandroid-glob, littlecms"
+TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk2, libandroid-glob, libandroid-shmem, libcairo-x, libjpeg-turbo, littlecms, pango-x, libpng, libtiff, libx11"
 TERMUX_PKG_RECOMMENDS="gifsicle"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=${TERMUX_PREFIX}/share/man man GIF jpeg tiff cflags lcms2"
diff --git a/x11-packages/openbox/build.sh b/x11-packages/openbox/build.sh
index e0988abaf..e04a97012 100644
--- a/x11-packages/openbox/build.sh
+++ b/x11-packages/openbox/build.sh
@@ -2,11 +2,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 
 TERMUX_PKG_HOMEPAGE=http://openbox.org
 TERMUX_PKG_DESCRIPTION="Highly configurable and lightweight X11 window manager"
-TERMUX_PKG_DEPENDS="bash, imlib2, librsvg, libsm, libxcursor, libxinerama, libxrandr, libxml2, pango-x, startup-notification"
 TERMUX_PKG_VERSION=3.6.1
-TERMUX_PKG_REVISION=14
+TERMUX_PKG_REVISION=15
 TERMUX_PKG_SRCURL=http://openbox.org/dist/openbox/openbox-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7
+TERMUX_PKG_DEPENDS="bash, fontconfig, freetype, fribidi, gdk-pixbuf, glib, harfbuzz, imlib2, libandroid-shmem, libandroid-support, libbz2, libcairo-x, libcroco, libffi, libgraphite, libice, liblzma, libpixman, libpng, librsvg, libsm, libuuid, libx11, libxau, libxcb, libxcursor, libxdmcp, libxext, libxfixes, libxft, libxinerama, libxml2, libxrandr, libxrender, pango-x, pcre, startup-notification, xcb-util"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-session-management"
 
 TERMUX_PKG_RM_AFTER_INSTALL="
diff --git a/x11-packages/pypanel/build.sh b/x11-packages/pypanel/build.sh
index 4d077d0a3..a166d3d34 100644
--- a/x11-packages/pypanel/build.sh
+++ b/x11-packages/pypanel/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://pypanel.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="A lightweight panel/taskbar for X11 window managers written in python."
 TERMUX_PKG_VERSION=2.4
-TERMUX_PKG_REVISION=8
+TERMUX_PKG_REVISION=9
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4e612b43c61b3a8af7d57a0364f6cd89df481dc41e20728afa643e9e3546e911
-TERMUX_PKG_DEPENDS="imlib2, libandroid-shmem, libx11, libxft, python2, python2-xlib"
+TERMUX_PKG_DEPENDS="freetype, imlib2, libandroid-shmem, libx11, libxft, python2, python2-xlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFFILES="etc/pypanelrc"
 
diff --git a/x11-packages/python2-six/build.sh b/x11-packages/python2-six/build.sh
index 1237752c6..7a69ab221 100644
--- a/x11-packages/python2-six/build.sh
+++ b/x11-packages/python2-six/build.sh
@@ -18,9 +18,3 @@ termux_step_make_install () {
     export PYTHONPATH=${TERMUX_PREFIX}/lib/python2.7/site-packages/
     python2.7 setup.py install --prefix="${TERMUX_PREFIX}" --force
 }
-
-#termux_step_post_massage () {
-#    find . -path '*/__pycache__*' -delete
-#    find . -path \*.pyc -delete
-#    find . -path \*.pyo -delete
-#}
diff --git a/x11-packages/python2-xlib/build.sh b/x11-packages/python2-xlib/build.sh
index e7d806688..87aab29c9 100644
--- a/x11-packages/python2-xlib/build.sh
+++ b/x11-packages/python2-xlib/build.sh
@@ -10,18 +10,12 @@ TERMUX_PKG_DEPENDS="libx11, python2, python2-six"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make () {
+termux_step_make() {
     return
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
     ## python2 setuptools needed
     export PYTHONPATH=${TERMUX_PREFIX}/lib/python2.7/site-packages/
     python2.7 setup.py install --root="/" --prefix="${TERMUX_PREFIX}" --force
 }
-
-#termux_step_post_massage () {
-#    find . -path '*/__pycache__*' -delete
-#    find . -path \*.pyc -delete
-#    find . -path \*.pyo -delete
-#}
diff --git a/x11-packages/sdl-net/build.sh b/x11-packages/sdl-net/build.sh
index 583f23355..08a4be6f6 100644
--- a/x11-packages/sdl-net/build.sh
+++ b/x11-packages/sdl-net/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.libsdl.org/projects/SDL_net/
 TERMUX_PKG_DESCRIPTION="A small sample cross-platform networking library"
 TERMUX_PKG_VERSION=1.2.8
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://www.libsdl.org/projects/SDL_net/release/SDL_net-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4
 
-TERMUX_PKG_DEPENDS="libpulseaudio, sdl"
+TERMUX_PKG_DEPENDS="libandroid-glob, libflac, libogg, libpulseaudio, libsndfile, libvorbis, sdl"
 TERMUX_PKG_CONFLICTS="libsdl-net"
 TERMUX_PKG_REPLACES="libsdl-net"
diff --git a/x11-packages/sdl/build.sh b/x11-packages/sdl/build.sh
index 439078674..eb72280ee 100644
--- a/x11-packages/sdl/build.sh
+++ b/x11-packages/sdl/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.libsdl.org
 TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 TERMUX_PKG_VERSION=1.2.15
-TERMUX_PKG_REVISION=10
+TERMUX_PKG_REVISION=11
 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
 
-TERMUX_PKG_DEPENDS="libx11, libxext, libxrandr, libxrender, pulseaudio"
+TERMUX_PKG_DEPENDS="libandroid-glob, libflac, libogg, libpulseaudio, libsndfile, libvorbis"
 TERMUX_PKG_CONFLICTS="libsdl"
 TERMUX_PKG_REPLACES="libsdl"
 
diff --git a/x11-packages/sdl2/build.sh b/x11-packages/sdl2/build.sh
index 110ebfdcd..897b39a63 100644
--- a/x11-packages/sdl2/build.sh
+++ b/x11-packages/sdl2/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.libsdl.org
 TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (version 2)"
 TERMUX_PKG_VERSION=2.0.8
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec
 
-TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-support, libflac, libogg, libsndfile, libvorbis, libx11, libxau, libxcb, libxdmcp, libxext, libxrandr, libxrender, libxxf86vm, pulseaudio"
+TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-support, libflac, libogg, libpulseaudio, libsndfile, libvorbis, libx11, libxau, libxcb, libxcursor, libxdmcp, libxext, libxfixes, libxi, libxinerama, libxrandr, libxrender, libxss, libxxf86vm"
 TERMUX_PKG_CONFLICTS="libsdl2"
 TERMUX_PKG_REPLACES="libsdl2"
 
diff --git a/x11-packages/startup-notification/build.sh b/x11-packages/startup-notification/build.sh
index c5bf869ee..1f21fc64c 100644
--- a/x11-packages/startup-notification/build.sh
+++ b/x11-packages/startup-notification/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Utility libraries for XC Binding"
 TERMUX_PKG_VERSION=0.12
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
-TERMUX_PKG_DEPENDS="libx11, xcb-util"
+TERMUX_PKG_DEPENDS="libx11, libxcb, xcb-util"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="lf_cv_sane_realloc=yes"
diff --git a/x11-packages/the-powder-toy/build.sh b/x11-packages/the-powder-toy/build.sh
index a39131afb..200621063 100644
--- a/x11-packages/the-powder-toy/build.sh
+++ b/x11-packages/the-powder-toy/build.sh
@@ -10,16 +10,14 @@ TERMUX_PKG_DEPENDS="fftw, libbz2, libc++, liblua52, sdl, libx11"
 TERMUX_PKG_FOLDERNAME=The-Powder-Toy-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_make()
-{
+termux_step_make() {
     export CFLAGS="${CFLAGS} -I${TERMUX_PREFIX}/include"
     export CXXFLAGS="${CFLAGS}"
     export LDFLAGS="-L${TERMUX_PREFIX}/lib"
     scons -j4 --lin --64bit --no-sse --lua52
 }
 
-termux_step_make_install()
-{
+termux_step_make_install() {
     install -Dm755 "${TERMUX_PKG_SRCDIR}/build/powder64-legacy" "${TERMUX_PREFIX}/bin/the-powder-toy"
     ln -sfr "${TERMUX_PREFIX}/bin/the-powder-toy" "${TERMUX_PREFIX}/bin/powder"
     ${TERMUX_ELF_CLEANER} "${TERMUX_PREFIX}/bin/the-powder-toy"
diff --git a/x11-packages/wireshark-gtk/build.sh b/x11-packages/wireshark-gtk/build.sh
index 0886ece56..a302e1423 100644
--- a/x11-packages/wireshark-gtk/build.sh
+++ b/x11-packages/wireshark-gtk/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.wireshark.org/
 TERMUX_PKG_DESCRIPTION="Network protocol analyzer"
 TERMUX_PKG_VERSION=2.6.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://www.wireshark.org/download/src/wireshark-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=d158a8a626dc0997a826cf12b5316a3d393fb9f93d84cc86e75b212f0044a3ec
 
-TERMUX_PKG_DEPENDS="c-ares, desktop-file-utils, glib, gtk3, hicolor-icon-theme, libandroid-shmem, libgcrypt, libgnutls, liblua52, liblz4, libmaxminddb, libnghttp2, libnl, libpcap, libssh, libxml2"
+TERMUX_PKG_DEPENDS="atk, c-ares, desktop-file-utils, gdk-pixbuf, glib, gtk3, hicolor-icon-theme, libandroid-shmem, libcairo-x, libgcrypt, libgnutls, libgpg-error, liblua52, liblz4, libmaxminddb, libnghttp2, libnl, libpcap, libssh, libxml2, pango-x"
 TERMUX_PKG_CONFLICTS="tshark, wireshark, wireshark-cli"
 TERMUX_PKG_PROVIDES="tshark, wireshark, wireshark-cli"
 TERMUX_PKG_REPLACES="tshark, wireshark, wireshark-cli"
diff --git a/x11-packages/xcb-util-cursor/build.sh b/x11-packages/xcb-util-cursor/build.sh
index 22cc42db2..4ef317599 100644
--- a/x11-packages/xcb-util-cursor/build.sh
+++ b/x11-packages/xcb-util-cursor/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://cgit.freedesktop.org/xcb/util-cursor
 TERMUX_PKG_DESCRIPTION="XCB cursor library"
 TERMUX_PKG_VERSION=0.1.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://xcb.freedesktop.org/dist/xcb-util-cursor-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=05a10a0706a1a789a078be297b5fb663f66a71fb7f7f1b99658264c35926394f
-TERMUX_PKG_DEPENDS="libxcb, xcb-util-image, xcb-util-renderutil"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libxcb, xcb-util-image, xcb-util-renderutil"
diff --git a/x11-packages/xcb-util-xrm/build.sh b/x11-packages/xcb-util-xrm/build.sh
index 43747ebd8..8ea1395b7 100644
--- a/x11-packages/xcb-util-xrm/build.sh
+++ b/x11-packages/xcb-util-xrm/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://github.com/Airblader/xcb-util-xrm/
 TERMUX_PKG_DESCRIPTION="XCB utility functions for the X resource manager"
 TERMUX_PKG_VERSION=1.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/Airblader/xcb-util-xrm/releases/download/v${TERMUX_PKG_VERSION}/xcb-util-xrm-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0129f74c327ae65e2f4ad4002f300b4f02c9aff78c00997f1f1c5a430f922f34
-TERMUX_PKG_DEPENDS="libx11, xcb-util"
+TERMUX_PKG_DEPENDS="libxau, libxcb, libxdmcp, xcb-util"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/xcompmgr/build.sh b/x11-packages/xcompmgr/build.sh
index 82252a292..1799bfc41 100644
--- a/x11-packages/xcompmgr/build.sh
+++ b/x11-packages/xcompmgr/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Composite Window-effects manager for X.org"
 TERMUX_PKG_VERSION=1.1.7
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/xcompmgr-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c8049b1a2531313be7469ba9b198d334f0b91cc01efc2b20b9afcb117e4d6892
-TERMUX_PKG_DEPENDS="libxcomposite, libxdamage, libxext, libxrender"
+TERMUX_PKG_DEPENDS="libx11, libxcomposite, libxdamage, libxext, libxfixes, libxrender"
diff --git a/x11-packages/xkeyboard-config/build.sh b/x11-packages/xkeyboard-config/build.sh
index 489466b88..1852d8f82 100644
--- a/x11-packages/xkeyboard-config/build.sh
+++ b/x11-packages/xkeyboard-config/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig/
 TERMUX_PKG_DESCRIPTION="X keyboard configuration files"
 TERMUX_PKG_VERSION=2.24
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=91b18580f46b4e4ea913707f6c8d68ab5286879c3a6591462f3b9e760d3ac4d7
-TERMUX_PKG_BUILD_DEPENDS="libx11"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/xorg-font-util/build.sh b/x11-packages/xorg-font-util/build.sh
index 562f37b4f..2d424051a 100644
--- a/x11-packages/xorg-font-util/build.sh
+++ b/x11-packages/xorg-font-util/build.sh
@@ -3,11 +3,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X.Org font utilities"
 TERMUX_PKG_VERSION=1.3.1
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/font/font-util-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921
-TERMUX_PKG_CONFLICTS="fontutil"
-TERMUX_PKG_REPLACES="fontutil"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-mapdir=${TERMUX_PREFIX}/share/fonts/util
diff --git a/x11-packages/xorg-twm/build.sh b/x11-packages/xorg-twm/build.sh
index afa9ee191..bd8a92f36 100644
--- a/x11-packages/xorg-twm/build.sh
+++ b/x11-packages/xorg-twm/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Tab Window Manager for the X Window System"
 TERMUX_PKG_VERSION=1.0.10
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/twm-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7
-TERMUX_PKG_DEPENDS="libuuid, libxmu"
+TERMUX_PKG_DEPENDS="libice, libsm, libx11, libxext, libxmu, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/xorg-xauth/build.sh b/x11-packages/xorg-xauth/build.sh
index 116442d5c..a0e9fa42c 100644
--- a/x11-packages/xorg-xauth/build.sh
+++ b/x11-packages/xorg-xauth/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X.Org authorization settings program"
 TERMUX_PKG_VERSION=1.0.10
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/xauth-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d
-TERMUX_PKG_DEPENDS="libxmu"
+TERMUX_PKG_DEPENDS="libx11, libxau, libxext, libxmu"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/xorg-xcalc/build.sh b/x11-packages/xorg-xcalc/build.sh
index ddee5107a..99c06e128 100644
--- a/x11-packages/xorg-xcalc/build.sh
+++ b/x11-packages/xorg-xcalc/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Scientific calculator for X"
 TERMUX_PKG_VERSION=1.0.6
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/app/xcalc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8
-TERMUX_PKG_DEPENDS="libxaw, xorg-fonts-75dpi | xorg-fonts-100dpi"
+TERMUX_PKG_DEPENDS="libx11, libxaw, libxt, xorg-fonts-75dpi | xorg-fonts-100dpi"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
diff --git a/x11-packages/xorg-xclock/build.sh b/x11-packages/xorg-xclock/build.sh
index f2e02306f..779175dcb 100644
--- a/x11-packages/xorg-xclock/build.sh
+++ b/x11-packages/xorg-xclock/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X clock"
 TERMUX_PKG_VERSION=1.0.7
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/xclock-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0
-TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxaw, libxft, libxkbfile, libxmu, libxrender"
+TERMUX_PKG_DEPENDS="libandroid-support, libx11, libxaw, libxft, libxkbfile, libxmu, libxrender, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
 TERMUX_PKG_CONFLICTS="xclock"
 TERMUX_PKG_REPLACES="xclock"
diff --git a/x11-packages/xorg-xkbcomp/build.sh b/x11-packages/xorg-xkbcomp/build.sh
index 38e20ac3e..e46c57776 100644
--- a/x11-packages/xorg-xkbcomp/build.sh
+++ b/x11-packages/xorg-xkbcomp/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X Keyboard description compiler"
 TERMUX_PKG_VERSION=1.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/app/xkbcomp-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424
-TERMUX_PKG_DEPENDS="libxkbfile"
+TERMUX_PKG_DEPENDS="libx11, libxkbfile"
diff --git a/x11-packages/xorg-xmessage/build.sh b/x11-packages/xorg-xmessage/build.sh
index 60d8465b0..8460b1bb7 100644
--- a/x11-packages/xorg-xmessage/build.sh
+++ b/x11-packages/xorg-xmessage/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Display a message or query in a window"
 TERMUX_PKG_VERSION=1.0.5
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/app/xmessage-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029
-TERMUX_PKG_DEPENDS="libxaw"
+TERMUX_PKG_DEPENDS="libx11, libxaw, libxt"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"