Updated to 59.0

4 files changed, 178 insertions, 179 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 673e283..3333d06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,11 +59,11 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.brand
          vendor.js)
 sha256sums=('fb5ff29e2bc68fa5ebb8bd8c800b597fcb2dd5820899aef3372380c99a0acec6'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
-            'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
+            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
             '7ee098251254cbfbcdf78463d3af95089e38d7942a5c7936dacbcf0c5fb1c5b8'
             'SKIP'
-            '12170e0539997396f83c511317377cf4cc5af74177c6c1db14275ebf0b932bb9'
-            'a3d82a2b4a61637c3813957c48e8ed0e16afc0138b198d2ec0c61f3dbb8977d2')
+            'ec074da734d847dbd1b93e980304d0a26a2c07232b388322c81235a0e5856887'
+            'f0bcb718362a81f2076f8418d8dfe87559de51d1e1d73f0ef0ddc368a53f7572')
 validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
@@ -112,6 +112,7 @@ ac_add_options --enable-jack
 ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
+ac_add_options --disable-stylo
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
@@ -125,9 +126,7 @@ END
       .mozconfig
 
     cat >> .mozconfig << END
-ac_add_options --disable-webrtc
 ac_add_options --disable-elf-hack
-ac_add_options --disable-stylo
 ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
 END
   fi
@@ -169,8 +168,8 @@ END
   #cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml
 
   # Load our searchplugins
-  rm -rv browser/locales/searchplugins
-  cp -av /usr/lib/mozilla/searchplugins browser/locales
+  #rm -rv browser/locales/searchplugins
+  #cp -av /usr/lib/mozilla/searchplugins browser/locales
 
   # Disable various components at the source level
   sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
@@ -203,7 +202,7 @@ package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   local shortver=$(echo $pkgver | cut -d'.' -f1,2)
   sed -i "s/@PKGVER@/$shortver/g" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
-  
+
   _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
   install -Dm644 /dev/stdin "$_distini" <<END
 [Global]
diff --git a/libre.patch b/libre.patch
index f9cb11c..861720a 100644
--- a/libre.patch
+++ b/libre.patch
@@ -175,7 +175,7 @@ diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/bro
 index e078ed528..ce2c5ed4d 100644
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,17 +3,12 @@
+@@ -3,16 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -184,8 +184,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
+-browser.search.order.2=Bing
 -
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
@@ -197,7 +196,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
+@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=4
  
@@ -295,19 +294,94 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 index eff09189b..6d76d20f0 100644
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -99,12 +99,6 @@
+@@ -99,11 +99,6 @@
      locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
      locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
  #endif
 -    locale/browser/searchplugins/images/amazon.ico     (searchplugins/images/amazon.ico)
 -    locale/browser/searchplugins/images/ebay.ico       (searchplugins/images/ebay.ico)
 -    locale/browser/searchplugins/images/wikipedia.ico  (searchplugins/images/wikipedia.ico)
--    locale/browser/searchplugins/images/yahoo.ico      (searchplugins/images/yahoo.ico)
 -    locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
 -    locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
  % locale browser-region @AB_CD@ %locale/browser-region/
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
+diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
+index 674a408d5..d27e97fd5 100644
+--- a/devtools/client/locales/en-US/connection-screen.dtd
++++ b/devtools/client/locales/en-US/connection-screen.dtd
+@@ -24,7 +24,7 @@
+ <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
+ these strings will be concatenated in a single label, remoteDocumentation will
+ be used as text for a link to MDN. -->
+-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
++<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
+ <!ENTITY remoteDocumentation "documentation">
+ <!ENTITY remoteHelpSuffix ".">
+ 
+diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
+index 842d549f0..31dcb82e5 100644
+--- a/devtools/client/locales/en-US/sourceeditor.properties
++++ b/devtools/client/locales/en-US/sourceeditor.properties
+@@ -4,7 +4,7 @@
+ 
+ # LOCALIZATION NOTE These strings are used inside the Source Editor component.
+ # This component is used whenever source code is displayed for the purpose of
+-# being edited, inside the Firefox developer tools - current examples are the
++# being edited, inside the Iceweasel developer tools - current examples are the
+ # Scratchpad and the Style Editor tools.
+ 
+ # LOCALIZATION NOTE The correct localization of this file might be to keep it
+diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
+index 6097fa82a..3dfe372db 100644
+--- a/devtools/client/locales/en-US/toolbox.dtd
++++ b/devtools/client/locales/en-US/toolbox.dtd
+@@ -80,7 +80,7 @@
+   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
+   -  boolean preference in about:config, in the options panel. -->
+ <!ENTITY options.enableRemote.label3    "Enable remote debugging">
+-<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
++<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
+ 
+ <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
+   -  options.disableJavaScript.tooltip): This is the options panel label and
+diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
+index 5e1a80ccd..8f375da2e 100644
+--- a/devtools/client/locales/en-US/webide.dtd
++++ b/devtools/client/locales/en-US/webide.dtd
+@@ -2,7 +2,7 @@
+    - 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/. -->
+ 
+-<!ENTITY windowTitle "Firefox WebIDE">
++<!ENTITY windowTitle "Iceweasel WebIDE">
+ 
+ <!ENTITY projectMenu_label "Project">
+ <!ENTITY projectMenu_accesskey "P">
+@@ -55,7 +55,7 @@
+ <!ENTITY projectButton_label "Open App">
+ <!ENTITY runtimeButton_label "Select Runtime">
+ 
+-<!-- We try to repicate Firefox' bindings: -->
++<!-- We try to repicate Iceweasel' bindings: -->
+ <!-- quit app -->
+ <!ENTITY key_quit "W">
+ <!-- open menu -->
+diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
+index 2368ad7f1..05e39c74f 100644
+--- a/devtools/client/locales/en-US/webide.properties
++++ b/devtools/client/locales/en-US/webide.properties
+@@ -2,8 +2,8 @@
+ # 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/.
+ 
+-title_noApp=Firefox WebIDE
+-title_app=Firefox WebIDE: %S
++title_noApp=Iceweasel WebIDE
++title_app=Iceweasel WebIDE: %S
+ 
+ runtimeButton_label=Select Runtime
+ projectButton_label=Open App
 diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
 index 544740a43..4961e5437 100644
 --- a/browser/locales/search/list.json
@@ -316,7 +390,7 @@ index 544740a43..4961e5437 100644
  {
    "default": {
      "visibleDefaultEngines": [
--      "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-      "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 +      "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
      ]
    },
@@ -375,12 +449,12 @@ index 544740a43..4961e5437 100644
      "en-US": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-          "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
 -        "visibleDefaultEngines": [
--          "amazon-ca", "amazon-au", "google-2018", "yahoo-en-CA", "yandex-en"
+-          "amazon-ca", "amazon-au", "google-2018", "yandex-en"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -388,7 +462,7 @@ index 544740a43..4961e5437 100644
      "ach": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -396,7 +470,7 @@ index 544740a43..4961e5437 100644
      "af": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-af"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-af"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -404,7 +478,7 @@ index 544740a43..4961e5437 100644
      "an": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
+-          "google", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -412,7 +486,7 @@ index 544740a43..4961e5437 100644
      "ar": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ar"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-ar"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -420,7 +494,7 @@ index 544740a43..4961e5437 100644
      "as": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-as"
+-          "google", "amazondotcom", "ddg", "wikipedia-as"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -428,7 +502,7 @@ index 544740a43..4961e5437 100644
      "ast": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
+-          "google", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -460,7 +534,7 @@ index 544740a43..4961e5437 100644
      "bn-BD": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "wikipedia-bn"
+-          "google", "bing", "ddg", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -468,7 +542,7 @@ index 544740a43..4961e5437 100644
      "bn-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
+-          "google", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -476,7 +550,7 @@ index 544740a43..4961e5437 100644
      "br": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
+-          "google", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -484,7 +558,7 @@ index 544740a43..4961e5437 100644
      "bs": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "ddg", "olx", "twitter", "wikipedia-bs"
+-          "google", "ddg", "olx", "twitter", "wikipedia-bs"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -500,7 +574,7 @@ index 544740a43..4961e5437 100644
      "cak": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-espanol", "bing", "amazondotcom", "ddg", "wikipedia-es"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -516,7 +590,7 @@ index 544740a43..4961e5437 100644
      "cy": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
+-          "google", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -532,7 +606,7 @@ index 544740a43..4961e5437 100644
      "de": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "ebay-de", "leo_ende_de", "wikipedia-de"
+-          "google", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -540,7 +614,7 @@ index 544740a43..4961e5437 100644
      "dsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
+-          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -548,7 +622,7 @@ index 544740a43..4961e5437 100644
      "el": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
+-          "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -556,7 +630,7 @@ index 544740a43..4961e5437 100644
      "en-GB": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -577,7 +651,7 @@ index 544740a43..4961e5437 100644
      "eo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
+-          "google", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -585,7 +659,7 @@ index 544740a43..4961e5437 100644
      "es-AR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-ar", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
+-          "google", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -593,7 +667,7 @@ index 544740a43..4961e5437 100644
      "es-CL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-cl", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
+-          "google", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -601,7 +675,7 @@ index 544740a43..4961e5437 100644
      "es-ES": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
+-          "google", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -609,7 +683,7 @@ index 544740a43..4961e5437 100644
      "es-MX": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
+-          "google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -630,7 +704,7 @@ index 544740a43..4961e5437 100644
      "eu": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
+-          "google", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -638,7 +712,7 @@ index 544740a43..4961e5437 100644
      "fa": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "wikipedia-fa"
+-          "google", "amazondotcom", "bing", "ddg", "wikipedia-fa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -646,7 +720,7 @@ index 544740a43..4961e5437 100644
      "ff": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -654,7 +728,7 @@ index 544740a43..4961e5437 100644
      "fi": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-fi", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
+-          "google", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -662,7 +736,7 @@ index 544740a43..4961e5437 100644
      "fr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -670,7 +744,7 @@ index 544740a43..4961e5437 100644
      "fy-NL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
+-          "google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -683,7 +757,7 @@ index 544740a43..4961e5437 100644
      "ga-IE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
+-          "google", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -691,7 +765,7 @@ index 544740a43..4961e5437 100644
      "gd": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
+-          "google", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -699,7 +773,7 @@ index 544740a43..4961e5437 100644
      "gl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
+-          "google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -707,7 +781,7 @@ index 544740a43..4961e5437 100644
      "gn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -715,7 +789,7 @@ index 544740a43..4961e5437 100644
      "gu-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
+-          "google", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -723,7 +797,7 @@ index 544740a43..4961e5437 100644
      "he": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "ddg", "wikipedia-he", "morfix-dic"
+-          "google", "ddg", "wikipedia-he", "morfix-dic"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -731,7 +805,7 @@ index 544740a43..4961e5437 100644
      "hi-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "wikipedia-hi"
+-          "google", "bing", "ddg", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -739,7 +813,7 @@ index 544740a43..4961e5437 100644
      "hr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
+-          "google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -747,7 +821,7 @@ index 544740a43..4961e5437 100644
      "hsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
+-          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -763,7 +837,7 @@ index 544740a43..4961e5437 100644
      "hy-AM": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
+-          "google", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -771,7 +845,7 @@ index 544740a43..4961e5437 100644
      "ia": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -779,7 +853,7 @@ index 544740a43..4961e5437 100644
      "id": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-id", "ddg", "wikipedia-id"
+-          "google", "ddg", "wikipedia-id"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -787,7 +861,7 @@ index 544740a43..4961e5437 100644
      "is": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
+-          "google", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -795,7 +869,7 @@ index 544740a43..4961e5437 100644
      "it": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
+-          "google", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -819,7 +893,7 @@ index 544740a43..4961e5437 100644
      "ka": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -827,7 +901,7 @@ index 544740a43..4961e5437 100644
      "kab": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "ddg", "wikipedia-kab"
+-          "google", "bing", "ddg", "wikipedia-kab"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -843,7 +917,7 @@ index 544740a43..4961e5437 100644
      "km": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -851,7 +925,7 @@ index 544740a43..4961e5437 100644
      "kn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
+-          "google", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -867,7 +941,7 @@ index 544740a43..4961e5437 100644
      "lij": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
+-          "google", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -875,7 +949,7 @@ index 544740a43..4961e5437 100644
      "lo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "wikipedia-lo", "twitter"
+-          "google", "bing", "ddg", "wikipedia-lo", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -891,7 +965,7 @@ index 544740a43..4961e5437 100644
      "ltg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
+-          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -899,7 +973,7 @@ index 544740a43..4961e5437 100644
      "lv": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
+-          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -907,7 +981,7 @@ index 544740a43..4961e5437 100644
      "mai": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "twitter", "wikipedia-hi"
+-          "google", "bing", "ddg", "twitter", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -915,7 +989,7 @@ index 544740a43..4961e5437 100644
      "mk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-mk"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-mk"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -931,7 +1005,7 @@ index 544740a43..4961e5437 100644
      "mr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
+-          "google", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -939,7 +1013,7 @@ index 544740a43..4961e5437 100644
      "ms": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -947,7 +1021,7 @@ index 544740a43..4961e5437 100644
      "my": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -955,7 +1029,7 @@ index 544740a43..4961e5437 100644
      "nb-NO": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-NO", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
+-          "google", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -963,7 +1037,7 @@ index 544740a43..4961e5437 100644
      "ne-NP": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "twitter", "wikipedia-ne"
+-          "google", "bing", "ddg", "twitter", "wikipedia-ne"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -992,7 +1066,7 @@ index 544740a43..4961e5437 100644
      "oc": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
+-          "google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1000,7 +1074,7 @@ index 544740a43..4961e5437 100644
      "or": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazondotcom", "ddg", "wikipedia-or"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-or"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1008,7 +1082,7 @@ index 544740a43..4961e5437 100644
      "pa-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "wikipedia-pa"
+-          "google", "bing", "ddg", "wikipedia-pa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1024,7 +1098,7 @@ index 544740a43..4961e5437 100644
      "pt-BR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
+-          "google", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -1045,7 +1119,7 @@ index 544740a43..4961e5437 100644
      "rm": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-ch", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
+-          "google", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1053,7 +1127,7 @@ index 544740a43..4961e5437 100644
      "ro": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ro"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-ro"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1069,7 +1143,7 @@ index 544740a43..4961e5437 100644
      "si": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "ddg", "wikipedia-si"
+-          "google", "amazondotcom", "ddg", "wikipedia-si"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1093,7 +1167,7 @@ index 544740a43..4961e5437 100644
      "son": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1101,7 +1175,7 @@ index 544740a43..4961e5437 100644
      "sq": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
+-          "google", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1117,7 +1191,7 @@ index 544740a43..4961e5437 100644
      "sv-SE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-sv-SE", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
+-          "google", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1125,7 +1199,7 @@ index 544740a43..4961e5437 100644
      "ta": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "ddg", "wikipedia-ta"
+-          "google", "ddg", "wikipedia-ta"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1133,7 +1207,7 @@ index 544740a43..4961e5437 100644
      "te": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
+-          "google", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1141,7 +1215,7 @@ index 544740a43..4961e5437 100644
      "th": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
+-          "google", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1149,7 +1223,7 @@ index 544740a43..4961e5437 100644
      "tl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-tl", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1173,7 +1247,7 @@ index 544740a43..4961e5437 100644
      "ur": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
+-          "google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1181,7 +1255,7 @@ index 544740a43..4961e5437 100644
      "uz": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1197,7 +1271,7 @@ index 544740a43..4961e5437 100644
      "wo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-wo"
+-          "google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1221,84 +1295,8 @@ index 544740a43..4961e5437 100644
      "zh-TW": {
        "default": {
          "visibleDefaultEngines": [
--          "yahoo-zh-TW", "google", "ddg", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
+-          "google", "ddg", "wikipedia-zh-TW"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
      }
-diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
-index 674a408d5..d27e97fd5 100644
---- a/devtools/client/locales/en-US/connection-screen.dtd
-+++ b/devtools/client/locales/en-US/connection-screen.dtd
-@@ -24,7 +24,7 @@
- <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
- these strings will be concatenated in a single label, remoteDocumentation will
- be used as text for a link to MDN. -->
--<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
-+<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
- <!ENTITY remoteDocumentation "documentation">
- <!ENTITY remoteHelpSuffix ".">
- 
-diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
-index 842d549f0..31dcb82e5 100644
---- a/devtools/client/locales/en-US/sourceeditor.properties
-+++ b/devtools/client/locales/en-US/sourceeditor.properties
-@@ -4,7 +4,7 @@
- 
- # LOCALIZATION NOTE These strings are used inside the Source Editor component.
- # This component is used whenever source code is displayed for the purpose of
--# being edited, inside the Firefox developer tools - current examples are the
-+# being edited, inside the Iceweasel developer tools - current examples are the
- # Scratchpad and the Style Editor tools.
- 
- # LOCALIZATION NOTE The correct localization of this file might be to keep it
-diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
-index 6097fa82a..3dfe372db 100644
---- a/devtools/client/locales/en-US/toolbox.dtd
-+++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -80,7 +80,7 @@
-   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
-   -  boolean preference in about:config, in the options panel. -->
- <!ENTITY options.enableRemote.label3    "Enable remote debugging">
--<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
-+<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
- 
- <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
-   -  options.disableJavaScript.tooltip): This is the options panel label and
-diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
-index 5e1a80ccd..8f375da2e 100644
---- a/devtools/client/locales/en-US/webide.dtd
-+++ b/devtools/client/locales/en-US/webide.dtd
-@@ -2,7 +2,7 @@
-    - 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/. -->
- 
--<!ENTITY windowTitle "Firefox WebIDE">
-+<!ENTITY windowTitle "Iceweasel WebIDE">
- 
- <!ENTITY projectMenu_label "Project">
- <!ENTITY projectMenu_accesskey "P">
-@@ -55,7 +55,7 @@
- <!ENTITY projectButton_label "Open App">
- <!ENTITY runtimeButton_label "Select Runtime">
- 
--<!-- We try to repicate Firefox' bindings: -->
-+<!-- We try to repicate Iceweasel' bindings: -->
- <!-- quit app -->
- <!ENTITY key_quit "W">
- <!-- open menu -->
-diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
-index 2368ad7f1..05e39c74f 100644
---- a/devtools/client/locales/en-US/webide.properties
-+++ b/devtools/client/locales/en-US/webide.properties
-@@ -2,8 +2,8 @@
- # 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/.
- 
--title_noApp=Firefox WebIDE
--title_app=Firefox WebIDE: %S
-+title_noApp=Iceweasel WebIDE
-+title_app=Iceweasel WebIDE: %S
- 
- runtimeButton_label=Select Runtime
- projectButton_label=Open App
diff --git a/no-crmf.diff b/no-crmf.diff
index 242304e..682ba3f 100644
--- a/no-crmf.diff
+++ b/no-crmf.diff
@@ -1,9 +1,9 @@
 diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
+index 12170a47568f..dbbaa0bc9194 100644
 --- i/old-configure.in
 +++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+     AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  fi
  
 -if test -n "$MOZ_SYSTEM_NSS"; then
diff --git a/vendor.js b/vendor.js
index 5e28e5a..6dffe85 100644
--- a/vendor.js
+++ b/vendor.js
@@ -5,6 +5,8 @@ pref("accessibility.force_disabled", 1);
 
 pref("alerts.showFavicons", false); //Breaks favicons
 
+pref("app.normandy.api_url", false);
+pref("app.normandy.enabled", false);
 pref("app.releaseNotesURL",				"https://www.mozilla.org/en-US/firefox/notes/");
 pref("app.shield.optoutstudies.enabled", false);
 pref("app.update.auto", 						false);
@@ -37,7 +39,7 @@ pref("browser.cache.disk_cache_ssl",			false);  //Conflict
 pref("browser.cache.frecency_experiment", -1);
 pref("browser.cache.memory.capacity", 1048576);  //Hidden
 pref("browser.cache.offline.enable",			false);
-\pref("browser.crashReports.unsubmittedCheck.autoSubmit2", 		false);
+pref("browser.crashReports.unsubmittedCheck.autoSubmit2", 		false);
 pref("browser.crashReports.unsubmittedCheck.enabled", 		false);
 pref("browser.customizemode.tip0.learnMoreUrl",				"https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
 pref("browser.disableResetPrompt", true);
@@ -159,7 +161,7 @@ pref("browser.taskbar.lists.tasks.enabled", false);
 pref("browser.taskbar.previews.enable", false);
 pref("browser.uitour.enabled",				false);
 pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
-pref("browser.urlbar.decodeURLsOnCopy", true);          
+pref("browser.urlbar.decodeURLsOnCopy", true);
 pref("browser.urlbar.filter.javascript",			true);
 pref("browser.urlbar.maxHistoricalSearchSuggestions", 0);
 pref("browser.urlbar.oneOffSearches", false);
@@ -189,11 +191,11 @@ pref("browser.usedOnWindows10", true);
 //pref("browser.xul.error_pages.expert_bad_cert", false);
 pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
 
-pref("captivedetect.canonicalURL", "");
-
 //pref("canvas.capturestream.enabled", true);
 pref("canvas.capturestream.enabled", false);  //Conflict
 
+pref("captivedetect.canonicalURL", "");
+
 pref("clipboard.autocopy", false);
 
 pref("datareporting.healthreport.uploadEnabled",		false);
@@ -311,11 +313,11 @@ pref("extensions.webextensions.keepStorageOnUninstall", false);
 pref("extensions.webextensions.keepUuidOnUninstall", false);
 pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 
+pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka");
+
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
 
-pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka");
-
 pref("general.useragent.compatMode.firefox", false);
 //pref("general.warnOnAboutConfig", true);
 pref("general.warnOnAboutConfig", false);  //Conflict
@@ -340,9 +342,9 @@ pref("identity.fxaccounts.remote.force_auth.uri",				"");
 pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/");
 pref("identity.mobilepromo.ios",				"");
 
+pref("intl.accept_languages",				"en-US, en");
 pref("intl.charset.default", "windows-1252");
 pref("intl.locale.requested",				"en-US");
-pref("intl.accept_languages",				"en-US, en");
 pref("intl.regional_prefs.use_os_locales", false);
 
 pref("javascript.options.asmjs",				false);
@@ -437,11 +439,11 @@ pref("network.http.redirection-limit", 10);  //Conflict
 pref("network.http.referer.hideOnionSource", true);
 pref("network.http.referer.spoofSource",			false);
 //pref("network.http.sendRefererHeader", 0);            //Breaks many sites, use privacy settings addon to quick toggle
+pref("network.http.referer.defaultPolicy", 1);    //A better default
+pref("network.http.referer.defaultPolicy.pbmode", 1);    //A better default
 //pref("network.http.referer.trimmingPolicy", 2);       //Breaks many sites
 //pref("network.http.referer.XOriginPolicy", 2);        //Breaks many sites
 //pref("network.http.referer.XOriginTrimmingPolicy", 0);  //Breaks many sites
-pref("network.http.referer.defaultPolicy", 1);    //A better default
-pref("network.http.referer.defaultPolicy.pbmode", 1);    //A better default
 pref("network.http.spdy.enabled", false);
 pref("network.http.spdy.enabled.deps", false);
 pref("network.http.spdy.enabled.http2", false);