diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.svg b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
new file mode 100644
index 0000000..4fd7a8c
--- /dev/null
+++ b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
@@ -0,0 +1,273 @@
+
+
+
+
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index e6bc437..7d569a9 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -1,6 +1,7 @@
#!/bin/bash
#
# Copyright (C) 2018 Ruben Rodriguez
+# Copyright (C) 2019 David Trudgian
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,12 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+set -x
-VERSION=1
+VERSION=2
. ./config
-cp $DATA/branding/* mail/branding/nightly/ -r
+cp $DATA/branding/* comm/mail/branding/nightly/ -r
cat << EOF >> debian/vendor.js
@@ -48,15 +50,13 @@ pref("app.releaseNotesURL", "http://trisquel.info/mailclient");
pref("pfs.datasource.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
pref("pfs.filehint.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
-pref("browser.search.defaultenginename", "Wikipedia (en)");
-pref("browser.search.order.1", "Wikipedia (en)");
-pref("browser.search.defaultenginename", "Wikipedia (en)");
+pref("browser.search.defaultenginename", "DuckDuckGo");
+pref("browser.search.order.1", "DuckDuckGo");
+pref("browser.search.defaultenginename", "DuckDuckGo");
pref("browser.search.showOneOffButtons", false);
pref("browser.search.suggest.enabled",false);
EOF
-sed '/enable-tests/d' -i debian/config/mozconfig.in
-
sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
@@ -69,10 +69,8 @@ MOZ_ENABLE_BREAKPAD = 0
EOF
# Replace Thunderbird branding
-find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type f | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type f | grep Thunderbird | xargs rename s/Thunderbird/Icedove/
+find -type d -name '*thunderbird*' | xargs rename s/thunderbird/icedove/
+find -type f -name '*thunderbird*' | xargs rename s/thunderbird/icedove/
SEDSCRIPT="
s/Mozilla Thunderbird/Icedove/g;
@@ -92,16 +90,13 @@ s/Trisquel Foundation/Mozilla Foundation/g;
s/Trisquel Corporation/Mozilla Corporation/g;
"
echo "Running batch replace operation"
-find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
+find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
-replace Daily Icedove mail/branding/
-sed '/.*