diff --git a/.gitignore b/.gitignore
index 7d6387c9..149a3c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 gtk2-runtime*-ts-win64*exe
 gtk3-runtime*-ts-win64*exe
 *.swp
+/.vscode
diff --git a/gtk-nsis-pack/bin/fc-cache.exe b/gtk-nsis-pack/bin/fc-cache.exe
index b6aa0212..67e2a6e3 100644
Binary files a/gtk-nsis-pack/bin/fc-cache.exe and b/gtk-nsis-pack/bin/fc-cache.exe differ
diff --git a/gtk-nsis-pack/bin/fc-cat.exe b/gtk-nsis-pack/bin/fc-cat.exe
index 9862b855..f542c41d 100644
Binary files a/gtk-nsis-pack/bin/fc-cat.exe and b/gtk-nsis-pack/bin/fc-cat.exe differ
diff --git a/gtk-nsis-pack/bin/fc-list.exe b/gtk-nsis-pack/bin/fc-list.exe
index dc443d9c..4b220925 100644
Binary files a/gtk-nsis-pack/bin/fc-list.exe and b/gtk-nsis-pack/bin/fc-list.exe differ
diff --git a/gtk-nsis-pack/bin/fc-match.exe b/gtk-nsis-pack/bin/fc-match.exe
index 48d836a5..94209937 100644
Binary files a/gtk-nsis-pack/bin/fc-match.exe and b/gtk-nsis-pack/bin/fc-match.exe differ
diff --git a/gtk-nsis-pack/bin/fc-pattern.exe b/gtk-nsis-pack/bin/fc-pattern.exe
index e88119b9..ba714a58 100644
Binary files a/gtk-nsis-pack/bin/fc-pattern.exe and b/gtk-nsis-pack/bin/fc-pattern.exe differ
diff --git a/gtk-nsis-pack/bin/fc-query.exe b/gtk-nsis-pack/bin/fc-query.exe
index cb6f58fc..cb21fe98 100644
Binary files a/gtk-nsis-pack/bin/fc-query.exe and b/gtk-nsis-pack/bin/fc-query.exe differ
diff --git a/gtk-nsis-pack/bin/fc-scan.exe b/gtk-nsis-pack/bin/fc-scan.exe
index 1d55a390..42ab30cd 100644
Binary files a/gtk-nsis-pack/bin/fc-scan.exe and b/gtk-nsis-pack/bin/fc-scan.exe differ
diff --git a/gtk-nsis-pack/bin/fc-validate.exe b/gtk-nsis-pack/bin/fc-validate.exe
index d812d9f9..19969f84 100644
Binary files a/gtk-nsis-pack/bin/fc-validate.exe and b/gtk-nsis-pack/bin/fc-validate.exe differ
diff --git a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe
index 4909f5f3..6e8c7fdc 100644
Binary files a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe and b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe differ
diff --git a/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe b/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe
index 0141d090..466f67b8 100644
Binary files a/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe and b/gtk-nsis-pack/bin/gspawn-win64-helper-console.exe differ
diff --git a/gtk-nsis-pack/bin/gspawn-win64-helper.exe b/gtk-nsis-pack/bin/gspawn-win64-helper.exe
index 99258982..d000ab2e 100644
Binary files a/gtk-nsis-pack/bin/gspawn-win64-helper.exe and b/gtk-nsis-pack/bin/gspawn-win64-helper.exe differ
diff --git a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe
index 6f44e165..5298287b 100644
Binary files a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe and b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe differ
diff --git a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe
index 13017c8d..72f43153 100644
Binary files a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe and b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe differ
diff --git a/gtk-nsis-pack/bin/libatk-1.0-0.dll b/gtk-nsis-pack/bin/libatk-1.0-0.dll
index 3e28eaa4..67926840 100644
Binary files a/gtk-nsis-pack/bin/libatk-1.0-0.dll and b/gtk-nsis-pack/bin/libatk-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libatkmm-1.6-1.dll b/gtk-nsis-pack/bin/libatkmm-1.6-1.dll
index 37ebf6cb..eb591099 100644
Binary files a/gtk-nsis-pack/bin/libatkmm-1.6-1.dll and b/gtk-nsis-pack/bin/libatkmm-1.6-1.dll differ
diff --git a/gtk-nsis-pack/bin/libbz2-1.dll b/gtk-nsis-pack/bin/libbz2-1.dll
new file mode 100644
index 00000000..238e4ed2
Binary files /dev/null and b/gtk-nsis-pack/bin/libbz2-1.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-2.dll b/gtk-nsis-pack/bin/libcairo-2.dll
index e8694432..7b0dd988 100644
Binary files a/gtk-nsis-pack/bin/libcairo-2.dll and b/gtk-nsis-pack/bin/libcairo-2.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-gobject-2.dll b/gtk-nsis-pack/bin/libcairo-gobject-2.dll
index 6f7c2a52..5aa2ccf5 100644
Binary files a/gtk-nsis-pack/bin/libcairo-gobject-2.dll and b/gtk-nsis-pack/bin/libcairo-gobject-2.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll
index aa344167..df53420d 100644
Binary files a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll and b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll differ
diff --git a/gtk-nsis-pack/bin/libcairomm-1.0-1.dll b/gtk-nsis-pack/bin/libcairomm-1.0-1.dll
index 46a686a6..5a279285 100644
Binary files a/gtk-nsis-pack/bin/libcairomm-1.0-1.dll and b/gtk-nsis-pack/bin/libcairomm-1.0-1.dll differ
diff --git a/gtk-nsis-pack/bin/libepoxy-0.dll b/gtk-nsis-pack/bin/libepoxy-0.dll
index 89c874ce..f06d2a66 100644
Binary files a/gtk-nsis-pack/bin/libepoxy-0.dll and b/gtk-nsis-pack/bin/libepoxy-0.dll differ
diff --git a/gtk-nsis-pack/bin/libexpat-1.dll b/gtk-nsis-pack/bin/libexpat-1.dll
new file mode 100644
index 00000000..a57a78ea
Binary files /dev/null and b/gtk-nsis-pack/bin/libexpat-1.dll differ
diff --git a/gtk-nsis-pack/bin/libexslt-0.dll b/gtk-nsis-pack/bin/libexslt-0.dll
index 8ad33aca..139bd906 100644
Binary files a/gtk-nsis-pack/bin/libexslt-0.dll and b/gtk-nsis-pack/bin/libexslt-0.dll differ
diff --git a/gtk-nsis-pack/bin/libffi-6.dll b/gtk-nsis-pack/bin/libffi-6.dll
index e0cf9952..6e154b84 100644
Binary files a/gtk-nsis-pack/bin/libffi-6.dll and b/gtk-nsis-pack/bin/libffi-6.dll differ
diff --git a/gtk-nsis-pack/bin/libfontconfig-1.dll b/gtk-nsis-pack/bin/libfontconfig-1.dll
index 08e428b6..85126d55 100644
Binary files a/gtk-nsis-pack/bin/libfontconfig-1.dll and b/gtk-nsis-pack/bin/libfontconfig-1.dll differ
diff --git a/gtk-nsis-pack/bin/libfreetype-6.dll b/gtk-nsis-pack/bin/libfreetype-6.dll
index bfe7a940..88fd451e 100644
Binary files a/gtk-nsis-pack/bin/libfreetype-6.dll and b/gtk-nsis-pack/bin/libfreetype-6.dll differ
diff --git a/gtk-nsis-pack/bin/libgailutil-3-0.dll b/gtk-nsis-pack/bin/libgailutil-3-0.dll
index 36697d67..4210c991 100644
Binary files a/gtk-nsis-pack/bin/libgailutil-3-0.dll and b/gtk-nsis-pack/bin/libgailutil-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgcc_s_seh-1.dll b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll
new file mode 100644
index 00000000..800d1736
Binary files /dev/null and b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk-3-0.dll b/gtk-nsis-pack/bin/libgdk-3-0.dll
index 097d4972..93b6621d 100644
Binary files a/gtk-nsis-pack/bin/libgdk-3-0.dll and b/gtk-nsis-pack/bin/libgdk-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll
index 8ce2571f..2256f33d 100644
Binary files a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll
index 2f2244f2..0f26ce02 100644
Binary files a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll
index 7e46d337..a6cd1fb8 100644
Binary files a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgio-2.0-0.dll b/gtk-nsis-pack/bin/libgio-2.0-0.dll
index a0d67dad..c2484249 100644
Binary files a/gtk-nsis-pack/bin/libgio-2.0-0.dll and b/gtk-nsis-pack/bin/libgio-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgiomm-2.4-1.dll b/gtk-nsis-pack/bin/libgiomm-2.4-1.dll
index e50f6f5a..bb5be081 100644
Binary files a/gtk-nsis-pack/bin/libgiomm-2.4-1.dll and b/gtk-nsis-pack/bin/libgiomm-2.4-1.dll differ
diff --git a/gtk-nsis-pack/bin/libglib-2.0-0.dll b/gtk-nsis-pack/bin/libglib-2.0-0.dll
index 63000f27..bc0dacba 100644
Binary files a/gtk-nsis-pack/bin/libglib-2.0-0.dll and b/gtk-nsis-pack/bin/libglib-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libglibmm-2.4-1.dll b/gtk-nsis-pack/bin/libglibmm-2.4-1.dll
index 6a7826ee..fe40aae1 100644
Binary files a/gtk-nsis-pack/bin/libglibmm-2.4-1.dll and b/gtk-nsis-pack/bin/libglibmm-2.4-1.dll differ
diff --git a/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll b/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll
index 41fe7cf9..45c717df 100644
Binary files a/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll and b/gtk-nsis-pack/bin/libglibmm_generate_extra_defs-2.4-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgmodule-2.0-0.dll b/gtk-nsis-pack/bin/libgmodule-2.0-0.dll
index 7ceb616a..2a36833f 100644
Binary files a/gtk-nsis-pack/bin/libgmodule-2.0-0.dll and b/gtk-nsis-pack/bin/libgmodule-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgobject-2.0-0.dll b/gtk-nsis-pack/bin/libgobject-2.0-0.dll
index d579c72a..7fb7dd93 100644
Binary files a/gtk-nsis-pack/bin/libgobject-2.0-0.dll and b/gtk-nsis-pack/bin/libgobject-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgraphite2.dll b/gtk-nsis-pack/bin/libgraphite2.dll
new file mode 100644
index 00000000..2e5b05de
Binary files /dev/null and b/gtk-nsis-pack/bin/libgraphite2.dll differ
diff --git a/gtk-nsis-pack/bin/libgthread-2.0-0.dll b/gtk-nsis-pack/bin/libgthread-2.0-0.dll
index 1b2149df..b3e722b1 100644
Binary files a/gtk-nsis-pack/bin/libgthread-2.0-0.dll and b/gtk-nsis-pack/bin/libgthread-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgtk-3-0.dll b/gtk-nsis-pack/bin/libgtk-3-0.dll
index 1ea9d805..a1f4fcf3 100644
Binary files a/gtk-nsis-pack/bin/libgtk-3-0.dll and b/gtk-nsis-pack/bin/libgtk-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll
index 2efedc0d..c8a88764 100644
Binary files a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll
index 42b35586..1a59d916 100644
Binary files a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgtksourceview-3.0-1.dll b/gtk-nsis-pack/bin/libgtksourceview-3.0-1.dll
index b2ac5b0b..ee1596d5 100644
Binary files a/gtk-nsis-pack/bin/libgtksourceview-3.0-1.dll and b/gtk-nsis-pack/bin/libgtksourceview-3.0-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgtksourceviewmm-3.0-0.dll b/gtk-nsis-pack/bin/libgtksourceviewmm-3.0-0.dll
index 13539260..6f37b5c6 100644
Binary files a/gtk-nsis-pack/bin/libgtksourceviewmm-3.0-0.dll and b/gtk-nsis-pack/bin/libgtksourceviewmm-3.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libharfbuzz-0.dll b/gtk-nsis-pack/bin/libharfbuzz-0.dll
index 777ef4bd..180c84a6 100644
Binary files a/gtk-nsis-pack/bin/libharfbuzz-0.dll and b/gtk-nsis-pack/bin/libharfbuzz-0.dll differ
diff --git a/gtk-nsis-pack/bin/libiconv-2.dll b/gtk-nsis-pack/bin/libiconv-2.dll
new file mode 100644
index 00000000..94fb8c7a
Binary files /dev/null and b/gtk-nsis-pack/bin/libiconv-2.dll differ
diff --git a/gtk-nsis-pack/bin/libintl-8.dll b/gtk-nsis-pack/bin/libintl-8.dll
index 4676ca79..695abb9c 100644
Binary files a/gtk-nsis-pack/bin/libintl-8.dll and b/gtk-nsis-pack/bin/libintl-8.dll differ
diff --git a/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll b/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll
index 6c843a29..09ca3a30 100644
Binary files a/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll and b/gtk-nsis-pack/bin/libjson-glib-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpango-1.0-0.dll b/gtk-nsis-pack/bin/libpango-1.0-0.dll
index 035e5088..47ebed5f 100644
Binary files a/gtk-nsis-pack/bin/libpango-1.0-0.dll and b/gtk-nsis-pack/bin/libpango-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll
index 6e6de60f..cab5cae9 100644
Binary files a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll and b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll
index 817068f0..8302fafd 100644
Binary files a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll and b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll
index 5141f18e..67520180 100644
Binary files a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll and b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll differ
diff --git a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll
index da566261..33061934 100644
Binary files a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll and b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpcre-1.dll b/gtk-nsis-pack/bin/libpcre-1.dll
index ab281586..4010c514 100644
Binary files a/gtk-nsis-pack/bin/libpcre-1.dll and b/gtk-nsis-pack/bin/libpcre-1.dll differ
diff --git a/gtk-nsis-pack/bin/libpixman-1-0.dll b/gtk-nsis-pack/bin/libpixman-1-0.dll
index fac0e4e2..30a96ac6 100644
Binary files a/gtk-nsis-pack/bin/libpixman-1-0.dll and b/gtk-nsis-pack/bin/libpixman-1-0.dll differ
diff --git a/gtk-nsis-pack/bin/libpng16-16.dll b/gtk-nsis-pack/bin/libpng16-16.dll
index 732c2bf8..20ede0d8 100644
Binary files a/gtk-nsis-pack/bin/libpng16-16.dll and b/gtk-nsis-pack/bin/libpng16-16.dll differ
diff --git a/gtk-nsis-pack/bin/librsvg-2-2.dll b/gtk-nsis-pack/bin/librsvg-2-2.dll
new file mode 100644
index 00000000..af8fe9b9
Binary files /dev/null and b/gtk-nsis-pack/bin/librsvg-2-2.dll differ
diff --git a/gtk-nsis-pack/bin/libsigc-2.0-0.dll b/gtk-nsis-pack/bin/libsigc-2.0-0.dll
index 452983f6..601d8858 100644
Binary files a/gtk-nsis-pack/bin/libsigc-2.0-0.dll and b/gtk-nsis-pack/bin/libsigc-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libstdc++-6.dll b/gtk-nsis-pack/bin/libstdc++-6.dll
new file mode 100644
index 00000000..18dc6833
Binary files /dev/null and b/gtk-nsis-pack/bin/libstdc++-6.dll differ
diff --git a/gtk-nsis-pack/bin/libwinpthread-1.dll b/gtk-nsis-pack/bin/libwinpthread-1.dll
new file mode 100644
index 00000000..82be745c
Binary files /dev/null and b/gtk-nsis-pack/bin/libwinpthread-1.dll differ
diff --git a/gtk-nsis-pack/bin/libxml2-2.dll b/gtk-nsis-pack/bin/libxml2-2.dll
index 48c832ce..60f109a7 100644
Binary files a/gtk-nsis-pack/bin/libxml2-2.dll and b/gtk-nsis-pack/bin/libxml2-2.dll differ
diff --git a/gtk-nsis-pack/bin/libxslt-1.dll b/gtk-nsis-pack/bin/libxslt-1.dll
index ac5f265b..a4fa030b 100644
Binary files a/gtk-nsis-pack/bin/libxslt-1.dll and b/gtk-nsis-pack/bin/libxslt-1.dll differ
diff --git a/gtk-nsis-pack/bin/zlib1.dll b/gtk-nsis-pack/bin/zlib1.dll
index 4c208233..f9d79ecf 100644
Binary files a/gtk-nsis-pack/bin/zlib1.dll and b/gtk-nsis-pack/bin/zlib1.dll differ
diff --git a/gtk-nsis-pack/copy-msys2-files.sh b/gtk-nsis-pack/copy-msys2-files.sh
new file mode 100644
index 00000000..eac87de7
--- /dev/null
+++ b/gtk-nsis-pack/copy-msys2-files.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# ---------------------------------------------------------------------------
+# Set default values to option vars
+# ---------------------------------------------------------------------------
+
+INSTALL_SRC_DIR=$(dirname "$0")
+INSTALL_SRC_MSYS2="/mingw64/"
+_DATE=$(date +'%Y-%m-%d')
+_VERSION="3.20.2"
+_ARCH="win64"
+# ---------------------------------------------------------------------------
+# Check source directory and prepare binary and lib destination directory
+# in the NSIS source tree
+# ---------------------------------------------------------------------------
+
+test "${INSTALL_SRC_DIR}" = "." && INSTALL_SRC_DIR=${PWD}
+INSTALL_SRC_BIN="${INSTALL_SRC_DIR}"/bin
+INSTALL_SRC_MSYS2_BIN=${INSTALL_SRC_MSYS2}/bin
+INSTALL_SRC_MSYS2_LIB=${INSTALL_SRC_MSYS2}/lib
+
+# Create installer file name
+INSTALLER_FILENAME=gtk3-runtime-${_VERSION}-${_DATE}-${_ARCH}.msi
+
+echo $INSTALLER_FILENAME
+
+# ---------------------------------------------------------------------------
+# Copy relevant GTK files to the binary destination directory
+# ---------------------------------------------------------------------------
+
+echo "Copying all GTK files from  : " $INSTALL_SRC_MSYS2
+echo "    to NSIS source directory: " $INSTALL_SRC_BIN
+
+cp $INSTALL_SRC_MSYS2_BIN/libatk-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libatkmm-1.6-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libcairo-2.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libcairo-gobject-2.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libcairo-script-interpreter-2.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libcairomm-1.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libepoxy-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libexslt-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libffi-6.dll  $INSTALL_SRC_BIN 
+cp $INSTALL_SRC_MSYS2_BIN/libfontconfig-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libfreetype-6.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgailutil-3-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgdk_pixbuf-2.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgdk-3-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgdkmm-3.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgio-2.0-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libglib-2.0-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libglibmm-2.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgiomm-2.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libsigc-2.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libglibmm_generate_extra_defs-2.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgmodule-2.0-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgobject-2.0-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgthread-2.0-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgtk-3-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-3.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgtksourceviewmm-3.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgtkmm-3.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libharfbuzz-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libintl-8.dll $INSTALL_SRC_BIN
+
+# I'm not sure that this is needed...:
+cp $INSTALL_SRC_MSYS2_BIN/libiconv-2.dll $INSTALL_SRC_BIN
+
+cp $INSTALL_SRC_MSYS2_BIN/libjson-glib-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpango-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpangocairo-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpangowin32-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpangoft2-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpangomm-1.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpixman-1-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpng16-16.dll  $INSTALL_SRC_BIN
+
+# No need for this IMHO, at least fontconfig is not dependent on these
+# cp $INSTALL_SRC_MSYS2_BIN/libxml++-2.6-2.dll $INSTALL_SRC_BIN
+# cp $INSTALL_SRC_MSYS2_BIN/libxml++-3.0-1.dll $INSTALL_SRC_BIN
+
+cp $INSTALL_SRC_MSYS2_BIN/libxml2-2.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libxslt-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpcre-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/zlib1.dll $INSTALL_SRC_BIN
+
+# These six additional one seems to me that is needed for my test GTK app,
+# as I see mainly needed for fontconfig package and dlls 
+cp $INSTALL_SRC_MSYS2_BIN/libgtk-win32-2.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgdk-win32-2.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libexpat-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN
+
+# Standrard MSYS2 libraries
+cp $INSTALL_SRC_MSYS2_BIN/libstdc++-6.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgcc_s_seh-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libwinpthread-1.dll $INSTALL_SRC_BIN
+
+
+cp $INSTALL_SRC_MSYS2_BIN/fc-cache.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-cat.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-list.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-match.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-pattern.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-query.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-scan.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/fc-validate.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/gdk-pixbuf-query-loaders.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/gspawn-win64-helper.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/gspawn-win64-helper-console.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/gtk-query-immodules-3.0.exe $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/gtk-update-icon-cache.exe $INSTALL_SRC_BIN
+
+# Should we also include libpixbufloader*. dll files under /lib/gdk-pixbuf-2.0, ie: libpixbufloader-svg.dll
+
+echo "Done with copying all binary relevant GTK files to the binary destination directory"
+echo "Now you can initiate the creation of the installer package with NSIS"
\ No newline at end of file
diff --git a/gtk-nsis-pack/etc/gtk-3.0/settings.ini b/gtk-nsis-pack/etc/gtk-3.0/settings.ini
index 7d2190ff..25c66b4b 100644
--- a/gtk-nsis-pack/etc/gtk-3.0/settings.ini
+++ b/gtk-nsis-pack/etc/gtk-3.0/settings.ini
@@ -1,3 +1,7 @@
 [Settings]
 gtk-theme-name = gtk-win32 
 gtk-icon-theme-name = Adwaita 
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb
\ No newline at end of file
diff --git a/gtk-nsis-pack/gtk3-runtime.ts.nsi b/gtk-nsis-pack/gtk3-runtime.ts.nsi
index b59ebe2e..baaa3071 100644
--- a/gtk-nsis-pack/gtk3-runtime.ts.nsi
+++ b/gtk-nsis-pack/gtk3-runtime.ts.nsi
@@ -13,7 +13,7 @@
 
 !define GTK_VERSION "3.20.2"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2016-04-09-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2016-09-05-ts-win64"
 !define PRODUCT_NAME "GTK3-Runtime Win64"
 !define PRODUCT_PUBLISHER "Tom Schoonjans"
 !define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -89,7 +89,7 @@ ShowUnInstDetails show
 ; Only useful for BZIP2 compression
 ReserveFile "nsi_pathpage.ini"
 ReserveFile "nsi_configpage.ini"
-ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
 
 
 ; Pages to show during installation
@@ -261,7 +261,7 @@ SectionIn 1 2 RO
 	File bin\libgtkmm-3.0-1.dll
 	File bin\libharfbuzz-0.dll
 	File bin\libintl-8.dll  ; gettext, needed by all i18n libs
-	File bin\iconv.dll
+	File bin\libiconv-2.dll
 	File bin\libjson-glib-1.0-0.dll  ; gettext, needed by all i18n libs
 	File bin\libpango-1.0-0.dll  ; pango, needed by gtk
 	File bin\libpangocairo-1.0-0.dll  ; pango, needed by gtk
@@ -270,15 +270,21 @@ SectionIn 1 2 RO
 	File bin\libpangomm-1.4-1.dll
 	File bin\libpixman-1-0.dll  ; libpixman, needed by cairo
 	File bin\libpng16-16.dll  ; for gdk_pixbuf loader.
-	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
-	File bin\libxml++-3.0-1.dll
+	; File bin\libxml++-2.6-2.dll  ; fontconfig needs this
+	; File bin\libxml++-3.0-1.dll
 	File bin\libxml2-2.dll  ; fontconfig needs this
 	File bin\libxslt-1.dll  ; fontconfig needs this
 	File bin\libpcre-1.dll  ; fontconfig needs this
 	File bin\zlib1.dll  ; png and many others need this
-	File bin\libstdc++_64-6.dll
-	File bin\libgcc_s_seh_64-1.dll
-	File bin\libwinpthread_64-1.dll
+	File bin\libgtk-win32-2.0-0.dll
+	File bin\libgdk-win32-2.0-0.dll
+	File bin\libexpat-1.dll
+	File bin\libbz2-1.dll
+	File bin\libgraphite2.dll
+	File bin\librsvg-2-2.dll
+	File bin\libstdc++-6.dll
+	File bin\libgcc_s_seh-1.dll
+	File bin\libwinpthread-1.dll
 
 	; We install this into the same place as the DLLs to avoid any PATH manipulation.
 	SetOutPath "$LIB_INSTDIR"
@@ -614,7 +620,7 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libgtkmm-3.0-1.dll
 	Delete $LIB_INSTDIR\libharfbuzz-0.dll
 	Delete $LIB_INSTDIR\libintl-8.dll  ; gettext, needed by all i18n libs
-	Delete $LIB_INSTDIR\iconv.dll
+	Delete $LIB_INSTDIR\libiconv-2.dll
 	Delete $LIB_INSTDIR\libjson-glib-1.0-0.dll 
 	Delete $LIB_INSTDIR\libpango-1.0-0.dll  ; pango, needed by gtk
 	Delete $LIB_INSTDIR\libpangocairo-1.0-0.dll  ; pango, needed by gtk
@@ -626,12 +632,18 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libxslt-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libpcre-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
-	Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
-	Delete $LIB_INSTDIR\libxml++-3.0-1.dll
+	; Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
+	; Delete $LIB_INSTDIR\libxml++-3.0-1.dll
 	Delete $LIB_INSTDIR\zlib1.dll  ; png and many others need this
-	Delete $LIB_INSTDIR\libstdc++_64-6.dll
-	Delete $LIB_INSTDIR\libgcc_s_seh_64-1.dll
-	Delete $LIB_INSTDIR\libwinpthread_64-1.dll
+	Delete $LIB_INSTDIR\libgtk-win32-2.0-0.dll
+	Delete $LIB_INSTDIR\libgdk-win32-2.0-0.dll
+	Delete $LIB_INSTDIR\libexpat-1.dll
+	Delete $LIB_INSTDIR\libbz2-1.dll
+	Delete $LIB_INSTDIR\libgraphite2.dll
+	Delete $LIB_INSTDIR\librsvg-2-2.dll
+	Delete $LIB_INSTDIR\libstdc++-6.dll
+	Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
+	Delete $LIB_INSTDIR\libwinpthread-1.dll
 
 
 FunctionEnd