diff --git a/tools/build_static_qt b/tools/build_static_qt
index bdce6dae7..b9b76e708 100755
--- a/tools/build_static_qt
+++ b/tools/build_static_qt
@@ -13,23 +13,58 @@ RED='\e[1;31m'
 NC='\e[0m'
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR/..
+cd "${SCRIPT_DIR}/.."
 
 # ==============================================================================
 
 if [ ! -d "${REPO_FOLDER}/.git" ]; then
-  git clone $REPO_URL $REPO_FOLDER
+  git clone "${REPO_URL}" "${REPO_FOLDER}"
 fi
 
-cd $REPO_FOLDER
-git checkout $QT_VERSION
+cd "${REPO_FOLDER}"
+git checkout "${QT_VERSION}"
 if [[ $? != 0 ]] ; then
   printf "${RED}Unable to checkout ${QT_VERSION}.${NC}\n"
   exit 1
 fi
 
-./init-repository --module-subset=default,-qtwebengine,-qtandroidextras,-qtcharts,-qtscript,-qtmacextras,-qtdoc,-qtlocation,-qtnetworkauth,-qtpurchasing,-qtremoteobjects,-qtrepotools,-qtscxml,-qtsensors,-qtspeech,-qtspeech,-qttools,-qtwebchannel,-qtwebglplugin,-qtwebsockets,-qtwebview,-qtwinextras,-qtx11extras,-qtxmlpatterns -f
-./configure -opensource -confirm-license -release -static -c++std c++11 -ccache -silent -nomake examples -nomake tests -system-zlib -qt-libjpeg -qt-libpng -qt-xcb -qt-xkbcommon -qt-freetype -qt-pcre -qt-harfbuzz
+./init-repository --module-subset=default,\
+  -qtandroidextras,\
+  -qtcharts,\
+  -qtdoc,\
+  -qtlocation,\
+  -qtmacextras,\
+  -qtnetworkauth,\
+  -qtpurchasing,\
+  -qtremoteobjects,\
+  -qtrepotools,\
+  -qtscript,\
+  -qtscxml,\
+  -qtsensors,\
+  -qtspeech,\
+  -qtspeech,\
+  -qttools,\
+  -qtwebchannel,\
+  -qtwebengine,\
+  -qtwebglplugin,\
+  -qtwebsockets,\
+  -qtwebview,\
+  -qtwinextras,\
+  -qtx11extras,\
+  -qtxmlpatterns \
+  -f
+
+./configure -opensource -confirm-license -release -static -c++std c++11 -ccache -silent -nomake examples -nomake tests \
+  -prefix "/opt/${QT_VERSION}" \
+  -qt-freetype \
+  -qt-harfbuzz \
+  -qt-libjpeg \
+  -qt-libpng \
+  -qt-pcre \
+  -qt-xcb \
+  -qt-xkbcommon \
+  -system-zlib
+
 if [[ $? != 0 ]] ; then
   printf "${RED}Unknown configure option.${NC}\n"
   exit 1
diff --git a/tools/check_qml_syntax b/tools/check_qml_syntax
index d8354aa97..6923de99e 100755
--- a/tools/check_qml_syntax
+++ b/tools/check_qml_syntax
@@ -13,7 +13,7 @@ BLUE='\e[1;34m'
 NC='\e[0m'
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR/..
+cd "${SCRIPT_DIR}/.."
 
 # ==============================================================================
 
diff --git a/tools/test_qml b/tools/test_qml
index c286ffcd6..8ffa6f82b 100755
--- a/tools/test_qml
+++ b/tools/test_qml
@@ -19,7 +19,7 @@ BLUE='\e[1;34m'
 NC='\e[0m'
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR/..
+cd "${SCRIPT_DIR}/.."
 
 # ==============================================================================
 
diff --git a/tools/update_resources b/tools/update_resources
index d67cf31e2..8f085f7be 100755
--- a/tools/update_resources
+++ b/tools/update_resources
@@ -13,7 +13,7 @@
 RESOURCES_FILE='resources.qrc'
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR/..
+cd "${SCRIPT_DIR}/.."
 
 echo '<!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/">' > $RESOURCES_FILE