diff --git a/docker-builder-data/build/script/packet/adwaitaicontheme-3.22.0.sh b/docker-builder-data/build/script/packet/adwaitaicontheme-3.22.0.sh
deleted file mode 100644
index 0ddea2b..0000000
--- a/docker-builder-data/build/script/packet/adwaitaicontheme-3.22.0.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-DEPS="rsvg-2.40.16 gtk-3.22.2"
-
-PK_DIRNAME="adwaita-icon-theme-3.22.0"
-PK_ARCHIVE="$PK_DIRNAME.tar.xz"
-PK_URL="https://download.gnome.org/sources/adwaita-icon-theme/3.22/$PK_ARCHIVE"
-
-PK_CONFIGURE_OPTIONS="--disable-gtk2-engine"
-PK_LICENSE_FILES="AUTHORS COPYING COPYING_CCBYSA3 COPYING_LGPL"
-
-source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/adwaitaicontheme-3.24.0.sh b/docker-builder-data/build/script/packet/adwaitaicontheme-3.24.0.sh
new file mode 100644
index 0000000..cf0e5df
--- /dev/null
+++ b/docker-builder-data/build/script/packet/adwaitaicontheme-3.24.0.sh
@@ -0,0 +1,10 @@
+DEPS="rsvg-2.40.16 gtk-3.22.12"
+
+PK_DIRNAME="adwaita-icon-theme-3.24.0"
+PK_ARCHIVE="$PK_DIRNAME.tar.xz"
+PK_URL="https://download.gnome.org/sources/adwaita-icon-theme/3.24/$PK_ARCHIVE"
+
+PK_CONFIGURE_OPTIONS="--disable-gtk2-engine"
+PK_LICENSE_FILES="AUTHORS COPYING COPYING_CCBYSA3 COPYING_LGPL"
+
+source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh b/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh
deleted file mode 100644
index 6730680..0000000
--- a/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.2.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-DEPS="rsvg-2.40.16 gtk-3.22.2"
-
-PK_DIRNAME="gnome-themes-standard-3.22.2"
-PK_ARCHIVE="$PK_DIRNAME.tar.xz"
-PK_URL="https://download.gnome.org/sources/gnome-themes-standard/3.22/$PK_ARCHIVE"
-
-PK_CONFIGURE_OPTIONS="--disable-gtk2-engine"
-
-source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.3.sh b/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.3.sh
new file mode 100644
index 0000000..9a5e3e6
--- /dev/null
+++ b/docker-builder-data/build/script/packet/gnomethemesstandard-3.22.3.sh
@@ -0,0 +1,9 @@
+DEPS="rsvg-2.40.16 gtk-3.22.12"
+
+PK_DIRNAME="gnome-themes-standard-3.22.3"
+PK_ARCHIVE="$PK_DIRNAME.tar.xz"
+PK_URL="https://download.gnome.org/sources/gnome-themes-standard/3.22/$PK_ARCHIVE"
+
+PK_CONFIGURE_OPTIONS="--disable-gtk2-engine"
+
+source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/gtk-3.22.12.sh b/docker-builder-data/build/script/packet/gtk-3.22.12.sh
new file mode 100644
index 0000000..2d8faf2
--- /dev/null
+++ b/docker-builder-data/build/script/packet/gtk-3.22.12.sh
@@ -0,0 +1,34 @@
+DEPS="epoxy-master rsvg-2.40.16 atk-2.22.0 gdkpixbuf-2.36.0 cairo-1.15.4 pango-1.40.3"
+DEPS_NATIVE="gtk-3.22.12"
+
+PK_DIRNAME="gtk+-3.22.12"
+PK_ARCHIVE="$PK_DIRNAME.tar.xz"
+PK_URL="https://download.gnome.org/sources/gtk+/3.22/$PK_ARCHIVE"
+
+source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
+
+if [ "$PLATFORM" = "linux" ] || [ ! -z "$IS_NATIVE" ]; then
+    DEPS="$DEPS atspi2atk-2.22.0"
+fi
+
+if [ "$PLATFORM" = "win" ]; then
+    PK_CONFIGURE_OPTIONS="--enable-introspection=no"
+fi
+
+pkinstall() {
+    cd "$BUILD_PACKET_DIR/$PK_DIRNAME"
+    local LOCAL_BIN="$BUILD_PACKET_DIR/$PK_DIRNAME/gtk"
+    local LOCAL_BIN_NATIVE="$ENVDEPS_NATIVE_PACKET_DIR/bin"
+    if [ "$PLATFORM" = "win" ] && [ ! -f "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" ]; then
+         mv "$LOCAL_BIN/gtk-query-immodules-3.0.exe" "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" || return 1
+         cp "$LOCAL_BIN_NATIVE/gtk-query-immodules-3.0" "$LOCAL_BIN/gtk-query-immodules-3.0.exe"
+         mv "$LOCAL_BIN/gtk-update-icon-cache.exe" "$LOCAL_BIN/gtk-update-icon-cache.exe.orig"
+         cp "$LOCAL_BIN_NATIVE/gtk-update-icon-cache" "$LOCAL_BIN/gtk-update-icon-cache.exe"
+    fi
+    make install || return 1
+    if [ "$PLATFORM" = "win" ]; then
+         cp "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" "$INSTALL_PACKET_DIR/bin/" || return 1 
+         cp "$LOCAL_BIN/gtk-update-icon-cache.exe.orig" "$INSTALL_PACKET_DIR/bin/" || return 1
+    fi
+}
+
diff --git a/docker-builder-data/build/script/packet/gtk-3.22.2.sh b/docker-builder-data/build/script/packet/gtk-3.22.2.sh
deleted file mode 100644
index 38bcda5..0000000
--- a/docker-builder-data/build/script/packet/gtk-3.22.2.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-DEPS="epoxy-master rsvg-2.40.16 atk-2.22.0 gdkpixbuf-2.36.0 cairo-1.15.4 pango-1.40.3"
-DEPS_NATIVE="gtk-3.22.2"
-
-PK_DIRNAME="gtk+-3.22.2"
-PK_ARCHIVE="$PK_DIRNAME.tar.xz"
-PK_URL="https://download.gnome.org/sources/gtk+/3.22/$PK_ARCHIVE"
-
-source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
-
-if [ "$PLATFORM" = "linux" ] || [ ! -z "$IS_NATIVE" ]; then
-    DEPS="$DEPS atspi2atk-2.22.0"
-fi
-
-if [ "$PLATFORM" = "win" ]; then
-    PK_CONFIGURE_OPTIONS="--enable-introspection=no"
-fi
-
-pkinstall() {
-    cd "$BUILD_PACKET_DIR/$PK_DIRNAME"
-    local LOCAL_BIN="$BUILD_PACKET_DIR/$PK_DIRNAME/gtk"
-    local LOCAL_BIN_NATIVE="$ENVDEPS_NATIVE_PACKET_DIR/bin"
-    if [ "$PLATFORM" = "win" ] && [ ! -f "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" ]; then
-         mv "$LOCAL_BIN/gtk-query-immodules-3.0.exe" "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" || return 1
-         cp "$LOCAL_BIN_NATIVE/gtk-query-immodules-3.0" "$LOCAL_BIN/gtk-query-immodules-3.0.exe"
-         mv "$LOCAL_BIN/gtk-update-icon-cache.exe" "$LOCAL_BIN/gtk-update-icon-cache.exe.orig"
-         cp "$LOCAL_BIN_NATIVE/gtk-update-icon-cache" "$LOCAL_BIN/gtk-update-icon-cache.exe"
-    fi
-    make install || return 1
-    if [ "$PLATFORM" = "win" ]; then
-         cp "$LOCAL_BIN/gtk-query-immodules-3.0.exe.orig" "$INSTALL_PACKET_DIR/bin/" || return 1 
-         cp "$LOCAL_BIN/gtk-update-icon-cache.exe.orig" "$INSTALL_PACKET_DIR/bin/" || return 1
-    fi
-}
-
diff --git a/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh b/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh
index 606ce31..e1556d5 100644
--- a/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh
+++ b/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh
@@ -1,4 +1,9 @@
-DEPS="gtk-3.22.2 atkmm-2.24.2 cairomm-1.12.0 pangomm-2.40.1 adwaitaicontheme-3.22.0 gnomethemesstandard-3.22.2"
+# GTK packets:
+#   gtkmm, atkmm, cairomm, pangomm, glibmm, sigcpp
+#   gtk
+#   adwaitaicontheme gnomethemesstandard
+
+DEPS="gtk-3.22.12 atkmm-2.24.2 cairomm-1.12.0 pangomm-2.40.1 adwaitaicontheme-3.24.0 gnomethemesstandard-3.22.3"
 
 PK_DIRNAME="gtkmm-3.22.0"
 PK_ARCHIVE="$PK_DIRNAME.tar.xz"
diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh
index c8d1b55..811e909 100644
--- a/docker-builder-data/build/script/packet/synfigcore-master.sh
+++ b/docker-builder-data/build/script/packet/synfigcore-master.sh
@@ -85,8 +85,7 @@ source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
 pkbuild() {
     cd "$BUILD_PACKET_DIR/$PK_DIRNAME/synfig-core" || return 1
     if ! check_packet_function $NAME build.configure; then
-        libtoolize --ltdl --copy --force || return 1
-        autoreconf --install --force || return 1
+        ./bootstrap.sh || return 1
         CPPFLAGS="$PK_CPPFLAGS $CPPFLAGS" \
          ./configure \
          --host=$HOST \