diff --git a/helpers/DATA/firefox/bookmarks.html.in b/helpers/DATA/firefox/bookmarks.html.in
deleted file mode 100644
index b4a2a7afc5df6a1381632b30994bcbe83b671b2a..0000000000000000000000000000000000000000
--- a/helpers/DATA/firefox/bookmarks.html.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#filter substitution
-#include @BOOKMARKS_INCLUDE_PATH@
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<meta charset="UTF-8">
-<title>@bookmarks_title@</title>
-<h1>@bookmarks_heading@</h1>
-
-<dl><p>
- <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
- <dd>@bookmarks_toolbarfolder_description@
- <dl>
- </dl>
-</dl>
diff --git a/helpers/DATA/firefox/default-bookmarks.html b/helpers/DATA/firefox/default-bookmarks.html
new file mode 100644
index 0000000000000000000000000000000000000000..bb85402816c7d77aa1f90f730589311238fb8378
--- /dev/null
+++ b/helpers/DATA/firefox/default-bookmarks.html
@@ -0,0 +1,23 @@
+#filter substitution
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <!-- These localization links are not automatically applied to any XHR
+ response body and must be applied manually as well. They are included
+ so that viewing the file directly shows the results. -->
+ <link rel="localization" href="branding/brand.ftl"/>
+ <link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
+ <title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
+</head>
+<body>
+<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
+<dl><p>
+ <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">Bookmarks Toolbar</h3></dt>
+</dl>
+</body>
+</html>
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 9467f4581ee20cc1430065ba4489d3d1705cfccf..6eb53df1cb173d6cb93858bf376d9befb7b4db74 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=86
+VERSION=87
. ./config
@@ -282,7 +282,7 @@ sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1
rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/osx ./b2g
#Trisquel custom bookmarks
-cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+cp $DATA/default-bookmarks.html browser/base/content/default-bookmarks.html
#Trisquel custom search engines
cp -a $DATA/searchplugins/* browser/components/search/extensions/
@@ -358,16 +358,8 @@ MOZ_TELEMETRY_REPORTING=0
MOZ_ADDON_SIGNING=0
EOF
-# Fix locale
-cat << EOF >> mobile/locales/en-US/chrome/region.properties
-browser.search.defaultenginename=DuckDuckGo
-browser.search.order.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
-browser.suggestedsites.webmaker.title=GNU Project
-browser.suggestedsites.webmaker.url=https://www.gnu.org
-EOF
+#Enable EGL by default
+sed -i '/gfx.x11-egl.force-enabled/,/mirror/s|false|true|' modules/libpref/init/StaticPrefList.yaml
# Branding
rm mobile/android/branding/{official,unofficial,beta,nightly} -rf