1942 files changed, 240 insertions, 3862 deletions

diff --git a/browser/.eslintrc.js b/application/basilisk/.eslintrc.js
index d3d2f320b..d3d2f320b 100644
--- a/browser/.eslintrc.js
+++ b/application/basilisk/.eslintrc.js
diff --git a/browser/LICENSE b/application/basilisk/LICENSE
index 4f643a5c8..4f643a5c8 100644
--- a/browser/LICENSE
+++ b/application/basilisk/LICENSE
diff --git a/browser/Makefile.in b/application/basilisk/Makefile.in
index 2eb9e708f..2eb9e708f 100644
--- a/browser/Makefile.in
+++ b/application/basilisk/Makefile.in
diff --git a/browser/app-rules.mk b/application/basilisk/app-rules.mk
index 2c3165304..2c3165304 100644
--- a/browser/app-rules.mk
+++ b/application/basilisk/app-rules.mk
diff --git a/browser/app.mozbuild b/application/basilisk/app.mozbuild
index 454933eb5..a6c2693ad 100644
--- a/browser/app.mozbuild
+++ b/application/basilisk/app.mozbuild
@@ -10,6 +10,6 @@ if CONFIG['MOZ_EXTENSIONS']:
 
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
-# Never add dirs after browser because they apparently won't get
-# packaged properly on Mac.
-DIRS += ['/browser']
+# Never add dirs after the browser root because they apparently won't
+# get packaged properly on Mac.
+DIRS += ['/application/basilisk']
diff --git a/browser/app/Makefile.in b/application/basilisk/app/Makefile.in
index d807b4337..d807b4337 100644
--- a/browser/app/Makefile.in
+++ b/application/basilisk/app/Makefile.in
diff --git a/browser/app/application.ini b/application/basilisk/app/application.ini
index 05317eee9..05317eee9 100644
--- a/browser/app/application.ini
+++ b/application/basilisk/app/application.ini
diff --git a/browser/app/basilisk.exe.manifest b/application/basilisk/app/basilisk.exe.manifest
index 079e15b58..079e15b58 100644
--- a/browser/app/basilisk.exe.manifest
+++ b/application/basilisk/app/basilisk.exe.manifest
diff --git a/browser/app/blocklist.xml b/application/basilisk/app/blocklist.xml
index 239fe43a4..239fe43a4 100644
--- a/browser/app/blocklist.xml
+++ b/application/basilisk/app/blocklist.xml
diff --git a/browser/app/macbuild/Contents/Info.plist.in b/application/basilisk/app/macbuild/Contents/Info.plist.in
index d6902fffd..d6902fffd 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/application/basilisk/app/macbuild/Contents/Info.plist.in
diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/application/basilisk/app/macbuild/Contents/MacOS-files.in
index 849336bc9..849336bc9 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/application/basilisk/app/macbuild/Contents/MacOS-files.in
diff --git a/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in b/application/basilisk/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
index 74d192cb0..74d192cb0 100644
--- a/browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
+++ b/application/basilisk/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
diff --git a/browser/app/macversion.py b/application/basilisk/app/macversion.py
index 839aac1ff..839aac1ff 100644
--- a/browser/app/macversion.py
+++ b/application/basilisk/app/macversion.py
diff --git a/browser/app/module.ver b/application/basilisk/app/module.ver
index 0373ff96d..0373ff96d 100644
--- a/browser/app/module.ver
+++ b/application/basilisk/app/module.ver
diff --git a/browser/app/moz.build b/application/basilisk/app/moz.build
index 1004e280c..1004e280c 100644
--- a/browser/app/moz.build
+++ b/application/basilisk/app/moz.build
diff --git a/browser/app/nsBrowserApp.cpp b/application/basilisk/app/nsBrowserApp.cpp
index 66ea8aed5..66ea8aed5 100644
--- a/browser/app/nsBrowserApp.cpp
+++ b/application/basilisk/app/nsBrowserApp.cpp
diff --git a/browser/app/permissions b/application/basilisk/app/permissions
index a2afdded2..cf0aa22fb 100644
--- a/browser/app/permissions
+++ b/application/basilisk/app/permissions
@@ -6,14 +6,6 @@
 # * permission is an integer between 1 and 15

 # See nsPermissionManager.cpp for more...

 

-# UITour

-origin	uitour	1	https://www.mozilla.org

-origin	uitour	1	https://self-repair.mozilla.org

-origin	uitour	1	https://support.mozilla.org

-origin	uitour	1	https://addons.mozilla.org

-origin	uitour	1	https://discovery.addons.mozilla.org

-origin	uitour	1	about:home

-

 # XPInstall

 origin	install	1	https://addons.mozilla.org

 origin	install	1	https://testpilot.firefox.com

diff --git a/browser/app/profile/channel-prefs.js b/application/basilisk/app/profile/channel-prefs.js
index 633c489f3..633c489f3 100644
--- a/browser/app/profile/channel-prefs.js
+++ b/application/basilisk/app/profile/channel-prefs.js
diff --git a/browser/app/profile/extensions/moz.build b/application/basilisk/app/profile/extensions/moz.build
index bb02c9165..bb02c9165 100644
--- a/browser/app/profile/extensions/moz.build
+++ b/application/basilisk/app/profile/extensions/moz.build
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/application/basilisk/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
index a2cb9754d..a2cb9754d 100644
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
+++ b/application/basilisk/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/application/basilisk/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
index f8c2a5c4b..f8c2a5c4b 100644
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
+++ b/application/basilisk/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
diff --git a/browser/app/profile/firefox.js b/application/basilisk/app/profile/firefox.js
index ede62fd5e..2babde3b0 100644
--- a/browser/app/profile/firefox.js
+++ b/application/basilisk/app/profile/firefox.js
@@ -178,20 +178,6 @@ pref("browser.eme.ui.enabled", true);
 pref("browser.eme.ui.enabled", false);
 #endif
 
-// UI tour experience.
-pref("browser.uitour.enabled", true);
-pref("browser.uitour.loglevel", "Error");
-pref("browser.uitour.requireSecure", true);
-pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
-pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
-// This is used as a regexp match against the page's URL.
-pref("browser.uitour.readerViewTrigger", "^https:\\/\\/www\\.mozilla\\.org\\/[^\\/]+\\/firefox\\/reading\\/start");
-// How long to show a Hearbeat survey (two hours, in seconds)
-pref("browser.uitour.surveyDuration", 7200);
-
-pref("browser.customizemode.tip0.shown", false);
-pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
-
 pref("keyword.enabled", true);
 pref("browser.fixup.domainwhitelist.localhost", true);
 
@@ -1301,8 +1287,6 @@ pref("privacy.trackingprotection.ui.enabled", true);
 #else
 pref("privacy.trackingprotection.ui.enabled", false);
 #endif
-pref("privacy.trackingprotection.introCount", 0);
-pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
 
 // Enable Contextual Identity Containers
 #ifdef NIGHTLY_BUILD
diff --git a/browser/app/profile/pagethemes.rdf b/application/basilisk/app/profile/pagethemes.rdf
index 3d09b95f5..3d09b95f5 100644
--- a/browser/app/profile/pagethemes.rdf
+++ b/application/basilisk/app/profile/pagethemes.rdf
diff --git a/browser/app/profile/prefs.js b/application/basilisk/app/profile/prefs.js
index 8c6f0d639..8c6f0d639 100644
--- a/browser/app/profile/prefs.js
+++ b/application/basilisk/app/profile/prefs.js
diff --git a/browser/app/splash.rc b/application/basilisk/app/splash.rc
index beccf8706..beccf8706 100644
--- a/browser/app/splash.rc
+++ b/application/basilisk/app/splash.rc
diff --git a/browser/base/.eslintrc.js b/application/basilisk/base/.eslintrc.js
index e6cf2032e..e6cf2032e 100644
--- a/browser/base/.eslintrc.js
+++ b/application/basilisk/base/.eslintrc.js
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/application/basilisk/base/content/aboutDialog-appUpdater.js
index 4b4fc6618..4b4fc6618 100644
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/application/basilisk/base/content/aboutDialog-appUpdater.js
diff --git a/browser/base/content/aboutDialog.css b/application/basilisk/base/content/aboutDialog.css
index 65830c8bb..65830c8bb 100644
--- a/browser/base/content/aboutDialog.css
+++ b/application/basilisk/base/content/aboutDialog.css
diff --git a/browser/base/content/aboutDialog.js b/application/basilisk/base/content/aboutDialog.js
index f9571621f..f9571621f 100644
--- a/browser/base/content/aboutDialog.js
+++ b/application/basilisk/base/content/aboutDialog.js
diff --git a/browser/base/content/aboutDialog.xul b/application/basilisk/base/content/aboutDialog.xul
index 5780e5ec1..5780e5ec1 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/application/basilisk/base/content/aboutDialog.xul
diff --git a/browser/base/content/aboutNetError.xhtml b/application/basilisk/base/content/aboutNetError.xhtml
index f2de106c2..f2de106c2 100644
--- a/browser/base/content/aboutNetError.xhtml
+++ b/application/basilisk/base/content/aboutNetError.xhtml
diff --git a/browser/base/content/aboutRobots-icon.png b/application/basilisk/base/content/aboutRobots-icon.png
index 1c4899aaf..1c4899aaf 100644
--- a/browser/base/content/aboutRobots-icon.png
+++ b/application/basilisk/base/content/aboutRobots-icon.png
diff --git a/browser/base/content/aboutRobots-widget-left.png b/application/basilisk/base/content/aboutRobots-widget-left.png
index 3a1e48d5f..3a1e48d5f 100644
--- a/browser/base/content/aboutRobots-widget-left.png
+++ b/application/basilisk/base/content/aboutRobots-widget-left.png
diff --git a/browser/base/content/aboutRobots.xhtml b/application/basilisk/base/content/aboutRobots.xhtml
index 23fe3ba17..23fe3ba17 100644
--- a/browser/base/content/aboutRobots.xhtml
+++ b/application/basilisk/base/content/aboutRobots.xhtml
diff --git a/browser/base/content/aboutTabCrashed.css b/application/basilisk/base/content/aboutTabCrashed.css
index de0eabe8b..de0eabe8b 100644
--- a/browser/base/content/aboutTabCrashed.css
+++ b/application/basilisk/base/content/aboutTabCrashed.css
diff --git a/browser/base/content/aboutTabCrashed.js b/application/basilisk/base/content/aboutTabCrashed.js
index 337add1d2..337add1d2 100644
--- a/browser/base/content/aboutTabCrashed.js
+++ b/application/basilisk/base/content/aboutTabCrashed.js
diff --git a/browser/base/content/aboutTabCrashed.xhtml b/application/basilisk/base/content/aboutTabCrashed.xhtml
index 8b18bee9c..8b18bee9c 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/application/basilisk/base/content/aboutTabCrashed.xhtml
diff --git a/browser/base/content/aboutaccounts/aboutaccounts.css b/application/basilisk/base/content/aboutaccounts/aboutaccounts.css
index a2c5cb8f0..a2c5cb8f0 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.css
+++ b/application/basilisk/base/content/aboutaccounts/aboutaccounts.css
diff --git a/browser/base/content/aboutaccounts/aboutaccounts.js b/application/basilisk/base/content/aboutaccounts/aboutaccounts.js
index a05c1ea75..a05c1ea75 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.js
+++ b/application/basilisk/base/content/aboutaccounts/aboutaccounts.js
diff --git a/browser/base/content/aboutaccounts/aboutaccounts.xhtml b/application/basilisk/base/content/aboutaccounts/aboutaccounts.xhtml
index 475f0e86f..475f0e86f 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/application/basilisk/base/content/aboutaccounts/aboutaccounts.xhtml
diff --git a/browser/base/content/aboutaccounts/images/fox.png b/application/basilisk/base/content/aboutaccounts/images/fox.png
index 83af78d6c..83af78d6c 100644
--- a/browser/base/content/aboutaccounts/images/fox.png
+++ b/application/basilisk/base/content/aboutaccounts/images/fox.png
diff --git a/browser/base/content/aboutaccounts/images/graphic_sync_intro.png b/application/basilisk/base/content/aboutaccounts/images/graphic_sync_intro.png
index ff5f482f0..ff5f482f0 100644
--- a/browser/base/content/aboutaccounts/images/graphic_sync_intro.png
+++ b/application/basilisk/base/content/aboutaccounts/images/graphic_sync_intro.png
diff --git a/browser/base/content/aboutaccounts/images/graphic_sync_intro@2x.png b/application/basilisk/base/content/aboutaccounts/images/graphic_sync_intro@2x.png
index 89fda0681..89fda0681 100644
--- a/browser/base/content/aboutaccounts/images/graphic_sync_intro@2x.png
+++ b/application/basilisk/base/content/aboutaccounts/images/graphic_sync_intro@2x.png
diff --git a/browser/base/content/aboutaccounts/main.css b/application/basilisk/base/content/aboutaccounts/main.css
index 8f4c3b34e..8f4c3b34e 100644
--- a/browser/base/content/aboutaccounts/main.css
+++ b/application/basilisk/base/content/aboutaccounts/main.css
diff --git a/browser/base/content/aboutaccounts/normalize.css b/application/basilisk/base/content/aboutaccounts/normalize.css
index c02ab25de..c02ab25de 100644
--- a/browser/base/content/aboutaccounts/normalize.css
+++ b/application/basilisk/base/content/aboutaccounts/normalize.css
diff --git a/browser/base/content/abouthealthreport/abouthealth.css b/application/basilisk/base/content/abouthealthreport/abouthealth.css
index 3dd40fc24..3dd40fc24 100644
--- a/browser/base/content/abouthealthreport/abouthealth.css
+++ b/application/basilisk/base/content/abouthealthreport/abouthealth.css
diff --git a/browser/base/content/abouthealthreport/abouthealth.js b/application/basilisk/base/content/abouthealthreport/abouthealth.js
index 66cbe16f5..66cbe16f5 100644
--- a/browser/base/content/abouthealthreport/abouthealth.js
+++ b/application/basilisk/base/content/abouthealthreport/abouthealth.js
diff --git a/browser/base/content/abouthealthreport/abouthealth.xhtml b/application/basilisk/base/content/abouthealthreport/abouthealth.xhtml
index 464635788..464635788 100644
--- a/browser/base/content/abouthealthreport/abouthealth.xhtml
+++ b/application/basilisk/base/content/abouthealthreport/abouthealth.xhtml
diff --git a/browser/base/content/abouthome/aboutHome.css b/application/basilisk/base/content/abouthome/aboutHome.css
index bc3f9882c..bc3f9882c 100644
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/application/basilisk/base/content/abouthome/aboutHome.css
diff --git a/browser/base/content/abouthome/aboutHome.js b/application/basilisk/base/content/abouthome/aboutHome.js
index 0cbcc835a..0cbcc835a 100644
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/application/basilisk/base/content/abouthome/aboutHome.js
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/application/basilisk/base/content/abouthome/aboutHome.xhtml
index 22bf2e7e8..22bf2e7e8 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/application/basilisk/base/content/abouthome/aboutHome.xhtml
diff --git a/browser/base/content/abouthome/addons.png b/application/basilisk/base/content/abouthome/addons.png
index 41519ce49..41519ce49 100644
--- a/browser/base/content/abouthome/addons.png
+++ b/application/basilisk/base/content/abouthome/addons.png
diff --git a/browser/base/content/abouthome/addons@2x.png b/application/basilisk/base/content/abouthome/addons@2x.png
index d4d04ee8c..d4d04ee8c 100644
--- a/browser/base/content/abouthome/addons@2x.png
+++ b/application/basilisk/base/content/abouthome/addons@2x.png
diff --git a/browser/base/content/abouthome/bookmarks.png b/application/basilisk/base/content/abouthome/bookmarks.png
index 5c7e194a6..5c7e194a6 100644
--- a/browser/base/content/abouthome/bookmarks.png
+++ b/application/basilisk/base/content/abouthome/bookmarks.png
diff --git a/browser/base/content/abouthome/bookmarks@2x.png b/application/basilisk/base/content/abouthome/bookmarks@2x.png
index 7ede00744..7ede00744 100644
--- a/browser/base/content/abouthome/bookmarks@2x.png
+++ b/application/basilisk/base/content/abouthome/bookmarks@2x.png
diff --git a/browser/base/content/abouthome/downloads.png b/application/basilisk/base/content/abouthome/downloads.png
index 3d4d10e7a..3d4d10e7a 100644
--- a/browser/base/content/abouthome/downloads.png
+++ b/application/basilisk/base/content/abouthome/downloads.png
diff --git a/browser/base/content/abouthome/downloads@2x.png b/application/basilisk/base/content/abouthome/downloads@2x.png
index d384a22c6..d384a22c6 100644
--- a/browser/base/content/abouthome/downloads@2x.png
+++ b/application/basilisk/base/content/abouthome/downloads@2x.png
diff --git a/browser/base/content/abouthome/history.png b/application/basilisk/base/content/abouthome/history.png
index ae742b1aa..ae742b1aa 100644
--- a/browser/base/content/abouthome/history.png
+++ b/application/basilisk/base/content/abouthome/history.png
diff --git a/browser/base/content/abouthome/history@2x.png b/application/basilisk/base/content/abouthome/history@2x.png
index 696902e7c..696902e7c 100644
--- a/browser/base/content/abouthome/history@2x.png
+++ b/application/basilisk/base/content/abouthome/history@2x.png
diff --git a/browser/base/content/abouthome/mozilla.png b/application/basilisk/base/content/abouthome/mozilla.png
index f2c348d13..f2c348d13 100644
--- a/browser/base/content/abouthome/mozilla.png
+++ b/application/basilisk/base/content/abouthome/mozilla.png
diff --git a/browser/base/content/abouthome/mozilla@2x.png b/application/basilisk/base/content/abouthome/mozilla@2x.png
index f8fc622d0..f8fc622d0 100644
--- a/browser/base/content/abouthome/mozilla@2x.png
+++ b/application/basilisk/base/content/abouthome/mozilla@2x.png
diff --git a/browser/base/content/abouthome/restore-large.png b/application/basilisk/base/content/abouthome/restore-large.png
index ef593e6e1..ef593e6e1 100644
--- a/browser/base/content/abouthome/restore-large.png
+++ b/application/basilisk/base/content/abouthome/restore-large.png
diff --git a/browser/base/content/abouthome/restore-large@2x.png b/application/basilisk/base/content/abouthome/restore-large@2x.png
index d5c71d0b0..d5c71d0b0 100644
--- a/browser/base/content/abouthome/restore-large@2x.png
+++ b/application/basilisk/base/content/abouthome/restore-large@2x.png
diff --git a/browser/base/content/abouthome/restore.png b/application/basilisk/base/content/abouthome/restore.png
index 5c3d6f437..5c3d6f437 100644
--- a/browser/base/content/abouthome/restore.png
+++ b/application/basilisk/base/content/abouthome/restore.png
diff --git a/browser/base/content/abouthome/restore@2x.png b/application/basilisk/base/content/abouthome/restore@2x.png
index 5acb63052..5acb63052 100644
--- a/browser/base/content/abouthome/restore@2x.png
+++ b/application/basilisk/base/content/abouthome/restore@2x.png
diff --git a/browser/base/content/abouthome/settings.png b/application/basilisk/base/content/abouthome/settings.png
index 4b0c30990..4b0c30990 100644
--- a/browser/base/content/abouthome/settings.png
+++ b/application/basilisk/base/content/abouthome/settings.png
diff --git a/browser/base/content/abouthome/settings@2x.png b/application/basilisk/base/content/abouthome/settings@2x.png
index c77cb9a92..c77cb9a92 100644
--- a/browser/base/content/abouthome/settings@2x.png
+++ b/application/basilisk/base/content/abouthome/settings@2x.png
diff --git a/browser/base/content/abouthome/snippet1.png b/application/basilisk/base/content/abouthome/snippet1.png
index ce2ec55c2..ce2ec55c2 100644
--- a/browser/base/content/abouthome/snippet1.png
+++ b/application/basilisk/base/content/abouthome/snippet1.png
diff --git a/browser/base/content/abouthome/snippet1@2x.png b/application/basilisk/base/content/abouthome/snippet1@2x.png
index f57cd0a82..f57cd0a82 100644
--- a/browser/base/content/abouthome/snippet1@2x.png
+++ b/application/basilisk/base/content/abouthome/snippet1@2x.png
diff --git a/browser/base/content/abouthome/snippet2.png b/application/basilisk/base/content/abouthome/snippet2.png
index e0724fb6d..e0724fb6d 100644
--- a/browser/base/content/abouthome/snippet2.png
+++ b/application/basilisk/base/content/abouthome/snippet2.png
diff --git a/browser/base/content/abouthome/snippet2@2x.png b/application/basilisk/base/content/abouthome/snippet2@2x.png
index 40577f52f..40577f52f 100644
--- a/browser/base/content/abouthome/snippet2@2x.png
+++ b/application/basilisk/base/content/abouthome/snippet2@2x.png
diff --git a/browser/base/content/abouthome/sync.png b/application/basilisk/base/content/abouthome/sync.png
index 11e40cc93..11e40cc93 100644
--- a/browser/base/content/abouthome/sync.png
+++ b/application/basilisk/base/content/abouthome/sync.png
diff --git a/browser/base/content/abouthome/sync@2x.png b/application/basilisk/base/content/abouthome/sync@2x.png
index 6354f5bf9..6354f5bf9 100644
--- a/browser/base/content/abouthome/sync@2x.png
+++ b/application/basilisk/base/content/abouthome/sync@2x.png
diff --git a/browser/base/content/baseMenuOverlay.xul b/application/basilisk/base/content/baseMenuOverlay.xul
index da74ca077..dce35e92d 100644
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/application/basilisk/base/content/baseMenuOverlay.xul
@@ -29,7 +29,7 @@
         <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
     </menupopup>
 <!-- Mac window menu -->
-#include ../../../toolkit/content/macWindowMenu.inc
+#include ../../../../toolkit/content/macWindowMenu.inc
 #endif
 
 #ifdef XP_WIN
@@ -52,10 +52,6 @@
 #else
                   />
 #endif
-        <menuitem id="menu_openTour"
-                  oncommand="openTourPage();"
-                  label="&helpShowTour2.label;"
-                  accesskey="&helpShowTour2.accesskey;"/>
         <menuitem id="menu_keyboardShortcuts"
                   oncommand="openHelpLink('keyboard-shortcuts')"
                   onclick="checkForMiddleClick(this, event);"
diff --git a/browser/base/content/blockedSite.xhtml b/application/basilisk/base/content/blockedSite.xhtml
index 10a4b33e8..10a4b33e8 100644
--- a/browser/base/content/blockedSite.xhtml
+++ b/application/basilisk/base/content/blockedSite.xhtml
diff --git a/browser/base/content/browser-addons.js b/application/basilisk/base/content/browser-addons.js
index 1d881536a..1d881536a 100644
--- a/browser/base/content/browser-addons.js
+++ b/application/basilisk/base/content/browser-addons.js
diff --git a/browser/base/content/browser-captivePortal.js b/application/basilisk/base/content/browser-captivePortal.js
index c2e45c4ed..c2e45c4ed 100644
--- a/browser/base/content/browser-captivePortal.js
+++ b/application/basilisk/base/content/browser-captivePortal.js
diff --git a/browser/base/content/browser-charsetmenu.inc b/application/basilisk/base/content/browser-charsetmenu.inc
index 806b1cf03..806b1cf03 100644
--- a/browser/base/content/browser-charsetmenu.inc
+++ b/application/basilisk/base/content/browser-charsetmenu.inc
diff --git a/browser/base/content/browser-context.inc b/application/basilisk/base/content/browser-context.inc
index 9fa90b11c..9fa90b11c 100644
--- a/browser/base/content/browser-context.inc
+++ b/application/basilisk/base/content/browser-context.inc
diff --git a/browser/base/content/browser-ctrlTab.js b/application/basilisk/base/content/browser-ctrlTab.js
index c761ea095..c761ea095 100644
--- a/browser/base/content/browser-ctrlTab.js
+++ b/application/basilisk/base/content/browser-ctrlTab.js
diff --git a/browser/base/content/browser-customization.js b/application/basilisk/base/content/browser-customization.js
index d5d51b893..d5d51b893 100644
--- a/browser/base/content/browser-customization.js
+++ b/application/basilisk/base/content/browser-customization.js
diff --git a/browser/base/content/browser-data-submission-info-bar.js b/application/basilisk/base/content/browser-data-submission-info-bar.js
index 0c87d199f..0c87d199f 100644
--- a/browser/base/content/browser-data-submission-info-bar.js
+++ b/application/basilisk/base/content/browser-data-submission-info-bar.js
diff --git a/browser/base/content/browser-devedition.js b/application/basilisk/base/content/browser-devedition.js
index 0dc1e94da..0dc1e94da 100644
--- a/browser/base/content/browser-devedition.js
+++ b/application/basilisk/base/content/browser-devedition.js
diff --git a/browser/base/content/browser-doctype.inc b/application/basilisk/base/content/browser-doctype.inc
index ad08f4b03..ad08f4b03 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/application/basilisk/base/content/browser-doctype.inc
diff --git a/browser/base/content/browser-feeds.js b/application/basilisk/base/content/browser-feeds.js
index 6f29d8915..6f29d8915 100644
--- a/browser/base/content/browser-feeds.js
+++ b/application/basilisk/base/content/browser-feeds.js
diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
index 497e51121..497e51121 100644
--- a/browser/base/content/browser-fullScreenAndPointerLock.js
+++ b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
diff --git a/browser/base/content/browser-fullZoom.js b/application/basilisk/base/content/browser-fullZoom.js
index 890cd8440..890cd8440 100644
--- a/browser/base/content/browser-fullZoom.js
+++ b/application/basilisk/base/content/browser-fullZoom.js
diff --git a/browser/base/content/browser-fxaccounts.js b/application/basilisk/base/content/browser-fxaccounts.js
index 0bbce3e26..0bbce3e26 100644
--- a/browser/base/content/browser-fxaccounts.js
+++ b/application/basilisk/base/content/browser-fxaccounts.js
diff --git a/browser/base/content/browser-gestureSupport.js b/application/basilisk/base/content/browser-gestureSupport.js
index f472e5c9a..f472e5c9a 100644
--- a/browser/base/content/browser-gestureSupport.js
+++ b/application/basilisk/base/content/browser-gestureSupport.js
diff --git a/browser/base/content/browser-media.js b/application/basilisk/base/content/browser-media.js
index bd5c5b227..bd5c5b227 100644
--- a/browser/base/content/browser-media.js
+++ b/application/basilisk/base/content/browser-media.js
diff --git a/browser/base/content/browser-menubar.inc b/application/basilisk/base/content/browser-menubar.inc
index 41734711c..41734711c 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/application/basilisk/base/content/browser-menubar.inc
diff --git a/browser/base/content/browser-places.js b/application/basilisk/base/content/browser-places.js
index 83c737977..83c737977 100644
--- a/browser/base/content/browser-places.js
+++ b/application/basilisk/base/content/browser-places.js
diff --git a/browser/base/content/browser-plugins.js b/application/basilisk/base/content/browser-plugins.js
index c1bc65860..c1bc65860 100644
--- a/browser/base/content/browser-plugins.js
+++ b/application/basilisk/base/content/browser-plugins.js
diff --git a/browser/base/content/browser-refreshblocker.js b/application/basilisk/base/content/browser-refreshblocker.js
index 025d45421..025d45421 100644
--- a/browser/base/content/browser-refreshblocker.js
+++ b/application/basilisk/base/content/browser-refreshblocker.js
diff --git a/browser/base/content/browser-safebrowsing.js b/application/basilisk/base/content/browser-safebrowsing.js
index 430d84f13..430d84f13 100644
--- a/browser/base/content/browser-safebrowsing.js
+++ b/application/basilisk/base/content/browser-safebrowsing.js
diff --git a/browser/base/content/browser-sets.inc b/application/basilisk/base/content/browser-sets.inc
index 6ea057d93..6ea057d93 100644
--- a/browser/base/content/browser-sets.inc
+++ b/application/basilisk/base/content/browser-sets.inc
diff --git a/browser/base/content/browser-sidebar.js b/application/basilisk/base/content/browser-sidebar.js
index 5893e6015..5893e6015 100644
--- a/browser/base/content/browser-sidebar.js
+++ b/application/basilisk/base/content/browser-sidebar.js
diff --git a/browser/base/content/browser-syncui.js b/application/basilisk/base/content/browser-syncui.js
index 51bcb15d5..51bcb15d5 100644
--- a/browser/base/content/browser-syncui.js
+++ b/application/basilisk/base/content/browser-syncui.js
diff --git a/browser/base/content/browser-tabPreviews.xml b/application/basilisk/base/content/browser-tabPreviews.xml
index f3f2ad180..f3f2ad180 100644
--- a/browser/base/content/browser-tabPreviews.xml
+++ b/application/basilisk/base/content/browser-tabPreviews.xml
diff --git a/browser/base/content/browser-tabsintitlebar-stub.js b/application/basilisk/base/content/browser-tabsintitlebar-stub.js
index 1e45b17dd..1e45b17dd 100644
--- a/browser/base/content/browser-tabsintitlebar-stub.js
+++ b/application/basilisk/base/content/browser-tabsintitlebar-stub.js
diff --git a/browser/base/content/browser-tabsintitlebar.js b/application/basilisk/base/content/browser-tabsintitlebar.js
index 5c0d94514..5c0d94514 100644
--- a/browser/base/content/browser-tabsintitlebar.js
+++ b/application/basilisk/base/content/browser-tabsintitlebar.js
diff --git a/browser/base/content/browser-thumbnails.js b/application/basilisk/base/content/browser-thumbnails.js
index ebefb193e..ebefb193e 100644
--- a/browser/base/content/browser-thumbnails.js
+++ b/application/basilisk/base/content/browser-thumbnails.js
diff --git a/browser/base/content/browser-trackingprotection.js b/application/basilisk/base/content/browser-trackingprotection.js
index cacb0522c..20917a083 100644
--- a/browser/base/content/browser-trackingprotection.js
+++ b/application/basilisk/base/content/browser-trackingprotection.js
@@ -4,7 +4,6 @@
 
 var TrackingProtection = {
   // If the user ignores the doorhanger, we stop showing it after some time.
-  MAX_INTROS: 20,
   PREF_ENABLED_GLOBALLY: "privacy.trackingprotection.enabled",
   PREF_ENABLED_IN_PRIVATE_WINDOWS: "privacy.trackingprotection.pbmode.enabled",
   enabledGlobally: false,
@@ -106,16 +105,6 @@ var TrackingProtection = {
       this.icon.setAttribute("state", "blocked-tracking-content");
       this.content.setAttribute("state", "blocked-tracking-content");
 
-      // Open the tracking protection introduction panel, if applicable.
-      if (this.enabledGlobally) {
-        let introCount = gPrefService.getIntPref("privacy.trackingprotection.introCount");
-        if (introCount < TrackingProtection.MAX_INTROS) {
-          gPrefService.setIntPref("privacy.trackingprotection.introCount", ++introCount);
-          gPrefService.savePrefFile(null);
-          this.showIntroPanel();
-        }
-      }
-
       this.shieldHistogramAdd(2);
     } else if (isAllowing) {
       this.icon.setAttribute("tooltiptext", this.disabledTooltipText);
@@ -185,55 +174,4 @@ var TrackingProtection = {
 
     BrowserReload();
   },
-
-  dontShowIntroPanelAgain() {
-    // This function may be called in private windows, but it does not change
-    // any preference unless Tracking Protection is enabled globally.
-    if (this.enabledGlobally) {
-      gPrefService.setIntPref("privacy.trackingprotection.introCount",
-                              this.MAX_INTROS);
-      gPrefService.savePrefFile(null);
-    }
-  },
-
-  showIntroPanel: Task.async(function*() {
-    let brandBundle = document.getElementById("bundle_brand");
-    let brandShortName = brandBundle.getString("brandShortName");
-
-    let openStep2 = () => {
-      // When the user proceeds in the tour, adjust the counter to indicate that
-      // the user doesn't need to see the intro anymore.
-      this.dontShowIntroPanelAgain();
-
-      let nextURL = Services.urlFormatter.formatURLPref("privacy.trackingprotection.introURL") +
-                    "?step=2&newtab=true";
-      switchToTabHavingURI(nextURL, true, {
-        // Ignore the fragment in case the intro is shown on the tour page
-        // (e.g. if the user manually visited the tour or clicked the link from
-        // about:privatebrowsing) so we can avoid a reload.
-        ignoreFragment: "whenComparingAndReplace",
-      });
-    };
-
-    let buttons = [
-      {
-        label: gNavigatorBundle.getString("trackingProtection.intro.step1of3"),
-        style: "text",
-      },
-      {
-        callback: openStep2,
-        label: gNavigatorBundle.getString("trackingProtection.intro.nextButton.label"),
-        style: "primary",
-      },
-    ];
-
-    let panelTarget = yield UITour.getTarget(window, "trackingProtection");
-    UITour.initForBrowser(gBrowser.selectedBrowser, window);
-    UITour.showInfo(window, panelTarget,
-                    gNavigatorBundle.getString("trackingProtection.intro.title"),
-                    gNavigatorBundle.getFormattedString("trackingProtection.intro.description2",
-                                                        [brandShortName]),
-                    undefined, buttons,
-                    { closeButtonCallback: () => this.dontShowIntroPanelAgain() });
-  }),
 };
diff --git a/browser/base/content/browser.css b/application/basilisk/base/content/browser.css
index ac5bf9e9b..e951985dc 100644
--- a/browser/base/content/browser.css
+++ b/application/basilisk/base/content/browser.css
@@ -1152,71 +1152,6 @@ toolbarpaletteitem[place="palette"][hidden] {
   display: none;
 }
 
-/* UI Tour */
-
-@keyframes uitour-wobble {
-  from {
-    transform: rotate(0deg) translateX(3px) rotate(0deg);
-  }
-  50% {
-    transform: rotate(360deg) translateX(3px) rotate(-360deg);
-  }
-  to {
-    transform: rotate(720deg) translateX(0px) rotate(-720deg);
-  }
-}
-
-@keyframes uitour-zoom {
-  from {
-    transform: scale(0.8);
-  }
-  50% {
-    transform: scale(1.0);
-  }
-  to {
-    transform: scale(0.8);
-  }
-}
-
-@keyframes uitour-color {
-  from {
-    border-color: #5B9CD9;
-  }
-  50% {
-    border-color: #FF0000;
-  }
-  to {
-    border-color: #5B9CD9;
-  }
-}
-
-#UITourHighlightContainer,
-#UITourHighlight {
-  pointer-events: none;
-}
-
-#UITourHighlight[active] {
-  animation-delay: 2s;
-  animation-fill-mode: forwards;
-  animation-iteration-count: infinite;
-  animation-timing-function: linear;
-}
-
-#UITourHighlight[active="wobble"] {
-  animation-name: uitour-wobble;
-  animation-delay: 0s;
-  animation-duration: 1.5s;
-  animation-iteration-count: 1;
-}
-#UITourHighlight[active="zoom"] {
-  animation-name: uitour-zoom;
-  animation-duration: 1s;
-}
-#UITourHighlight[active="color"] {
-  animation-name: uitour-color;
-  animation-duration: 2s;
-}
-
 /* Combined context-menu items */
 #context-navigation > .menuitem-iconic > .menu-iconic-text,
 #context-navigation > .menuitem-iconic > .menu-accel-container {
diff --git a/browser/base/content/browser.js b/application/basilisk/base/content/browser.js
index 4b8ec864b..64c0d86f5 100755..100644
--- a/browser/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -48,7 +48,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
   ["Task", "resource://gre/modules/Task.jsm"],
   ["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"],
   ["Translation", "resource:///modules/translation/Translation.jsm"],
-  ["UITour", "resource:///modules/UITour.jsm"],
   ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"],
   ["Weave", "resource://services-sync/main.js"],
   ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"],
@@ -984,7 +983,6 @@ var gBrowserInit = {
     let mm = window.getGroupMessageManager("browsers");
     mm.loadFrameScript("chrome://browser/content/tab-content.js", true);
     mm.loadFrameScript("chrome://browser/content/content.js", true);
-    mm.loadFrameScript("chrome://browser/content/content-UITour.js", true);
     mm.loadFrameScript("chrome://global/content/manifestMessages.js", true);
 
     // initialize observers and listeners
@@ -4474,7 +4472,6 @@ var XULBrowserWindow = {
 
       gIdentityHandler.onLocationChange();
 
-      UITour.onLocationChange(location);
 
       gTabletModePageCounter.inc();
 
@@ -8085,11 +8082,6 @@ var AboutPrivateBrowsingListener = {
         const PREF = "privacy.trackingprotection.pbmode.enabled";
         Services.prefs.setBoolPref(PREF, !Services.prefs.getBoolPref(PREF));
     });
-    window.messageManager.addMessageListener(
-      "AboutPrivateBrowsing:DontShowIntroPanelAgain",
-      msg => {
-        TrackingProtection.dontShowIntroPanelAgain();
-    });
   }
 };
 
diff --git a/browser/base/content/browser.xul b/application/basilisk/base/content/browser.xul
index 4f1b48349..028df609f 100644
--- a/browser/base/content/browser.xul
+++ b/application/basilisk/base/content/browser.xul
@@ -232,42 +232,6 @@
       </hbox>
     </panel>
 
-    <!-- UI tour experience -->
-    <panel id="UITourTooltip"
-           type="arrow"
-           hidden="true"
-           noautofocus="true"
-           noautohide="true"
-           align="start"
-           orient="vertical"
-           role="alert">
-     <vbox>
-      <hbox id="UITourTooltipBody">
-        <image id="UITourTooltipIcon"/>
-        <vbox flex="1">
-          <hbox id="UITourTooltipTitleContainer">
-            <label id="UITourTooltipTitle" flex="1"/>
-            <toolbarbutton id="UITourTooltipClose" class="close-icon"
-                           tooltiptext="&uiTour.infoPanel.close;"/>
-          </hbox>
-          <description id="UITourTooltipDescription" flex="1"/>
-        </vbox>
-      </hbox>
-      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
-     </vbox>
-    </panel>
-    <!-- type="default" forces frames to be created so that the panel's size can be determined -->
-    <panel id="UITourHighlightContainer"
-           type="default"
-           hidden="true"
-           noautofocus="true"
-           noautohide="true"
-           flip="none"
-           consumeoutsideclicks="false"
-           mousethrough="always">
-      <box id="UITourHighlight"></box>
-    </panel>
-
     <menupopup id="toolbar-context-menu"
                onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
       <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
diff --git a/browser/base/content/browserMountPoints.inc b/application/basilisk/base/content/browserMountPoints.inc
index e4315b04a..e4315b04a 100644
--- a/browser/base/content/browserMountPoints.inc
+++ b/application/basilisk/base/content/browserMountPoints.inc
diff --git a/browser/base/content/content.js b/application/basilisk/base/content/content.js
index 5758cb023..5758cb023 100644
--- a/browser/base/content/content.js
+++ b/application/basilisk/base/content/content.js
diff --git a/browser/base/content/contentSearchUI.css b/application/basilisk/base/content/contentSearchUI.css
index cd5cf5008..cd5cf5008 100644
--- a/browser/base/content/contentSearchUI.css
+++ b/application/basilisk/base/content/contentSearchUI.css
diff --git a/browser/base/content/contentSearchUI.js b/application/basilisk/base/content/contentSearchUI.js
index 9136ea8f2..9136ea8f2 100644
--- a/browser/base/content/contentSearchUI.js
+++ b/application/basilisk/base/content/contentSearchUI.js
diff --git a/browser/base/content/defaultthemes/1.footer.jpg b/application/basilisk/base/content/defaultthemes/1.footer.jpg
index cb5ff2705..cb5ff2705 100644
--- a/browser/base/content/defaultthemes/1.footer.jpg
+++ b/application/basilisk/base/content/defaultthemes/1.footer.jpg
diff --git a/browser/base/content/defaultthemes/1.header.jpg b/application/basilisk/base/content/defaultthemes/1.header.jpg
index 58c52f86a..58c52f86a 100644
--- a/browser/base/content/defaultthemes/1.header.jpg
+++ b/application/basilisk/base/content/defaultthemes/1.header.jpg
diff --git a/browser/base/content/defaultthemes/1.icon.jpg b/application/basilisk/base/content/defaultthemes/1.icon.jpg
index 67b316d9f..67b316d9f 100644
--- a/browser/base/content/defaultthemes/1.icon.jpg
+++ b/application/basilisk/base/content/defaultthemes/1.icon.jpg
diff --git a/browser/base/content/defaultthemes/1.preview.jpg b/application/basilisk/base/content/defaultthemes/1.preview.jpg
index 1394c5936..1394c5936 100644
--- a/browser/base/content/defaultthemes/1.preview.jpg
+++ b/application/basilisk/base/content/defaultthemes/1.preview.jpg
diff --git a/browser/base/content/defaultthemes/2.footer.jpg b/application/basilisk/base/content/defaultthemes/2.footer.jpg
index a8cce0ef8..a8cce0ef8 100644
--- a/browser/base/content/defaultthemes/2.footer.jpg
+++ b/application/basilisk/base/content/defaultthemes/2.footer.jpg
diff --git a/browser/base/content/defaultthemes/2.header.jpg b/application/basilisk/base/content/defaultthemes/2.header.jpg
index 8a4aec353..8a4aec353 100644
--- a/browser/base/content/defaultthemes/2.header.jpg
+++ b/application/basilisk/base/content/defaultthemes/2.header.jpg
diff --git a/browser/base/content/defaultthemes/2.icon.jpg b/application/basilisk/base/content/defaultthemes/2.icon.jpg
index 4eeed30ca..4eeed30ca 100644
--- a/browser/base/content/defaultthemes/2.icon.jpg
+++ b/application/basilisk/base/content/defaultthemes/2.icon.jpg
diff --git a/browser/base/content/defaultthemes/2.preview.jpg b/application/basilisk/base/content/defaultthemes/2.preview.jpg
index cc45cfc94..cc45cfc94 100644
--- a/browser/base/content/defaultthemes/2.preview.jpg
+++ b/application/basilisk/base/content/defaultthemes/2.preview.jpg
diff --git a/browser/base/content/defaultthemes/3.footer.png b/application/basilisk/base/content/defaultthemes/3.footer.png
index 235a5ad54..235a5ad54 100644
--- a/browser/base/content/defaultthemes/3.footer.png
+++ b/application/basilisk/base/content/defaultthemes/3.footer.png
diff --git a/browser/base/content/defaultthemes/3.header.png b/application/basilisk/base/content/defaultthemes/3.header.png
index b25d673c4..b25d673c4 100644
--- a/browser/base/content/defaultthemes/3.header.png
+++ b/application/basilisk/base/content/defaultthemes/3.header.png
diff --git a/browser/base/content/defaultthemes/3.icon.png b/application/basilisk/base/content/defaultthemes/3.icon.png
index 186519d3e..186519d3e 100644
--- a/browser/base/content/defaultthemes/3.icon.png
+++ b/application/basilisk/base/content/defaultthemes/3.icon.png
diff --git a/browser/base/content/defaultthemes/3.preview.png b/application/basilisk/base/content/defaultthemes/3.preview.png
index 46850f139..46850f139 100644
--- a/browser/base/content/defaultthemes/3.preview.png
+++ b/application/basilisk/base/content/defaultthemes/3.preview.png
diff --git a/browser/base/content/defaultthemes/4.footer.png b/application/basilisk/base/content/defaultthemes/4.footer.png
index bd944d58b..bd944d58b 100644
--- a/browser/base/content/defaultthemes/4.footer.png
+++ b/application/basilisk/base/content/defaultthemes/4.footer.png
diff --git a/browser/base/content/defaultthemes/4.header.png b/application/basilisk/base/content/defaultthemes/4.header.png
index 1487ff10e..1487ff10e 100644
--- a/browser/base/content/defaultthemes/4.header.png
+++ b/application/basilisk/base/content/defaultthemes/4.header.png
diff --git a/browser/base/content/defaultthemes/4.icon.png b/application/basilisk/base/content/defaultthemes/4.icon.png
index 8dd688ef1..8dd688ef1 100644
--- a/browser/base/content/defaultthemes/4.icon.png
+++ b/application/basilisk/base/content/defaultthemes/4.icon.png
diff --git a/browser/base/content/defaultthemes/4.preview.png b/application/basilisk/base/content/defaultthemes/4.preview.png
index 36ac2a0bf..36ac2a0bf 100644
--- a/browser/base/content/defaultthemes/4.preview.png
+++ b/application/basilisk/base/content/defaultthemes/4.preview.png
diff --git a/browser/base/content/defaultthemes/5.footer.png b/application/basilisk/base/content/defaultthemes/5.footer.png
index 8e87c69a0..8e87c69a0 100644
--- a/browser/base/content/defaultthemes/5.footer.png
+++ b/application/basilisk/base/content/defaultthemes/5.footer.png
diff --git a/browser/base/content/defaultthemes/5.header.png b/application/basilisk/base/content/defaultthemes/5.header.png
index 8e87c69a0..8e87c69a0 100644
--- a/browser/base/content/defaultthemes/5.header.png
+++ b/application/basilisk/base/content/defaultthemes/5.header.png
diff --git a/browser/base/content/defaultthemes/5.icon.jpg b/application/basilisk/base/content/defaultthemes/5.icon.jpg
index b3e103ee5..b3e103ee5 100644
--- a/browser/base/content/defaultthemes/5.icon.jpg
+++ b/application/basilisk/base/content/defaultthemes/5.icon.jpg
diff --git a/browser/base/content/defaultthemes/5.preview.jpg b/application/basilisk/base/content/defaultthemes/5.preview.jpg
index 78c2f1248..78c2f1248 100644
--- a/browser/base/content/defaultthemes/5.preview.jpg
+++ b/application/basilisk/base/content/defaultthemes/5.preview.jpg
diff --git a/browser/base/content/defaultthemes/devedition.header.png b/application/basilisk/base/content/defaultthemes/devedition.header.png
index e4e8dcaa3..e4e8dcaa3 100644
--- a/browser/base/content/defaultthemes/devedition.header.png
+++ b/application/basilisk/base/content/defaultthemes/devedition.header.png
diff --git a/browser/base/content/defaultthemes/devedition.icon.png b/application/basilisk/base/content/defaultthemes/devedition.icon.png
index 04cfba796..04cfba796 100644
--- a/browser/base/content/defaultthemes/devedition.icon.png
+++ b/application/basilisk/base/content/defaultthemes/devedition.icon.png
diff --git a/browser/base/content/docs/sslerrorreport/dataformat.rst b/application/basilisk/base/content/docs/sslerrorreport/dataformat.rst
index f69dc7417..f69dc7417 100644
--- a/browser/base/content/docs/sslerrorreport/dataformat.rst
+++ b/application/basilisk/base/content/docs/sslerrorreport/dataformat.rst
diff --git a/browser/base/content/docs/sslerrorreport/index.rst b/application/basilisk/base/content/docs/sslerrorreport/index.rst
index 2c4210113..2c4210113 100644
--- a/browser/base/content/docs/sslerrorreport/index.rst
+++ b/application/basilisk/base/content/docs/sslerrorreport/index.rst
diff --git a/browser/base/content/docs/sslerrorreport/preferences.rst b/application/basilisk/base/content/docs/sslerrorreport/preferences.rst
index ed6f384c2..ed6f384c2 100644
--- a/browser/base/content/docs/sslerrorreport/preferences.rst
+++ b/application/basilisk/base/content/docs/sslerrorreport/preferences.rst
diff --git a/browser/base/content/downloadManagerOverlay.xul b/application/basilisk/base/content/downloadManagerOverlay.xul
index 9987820cb..9987820cb 100644
--- a/browser/base/content/downloadManagerOverlay.xul
+++ b/application/basilisk/base/content/downloadManagerOverlay.xul
diff --git a/browser/base/content/gcli_sec_bad.svg b/application/basilisk/base/content/gcli_sec_bad.svg
index 4f440eb6b..4f440eb6b 100644
--- a/browser/base/content/gcli_sec_bad.svg
+++ b/application/basilisk/base/content/gcli_sec_bad.svg
diff --git a/browser/base/content/gcli_sec_good.svg b/application/basilisk/base/content/gcli_sec_good.svg
index f1b33d073..f1b33d073 100644
--- a/browser/base/content/gcli_sec_good.svg
+++ b/application/basilisk/base/content/gcli_sec_good.svg
diff --git a/browser/base/content/gcli_sec_moderate.svg b/application/basilisk/base/content/gcli_sec_moderate.svg
index 3a88aa468..3a88aa468 100644
--- a/browser/base/content/gcli_sec_moderate.svg
+++ b/application/basilisk/base/content/gcli_sec_moderate.svg
diff --git a/browser/base/content/global-scripts.inc b/application/basilisk/base/content/global-scripts.inc
index eef21e15e..eef21e15e 100755..100644
--- a/browser/base/content/global-scripts.inc
+++ b/application/basilisk/base/content/global-scripts.inc
diff --git a/browser/base/content/hiddenWindow.xul b/application/basilisk/base/content/hiddenWindow.xul
index c708071cd..c708071cd 100644
--- a/browser/base/content/hiddenWindow.xul
+++ b/application/basilisk/base/content/hiddenWindow.xul
diff --git a/browser/base/content/jsConsoleOverlay.xul b/application/basilisk/base/content/jsConsoleOverlay.xul
index 1bc518d4f..1bc518d4f 100644
--- a/browser/base/content/jsConsoleOverlay.xul
+++ b/application/basilisk/base/content/jsConsoleOverlay.xul
diff --git a/browser/base/content/macBrowserOverlay.xul b/application/basilisk/base/content/macBrowserOverlay.xul
index 4b2cb0d89..4b2cb0d89 100644
--- a/browser/base/content/macBrowserOverlay.xul
+++ b/application/basilisk/base/content/macBrowserOverlay.xul
diff --git a/browser/base/content/newtab/alternativeDefaultSites.json b/application/basilisk/base/content/newtab/alternativeDefaultSites.json
index 018d3edcc..018d3edcc 100644
--- a/browser/base/content/newtab/alternativeDefaultSites.json
+++ b/application/basilisk/base/content/newtab/alternativeDefaultSites.json
diff --git a/browser/base/content/newtab/cells.js b/application/basilisk/base/content/newtab/cells.js
index 47d4ef52d..47d4ef52d 100644
--- a/browser/base/content/newtab/cells.js
+++ b/application/basilisk/base/content/newtab/cells.js
diff --git a/browser/base/content/newtab/customize.js b/application/basilisk/base/content/newtab/customize.js
index 39724fa91..39724fa91 100644
--- a/browser/base/content/newtab/customize.js
+++ b/application/basilisk/base/content/newtab/customize.js
diff --git a/browser/base/content/newtab/drag.js b/application/basilisk/base/content/newtab/drag.js
index e3928ebd0..e3928ebd0 100644
--- a/browser/base/content/newtab/drag.js
+++ b/application/basilisk/base/content/newtab/drag.js
diff --git a/browser/base/content/newtab/dragDataHelper.js b/application/basilisk/base/content/newtab/dragDataHelper.js
index 675ff2671..675ff2671 100644
--- a/browser/base/content/newtab/dragDataHelper.js
+++ b/application/basilisk/base/content/newtab/dragDataHelper.js
diff --git a/browser/base/content/newtab/drop.js b/application/basilisk/base/content/newtab/drop.js
index 748652455..748652455 100644
--- a/browser/base/content/newtab/drop.js
+++ b/application/basilisk/base/content/newtab/drop.js
diff --git a/browser/base/content/newtab/dropPreview.js b/application/basilisk/base/content/newtab/dropPreview.js
index fd7587a35..fd7587a35 100644
--- a/browser/base/content/newtab/dropPreview.js
+++ b/application/basilisk/base/content/newtab/dropPreview.js
diff --git a/browser/base/content/newtab/dropTargetShim.js b/application/basilisk/base/content/newtab/dropTargetShim.js
index 57a97fa00..57a97fa00 100644
--- a/browser/base/content/newtab/dropTargetShim.js
+++ b/application/basilisk/base/content/newtab/dropTargetShim.js
diff --git a/browser/base/content/newtab/grid.js b/application/basilisk/base/content/newtab/grid.js
index b6f98fa17..b6f98fa17 100644
--- a/browser/base/content/newtab/grid.js
+++ b/application/basilisk/base/content/newtab/grid.js
diff --git a/browser/base/content/newtab/newTab.css b/application/basilisk/base/content/newtab/newTab.css
index 658ad2ed3..658ad2ed3 100644
--- a/browser/base/content/newtab/newTab.css
+++ b/application/basilisk/base/content/newtab/newTab.css
diff --git a/browser/base/content/newtab/newTab.inadjacent.json b/application/basilisk/base/content/newtab/newTab.inadjacent.json
index 53fb542af..53fb542af 100644
--- a/browser/base/content/newtab/newTab.inadjacent.json
+++ b/application/basilisk/base/content/newtab/newTab.inadjacent.json
diff --git a/browser/base/content/newtab/newTab.js b/application/basilisk/base/content/newtab/newTab.js
index bbd2ef39d..bbd2ef39d 100644
--- a/browser/base/content/newtab/newTab.js
+++ b/application/basilisk/base/content/newtab/newTab.js
diff --git a/browser/base/content/newtab/newTab.xhtml b/application/basilisk/base/content/newtab/newTab.xhtml
index eef51b4b2..eef51b4b2 100644
--- a/browser/base/content/newtab/newTab.xhtml
+++ b/application/basilisk/base/content/newtab/newTab.xhtml
diff --git a/browser/base/content/newtab/page.js b/application/basilisk/base/content/newtab/page.js
index f7626ced2..f7626ced2 100644
--- a/browser/base/content/newtab/page.js
+++ b/application/basilisk/base/content/newtab/page.js
diff --git a/browser/base/content/newtab/search.js b/application/basilisk/base/content/newtab/search.js
index cbbb6e243..cbbb6e243 100644
--- a/browser/base/content/newtab/search.js
+++ b/application/basilisk/base/content/newtab/search.js
diff --git a/browser/base/content/newtab/sites.js b/application/basilisk/base/content/newtab/sites.js
index 9d103ce9b..9d103ce9b 100644
--- a/browser/base/content/newtab/sites.js
+++ b/application/basilisk/base/content/newtab/sites.js
diff --git a/browser/base/content/newtab/transformations.js b/application/basilisk/base/content/newtab/transformations.js
index f7db0ad84..f7db0ad84 100644
--- a/browser/base/content/newtab/transformations.js
+++ b/application/basilisk/base/content/newtab/transformations.js
diff --git a/browser/base/content/newtab/undo.js b/application/basilisk/base/content/newtab/undo.js
index b856914d2..b856914d2 100644
--- a/browser/base/content/newtab/undo.js
+++ b/application/basilisk/base/content/newtab/undo.js
diff --git a/browser/base/content/newtab/updater.js b/application/basilisk/base/content/newtab/updater.js
index 2bab74d70..2bab74d70 100644
--- a/browser/base/content/newtab/updater.js
+++ b/application/basilisk/base/content/newtab/updater.js
diff --git a/browser/base/content/nsContextMenu.js b/application/basilisk/base/content/nsContextMenu.js
index 097caf367..097caf367 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/application/basilisk/base/content/nsContextMenu.js
diff --git a/browser/base/content/overrides/app-license.html b/application/basilisk/base/content/overrides/app-license.html
index 0a1f0d8f5..0a1f0d8f5 100644
--- a/browser/base/content/overrides/app-license.html
+++ b/application/basilisk/base/content/overrides/app-license.html
diff --git a/browser/base/content/pageinfo/feeds.js b/application/basilisk/base/content/pageinfo/feeds.js
index c9731b4ef..c9731b4ef 100644
--- a/browser/base/content/pageinfo/feeds.js
+++ b/application/basilisk/base/content/pageinfo/feeds.js
diff --git a/browser/base/content/pageinfo/feeds.xml b/application/basilisk/base/content/pageinfo/feeds.xml
index 782c05a73..782c05a73 100644
--- a/browser/base/content/pageinfo/feeds.xml
+++ b/application/basilisk/base/content/pageinfo/feeds.xml
diff --git a/browser/base/content/pageinfo/pageInfo.css b/application/basilisk/base/content/pageinfo/pageInfo.css
index 622b56bb5..622b56bb5 100644
--- a/browser/base/content/pageinfo/pageInfo.css
+++ b/application/basilisk/base/content/pageinfo/pageInfo.css
diff --git a/browser/base/content/pageinfo/pageInfo.js b/application/basilisk/base/content/pageinfo/pageInfo.js
index 7a6d0a063..7a6d0a063 100644
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/application/basilisk/base/content/pageinfo/pageInfo.js
diff --git a/browser/base/content/pageinfo/pageInfo.xml b/application/basilisk/base/content/pageinfo/pageInfo.xml
index 62c699bf2..62c699bf2 100644
--- a/browser/base/content/pageinfo/pageInfo.xml
+++ b/application/basilisk/base/content/pageinfo/pageInfo.xml
diff --git a/browser/base/content/pageinfo/pageInfo.xul b/application/basilisk/base/content/pageinfo/pageInfo.xul
index 8352a8aa7..8352a8aa7 100644
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/application/basilisk/base/content/pageinfo/pageInfo.xul
diff --git a/browser/base/content/pageinfo/permissions.js b/application/basilisk/base/content/pageinfo/permissions.js
index 0e6b9cba1..0e6b9cba1 100644
--- a/browser/base/content/pageinfo/permissions.js
+++ b/application/basilisk/base/content/pageinfo/permissions.js
diff --git a/browser/base/content/pageinfo/security.js b/application/basilisk/base/content/pageinfo/security.js
index 5295a8fe6..5295a8fe6 100644
--- a/browser/base/content/pageinfo/security.js
+++ b/application/basilisk/base/content/pageinfo/security.js
diff --git a/browser/base/content/popup-notifications.inc b/application/basilisk/base/content/popup-notifications.inc
index bdc2d0bd3..bdc2d0bd3 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/application/basilisk/base/content/popup-notifications.inc
diff --git a/browser/base/content/report-phishing-overlay.xul b/application/basilisk/base/content/report-phishing-overlay.xul
index 712079f82..712079f82 100644
--- a/browser/base/content/report-phishing-overlay.xul
+++ b/application/basilisk/base/content/report-phishing-overlay.xul
diff --git a/browser/base/content/safeMode.css b/application/basilisk/base/content/safeMode.css
index 4f093a452..4f093a452 100644
--- a/browser/base/content/safeMode.css
+++ b/application/basilisk/base/content/safeMode.css
diff --git a/browser/base/content/safeMode.js b/application/basilisk/base/content/safeMode.js
index 7f34c2c58..7f34c2c58 100644
--- a/browser/base/content/safeMode.js
+++ b/application/basilisk/base/content/safeMode.js
diff --git a/browser/base/content/safeMode.xul b/application/basilisk/base/content/safeMode.xul
index a94de5fba..a94de5fba 100644
--- a/browser/base/content/safeMode.xul
+++ b/application/basilisk/base/content/safeMode.xul
diff --git a/browser/base/content/sanitize.js b/application/basilisk/base/content/sanitize.js
index 841376580..841376580 100644
--- a/browser/base/content/sanitize.js
+++ b/application/basilisk/base/content/sanitize.js
diff --git a/browser/base/content/sanitize.xul b/application/basilisk/base/content/sanitize.xul
index c00c6cda7..c00c6cda7 100644
--- a/browser/base/content/sanitize.xul
+++ b/application/basilisk/base/content/sanitize.xul
diff --git a/browser/base/content/sanitizeDialog.css b/application/basilisk/base/content/sanitizeDialog.css
index a7c17f094..a7c17f094 100644
--- a/browser/base/content/sanitizeDialog.css
+++ b/application/basilisk/base/content/sanitizeDialog.css
diff --git a/browser/base/content/sanitizeDialog.js b/application/basilisk/base/content/sanitizeDialog.js
index 279f1efd6..279f1efd6 100644
--- a/browser/base/content/sanitizeDialog.js
+++ b/application/basilisk/base/content/sanitizeDialog.js
diff --git a/browser/base/content/softwareUpdateOverlay.xul b/application/basilisk/base/content/softwareUpdateOverlay.xul
index 01170e46c..01170e46c 100644
--- a/browser/base/content/softwareUpdateOverlay.xul
+++ b/application/basilisk/base/content/softwareUpdateOverlay.xul
diff --git a/browser/base/content/sync/aboutSyncTabs-bindings.xml b/application/basilisk/base/content/sync/aboutSyncTabs-bindings.xml
index e6108209a..e6108209a 100644
--- a/browser/base/content/sync/aboutSyncTabs-bindings.xml
+++ b/application/basilisk/base/content/sync/aboutSyncTabs-bindings.xml
diff --git a/browser/base/content/sync/aboutSyncTabs.css b/application/basilisk/base/content/sync/aboutSyncTabs.css
index 5a353175b..5a353175b 100644
--- a/browser/base/content/sync/aboutSyncTabs.css
+++ b/application/basilisk/base/content/sync/aboutSyncTabs.css
diff --git a/browser/base/content/sync/aboutSyncTabs.js b/application/basilisk/base/content/sync/aboutSyncTabs.js
index f4bb607ea..f4bb607ea 100644
--- a/browser/base/content/sync/aboutSyncTabs.js
+++ b/application/basilisk/base/content/sync/aboutSyncTabs.js
diff --git a/browser/base/content/sync/aboutSyncTabs.xul b/application/basilisk/base/content/sync/aboutSyncTabs.xul
index a4aa0032f..a4aa0032f 100644
--- a/browser/base/content/sync/aboutSyncTabs.xul
+++ b/application/basilisk/base/content/sync/aboutSyncTabs.xul
diff --git a/browser/base/content/sync/addDevice.js b/application/basilisk/base/content/sync/addDevice.js
index 0390d4397..0390d4397 100644
--- a/browser/base/content/sync/addDevice.js
+++ b/application/basilisk/base/content/sync/addDevice.js
diff --git a/browser/base/content/sync/addDevice.xul b/application/basilisk/base/content/sync/addDevice.xul
index 83c3b7b3c..83c3b7b3c 100644
--- a/browser/base/content/sync/addDevice.xul
+++ b/application/basilisk/base/content/sync/addDevice.xul
diff --git a/browser/base/content/sync/customize.css b/application/basilisk/base/content/sync/customize.css
index 2bb62595d..2bb62595d 100644
--- a/browser/base/content/sync/customize.css
+++ b/application/basilisk/base/content/sync/customize.css
diff --git a/browser/base/content/sync/customize.js b/application/basilisk/base/content/sync/customize.js
index f431ac58c..f431ac58c 100644
--- a/browser/base/content/sync/customize.js
+++ b/application/basilisk/base/content/sync/customize.js
diff --git a/browser/base/content/sync/customize.xul b/application/basilisk/base/content/sync/customize.xul
index 827edf565..827edf565 100644
--- a/browser/base/content/sync/customize.xul
+++ b/application/basilisk/base/content/sync/customize.xul
diff --git a/browser/base/content/sync/genericChange.js b/application/basilisk/base/content/sync/genericChange.js
index 51a74f1b1..51a74f1b1 100644
--- a/browser/base/content/sync/genericChange.js
+++ b/application/basilisk/base/content/sync/genericChange.js
diff --git a/browser/base/content/sync/genericChange.xul b/application/basilisk/base/content/sync/genericChange.xul
index db74a1b31..db74a1b31 100644
--- a/browser/base/content/sync/genericChange.xul
+++ b/application/basilisk/base/content/sync/genericChange.xul
diff --git a/browser/base/content/sync/key.xhtml b/application/basilisk/base/content/sync/key.xhtml
index 1363132e7..1363132e7 100644
--- a/browser/base/content/sync/key.xhtml
+++ b/application/basilisk/base/content/sync/key.xhtml
diff --git a/browser/base/content/sync/setup.js b/application/basilisk/base/content/sync/setup.js
index f9dae1bd4..f9dae1bd4 100644
--- a/browser/base/content/sync/setup.js
+++ b/application/basilisk/base/content/sync/setup.js
diff --git a/browser/base/content/sync/setup.xul b/application/basilisk/base/content/sync/setup.xul
index 11c085931..11c085931 100644
--- a/browser/base/content/sync/setup.xul
+++ b/application/basilisk/base/content/sync/setup.xul
diff --git a/browser/base/content/sync/utils.js b/application/basilisk/base/content/sync/utils.js
index 92981f7b4..92981f7b4 100644
--- a/browser/base/content/sync/utils.js
+++ b/application/basilisk/base/content/sync/utils.js
diff --git a/browser/base/content/tab-content.js b/application/basilisk/base/content/tab-content.js
index a57dc6607..11a9fabce 100644
--- a/browser/base/content/tab-content.js
+++ b/application/basilisk/base/content/tab-content.js
@@ -226,8 +226,6 @@ var AboutPrivateBrowsingListener = {
                                   false, true);
     chromeGlobal.addEventListener("AboutPrivateBrowsingToggleTrackingProtection", this,
                                   false, true);
-    chromeGlobal.addEventListener("AboutPrivateBrowsingDontShowIntroPanelAgain", this,
-                                  false, true);
   },
 
   get isAboutPrivateBrowsing() {
@@ -245,9 +243,6 @@ var AboutPrivateBrowsingListener = {
       case "AboutPrivateBrowsingToggleTrackingProtection":
         sendAsyncMessage("AboutPrivateBrowsing:ToggleTrackingProtection");
         break;
-      case "AboutPrivateBrowsingDontShowIntroPanelAgain":
-        sendAsyncMessage("AboutPrivateBrowsing:DontShowIntroPanelAgain");
-        break;
     }
   },
 };
diff --git a/browser/base/content/tab-shape.inc.svg b/application/basilisk/base/content/tab-shape.inc.svg
index f97889389..f97889389 100644
--- a/browser/base/content/tab-shape.inc.svg
+++ b/application/basilisk/base/content/tab-shape.inc.svg
diff --git a/browser/base/content/tabbrowser.css b/application/basilisk/base/content/tabbrowser.css
index 9085304f6..9085304f6 100644
--- a/browser/base/content/tabbrowser.css
+++ b/application/basilisk/base/content/tabbrowser.css
diff --git a/browser/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index 463e74a52..463e74a52 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
diff --git a/browser/base/content/urlbarBindings.xml b/application/basilisk/base/content/urlbarBindings.xml
index eb3150581..eb3150581 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/application/basilisk/base/content/urlbarBindings.xml
diff --git a/browser/base/content/usercontext.svg b/application/basilisk/base/content/usercontext.svg
index 705f80bfd..705f80bfd 100644
--- a/browser/base/content/usercontext.svg
+++ b/application/basilisk/base/content/usercontext.svg
diff --git a/browser/base/content/utilityOverlay.js b/application/basilisk/base/content/utilityOverlay.js
index 4ea6d8f90..38ca82f55 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/application/basilisk/base/content/utilityOverlay.js
@@ -809,13 +809,6 @@ function openFeedbackPage()
   openUILinkIn(url, "tab");
 }
 
-function openTourPage()
-{
-  let scope = {}
-  Components.utils.import("resource:///modules/UITour.jsm", scope);
-  openUILinkIn(scope.UITour.url, "tab");
-}
-
 function buildHelpMenu()
 {
   // Enable/disable the "Report Web Forgery" menu item.
diff --git a/browser/base/content/viewSourceOverlay.xul b/application/basilisk/base/content/viewSourceOverlay.xul
index 8b40ddfd2..8b40ddfd2 100644
--- a/browser/base/content/viewSourceOverlay.xul
+++ b/application/basilisk/base/content/viewSourceOverlay.xul
diff --git a/browser/base/content/web-panels.js b/application/basilisk/base/content/web-panels.js
index 3a64b92a0..3a64b92a0 100644
--- a/browser/base/content/web-panels.js
+++ b/application/basilisk/base/content/web-panels.js
diff --git a/browser/base/content/web-panels.xul b/application/basilisk/base/content/web-panels.xul
index 223b20ed7..223b20ed7 100644
--- a/browser/base/content/web-panels.xul
+++ b/application/basilisk/base/content/web-panels.xul
diff --git a/browser/base/content/webrtcIndicator.js b/application/basilisk/base/content/webrtcIndicator.js
index 301607031..301607031 100644
--- a/browser/base/content/webrtcIndicator.js
+++ b/application/basilisk/base/content/webrtcIndicator.js
diff --git a/browser/base/content/webrtcIndicator.xul b/application/basilisk/base/content/webrtcIndicator.xul
index 9208dc814..9208dc814 100644
--- a/browser/base/content/webrtcIndicator.xul
+++ b/application/basilisk/base/content/webrtcIndicator.xul
diff --git a/browser/base/jar.mn b/application/basilisk/base/jar.mn
index 5ec92d79a..5ec92d79a 100644
--- a/browser/base/jar.mn
+++ b/application/basilisk/base/jar.mn
diff --git a/browser/base/moz.build b/application/basilisk/base/moz.build
index b21c0ac29..b21c0ac29 100644
--- a/browser/base/moz.build
+++ b/application/basilisk/base/moz.build
diff --git a/browser/branding/official/LICENSE b/application/basilisk/branding/official/LICENSE
index 8833fe212..8833fe212 100644
--- a/browser/branding/official/LICENSE
+++ b/application/basilisk/branding/official/LICENSE
diff --git a/browser/branding/official/VisualElements_150.png b/application/basilisk/branding/official/VisualElements_150.png
index 70b256398..70b256398 100644
--- a/browser/branding/official/VisualElements_150.png
+++ b/application/basilisk/branding/official/VisualElements_150.png
diff --git a/browser/branding/official/VisualElements_70.png b/application/basilisk/branding/official/VisualElements_70.png
index 64ce3276d..64ce3276d 100644
--- a/browser/branding/official/VisualElements_70.png
+++ b/application/basilisk/branding/official/VisualElements_70.png
diff --git a/browser/branding/official/appname.bmp b/application/basilisk/branding/official/appname.bmp
index 1c2f44cf3..1c2f44cf3 100644
--- a/browser/branding/official/appname.bmp
+++ b/application/basilisk/branding/official/appname.bmp
diff --git a/browser/branding/official/background.png b/application/basilisk/branding/official/background.png
index d594986c1..d594986c1 100644
--- a/browser/branding/official/background.png
+++ b/application/basilisk/branding/official/background.png
diff --git a/browser/branding/official/basilisk.VisualElementsManifest.xml b/application/basilisk/branding/official/basilisk.VisualElementsManifest.xml
index d675d573f..d675d573f 100644
--- a/browser/branding/official/basilisk.VisualElementsManifest.xml
+++ b/application/basilisk/branding/official/basilisk.VisualElementsManifest.xml
diff --git a/browser/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi
index 58d7554df..58d7554df 100644
--- a/browser/branding/official/branding.nsi
+++ b/application/basilisk/branding/official/branding.nsi
diff --git a/browser/branding/official/configure.sh b/application/basilisk/branding/official/configure.sh
index 49126c4aa..49126c4aa 100644
--- a/browser/branding/official/configure.sh
+++ b/application/basilisk/branding/official/configure.sh
diff --git a/browser/branding/official/content/about-logo.png b/application/basilisk/branding/official/content/about-logo.png
index a6c89cf2c..a6c89cf2c 100644
--- a/browser/branding/official/content/about-logo.png
+++ b/application/basilisk/branding/official/content/about-logo.png
diff --git a/browser/branding/official/content/about-logo@2x.png b/application/basilisk/branding/official/content/about-logo@2x.png
index 761e47f6e..761e47f6e 100644
--- a/browser/branding/official/content/about-logo@2x.png
+++ b/application/basilisk/branding/official/content/about-logo@2x.png
diff --git a/browser/branding/official/content/about-wordmark.png b/application/basilisk/branding/official/content/about-wordmark.png
index 4ac8d3557..4ac8d3557 100644
--- a/browser/branding/official/content/about-wordmark.png
+++ b/application/basilisk/branding/official/content/about-wordmark.png
diff --git a/browser/branding/official/content/about.png b/application/basilisk/branding/official/content/about.png
index 4fc6e5c36..4fc6e5c36 100644
--- a/browser/branding/official/content/about.png
+++ b/application/basilisk/branding/official/content/about.png
diff --git a/browser/branding/official/content/aboutDialog.css b/application/basilisk/branding/official/content/aboutDialog.css
index 631f06a72..631f06a72 100644
--- a/browser/branding/official/content/aboutDialog.css
+++ b/application/basilisk/branding/official/content/aboutDialog.css
diff --git a/browser/branding/official/content/icon48.png b/application/basilisk/branding/official/content/icon48.png
index e7dcd8ae2..e7dcd8ae2 100644
--- a/browser/branding/official/content/icon48.png
+++ b/application/basilisk/branding/official/content/icon48.png
diff --git a/browser/branding/official/content/icon64.png b/application/basilisk/branding/official/content/icon64.png
index 7bad34f8b..7bad34f8b 100644
--- a/browser/branding/official/content/icon64.png
+++ b/application/basilisk/branding/official/content/icon64.png
diff --git a/browser/branding/official/content/identity-icons-brand.svg b/application/basilisk/branding/official/content/identity-icons-brand.svg
index 80d2155c2..80d2155c2 100644
--- a/browser/branding/official/content/identity-icons-brand.svg
+++ b/application/basilisk/branding/official/content/identity-icons-brand.svg
diff --git a/browser/branding/official/content/jar.mn b/application/basilisk/branding/official/content/jar.mn
index 4b8c5fc9d..4b8c5fc9d 100644
--- a/browser/branding/official/content/jar.mn
+++ b/application/basilisk/branding/official/content/jar.mn
diff --git a/browser/branding/official/content/moz.build b/application/basilisk/branding/official/content/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/branding/official/content/moz.build
+++ b/application/basilisk/branding/official/content/moz.build
diff --git a/browser/branding/official/content/silhouette-40.svg b/application/basilisk/branding/official/content/silhouette-40.svg
index c00a38cb1..c00a38cb1 100644
--- a/browser/branding/official/content/silhouette-40.svg
+++ b/application/basilisk/branding/official/content/silhouette-40.svg
diff --git a/browser/branding/official/default16.png b/application/basilisk/branding/official/default16.png
index 6618c0667..6618c0667 100644
--- a/browser/branding/official/default16.png
+++ b/application/basilisk/branding/official/default16.png
diff --git a/browser/branding/official/default22.png b/application/basilisk/branding/official/default22.png
index d53d5b503..d53d5b503 100644
--- a/browser/branding/official/default22.png
+++ b/application/basilisk/branding/official/default22.png
diff --git a/browser/branding/official/default24.png b/application/basilisk/branding/official/default24.png
index 1e86c0cdd..1e86c0cdd 100644
--- a/browser/branding/official/default24.png
+++ b/application/basilisk/branding/official/default24.png
diff --git a/browser/branding/official/default256.png b/application/basilisk/branding/official/default256.png
index 96f72ae15..96f72ae15 100644
--- a/browser/branding/official/default256.png
+++ b/application/basilisk/branding/official/default256.png
diff --git a/browser/branding/official/default32.png b/application/basilisk/branding/official/default32.png
index ac39ccf0d..ac39ccf0d 100644
--- a/browser/branding/official/default32.png
+++ b/application/basilisk/branding/official/default32.png
diff --git a/browser/branding/official/default48.png b/application/basilisk/branding/official/default48.png
index e7dcd8ae2..e7dcd8ae2 100644
--- a/browser/branding/official/default48.png
+++ b/application/basilisk/branding/official/default48.png
diff --git a/browser/branding/official/default64.png b/application/basilisk/branding/official/default64.png
index 7bad34f8b..7bad34f8b 100644
--- a/browser/branding/official/default64.png
+++ b/application/basilisk/branding/official/default64.png
diff --git a/browser/branding/official/disk.icns b/application/basilisk/branding/official/disk.icns
index 82fdccff8..82fdccff8 100644
--- a/browser/branding/official/disk.icns
+++ b/application/basilisk/branding/official/disk.icns
diff --git a/browser/branding/official/document.icns b/application/basilisk/branding/official/document.icns
index 5f03305d7..5f03305d7 100644
--- a/browser/branding/official/document.icns
+++ b/application/basilisk/branding/official/document.icns
diff --git a/browser/branding/official/document.ico b/application/basilisk/branding/official/document.ico
index 525b1a929..525b1a929 100644
--- a/browser/branding/official/document.ico
+++ b/application/basilisk/branding/official/document.ico
diff --git a/browser/branding/official/firefox.icns b/application/basilisk/branding/official/firefox.icns
index 4d2ad5a04..4d2ad5a04 100644
--- a/browser/branding/official/firefox.icns
+++ b/application/basilisk/branding/official/firefox.icns
diff --git a/browser/branding/official/firefox.ico b/application/basilisk/branding/official/firefox.ico
index 320796dd2..320796dd2 100644
--- a/browser/branding/official/firefox.ico
+++ b/application/basilisk/branding/official/firefox.ico
diff --git a/browser/branding/official/locales/browserconfig.properties b/application/basilisk/branding/official/locales/browserconfig.properties
index 06cefece3..06cefece3 100644
--- a/browser/branding/official/locales/browserconfig.properties
+++ b/application/basilisk/branding/official/locales/browserconfig.properties
diff --git a/browser/branding/official/locales/en-US/brand.dtd b/application/basilisk/branding/official/locales/en-US/brand.dtd
index 1d2ac791e..1d2ac791e 100644
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/application/basilisk/branding/official/locales/en-US/brand.dtd
diff --git a/browser/branding/official/locales/en-US/brand.properties b/application/basilisk/branding/official/locales/en-US/brand.properties
index 9bdb66706..9bdb66706 100644
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/application/basilisk/branding/official/locales/en-US/brand.properties
diff --git a/browser/branding/official/locales/jar.mn b/application/basilisk/branding/official/locales/jar.mn
index 9fdfe578b..9fdfe578b 100644
--- a/browser/branding/official/locales/jar.mn
+++ b/application/basilisk/branding/official/locales/jar.mn
diff --git a/browser/branding/official/locales/moz.build b/application/basilisk/branding/official/locales/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/branding/official/locales/moz.build
+++ b/application/basilisk/branding/official/locales/moz.build
diff --git a/browser/branding/official/moz.build b/application/basilisk/branding/official/moz.build
index e3b7fd1ab..e3b7fd1ab 100644
--- a/browser/branding/official/moz.build
+++ b/application/basilisk/branding/official/moz.build
diff --git a/browser/branding/official/mozicon128.png b/application/basilisk/branding/official/mozicon128.png
index 0de78e0ce..0de78e0ce 100644
--- a/browser/branding/official/mozicon128.png
+++ b/application/basilisk/branding/official/mozicon128.png
diff --git a/browser/branding/official/pref/firefox-branding.js b/application/basilisk/branding/official/pref/firefox-branding.js
index 190b84e78..190b84e78 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/application/basilisk/branding/official/pref/firefox-branding.js
diff --git a/browser/branding/official/wizHeader.bmp b/application/basilisk/branding/official/wizHeader.bmp
index 8f1a0598b..8f1a0598b 100644
--- a/browser/branding/official/wizHeader.bmp
+++ b/application/basilisk/branding/official/wizHeader.bmp
diff --git a/browser/branding/official/wizHeaderRTL.bmp b/application/basilisk/branding/official/wizHeaderRTL.bmp
index 8f1a0598b..8f1a0598b 100644
--- a/browser/branding/official/wizHeaderRTL.bmp
+++ b/application/basilisk/branding/official/wizHeaderRTL.bmp
diff --git a/browser/branding/official/wizWatermark.bmp b/application/basilisk/branding/official/wizWatermark.bmp
index 491f27aa5..491f27aa5 100644
--- a/browser/branding/official/wizWatermark.bmp
+++ b/application/basilisk/branding/official/wizWatermark.bmp
diff --git a/browser/branding/shared/branding.mozbuild b/application/basilisk/branding/shared/branding.mozbuild
index e6fee3f4e..e6fee3f4e 100644
--- a/browser/branding/shared/branding.mozbuild
+++ b/application/basilisk/branding/shared/branding.mozbuild
diff --git a/browser/branding/shared/dsstore b/application/basilisk/branding/shared/dsstore
index 8ea703674..8ea703674 100644
--- a/browser/branding/shared/dsstore
+++ b/application/basilisk/branding/shared/dsstore
diff --git a/browser/branding/shared/newtab.ico b/application/basilisk/branding/shared/newtab.ico
index a9b37c08c..a9b37c08c 100644
--- a/browser/branding/shared/newtab.ico
+++ b/application/basilisk/branding/shared/newtab.ico
diff --git a/browser/branding/shared/newwindow.ico b/application/basilisk/branding/shared/newwindow.ico
index 553720771..553720771 100644
--- a/browser/branding/shared/newwindow.ico
+++ b/application/basilisk/branding/shared/newwindow.ico
diff --git a/browser/branding/shared/pbmode.ico b/application/basilisk/branding/shared/pbmode.ico
index 47677c13f..47677c13f 100644
--- a/browser/branding/shared/pbmode.ico
+++ b/application/basilisk/branding/shared/pbmode.ico
diff --git a/browser/branding/shared/preferences.inc b/application/basilisk/branding/shared/preferences.inc
index e1b8d3be6..e1b8d3be6 100644
--- a/browser/branding/shared/preferences.inc
+++ b/application/basilisk/branding/shared/preferences.inc
diff --git a/browser/branding/shared/uaoverrides.inc b/application/basilisk/branding/shared/uaoverrides.inc
index f7f7fafa3..f7f7fafa3 100644
--- a/browser/branding/shared/uaoverrides.inc
+++ b/application/basilisk/branding/shared/uaoverrides.inc
diff --git a/browser/branding/unofficial/LICENSE b/application/basilisk/branding/unofficial/LICENSE
index 35dec1819..35dec1819 100644
--- a/browser/branding/unofficial/LICENSE
+++ b/application/basilisk/branding/unofficial/LICENSE
diff --git a/browser/branding/unofficial/VisualElements_150.png b/application/basilisk/branding/unofficial/VisualElements_150.png
index eb74e4adc..eb74e4adc 100644
--- a/browser/branding/unofficial/VisualElements_150.png
+++ b/application/basilisk/branding/unofficial/VisualElements_150.png
diff --git a/browser/branding/unofficial/VisualElements_70.png b/application/basilisk/branding/unofficial/VisualElements_70.png
index 571532a9b..571532a9b 100644
--- a/browser/branding/unofficial/VisualElements_70.png
+++ b/application/basilisk/branding/unofficial/VisualElements_70.png
diff --git a/browser/branding/unofficial/appname.bmp b/application/basilisk/branding/unofficial/appname.bmp
index 1ee08c944..1ee08c944 100644
--- a/browser/branding/unofficial/appname.bmp
+++ b/application/basilisk/branding/unofficial/appname.bmp
diff --git a/browser/branding/unofficial/background.png b/application/basilisk/branding/unofficial/background.png
index 3fa4a0ec7..3fa4a0ec7 100644
--- a/browser/branding/unofficial/background.png
+++ b/application/basilisk/branding/unofficial/background.png
diff --git a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml b/application/basilisk/branding/unofficial/basilisk.VisualElementsManifest.xml
index 5046ee7da..5046ee7da 100644
--- a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml
+++ b/application/basilisk/branding/unofficial/basilisk.VisualElementsManifest.xml
diff --git a/browser/branding/unofficial/branding.nsi b/application/basilisk/branding/unofficial/branding.nsi
index 77f08a4cb..77f08a4cb 100644
--- a/browser/branding/unofficial/branding.nsi
+++ b/application/basilisk/branding/unofficial/branding.nsi
diff --git a/browser/branding/unofficial/configure.sh b/application/basilisk/branding/unofficial/configure.sh
index ea4e37e45..ea4e37e45 100644
--- a/browser/branding/unofficial/configure.sh
+++ b/application/basilisk/branding/unofficial/configure.sh
diff --git a/browser/branding/unofficial/content/about-background.png b/application/basilisk/branding/unofficial/content/about-background.png
index e36211b08..e36211b08 100644
--- a/browser/branding/unofficial/content/about-background.png
+++ b/application/basilisk/branding/unofficial/content/about-background.png
diff --git a/browser/branding/unofficial/content/about-logo.png b/application/basilisk/branding/unofficial/content/about-logo.png
index c5a838178..c5a838178 100644
--- a/browser/branding/unofficial/content/about-logo.png
+++ b/application/basilisk/branding/unofficial/content/about-logo.png
diff --git a/browser/branding/unofficial/content/about-logo@2x.png b/application/basilisk/branding/unofficial/content/about-logo@2x.png
index 48c31564c..48c31564c 100644
--- a/browser/branding/unofficial/content/about-logo@2x.png
+++ b/application/basilisk/branding/unofficial/content/about-logo@2x.png
diff --git a/browser/branding/unofficial/content/about-wordmark.svg b/application/basilisk/branding/unofficial/content/about-wordmark.svg
index ce7a5c07b..ce7a5c07b 100644
--- a/browser/branding/unofficial/content/about-wordmark.svg
+++ b/application/basilisk/branding/unofficial/content/about-wordmark.svg
diff --git a/browser/branding/unofficial/content/about.png b/application/basilisk/branding/unofficial/content/about.png
index e323c8df5..e323c8df5 100644
--- a/browser/branding/unofficial/content/about.png
+++ b/application/basilisk/branding/unofficial/content/about.png
diff --git a/browser/branding/unofficial/content/aboutDialog.css b/application/basilisk/branding/unofficial/content/aboutDialog.css
index be7fdcab6..be7fdcab6 100644
--- a/browser/branding/unofficial/content/aboutDialog.css
+++ b/application/basilisk/branding/unofficial/content/aboutDialog.css
diff --git a/browser/branding/unofficial/content/icon48.png b/application/basilisk/branding/unofficial/content/icon48.png
index 16e022a64..16e022a64 100644
--- a/browser/branding/unofficial/content/icon48.png
+++ b/application/basilisk/branding/unofficial/content/icon48.png
diff --git a/browser/branding/unofficial/content/icon64.png b/application/basilisk/branding/unofficial/content/icon64.png
index 9860917e3..9860917e3 100644
--- a/browser/branding/unofficial/content/icon64.png
+++ b/application/basilisk/branding/unofficial/content/icon64.png
diff --git a/browser/branding/unofficial/content/identity-icons-brand.svg b/application/basilisk/branding/unofficial/content/identity-icons-brand.svg
index 6c33113e5..6c33113e5 100644
--- a/browser/branding/unofficial/content/identity-icons-brand.svg
+++ b/application/basilisk/branding/unofficial/content/identity-icons-brand.svg
diff --git a/browser/branding/unofficial/content/jar.mn b/application/basilisk/branding/unofficial/content/jar.mn
index 140359a19..140359a19 100644
--- a/browser/branding/unofficial/content/jar.mn
+++ b/application/basilisk/branding/unofficial/content/jar.mn
diff --git a/browser/branding/unofficial/content/moz.build b/application/basilisk/branding/unofficial/content/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/branding/unofficial/content/moz.build
+++ b/application/basilisk/branding/unofficial/content/moz.build
diff --git a/browser/branding/unofficial/content/silhouette-40.svg b/application/basilisk/branding/unofficial/content/silhouette-40.svg
index bef723b59..bef723b59 100644
--- a/browser/branding/unofficial/content/silhouette-40.svg
+++ b/application/basilisk/branding/unofficial/content/silhouette-40.svg
diff --git a/browser/branding/unofficial/default16.png b/application/basilisk/branding/unofficial/default16.png
index 67ef39df8..67ef39df8 100644
--- a/browser/branding/unofficial/default16.png
+++ b/application/basilisk/branding/unofficial/default16.png
diff --git a/browser/branding/unofficial/default32.png b/application/basilisk/branding/unofficial/default32.png
index 2f709e6b2..2f709e6b2 100644
--- a/browser/branding/unofficial/default32.png
+++ b/application/basilisk/branding/unofficial/default32.png
diff --git a/browser/branding/unofficial/default48.png b/application/basilisk/branding/unofficial/default48.png
index 02a1e14c1..02a1e14c1 100644
--- a/browser/branding/unofficial/default48.png
+++ b/application/basilisk/branding/unofficial/default48.png
diff --git a/browser/branding/unofficial/disk.icns b/application/basilisk/branding/unofficial/disk.icns
index 718f1a3d3..718f1a3d3 100644
--- a/browser/branding/unofficial/disk.icns
+++ b/application/basilisk/branding/unofficial/disk.icns
diff --git a/browser/branding/unofficial/document.icns b/application/basilisk/branding/unofficial/document.icns
index ff419f2f7..ff419f2f7 100644
--- a/browser/branding/unofficial/document.icns
+++ b/application/basilisk/branding/unofficial/document.icns
diff --git a/browser/branding/unofficial/document.ico b/application/basilisk/branding/unofficial/document.ico
index 584a0a1bf..584a0a1bf 100644
--- a/browser/branding/unofficial/document.ico
+++ b/application/basilisk/branding/unofficial/document.ico
diff --git a/browser/branding/unofficial/dsstore b/application/basilisk/branding/unofficial/dsstore
index 2d11482a7..2d11482a7 100644
--- a/browser/branding/unofficial/dsstore
+++ b/application/basilisk/branding/unofficial/dsstore
diff --git a/browser/branding/unofficial/firefox.icns b/application/basilisk/branding/unofficial/firefox.icns
index 2c613634b..2c613634b 100644
--- a/browser/branding/unofficial/firefox.icns
+++ b/application/basilisk/branding/unofficial/firefox.icns
diff --git a/browser/branding/unofficial/firefox.ico b/application/basilisk/branding/unofficial/firefox.ico
index 0c7acb61b..0c7acb61b 100644
--- a/browser/branding/unofficial/firefox.ico
+++ b/application/basilisk/branding/unofficial/firefox.ico
diff --git a/browser/branding/unofficial/locales/browserconfig.properties b/application/basilisk/branding/unofficial/locales/browserconfig.properties
index 06cefece3..06cefece3 100644
--- a/browser/branding/unofficial/locales/browserconfig.properties
+++ b/application/basilisk/branding/unofficial/locales/browserconfig.properties
diff --git a/browser/branding/unofficial/locales/en-US/brand.dtd b/application/basilisk/branding/unofficial/locales/en-US/brand.dtd
index 17c243606..17c243606 100644
--- a/browser/branding/unofficial/locales/en-US/brand.dtd
+++ b/application/basilisk/branding/unofficial/locales/en-US/brand.dtd
diff --git a/browser/branding/unofficial/locales/en-US/brand.properties b/application/basilisk/branding/unofficial/locales/en-US/brand.properties
index 80349f0e3..80349f0e3 100644
--- a/browser/branding/unofficial/locales/en-US/brand.properties
+++ b/application/basilisk/branding/unofficial/locales/en-US/brand.properties
diff --git a/browser/branding/unofficial/locales/jar.mn b/application/basilisk/branding/unofficial/locales/jar.mn
index 8515d5cc0..8515d5cc0 100644
--- a/browser/branding/unofficial/locales/jar.mn
+++ b/application/basilisk/branding/unofficial/locales/jar.mn
diff --git a/browser/branding/unofficial/locales/moz.build b/application/basilisk/branding/unofficial/locales/moz.build
index 8bad13124..8bad13124 100644
--- a/browser/branding/unofficial/locales/moz.build
+++ b/application/basilisk/branding/unofficial/locales/moz.build
diff --git a/browser/branding/unofficial/moz.build b/application/basilisk/branding/unofficial/moz.build
index 0d829fa5e..0d829fa5e 100644
--- a/browser/branding/unofficial/moz.build
+++ b/application/basilisk/branding/unofficial/moz.build
diff --git a/browser/branding/unofficial/mozicon128.png b/application/basilisk/branding/unofficial/mozicon128.png
index 739b61084..739b61084 100644
--- a/browser/branding/unofficial/mozicon128.png
+++ b/application/basilisk/branding/unofficial/mozicon128.png
diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/application/basilisk/branding/unofficial/pref/firefox-branding.js
index a5b617a53..a5b617a53 100644
--- a/browser/branding/unofficial/pref/firefox-branding.js
+++ b/application/basilisk/branding/unofficial/pref/firefox-branding.js
diff --git a/browser/branding/unofficial/wizHeader.bmp b/application/basilisk/branding/unofficial/wizHeader.bmp
index f67b45239..f67b45239 100644
--- a/browser/branding/unofficial/wizHeader.bmp
+++ b/application/basilisk/branding/unofficial/wizHeader.bmp
diff --git a/browser/branding/unofficial/wizHeaderRTL.bmp b/application/basilisk/branding/unofficial/wizHeaderRTL.bmp
index 7c57e461b..7c57e461b 100644
--- a/browser/branding/unofficial/wizHeaderRTL.bmp
+++ b/application/basilisk/branding/unofficial/wizHeaderRTL.bmp
diff --git a/browser/branding/unofficial/wizWatermark.bmp b/application/basilisk/branding/unofficial/wizWatermark.bmp
index 05f0e7f9b..05f0e7f9b 100644
--- a/browser/branding/unofficial/wizWatermark.bmp
+++ b/application/basilisk/branding/unofficial/wizWatermark.bmp
diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk
new file mode 100644
index 000000000..539c57ab1
--- /dev/null
+++ b/application/basilisk/build.mk
@@ -0,0 +1,55 @@
+# 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/.
+
+installer:
+	@$(MAKE) -C application/basilisk/installer installer
+
+package:
+	@$(MAKE) -C application/basilisk/installer
+
+package-compare:
+	@$(MAKE) -C application/basilisk/installer package-compare
+
+stage-package:
+	@$(MAKE) -C application/basilisk/installer stage-package
+
+sdk:
+	@$(MAKE) -C application/basilisk/installer make-sdk
+
+install::
+	@$(MAKE) -C application/basilisk/installer install
+
+clean::
+	@$(MAKE) -C application/basilisk/installer clean
+
+distclean::
+	@$(MAKE) -C application/basilisk/installer distclean
+
+source-package::
+	@$(MAKE) -C application/basilisk/installer source-package
+
+upload::
+	@$(MAKE) -C application/basilisk/installer upload
+
+source-upload::
+	@$(MAKE) -C application/basilisk/installer source-upload
+
+hg-bundle::
+	@$(MAKE) -C application/basilisk/installer hg-bundle
+
+l10n-check::
+	@$(MAKE) -C application/basilisk/locales l10n-check
+
+ifdef ENABLE_TESTS
+# Implemented in testing/testsuite-targets.mk
+
+mochitest-browser-chrome:
+	$(RUN_MOCHITEST) --flavor=browser
+	$(CHECK_TEST_ERROR)
+
+mochitest:: mochitest-browser-chrome
+
+.PHONY: mochitest-browser-chrome
+
+endif
diff --git a/browser/components/BrowserComponents.manifest b/application/basilisk/components/BrowserComponents.manifest
index 0c80006be..0c80006be 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/application/basilisk/components/BrowserComponents.manifest
diff --git a/browser/components/about/AboutRedirector.cpp b/application/basilisk/components/about/AboutRedirector.cpp
index b77949ea7..b77949ea7 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/application/basilisk/components/about/AboutRedirector.cpp
diff --git a/browser/components/about/AboutRedirector.h b/application/basilisk/components/about/AboutRedirector.h
index 8feeb7491..8feeb7491 100644
--- a/browser/components/about/AboutRedirector.h
+++ b/application/basilisk/components/about/AboutRedirector.h
diff --git a/browser/components/about/moz.build b/application/basilisk/components/about/moz.build
index f1559c2b9..f1559c2b9 100644
--- a/browser/components/about/moz.build
+++ b/application/basilisk/components/about/moz.build
diff --git a/browser/components/build/Makefile.in b/application/basilisk/components/build/Makefile.in
index 2387227ab..2387227ab 100644
--- a/browser/components/build/Makefile.in
+++ b/application/basilisk/components/build/Makefile.in
diff --git a/browser/components/build/moz.build b/application/basilisk/components/build/moz.build
index 622cf449c..622cf449c 100644
--- a/browser/components/build/moz.build
+++ b/application/basilisk/components/build/moz.build
diff --git a/browser/components/build/nsBrowserCompsCID.h b/application/basilisk/components/build/nsBrowserCompsCID.h
index e325e43d4..e325e43d4 100644
--- a/browser/components/build/nsBrowserCompsCID.h
+++ b/application/basilisk/components/build/nsBrowserCompsCID.h
diff --git a/browser/components/build/nsModule.cpp b/application/basilisk/components/build/nsModule.cpp
index 1baccd710..1baccd710 100644
--- a/browser/components/build/nsModule.cpp
+++ b/application/basilisk/components/build/nsModule.cpp
diff --git a/browser/components/contextualidentity/content/usercontext.css b/application/basilisk/components/contextualidentity/content/usercontext.css
index 728275d9f..728275d9f 100644
--- a/browser/components/contextualidentity/content/usercontext.css
+++ b/application/basilisk/components/contextualidentity/content/usercontext.css
diff --git a/browser/components/contextualidentity/jar.mn b/application/basilisk/components/contextualidentity/jar.mn
index 848245949..848245949 100644
--- a/browser/components/contextualidentity/jar.mn
+++ b/application/basilisk/components/contextualidentity/jar.mn
diff --git a/browser/components/contextualidentity/moz.build b/application/basilisk/components/contextualidentity/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/components/contextualidentity/moz.build
+++ b/application/basilisk/components/contextualidentity/moz.build
diff --git a/browser/components/controlcenter/content/panel.inc.xul b/application/basilisk/components/controlcenter/content/panel.inc.xul
index 361b3c945..361b3c945 100644
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/application/basilisk/components/controlcenter/content/panel.inc.xul
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/application/basilisk/components/customizableui/CustomizableUI.jsm
index cb0f519b2..cb0f519b2 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/application/basilisk/components/customizableui/CustomizableUI.jsm
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/application/basilisk/components/customizableui/CustomizableWidgets.jsm
index 3e00d385f..3e00d385f 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/application/basilisk/components/customizableui/CustomizableWidgets.jsm
diff --git a/browser/components/customizableui/CustomizeMode.jsm b/application/basilisk/components/customizableui/CustomizeMode.jsm
index 49868cdbd..e63e25b0a 100644
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/application/basilisk/components/customizableui/CustomizeMode.jsm
@@ -90,7 +90,6 @@ function CustomizeMode(aWindow) {
   // to the user when in customizing mode.
   this.visiblePalette = this.document.getElementById(kPaletteId);
   this.paletteEmptyNotice = this.document.getElementById("customization-empty");
-  this.tipPanel = this.document.getElementById("customization-tipPanel");
   if (Services.prefs.getCharPref("general.skins.selectedSkin") != "classic/1.0") {
     let lwthemeButton = this.document.getElementById("customization-lwtheme-button");
     lwthemeButton.setAttribute("hidden", "true");
@@ -355,7 +354,6 @@ CustomizeMode.prototype = {
       this._updateEmptyPaletteNotice();
 
       this._updateLWThemeButtonIcon();
-      this.maybeShowTip(panelHolder);
 
       this._handler.isEnteringCustomizeMode = false;
       panelContents.removeAttribute("customize-transitioning");
@@ -400,8 +398,6 @@ CustomizeMode.prototype = {
       return;
     }
 
-    this.hideTip();
-
     this._handler.isExitingCustomizeMode = true;
 
     if (this._enableOutlinesTimeout) {
@@ -675,46 +671,6 @@ CustomizeMode.prototype = {
     return "url(\"" + aData.headerURL.replace(/"/g, '\\"') + "\")";
   },
 
-  maybeShowTip: function(aAnchor) {
-    let shown = false;
-    const kShownPref = "browser.customizemode.tip0.shown";
-    try {
-      shown = Services.prefs.getBoolPref(kShownPref);
-    } catch (ex) {}
-    if (shown)
-      return;
-
-    let anchorNode = aAnchor || this.document.getElementById("customization-panelHolder");
-    let messageNode = this.tipPanel.querySelector(".customization-tipPanel-contentMessage");
-    if (!messageNode.childElementCount) {
-      // Put the tip contents in the popup.
-      let bundle = this.document.getElementById("bundle_browser");
-      const kLabelClass = "customization-tipPanel-link";
-      messageNode.innerHTML = bundle.getFormattedString("customizeTips.tip0", [
-        "<label class=\"customization-tipPanel-em\" value=\"" +
-          bundle.getString("customizeTips.tip0.hint") + "\"/>",
-        this.document.getElementById("bundle_brand").getString("brandShortName"),
-        "<label class=\"" + kLabelClass + " text-link\" value=\"" +
-        bundle.getString("customizeTips.tip0.learnMore") + "\"/>"
-      ]);
-
-      messageNode.querySelector("." + kLabelClass).addEventListener("click", () => {
-        let url = Services.urlFormatter.formatURLPref("browser.customizemode.tip0.learnMoreUrl");
-        let browser = this.browser;
-        browser.selectedTab = browser.addTab(url);
-        this.hideTip();
-      });
-    }
-
-    this.tipPanel.hidden = false;
-    this.tipPanel.openPopup(anchorNode);
-    Services.prefs.setBoolPref(kShownPref, true);
-  },
-
-  hideTip: function() {
-    this.tipPanel.hidePopup();
-  },
-
   _getCustomizableChildForNode: function(aNode) {
     // NB: adjusted from _getCustomizableParent to keep that method fast
     // (it's used during drags), and avoid multiple DOM loops
diff --git a/browser/components/customizableui/DragPositionManager.jsm b/application/basilisk/components/customizableui/DragPositionManager.jsm
index 1b4eb59dc..1b4eb59dc 100644
--- a/browser/components/customizableui/DragPositionManager.jsm
+++ b/application/basilisk/components/customizableui/DragPositionManager.jsm
diff --git a/browser/components/customizableui/PanelWideWidgetTracker.jsm b/application/basilisk/components/customizableui/PanelWideWidgetTracker.jsm
index 768cebbca..768cebbca 100644
--- a/browser/components/customizableui/PanelWideWidgetTracker.jsm
+++ b/application/basilisk/components/customizableui/PanelWideWidgetTracker.jsm
diff --git a/browser/components/customizableui/ScrollbarSampler.jsm b/application/basilisk/components/customizableui/ScrollbarSampler.jsm
index 44736e4c4..44736e4c4 100644
--- a/browser/components/customizableui/ScrollbarSampler.jsm
+++ b/application/basilisk/components/customizableui/ScrollbarSampler.jsm
diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/application/basilisk/components/customizableui/content/customizeMode.inc.xul
index b665630a2..b665630a2 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/application/basilisk/components/customizableui/content/customizeMode.inc.xul
diff --git a/browser/components/customizableui/content/jar.mn b/application/basilisk/components/customizableui/content/jar.mn
index 05c0112cd..05c0112cd 100644
--- a/browser/components/customizableui/content/jar.mn
+++ b/application/basilisk/components/customizableui/content/jar.mn
diff --git a/browser/components/customizableui/content/moz.build b/application/basilisk/components/customizableui/content/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/components/customizableui/content/moz.build
+++ b/application/basilisk/components/customizableui/content/moz.build
diff --git a/browser/components/customizableui/content/panelUI.css b/application/basilisk/components/customizableui/content/panelUI.css
index ba44636f1..ba44636f1 100644
--- a/browser/components/customizableui/content/panelUI.css
+++ b/application/basilisk/components/customizableui/content/panelUI.css
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/application/basilisk/components/customizableui/content/panelUI.inc.xul
index 077d9c014..e389b14bf 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/application/basilisk/components/customizableui/content/panelUI.inc.xul
@@ -367,25 +367,6 @@
   </vbox>
 </panel>
 
-<panel id="customization-tipPanel"
-       type="arrow"
-       flip="none"
-       side="left"
-       position="leftcenter topright"
-       noautohide="true"
-       hidden="true">
-  <hbox class="customization-tipPanel-wrapper">
-    <vbox class="customization-tipPanel-infoBox"/>
-    <vbox class="customization-tipPanel-content" flex="1">
-      <description class="customization-tipPanel-contentMessage"/>
-      <image class="customization-tipPanel-contentImage"/>
-    </vbox>
-    <vbox pack="start" align="end" class="customization-tipPanel-closeBox">
-      <toolbarbutton oncommand="gCustomizeMode.hideTip()" class="close-icon"/>
-    </vbox>
-  </hbox>
-</panel>
-
 <panel id="panic-button-success-notification"
        type="arrow"
        position="bottomcenter topright"
diff --git a/browser/components/customizableui/content/panelUI.js b/application/basilisk/components/customizableui/content/panelUI.js
index 66fa0c184..66fa0c184 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/application/basilisk/components/customizableui/content/panelUI.js
diff --git a/browser/components/customizableui/content/panelUI.xml b/application/basilisk/components/customizableui/content/panelUI.xml
index 6893bd8ff..6893bd8ff 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/application/basilisk/components/customizableui/content/panelUI.xml
diff --git a/browser/components/customizableui/content/toolbar.xml b/application/basilisk/components/customizableui/content/toolbar.xml
index 4e6964c9f..4e6964c9f 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/application/basilisk/components/customizableui/content/toolbar.xml
diff --git a/browser/components/customizableui/moz.build b/application/basilisk/components/customizableui/moz.build
index 034630dc9..034630dc9 100644
--- a/browser/components/customizableui/moz.build
+++ b/application/basilisk/components/customizableui/moz.build
diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/application/basilisk/components/dirprovider/DirectoryProvider.cpp
index 8b7c0b9e0..8b7c0b9e0 100644
--- a/browser/components/dirprovider/DirectoryProvider.cpp
+++ b/application/basilisk/components/dirprovider/DirectoryProvider.cpp
diff --git a/browser/components/dirprovider/DirectoryProvider.h b/application/basilisk/components/dirprovider/DirectoryProvider.h
index 43fa85ab9..43fa85ab9 100644
--- a/browser/components/dirprovider/DirectoryProvider.h
+++ b/application/basilisk/components/dirprovider/DirectoryProvider.h
diff --git a/browser/components/dirprovider/moz.build b/application/basilisk/components/dirprovider/moz.build
index 799d4deb3..799d4deb3 100644
--- a/browser/components/dirprovider/moz.build
+++ b/application/basilisk/components/dirprovider/moz.build
diff --git a/browser/components/distribution.js b/application/basilisk/components/distribution.js
index 589129a5a..589129a5a 100644
--- a/browser/components/distribution.js
+++ b/application/basilisk/components/distribution.js
diff --git a/browser/components/downloads/DownloadsCommon.jsm b/application/basilisk/components/downloads/DownloadsCommon.jsm
index 90f14f2d8..90f14f2d8 100644
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/application/basilisk/components/downloads/DownloadsCommon.jsm
diff --git a/browser/components/downloads/DownloadsTaskbar.jsm b/application/basilisk/components/downloads/DownloadsTaskbar.jsm
index cf915abb5..cf915abb5 100644
--- a/browser/components/downloads/DownloadsTaskbar.jsm
+++ b/application/basilisk/components/downloads/DownloadsTaskbar.jsm
diff --git a/browser/components/downloads/DownloadsViewUI.jsm b/application/basilisk/components/downloads/DownloadsViewUI.jsm
index 3b0e4c1b7..3b0e4c1b7 100644
--- a/browser/components/downloads/DownloadsViewUI.jsm
+++ b/application/basilisk/components/downloads/DownloadsViewUI.jsm
diff --git a/browser/components/downloads/content/allDownloadsViewOverlay.js b/application/basilisk/components/downloads/content/allDownloadsViewOverlay.js
index 58078cd08..58078cd08 100644
--- a/browser/components/downloads/content/allDownloadsViewOverlay.js
+++ b/application/basilisk/components/downloads/content/allDownloadsViewOverlay.js
diff --git a/browser/components/downloads/content/allDownloadsViewOverlay.xul b/application/basilisk/components/downloads/content/allDownloadsViewOverlay.xul
index cb8c699bf..cb8c699bf 100644
--- a/browser/components/downloads/content/allDownloadsViewOverlay.xul
+++ b/application/basilisk/components/downloads/content/allDownloadsViewOverlay.xul
diff --git a/browser/components/downloads/content/contentAreaDownloadsView.css b/application/basilisk/components/downloads/content/contentAreaDownloadsView.css
index abaae1f7b..abaae1f7b 100644
--- a/browser/components/downloads/content/contentAreaDownloadsView.css
+++ b/application/basilisk/components/downloads/content/contentAreaDownloadsView.css
diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/application/basilisk/components/downloads/content/contentAreaDownloadsView.js
index 6e4f18599..6e4f18599 100644
--- a/browser/components/downloads/content/contentAreaDownloadsView.js
+++ b/application/basilisk/components/downloads/content/contentAreaDownloadsView.js
diff --git a/browser/components/downloads/content/contentAreaDownloadsView.xul b/application/basilisk/components/downloads/content/contentAreaDownloadsView.xul
index 91c986656..91c986656 100644
--- a/browser/components/downloads/content/contentAreaDownloadsView.xul
+++ b/application/basilisk/components/downloads/content/contentAreaDownloadsView.xul
diff --git a/browser/components/downloads/content/download.xml b/application/basilisk/components/downloads/content/download.xml
index 29a1530fd..29a1530fd 100644
--- a/browser/components/downloads/content/download.xml
+++ b/application/basilisk/components/downloads/content/download.xml
diff --git a/browser/components/downloads/content/downloads.css b/application/basilisk/components/downloads/content/downloads.css
index dd47c6f91..dd47c6f91 100644
--- a/browser/components/downloads/content/downloads.css
+++ b/application/basilisk/components/downloads/content/downloads.css
diff --git a/browser/components/downloads/content/downloads.js b/application/basilisk/components/downloads/content/downloads.js
index 57397c815..57397c815 100644
--- a/browser/components/downloads/content/downloads.js
+++ b/application/basilisk/components/downloads/content/downloads.js
diff --git a/browser/components/downloads/content/downloadsOverlay.xul b/application/basilisk/components/downloads/content/downloadsOverlay.xul
index 9fe2ee022..9fe2ee022 100644
--- a/browser/components/downloads/content/downloadsOverlay.xul
+++ b/application/basilisk/components/downloads/content/downloadsOverlay.xul
diff --git a/browser/components/downloads/content/indicator.js b/application/basilisk/components/downloads/content/indicator.js
index 4c22a6e5d..4c22a6e5d 100644
--- a/browser/components/downloads/content/indicator.js
+++ b/application/basilisk/components/downloads/content/indicator.js
diff --git a/browser/components/downloads/content/indicatorOverlay.xul b/application/basilisk/components/downloads/content/indicatorOverlay.xul
index 07987c88c..07987c88c 100644
--- a/browser/components/downloads/content/indicatorOverlay.xul
+++ b/application/basilisk/components/downloads/content/indicatorOverlay.xul
diff --git a/browser/components/downloads/jar.mn b/application/basilisk/components/downloads/jar.mn
index 2663454fa..2663454fa 100644
--- a/browser/components/downloads/jar.mn
+++ b/application/basilisk/components/downloads/jar.mn
diff --git a/browser/components/downloads/moz.build b/application/basilisk/components/downloads/moz.build
index 241354619..241354619 100644
--- a/browser/components/downloads/moz.build
+++ b/application/basilisk/components/downloads/moz.build
diff --git a/browser/components/feeds/BrowserFeeds.manifest b/application/basilisk/components/feeds/BrowserFeeds.manifest
index ac5c299fa..ac5c299fa 100644
--- a/browser/components/feeds/BrowserFeeds.manifest
+++ b/application/basilisk/components/feeds/BrowserFeeds.manifest
diff --git a/browser/components/feeds/FeedConverter.js b/application/basilisk/components/feeds/FeedConverter.js
index c2c565608..c2c565608 100644
--- a/browser/components/feeds/FeedConverter.js
+++ b/application/basilisk/components/feeds/FeedConverter.js
diff --git a/browser/components/feeds/FeedWriter.js b/application/basilisk/components/feeds/FeedWriter.js
index 20f1399b0..20f1399b0 100644
--- a/browser/components/feeds/FeedWriter.js
+++ b/application/basilisk/components/feeds/FeedWriter.js
diff --git a/browser/components/feeds/WebContentConverter.js b/application/basilisk/components/feeds/WebContentConverter.js
index 2cb5cd145..2cb5cd145 100644
--- a/browser/components/feeds/WebContentConverter.js
+++ b/application/basilisk/components/feeds/WebContentConverter.js
diff --git a/browser/components/feeds/content/subscribe.js b/application/basilisk/components/feeds/content/subscribe.js
index 05a564bf1..05a564bf1 100644
--- a/browser/components/feeds/content/subscribe.js
+++ b/application/basilisk/components/feeds/content/subscribe.js
diff --git a/browser/components/feeds/content/subscribe.xhtml b/application/basilisk/components/feeds/content/subscribe.xhtml
index a55c80053..a55c80053 100644
--- a/browser/components/feeds/content/subscribe.xhtml
+++ b/application/basilisk/components/feeds/content/subscribe.xhtml
diff --git a/browser/components/feeds/jar.mn b/application/basilisk/components/feeds/jar.mn
index 8570112c1..8570112c1 100644
--- a/browser/components/feeds/jar.mn
+++ b/application/basilisk/components/feeds/jar.mn
diff --git a/browser/components/feeds/moz.build b/application/basilisk/components/feeds/moz.build
index b8755fcc9..b8755fcc9 100644
--- a/browser/components/feeds/moz.build
+++ b/application/basilisk/components/feeds/moz.build
diff --git a/browser/components/feeds/nsFeedSniffer.cpp b/application/basilisk/components/feeds/nsFeedSniffer.cpp
index f314d3d3b..f314d3d3b 100644
--- a/browser/components/feeds/nsFeedSniffer.cpp
+++ b/application/basilisk/components/feeds/nsFeedSniffer.cpp
diff --git a/browser/components/feeds/nsFeedSniffer.h b/application/basilisk/components/feeds/nsFeedSniffer.h
index a0eb9862c..a0eb9862c 100644
--- a/browser/components/feeds/nsFeedSniffer.h
+++ b/application/basilisk/components/feeds/nsFeedSniffer.h
diff --git a/browser/components/feeds/nsIFeedResultService.idl b/application/basilisk/components/feeds/nsIFeedResultService.idl
index f745fa693..f745fa693 100644
--- a/browser/components/feeds/nsIFeedResultService.idl
+++ b/application/basilisk/components/feeds/nsIFeedResultService.idl
diff --git a/browser/components/feeds/nsIWebContentConverterRegistrar.idl b/application/basilisk/components/feeds/nsIWebContentConverterRegistrar.idl
index 08ce2f4ae..08ce2f4ae 100644
--- a/browser/components/feeds/nsIWebContentConverterRegistrar.idl
+++ b/application/basilisk/components/feeds/nsIWebContentConverterRegistrar.idl
diff --git a/browser/components/migration/.eslintrc.js b/application/basilisk/components/migration/.eslintrc.js
index 6693f83d0..6693f83d0 100644
--- a/browser/components/migration/.eslintrc.js
+++ b/application/basilisk/components/migration/.eslintrc.js
diff --git a/browser/components/migration/360seProfileMigrator.js b/application/basilisk/components/migration/360seProfileMigrator.js
index 42347d542..42347d542 100644
--- a/browser/components/migration/360seProfileMigrator.js
+++ b/application/basilisk/components/migration/360seProfileMigrator.js
diff --git a/browser/components/migration/AutoMigrate.jsm b/application/basilisk/components/migration/AutoMigrate.jsm
index b38747825..b38747825 100644
--- a/browser/components/migration/AutoMigrate.jsm
+++ b/application/basilisk/components/migration/AutoMigrate.jsm
diff --git a/browser/components/migration/BrowserProfileMigrators.manifest b/application/basilisk/components/migration/BrowserProfileMigrators.manifest
index e16fba13a..e16fba13a 100644
--- a/browser/components/migration/BrowserProfileMigrators.manifest
+++ b/application/basilisk/components/migration/BrowserProfileMigrators.manifest
diff --git a/browser/components/migration/ChromeProfileMigrator.js b/application/basilisk/components/migration/ChromeProfileMigrator.js
index ec0c8d444..ec0c8d444 100644
--- a/browser/components/migration/ChromeProfileMigrator.js
+++ b/application/basilisk/components/migration/ChromeProfileMigrator.js
diff --git a/browser/components/migration/ESEDBReader.jsm b/application/basilisk/components/migration/ESEDBReader.jsm
index 0768c65aa..0768c65aa 100644
--- a/browser/components/migration/ESEDBReader.jsm
+++ b/application/basilisk/components/migration/ESEDBReader.jsm
diff --git a/browser/components/migration/EdgeProfileMigrator.js b/application/basilisk/components/migration/EdgeProfileMigrator.js
index afdcc2773..afdcc2773 100644
--- a/browser/components/migration/EdgeProfileMigrator.js
+++ b/application/basilisk/components/migration/EdgeProfileMigrator.js
diff --git a/browser/components/migration/FirefoxProfileMigrator.js b/application/basilisk/components/migration/FirefoxProfileMigrator.js
index 2714cdbcd..2714cdbcd 100644
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/application/basilisk/components/migration/FirefoxProfileMigrator.js
diff --git a/browser/components/migration/IEProfileMigrator.js b/application/basilisk/components/migration/IEProfileMigrator.js
index ac055686c..ac055686c 100644
--- a/browser/components/migration/IEProfileMigrator.js
+++ b/application/basilisk/components/migration/IEProfileMigrator.js
diff --git a/browser/components/migration/MSMigrationUtils.jsm b/application/basilisk/components/migration/MSMigrationUtils.jsm
index 1e0250b06..1e0250b06 100644
--- a/browser/components/migration/MSMigrationUtils.jsm
+++ b/application/basilisk/components/migration/MSMigrationUtils.jsm
diff --git a/browser/components/migration/MigrationUtils.jsm b/application/basilisk/components/migration/MigrationUtils.jsm
index e133ec520..e133ec520 100644
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/application/basilisk/components/migration/MigrationUtils.jsm
diff --git a/browser/components/migration/ProfileMigrator.js b/application/basilisk/components/migration/ProfileMigrator.js
index f67823bae..f67823bae 100644
--- a/browser/components/migration/ProfileMigrator.js
+++ b/application/basilisk/components/migration/ProfileMigrator.js
diff --git a/browser/components/migration/SafariProfileMigrator.js b/application/basilisk/components/migration/SafariProfileMigrator.js
index 6a2dbfcb1..6a2dbfcb1 100644
--- a/browser/components/migration/SafariProfileMigrator.js
+++ b/application/basilisk/components/migration/SafariProfileMigrator.js
diff --git a/browser/components/migration/content/aboutWelcomeBack.xhtml b/application/basilisk/components/migration/content/aboutWelcomeBack.xhtml
index d9fdb6c2c..d9fdb6c2c 100644
--- a/browser/components/migration/content/aboutWelcomeBack.xhtml
+++ b/application/basilisk/components/migration/content/aboutWelcomeBack.xhtml
diff --git a/browser/components/migration/content/extra-migration-strings.properties b/application/basilisk/components/migration/content/extra-migration-strings.properties
index 208906b31..208906b31 100644
--- a/browser/components/migration/content/extra-migration-strings.properties
+++ b/application/basilisk/components/migration/content/extra-migration-strings.properties
diff --git a/browser/components/migration/content/migration.js b/application/basilisk/components/migration/content/migration.js
index eb2175628..eb2175628 100644
--- a/browser/components/migration/content/migration.js
+++ b/application/basilisk/components/migration/content/migration.js
diff --git a/browser/components/migration/content/migration.xul b/application/basilisk/components/migration/content/migration.xul
index e85091002..e85091002 100644
--- a/browser/components/migration/content/migration.xul
+++ b/application/basilisk/components/migration/content/migration.xul
diff --git a/browser/components/migration/jar.mn b/application/basilisk/components/migration/jar.mn
index 110788bc4..110788bc4 100644
--- a/browser/components/migration/jar.mn
+++ b/application/basilisk/components/migration/jar.mn
diff --git a/browser/components/migration/moz.build b/application/basilisk/components/migration/moz.build
index 465e3eade..465e3eade 100644
--- a/browser/components/migration/moz.build
+++ b/application/basilisk/components/migration/moz.build
diff --git a/browser/components/migration/nsIBrowserProfileMigrator.idl b/application/basilisk/components/migration/nsIBrowserProfileMigrator.idl
index a251c3683..a251c3683 100644
--- a/browser/components/migration/nsIBrowserProfileMigrator.idl
+++ b/application/basilisk/components/migration/nsIBrowserProfileMigrator.idl
diff --git a/browser/components/migration/nsIEHistoryEnumerator.cpp b/application/basilisk/components/migration/nsIEHistoryEnumerator.cpp
index 0b377d27e..0b377d27e 100644
--- a/browser/components/migration/nsIEHistoryEnumerator.cpp
+++ b/application/basilisk/components/migration/nsIEHistoryEnumerator.cpp
diff --git a/browser/components/migration/nsIEHistoryEnumerator.h b/application/basilisk/components/migration/nsIEHistoryEnumerator.h
index 1572a8dd5..1572a8dd5 100644
--- a/browser/components/migration/nsIEHistoryEnumerator.h
+++ b/application/basilisk/components/migration/nsIEHistoryEnumerator.h
diff --git a/browser/components/migration/nsWindowsMigrationUtils.h b/application/basilisk/components/migration/nsWindowsMigrationUtils.h
index 0288d93d3..0288d93d3 100644
--- a/browser/components/migration/nsWindowsMigrationUtils.h
+++ b/application/basilisk/components/migration/nsWindowsMigrationUtils.h
diff --git a/browser/components/moz.build b/application/basilisk/components/moz.build
index a49580200..07e79bc36 100644
--- a/browser/components/moz.build
+++ b/application/basilisk/components/moz.build
@@ -21,7 +21,6 @@ DIRS += [
     'shell',
     'selfsupport',
     'syncedtabs',
-    'uitour',
     'translation',
 ]
 
diff --git a/browser/components/newtab/NewTabComponents.manifest b/application/basilisk/components/newtab/NewTabComponents.manifest
index 42db65acd..42db65acd 100644
--- a/browser/components/newtab/NewTabComponents.manifest
+++ b/application/basilisk/components/newtab/NewTabComponents.manifest
diff --git a/browser/components/newtab/NewTabMessages.jsm b/application/basilisk/components/newtab/NewTabMessages.jsm
index 0816ed65a..0816ed65a 100644
--- a/browser/components/newtab/NewTabMessages.jsm
+++ b/application/basilisk/components/newtab/NewTabMessages.jsm
diff --git a/browser/components/newtab/NewTabPrefsProvider.jsm b/application/basilisk/components/newtab/NewTabPrefsProvider.jsm
index c1d8b4149..c1d8b4149 100644
--- a/browser/components/newtab/NewTabPrefsProvider.jsm
+++ b/application/basilisk/components/newtab/NewTabPrefsProvider.jsm
diff --git a/browser/components/newtab/NewTabRemoteResources.jsm b/application/basilisk/components/newtab/NewTabRemoteResources.jsm
index 57351b15c..57351b15c 100644
--- a/browser/components/newtab/NewTabRemoteResources.jsm
+++ b/application/basilisk/components/newtab/NewTabRemoteResources.jsm
diff --git a/browser/components/newtab/NewTabSearchProvider.jsm b/application/basilisk/components/newtab/NewTabSearchProvider.jsm
index a50d8c706..a50d8c706 100644
--- a/browser/components/newtab/NewTabSearchProvider.jsm
+++ b/application/basilisk/components/newtab/NewTabSearchProvider.jsm
diff --git a/browser/components/newtab/NewTabURL.jsm b/application/basilisk/components/newtab/NewTabURL.jsm
index 5000eae2e..5000eae2e 100644
--- a/browser/components/newtab/NewTabURL.jsm
+++ b/application/basilisk/components/newtab/NewTabURL.jsm
diff --git a/browser/components/newtab/NewTabWebChannel.jsm b/application/basilisk/components/newtab/NewTabWebChannel.jsm
index 40ee73684..40ee73684 100644
--- a/browser/components/newtab/NewTabWebChannel.jsm
+++ b/application/basilisk/components/newtab/NewTabWebChannel.jsm
diff --git a/browser/components/newtab/PlacesProvider.jsm b/application/basilisk/components/newtab/PlacesProvider.jsm
index f478b5c5c..f478b5c5c 100644
--- a/browser/components/newtab/PlacesProvider.jsm
+++ b/application/basilisk/components/newtab/PlacesProvider.jsm
diff --git a/browser/components/newtab/PreviewProvider.jsm b/application/basilisk/components/newtab/PreviewProvider.jsm
index 8624b8544..8624b8544 100644
--- a/browser/components/newtab/PreviewProvider.jsm
+++ b/application/basilisk/components/newtab/PreviewProvider.jsm
diff --git a/browser/components/newtab/aboutNewTabService.js b/application/basilisk/components/newtab/aboutNewTabService.js
index 54c3749e8..54c3749e8 100644
--- a/browser/components/newtab/aboutNewTabService.js
+++ b/application/basilisk/components/newtab/aboutNewTabService.js
diff --git a/browser/components/newtab/moz.build b/application/basilisk/components/newtab/moz.build
index 3d3be6454..3d3be6454 100644
--- a/browser/components/newtab/moz.build
+++ b/application/basilisk/components/newtab/moz.build
diff --git a/browser/components/newtab/nsIAboutNewTabService.idl b/application/basilisk/components/newtab/nsIAboutNewTabService.idl
index bc25c7492..bc25c7492 100644
--- a/browser/components/newtab/nsIAboutNewTabService.idl
+++ b/application/basilisk/components/newtab/nsIAboutNewTabService.idl
diff --git a/browser/components/nsBrowserContentHandler.js b/application/basilisk/components/nsBrowserContentHandler.js
index 74144fc1b..74144fc1b 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/application/basilisk/components/nsBrowserContentHandler.js
diff --git a/browser/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js
index 448bb910d..ae00e30cf 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/application/basilisk/components/nsBrowserGlue.js
@@ -56,13 +56,11 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s
   ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
   ["RecentWindow", "resource:///modules/RecentWindow.jsm"],
   ["RemotePrompt", "resource:///modules/RemotePrompt.jsm"],
-  ["SelfSupportBackend", "resource:///modules/SelfSupportBackend.jsm"],
   ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
   ["ShellService", "resource:///modules/ShellService.jsm"],
   ["SimpleServiceDiscovery", "resource://gre/modules/SimpleServiceDiscovery.jsm"],
   ["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"],
   ["Task", "resource://gre/modules/Task.jsm"],
-  ["UITour", "resource:///modules/UITour.jsm"],
   ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"],
   ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"],
   ["WebChannel", "resource://gre/modules/WebChannel.jsm"],
@@ -682,8 +680,6 @@ BrowserGlue.prototype = {
     ReaderParent.init();
     URLBarZoom.init();
 
-    SelfSupportBackend.init();
-
     // Ensure we keep track of places/pw-mananager undo by init'ing this early.
     Cu.import("resource:///modules/AutoMigrate.jsm");
 
@@ -1031,7 +1027,6 @@ BrowserGlue.prototype = {
     }
 
     BrowserUsageTelemetry.uninit();
-    SelfSupportBackend.uninit();
     UserAgentOverrides.uninit();
     PageThumbs.uninit();
     NewTabMessages.uninit();
@@ -2847,12 +2842,3 @@ var E10SAccessibilityCheck = {
 
 var components = [BrowserGlue, ContentPermissionPrompt];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
-
-
-// Listen for UITour messages.
-// Do it here instead of the UITour module itself so that the UITour module is lazy loaded
-// when the first message is received.
-var globalMM = Cc["@mozilla.org/globalmessagemanager;1"].getService(Ci.nsIMessageListenerManager);
-globalMM.addMessageListener("UITour:onPageEvent", function(aMessage) {
-  UITour.onPageEvent(aMessage, aMessage.data);
-});
diff --git a/browser/components/nsIBrowserGlue.idl b/application/basilisk/components/nsIBrowserGlue.idl
index 01f164f5b..01f164f5b 100644
--- a/browser/components/nsIBrowserGlue.idl
+++ b/application/basilisk/components/nsIBrowserGlue.idl
diff --git a/browser/components/nsIBrowserHandler.idl b/application/basilisk/components/nsIBrowserHandler.idl
index 74292f9d9..74292f9d9 100644
--- a/browser/components/nsIBrowserHandler.idl
+++ b/application/basilisk/components/nsIBrowserHandler.idl
diff --git a/browser/components/places/PlacesUIUtils.jsm b/application/basilisk/components/places/PlacesUIUtils.jsm
index 17fa276aa..17fa276aa 100644
--- a/browser/components/places/PlacesUIUtils.jsm
+++ b/application/basilisk/components/places/PlacesUIUtils.jsm
diff --git a/browser/components/places/content/bookmarkProperties.js b/application/basilisk/components/places/content/bookmarkProperties.js
index afcf65736..afcf65736 100644
--- a/browser/components/places/content/bookmarkProperties.js
+++ b/application/basilisk/components/places/content/bookmarkProperties.js
diff --git a/browser/components/places/content/bookmarkProperties.xul b/application/basilisk/components/places/content/bookmarkProperties.xul
index 2c04f8b05..2c04f8b05 100644
--- a/browser/components/places/content/bookmarkProperties.xul
+++ b/application/basilisk/components/places/content/bookmarkProperties.xul
diff --git a/browser/components/places/content/bookmarksPanel.js b/application/basilisk/components/places/content/bookmarksPanel.js
index 871d69725..871d69725 100644
--- a/browser/components/places/content/bookmarksPanel.js
+++ b/application/basilisk/components/places/content/bookmarksPanel.js
diff --git a/browser/components/places/content/bookmarksPanel.xul b/application/basilisk/components/places/content/bookmarksPanel.xul
index 332b9e7a9..332b9e7a9 100644
--- a/browser/components/places/content/bookmarksPanel.xul
+++ b/application/basilisk/components/places/content/bookmarksPanel.xul
diff --git a/browser/components/places/content/browserPlacesViews.js b/application/basilisk/components/places/content/browserPlacesViews.js
index c6ee9b6ce..c6ee9b6ce 100644
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/application/basilisk/components/places/content/browserPlacesViews.js
diff --git a/browser/components/places/content/controller.js b/application/basilisk/components/places/content/controller.js
index ebdab60f4..ebdab60f4 100644
--- a/browser/components/places/content/controller.js
+++ b/application/basilisk/components/places/content/controller.js
diff --git a/browser/components/places/content/downloadsViewOverlay.xul b/application/basilisk/components/places/content/downloadsViewOverlay.xul
index 5706632ba..5706632ba 100644
--- a/browser/components/places/content/downloadsViewOverlay.xul
+++ b/application/basilisk/components/places/content/downloadsViewOverlay.xul
diff --git a/browser/components/places/content/editBookmarkOverlay.js b/application/basilisk/components/places/content/editBookmarkOverlay.js
index d59f5c764..d59f5c764 100644
--- a/browser/components/places/content/editBookmarkOverlay.js
+++ b/application/basilisk/components/places/content/editBookmarkOverlay.js
diff --git a/browser/components/places/content/editBookmarkOverlay.xul b/application/basilisk/components/places/content/editBookmarkOverlay.xul
index 140e752c0..140e752c0 100644
--- a/browser/components/places/content/editBookmarkOverlay.xul
+++ b/application/basilisk/components/places/content/editBookmarkOverlay.xul
diff --git a/browser/components/places/content/history-panel.js b/application/basilisk/components/places/content/history-panel.js
index 20dbbb5bd..20dbbb5bd 100644
--- a/browser/components/places/content/history-panel.js
+++ b/application/basilisk/components/places/content/history-panel.js
diff --git a/browser/components/places/content/history-panel.xul b/application/basilisk/components/places/content/history-panel.xul
index d1c875a63..d1c875a63 100644
--- a/browser/components/places/content/history-panel.xul
+++ b/application/basilisk/components/places/content/history-panel.xul
diff --git a/browser/components/places/content/menu.xml b/application/basilisk/components/places/content/menu.xml
index f791d76fb..f791d76fb 100644
--- a/browser/components/places/content/menu.xml
+++ b/application/basilisk/components/places/content/menu.xml
diff --git a/browser/components/places/content/moveBookmarks.js b/application/basilisk/components/places/content/moveBookmarks.js
index 5bfdce56e..5bfdce56e 100644
--- a/browser/components/places/content/moveBookmarks.js
+++ b/application/basilisk/components/places/content/moveBookmarks.js
diff --git a/browser/components/places/content/moveBookmarks.xul b/application/basilisk/components/places/content/moveBookmarks.xul
index b6e75f3da..b6e75f3da 100644
--- a/browser/components/places/content/moveBookmarks.xul
+++ b/application/basilisk/components/places/content/moveBookmarks.xul
diff --git a/browser/components/places/content/organizer.css b/application/basilisk/components/places/content/organizer.css
index 47b1832c1..47b1832c1 100644
--- a/browser/components/places/content/organizer.css
+++ b/application/basilisk/components/places/content/organizer.css
diff --git a/browser/components/places/content/places.css b/application/basilisk/components/places/content/places.css
index de3cc91d8..de3cc91d8 100644
--- a/browser/components/places/content/places.css
+++ b/application/basilisk/components/places/content/places.css
diff --git a/browser/components/places/content/places.js b/application/basilisk/components/places/content/places.js
index aa43b20e6..aa43b20e6 100644
--- a/browser/components/places/content/places.js
+++ b/application/basilisk/components/places/content/places.js
diff --git a/browser/components/places/content/places.xul b/application/basilisk/components/places/content/places.xul
index 16c3385cb..16c3385cb 100644
--- a/browser/components/places/content/places.xul
+++ b/application/basilisk/components/places/content/places.xul
diff --git a/browser/components/places/content/placesOverlay.xul b/application/basilisk/components/places/content/placesOverlay.xul
index 512eb923e..512eb923e 100644
--- a/browser/components/places/content/placesOverlay.xul
+++ b/application/basilisk/components/places/content/placesOverlay.xul
diff --git a/browser/components/places/content/sidebarUtils.js b/application/basilisk/components/places/content/sidebarUtils.js
index 96c289741..96c289741 100644
--- a/browser/components/places/content/sidebarUtils.js
+++ b/application/basilisk/components/places/content/sidebarUtils.js
diff --git a/browser/components/places/content/tree.xml b/application/basilisk/components/places/content/tree.xml
index 338ee81f6..338ee81f6 100644
--- a/browser/components/places/content/tree.xml
+++ b/application/basilisk/components/places/content/tree.xml
diff --git a/browser/components/places/content/treeView.js b/application/basilisk/components/places/content/treeView.js
index 181bb5404..181bb5404 100644
--- a/browser/components/places/content/treeView.js
+++ b/application/basilisk/components/places/content/treeView.js
diff --git a/browser/components/places/jar.mn b/application/basilisk/components/places/jar.mn
index 93809510d..93809510d 100644
--- a/browser/components/places/jar.mn
+++ b/application/basilisk/components/places/jar.mn
diff --git a/browser/components/places/moz.build b/application/basilisk/components/places/moz.build
index 9e5a2c074..9e5a2c074 100644
--- a/browser/components/places/moz.build
+++ b/application/basilisk/components/places/moz.build
diff --git a/browser/components/preferences/applicationManager.js b/application/basilisk/components/preferences/applicationManager.js
index 2e0f47a69..2e0f47a69 100644
--- a/browser/components/preferences/applicationManager.js
+++ b/application/basilisk/components/preferences/applicationManager.js
diff --git a/browser/components/preferences/applicationManager.xul b/application/basilisk/components/preferences/applicationManager.xul
index ea9d3a53f..ea9d3a53f 100644
--- a/browser/components/preferences/applicationManager.xul
+++ b/application/basilisk/components/preferences/applicationManager.xul
diff --git a/browser/components/preferences/blocklists.js b/application/basilisk/components/preferences/blocklists.js
index c0ce5b656..bc39eb6bd 100644
--- a/browser/components/preferences/blocklists.js
+++ b/application/basilisk/components/preferences/blocklists.js
@@ -6,11 +6,9 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 const BASE_LIST_ID = "base";
 const CONTENT_LIST_ID = "content";
 const TRACK_SUFFIX = "-track-digest256";
-#ifdef MOZ_SAFE_BROWSING
 const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
 const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
 const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime";
-#endif
 
 var gBlocklistManager = {
   _type: "",
diff --git a/browser/components/preferences/blocklists.xul b/application/basilisk/components/preferences/blocklists.xul
index 523c20810..523c20810 100644
--- a/browser/components/preferences/blocklists.xul
+++ b/application/basilisk/components/preferences/blocklists.xul
diff --git a/browser/components/preferences/colors.xul b/application/basilisk/components/preferences/colors.xul
index f2109aed7..f2109aed7 100644
--- a/browser/components/preferences/colors.xul
+++ b/application/basilisk/components/preferences/colors.xul
diff --git a/browser/components/preferences/connection.js b/application/basilisk/components/preferences/connection.js
index f6b395a2d..f6b395a2d 100644
--- a/browser/components/preferences/connection.js
+++ b/application/basilisk/components/preferences/connection.js
diff --git a/browser/components/preferences/connection.xul b/application/basilisk/components/preferences/connection.xul
index a3f0d082a..a3f0d082a 100644
--- a/browser/components/preferences/connection.xul
+++ b/application/basilisk/components/preferences/connection.xul
diff --git a/browser/components/preferences/containers.js b/application/basilisk/components/preferences/containers.js
index 6ca5853f7..6ca5853f7 100644
--- a/browser/components/preferences/containers.js
+++ b/application/basilisk/components/preferences/containers.js
diff --git a/browser/components/preferences/containers.xul b/application/basilisk/components/preferences/containers.xul
index 62a775fe4..62a775fe4 100644
--- a/browser/components/preferences/containers.xul
+++ b/application/basilisk/components/preferences/containers.xul
diff --git a/browser/components/preferences/cookies.js b/application/basilisk/components/preferences/cookies.js
index 921eee4c0..921eee4c0 100644
--- a/browser/components/preferences/cookies.js
+++ b/application/basilisk/components/preferences/cookies.js
diff --git a/browser/components/preferences/cookies.xul b/application/basilisk/components/preferences/cookies.xul
index bd60d9346..bd60d9346 100644
--- a/browser/components/preferences/cookies.xul
+++ b/application/basilisk/components/preferences/cookies.xul
diff --git a/browser/components/preferences/donottrack.xul b/application/basilisk/components/preferences/donottrack.xul
index d0631ac4f..d0631ac4f 100644
--- a/browser/components/preferences/donottrack.xul
+++ b/application/basilisk/components/preferences/donottrack.xul
diff --git a/browser/components/preferences/fonts.js b/application/basilisk/components/preferences/fonts.js
index bf6f43159..bf6f43159 100644
--- a/browser/components/preferences/fonts.js
+++ b/application/basilisk/components/preferences/fonts.js
diff --git a/browser/components/preferences/fonts.xul b/application/basilisk/components/preferences/fonts.xul
index 26b1c6547..26b1c6547 100644
--- a/browser/components/preferences/fonts.xul
+++ b/application/basilisk/components/preferences/fonts.xul
diff --git a/browser/components/preferences/handlers.css b/application/basilisk/components/preferences/handlers.css
index 6af75a08b..6af75a08b 100644
--- a/browser/components/preferences/handlers.css
+++ b/application/basilisk/components/preferences/handlers.css
diff --git a/browser/components/preferences/handlers.xml b/application/basilisk/components/preferences/handlers.xml
index 0c629d759..0c629d759 100644
--- a/browser/components/preferences/handlers.xml
+++ b/application/basilisk/components/preferences/handlers.xml
diff --git a/browser/components/preferences/in-content/advanced.js b/application/basilisk/components/preferences/in-content/advanced.js
index 5f9458eee..5f9458eee 100644
--- a/browser/components/preferences/in-content/advanced.js
+++ b/application/basilisk/components/preferences/in-content/advanced.js
diff --git a/browser/components/preferences/in-content/advanced.xul b/application/basilisk/components/preferences/in-content/advanced.xul
index 4973f8e09..4973f8e09 100644
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/application/basilisk/components/preferences/in-content/advanced.xul
diff --git a/browser/components/preferences/in-content/applications.js b/application/basilisk/components/preferences/in-content/applications.js
index 6f2989657..6f2989657 100644
--- a/browser/components/preferences/in-content/applications.js
+++ b/application/basilisk/components/preferences/in-content/applications.js
diff --git a/browser/components/preferences/in-content/applications.xul b/application/basilisk/components/preferences/in-content/applications.xul
index 1d4723493..1d4723493 100644
--- a/browser/components/preferences/in-content/applications.xul
+++ b/application/basilisk/components/preferences/in-content/applications.xul
diff --git a/browser/components/preferences/in-content/containers.js b/application/basilisk/components/preferences/in-content/containers.js
index 758e45fff..758e45fff 100644
--- a/browser/components/preferences/in-content/containers.js
+++ b/application/basilisk/components/preferences/in-content/containers.js
diff --git a/browser/components/preferences/in-content/containers.xul b/application/basilisk/components/preferences/in-content/containers.xul
index e83bac1c3..e83bac1c3 100644
--- a/browser/components/preferences/in-content/containers.xul
+++ b/application/basilisk/components/preferences/in-content/containers.xul
diff --git a/browser/components/preferences/in-content/content.js b/application/basilisk/components/preferences/in-content/content.js
index a957b1dd5..a957b1dd5 100644
--- a/browser/components/preferences/in-content/content.js
+++ b/application/basilisk/components/preferences/in-content/content.js
diff --git a/browser/components/preferences/in-content/content.xul b/application/basilisk/components/preferences/in-content/content.xul
index 9434cba62..9434cba62 100644
--- a/browser/components/preferences/in-content/content.xul
+++ b/application/basilisk/components/preferences/in-content/content.xul
diff --git a/browser/components/preferences/in-content/jar.mn b/application/basilisk/components/preferences/in-content/jar.mn
index 130bf8549..130bf8549 100644
--- a/browser/components/preferences/in-content/jar.mn
+++ b/application/basilisk/components/preferences/in-content/jar.mn
diff --git a/browser/components/preferences/in-content/main.js b/application/basilisk/components/preferences/in-content/main.js
index bac771bec..bac771bec 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/application/basilisk/components/preferences/in-content/main.js
diff --git a/browser/components/preferences/in-content/main.xul b/application/basilisk/components/preferences/in-content/main.xul
index 8eca11877..8eca11877 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/application/basilisk/components/preferences/in-content/main.xul
diff --git a/browser/components/preferences/in-content/moz.build b/application/basilisk/components/preferences/in-content/moz.build
index 08a75bcf7..08a75bcf7 100644
--- a/browser/components/preferences/in-content/moz.build
+++ b/application/basilisk/components/preferences/in-content/moz.build
diff --git a/browser/components/preferences/in-content/preferences.js b/application/basilisk/components/preferences/in-content/preferences.js
index e18ab4b04..e18ab4b04 100644
--- a/browser/components/preferences/in-content/preferences.js
+++ b/application/basilisk/components/preferences/in-content/preferences.js
diff --git a/browser/components/preferences/in-content/preferences.xul b/application/basilisk/components/preferences/in-content/preferences.xul
index 7ec7ef119..7ec7ef119 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/application/basilisk/components/preferences/in-content/preferences.xul
diff --git a/browser/components/preferences/in-content/privacy.js b/application/basilisk/components/preferences/in-content/privacy.js
index 7dfc7de5a..7dfc7de5a 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/application/basilisk/components/preferences/in-content/privacy.js
diff --git a/browser/components/preferences/in-content/privacy.xul b/application/basilisk/components/preferences/in-content/privacy.xul
index 6ac6c88a4..6ac6c88a4 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/application/basilisk/components/preferences/in-content/privacy.xul
diff --git a/browser/components/preferences/in-content/search.js b/application/basilisk/components/preferences/in-content/search.js
index 55aa2c18c..55aa2c18c 100644
--- a/browser/components/preferences/in-content/search.js
+++ b/application/basilisk/components/preferences/in-content/search.js
diff --git a/browser/components/preferences/in-content/search.xul b/application/basilisk/components/preferences/in-content/search.xul
index 95c7acd85..95c7acd85 100644
--- a/browser/components/preferences/in-content/search.xul
+++ b/application/basilisk/components/preferences/in-content/search.xul
diff --git a/browser/components/preferences/in-content/security.js b/application/basilisk/components/preferences/in-content/security.js
index 37a187f9c..37a187f9c 100644
--- a/browser/components/preferences/in-content/security.js
+++ b/application/basilisk/components/preferences/in-content/security.js
diff --git a/browser/components/preferences/in-content/security.xul b/application/basilisk/components/preferences/in-content/security.xul
index 33e1471bd..33e1471bd 100644
--- a/browser/components/preferences/in-content/security.xul
+++ b/application/basilisk/components/preferences/in-content/security.xul
diff --git a/browser/components/preferences/in-content/subdialogs.js b/application/basilisk/components/preferences/in-content/subdialogs.js
index bb8d0048f..bb8d0048f 100644
--- a/browser/components/preferences/in-content/subdialogs.js
+++ b/application/basilisk/components/preferences/in-content/subdialogs.js
diff --git a/browser/components/preferences/in-content/sync.js b/application/basilisk/components/preferences/in-content/sync.js
index 27f7cd48c..27f7cd48c 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/application/basilisk/components/preferences/in-content/sync.js
diff --git a/browser/components/preferences/in-content/sync.xul b/application/basilisk/components/preferences/in-content/sync.xul
index f1aebf2aa..f1aebf2aa 100644
--- a/browser/components/preferences/in-content/sync.xul
+++ b/application/basilisk/components/preferences/in-content/sync.xul
diff --git a/browser/components/preferences/jar.mn b/application/basilisk/components/preferences/jar.mn
index f83809b03..c0d34da7f 100644
--- a/browser/components/preferences/jar.mn
+++ b/application/basilisk/components/preferences/jar.mn
@@ -6,7 +6,7 @@ browser.jar:
     content/browser/preferences/applicationManager.xul
     content/browser/preferences/applicationManager.js
     content/browser/preferences/blocklists.xul
-*   content/browser/preferences/blocklists.js
+    content/browser/preferences/blocklists.js
 *   content/browser/preferences/colors.xul
 *   content/browser/preferences/cookies.xul
     content/browser/preferences/cookies.js
diff --git a/browser/components/preferences/languages.js b/application/basilisk/components/preferences/languages.js
index 16ca257f7..16ca257f7 100644
--- a/browser/components/preferences/languages.js
+++ b/application/basilisk/components/preferences/languages.js
diff --git a/browser/components/preferences/languages.xul b/application/basilisk/components/preferences/languages.xul
index 7c877a456..7c877a456 100644
--- a/browser/components/preferences/languages.xul
+++ b/application/basilisk/components/preferences/languages.xul
diff --git a/browser/components/preferences/moz.build b/application/basilisk/components/preferences/moz.build
index adee51e3b..adee51e3b 100644
--- a/browser/components/preferences/moz.build
+++ b/application/basilisk/components/preferences/moz.build
diff --git a/browser/components/preferences/permissions.js b/application/basilisk/components/preferences/permissions.js
index 4944f79a4..4944f79a4 100644
--- a/browser/components/preferences/permissions.js
+++ b/application/basilisk/components/preferences/permissions.js
diff --git a/browser/components/preferences/permissions.xul b/application/basilisk/components/preferences/permissions.xul
index 7a7040864..7a7040864 100644
--- a/browser/components/preferences/permissions.xul
+++ b/application/basilisk/components/preferences/permissions.xul
diff --git a/browser/components/preferences/sanitize.js b/application/basilisk/components/preferences/sanitize.js
index 3504bffd6..3504bffd6 100644
--- a/browser/components/preferences/sanitize.js
+++ b/application/basilisk/components/preferences/sanitize.js
diff --git a/browser/components/preferences/sanitize.xul b/application/basilisk/components/preferences/sanitize.xul
index ca020ba44..ca020ba44 100644
--- a/browser/components/preferences/sanitize.xul
+++ b/application/basilisk/components/preferences/sanitize.xul
diff --git a/browser/components/preferences/selectBookmark.js b/application/basilisk/components/preferences/selectBookmark.js
index ae9b6b1c8..ae9b6b1c8 100644
--- a/browser/components/preferences/selectBookmark.js
+++ b/application/basilisk/components/preferences/selectBookmark.js
diff --git a/browser/components/preferences/selectBookmark.xul b/application/basilisk/components/preferences/selectBookmark.xul
index 5547534b6..5547534b6 100644
--- a/browser/components/preferences/selectBookmark.xul
+++ b/application/basilisk/components/preferences/selectBookmark.xul
diff --git a/browser/components/preferences/translation.js b/application/basilisk/components/preferences/translation.js
index cd570db0e..cd570db0e 100644
--- a/browser/components/preferences/translation.js
+++ b/application/basilisk/components/preferences/translation.js
diff --git a/browser/components/preferences/translation.xul b/application/basilisk/components/preferences/translation.xul
index b5dfd1b9b..b5dfd1b9b 100644
--- a/browser/components/preferences/translation.xul
+++ b/application/basilisk/components/preferences/translation.xul
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.css b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.css
index 29d7a843d..29d7a843d 100644
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.css
+++ b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.css
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js
index 31ce96347..4434f7b6a 100644
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
+++ b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js
@@ -63,13 +63,9 @@ document.addEventListener("DOMContentLoaded", function () {
  document.getElementById("favicon")
          .setAttribute("href", FAVICON_PRIVACY);
  tpToggle.addEventListener("change", toggleTrackingProtection);
- document.getElementById("startTour")
-         .addEventListener("click", dontShowIntroPanelAgain);
 
  let formatURLPref = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
                        .getService(Ci.nsIURLFormatter).formatURLPref;
- document.getElementById("startTour").setAttribute("href",
-                    formatURLPref("privacy.trackingprotection.introURL"));
  document.getElementById("learnMore").setAttribute("href",
                     formatURLPref("app.support.baseURL") + "private-browsing");
 
@@ -89,10 +85,3 @@ function toggleTrackingProtection() {
    new CustomEvent("AboutPrivateBrowsingToggleTrackingProtection",
                    {bubbles: true}));
 }
-
-function dontShowIntroPanelAgain() {
- // Ask chrome to disable the doorhanger
- document.dispatchEvent(
-   new CustomEvent("AboutPrivateBrowsingDontShowIntroPanelAgain",
-                   {bubbles: true}));
-}
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
index fb5c4ac8e..36058efa5 100644
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -69,9 +69,6 @@
 
       <section class="section-main">
         <p>&trackingProtection.description2;</p>
-        <p>
-          <a id="startTour" class="button">&trackingProtection.startTour1;</a>
-        </p>
       </section>
 
       <section class="section-main">
diff --git a/browser/components/privatebrowsing/jar.mn b/application/basilisk/components/privatebrowsing/jar.mn
index a98d65163..a98d65163 100644
--- a/browser/components/privatebrowsing/jar.mn
+++ b/application/basilisk/components/privatebrowsing/jar.mn
diff --git a/browser/components/privatebrowsing/moz.build b/application/basilisk/components/privatebrowsing/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/components/privatebrowsing/moz.build
+++ b/application/basilisk/components/privatebrowsing/moz.build
diff --git a/browser/components/search/content/search.xml b/application/basilisk/components/search/content/search.xml
index 5c67bc649..5c67bc649 100644
--- a/browser/components/search/content/search.xml
+++ b/application/basilisk/components/search/content/search.xml
diff --git a/browser/components/search/content/searchReset.js b/application/basilisk/components/search/content/searchReset.js
index b541d41da..b541d41da 100644
--- a/browser/components/search/content/searchReset.js
+++ b/application/basilisk/components/search/content/searchReset.js
diff --git a/browser/components/search/content/searchReset.xhtml b/application/basilisk/components/search/content/searchReset.xhtml
index b851dd383..b851dd383 100644
--- a/browser/components/search/content/searchReset.xhtml
+++ b/application/basilisk/components/search/content/searchReset.xhtml
diff --git a/browser/components/search/content/searchbarBindings.css b/application/basilisk/components/search/content/searchbarBindings.css
index 0429e8811..0429e8811 100644
--- a/browser/components/search/content/searchbarBindings.css
+++ b/application/basilisk/components/search/content/searchbarBindings.css
diff --git a/browser/components/search/jar.mn b/application/basilisk/components/search/jar.mn
index 089ec4bb9..089ec4bb9 100644
--- a/browser/components/search/jar.mn
+++ b/application/basilisk/components/search/jar.mn
diff --git a/browser/components/search/moz.build b/application/basilisk/components/search/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/components/search/moz.build
+++ b/application/basilisk/components/search/moz.build
diff --git a/browser/components/selfsupport/SelfSupportService.js b/application/basilisk/components/selfsupport/SelfSupportService.js
index 26148c6ff..26148c6ff 100644
--- a/browser/components/selfsupport/SelfSupportService.js
+++ b/application/basilisk/components/selfsupport/SelfSupportService.js
diff --git a/browser/components/selfsupport/SelfSupportService.manifest b/application/basilisk/components/selfsupport/SelfSupportService.manifest
index 0e87857e7..0e87857e7 100644
--- a/browser/components/selfsupport/SelfSupportService.manifest
+++ b/application/basilisk/components/selfsupport/SelfSupportService.manifest
diff --git a/browser/components/selfsupport/moz.build b/application/basilisk/components/selfsupport/moz.build
index f8923b081..f8923b081 100644
--- a/browser/components/selfsupport/moz.build
+++ b/application/basilisk/components/selfsupport/moz.build
diff --git a/browser/components/sessionstore/ContentRestore.jsm b/application/basilisk/components/sessionstore/ContentRestore.jsm
index d4972bcaf..d4972bcaf 100644
--- a/browser/components/sessionstore/ContentRestore.jsm
+++ b/application/basilisk/components/sessionstore/ContentRestore.jsm
diff --git a/browser/components/sessionstore/DocShellCapabilities.jsm b/application/basilisk/components/sessionstore/DocShellCapabilities.jsm
index 098aae86f..098aae86f 100644
--- a/browser/components/sessionstore/DocShellCapabilities.jsm
+++ b/application/basilisk/components/sessionstore/DocShellCapabilities.jsm
diff --git a/browser/components/sessionstore/FrameTree.jsm b/application/basilisk/components/sessionstore/FrameTree.jsm
index e8ed12a8f..e8ed12a8f 100644
--- a/browser/components/sessionstore/FrameTree.jsm
+++ b/application/basilisk/components/sessionstore/FrameTree.jsm
diff --git a/browser/components/sessionstore/GlobalState.jsm b/application/basilisk/components/sessionstore/GlobalState.jsm
index ac2d7c81b..ac2d7c81b 100644
--- a/browser/components/sessionstore/GlobalState.jsm
+++ b/application/basilisk/components/sessionstore/GlobalState.jsm
diff --git a/browser/components/sessionstore/PageStyle.jsm b/application/basilisk/components/sessionstore/PageStyle.jsm
index 0424ef6b1..0424ef6b1 100644
--- a/browser/components/sessionstore/PageStyle.jsm
+++ b/application/basilisk/components/sessionstore/PageStyle.jsm
diff --git a/browser/components/sessionstore/PrivacyFilter.jsm b/application/basilisk/components/sessionstore/PrivacyFilter.jsm
index 88713b402..88713b402 100644
--- a/browser/components/sessionstore/PrivacyFilter.jsm
+++ b/application/basilisk/components/sessionstore/PrivacyFilter.jsm
diff --git a/browser/components/sessionstore/PrivacyLevel.jsm b/application/basilisk/components/sessionstore/PrivacyLevel.jsm
index 135f1f959..135f1f959 100644
--- a/browser/components/sessionstore/PrivacyLevel.jsm
+++ b/application/basilisk/components/sessionstore/PrivacyLevel.jsm
diff --git a/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm b/application/basilisk/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
index ac5731160..ac5731160 100644
--- a/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
+++ b/application/basilisk/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
diff --git a/browser/components/sessionstore/RunState.jsm b/application/basilisk/components/sessionstore/RunState.jsm
index 3cdf47718..3cdf47718 100644
--- a/browser/components/sessionstore/RunState.jsm
+++ b/application/basilisk/components/sessionstore/RunState.jsm
diff --git a/browser/components/sessionstore/SessionCookies.jsm b/application/basilisk/components/sessionstore/SessionCookies.jsm
index b99ab927b..b99ab927b 100644
--- a/browser/components/sessionstore/SessionCookies.jsm
+++ b/application/basilisk/components/sessionstore/SessionCookies.jsm
diff --git a/browser/components/sessionstore/SessionFile.jsm b/application/basilisk/components/sessionstore/SessionFile.jsm
index 80c4e7790..80c4e7790 100644
--- a/browser/components/sessionstore/SessionFile.jsm
+++ b/application/basilisk/components/sessionstore/SessionFile.jsm
diff --git a/browser/components/sessionstore/SessionHistory.jsm b/application/basilisk/components/sessionstore/SessionHistory.jsm
index 3d28d87db..3d28d87db 100644
--- a/browser/components/sessionstore/SessionHistory.jsm
+++ b/application/basilisk/components/sessionstore/SessionHistory.jsm
diff --git a/browser/components/sessionstore/SessionMigration.jsm b/application/basilisk/components/sessionstore/SessionMigration.jsm
index 1aa22f1a9..1aa22f1a9 100644
--- a/browser/components/sessionstore/SessionMigration.jsm
+++ b/application/basilisk/components/sessionstore/SessionMigration.jsm
diff --git a/browser/components/sessionstore/SessionSaver.jsm b/application/basilisk/components/sessionstore/SessionSaver.jsm
index d672f8877..d672f8877 100644
--- a/browser/components/sessionstore/SessionSaver.jsm
+++ b/application/basilisk/components/sessionstore/SessionSaver.jsm
diff --git a/browser/components/sessionstore/SessionStorage.jsm b/application/basilisk/components/sessionstore/SessionStorage.jsm
index 705139ebf..705139ebf 100644
--- a/browser/components/sessionstore/SessionStorage.jsm
+++ b/application/basilisk/components/sessionstore/SessionStorage.jsm
diff --git a/browser/components/sessionstore/SessionStore.jsm b/application/basilisk/components/sessionstore/SessionStore.jsm
index 6b30943f3..6b30943f3 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/application/basilisk/components/sessionstore/SessionStore.jsm
diff --git a/browser/components/sessionstore/SessionWorker.js b/application/basilisk/components/sessionstore/SessionWorker.js
index 7d802a7df..7d802a7df 100644
--- a/browser/components/sessionstore/SessionWorker.js
+++ b/application/basilisk/components/sessionstore/SessionWorker.js
diff --git a/browser/components/sessionstore/SessionWorker.jsm b/application/basilisk/components/sessionstore/SessionWorker.jsm
index b26e531ac..b26e531ac 100644
--- a/browser/components/sessionstore/SessionWorker.jsm
+++ b/application/basilisk/components/sessionstore/SessionWorker.jsm
diff --git a/browser/components/sessionstore/StartupPerformance.jsm b/application/basilisk/components/sessionstore/StartupPerformance.jsm
index d1b77a237..d1b77a237 100644
--- a/browser/components/sessionstore/StartupPerformance.jsm
+++ b/application/basilisk/components/sessionstore/StartupPerformance.jsm
diff --git a/browser/components/sessionstore/TabAttributes.jsm b/application/basilisk/components/sessionstore/TabAttributes.jsm
index 8a29680f4..8a29680f4 100644
--- a/browser/components/sessionstore/TabAttributes.jsm
+++ b/application/basilisk/components/sessionstore/TabAttributes.jsm
diff --git a/browser/components/sessionstore/TabState.jsm b/application/basilisk/components/sessionstore/TabState.jsm
index f22c52fe3..f22c52fe3 100644
--- a/browser/components/sessionstore/TabState.jsm
+++ b/application/basilisk/components/sessionstore/TabState.jsm
diff --git a/browser/components/sessionstore/TabStateCache.jsm b/application/basilisk/components/sessionstore/TabStateCache.jsm
index 9bed315a0..9bed315a0 100644
--- a/browser/components/sessionstore/TabStateCache.jsm
+++ b/application/basilisk/components/sessionstore/TabStateCache.jsm
diff --git a/browser/components/sessionstore/TabStateFlusher.jsm b/application/basilisk/components/sessionstore/TabStateFlusher.jsm
index 6397efe9d..6397efe9d 100644
--- a/browser/components/sessionstore/TabStateFlusher.jsm
+++ b/application/basilisk/components/sessionstore/TabStateFlusher.jsm
diff --git a/browser/components/sessionstore/content/aboutSessionRestore.js b/application/basilisk/components/sessionstore/content/aboutSessionRestore.js
index 8f265235d..8f265235d 100644
--- a/browser/components/sessionstore/content/aboutSessionRestore.js
+++ b/application/basilisk/components/sessionstore/content/aboutSessionRestore.js
diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/application/basilisk/components/sessionstore/content/aboutSessionRestore.xhtml
index bcd9084e7..bcd9084e7 100644
--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/application/basilisk/components/sessionstore/content/aboutSessionRestore.xhtml
diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/application/basilisk/components/sessionstore/content/content-sessionStore.js
index 858e35750..858e35750 100644
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/application/basilisk/components/sessionstore/content/content-sessionStore.js
diff --git a/browser/components/sessionstore/jar.mn b/application/basilisk/components/sessionstore/jar.mn
index 7e5bc07dc..7e5bc07dc 100644
--- a/browser/components/sessionstore/jar.mn
+++ b/application/basilisk/components/sessionstore/jar.mn
diff --git a/browser/components/sessionstore/moz.build b/application/basilisk/components/sessionstore/moz.build
index 3117f02c7..3117f02c7 100644
--- a/browser/components/sessionstore/moz.build
+++ b/application/basilisk/components/sessionstore/moz.build
diff --git a/browser/components/sessionstore/nsISessionStartup.idl b/application/basilisk/components/sessionstore/nsISessionStartup.idl
index 2321ac310..2321ac310 100644
--- a/browser/components/sessionstore/nsISessionStartup.idl
+++ b/application/basilisk/components/sessionstore/nsISessionStartup.idl
diff --git a/browser/components/sessionstore/nsISessionStore.idl b/application/basilisk/components/sessionstore/nsISessionStore.idl
index 0d2500ef7..0d2500ef7 100644
--- a/browser/components/sessionstore/nsISessionStore.idl
+++ b/application/basilisk/components/sessionstore/nsISessionStore.idl
diff --git a/browser/components/sessionstore/nsSessionStartup.js b/application/basilisk/components/sessionstore/nsSessionStartup.js
index 7593c48ec..7593c48ec 100644
--- a/browser/components/sessionstore/nsSessionStartup.js
+++ b/application/basilisk/components/sessionstore/nsSessionStartup.js
diff --git a/browser/components/sessionstore/nsSessionStore.js b/application/basilisk/components/sessionstore/nsSessionStore.js
index 8d96178ce..8d96178ce 100644
--- a/browser/components/sessionstore/nsSessionStore.js
+++ b/application/basilisk/components/sessionstore/nsSessionStore.js
diff --git a/browser/components/sessionstore/nsSessionStore.manifest b/application/basilisk/components/sessionstore/nsSessionStore.manifest
index 9b5819c6a..9b5819c6a 100644
--- a/browser/components/sessionstore/nsSessionStore.manifest
+++ b/application/basilisk/components/sessionstore/nsSessionStore.manifest
diff --git a/browser/components/shell/ShellService.jsm b/application/basilisk/components/shell/ShellService.jsm
index cc225eae0..cc225eae0 100644
--- a/browser/components/shell/ShellService.jsm
+++ b/application/basilisk/components/shell/ShellService.jsm
diff --git a/browser/components/shell/content/setDesktopBackground.js b/application/basilisk/components/shell/content/setDesktopBackground.js
index 53cc70db0..53cc70db0 100644
--- a/browser/components/shell/content/setDesktopBackground.js
+++ b/application/basilisk/components/shell/content/setDesktopBackground.js
diff --git a/browser/components/shell/content/setDesktopBackground.xul b/application/basilisk/components/shell/content/setDesktopBackground.xul
index d7d4079e3..d7d4079e3 100644
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/application/basilisk/components/shell/content/setDesktopBackground.xul
diff --git a/browser/components/shell/jar.mn b/application/basilisk/components/shell/jar.mn
index 1f33b5d56..1f33b5d56 100644
--- a/browser/components/shell/jar.mn
+++ b/application/basilisk/components/shell/jar.mn
diff --git a/browser/components/shell/moz.build b/application/basilisk/components/shell/moz.build
index 94ec88571..94ec88571 100644
--- a/browser/components/shell/moz.build
+++ b/application/basilisk/components/shell/moz.build
diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/application/basilisk/components/shell/nsGNOMEShellService.cpp
index 613b5bffc..613b5bffc 100644
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/application/basilisk/components/shell/nsGNOMEShellService.cpp
diff --git a/browser/components/shell/nsGNOMEShellService.h b/application/basilisk/components/shell/nsGNOMEShellService.h
index a7b003802..a7b003802 100644
--- a/browser/components/shell/nsGNOMEShellService.h
+++ b/application/basilisk/components/shell/nsGNOMEShellService.h
diff --git a/browser/components/shell/nsIGNOMEShellService.idl b/application/basilisk/components/shell/nsIGNOMEShellService.idl
index 842ce5e8a..842ce5e8a 100644
--- a/browser/components/shell/nsIGNOMEShellService.idl
+++ b/application/basilisk/components/shell/nsIGNOMEShellService.idl
diff --git a/browser/components/shell/nsIMacShellService.idl b/application/basilisk/components/shell/nsIMacShellService.idl
index 6a532bbd0..6a532bbd0 100644
--- a/browser/components/shell/nsIMacShellService.idl
+++ b/application/basilisk/components/shell/nsIMacShellService.idl
diff --git a/browser/components/shell/nsIShellService.idl b/application/basilisk/components/shell/nsIShellService.idl
index 3e7e94b00..3e7e94b00 100644
--- a/browser/components/shell/nsIShellService.idl
+++ b/application/basilisk/components/shell/nsIShellService.idl
diff --git a/browser/components/shell/nsIWindowsShellService.idl b/application/basilisk/components/shell/nsIWindowsShellService.idl
index 57ed37055..57ed37055 100644
--- a/browser/components/shell/nsIWindowsShellService.idl
+++ b/application/basilisk/components/shell/nsIWindowsShellService.idl
diff --git a/browser/components/shell/nsMacShellService.cpp b/application/basilisk/components/shell/nsMacShellService.cpp
index d8d64039d..d8d64039d 100644
--- a/browser/components/shell/nsMacShellService.cpp
+++ b/application/basilisk/components/shell/nsMacShellService.cpp
diff --git a/browser/components/shell/nsMacShellService.h b/application/basilisk/components/shell/nsMacShellService.h
index db9527809..db9527809 100644
--- a/browser/components/shell/nsMacShellService.h
+++ b/application/basilisk/components/shell/nsMacShellService.h
diff --git a/browser/components/shell/nsSetDefaultBrowser.js b/application/basilisk/components/shell/nsSetDefaultBrowser.js
index c7a78c538..c7a78c538 100644
--- a/browser/components/shell/nsSetDefaultBrowser.js
+++ b/application/basilisk/components/shell/nsSetDefaultBrowser.js
diff --git a/browser/components/shell/nsSetDefaultBrowser.manifest b/application/basilisk/components/shell/nsSetDefaultBrowser.manifest
index bf3c0f04f..bf3c0f04f 100644
--- a/browser/components/shell/nsSetDefaultBrowser.manifest
+++ b/application/basilisk/components/shell/nsSetDefaultBrowser.manifest
diff --git a/browser/components/shell/nsShellService.h b/application/basilisk/components/shell/nsShellService.h
index 516a8423a..516a8423a 100644
--- a/browser/components/shell/nsShellService.h
+++ b/application/basilisk/components/shell/nsShellService.h
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/application/basilisk/components/shell/nsWindowsShellService.cpp
index 879b0c7f0..879b0c7f0 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/application/basilisk/components/shell/nsWindowsShellService.cpp
diff --git a/browser/components/shell/nsWindowsShellService.h b/application/basilisk/components/shell/nsWindowsShellService.h
index 06c6c3c9b..06c6c3c9b 100644
--- a/browser/components/shell/nsWindowsShellService.h
+++ b/application/basilisk/components/shell/nsWindowsShellService.h
diff --git a/browser/components/syncedtabs/EventEmitter.jsm b/application/basilisk/components/syncedtabs/EventEmitter.jsm
index ec3225f0f..ec3225f0f 100644
--- a/browser/components/syncedtabs/EventEmitter.jsm
+++ b/application/basilisk/components/syncedtabs/EventEmitter.jsm
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/application/basilisk/components/syncedtabs/SyncedTabsDeckComponent.js
index c35277795..c35277795 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/application/basilisk/components/syncedtabs/SyncedTabsDeckComponent.js
diff --git a/browser/components/syncedtabs/SyncedTabsDeckStore.js b/application/basilisk/components/syncedtabs/SyncedTabsDeckStore.js
index ede6914c8..ede6914c8 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckStore.js
+++ b/application/basilisk/components/syncedtabs/SyncedTabsDeckStore.js
diff --git a/browser/components/syncedtabs/SyncedTabsDeckView.js b/application/basilisk/components/syncedtabs/SyncedTabsDeckView.js
index e9efff323..e9efff323 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckView.js
+++ b/application/basilisk/components/syncedtabs/SyncedTabsDeckView.js
diff --git a/browser/components/syncedtabs/SyncedTabsListStore.js b/application/basilisk/components/syncedtabs/SyncedTabsListStore.js
index 8f03d9a89..8f03d9a89 100644
--- a/browser/components/syncedtabs/SyncedTabsListStore.js
+++ b/application/basilisk/components/syncedtabs/SyncedTabsListStore.js
diff --git a/browser/components/syncedtabs/TabListComponent.js b/application/basilisk/components/syncedtabs/TabListComponent.js
index d3aace8f9..d3aace8f9 100644
--- a/browser/components/syncedtabs/TabListComponent.js
+++ b/application/basilisk/components/syncedtabs/TabListComponent.js
diff --git a/browser/components/syncedtabs/TabListView.js b/application/basilisk/components/syncedtabs/TabListView.js
index dab15101b..dab15101b 100644
--- a/browser/components/syncedtabs/TabListView.js
+++ b/application/basilisk/components/syncedtabs/TabListView.js
diff --git a/browser/components/syncedtabs/jar.mn b/application/basilisk/components/syncedtabs/jar.mn
index ba2b105a1..ba2b105a1 100644
--- a/browser/components/syncedtabs/jar.mn
+++ b/application/basilisk/components/syncedtabs/jar.mn
diff --git a/browser/components/syncedtabs/moz.build b/application/basilisk/components/syncedtabs/moz.build
index a6515d6a1..a6515d6a1 100644
--- a/browser/components/syncedtabs/moz.build
+++ b/application/basilisk/components/syncedtabs/moz.build
diff --git a/browser/components/syncedtabs/sidebar.js b/application/basilisk/components/syncedtabs/sidebar.js
index 84df95e9d..84df95e9d 100644
--- a/browser/components/syncedtabs/sidebar.js
+++ b/application/basilisk/components/syncedtabs/sidebar.js
diff --git a/browser/components/syncedtabs/sidebar.xhtml b/application/basilisk/components/syncedtabs/sidebar.xhtml
index 3efcbea0e..3efcbea0e 100644
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/application/basilisk/components/syncedtabs/sidebar.xhtml
diff --git a/browser/components/syncedtabs/util.js b/application/basilisk/components/syncedtabs/util.js
index e09a1a528..e09a1a528 100644
--- a/browser/components/syncedtabs/util.js
+++ b/application/basilisk/components/syncedtabs/util.js
diff --git a/browser/components/translation/BingTranslator.jsm b/application/basilisk/components/translation/BingTranslator.jsm
index fc1cc942a..fc1cc942a 100644
--- a/browser/components/translation/BingTranslator.jsm
+++ b/application/basilisk/components/translation/BingTranslator.jsm
diff --git a/browser/components/translation/LanguageDetector.jsm b/application/basilisk/components/translation/LanguageDetector.jsm
index a65d6eda1..a65d6eda1 100644
--- a/browser/components/translation/LanguageDetector.jsm
+++ b/application/basilisk/components/translation/LanguageDetector.jsm
diff --git a/browser/components/translation/Translation.jsm b/application/basilisk/components/translation/Translation.jsm
index 15a847c13..15a847c13 100644
--- a/browser/components/translation/Translation.jsm
+++ b/application/basilisk/components/translation/Translation.jsm
diff --git a/browser/components/translation/TranslationContentHandler.jsm b/application/basilisk/components/translation/TranslationContentHandler.jsm
index 3b0d59ddd..3b0d59ddd 100644
--- a/browser/components/translation/TranslationContentHandler.jsm
+++ b/application/basilisk/components/translation/TranslationContentHandler.jsm
diff --git a/browser/components/translation/TranslationDocument.jsm b/application/basilisk/components/translation/TranslationDocument.jsm
index 058d07a49..058d07a49 100644
--- a/browser/components/translation/TranslationDocument.jsm
+++ b/application/basilisk/components/translation/TranslationDocument.jsm
diff --git a/browser/components/translation/YandexTranslator.jsm b/application/basilisk/components/translation/YandexTranslator.jsm
index ab92e0962..ab92e0962 100644
--- a/browser/components/translation/YandexTranslator.jsm
+++ b/application/basilisk/components/translation/YandexTranslator.jsm
diff --git a/browser/components/translation/cld2/Makefile b/application/basilisk/components/translation/cld2/Makefile
index 080a7be3d..080a7be3d 100644
--- a/browser/components/translation/cld2/Makefile
+++ b/application/basilisk/components/translation/cld2/Makefile
diff --git a/browser/components/translation/cld2/cld-worker.js b/application/basilisk/components/translation/cld2/cld-worker.js
index b06021bfe..b06021bfe 100644
--- a/browser/components/translation/cld2/cld-worker.js
+++ b/application/basilisk/components/translation/cld2/cld-worker.js
diff --git a/browser/components/translation/cld2/cld-worker.js.mem b/application/basilisk/components/translation/cld2/cld-worker.js.mem
index c07ed5d53..c07ed5d53 100644
--- a/browser/components/translation/cld2/cld-worker.js.mem
+++ b/application/basilisk/components/translation/cld2/cld-worker.js.mem
diff --git a/browser/components/translation/cld2/cld.idl b/application/basilisk/components/translation/cld2/cld.idl
index e426dd303..e426dd303 100644
--- a/browser/components/translation/cld2/cld.idl
+++ b/application/basilisk/components/translation/cld2/cld.idl
diff --git a/browser/components/translation/cld2/cldapp.cc b/application/basilisk/components/translation/cld2/cldapp.cc
index 4750cc54b..4750cc54b 100644
--- a/browser/components/translation/cld2/cldapp.cc
+++ b/application/basilisk/components/translation/cld2/cldapp.cc
diff --git a/browser/components/translation/cld2/internal/LICENSE b/application/basilisk/components/translation/cld2/internal/LICENSE
index d64569567..d64569567 100644
--- a/browser/components/translation/cld2/internal/LICENSE
+++ b/application/basilisk/components/translation/cld2/internal/LICENSE
diff --git a/browser/components/translation/cld2/internal/cld2_dynamic_data.h b/application/basilisk/components/translation/cld2/internal/cld2_dynamic_data.h
index 693d35b38..693d35b38 100644
--- a/browser/components/translation/cld2/internal/cld2_dynamic_data.h
+++ b/application/basilisk/components/translation/cld2/internal/cld2_dynamic_data.h
diff --git a/browser/components/translation/cld2/internal/cld2_dynamic_data_loader.h b/application/basilisk/components/translation/cld2/internal/cld2_dynamic_data_loader.h
index 9beba0fb3..9beba0fb3 100644
--- a/browser/components/translation/cld2/internal/cld2_dynamic_data_loader.h
+++ b/application/basilisk/components/translation/cld2/internal/cld2_dynamic_data_loader.h
diff --git a/browser/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc b/application/basilisk/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc
index d08b66c5e..d08b66c5e 100644
--- a/browser/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc
diff --git a/browser/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc b/application/basilisk/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc
index 035e8fb26..035e8fb26 100644
--- a/browser/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc
diff --git a/browser/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc b/application/basilisk/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc
index e8171caa3..e8171caa3 100644
--- a/browser/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc
diff --git a/browser/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc b/application/basilisk/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc
index 45018c8e6..45018c8e6 100644
--- a/browser/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc
diff --git a/browser/components/translation/cld2/internal/cld2tablesummary.h b/application/basilisk/components/translation/cld2/internal/cld2tablesummary.h
index a30bbb56f..a30bbb56f 100644
--- a/browser/components/translation/cld2/internal/cld2tablesummary.h
+++ b/application/basilisk/components/translation/cld2/internal/cld2tablesummary.h
diff --git a/browser/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc b/application/basilisk/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc
index 6f6d732b2..6f6d732b2 100644
--- a/browser/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc
diff --git a/browser/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc b/application/basilisk/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc
index 06ad80643..06ad80643 100644
--- a/browser/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc
diff --git a/browser/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc b/application/basilisk/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc
index c57f26363..c57f26363 100644
--- a/browser/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc
+++ b/application/basilisk/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc
diff --git a/browser/components/translation/cld2/internal/cldutil.cc b/application/basilisk/components/translation/cld2/internal/cldutil.cc
index ecda9a53e..ecda9a53e 100644
--- a/browser/components/translation/cld2/internal/cldutil.cc
+++ b/application/basilisk/components/translation/cld2/internal/cldutil.cc
diff --git a/browser/components/translation/cld2/internal/cldutil.h b/application/basilisk/components/translation/cld2/internal/cldutil.h
index 9712b30a9..9712b30a9 100644
--- a/browser/components/translation/cld2/internal/cldutil.h
+++ b/application/basilisk/components/translation/cld2/internal/cldutil.h
diff --git a/browser/components/translation/cld2/internal/cldutil_shared.cc b/application/basilisk/components/translation/cld2/internal/cldutil_shared.cc
index f111473af..f111473af 100644
--- a/browser/components/translation/cld2/internal/cldutil_shared.cc
+++ b/application/basilisk/components/translation/cld2/internal/cldutil_shared.cc
diff --git a/browser/components/translation/cld2/internal/cldutil_shared.h b/application/basilisk/components/translation/cld2/internal/cldutil_shared.h
index 5e3b8dfa8..5e3b8dfa8 100644
--- a/browser/components/translation/cld2/internal/cldutil_shared.h
+++ b/application/basilisk/components/translation/cld2/internal/cldutil_shared.h
diff --git a/browser/components/translation/cld2/internal/compact_lang_det.cc b/application/basilisk/components/translation/cld2/internal/compact_lang_det.cc
index ccc6588fc..ccc6588fc 100644
--- a/browser/components/translation/cld2/internal/compact_lang_det.cc
+++ b/application/basilisk/components/translation/cld2/internal/compact_lang_det.cc
diff --git a/browser/components/translation/cld2/internal/compact_lang_det_hint_code.cc b/application/basilisk/components/translation/cld2/internal/compact_lang_det_hint_code.cc
index 9bde8a86a..9bde8a86a 100644
--- a/browser/components/translation/cld2/internal/compact_lang_det_hint_code.cc
+++ b/application/basilisk/components/translation/cld2/internal/compact_lang_det_hint_code.cc
diff --git a/browser/components/translation/cld2/internal/compact_lang_det_hint_code.h b/application/basilisk/components/translation/cld2/internal/compact_lang_det_hint_code.h
index df8948a27..df8948a27 100644
--- a/browser/components/translation/cld2/internal/compact_lang_det_hint_code.h
+++ b/application/basilisk/components/translation/cld2/internal/compact_lang_det_hint_code.h
diff --git a/browser/components/translation/cld2/internal/compact_lang_det_impl.cc b/application/basilisk/components/translation/cld2/internal/compact_lang_det_impl.cc
index e01fdcef4..e01fdcef4 100644
--- a/browser/components/translation/cld2/internal/compact_lang_det_impl.cc
+++ b/application/basilisk/components/translation/cld2/internal/compact_lang_det_impl.cc
diff --git a/browser/components/translation/cld2/internal/compact_lang_det_impl.h b/application/basilisk/components/translation/cld2/internal/compact_lang_det_impl.h
index 6cadb3d9f..6cadb3d9f 100644
--- a/browser/components/translation/cld2/internal/compact_lang_det_impl.h
+++ b/application/basilisk/components/translation/cld2/internal/compact_lang_det_impl.h
diff --git a/browser/components/translation/cld2/internal/debug.h b/application/basilisk/components/translation/cld2/internal/debug.h
index 471a35d6c..471a35d6c 100644
--- a/browser/components/translation/cld2/internal/debug.h
+++ b/application/basilisk/components/translation/cld2/internal/debug.h
diff --git a/browser/components/translation/cld2/internal/debug_empty.cc b/application/basilisk/components/translation/cld2/internal/debug_empty.cc
index 19f17e312..19f17e312 100644
--- a/browser/components/translation/cld2/internal/debug_empty.cc
+++ b/application/basilisk/components/translation/cld2/internal/debug_empty.cc
diff --git a/browser/components/translation/cld2/internal/fixunicodevalue.cc b/application/basilisk/components/translation/cld2/internal/fixunicodevalue.cc
index 03edf7c51..03edf7c51 100644
--- a/browser/components/translation/cld2/internal/fixunicodevalue.cc
+++ b/application/basilisk/components/translation/cld2/internal/fixunicodevalue.cc
diff --git a/browser/components/translation/cld2/internal/fixunicodevalue.h b/application/basilisk/components/translation/cld2/internal/fixunicodevalue.h
index 5d0f7f55f..5d0f7f55f 100644
--- a/browser/components/translation/cld2/internal/fixunicodevalue.h
+++ b/application/basilisk/components/translation/cld2/internal/fixunicodevalue.h
diff --git a/browser/components/translation/cld2/internal/generated_distinct_bi_0.cc b/application/basilisk/components/translation/cld2/internal/generated_distinct_bi_0.cc
index e9e763abb..e9e763abb 100644
--- a/browser/components/translation/cld2/internal/generated_distinct_bi_0.cc
+++ b/application/basilisk/components/translation/cld2/internal/generated_distinct_bi_0.cc
diff --git a/browser/components/translation/cld2/internal/generated_entities.cc b/application/basilisk/components/translation/cld2/internal/generated_entities.cc
index 26a6f7bb3..26a6f7bb3 100644
--- a/browser/components/translation/cld2/internal/generated_entities.cc
+++ b/application/basilisk/components/translation/cld2/internal/generated_entities.cc
diff --git a/browser/components/translation/cld2/internal/generated_language.cc b/application/basilisk/components/translation/cld2/internal/generated_language.cc
index dc4df67cc..dc4df67cc 100644
--- a/browser/components/translation/cld2/internal/generated_language.cc
+++ b/application/basilisk/components/translation/cld2/internal/generated_language.cc
diff --git a/browser/components/translation/cld2/internal/generated_language.h b/application/basilisk/components/translation/cld2/internal/generated_language.h
index 4e9dbc441..4e9dbc441 100644
--- a/browser/components/translation/cld2/internal/generated_language.h
+++ b/application/basilisk/components/translation/cld2/internal/generated_language.h
diff --git a/browser/components/translation/cld2/internal/generated_ulscript.cc b/application/basilisk/components/translation/cld2/internal/generated_ulscript.cc
index f15941d4e..f15941d4e 100644
--- a/browser/components/translation/cld2/internal/generated_ulscript.cc
+++ b/application/basilisk/components/translation/cld2/internal/generated_ulscript.cc
diff --git a/browser/components/translation/cld2/internal/generated_ulscript.h b/application/basilisk/components/translation/cld2/internal/generated_ulscript.h
index 845b9c191..845b9c191 100644
--- a/browser/components/translation/cld2/internal/generated_ulscript.h
+++ b/application/basilisk/components/translation/cld2/internal/generated_ulscript.h
diff --git a/browser/components/translation/cld2/internal/getonescriptspan.cc b/application/basilisk/components/translation/cld2/internal/getonescriptspan.cc
index 6bdd4871b..6bdd4871b 100644
--- a/browser/components/translation/cld2/internal/getonescriptspan.cc
+++ b/application/basilisk/components/translation/cld2/internal/getonescriptspan.cc
diff --git a/browser/components/translation/cld2/internal/getonescriptspan.h b/application/basilisk/components/translation/cld2/internal/getonescriptspan.h
index a8999d069..a8999d069 100644
--- a/browser/components/translation/cld2/internal/getonescriptspan.h
+++ b/application/basilisk/components/translation/cld2/internal/getonescriptspan.h
diff --git a/browser/components/translation/cld2/internal/integral_types.h b/application/basilisk/components/translation/cld2/internal/integral_types.h
index 1e63adb67..1e63adb67 100644
--- a/browser/components/translation/cld2/internal/integral_types.h
+++ b/application/basilisk/components/translation/cld2/internal/integral_types.h
diff --git a/browser/components/translation/cld2/internal/lang_script.cc b/application/basilisk/components/translation/cld2/internal/lang_script.cc
index 10fc4557e..10fc4557e 100644
--- a/browser/components/translation/cld2/internal/lang_script.cc
+++ b/application/basilisk/components/translation/cld2/internal/lang_script.cc
diff --git a/browser/components/translation/cld2/internal/lang_script.h b/application/basilisk/components/translation/cld2/internal/lang_script.h
index 9311707e4..9311707e4 100644
--- a/browser/components/translation/cld2/internal/lang_script.h
+++ b/application/basilisk/components/translation/cld2/internal/lang_script.h
diff --git a/browser/components/translation/cld2/internal/langspan.h b/application/basilisk/components/translation/cld2/internal/langspan.h
index be2889038..be2889038 100644
--- a/browser/components/translation/cld2/internal/langspan.h
+++ b/application/basilisk/components/translation/cld2/internal/langspan.h
diff --git a/browser/components/translation/cld2/internal/offsetmap.cc b/application/basilisk/components/translation/cld2/internal/offsetmap.cc
index 84609a71f..84609a71f 100644
--- a/browser/components/translation/cld2/internal/offsetmap.cc
+++ b/application/basilisk/components/translation/cld2/internal/offsetmap.cc
diff --git a/browser/components/translation/cld2/internal/offsetmap.h b/application/basilisk/components/translation/cld2/internal/offsetmap.h
index 632555400..632555400 100644
--- a/browser/components/translation/cld2/internal/offsetmap.h
+++ b/application/basilisk/components/translation/cld2/internal/offsetmap.h
diff --git a/browser/components/translation/cld2/internal/port.h b/application/basilisk/components/translation/cld2/internal/port.h
index 077e35a2f..077e35a2f 100644
--- a/browser/components/translation/cld2/internal/port.h
+++ b/application/basilisk/components/translation/cld2/internal/port.h
diff --git a/browser/components/translation/cld2/internal/scoreonescriptspan.cc b/application/basilisk/components/translation/cld2/internal/scoreonescriptspan.cc
index b2cebc02e..b2cebc02e 100644
--- a/browser/components/translation/cld2/internal/scoreonescriptspan.cc
+++ b/application/basilisk/components/translation/cld2/internal/scoreonescriptspan.cc
diff --git a/browser/components/translation/cld2/internal/scoreonescriptspan.h b/application/basilisk/components/translation/cld2/internal/scoreonescriptspan.h
index 8fe717b8f..8fe717b8f 100644
--- a/browser/components/translation/cld2/internal/scoreonescriptspan.h
+++ b/application/basilisk/components/translation/cld2/internal/scoreonescriptspan.h
diff --git a/browser/components/translation/cld2/internal/stringpiece.h b/application/basilisk/components/translation/cld2/internal/stringpiece.h
index 18cc4a7cc..18cc4a7cc 100644
--- a/browser/components/translation/cld2/internal/stringpiece.h
+++ b/application/basilisk/components/translation/cld2/internal/stringpiece.h
diff --git a/browser/components/translation/cld2/internal/tote.cc b/application/basilisk/components/translation/cld2/internal/tote.cc
index fbaba7d5c..fbaba7d5c 100644
--- a/browser/components/translation/cld2/internal/tote.cc
+++ b/application/basilisk/components/translation/cld2/internal/tote.cc
diff --git a/browser/components/translation/cld2/internal/tote.h b/application/basilisk/components/translation/cld2/internal/tote.h
index cd45592ec..cd45592ec 100644
--- a/browser/components/translation/cld2/internal/tote.h
+++ b/application/basilisk/components/translation/cld2/internal/tote.h
diff --git a/browser/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h b/application/basilisk/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h
index 2eeedf840..2eeedf840 100644
--- a/browser/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h
+++ b/application/basilisk/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h
diff --git a/browser/components/translation/cld2/internal/utf8repl_lettermarklower.h b/application/basilisk/components/translation/cld2/internal/utf8repl_lettermarklower.h
index bfef21d65..bfef21d65 100644
--- a/browser/components/translation/cld2/internal/utf8repl_lettermarklower.h
+++ b/application/basilisk/components/translation/cld2/internal/utf8repl_lettermarklower.h
diff --git a/browser/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h b/application/basilisk/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h
index c71d47bf6..c71d47bf6 100644
--- a/browser/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h
+++ b/application/basilisk/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h
diff --git a/browser/components/translation/cld2/internal/utf8statetable.cc b/application/basilisk/components/translation/cld2/internal/utf8statetable.cc
index 8c97123d8..8c97123d8 100644
--- a/browser/components/translation/cld2/internal/utf8statetable.cc
+++ b/application/basilisk/components/translation/cld2/internal/utf8statetable.cc
diff --git a/browser/components/translation/cld2/internal/utf8statetable.h b/application/basilisk/components/translation/cld2/internal/utf8statetable.h
index 55c00f45e..55c00f45e 100644
--- a/browser/components/translation/cld2/internal/utf8statetable.h
+++ b/application/basilisk/components/translation/cld2/internal/utf8statetable.h
diff --git a/browser/components/translation/cld2/post.js b/application/basilisk/components/translation/cld2/post.js
index a3e8b8522..a3e8b8522 100644
--- a/browser/components/translation/cld2/post.js
+++ b/application/basilisk/components/translation/cld2/post.js
diff --git a/browser/components/translation/cld2/public/compact_lang_det.h b/application/basilisk/components/translation/cld2/public/compact_lang_det.h
index da59abd63..da59abd63 100644
--- a/browser/components/translation/cld2/public/compact_lang_det.h
+++ b/application/basilisk/components/translation/cld2/public/compact_lang_det.h
diff --git a/browser/components/translation/cld2/public/encodings.h b/application/basilisk/components/translation/cld2/public/encodings.h
index 1eb8f0a15..1eb8f0a15 100644
--- a/browser/components/translation/cld2/public/encodings.h
+++ b/application/basilisk/components/translation/cld2/public/encodings.h
diff --git a/browser/components/translation/jar.mn b/application/basilisk/components/translation/jar.mn
index be744cb9e..be744cb9e 100644
--- a/browser/components/translation/jar.mn
+++ b/application/basilisk/components/translation/jar.mn
diff --git a/browser/components/translation/microsoft-translator-attribution.png b/application/basilisk/components/translation/microsoft-translator-attribution.png
index d9d277461..d9d277461 100644
--- a/browser/components/translation/microsoft-translator-attribution.png
+++ b/application/basilisk/components/translation/microsoft-translator-attribution.png
diff --git a/browser/components/translation/moz.build b/application/basilisk/components/translation/moz.build
index ac0165230..ac0165230 100644
--- a/browser/components/translation/moz.build
+++ b/application/basilisk/components/translation/moz.build
diff --git a/browser/components/translation/translation-infobar.xml b/application/basilisk/components/translation/translation-infobar.xml
index db0695c03..db0695c03 100644
--- a/browser/components/translation/translation-infobar.xml
+++ b/application/basilisk/components/translation/translation-infobar.xml
diff --git a/browser/components/webextensions/.eslintrc.js b/application/basilisk/components/webextensions/.eslintrc.js
index 81a11c4ac..81a11c4ac 100644
--- a/browser/components/webextensions/.eslintrc.js
+++ b/application/basilisk/components/webextensions/.eslintrc.js
diff --git a/browser/components/webextensions/ext-bookmarks.js b/application/basilisk/components/webextensions/ext-bookmarks.js
index 399f6212d..399f6212d 100644
--- a/browser/components/webextensions/ext-bookmarks.js
+++ b/application/basilisk/components/webextensions/ext-bookmarks.js
diff --git a/browser/components/webextensions/ext-browserAction.js b/application/basilisk/components/webextensions/ext-browserAction.js
index 2c82ac701..2c82ac701 100644
--- a/browser/components/webextensions/ext-browserAction.js
+++ b/application/basilisk/components/webextensions/ext-browserAction.js
diff --git a/browser/components/webextensions/ext-c-contextMenus.js b/application/basilisk/components/webextensions/ext-c-contextMenus.js
index 9fde90808..9fde90808 100644
--- a/browser/components/webextensions/ext-c-contextMenus.js
+++ b/application/basilisk/components/webextensions/ext-c-contextMenus.js
diff --git a/browser/components/webextensions/ext-c-omnibox.js b/application/basilisk/components/webextensions/ext-c-omnibox.js
index 3b9b6e2f7..3b9b6e2f7 100644
--- a/browser/components/webextensions/ext-c-omnibox.js
+++ b/application/basilisk/components/webextensions/ext-c-omnibox.js
diff --git a/browser/components/webextensions/ext-c-tabs.js b/application/basilisk/components/webextensions/ext-c-tabs.js
index d5ce9fbf9..d5ce9fbf9 100644
--- a/browser/components/webextensions/ext-c-tabs.js
+++ b/application/basilisk/components/webextensions/ext-c-tabs.js
diff --git a/browser/components/webextensions/ext-commands.js b/application/basilisk/components/webextensions/ext-commands.js
index b6e7ab3d1..b6e7ab3d1 100644
--- a/browser/components/webextensions/ext-commands.js
+++ b/application/basilisk/components/webextensions/ext-commands.js
diff --git a/browser/components/webextensions/ext-contextMenus.js b/application/basilisk/components/webextensions/ext-contextMenus.js
index b3bf8aa53..b3bf8aa53 100644
--- a/browser/components/webextensions/ext-contextMenus.js
+++ b/application/basilisk/components/webextensions/ext-contextMenus.js
diff --git a/browser/components/webextensions/ext-desktop-runtime.js b/application/basilisk/components/webextensions/ext-desktop-runtime.js
index 0fdb45562..0fdb45562 100644
--- a/browser/components/webextensions/ext-desktop-runtime.js
+++ b/application/basilisk/components/webextensions/ext-desktop-runtime.js
diff --git a/browser/components/webextensions/ext-history.js b/application/basilisk/components/webextensions/ext-history.js
index a47df1621..a47df1621 100644
--- a/browser/components/webextensions/ext-history.js
+++ b/application/basilisk/components/webextensions/ext-history.js
diff --git a/browser/components/webextensions/ext-omnibox.js b/application/basilisk/components/webextensions/ext-omnibox.js
index 9b2f60ca4..9b2f60ca4 100644
--- a/browser/components/webextensions/ext-omnibox.js
+++ b/application/basilisk/components/webextensions/ext-omnibox.js
diff --git a/browser/components/webextensions/ext-pageAction.js b/application/basilisk/components/webextensions/ext-pageAction.js
index 5bf3a9c70..5bf3a9c70 100644
--- a/browser/components/webextensions/ext-pageAction.js
+++ b/application/basilisk/components/webextensions/ext-pageAction.js
diff --git a/browser/components/webextensions/ext-sessions.js b/application/basilisk/components/webextensions/ext-sessions.js
index 4c13a1ac3..4c13a1ac3 100644
--- a/browser/components/webextensions/ext-sessions.js
+++ b/application/basilisk/components/webextensions/ext-sessions.js
diff --git a/browser/components/webextensions/ext-tabs.js b/application/basilisk/components/webextensions/ext-tabs.js
index bb575aaab..bb575aaab 100644
--- a/browser/components/webextensions/ext-tabs.js
+++ b/application/basilisk/components/webextensions/ext-tabs.js
diff --git a/browser/components/webextensions/ext-utils.js b/application/basilisk/components/webextensions/ext-utils.js
index 75b2f4bd4..75b2f4bd4 100644
--- a/browser/components/webextensions/ext-utils.js
+++ b/application/basilisk/components/webextensions/ext-utils.js
diff --git a/browser/components/webextensions/ext-windows.js b/application/basilisk/components/webextensions/ext-windows.js
index 5956ae15b..5956ae15b 100644
--- a/browser/components/webextensions/ext-windows.js
+++ b/application/basilisk/components/webextensions/ext-windows.js
diff --git a/browser/components/webextensions/extension-mac-panel.css b/application/basilisk/components/webextensions/extension-mac-panel.css
index 2e9ed6bdb..2e9ed6bdb 100644
--- a/browser/components/webextensions/extension-mac-panel.css
+++ b/application/basilisk/components/webextensions/extension-mac-panel.css
diff --git a/browser/components/webextensions/extension-mac.css b/application/basilisk/components/webextensions/extension-mac.css
index 49cd3b359..49cd3b359 100644
--- a/browser/components/webextensions/extension-mac.css
+++ b/application/basilisk/components/webextensions/extension-mac.css
diff --git a/browser/components/webextensions/extension-win-panel.css b/application/basilisk/components/webextensions/extension-win-panel.css
index 9da6da14c..9da6da14c 100644
--- a/browser/components/webextensions/extension-win-panel.css
+++ b/application/basilisk/components/webextensions/extension-win-panel.css
diff --git a/browser/components/webextensions/extension.css b/application/basilisk/components/webextensions/extension.css
index 6b59033e3..6b59033e3 100644
--- a/browser/components/webextensions/extension.css
+++ b/application/basilisk/components/webextensions/extension.css
diff --git a/browser/components/webextensions/extension.svg b/application/basilisk/components/webextensions/extension.svg
index a16455253..a16455253 100644
--- a/browser/components/webextensions/extension.svg
+++ b/application/basilisk/components/webextensions/extension.svg
diff --git a/browser/components/webextensions/extensions-browser.manifest b/application/basilisk/components/webextensions/extensions-browser.manifest
index ed5cca813..ed5cca813 100644
--- a/browser/components/webextensions/extensions-browser.manifest
+++ b/application/basilisk/components/webextensions/extensions-browser.manifest
diff --git a/browser/components/webextensions/jar.mn b/application/basilisk/components/webextensions/jar.mn
index a7b506ec4..a7b506ec4 100644
--- a/browser/components/webextensions/jar.mn
+++ b/application/basilisk/components/webextensions/jar.mn
diff --git a/browser/components/webextensions/moz.build b/application/basilisk/components/webextensions/moz.build
index 116e90415..116e90415 100644
--- a/browser/components/webextensions/moz.build
+++ b/application/basilisk/components/webextensions/moz.build
diff --git a/browser/components/webextensions/schemas/LICENSE b/application/basilisk/components/webextensions/schemas/LICENSE
index 9314092fd..9314092fd 100644
--- a/browser/components/webextensions/schemas/LICENSE
+++ b/application/basilisk/components/webextensions/schemas/LICENSE
diff --git a/browser/components/webextensions/schemas/bookmarks.json b/application/basilisk/components/webextensions/schemas/bookmarks.json
index fb74c633e..fb74c633e 100644
--- a/browser/components/webextensions/schemas/bookmarks.json
+++ b/application/basilisk/components/webextensions/schemas/bookmarks.json
diff --git a/browser/components/webextensions/schemas/browser_action.json b/application/basilisk/components/webextensions/schemas/browser_action.json
index 1a7da956a..1a7da956a 100644
--- a/browser/components/webextensions/schemas/browser_action.json
+++ b/application/basilisk/components/webextensions/schemas/browser_action.json
diff --git a/browser/components/webextensions/schemas/commands.json b/application/basilisk/components/webextensions/schemas/commands.json
index a1632088e..a1632088e 100644
--- a/browser/components/webextensions/schemas/commands.json
+++ b/application/basilisk/components/webextensions/schemas/commands.json
diff --git a/browser/components/webextensions/schemas/context_menus.json b/application/basilisk/components/webextensions/schemas/context_menus.json
index b31af51f3..b31af51f3 100644
--- a/browser/components/webextensions/schemas/context_menus.json
+++ b/application/basilisk/components/webextensions/schemas/context_menus.json
diff --git a/browser/components/webextensions/schemas/context_menus_internal.json b/application/basilisk/components/webextensions/schemas/context_menus_internal.json
index c3cb7aff0..c3cb7aff0 100644
--- a/browser/components/webextensions/schemas/context_menus_internal.json
+++ b/application/basilisk/components/webextensions/schemas/context_menus_internal.json
diff --git a/browser/components/webextensions/schemas/history.json b/application/basilisk/components/webextensions/schemas/history.json
index e05569e38..e05569e38 100644
--- a/browser/components/webextensions/schemas/history.json
+++ b/application/basilisk/components/webextensions/schemas/history.json
diff --git a/browser/components/webextensions/schemas/jar.mn b/application/basilisk/components/webextensions/schemas/jar.mn
index c9fc9a808..c9fc9a808 100644
--- a/browser/components/webextensions/schemas/jar.mn
+++ b/application/basilisk/components/webextensions/schemas/jar.mn
diff --git a/browser/components/webextensions/schemas/moz.build b/application/basilisk/components/webextensions/schemas/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/components/webextensions/schemas/moz.build
+++ b/application/basilisk/components/webextensions/schemas/moz.build
diff --git a/browser/components/webextensions/schemas/omnibox.json b/application/basilisk/components/webextensions/schemas/omnibox.json
index 34428fab7..34428fab7 100644
--- a/browser/components/webextensions/schemas/omnibox.json
+++ b/application/basilisk/components/webextensions/schemas/omnibox.json
diff --git a/browser/components/webextensions/schemas/page_action.json b/application/basilisk/components/webextensions/schemas/page_action.json
index 126378ca5..126378ca5 100644
--- a/browser/components/webextensions/schemas/page_action.json
+++ b/application/basilisk/components/webextensions/schemas/page_action.json
diff --git a/browser/components/webextensions/schemas/sessions.json b/application/basilisk/components/webextensions/schemas/sessions.json
index 690bb8ebc..690bb8ebc 100644
--- a/browser/components/webextensions/schemas/sessions.json
+++ b/application/basilisk/components/webextensions/schemas/sessions.json
diff --git a/browser/components/webextensions/schemas/tabs.json b/application/basilisk/components/webextensions/schemas/tabs.json
index 23ce33a4b..23ce33a4b 100644
--- a/browser/components/webextensions/schemas/tabs.json
+++ b/application/basilisk/components/webextensions/schemas/tabs.json
diff --git a/browser/components/webextensions/schemas/windows.json b/application/basilisk/components/webextensions/schemas/windows.json
index 8453358b5..8453358b5 100644
--- a/browser/components/webextensions/schemas/windows.json
+++ b/application/basilisk/components/webextensions/schemas/windows.json
diff --git a/browser/config/mozconfig b/application/basilisk/config/mozconfig
index ad2e3a4ea..ad2e3a4ea 100644
--- a/browser/config/mozconfig
+++ b/application/basilisk/config/mozconfig
diff --git a/browser/config/mozconfigs/common b/application/basilisk/config/mozconfigs/common
index febf5622f..febf5622f 100644
--- a/browser/config/mozconfigs/common
+++ b/application/basilisk/config/mozconfigs/common
diff --git a/browser/config/mozconfigs/linux32/artifact b/application/basilisk/config/mozconfigs/linux32/artifact
index 29eb8ba1c..29eb8ba1c 100644
--- a/browser/config/mozconfigs/linux32/artifact
+++ b/application/basilisk/config/mozconfigs/linux32/artifact
diff --git a/browser/config/mozconfigs/linux32/beta b/application/basilisk/config/mozconfigs/linux32/beta
index 315c32b84..315c32b84 100644
--- a/browser/config/mozconfigs/linux32/beta
+++ b/application/basilisk/config/mozconfigs/linux32/beta
diff --git a/browser/config/mozconfigs/linux32/common-opt b/application/basilisk/config/mozconfigs/linux32/common-opt
index 3bf3e530e..3bf3e530e 100644
--- a/browser/config/mozconfigs/linux32/common-opt
+++ b/application/basilisk/config/mozconfigs/linux32/common-opt
diff --git a/browser/config/mozconfigs/linux32/debug b/application/basilisk/config/mozconfigs/linux32/debug
index de97087d2..de97087d2 100644
--- a/browser/config/mozconfigs/linux32/debug
+++ b/application/basilisk/config/mozconfigs/linux32/debug
diff --git a/browser/config/mozconfigs/linux32/debug-artifact b/application/basilisk/config/mozconfigs/linux32/debug-artifact
index 3fc3faf89..3fc3faf89 100644
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ b/application/basilisk/config/mozconfigs/linux32/debug-artifact
diff --git a/browser/config/mozconfigs/linux32/debug-asan b/application/basilisk/config/mozconfigs/linux32/debug-asan
index 9fc7b9bff..9fc7b9bff 100644
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ b/application/basilisk/config/mozconfigs/linux32/debug-asan
diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig
index ae7cc933b..ae7cc933b 100644
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/linux32/l10n-mozconfig
diff --git a/browser/config/mozconfigs/linux32/nightly b/application/basilisk/config/mozconfigs/linux32/nightly
index 6d605ca7d..6d605ca7d 100644
--- a/browser/config/mozconfigs/linux32/nightly
+++ b/application/basilisk/config/mozconfigs/linux32/nightly
diff --git a/browser/config/mozconfigs/linux32/nightly-asan b/application/basilisk/config/mozconfigs/linux32/nightly-asan
index 0930c184f..0930c184f 100644
--- a/browser/config/mozconfigs/linux32/nightly-asan
+++ b/application/basilisk/config/mozconfigs/linux32/nightly-asan
diff --git a/browser/config/mozconfigs/linux32/release b/application/basilisk/config/mozconfigs/linux32/release
index b17186666..b17186666 100644
--- a/browser/config/mozconfigs/linux32/release
+++ b/application/basilisk/config/mozconfigs/linux32/release
diff --git a/browser/config/mozconfigs/linux32/valgrind b/application/basilisk/config/mozconfigs/linux32/valgrind
index c8fb4f574..c8fb4f574 100644
--- a/browser/config/mozconfigs/linux32/valgrind
+++ b/application/basilisk/config/mozconfigs/linux32/valgrind
diff --git a/browser/config/mozconfigs/linux64/add-on-devel b/application/basilisk/config/mozconfigs/linux64/add-on-devel
index 0a3dfeb3f..0a3dfeb3f 100644
--- a/browser/config/mozconfigs/linux64/add-on-devel
+++ b/application/basilisk/config/mozconfigs/linux64/add-on-devel
diff --git a/browser/config/mozconfigs/linux64/artifact b/application/basilisk/config/mozconfigs/linux64/artifact
index 524a25e69..524a25e69 100644
--- a/browser/config/mozconfigs/linux64/artifact
+++ b/application/basilisk/config/mozconfigs/linux64/artifact
diff --git a/browser/config/mozconfigs/linux64/beta b/application/basilisk/config/mozconfigs/linux64/beta
index f349ee9f8..f349ee9f8 100644
--- a/browser/config/mozconfigs/linux64/beta
+++ b/application/basilisk/config/mozconfigs/linux64/beta
diff --git a/browser/config/mozconfigs/linux64/code-coverage b/application/basilisk/config/mozconfigs/linux64/code-coverage
index 48ffa9b17..48ffa9b17 100644
--- a/browser/config/mozconfigs/linux64/code-coverage
+++ b/application/basilisk/config/mozconfigs/linux64/code-coverage
diff --git a/browser/config/mozconfigs/linux64/common-opt b/application/basilisk/config/mozconfigs/linux64/common-opt
index 0d605ff9e..0d605ff9e 100644
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/application/basilisk/config/mozconfigs/linux64/common-opt
diff --git a/browser/config/mozconfigs/linux64/debug b/application/basilisk/config/mozconfigs/linux64/debug
index a879da75e..a879da75e 100644
--- a/browser/config/mozconfigs/linux64/debug
+++ b/application/basilisk/config/mozconfigs/linux64/debug
diff --git a/browser/config/mozconfigs/linux64/debug-artifact b/application/basilisk/config/mozconfigs/linux64/debug-artifact
index 6dc4d13ce..6dc4d13ce 100644
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ b/application/basilisk/config/mozconfigs/linux64/debug-artifact
diff --git a/browser/config/mozconfigs/linux64/debug-asan b/application/basilisk/config/mozconfigs/linux64/debug-asan
index a772dbb51..a772dbb51 100644
--- a/browser/config/mozconfigs/linux64/debug-asan
+++ b/application/basilisk/config/mozconfigs/linux64/debug-asan
diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/application/basilisk/config/mozconfigs/linux64/debug-static-analysis-clang
index ff41e13f9..ff41e13f9 100644
--- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ b/application/basilisk/config/mozconfigs/linux64/debug-static-analysis-clang
diff --git a/browser/config/mozconfigs/linux64/hazards b/application/basilisk/config/mozconfigs/linux64/hazards
index 03d72ef7e..03d72ef7e 100644
--- a/browser/config/mozconfigs/linux64/hazards
+++ b/application/basilisk/config/mozconfigs/linux64/hazards
diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/application/basilisk/config/mozconfigs/linux64/l10n-mozconfig
index 4df482dc3..4df482dc3 100644
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/linux64/l10n-mozconfig
diff --git a/browser/config/mozconfigs/linux64/nightly b/application/basilisk/config/mozconfigs/linux64/nightly
index ec360a99a..ec360a99a 100644
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/application/basilisk/config/mozconfigs/linux64/nightly
diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/application/basilisk/config/mozconfigs/linux64/nightly-asan
index 833b530d2..833b530d2 100644
--- a/browser/config/mozconfigs/linux64/nightly-asan
+++ b/application/basilisk/config/mozconfigs/linux64/nightly-asan
diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/application/basilisk/config/mozconfigs/linux64/opt-static-analysis-clang
index 936cc46f7..936cc46f7 100644
--- a/browser/config/mozconfigs/linux64/opt-static-analysis-clang
+++ b/application/basilisk/config/mozconfigs/linux64/opt-static-analysis-clang
diff --git a/browser/config/mozconfigs/linux64/opt-tsan b/application/basilisk/config/mozconfigs/linux64/opt-tsan
index 12b156633..12b156633 100644
--- a/browser/config/mozconfigs/linux64/opt-tsan
+++ b/application/basilisk/config/mozconfigs/linux64/opt-tsan
diff --git a/browser/config/mozconfigs/linux64/release b/application/basilisk/config/mozconfigs/linux64/release
index 2090f3525..2090f3525 100644
--- a/browser/config/mozconfigs/linux64/release
+++ b/application/basilisk/config/mozconfigs/linux64/release
diff --git a/browser/config/mozconfigs/linux64/source b/application/basilisk/config/mozconfigs/linux64/source
index 4a3c6996b..4a3c6996b 100644
--- a/browser/config/mozconfigs/linux64/source
+++ b/application/basilisk/config/mozconfigs/linux64/source
diff --git a/browser/config/mozconfigs/linux64/valgrind b/application/basilisk/config/mozconfigs/linux64/valgrind
index 2efc6e3bb..2efc6e3bb 100644
--- a/browser/config/mozconfigs/linux64/valgrind
+++ b/application/basilisk/config/mozconfigs/linux64/valgrind
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/application/basilisk/config/mozconfigs/macosx-universal/beta
index 937185e94..937185e94 100644
--- a/browser/config/mozconfigs/macosx-universal/beta
+++ b/application/basilisk/config/mozconfigs/macosx-universal/beta
diff --git a/browser/config/mozconfigs/macosx-universal/common-opt b/application/basilisk/config/mozconfigs/macosx-universal/common-opt
index 145d32fc9..145d32fc9 100644
--- a/browser/config/mozconfigs/macosx-universal/common-opt
+++ b/application/basilisk/config/mozconfigs/macosx-universal/common-opt
diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
index 80a06ed65..80a06ed65 100644
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/macosx-universal/l10n-mozconfig
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/application/basilisk/config/mozconfigs/macosx-universal/nightly
index 7af737e56..7af737e56 100644
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/application/basilisk/config/mozconfigs/macosx-universal/nightly
diff --git a/browser/config/mozconfigs/macosx-universal/release b/application/basilisk/config/mozconfigs/macosx-universal/release
index 4700886aa..4700886aa 100644
--- a/browser/config/mozconfigs/macosx-universal/release
+++ b/application/basilisk/config/mozconfigs/macosx-universal/release
diff --git a/browser/config/mozconfigs/macosx64/add-on-devel b/application/basilisk/config/mozconfigs/macosx64/add-on-devel
index e76df4dfa..e76df4dfa 100644
--- a/browser/config/mozconfigs/macosx64/add-on-devel
+++ b/application/basilisk/config/mozconfigs/macosx64/add-on-devel
diff --git a/browser/config/mozconfigs/macosx64/artifact b/application/basilisk/config/mozconfigs/macosx64/artifact
index c25b21122..c25b21122 100644
--- a/browser/config/mozconfigs/macosx64/artifact
+++ b/application/basilisk/config/mozconfigs/macosx64/artifact
diff --git a/browser/config/mozconfigs/macosx64/debug b/application/basilisk/config/mozconfigs/macosx64/debug
index 4b052aa00..4b052aa00 100644
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/application/basilisk/config/mozconfigs/macosx64/debug
diff --git a/browser/config/mozconfigs/macosx64/debug-artifact b/application/basilisk/config/mozconfigs/macosx64/debug-artifact
index 3afa8e4bf..3afa8e4bf 100644
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ b/application/basilisk/config/mozconfigs/macosx64/debug-artifact
diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/application/basilisk/config/mozconfigs/macosx64/debug-asan
index 28d23798b..28d23798b 100644
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/application/basilisk/config/mozconfigs/macosx64/debug-asan
diff --git a/browser/config/mozconfigs/macosx64/debug-static-analysis b/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis
index bb19af612..bb19af612 100644
--- a/browser/config/mozconfigs/macosx64/debug-static-analysis
+++ b/application/basilisk/config/mozconfigs/macosx64/debug-static-analysis
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig
index 40ad84086..40ad84086 100644
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/macosx64/l10n-mozconfig
diff --git a/browser/config/mozconfigs/macosx64/nightly b/application/basilisk/config/mozconfigs/macosx64/nightly
index 12fec0474..12fec0474 100644
--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/application/basilisk/config/mozconfigs/macosx64/nightly
diff --git a/browser/config/mozconfigs/macosx64/opt-static-analysis b/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis
index 72ed3d6bd..72ed3d6bd 100644
--- a/browser/config/mozconfigs/macosx64/opt-static-analysis
+++ b/application/basilisk/config/mozconfigs/macosx64/opt-static-analysis
diff --git a/browser/config/mozconfigs/whitelist b/application/basilisk/config/mozconfigs/whitelist
index 65b66b6f2..65b66b6f2 100644
--- a/browser/config/mozconfigs/whitelist
+++ b/application/basilisk/config/mozconfigs/whitelist
diff --git a/browser/config/mozconfigs/win32/add-on-devel b/application/basilisk/config/mozconfigs/win32/add-on-devel
index d84c1f5e4..d84c1f5e4 100644
--- a/browser/config/mozconfigs/win32/add-on-devel
+++ b/application/basilisk/config/mozconfigs/win32/add-on-devel
diff --git a/browser/config/mozconfigs/win32/artifact b/application/basilisk/config/mozconfigs/win32/artifact
index 888c99668..888c99668 100644
--- a/browser/config/mozconfigs/win32/artifact
+++ b/application/basilisk/config/mozconfigs/win32/artifact
diff --git a/browser/config/mozconfigs/win32/beta b/application/basilisk/config/mozconfigs/win32/beta
index cc14d6800..cc14d6800 100644
--- a/browser/config/mozconfigs/win32/beta
+++ b/application/basilisk/config/mozconfigs/win32/beta
diff --git a/browser/config/mozconfigs/win32/common-opt b/application/basilisk/config/mozconfigs/win32/common-opt
index 816c8926a..816c8926a 100644
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/application/basilisk/config/mozconfigs/win32/common-opt
diff --git a/browser/config/mozconfigs/win32/debug b/application/basilisk/config/mozconfigs/win32/debug
index 815276d0f..815276d0f 100644
--- a/browser/config/mozconfigs/win32/debug
+++ b/application/basilisk/config/mozconfigs/win32/debug
diff --git a/browser/config/mozconfigs/win32/debug-artifact b/application/basilisk/config/mozconfigs/win32/debug-artifact
index 5a31b8b3e..5a31b8b3e 100644
--- a/browser/config/mozconfigs/win32/debug-artifact
+++ b/application/basilisk/config/mozconfigs/win32/debug-artifact
diff --git a/browser/config/mozconfigs/win32/debug-static-analysis b/application/basilisk/config/mozconfigs/win32/debug-static-analysis
index efc0820b5..efc0820b5 100644
--- a/browser/config/mozconfigs/win32/debug-static-analysis
+++ b/application/basilisk/config/mozconfigs/win32/debug-static-analysis
diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/application/basilisk/config/mozconfigs/win32/l10n-mozconfig
index d05067e03..d05067e03 100644
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/win32/l10n-mozconfig
diff --git a/browser/config/mozconfigs/win32/nightly b/application/basilisk/config/mozconfigs/win32/nightly
index 210004905..210004905 100644
--- a/browser/config/mozconfigs/win32/nightly
+++ b/application/basilisk/config/mozconfigs/win32/nightly
diff --git a/browser/config/mozconfigs/win32/release b/application/basilisk/config/mozconfigs/win32/release
index daaa45f89..daaa45f89 100644
--- a/browser/config/mozconfigs/win32/release
+++ b/application/basilisk/config/mozconfigs/win32/release
diff --git a/browser/config/mozconfigs/win64/add-on-devel b/application/basilisk/config/mozconfigs/win64/add-on-devel
index 47d0bf589..47d0bf589 100644
--- a/browser/config/mozconfigs/win64/add-on-devel
+++ b/application/basilisk/config/mozconfigs/win64/add-on-devel
diff --git a/browser/config/mozconfigs/win64/artifact b/application/basilisk/config/mozconfigs/win64/artifact
index ce6969667..ce6969667 100644
--- a/browser/config/mozconfigs/win64/artifact
+++ b/application/basilisk/config/mozconfigs/win64/artifact
diff --git a/browser/config/mozconfigs/win64/beta b/application/basilisk/config/mozconfigs/win64/beta
index 6fc4ebe36..6fc4ebe36 100644
--- a/browser/config/mozconfigs/win64/beta
+++ b/application/basilisk/config/mozconfigs/win64/beta
diff --git a/browser/config/mozconfigs/win64/common-opt b/application/basilisk/config/mozconfigs/win64/common-opt
index 40fba7f76..40fba7f76 100644
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/application/basilisk/config/mozconfigs/win64/common-opt
diff --git a/browser/config/mozconfigs/win64/common-win64 b/application/basilisk/config/mozconfigs/win64/common-win64
index 8f167cad1..8f167cad1 100644
--- a/browser/config/mozconfigs/win64/common-win64
+++ b/application/basilisk/config/mozconfigs/win64/common-win64
diff --git a/browser/config/mozconfigs/win64/debug b/application/basilisk/config/mozconfigs/win64/debug
index db4eb5940..db4eb5940 100644
--- a/browser/config/mozconfigs/win64/debug
+++ b/application/basilisk/config/mozconfigs/win64/debug
diff --git a/browser/config/mozconfigs/win64/debug-artifact b/application/basilisk/config/mozconfigs/win64/debug-artifact
index bbba268fb..bbba268fb 100644
--- a/browser/config/mozconfigs/win64/debug-artifact
+++ b/application/basilisk/config/mozconfigs/win64/debug-artifact
diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig
index 3b9b4af1c..3b9b4af1c 100644
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig
diff --git a/browser/config/mozconfigs/win64/nightly b/application/basilisk/config/mozconfigs/win64/nightly
index aee22f1c0..aee22f1c0 100644
--- a/browser/config/mozconfigs/win64/nightly
+++ b/application/basilisk/config/mozconfigs/win64/nightly
diff --git a/browser/config/mozconfigs/win64/release b/application/basilisk/config/mozconfigs/win64/release
index 62e83205f..62e83205f 100644
--- a/browser/config/mozconfigs/win64/release
+++ b/application/basilisk/config/mozconfigs/win64/release
diff --git a/browser/config/tooltool-manifests/linux32/clang.manifest b/application/basilisk/config/tooltool-manifests/linux32/clang.manifest
index 07173985c..07173985c 100644
--- a/browser/config/tooltool-manifests/linux32/clang.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux32/clang.manifest
diff --git a/browser/config/tooltool-manifests/linux32/releng.manifest b/application/basilisk/config/tooltool-manifests/linux32/releng.manifest
index fc946eadf..fc946eadf 100644
--- a/browser/config/tooltool-manifests/linux32/releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux32/releng.manifest
diff --git a/browser/config/tooltool-manifests/linux64/asan.manifest b/application/basilisk/config/tooltool-manifests/linux64/asan.manifest
index 9642de0b0..9642de0b0 100644
--- a/browser/config/tooltool-manifests/linux64/asan.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/asan.manifest
diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest
index 97496f2c2..97496f2c2 100644
--- a/browser/config/tooltool-manifests/linux64/clang.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest
diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6 b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest.centos6
index a7173b592..a7173b592 100644
--- a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6
+++ b/application/basilisk/config/tooltool-manifests/linux64/clang.manifest.centos6
diff --git a/browser/config/tooltool-manifests/linux64/hazard.manifest b/application/basilisk/config/tooltool-manifests/linux64/hazard.manifest
index d2a4998b1..d2a4998b1 100644
--- a/browser/config/tooltool-manifests/linux64/hazard.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/hazard.manifest
diff --git a/browser/config/tooltool-manifests/linux64/msan.manifest b/application/basilisk/config/tooltool-manifests/linux64/msan.manifest
index 9642de0b0..9642de0b0 100644
--- a/browser/config/tooltool-manifests/linux64/msan.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/msan.manifest
diff --git a/browser/config/tooltool-manifests/linux64/releng.manifest b/application/basilisk/config/tooltool-manifests/linux64/releng.manifest
index eb7293cee..eb7293cee 100644
--- a/browser/config/tooltool-manifests/linux64/releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/releng.manifest
diff --git a/browser/config/tooltool-manifests/linux64/tsan.manifest b/application/basilisk/config/tooltool-manifests/linux64/tsan.manifest
index 9642de0b0..9642de0b0 100644
--- a/browser/config/tooltool-manifests/linux64/tsan.manifest
+++ b/application/basilisk/config/tooltool-manifests/linux64/tsan.manifest
diff --git a/browser/config/tooltool-manifests/macosx64/asan.manifest b/application/basilisk/config/tooltool-manifests/macosx64/asan.manifest
index e00596925..e00596925 100644
--- a/browser/config/tooltool-manifests/macosx64/asan.manifest
+++ b/application/basilisk/config/tooltool-manifests/macosx64/asan.manifest
diff --git a/browser/config/tooltool-manifests/macosx64/clang.manifest b/application/basilisk/config/tooltool-manifests/macosx64/clang.manifest
index a768012c4..a768012c4 100644
--- a/browser/config/tooltool-manifests/macosx64/clang.manifest
+++ b/application/basilisk/config/tooltool-manifests/macosx64/clang.manifest
diff --git a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest b/application/basilisk/config/tooltool-manifests/macosx64/cross-releng.manifest
index fc356233d..fc356233d 100644
--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/macosx64/cross-releng.manifest
diff --git a/browser/config/tooltool-manifests/macosx64/releng.manifest b/application/basilisk/config/tooltool-manifests/macosx64/releng.manifest
index 98cccce71..98cccce71 100644
--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/macosx64/releng.manifest
diff --git a/browser/config/tooltool-manifests/win32/build-clang-cl.manifest b/application/basilisk/config/tooltool-manifests/win32/build-clang-cl.manifest
index 2ead16fd9..2ead16fd9 100644
--- a/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
+++ b/application/basilisk/config/tooltool-manifests/win32/build-clang-cl.manifest
diff --git a/browser/config/tooltool-manifests/win32/clang.manifest b/application/basilisk/config/tooltool-manifests/win32/clang.manifest
index fb4309466..fb4309466 100644
--- a/browser/config/tooltool-manifests/win32/clang.manifest
+++ b/application/basilisk/config/tooltool-manifests/win32/clang.manifest
diff --git a/browser/config/tooltool-manifests/win32/l10n.manifest b/application/basilisk/config/tooltool-manifests/win32/l10n.manifest
index 2e802b78d..2e802b78d 100644
--- a/browser/config/tooltool-manifests/win32/l10n.manifest
+++ b/application/basilisk/config/tooltool-manifests/win32/l10n.manifest
diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/application/basilisk/config/tooltool-manifests/win32/releng.manifest
index 9124644f1..9124644f1 100644
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/win32/releng.manifest
diff --git a/browser/config/tooltool-manifests/win64/clang.manifest b/application/basilisk/config/tooltool-manifests/win64/clang.manifest
index a91d2dbff..a91d2dbff 100644
--- a/browser/config/tooltool-manifests/win64/clang.manifest
+++ b/application/basilisk/config/tooltool-manifests/win64/clang.manifest
diff --git a/browser/config/tooltool-manifests/win64/l10n.manifest b/application/basilisk/config/tooltool-manifests/win64/l10n.manifest
index 2e802b78d..2e802b78d 100644
--- a/browser/config/tooltool-manifests/win64/l10n.manifest
+++ b/application/basilisk/config/tooltool-manifests/win64/l10n.manifest
diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/application/basilisk/config/tooltool-manifests/win64/releng.manifest
index 207d8e5d0..207d8e5d0 100644
--- a/browser/config/tooltool-manifests/win64/releng.manifest
+++ b/application/basilisk/config/tooltool-manifests/win64/releng.manifest
diff --git a/browser/config/version.txt b/application/basilisk/config/version.txt
index d90a8c220..d90a8c220 100644
--- a/browser/config/version.txt
+++ b/application/basilisk/config/version.txt
diff --git a/browser/config/version_display.txt b/application/basilisk/config/version_display.txt
index d90a8c220..d90a8c220 100644
--- a/browser/config/version_display.txt
+++ b/application/basilisk/config/version_display.txt
diff --git a/browser/configure.in b/application/basilisk/configure.in
index 9638c1e4d..9638c1e4d 100644
--- a/browser/configure.in
+++ b/application/basilisk/configure.in
diff --git a/browser/confvars.sh b/application/basilisk/confvars.sh
index 0343034a4..0343034a4 100755..100644
--- a/browser/confvars.sh
+++ b/application/basilisk/confvars.sh
diff --git a/browser/defs.mk b/application/basilisk/defs.mk
index fd88c6585..fd88c6585 100644
--- a/browser/defs.mk
+++ b/application/basilisk/defs.mk
diff --git a/browser/docs/BrowserUsageTelemetry.rst b/application/basilisk/docs/BrowserUsageTelemetry.rst
index c49cf7a3a..c49cf7a3a 100644
--- a/browser/docs/BrowserUsageTelemetry.rst
+++ b/application/basilisk/docs/BrowserUsageTelemetry.rst
diff --git a/browser/docs/DirectoryLinksProvider.rst b/application/basilisk/docs/DirectoryLinksProvider.rst
index c6f55c3d4..c6f55c3d4 100644
--- a/browser/docs/DirectoryLinksProvider.rst
+++ b/application/basilisk/docs/DirectoryLinksProvider.rst
diff --git a/browser/docs/UITelemetry.rst b/application/basilisk/docs/UITelemetry.rst
index 1a9213359..1a9213359 100644
--- a/browser/docs/UITelemetry.rst
+++ b/application/basilisk/docs/UITelemetry.rst
diff --git a/browser/docs/index.rst b/application/basilisk/docs/index.rst
index bfdd78e04..bfdd78e04 100644
--- a/browser/docs/index.rst
+++ b/application/basilisk/docs/index.rst
diff --git a/browser/extensions/moz.build b/application/basilisk/extensions/moz.build
index 69d6af6d6..69d6af6d6 100644
--- a/browser/extensions/moz.build
+++ b/application/basilisk/extensions/moz.build
diff --git a/browser/extensions/pdfjs/LICENSE b/application/basilisk/extensions/pdfjs/LICENSE
index f433b1a53..f433b1a53 100644
--- a/browser/extensions/pdfjs/LICENSE
+++ b/application/basilisk/extensions/pdfjs/LICENSE
diff --git a/browser/extensions/pdfjs/README.mozilla b/application/basilisk/extensions/pdfjs/README.mozilla
index 884f85eb3..884f85eb3 100644
--- a/browser/extensions/pdfjs/README.mozilla
+++ b/application/basilisk/extensions/pdfjs/README.mozilla
diff --git a/browser/extensions/pdfjs/chrome.manifest b/application/basilisk/extensions/pdfjs/chrome.manifest
index 1aef83abc..1aef83abc 100644
--- a/browser/extensions/pdfjs/chrome.manifest
+++ b/application/basilisk/extensions/pdfjs/chrome.manifest
diff --git a/browser/extensions/pdfjs/content/PdfJs.jsm b/application/basilisk/extensions/pdfjs/content/PdfJs.jsm
index b3d85436e..b3d85436e 100644
--- a/browser/extensions/pdfjs/content/PdfJs.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfJs.jsm
diff --git a/browser/extensions/pdfjs/content/PdfJsNetwork.jsm b/application/basilisk/extensions/pdfjs/content/PdfJsNetwork.jsm
index c3aefecb2..c3aefecb2 100644
--- a/browser/extensions/pdfjs/content/PdfJsNetwork.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfJsNetwork.jsm
diff --git a/browser/extensions/pdfjs/content/PdfJsTelemetry.jsm b/application/basilisk/extensions/pdfjs/content/PdfJsTelemetry.jsm
index 275da9d87..275da9d87 100644
--- a/browser/extensions/pdfjs/content/PdfJsTelemetry.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfJsTelemetry.jsm
diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/application/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm
index 5e337bbc5..5e337bbc5 100644
--- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm
diff --git a/browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm b/application/basilisk/extensions/pdfjs/content/PdfjsChromeUtils.jsm
index 7a082b6af..7a082b6af 100644
--- a/browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfjsChromeUtils.jsm
diff --git a/browser/extensions/pdfjs/content/PdfjsContentUtils.jsm b/application/basilisk/extensions/pdfjs/content/PdfjsContentUtils.jsm
index 3dec5f389..3dec5f389 100644
--- a/browser/extensions/pdfjs/content/PdfjsContentUtils.jsm
+++ b/application/basilisk/extensions/pdfjs/content/PdfjsContentUtils.jsm
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/application/basilisk/extensions/pdfjs/content/build/pdf.js
index 98a3bd392..98a3bd392 100644
--- a/browser/extensions/pdfjs/content/build/pdf.js
+++ b/application/basilisk/extensions/pdfjs/content/build/pdf.js
diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/application/basilisk/extensions/pdfjs/content/build/pdf.worker.js
index 6ce519940..6ce519940 100644
--- a/browser/extensions/pdfjs/content/build/pdf.worker.js
+++ b/application/basilisk/extensions/pdfjs/content/build/pdf.worker.js
diff --git a/browser/extensions/pdfjs/content/network.js b/application/basilisk/extensions/pdfjs/content/network.js
index 68c8dd19f..68c8dd19f 100644
--- a/browser/extensions/pdfjs/content/network.js
+++ b/application/basilisk/extensions/pdfjs/content/network.js
diff --git a/browser/extensions/pdfjs/content/pdfjschildbootstrap.js b/application/basilisk/extensions/pdfjs/content/pdfjschildbootstrap.js
index 1f44b9c2e..1f44b9c2e 100644
--- a/browser/extensions/pdfjs/content/pdfjschildbootstrap.js
+++ b/application/basilisk/extensions/pdfjs/content/pdfjschildbootstrap.js
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-EUC-H.bcmap
index 2655fc70a..2655fc70a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-EUC-V.bcmap
index f1ed85382..f1ed85382 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-H.bcmap
index 39e89d333..39e89d333 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-RKSJ-H.bcmap
index e4167cb51..e4167cb51 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-RKSJ-V.bcmap
index 50b1646e9..50b1646e9 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-V.bcmap
index d7af99b5e..d7af99b5e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-H.bcmap
index 37077d01e..37077d01e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-V.bcmap
index acf23231a..acf23231a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/78ms-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/83pv-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/83pv-RKSJ-H.bcmap
index 2359bc529..2359bc529 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/83pv-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/83pv-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-H.bcmap
index af8293829..af8293829 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-V.bcmap
index 780549de1..780549de1 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90ms-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-H.bcmap
index bfd3119c6..bfd3119c6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-V.bcmap
index 25ef14ab4..25ef14ab4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90msp-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-H.bcmap
index 02f713bb8..02f713bb8 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-V.bcmap
index d08e0cc5d..d08e0cc5d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/90pv-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Add-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-H.bcmap
index 59442acaf..59442acaf 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Add-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Add-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-RKSJ-H.bcmap
index a3065e441..a3065e441 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Add-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Add-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-RKSJ-V.bcmap
index 040014cfc..040014cfc 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Add-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Add-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-V.bcmap
index 2f816d320..2f816d320 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Add-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Add-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-0.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-0.bcmap
index 88ec04af4..88ec04af4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-0.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-0.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-1.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-1.bcmap
index 03a501477..03a501477 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-1.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-1.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-2.bcmap
index 2aa95141f..2aa95141f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-3.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-3.bcmap
index 86d8b8c79..86d8b8c79 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-3.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-3.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-4.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-4.bcmap
index f50fc6c14..f50fc6c14 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-4.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-4.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-5.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-5.bcmap
index 6caf4a831..6caf4a831 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-5.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-5.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-6.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-6.bcmap
index b77fb0705..b77fb0705 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-6.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-6.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-UCS2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-UCS2.bcmap
index 69d79a2c2..69d79a2c2 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-UCS2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-CNS1-UCS2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-0.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-0.bcmap
index 36101083f..36101083f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-0.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-0.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-1.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-1.bcmap
index 707bb1065..707bb1065 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-1.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-1.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-2.bcmap
index f7648cc3f..f7648cc3f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-3.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-3.bcmap
index 852145890..852145890 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-3.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-3.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-4.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-4.bcmap
index e40c63ab1..e40c63ab1 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-4.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-4.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-5.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-5.bcmap
index d7623b500..d7623b500 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-5.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-5.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-UCS2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-UCS2.bcmap
index 758652593..758652593 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-GB1-UCS2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-GB1-UCS2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-0.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-0.bcmap
index f0e94ec19..f0e94ec19 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-0.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-0.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-1.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-1.bcmap
index dad42c5ad..dad42c5ad 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-1.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-1.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-2.bcmap
index 090819a06..090819a06 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-3.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-3.bcmap
index 087dfc155..087dfc155 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-3.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-3.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-4.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-4.bcmap
index 46aa9bffe..46aa9bffe 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-4.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-4.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-5.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-5.bcmap
index 5b4b65cc6..5b4b65cc6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-5.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-5.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-6.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-6.bcmap
index e77d699ab..e77d699ab 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-6.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-6.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-UCS2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-UCS2.bcmap
index 128a14107..128a14107 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-UCS2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Japan1-UCS2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-0.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-0.bcmap
index cef1a9985..cef1a9985 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-0.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-0.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-1.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-1.bcmap
index 11ffa36df..11ffa36df 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-1.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-1.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-2.bcmap
index 3172308c7..3172308c7 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-UCS2.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-UCS2.bcmap
index f3371c0cb..f3371c0cb 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-UCS2.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Adobe-Korea1-UCS2.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5-H.bcmap
index beb4d2281..beb4d2281 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5-V.bcmap
index 2d4f87d50..2d4f87d50 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/B5pc-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5pc-H.bcmap
index ce0013167..ce0013167 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/B5pc-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5pc-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/B5pc-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5pc-V.bcmap
index 73b99ff2f..73b99ff2f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/B5pc-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/B5pc-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS-EUC-H.bcmap
index 61d1d0cb0..61d1d0cb0 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS-EUC-V.bcmap
index 1a393a51e..1a393a51e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS1-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS1-H.bcmap
index f738e218a..f738e218a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS1-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS1-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS1-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS1-V.bcmap
index 9c3169f0d..9c3169f0d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS1-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS1-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS2-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS2-H.bcmap
index c89b3527f..c89b3527f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS2-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS2-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/CNS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS2-V.bcmap
index 7588cec83..7588cec83 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/CNS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/CNS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETHK-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETHK-B5-H.bcmap
index cb29415de..cb29415de 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETHK-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETHK-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETHK-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETHK-B5-V.bcmap
index f09aec631..f09aec631 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETHK-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETHK-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETen-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETen-B5-H.bcmap
index c2d77462d..c2d77462d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETen-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETen-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETen-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETen-B5-V.bcmap
index 89bff159e..89bff159e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETen-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETen-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETenms-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETenms-B5-H.bcmap
index a7d69db5e..a7d69db5e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETenms-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETenms-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/ETenms-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETenms-B5-V.bcmap
index adc5d618d..adc5d618d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/ETenms-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/ETenms-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/EUC-H.bcmap
index e92ea5b3b..e92ea5b3b 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/EUC-V.bcmap
index 7a7c18322..7a7c18322 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Ext-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-H.bcmap
index 3b5cde44d..3b5cde44d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Ext-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-H.bcmap
index ea4d2d97b..ea4d2d97b 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-V.bcmap
index 3457c2770..3457c2770 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Ext-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-V.bcmap
index 4999ca404..4999ca404 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Ext-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Ext-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GB-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-EUC-H.bcmap
index e39908b98..e39908b98 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GB-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GB-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-EUC-V.bcmap
index d5be5446a..d5be5446a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GB-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GB-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-H.bcmap
index 39189c54e..39189c54e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GB-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GB-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-V.bcmap
index 310834512..310834512 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GB-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GB-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBK-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK-EUC-H.bcmap
index 05fff7e82..05fff7e82 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBK-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBK-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK-EUC-V.bcmap
index 0cdf6bed6..0cdf6bed6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBK-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBK2K-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK2K-H.bcmap
index 46f6ba596..46f6ba596 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBK2K-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK2K-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBK2K-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK2K-V.bcmap
index d9a947984..d9a947984 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBK2K-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBK2K-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBKp-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBKp-EUC-H.bcmap
index 5cb0af687..5cb0af687 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBKp-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBKp-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBKp-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBKp-EUC-V.bcmap
index bca93b8ef..bca93b8ef 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBKp-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBKp-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBT-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-EUC-H.bcmap
index 4b4e2d322..4b4e2d322 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBT-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBT-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-EUC-V.bcmap
index 38f706699..38f706699 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBT-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBT-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-H.bcmap
index 8437ac337..8437ac337 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBT-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBT-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-V.bcmap
index 697ab4a8e..697ab4a8e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBT-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBT-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-H.bcmap
index f6e50e893..f6e50e893 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-V.bcmap
index 6c0d71a2d..6c0d71a2d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBTpc-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBpc-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBpc-EUC-H.bcmap
index c9edf67cf..c9edf67cf 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBpc-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBpc-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/GBpc-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBpc-EUC-V.bcmap
index 31450c97f..31450c97f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/GBpc-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/GBpc-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/H.bcmap
index 7b24ea462..7b24ea462 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKdla-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdla-B5-H.bcmap
index 7d30c0500..7d30c0500 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKdla-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdla-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKdla-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdla-B5-V.bcmap
index 78946940d..78946940d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKdla-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdla-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKdlb-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdlb-B5-H.bcmap
index d829a2310..d829a2310 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKdlb-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdlb-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKdlb-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdlb-B5-V.bcmap
index 2b572b50a..2b572b50a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKdlb-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKdlb-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKgccs-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKgccs-B5-H.bcmap
index 971a4f23f..971a4f23f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKgccs-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKgccs-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKgccs-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKgccs-B5-V.bcmap
index d353ca256..d353ca256 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKgccs-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKgccs-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKm314-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm314-B5-H.bcmap
index 576dc0111..576dc0111 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKm314-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm314-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKm314-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm314-B5-V.bcmap
index 0e96d0e22..0e96d0e22 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKm314-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm314-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKm471-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm471-B5-H.bcmap
index 11d170c75..11d170c75 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKm471-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm471-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKm471-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm471-B5-V.bcmap
index 54959bf9e..54959bf9e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKm471-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKm471-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKscs-B5-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKscs-B5-H.bcmap
index 6ef7857ad..6ef7857ad 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKscs-B5-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKscs-B5-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/HKscs-B5-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKscs-B5-V.bcmap
index 1fb2fa2a2..1fb2fa2a2 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/HKscs-B5-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/HKscs-B5-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Hankaku.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Hankaku.bcmap
index 4b8ec7fce..4b8ec7fce 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Hankaku.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Hankaku.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Hiragana.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Hiragana.bcmap
index 17e983e77..17e983e77 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Hiragana.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Hiragana.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-EUC-H.bcmap
index a45c65f00..a45c65f00 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-EUC-V.bcmap
index 0e7b21f0a..0e7b21f0a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-H.bcmap
index b9b22b678..b9b22b678 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-Johab-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-Johab-H.bcmap
index 2531ffcf4..2531ffcf4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-Johab-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-Johab-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-Johab-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-Johab-V.bcmap
index 367ceb226..367ceb226 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-Johab-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-Johab-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-V.bcmap
index 6ae2f0b6b..6ae2f0b6b 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-H.bcmap
index a8d4240e6..a8d4240e6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-H.bcmap
index 8b4ae18fd..8b4ae18fd 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-V.bcmap
index b655dbcfb..b655dbcfb 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-HW-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-V.bcmap
index 21f97f65b..21f97f65b 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCms-UHC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCms-UHC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-H.bcmap
index e06f361eb..e06f361eb 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-V.bcmap
index f3c9113fc..f3c9113fc 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/KSCpc-EUC-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Katakana.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Katakana.bcmap
index 524303c4f..524303c4f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Katakana.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Katakana.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/LICENSE b/application/basilisk/extensions/pdfjs/content/web/cmaps/LICENSE
index b1ad168ad..b1ad168ad 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/LICENSE
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/LICENSE
diff --git a/browser/extensions/pdfjs/content/web/cmaps/NWP-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/NWP-H.bcmap
index afc5e4b05..afc5e4b05 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/NWP-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/NWP-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/NWP-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/NWP-V.bcmap
index bb5785e32..bb5785e32 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/NWP-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/NWP-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/RKSJ-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/RKSJ-H.bcmap
index fb8d298e9..fb8d298e9 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/RKSJ-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/RKSJ-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/RKSJ-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/RKSJ-V.bcmap
index a2555a6c0..a2555a6c0 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/RKSJ-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/RKSJ-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/Roman.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/Roman.bcmap
index f896dcf1c..f896dcf1c 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/Roman.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/Roman.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-H.bcmap
index d5db27c5c..d5db27c5c 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-V.bcmap
index 1dc9b7a21..1dc9b7a21 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UCS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-H.bcmap
index 961afefb6..961afefb6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-V.bcmap
index df0cffe86..df0cffe86 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF16-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-H.bcmap
index 1ab18a143..1ab18a143 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-V.bcmap
index ad14662e2..ad14662e2 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-H.bcmap
index 83c6bd7c4..83c6bd7c4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-V.bcmap
index 22a27e4dd..22a27e4dd 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniCNS-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-H.bcmap
index 5bd6228ce..5bd6228ce 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-V.bcmap
index 53c534b7f..53c534b7f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UCS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-H.bcmap
index b95045b40..b95045b40 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-V.bcmap
index 51f023e0d..51f023e0d 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF16-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-H.bcmap
index f0dbd14f3..f0dbd14f3 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-V.bcmap
index ce9c30a98..ce9c30a98 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-H.bcmap
index 982ca462b..982ca462b 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-V.bcmap
index f78020dd4..f78020dd4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniGB-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-H.bcmap
index 7daf56afa..7daf56afa 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-H.bcmap
index ac9975c58..ac9975c58 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-V.bcmap
index 3da0a1c62..3da0a1c62 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-V.bcmap
index c50b9ddfd..c50b9ddfd 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UCS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-H.bcmap
index 676134463..676134463 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-V.bcmap
index 70bf90c0e..70bf90c0e 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF16-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-H.bcmap
index 7a83d53ae..7a83d53ae 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-V.bcmap
index 7a8713539..7a8713539 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-H.bcmap
index 9f0334cac..9f0334cac 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-V.bcmap
index 808a94f0f..808a94f0f 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-H.bcmap
index d768bf811..d768bf811 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-V.bcmap
index 3d5bf6fb4..3d5bf6fb4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF16-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-H.bcmap
index 09eee10d4..09eee10d4 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-V.bcmap
index 6c5460013..6c5460013 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-H.bcmap
index 1b1a64f50..1b1a64f50 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-V.bcmap
index 994aa9ef9..994aa9ef9 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJIS2004-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-HW-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
index 643f921b6..643f921b6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-V.bcmap
index c148f67f5..c148f67f5 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UCS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UTF8-V.bcmap
index 1849d809a..1849d809a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISPro-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISPro-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-H.bcmap
index a83a677c5..a83a677c5 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-V.bcmap
index f527248ad..f527248ad 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX0213-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-H.bcmap
index e1a988dc9..e1a988dc9 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-V.bcmap
index 47e054a96..47e054a96 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-H.bcmap
index b5b94852a..b5b94852a 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-V.bcmap
index 026adcaad..026adcaad 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UCS2-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-H.bcmap
index fd4e66e81..fd4e66e81 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-V.bcmap
index 075efb705..075efb705 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF16-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-H.bcmap
index 769d2142c..769d2142c 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-V.bcmap
index bdab208b6..bdab208b6 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF32-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-H.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-H.bcmap
index 6ff8674af..6ff8674af 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-H.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-H.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-V.bcmap
index 8dfa76a58..8dfa76a58 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/UniKS-UTF8-V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/V.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/V.bcmap
index fdec99066..fdec99066 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/V.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/V.bcmap
diff --git a/browser/extensions/pdfjs/content/web/cmaps/WP-Symbol.bcmap b/application/basilisk/extensions/pdfjs/content/web/cmaps/WP-Symbol.bcmap
index 46729bbf3..46729bbf3 100644
--- a/browser/extensions/pdfjs/content/web/cmaps/WP-Symbol.bcmap
+++ b/application/basilisk/extensions/pdfjs/content/web/cmaps/WP-Symbol.bcmap
diff --git a/browser/extensions/pdfjs/content/web/debugger.js b/application/basilisk/extensions/pdfjs/content/web/debugger.js
index 8a049f4c6..8a049f4c6 100644
--- a/browser/extensions/pdfjs/content/web/debugger.js
+++ b/application/basilisk/extensions/pdfjs/content/web/debugger.js
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-check.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-check.svg
index 71cd16df5..71cd16df5 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-check.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-check.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-comment.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-comment.svg
index 86f1f1724..86f1f1724 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-comment.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-comment.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-help.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-help.svg
index 00938fefe..00938fefe 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-help.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-help.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-insert.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-insert.svg
index 519ef6826..519ef6826 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-insert.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-insert.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-key.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-key.svg
index 8d09d5378..8d09d5378 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-key.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-key.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-newparagraph.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-newparagraph.svg
index 38d2497da..38d2497da 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-newparagraph.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-newparagraph.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-noicon.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-noicon.svg
index c07d10808..c07d10808 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-noicon.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-noicon.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-note.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-note.svg
index 70173651c..70173651c 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-note.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-note.svg
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-paragraph.svg b/application/basilisk/extensions/pdfjs/content/web/images/annotation-paragraph.svg
index 6ae5212b7..6ae5212b7 100644
--- a/browser/extensions/pdfjs/content/web/images/annotation-paragraph.svg
+++ b/application/basilisk/extensions/pdfjs/content/web/images/annotation-paragraph.svg
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-next-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next-rtl.png
index bef02743f..bef02743f 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-next-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-next-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next-rtl@2x.png
index 1da6dc949..1da6dc949 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-next-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-next.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next.png
index de1d0fc90..de1d0fc90 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-next.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-next@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next@2x.png
index 0250307c0..0250307c0 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-next@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-next@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-previous-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous-rtl.png
index de1d0fc90..de1d0fc90 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-previous-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-previous-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous-rtl@2x.png
index 0250307c0..0250307c0 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-previous-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-previous.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous.png
index bef02743f..bef02743f 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-previous.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous.png
diff --git a/browser/extensions/pdfjs/content/web/images/findbarButton-previous@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous@2x.png
index 1da6dc949..1da6dc949 100644
--- a/browser/extensions/pdfjs/content/web/images/findbarButton-previous@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/findbarButton-previous@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/grab.cur b/application/basilisk/extensions/pdfjs/content/web/images/grab.cur
index db7ad5aed..db7ad5aed 100644
--- a/browser/extensions/pdfjs/content/web/images/grab.cur
+++ b/application/basilisk/extensions/pdfjs/content/web/images/grab.cur
diff --git a/browser/extensions/pdfjs/content/web/images/grabbing.cur b/application/basilisk/extensions/pdfjs/content/web/images/grabbing.cur
index e0dfd04e4..e0dfd04e4 100644
--- a/browser/extensions/pdfjs/content/web/images/grabbing.cur
+++ b/application/basilisk/extensions/pdfjs/content/web/images/grabbing.cur
diff --git a/browser/extensions/pdfjs/content/web/images/loading-icon.gif b/application/basilisk/extensions/pdfjs/content/web/images/loading-icon.gif
index 1c72ebb55..1c72ebb55 100644
--- a/browser/extensions/pdfjs/content/web/images/loading-icon.gif
+++ b/application/basilisk/extensions/pdfjs/content/web/images/loading-icon.gif
diff --git a/browser/extensions/pdfjs/content/web/images/loading-small.png b/application/basilisk/extensions/pdfjs/content/web/images/loading-small.png
index 8831a8058..8831a8058 100644
--- a/browser/extensions/pdfjs/content/web/images/loading-small.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/loading-small.png
diff --git a/browser/extensions/pdfjs/content/web/images/loading-small@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/loading-small@2x.png
index b25b4452a..b25b4452a 100644
--- a/browser/extensions/pdfjs/content/web/images/loading-small@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/loading-small@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png
index 40925e25a..40925e25a 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties@2x.png
index adb240eaa..adb240eaa 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-documentProperties@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png
index e68846aa5..e68846aa5 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage@2x.png
index 3ad8af517..3ad8af517 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-firstPage@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool.png
index cb85a841b..cb85a841b 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool@2x.png
index 5c13f77ff..5c13f77ff 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-handTool@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage.png
index be763e0c4..be763e0c4 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage@2x.png
index 8570984f2..8570984f2 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-lastPage@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.png
index 675d6da2c..675d6da2c 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw@2x.png
index b9e743122..b9e743122 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png
index e1c759888..e1c759888 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png
diff --git a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw@2x.png
index cb257b41c..cb257b41c 100644
--- a/browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/secondaryToolbarButton-rotateCw@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/shadow.png b/application/basilisk/extensions/pdfjs/content/web/images/shadow.png
index 31d3bdb14..31d3bdb14 100644
--- a/browser/extensions/pdfjs/content/web/images/shadow.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/shadow.png
diff --git a/browser/extensions/pdfjs/content/web/images/texture.png b/application/basilisk/extensions/pdfjs/content/web/images/texture.png
index 12bae83a9..12bae83a9 100644
--- a/browser/extensions/pdfjs/content/web/images/texture.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/texture.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png
index a187be6c9..a187be6c9 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-bookmark@2x.png
index 4efbaa675..4efbaa675 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-bookmark@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-download.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-download.png
index eaab35f09..eaab35f09 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-download.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-download.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-download@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-download@2x.png
index 896face45..896face45 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-download@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-download@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png
index e50ca4eee..e50ca4eee 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-menuArrows@2x.png
index f7570bc0d..f7570bc0d 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-menuArrows@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-openFile.png
index b5cf1bd06..b5cf1bd06 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-openFile.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-openFile@2x.png
index 91ab76593..91ab76593 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-openFile@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png
index 1957f79ab..1957f79ab 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl@2x.png
index 16ebcb8ef..16ebcb8ef 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png
index 8219ecf83..8219ecf83 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown@2x.png
index 758c01d83..758c01d83 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageDown@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png
index 98e7ce481..98e7ce481 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl@2x.png
index a01b02380..a01b02380 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png
index fb9daa337..fb9daa337 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp@2x.png
index a5cfd755b..a5cfd755b 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-pageUp@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-presentationMode.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-presentationMode.png
index 3ac21244d..3ac21244d 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-presentationMode.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-presentationMode.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-presentationMode@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-presentationMode@2x.png
index cada9e791..cada9e791 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-presentationMode@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-presentationMode@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-print.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-print.png
index 51275e54b..51275e54b 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-print.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-print.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-print@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-print@2x.png
index 53d18daf7..53d18daf7 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-print@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-print@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-search.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-search.png
index f9b75579b..f9b75579b 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-search.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-search.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-search@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-search@2x.png
index 456b13324..456b13324 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-search@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-search@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
index 843709527..843709527 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
index 9d9bfa4f6..9d9bfa4f6 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.png
index 1f90f83da..1f90f83da 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle@2x.png
index b066fe5cb..b066fe5cb 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl.png
index 6f85ec061..6f85ec061 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl@2x.png
index 291e00679..291e00679 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png
index 025dc9040..025dc9040 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle@2x.png
index 7f834df94..7f834df94 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments.png
index fcd0b268a..fcd0b268a 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments@2x.png
index 4a5e2b8a3..4a5e2b8a3 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewAttachments@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png
index aaa943021..aaa943021 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl@2x.png
index 3410f70df..3410f70df 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png
index 976365a50..976365a50 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline@2x.png
index b6a197fdf..b6a197fdf 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewOutline@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png
index 584ba5588..584ba5588 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail@2x.png
index a0208b413..a0208b413 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png
index 513d081bc..513d081bc 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomIn@2x.png
index d5d49d5ff..d5d49d5ff 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomIn@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png
index 156c26b94..156c26b94 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomOut@2x.png
index 959e1919d..959e1919d 100644
--- a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/toolbarButton-zoomOut@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl.png
index 0496b3577..0496b3577 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png
index 6ad9ebcdf..6ad9ebcdf 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed-rtl@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed.png
index 06d4d3769..06d4d3769 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed@2x.png
index eec1e58c1..eec1e58c1 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-collapsed@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-collapsed@2x.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-expanded.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-expanded.png
index c8d557351..c8d557351 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-expanded.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-expanded.png
diff --git a/browser/extensions/pdfjs/content/web/images/treeitem-expanded@2x.png b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-expanded@2x.png
index 3b3b6103b..3b3b6103b 100644
--- a/browser/extensions/pdfjs/content/web/images/treeitem-expanded@2x.png
+++ b/application/basilisk/extensions/pdfjs/content/web/images/treeitem-expanded@2x.png
diff --git a/browser/extensions/pdfjs/content/web/l10n.js b/application/basilisk/extensions/pdfjs/content/web/l10n.js
index 2e0684e06..2e0684e06 100644
--- a/browser/extensions/pdfjs/content/web/l10n.js
+++ b/application/basilisk/extensions/pdfjs/content/web/l10n.js
diff --git a/browser/extensions/pdfjs/content/web/viewer.css b/application/basilisk/extensions/pdfjs/content/web/viewer.css
index 74b6fab86..74b6fab86 100644
--- a/browser/extensions/pdfjs/content/web/viewer.css
+++ b/application/basilisk/extensions/pdfjs/content/web/viewer.css
diff --git a/browser/extensions/pdfjs/content/web/viewer.html b/application/basilisk/extensions/pdfjs/content/web/viewer.html
index 3a06aa7b1..3a06aa7b1 100644
--- a/browser/extensions/pdfjs/content/web/viewer.html
+++ b/application/basilisk/extensions/pdfjs/content/web/viewer.html
diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/application/basilisk/extensions/pdfjs/content/web/viewer.js
index 35fef2cd0..35fef2cd0 100644
--- a/browser/extensions/pdfjs/content/web/viewer.js
+++ b/application/basilisk/extensions/pdfjs/content/web/viewer.js
diff --git a/browser/extensions/pdfjs/jar.mn b/application/basilisk/extensions/pdfjs/jar.mn
index ca1148155..ca1148155 100644
--- a/browser/extensions/pdfjs/jar.mn
+++ b/application/basilisk/extensions/pdfjs/jar.mn
diff --git a/browser/extensions/pdfjs/moz.build b/application/basilisk/extensions/pdfjs/moz.build
index aac3a838c..aac3a838c 100644
--- a/browser/extensions/pdfjs/moz.build
+++ b/application/basilisk/extensions/pdfjs/moz.build
diff --git a/browser/fonts/README.txt b/application/basilisk/fonts/README.txt
index ac1f6d9de..ac1f6d9de 100644
--- a/browser/fonts/README.txt
+++ b/application/basilisk/fonts/README.txt
diff --git a/browser/fonts/TwemojiMozilla.ttf b/application/basilisk/fonts/TwemojiMozilla.ttf
index 1933891d9..1933891d9 100644
--- a/browser/fonts/TwemojiMozilla.ttf
+++ b/application/basilisk/fonts/TwemojiMozilla.ttf
diff --git a/browser/fonts/moz.build b/application/basilisk/fonts/moz.build
index 5cb98333b..5cb98333b 100644
--- a/browser/fonts/moz.build
+++ b/application/basilisk/fonts/moz.build
diff --git a/browser/installer/Makefile.in b/application/basilisk/installer/Makefile.in
index 4a934fe45..4de368db7 100644
--- a/browser/installer/Makefile.in
+++ b/application/basilisk/installer/Makefile.in
@@ -149,7 +149,7 @@ endif
 # fail to produce a langpack. See bug 1255096.
 libs::
 ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-	$(MAKE) -C $(DEPTH)/browser/locales langpack
+	$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack
 endif
 
 ifeq (WINNT,$(OS_ARCH))
diff --git a/browser/installer/allowed-dupes.mn b/application/basilisk/installer/allowed-dupes.mn
index 7baa6ebed..7baa6ebed 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/application/basilisk/installer/allowed-dupes.mn
diff --git a/browser/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 27dfc4e05..27dfc4e05 100644
--- a/browser/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
diff --git a/browser/installer/removed-files.in b/application/basilisk/installer/removed-files.in
index 8801d1cb0..8801d1cb0 100644
--- a/browser/installer/removed-files.in
+++ b/application/basilisk/installer/removed-files.in
diff --git a/browser/installer/windows/Makefile.in b/application/basilisk/installer/windows/Makefile.in
index 600bdfeb6..d5580b53d 100644
--- a/browser/installer/windows/Makefile.in
+++ b/application/basilisk/installer/windows/Makefile.in
@@ -32,12 +32,12 @@ include $(topsrcdir)/config/config.mk
 
 ifdef LOCALE_MERGEDIR
 PPL_LOCALE_ARGS = \
-  --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \
-  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \
-  --l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \
+  --l10n-dir=$(LOCALE_MERGEDIR)/application/basilisk/installer \
+  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer \
+  --l10n-dir=$(topsrcdir)/application/basilisk/locales/en-US/installer \
   $(NULL)
 else
-PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer
+PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer
 endif
 
 OVERRIDE_DEFAULT_GOAL := installer
diff --git a/browser/installer/windows/app.tag b/application/basilisk/installer/windows/app.tag
index 7be6d2e42..7be6d2e42 100644
--- a/browser/installer/windows/app.tag
+++ b/application/basilisk/installer/windows/app.tag
diff --git a/browser/installer/windows/moz.build b/application/basilisk/installer/windows/moz.build
index 12e7831ed..12e7831ed 100644
--- a/browser/installer/windows/moz.build
+++ b/application/basilisk/installer/windows/moz.build
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/application/basilisk/installer/windows/nsis/defines.nsi.in
index 5ad9b7966..5ad9b7966 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/application/basilisk/installer/windows/nsis/defines.nsi.in
diff --git a/browser/installer/windows/nsis/installer.nsi b/application/basilisk/installer/windows/nsis/installer.nsi
index 994c09279..994c09279 100755..100644
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/application/basilisk/installer/windows/nsis/installer.nsi
diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/application/basilisk/installer/windows/nsis/maintenanceservice_installer.nsi
index 1f73bac6a..1f73bac6a 100644
--- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/application/basilisk/installer/windows/nsis/maintenanceservice_installer.nsi
diff --git a/browser/installer/windows/nsis/shared.nsh b/application/basilisk/installer/windows/nsis/shared.nsh
index fb2239d24..fb2239d24 100755..100644
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/application/basilisk/installer/windows/nsis/shared.nsh
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/application/basilisk/installer/windows/nsis/uninstaller.nsi
index 87f4d838a..87f4d838a 100755..100644
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/application/basilisk/installer/windows/nsis/uninstaller.nsi
diff --git a/browser/installer/windows/nsis/updater_append.ini b/application/basilisk/installer/windows/nsis/updater_append.ini
index af7742c12..af7742c12 100644
--- a/browser/installer/windows/nsis/updater_append.ini
+++ b/application/basilisk/installer/windows/nsis/updater_append.ini
diff --git a/browser/locales/Makefile.in b/application/basilisk/locales/Makefile.in
index b8aee0f14..b8aee0f14 100644
--- a/browser/locales/Makefile.in
+++ b/application/basilisk/locales/Makefile.in
diff --git a/browser/locales/all-locales b/application/basilisk/locales/all-locales
index dba2d5336..dba2d5336 100644
--- a/browser/locales/all-locales
+++ b/application/basilisk/locales/all-locales
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/application/basilisk/locales/en-US/chrome/browser-region/region.properties
index e35fc7497..e35fc7497 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/application/basilisk/locales/en-US/chrome/browser-region/region.properties
diff --git a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd
index 358722156..358722156 100644
--- a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutDialog.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd
index e0c34692e..e0c34692e 100644
--- a/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutHealthReport.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutHealthReport.dtd
index 0cc20e38e..0cc20e38e 100644
--- a/browser/locales/en-US/chrome/browser/aboutHealthReport.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutHealthReport.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd
index 17b401c6c..17b401c6c 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
index 381da356a..381da356a 100644
--- a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties
index f01e40dd7..f01e40dd7 100644
--- a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties
diff --git a/browser/locales/en-US/chrome/browser/aboutRobots.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd
index 23447add1..23447add1 100644
--- a/browser/locales/en-US/chrome/browser/aboutRobots.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutSearchReset.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutSearchReset.dtd
index 65ae1599f..65ae1599f 100644
--- a/browser/locales/en-US/chrome/browser/aboutSearchReset.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutSearchReset.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutSessionRestore.dtd
index cd1f3c426..cd1f3c426 100644
--- a/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutSessionRestore.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutSyncTabs.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutSyncTabs.dtd
index fad491bbd..fad491bbd 100644
--- a/browser/locales/en-US/chrome/browser/aboutSyncTabs.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutSyncTabs.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutTabCrashed.dtd
index e624de155..e624de155 100644
--- a/browser/locales/en-US/chrome/browser/aboutTabCrashed.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutTabCrashed.dtd
diff --git a/browser/locales/en-US/chrome/browser/accounts.properties b/application/basilisk/locales/en-US/chrome/browser/accounts.properties
index 237556132..237556132 100644
--- a/browser/locales/en-US/chrome/browser/accounts.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/accounts.properties
diff --git a/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd
index de92ad3aa..1079c3cef 100644
--- a/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -37,9 +37,6 @@
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
-<!ENTITY helpShowTour2.label            "&brandShorterName; Tour">
-<!ENTITY helpShowTour2.accesskey        "o">
-
 <!ENTITY preferencesCmdMac.label        "Preferences…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
index 1045977e8..0b2e41612 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
@@ -828,8 +828,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
      a CSS length value. -->
 <!ENTITY pluginNotification.width "28em">
 
-<!ENTITY uiTour.infoPanel.close "Close">
-
 <!ENTITY appMenuSidebars.label         "Sidebars">
 
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/application/basilisk/locales/en-US/chrome/browser/browser.properties
index 46b8aabc7..8f4036dcd 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.properties
@@ -336,15 +336,6 @@ identity.identified.state_and_country=%S, %S
 
 identity.icon.tooltip=Show site information
 
-trackingProtection.intro.title=How Tracking Protection works
-# LOCALIZATION NOTE (trackingProtection.intro.description2):
-# %S is brandShortName. This string should match the one from Step 1 of the tour
-# when it starts from the button shown when a new private window is opened.
-trackingProtection.intro.description2=When you see the shield, %S is blocking some parts of the page that could track your browsing activity.
-# LOCALIZATION NOTE (trackingProtection.intro.step1of3): Indicates that the intro panel is step one of three in a tour.
-trackingProtection.intro.step1of3=1 of 3
-trackingProtection.intro.nextButton.label=Next
-
 trackingProtection.icon.activeTooltip=Tracking attempts blocked
 trackingProtection.icon.disabledTooltip=Tracking content detected
 
@@ -606,13 +597,6 @@ flashHang.message = %S changed some Adobe Flash settings to improve performance.
 flashHang.helpButton.label = Learn More…
 flashHang.helpButton.accesskey = L
 
-# LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
-# in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
-# be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
-customizeTips.tip0 = %1$S: You can customize %2$S to work the way you do. Simply drag any of the above to the menu or toolbar. %3$S about customizing %2$S.
-customizeTips.tip0.hint = Hint
-customizeTips.tip0.learnMore = Learn more
-
 # LOCALIZATION NOTE (customizeMode.tabTitle): %S is brandShortName
 customizeMode.tabTitle = Customize %S
 
diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/application/basilisk/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
index 4574c6a81..4574c6a81 100644
--- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
diff --git a/browser/locales/en-US/chrome/browser/downloads/downloads.dtd b/application/basilisk/locales/en-US/chrome/browser/downloads/downloads.dtd
index 1217f43e4..1217f43e4 100644
--- a/browser/locales/en-US/chrome/browser/downloads/downloads.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/downloads/downloads.dtd
diff --git a/browser/locales/en-US/chrome/browser/downloads/downloads.properties b/application/basilisk/locales/en-US/chrome/browser/downloads/downloads.properties
index 30885e006..30885e006 100644
--- a/browser/locales/en-US/chrome/browser/downloads/downloads.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/downloads/downloads.properties
diff --git a/browser/locales/en-US/chrome/browser/engineManager.properties b/application/basilisk/locales/en-US/chrome/browser/engineManager.properties
index afe48f125..afe48f125 100644
--- a/browser/locales/en-US/chrome/browser/engineManager.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/engineManager.properties
diff --git a/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd b/application/basilisk/locales/en-US/chrome/browser/feeds/subscribe.dtd
index 9e124196d..9e124196d 100644
--- a/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/feeds/subscribe.dtd
diff --git a/browser/locales/en-US/chrome/browser/feeds/subscribe.properties b/application/basilisk/locales/en-US/chrome/browser/feeds/subscribe.properties
index 14354843c..14354843c 100644
--- a/browser/locales/en-US/chrome/browser/feeds/subscribe.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/feeds/subscribe.properties
diff --git a/browser/locales/en-US/chrome/browser/lightweightThemes.properties b/application/basilisk/locales/en-US/chrome/browser/lightweightThemes.properties
index 7228c5b0d..7228c5b0d 100644
--- a/browser/locales/en-US/chrome/browser/lightweightThemes.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/lightweightThemes.properties
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/application/basilisk/locales/en-US/chrome/browser/migration/migration.dtd
index ad9293a5d..ad9293a5d 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/migration/migration.dtd
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/application/basilisk/locales/en-US/chrome/browser/migration/migration.properties
index 65e39c78e..65e39c78e 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/migration/migration.properties
diff --git a/browser/locales/en-US/chrome/browser/newTab.dtd b/application/basilisk/locales/en-US/chrome/browser/newTab.dtd
index 392aeb957..392aeb957 100644
--- a/browser/locales/en-US/chrome/browser/newTab.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/newTab.dtd
diff --git a/browser/locales/en-US/chrome/browser/newTab.properties b/application/basilisk/locales/en-US/chrome/browser/newTab.properties
index 7b3fe248e..7b3fe248e 100644
--- a/browser/locales/en-US/chrome/browser/newTab.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/newTab.properties
diff --git a/browser/locales/en-US/chrome/browser/pageInfo.dtd b/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd
index 1e861c59c..1e861c59c 100644
--- a/browser/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd
diff --git a/browser/locales/en-US/chrome/browser/pageInfo.properties b/application/basilisk/locales/en-US/chrome/browser/pageInfo.properties
index 5cb678f4d..5cb678f4d 100644
--- a/browser/locales/en-US/chrome/browser/pageInfo.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/pageInfo.properties
diff --git a/browser/locales/en-US/chrome/browser/places/bookmarkProperties.properties b/application/basilisk/locales/en-US/chrome/browser/places/bookmarkProperties.properties
index 9f818f45b..9f818f45b 100644
--- a/browser/locales/en-US/chrome/browser/places/bookmarkProperties.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/places/bookmarkProperties.properties
diff --git a/browser/locales/en-US/chrome/browser/places/editBookmarkOverlay.dtd b/application/basilisk/locales/en-US/chrome/browser/places/editBookmarkOverlay.dtd
index d78c355c2..d78c355c2 100644
--- a/browser/locales/en-US/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/places/editBookmarkOverlay.dtd
diff --git a/browser/locales/en-US/chrome/browser/places/moveBookmarks.dtd b/application/basilisk/locales/en-US/chrome/browser/places/moveBookmarks.dtd
index 9f28b8098..9f28b8098 100644
--- a/browser/locales/en-US/chrome/browser/places/moveBookmarks.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/places/moveBookmarks.dtd
diff --git a/browser/locales/en-US/chrome/browser/places/places.dtd b/application/basilisk/locales/en-US/chrome/browser/places/places.dtd
index 6b2d10b1a..6b2d10b1a 100644
--- a/browser/locales/en-US/chrome/browser/places/places.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/places/places.dtd
diff --git a/browser/locales/en-US/chrome/browser/places/places.properties b/application/basilisk/locales/en-US/chrome/browser/places/places.properties
index f83b095c7..f83b095c7 100644
--- a/browser/locales/en-US/chrome/browser/places/places.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/places/places.properties
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd
index 124c00d84..124c00d84 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/applicationManager.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/applicationManager.dtd
index d2c76e63d..d2c76e63d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/applicationManager.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/applicationManager.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/applicationManager.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/applicationManager.properties
index 335363a66..335363a66 100644
--- a/browser/locales/en-US/chrome/browser/preferences/applicationManager.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/applicationManager.properties
diff --git a/browser/locales/en-US/chrome/browser/preferences/applications.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/applications.dtd
index ea89c3124..ea89c3124 100644
--- a/browser/locales/en-US/chrome/browser/preferences/applications.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/applications.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/blocklists.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/blocklists.dtd
index 31a2986fe..31a2986fe 100644
--- a/browser/locales/en-US/chrome/browser/preferences/blocklists.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/blocklists.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/colors.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/colors.dtd
index 7456f48b5..7456f48b5 100644
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/colors.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/connection.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/connection.dtd
index 850964a0f..850964a0f 100644
--- a/browser/locales/en-US/chrome/browser/preferences/connection.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/connection.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/containers.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd
index 58eca1ace..58eca1ace 100644
--- a/browser/locales/en-US/chrome/browser/preferences/containers.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/containers.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties
index 9866a0659..9866a0659 100644
--- a/browser/locales/en-US/chrome/browser/preferences/containers.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties
diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/content.dtd
index 5d58ffa37..5d58ffa37 100644
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/content.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd
index 5e7df9609..5e7df9609 100644
--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd
index 781fb53cd..781fb53cd 100644
--- a/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/fonts.dtd
index d55bcde8b..d55bcde8b 100644
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/fonts.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/languages.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/languages.dtd
index ba5b11eb5..ba5b11eb5 100644
--- a/browser/locales/en-US/chrome/browser/preferences/languages.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/languages.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/main.dtd
index 6b56f3400..6b56f3400 100644
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/main.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/permissions.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/permissions.dtd
index e61228b76..e61228b76 100644
--- a/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/permissions.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd
index 7702c8c51..7702c8c51 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties
index da40f40a9..da40f40a9 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
index 4c38c111a..4c38c111a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/search.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/search.dtd
index dbc2d7134..dbc2d7134 100644
--- a/browser/locales/en-US/chrome/browser/preferences/search.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/search.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/security.dtd
index 7ccc9af50..7ccc9af50 100644
--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/security.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/selectBookmark.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/selectBookmark.dtd
index a6082862a..a6082862a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/selectBookmark.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/selectBookmark.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/sync.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd
index 78cadd74c..78cadd74c 100644
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/tabs.dtd
index 5df3e330d..5df3e330d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/tabs.dtd
diff --git a/browser/locales/en-US/chrome/browser/preferences/translation.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/translation.dtd
index fc5fb2b7b..fc5fb2b7b 100644
--- a/browser/locales/en-US/chrome/browser/preferences/translation.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/translation.dtd
diff --git a/browser/locales/en-US/chrome/browser/quitDialog.properties b/application/basilisk/locales/en-US/chrome/browser/quitDialog.properties
index 35cdaa0d7..35cdaa0d7 100644
--- a/browser/locales/en-US/chrome/browser/quitDialog.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/quitDialog.properties
diff --git a/browser/locales/en-US/chrome/browser/safeMode.dtd b/application/basilisk/locales/en-US/chrome/browser/safeMode.dtd
index ab23731c1..ab23731c1 100644
--- a/browser/locales/en-US/chrome/browser/safeMode.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/safeMode.dtd
diff --git a/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
index 33d2202b3..33d2202b3 100644
--- a/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
diff --git a/browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
index 7444bcbf3..7444bcbf3 100644
--- a/browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
diff --git a/browser/locales/en-US/chrome/browser/sanitize.dtd b/application/basilisk/locales/en-US/chrome/browser/sanitize.dtd
index ab06ece0e..ab06ece0e 100644
--- a/browser/locales/en-US/chrome/browser/sanitize.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/sanitize.dtd
diff --git a/browser/locales/en-US/chrome/browser/search.properties b/application/basilisk/locales/en-US/chrome/browser/search.properties
index 83e8b690c..83e8b690c 100644
--- a/browser/locales/en-US/chrome/browser/search.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/search.properties
diff --git a/browser/locales/en-US/chrome/browser/searchbar.dtd b/application/basilisk/locales/en-US/chrome/browser/searchbar.dtd
index e5d18e4e8..e5d18e4e8 100644
--- a/browser/locales/en-US/chrome/browser/searchbar.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/searchbar.dtd
diff --git a/browser/locales/en-US/chrome/browser/setDesktopBackground.dtd b/application/basilisk/locales/en-US/chrome/browser/setDesktopBackground.dtd
index 71aa4b649..71aa4b649 100644
--- a/browser/locales/en-US/chrome/browser/setDesktopBackground.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/setDesktopBackground.dtd
diff --git a/browser/locales/en-US/chrome/browser/shellservice.properties b/application/basilisk/locales/en-US/chrome/browser/shellservice.properties
index e3dc14b7e..e3dc14b7e 100644
--- a/browser/locales/en-US/chrome/browser/shellservice.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/shellservice.properties
diff --git a/browser/locales/en-US/chrome/browser/sitePermissions.properties b/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties
index 8126995f2..8126995f2 100644
--- a/browser/locales/en-US/chrome/browser/sitePermissions.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties
diff --git a/browser/locales/en-US/chrome/browser/syncBrand.dtd b/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd
index 0c9e9201a..0c9e9201a 100644
--- a/browser/locales/en-US/chrome/browser/syncBrand.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd
diff --git a/browser/locales/en-US/chrome/browser/syncCustomize.dtd b/application/basilisk/locales/en-US/chrome/browser/syncCustomize.dtd
index e59d1db25..e59d1db25 100644
--- a/browser/locales/en-US/chrome/browser/syncCustomize.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/syncCustomize.dtd
diff --git a/browser/locales/en-US/chrome/browser/syncGenericChange.properties b/application/basilisk/locales/en-US/chrome/browser/syncGenericChange.properties
index aea86ad0e..aea86ad0e 100644
--- a/browser/locales/en-US/chrome/browser/syncGenericChange.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/syncGenericChange.properties
diff --git a/browser/locales/en-US/chrome/browser/syncKey.dtd b/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd
index 2ff001842..2ff001842 100644
--- a/browser/locales/en-US/chrome/browser/syncKey.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd
diff --git a/browser/locales/en-US/chrome/browser/syncQuota.dtd b/application/basilisk/locales/en-US/chrome/browser/syncQuota.dtd
index 71174f087..71174f087 100644
--- a/browser/locales/en-US/chrome/browser/syncQuota.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/syncQuota.dtd
diff --git a/browser/locales/en-US/chrome/browser/syncQuota.properties b/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties
index 099090ec9..099090ec9 100644
--- a/browser/locales/en-US/chrome/browser/syncQuota.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.dtd b/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd
index 950a83553..950a83553 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.properties b/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties
index 9d388af86..9d388af86 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties
diff --git a/browser/locales/en-US/chrome/browser/tabbrowser.properties b/application/basilisk/locales/en-US/chrome/browser/tabbrowser.properties
index 8e833c435..8e833c435 100644
--- a/browser/locales/en-US/chrome/browser/tabbrowser.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/tabbrowser.properties
diff --git a/browser/locales/en-US/chrome/browser/taskbar.properties b/application/basilisk/locales/en-US/chrome/browser/taskbar.properties
index 987d5ccf8..987d5ccf8 100644
--- a/browser/locales/en-US/chrome/browser/taskbar.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/taskbar.properties
diff --git a/browser/locales/en-US/chrome/browser/translation.dtd b/application/basilisk/locales/en-US/chrome/browser/translation.dtd
index ca8bb9d51..ca8bb9d51 100644
--- a/browser/locales/en-US/chrome/browser/translation.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/translation.dtd
diff --git a/browser/locales/en-US/chrome/browser/translation.properties b/application/basilisk/locales/en-US/chrome/browser/translation.properties
index e62edbd0a..e62edbd0a 100644
--- a/browser/locales/en-US/chrome/browser/translation.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/translation.properties
diff --git a/browser/locales/en-US/chrome/browser/webrtcIndicator.properties b/application/basilisk/locales/en-US/chrome/browser/webrtcIndicator.properties
index 71d6f2ed9..71d6f2ed9 100644
--- a/browser/locales/en-US/chrome/browser/webrtcIndicator.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/webrtcIndicator.properties
diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties
index 02682c89c..02682c89c 100644
--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
+++ b/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties
diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/application/basilisk/locales/en-US/chrome/overrides/netError.dtd
index 6c65c9345..6c65c9345 100644
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/application/basilisk/locales/en-US/chrome/overrides/netError.dtd
diff --git a/browser/locales/en-US/chrome/overrides/settingsChange.dtd b/application/basilisk/locales/en-US/chrome/overrides/settingsChange.dtd
index 1357b92fa..1357b92fa 100644
--- a/browser/locales/en-US/chrome/overrides/settingsChange.dtd
+++ b/application/basilisk/locales/en-US/chrome/overrides/settingsChange.dtd
diff --git a/browser/locales/en-US/crashreporter/crashreporter-override.ini b/application/basilisk/locales/en-US/crashreporter/crashreporter-override.ini
index f14b1c4f0..f14b1c4f0 100644
--- a/browser/locales/en-US/crashreporter/crashreporter-override.ini
+++ b/application/basilisk/locales/en-US/crashreporter/crashreporter-override.ini
diff --git a/browser/locales/en-US/defines.inc b/application/basilisk/locales/en-US/defines.inc
index fb7fe4c93..fb7fe4c93 100644
--- a/browser/locales/en-US/defines.inc
+++ b/application/basilisk/locales/en-US/defines.inc
diff --git a/browser/locales/en-US/firefox-l10n.js b/application/basilisk/locales/en-US/firefox-l10n.js
index 642ad6534..642ad6534 100644
--- a/browser/locales/en-US/firefox-l10n.js
+++ b/application/basilisk/locales/en-US/firefox-l10n.js
diff --git a/browser/locales/en-US/installer/custom.properties b/application/basilisk/locales/en-US/installer/custom.properties
index 4abb1a550..4abb1a550 100644
--- a/browser/locales/en-US/installer/custom.properties
+++ b/application/basilisk/locales/en-US/installer/custom.properties
diff --git a/browser/locales/en-US/installer/mui.properties b/application/basilisk/locales/en-US/installer/mui.properties
index c786dbba2..c786dbba2 100644
--- a/browser/locales/en-US/installer/mui.properties
+++ b/application/basilisk/locales/en-US/installer/mui.properties
diff --git a/browser/locales/en-US/installer/nsisstrings.properties b/application/basilisk/locales/en-US/installer/nsisstrings.properties
index 389405696..389405696 100644
--- a/browser/locales/en-US/installer/nsisstrings.properties
+++ b/application/basilisk/locales/en-US/installer/nsisstrings.properties
diff --git a/browser/locales/en-US/installer/override.properties b/application/basilisk/locales/en-US/installer/override.properties
index 288f67480..288f67480 100644
--- a/browser/locales/en-US/installer/override.properties
+++ b/application/basilisk/locales/en-US/installer/override.properties
diff --git a/browser/locales/en-US/pdfviewer/chrome.properties b/application/basilisk/locales/en-US/pdfviewer/chrome.properties
index e42ac790c..e42ac790c 100644
--- a/browser/locales/en-US/pdfviewer/chrome.properties
+++ b/application/basilisk/locales/en-US/pdfviewer/chrome.properties
diff --git a/browser/locales/en-US/pdfviewer/viewer.properties b/application/basilisk/locales/en-US/pdfviewer/viewer.properties
index 43ce1f317..43ce1f317 100644
--- a/browser/locales/en-US/pdfviewer/viewer.properties
+++ b/application/basilisk/locales/en-US/pdfviewer/viewer.properties
diff --git a/browser/locales/en-US/profile/bookmarks.inc b/application/basilisk/locales/en-US/profile/bookmarks.inc
index 3ef47799a..3ef47799a 100644
--- a/browser/locales/en-US/profile/bookmarks.inc
+++ b/application/basilisk/locales/en-US/profile/bookmarks.inc
diff --git a/browser/locales/en-US/updater/updater.ini b/application/basilisk/locales/en-US/updater/updater.ini
index 6bc731f16..6bc731f16 100644
--- a/browser/locales/en-US/updater/updater.ini
+++ b/application/basilisk/locales/en-US/updater/updater.ini
diff --git a/browser/locales/filter.py b/application/basilisk/locales/filter.py
index 52e596d96..52e596d96 100755..100644
--- a/browser/locales/filter.py
+++ b/application/basilisk/locales/filter.py
diff --git a/browser/locales/generic/profile/bookmarks.html.in b/application/basilisk/locales/generic/profile/bookmarks.html.in
index e9121f023..e9121f023 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/application/basilisk/locales/generic/profile/bookmarks.html.in
diff --git a/browser/locales/jar.mn b/application/basilisk/locales/jar.mn
index 31cbd9ccf..31cbd9ccf 100644
--- a/browser/locales/jar.mn
+++ b/application/basilisk/locales/jar.mn
diff --git a/browser/locales/l10n.ini b/application/basilisk/locales/l10n.ini
index 2e387e97a..f1d22c259 100644
--- a/browser/locales/l10n.ini
+++ b/application/basilisk/locales/l10n.ini
@@ -3,13 +3,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [general]
-depth = ../..
-all = browser/locales/all-locales
+depth = ../../..
+all = application/basilisk/locales/all-locales
 
 [compare]
 dirs = browser
      other-licenses/branding/firefox
-     browser/branding/official
+     application/basilisk/branding/official
      devtools/client
 
 [includes]
diff --git a/browser/locales/moz.build b/application/basilisk/locales/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/locales/moz.build
+++ b/application/basilisk/locales/moz.build
diff --git a/browser/locales/search/list.json b/application/basilisk/locales/search/list.json
index 722f3186f..722f3186f 100644
--- a/browser/locales/search/list.json
+++ b/application/basilisk/locales/search/list.json
diff --git a/browser/locales/searchplugins/bing.xml b/application/basilisk/locales/searchplugins/bing.xml
index d0f2f6e9f..d0f2f6e9f 100644
--- a/browser/locales/searchplugins/bing.xml
+++ b/application/basilisk/locales/searchplugins/bing.xml
diff --git a/browser/locales/searchplugins/ddg.xml b/application/basilisk/locales/searchplugins/ddg.xml
index 079c9d6f6..079c9d6f6 100644
--- a/browser/locales/searchplugins/ddg.xml
+++ b/application/basilisk/locales/searchplugins/ddg.xml
diff --git a/browser/locales/searchplugins/google-2018.xml b/application/basilisk/locales/searchplugins/google-2018.xml
index 27227fa3b..27227fa3b 100644
--- a/browser/locales/searchplugins/google-2018.xml
+++ b/application/basilisk/locales/searchplugins/google-2018.xml
diff --git a/browser/locales/searchplugins/wikipedia.xml b/application/basilisk/locales/searchplugins/wikipedia.xml
index fb72be5d1..fb72be5d1 100644
--- a/browser/locales/searchplugins/wikipedia.xml
+++ b/application/basilisk/locales/searchplugins/wikipedia.xml
diff --git a/browser/locales/searchplugins/yahoo.xml b/application/basilisk/locales/searchplugins/yahoo.xml
index 1c890a208..1c890a208 100644
--- a/browser/locales/searchplugins/yahoo.xml
+++ b/application/basilisk/locales/searchplugins/yahoo.xml
diff --git a/browser/locales/shipped-locales b/application/basilisk/locales/shipped-locales
index 6dc8e0dc8..6dc8e0dc8 100644
--- a/browser/locales/shipped-locales
+++ b/application/basilisk/locales/shipped-locales
diff --git a/browser/modules/AboutHome.jsm b/application/basilisk/modules/AboutHome.jsm
index 639194c20..639194c20 100644
--- a/browser/modules/AboutHome.jsm
+++ b/application/basilisk/modules/AboutHome.jsm
diff --git a/browser/modules/AboutNewTab.jsm b/application/basilisk/modules/AboutNewTab.jsm
index 4337c5a2d..4337c5a2d 100644
--- a/browser/modules/AboutNewTab.jsm
+++ b/application/basilisk/modules/AboutNewTab.jsm
diff --git a/browser/modules/AttributionCode.jsm b/application/basilisk/modules/AttributionCode.jsm
index dc42b2be4..dc42b2be4 100644
--- a/browser/modules/AttributionCode.jsm
+++ b/application/basilisk/modules/AttributionCode.jsm
diff --git a/browser/modules/BrowserUITelemetry.jsm b/application/basilisk/modules/BrowserUITelemetry.jsm
index 2ad319f1a..2b7cc8c20 100644
--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/application/basilisk/modules/BrowserUITelemetry.jsm
@@ -17,8 +17,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
   "resource:///modules/RecentWindow.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
   "resource:///modules/CustomizableUI.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "UITour",
-  "resource:///modules/UITour.jsm");
 XPCOMUtils.defineLazyGetter(this, "Timer", function() {
   let timer = {};
   Cu.import("resource://gre/modules/Timer.jsm", timer);
@@ -174,11 +172,6 @@ this.BrowserUITelemetry = {
                                          this.getToolbarMeasures.bind(this));
     UITelemetry.addSimpleMeasureFunction("contextmenu",
                                          this.getContextMenuInfo.bind(this));
-    // Ensure that UITour.jsm remains lazy-loaded, yet always registers its
-    // simple measure function with UITelemetry.
-    UITelemetry.addSimpleMeasureFunction("UITour",
-                                         () => UITour.getTelemetry());
-
     UITelemetry.addSimpleMeasureFunction("syncstate",
                                          this.getSyncState.bind(this));
 
diff --git a/browser/modules/BrowserUsageTelemetry.jsm b/application/basilisk/modules/BrowserUsageTelemetry.jsm
index 39012d2ab..39012d2ab 100644
--- a/browser/modules/BrowserUsageTelemetry.jsm
+++ b/application/basilisk/modules/BrowserUsageTelemetry.jsm
diff --git a/browser/modules/CastingApps.jsm b/application/basilisk/modules/CastingApps.jsm
index 6f32753e8..6f32753e8 100644
--- a/browser/modules/CastingApps.jsm
+++ b/application/basilisk/modules/CastingApps.jsm
diff --git a/browser/modules/ContentClick.jsm b/application/basilisk/modules/ContentClick.jsm
index 40101d5d3..40101d5d3 100644
--- a/browser/modules/ContentClick.jsm
+++ b/application/basilisk/modules/ContentClick.jsm
diff --git a/browser/modules/ContentCrashHandlers.jsm b/application/basilisk/modules/ContentCrashHandlers.jsm
index 488cc4f26..488cc4f26 100644
--- a/browser/modules/ContentCrashHandlers.jsm
+++ b/application/basilisk/modules/ContentCrashHandlers.jsm
diff --git a/browser/modules/ContentLinkHandler.jsm b/application/basilisk/modules/ContentLinkHandler.jsm
index 443cae2da..443cae2da 100644
--- a/browser/modules/ContentLinkHandler.jsm
+++ b/application/basilisk/modules/ContentLinkHandler.jsm
diff --git a/browser/modules/ContentObservers.jsm b/application/basilisk/modules/ContentObservers.jsm
index 9d627ddc2..9d627ddc2 100644
--- a/browser/modules/ContentObservers.jsm
+++ b/application/basilisk/modules/ContentObservers.jsm
diff --git a/browser/modules/ContentSearch.jsm b/application/basilisk/modules/ContentSearch.jsm
index 91b0b9ac8..91b0b9ac8 100644
--- a/browser/modules/ContentSearch.jsm
+++ b/application/basilisk/modules/ContentSearch.jsm
diff --git a/browser/modules/ContentWebRTC.jsm b/application/basilisk/modules/ContentWebRTC.jsm
index fd50176a0..fd50176a0 100644
--- a/browser/modules/ContentWebRTC.jsm
+++ b/application/basilisk/modules/ContentWebRTC.jsm
diff --git a/browser/modules/DirectoryLinksProvider.jsm b/application/basilisk/modules/DirectoryLinksProvider.jsm
index 117564099..117564099 100644
--- a/browser/modules/DirectoryLinksProvider.jsm
+++ b/application/basilisk/modules/DirectoryLinksProvider.jsm
diff --git a/browser/modules/E10SUtils.jsm b/application/basilisk/modules/E10SUtils.jsm
index 7ed51ee96..7ed51ee96 100644
--- a/browser/modules/E10SUtils.jsm
+++ b/application/basilisk/modules/E10SUtils.jsm
diff --git a/browser/modules/Feeds.jsm b/application/basilisk/modules/Feeds.jsm
index 179d2b83d..179d2b83d 100644
--- a/browser/modules/Feeds.jsm
+++ b/application/basilisk/modules/Feeds.jsm
diff --git a/browser/modules/FormSubmitObserver.jsm b/application/basilisk/modules/FormSubmitObserver.jsm
index 058794a54..058794a54 100644
--- a/browser/modules/FormSubmitObserver.jsm
+++ b/application/basilisk/modules/FormSubmitObserver.jsm
diff --git a/browser/modules/FormValidationHandler.jsm b/application/basilisk/modules/FormValidationHandler.jsm
index e7e7b14c3..e7e7b14c3 100644
--- a/browser/modules/FormValidationHandler.jsm
+++ b/application/basilisk/modules/FormValidationHandler.jsm
diff --git a/browser/modules/HiddenFrame.jsm b/application/basilisk/modules/HiddenFrame.jsm
index 7676ae189..7676ae189 100644
--- a/browser/modules/HiddenFrame.jsm
+++ b/application/basilisk/modules/HiddenFrame.jsm
diff --git a/browser/modules/LaterRun.jsm b/application/basilisk/modules/LaterRun.jsm
index 4c93a904a..4c93a904a 100644
--- a/browser/modules/LaterRun.jsm
+++ b/application/basilisk/modules/LaterRun.jsm
diff --git a/browser/modules/NetworkPrioritizer.jsm b/application/basilisk/modules/NetworkPrioritizer.jsm
index 770a30e09..770a30e09 100644
--- a/browser/modules/NetworkPrioritizer.jsm
+++ b/application/basilisk/modules/NetworkPrioritizer.jsm
diff --git a/browser/modules/PermissionUI.jsm b/application/basilisk/modules/PermissionUI.jsm
index 5fa0f9f06..5fa0f9f06 100644
--- a/browser/modules/PermissionUI.jsm
+++ b/application/basilisk/modules/PermissionUI.jsm
diff --git a/browser/modules/PluginContent.jsm b/application/basilisk/modules/PluginContent.jsm
index 622d608bc..622d608bc 100644
--- a/browser/modules/PluginContent.jsm
+++ b/application/basilisk/modules/PluginContent.jsm
diff --git a/browser/modules/ProcessHangMonitor.jsm b/application/basilisk/modules/ProcessHangMonitor.jsm
index e048f5b40..e048f5b40 100644
--- a/browser/modules/ProcessHangMonitor.jsm
+++ b/application/basilisk/modules/ProcessHangMonitor.jsm
diff --git a/browser/modules/ReaderParent.jsm b/application/basilisk/modules/ReaderParent.jsm
index c81aa9905..c81aa9905 100644
--- a/browser/modules/ReaderParent.jsm
+++ b/application/basilisk/modules/ReaderParent.jsm
diff --git a/browser/modules/RecentWindow.jsm b/application/basilisk/modules/RecentWindow.jsm
index fac9dcea4..fac9dcea4 100644
--- a/browser/modules/RecentWindow.jsm
+++ b/application/basilisk/modules/RecentWindow.jsm
diff --git a/browser/modules/RemotePrompt.jsm b/application/basilisk/modules/RemotePrompt.jsm
index da4945c2e..da4945c2e 100644
--- a/browser/modules/RemotePrompt.jsm
+++ b/application/basilisk/modules/RemotePrompt.jsm
diff --git a/browser/modules/Sanitizer.jsm b/application/basilisk/modules/Sanitizer.jsm
index 31c2823c7..31c2823c7 100644
--- a/browser/modules/Sanitizer.jsm
+++ b/application/basilisk/modules/Sanitizer.jsm
diff --git a/browser/modules/SitePermissions.jsm b/application/basilisk/modules/SitePermissions.jsm
index d15ddb21b..d15ddb21b 100644
--- a/browser/modules/SitePermissions.jsm
+++ b/application/basilisk/modules/SitePermissions.jsm
diff --git a/browser/modules/TransientPrefs.jsm b/application/basilisk/modules/TransientPrefs.jsm
index 30ba6a152..30ba6a152 100644
--- a/browser/modules/TransientPrefs.jsm
+++ b/application/basilisk/modules/TransientPrefs.jsm
diff --git a/browser/modules/URLBarZoom.jsm b/application/basilisk/modules/URLBarZoom.jsm
index 3e1c0f707..3e1c0f707 100644
--- a/browser/modules/URLBarZoom.jsm
+++ b/application/basilisk/modules/URLBarZoom.jsm
diff --git a/browser/modules/Windows8WindowFrameColor.jsm b/application/basilisk/modules/Windows8WindowFrameColor.jsm
index 911333747..911333747 100644
--- a/browser/modules/Windows8WindowFrameColor.jsm
+++ b/application/basilisk/modules/Windows8WindowFrameColor.jsm
diff --git a/browser/modules/WindowsJumpLists.jsm b/application/basilisk/modules/WindowsJumpLists.jsm
index 4df87b47a..4df87b47a 100644
--- a/browser/modules/WindowsJumpLists.jsm
+++ b/application/basilisk/modules/WindowsJumpLists.jsm
diff --git a/browser/modules/WindowsPreviewPerTab.jsm b/application/basilisk/modules/WindowsPreviewPerTab.jsm
index 6586b5d3b..6586b5d3b 100644
--- a/browser/modules/WindowsPreviewPerTab.jsm
+++ b/application/basilisk/modules/WindowsPreviewPerTab.jsm
diff --git a/browser/modules/moz.build b/application/basilisk/modules/moz.build
index a7bbbc258..684f662d7 100644
--- a/browser/modules/moz.build
+++ b/application/basilisk/modules/moz.build
@@ -33,7 +33,6 @@ EXTRA_JS_MODULES += [
     'RecentWindow.jsm',
     'RemotePrompt.jsm',
     'Sanitizer.jsm',
-    'SelfSupportBackend.jsm',
     'SitePermissions.jsm',
     'TransientPrefs.jsm',
     'URLBarZoom.jsm',
diff --git a/browser/modules/offlineAppCache.jsm b/application/basilisk/modules/offlineAppCache.jsm
index 5d0e3481a..5d0e3481a 100644
--- a/browser/modules/offlineAppCache.jsm
+++ b/application/basilisk/modules/offlineAppCache.jsm
diff --git a/browser/modules/webrtcUI.jsm b/application/basilisk/modules/webrtcUI.jsm
index 08de46bb3..08de46bb3 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/application/basilisk/modules/webrtcUI.jsm
diff --git a/browser/moz.build b/application/basilisk/moz.build
index 0985148c0..7274f48fc 100644
--- a/browser/moz.build
+++ b/application/basilisk/moz.build
@@ -36,5 +36,5 @@ if CONFIG['MOZ_ARTIFACT_BUILDS']:
     # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact
     # code is included by the top-level chrome.manifest.
     EXTRA_COMPONENTS += [
-        '../build/prebuilt-interfaces.manifest',
+        '../../build/prebuilt-interfaces.manifest',
     ]
diff --git a/browser/moz.configure b/application/basilisk/moz.configure
index d5e7dba11..72236254f 100644
--- a/browser/moz.configure
+++ b/application/basilisk/moz.configure
@@ -4,4 +4,4 @@
 # 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/.
 
-include('../toolkit/moz.configure')
+include('../../toolkit/moz.configure')
diff --git a/browser/themes/LICENSE b/application/basilisk/themes/LICENSE
index 39d4f8fdf..39d4f8fdf 100644
--- a/browser/themes/LICENSE
+++ b/application/basilisk/themes/LICENSE
diff --git a/browser/themes/linux/Info.png b/application/basilisk/themes/linux/Info.png
index d14479852..d14479852 100644
--- a/browser/themes/linux/Info.png
+++ b/application/basilisk/themes/linux/Info.png
diff --git a/browser/themes/linux/Privacy-16.png b/application/basilisk/themes/linux/Privacy-16.png
index 013cdc4b9..013cdc4b9 100644
--- a/browser/themes/linux/Privacy-16.png
+++ b/application/basilisk/themes/linux/Privacy-16.png
diff --git a/browser/themes/linux/Security-broken.png b/application/basilisk/themes/linux/Security-broken.png
index 1ec110be4..1ec110be4 100644
--- a/browser/themes/linux/Security-broken.png
+++ b/application/basilisk/themes/linux/Security-broken.png
diff --git a/browser/themes/linux/Toolbar-inverted.png b/application/basilisk/themes/linux/Toolbar-inverted.png
index 50a3d346f..50a3d346f 100644
--- a/browser/themes/linux/Toolbar-inverted.png
+++ b/application/basilisk/themes/linux/Toolbar-inverted.png
diff --git a/browser/themes/linux/Toolbar-inverted@2x.png b/application/basilisk/themes/linux/Toolbar-inverted@2x.png
index 3472548d2..3472548d2 100644
--- a/browser/themes/linux/Toolbar-inverted@2x.png
+++ b/application/basilisk/themes/linux/Toolbar-inverted@2x.png
diff --git a/browser/themes/linux/Toolbar-small.png b/application/basilisk/themes/linux/Toolbar-small.png
index 8f100a54a..8f100a54a 100644
--- a/browser/themes/linux/Toolbar-small.png
+++ b/application/basilisk/themes/linux/Toolbar-small.png
diff --git a/browser/themes/linux/Toolbar.png b/application/basilisk/themes/linux/Toolbar.png
index cdd100aa5..cdd100aa5 100644
--- a/browser/themes/linux/Toolbar.png
+++ b/application/basilisk/themes/linux/Toolbar.png
diff --git a/browser/themes/linux/Toolbar@2x.png b/application/basilisk/themes/linux/Toolbar@2x.png
index 3244081c3..3244081c3 100644
--- a/browser/themes/linux/Toolbar@2x.png
+++ b/application/basilisk/themes/linux/Toolbar@2x.png
diff --git a/browser/themes/linux/aboutSessionRestore-window-icon.png b/application/basilisk/themes/linux/aboutSessionRestore-window-icon.png
index a99832372..a99832372 100644
--- a/browser/themes/linux/aboutSessionRestore-window-icon.png
+++ b/application/basilisk/themes/linux/aboutSessionRestore-window-icon.png
diff --git a/browser/themes/linux/aboutSyncTabs.css b/application/basilisk/themes/linux/aboutSyncTabs.css
index 4cedad649..4cedad649 100644
--- a/browser/themes/linux/aboutSyncTabs.css
+++ b/application/basilisk/themes/linux/aboutSyncTabs.css
diff --git a/browser/themes/linux/actionicon-tab.png b/application/basilisk/themes/linux/actionicon-tab.png
index 433c25e1a..433c25e1a 100644
--- a/browser/themes/linux/actionicon-tab.png
+++ b/application/basilisk/themes/linux/actionicon-tab.png
diff --git a/browser/themes/linux/browser-lightweightTheme.css b/application/basilisk/themes/linux/browser-lightweightTheme.css
index d3109bec3..d3109bec3 100644
--- a/browser/themes/linux/browser-lightweightTheme.css
+++ b/application/basilisk/themes/linux/browser-lightweightTheme.css
diff --git a/browser/themes/linux/browser.css b/application/basilisk/themes/linux/browser.css
index 3e6b81512..f9bd0bbd0 100644
--- a/browser/themes/linux/browser.css
+++ b/application/basilisk/themes/linux/browser.css
@@ -1460,8 +1460,8 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) {
@@ -1543,11 +1543,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   border-left: 3px solid transparent;
 }
 
-/* The :hover:active style from toolkit doesn't seem to work in this panel so just use :active. */
-.customization-tipPanel-closeBox > .close-icon:active {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32);
-}
-
 /* End customization mode */
 
 
@@ -1556,40 +1551,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:h
   width: 40px;
 }
 
-%include ../shared/UITour.inc.css
-
-#UITourHighlight {
-  /* Below are some fixes for people without an X compositor on Linux.
-     This is why we can't have nice things: */
-  /* Animations don't repaint properly without an X compositor. */
-  animation-name: none !important;
-  /* Opacity rounds to 0 or 1 on Linux without an X compositor so make the
-     background be transparent in that case by having all alpha values < 0.5 */
-  background-image: radial-gradient(50% 100%, rgba(0,149,220,0.3) 50%, rgba(0,149,220,0.49) 100%);
-  /* The highlight isn't anti-aliased without an X compositor so make it thicker.
-     Make it a darker color since we don't have the box-shadow in this case. */
-  border: 4px solid rgb(0,149,220);
-}
-
-#UITourTooltipDescription {
-  font-size: 1.05rem;
-}
-
-#UITourTooltipClose {
-  margin-inline-end: -4px;
-  height: 16px;
-  width: 16px;
-}
-
-/**
- * Override the --arrowpanel-padding so the background extends
- * to the sides and bottom of the panel.
- */
-#UITourTooltipButtons {
-  margin-left: -10px;
-  margin-bottom: -10px;
-}
-
 %include ../shared/contextmenu.inc.css
 
 #context-navigation > .menuitem-iconic > .menu-iconic-left {
diff --git a/browser/themes/linux/click-to-play-warning-stripes.png b/application/basilisk/themes/linux/click-to-play-warning-stripes.png
index 29f15f7b8..29f15f7b8 100644
--- a/browser/themes/linux/click-to-play-warning-stripes.png
+++ b/application/basilisk/themes/linux/click-to-play-warning-stripes.png
diff --git a/browser/themes/linux/communicator/communicator.css b/application/basilisk/themes/linux/communicator/communicator.css
index 0b57574fd..0b57574fd 100644
--- a/browser/themes/linux/communicator/communicator.css
+++ b/application/basilisk/themes/linux/communicator/communicator.css
diff --git a/browser/themes/linux/communicator/jar.mn b/application/basilisk/themes/linux/communicator/jar.mn
index dfd20c523..dfd20c523 100644
--- a/browser/themes/linux/communicator/jar.mn
+++ b/application/basilisk/themes/linux/communicator/jar.mn
diff --git a/browser/themes/linux/communicator/moz.build b/application/basilisk/themes/linux/communicator/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/themes/linux/communicator/moz.build
+++ b/application/basilisk/themes/linux/communicator/moz.build
diff --git a/browser/themes/linux/controlcenter/panel.css b/application/basilisk/themes/linux/controlcenter/panel.css
index fab9aa3a4..fab9aa3a4 100644
--- a/browser/themes/linux/controlcenter/panel.css
+++ b/application/basilisk/themes/linux/controlcenter/panel.css
diff --git a/browser/themes/linux/customizableui/background-noise-toolbar.png b/application/basilisk/themes/linux/customizableui/background-noise-toolbar.png
index d09ba9daf..d09ba9daf 100644
--- a/browser/themes/linux/customizableui/background-noise-toolbar.png
+++ b/application/basilisk/themes/linux/customizableui/background-noise-toolbar.png
diff --git a/browser/themes/linux/customizableui/customizeMode-gridTexture.png b/application/basilisk/themes/linux/customizableui/customizeMode-gridTexture.png
index a7c2775cf..a7c2775cf 100644
--- a/browser/themes/linux/customizableui/customizeMode-gridTexture.png
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-gridTexture.png
diff --git a/browser/themes/linux/customizableui/customizeMode-separatorHorizontal.png b/application/basilisk/themes/linux/customizableui/customizeMode-separatorHorizontal.png
index 5e17cb4db..5e17cb4db 100644
--- a/browser/themes/linux/customizableui/customizeMode-separatorHorizontal.png
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-separatorHorizontal.png
diff --git a/browser/themes/linux/customizableui/customizeMode-separatorVertical.png b/application/basilisk/themes/linux/customizableui/customizeMode-separatorVertical.png
index dc4caee81..dc4caee81 100644
--- a/browser/themes/linux/customizableui/customizeMode-separatorVertical.png
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-separatorVertical.png
diff --git a/browser/themes/linux/customizableui/panelUI.css b/application/basilisk/themes/linux/customizableui/panelUI.css
index 0037b5634..0037b5634 100644
--- a/browser/themes/linux/customizableui/panelUI.css
+++ b/application/basilisk/themes/linux/customizableui/panelUI.css
diff --git a/browser/themes/linux/devedition.css b/application/basilisk/themes/linux/devedition.css
index 1f16d5d63..1f16d5d63 100644
--- a/browser/themes/linux/devedition.css
+++ b/application/basilisk/themes/linux/devedition.css
diff --git a/browser/themes/linux/downloads/allDownloadsViewOverlay.css b/application/basilisk/themes/linux/downloads/allDownloadsViewOverlay.css
index f5a05c9b0..f5a05c9b0 100644
--- a/browser/themes/linux/downloads/allDownloadsViewOverlay.css
+++ b/application/basilisk/themes/linux/downloads/allDownloadsViewOverlay.css
diff --git a/browser/themes/linux/downloads/download-glow-menuPanel.png b/application/basilisk/themes/linux/downloads/download-glow-menuPanel.png
index b8443f045..b8443f045 100644
--- a/browser/themes/linux/downloads/download-glow-menuPanel.png
+++ b/application/basilisk/themes/linux/downloads/download-glow-menuPanel.png
diff --git a/browser/themes/linux/downloads/download-notification-finish.png b/application/basilisk/themes/linux/downloads/download-notification-finish.png
index f5fa12053..f5fa12053 100644
--- a/browser/themes/linux/downloads/download-notification-finish.png
+++ b/application/basilisk/themes/linux/downloads/download-notification-finish.png
diff --git a/browser/themes/linux/downloads/download-notification-start.png b/application/basilisk/themes/linux/downloads/download-notification-start.png
index bd548b183..bd548b183 100644
--- a/browser/themes/linux/downloads/download-notification-start.png
+++ b/application/basilisk/themes/linux/downloads/download-notification-start.png
diff --git a/browser/themes/linux/downloads/downloads.css b/application/basilisk/themes/linux/downloads/downloads.css
index 41ea68d43..41ea68d43 100644
--- a/browser/themes/linux/downloads/downloads.css
+++ b/application/basilisk/themes/linux/downloads/downloads.css
diff --git a/browser/themes/linux/downloads/indicator.css b/application/basilisk/themes/linux/downloads/indicator.css
index 6e9d9ace5..6e9d9ace5 100644
--- a/browser/themes/linux/downloads/indicator.css
+++ b/application/basilisk/themes/linux/downloads/indicator.css
diff --git a/browser/themes/linux/feeds/feedIcon.png b/application/basilisk/themes/linux/feeds/feedIcon.png
index a788fffb0..a788fffb0 100644
--- a/browser/themes/linux/feeds/feedIcon.png
+++ b/application/basilisk/themes/linux/feeds/feedIcon.png
diff --git a/browser/themes/linux/feeds/feedIcon16.png b/application/basilisk/themes/linux/feeds/feedIcon16.png
index f8536a4e1..f8536a4e1 100644
--- a/browser/themes/linux/feeds/feedIcon16.png
+++ b/application/basilisk/themes/linux/feeds/feedIcon16.png
diff --git a/browser/themes/linux/feeds/subscribe-ui.css b/application/basilisk/themes/linux/feeds/subscribe-ui.css
index f1650036e..f1650036e 100644
--- a/browser/themes/linux/feeds/subscribe-ui.css
+++ b/application/basilisk/themes/linux/feeds/subscribe-ui.css
diff --git a/browser/themes/linux/feeds/subscribe.css b/application/basilisk/themes/linux/feeds/subscribe.css
index a9b59d2e1..a9b59d2e1 100644
--- a/browser/themes/linux/feeds/subscribe.css
+++ b/application/basilisk/themes/linux/feeds/subscribe.css
diff --git a/browser/themes/linux/jar.mn b/application/basilisk/themes/linux/jar.mn
index 189027812..189027812 100644
--- a/browser/themes/linux/jar.mn
+++ b/application/basilisk/themes/linux/jar.mn
diff --git a/browser/themes/linux/linuxShared.inc b/application/basilisk/themes/linux/linuxShared.inc
index 80f88ae73..80f88ae73 100644
--- a/browser/themes/linux/linuxShared.inc
+++ b/application/basilisk/themes/linux/linuxShared.inc
diff --git a/browser/themes/linux/menuPanel-customize.png b/application/basilisk/themes/linux/menuPanel-customize.png
index e0b0a70a3..e0b0a70a3 100644
--- a/browser/themes/linux/menuPanel-customize.png
+++ b/application/basilisk/themes/linux/menuPanel-customize.png
diff --git a/browser/themes/linux/menuPanel-customize@2x.png b/application/basilisk/themes/linux/menuPanel-customize@2x.png
index 5ce3b766a..5ce3b766a 100644
--- a/browser/themes/linux/menuPanel-customize@2x.png
+++ b/application/basilisk/themes/linux/menuPanel-customize@2x.png
diff --git a/browser/themes/linux/menuPanel-exit.png b/application/basilisk/themes/linux/menuPanel-exit.png
index 8daaffe95..8daaffe95 100644
--- a/browser/themes/linux/menuPanel-exit.png
+++ b/application/basilisk/themes/linux/menuPanel-exit.png
diff --git a/browser/themes/linux/menuPanel-exit@2x.png b/application/basilisk/themes/linux/menuPanel-exit@2x.png
index d48426546..d48426546 100644
--- a/browser/themes/linux/menuPanel-exit@2x.png
+++ b/application/basilisk/themes/linux/menuPanel-exit@2x.png
diff --git a/browser/themes/linux/menuPanel-help.png b/application/basilisk/themes/linux/menuPanel-help.png
index 962001ff6..962001ff6 100644
--- a/browser/themes/linux/menuPanel-help.png
+++ b/application/basilisk/themes/linux/menuPanel-help.png
diff --git a/browser/themes/linux/menuPanel-help@2x.png b/application/basilisk/themes/linux/menuPanel-help@2x.png
index b8f0a80fa..b8f0a80fa 100644
--- a/browser/themes/linux/menuPanel-help@2x.png
+++ b/application/basilisk/themes/linux/menuPanel-help@2x.png
diff --git a/browser/themes/linux/monitor.png b/application/basilisk/themes/linux/monitor.png
index 35e7b2056..35e7b2056 100644
--- a/browser/themes/linux/monitor.png
+++ b/application/basilisk/themes/linux/monitor.png
diff --git a/browser/themes/linux/monitor_16-10.png b/application/basilisk/themes/linux/monitor_16-10.png
index 41950340e..41950340e 100644
--- a/browser/themes/linux/monitor_16-10.png
+++ b/application/basilisk/themes/linux/monitor_16-10.png
diff --git a/browser/themes/linux/moz.build b/application/basilisk/themes/linux/moz.build
index 8b611040d..8b611040d 100644
--- a/browser/themes/linux/moz.build
+++ b/application/basilisk/themes/linux/moz.build
diff --git a/browser/themes/linux/newtab/newTab.css b/application/basilisk/themes/linux/newtab/newTab.css
index 371594f06..371594f06 100644
--- a/browser/themes/linux/newtab/newTab.css
+++ b/application/basilisk/themes/linux/newtab/newTab.css
diff --git a/browser/themes/linux/page-livemarks.png b/application/basilisk/themes/linux/page-livemarks.png
index c3b534e04..c3b534e04 100644
--- a/browser/themes/linux/page-livemarks.png
+++ b/application/basilisk/themes/linux/page-livemarks.png
diff --git a/browser/themes/linux/pageInfo.css b/application/basilisk/themes/linux/pageInfo.css
index 6cf37a7c9..6cf37a7c9 100644
--- a/browser/themes/linux/pageInfo.css
+++ b/application/basilisk/themes/linux/pageInfo.css
diff --git a/browser/themes/linux/pageInfo.png b/application/basilisk/themes/linux/pageInfo.png
index 2cbb15df9..2cbb15df9 100644
--- a/browser/themes/linux/pageInfo.png
+++ b/application/basilisk/themes/linux/pageInfo.png
diff --git a/browser/themes/linux/places/autocomplete-star.png b/application/basilisk/themes/linux/places/autocomplete-star.png
index 2675f9345..2675f9345 100644
--- a/browser/themes/linux/places/autocomplete-star.png
+++ b/application/basilisk/themes/linux/places/autocomplete-star.png
diff --git a/browser/themes/linux/places/bookmarks-menu-arrow.png b/application/basilisk/themes/linux/places/bookmarks-menu-arrow.png
index 616f16b7f..616f16b7f 100644
--- a/browser/themes/linux/places/bookmarks-menu-arrow.png
+++ b/application/basilisk/themes/linux/places/bookmarks-menu-arrow.png
diff --git a/browser/themes/linux/places/bookmarks-notification-finish.png b/application/basilisk/themes/linux/places/bookmarks-notification-finish.png
index 8520b4985..8520b4985 100644
--- a/browser/themes/linux/places/bookmarks-notification-finish.png
+++ b/application/basilisk/themes/linux/places/bookmarks-notification-finish.png
diff --git a/browser/themes/linux/places/bookmarksMenu.png b/application/basilisk/themes/linux/places/bookmarksMenu.png
index 80dd2168d..80dd2168d 100644
--- a/browser/themes/linux/places/bookmarksMenu.png
+++ b/application/basilisk/themes/linux/places/bookmarksMenu.png
diff --git a/browser/themes/linux/places/bookmarksToolbar-menuPanel.png b/application/basilisk/themes/linux/places/bookmarksToolbar-menuPanel.png
index 367a9090d..367a9090d 100644
--- a/browser/themes/linux/places/bookmarksToolbar-menuPanel.png
+++ b/application/basilisk/themes/linux/places/bookmarksToolbar-menuPanel.png
diff --git a/browser/themes/linux/places/bookmarksToolbar.png b/application/basilisk/themes/linux/places/bookmarksToolbar.png
index 09502fe83..09502fe83 100644
--- a/browser/themes/linux/places/bookmarksToolbar.png
+++ b/application/basilisk/themes/linux/places/bookmarksToolbar.png
diff --git a/browser/themes/linux/places/calendar.png b/application/basilisk/themes/linux/places/calendar.png
index f7128685c..f7128685c 100644
--- a/browser/themes/linux/places/calendar.png
+++ b/application/basilisk/themes/linux/places/calendar.png
diff --git a/browser/themes/linux/places/downloads.png b/application/basilisk/themes/linux/places/downloads.png
index d641714aa..d641714aa 100644
--- a/browser/themes/linux/places/downloads.png
+++ b/application/basilisk/themes/linux/places/downloads.png
diff --git a/browser/themes/linux/places/editBookmarkOverlay.css b/application/basilisk/themes/linux/places/editBookmarkOverlay.css
index dba6ba655..dba6ba655 100644
--- a/browser/themes/linux/places/editBookmarkOverlay.css
+++ b/application/basilisk/themes/linux/places/editBookmarkOverlay.css
diff --git a/browser/themes/linux/places/livemark-item.png b/application/basilisk/themes/linux/places/livemark-item.png
index 9184b9518..9184b9518 100644
--- a/browser/themes/linux/places/livemark-item.png
+++ b/application/basilisk/themes/linux/places/livemark-item.png
diff --git a/browser/themes/linux/places/organizer.css b/application/basilisk/themes/linux/places/organizer.css
index d1881dbb4..d1881dbb4 100644
--- a/browser/themes/linux/places/organizer.css
+++ b/application/basilisk/themes/linux/places/organizer.css
diff --git a/browser/themes/linux/places/organizer.xml b/application/basilisk/themes/linux/places/organizer.xml
index 8331ebb11..8331ebb11 100644
--- a/browser/themes/linux/places/organizer.xml
+++ b/application/basilisk/themes/linux/places/organizer.xml
diff --git a/browser/themes/linux/places/places.css b/application/basilisk/themes/linux/places/places.css
index 776191dd5..776191dd5 100644
--- a/browser/themes/linux/places/places.css
+++ b/application/basilisk/themes/linux/places/places.css
diff --git a/browser/themes/linux/places/query.png b/application/basilisk/themes/linux/places/query.png
index 2420dee0e..2420dee0e 100644
--- a/browser/themes/linux/places/query.png
+++ b/application/basilisk/themes/linux/places/query.png
diff --git a/browser/themes/linux/places/starred48.png b/application/basilisk/themes/linux/places/starred48.png
index bdcc7e757..bdcc7e757 100644
--- a/browser/themes/linux/places/starred48.png
+++ b/application/basilisk/themes/linux/places/starred48.png
diff --git a/browser/themes/linux/places/tag.png b/application/basilisk/themes/linux/places/tag.png
index 27176cc6d..27176cc6d 100644
--- a/browser/themes/linux/places/tag.png
+++ b/application/basilisk/themes/linux/places/tag.png
diff --git a/browser/themes/linux/places/toolbarDropMarker.png b/application/basilisk/themes/linux/places/toolbarDropMarker.png
index ed3200f6c..ed3200f6c 100644
--- a/browser/themes/linux/places/toolbarDropMarker.png
+++ b/application/basilisk/themes/linux/places/toolbarDropMarker.png
diff --git a/browser/themes/linux/places/unsortedBookmarks.png b/application/basilisk/themes/linux/places/unsortedBookmarks.png
index 4dcf76138..4dcf76138 100644
--- a/browser/themes/linux/places/unsortedBookmarks.png
+++ b/application/basilisk/themes/linux/places/unsortedBookmarks.png
diff --git a/browser/themes/linux/places/unstarred48.png b/application/basilisk/themes/linux/places/unstarred48.png
index 15448636e..15448636e 100644
--- a/browser/themes/linux/places/unstarred48.png
+++ b/application/basilisk/themes/linux/places/unstarred48.png
diff --git a/browser/themes/linux/preferences/alwaysAsk.png b/application/basilisk/themes/linux/preferences/alwaysAsk.png
index 45256d4e7..45256d4e7 100644
--- a/browser/themes/linux/preferences/alwaysAsk.png
+++ b/application/basilisk/themes/linux/preferences/alwaysAsk.png
diff --git a/browser/themes/linux/preferences/applications.css b/application/basilisk/themes/linux/preferences/applications.css
index 508076304..508076304 100644
--- a/browser/themes/linux/preferences/applications.css
+++ b/application/basilisk/themes/linux/preferences/applications.css
diff --git a/browser/themes/linux/preferences/in-content/dialog.css b/application/basilisk/themes/linux/preferences/in-content/dialog.css
index 3b1ae45e0..3b1ae45e0 100644
--- a/browser/themes/linux/preferences/in-content/dialog.css
+++ b/application/basilisk/themes/linux/preferences/in-content/dialog.css
diff --git a/browser/themes/linux/preferences/in-content/preferences.css b/application/basilisk/themes/linux/preferences/in-content/preferences.css
index 91997aa0d..91997aa0d 100644
--- a/browser/themes/linux/preferences/in-content/preferences.css
+++ b/application/basilisk/themes/linux/preferences/in-content/preferences.css
diff --git a/browser/themes/linux/preferences/mail.png b/application/basilisk/themes/linux/preferences/mail.png
index 66d2bc9e0..66d2bc9e0 100644
--- a/browser/themes/linux/preferences/mail.png
+++ b/application/basilisk/themes/linux/preferences/mail.png
diff --git a/browser/themes/linux/preferences/preferences.css b/application/basilisk/themes/linux/preferences/preferences.css
index 45e2dc23d..45e2dc23d 100644
--- a/browser/themes/linux/preferences/preferences.css
+++ b/application/basilisk/themes/linux/preferences/preferences.css
diff --git a/browser/themes/linux/privatebrowsing-mask.png b/application/basilisk/themes/linux/privatebrowsing-mask.png
index 9eaf3aec7..9eaf3aec7 100644
--- a/browser/themes/linux/privatebrowsing-mask.png
+++ b/application/basilisk/themes/linux/privatebrowsing-mask.png
diff --git a/browser/themes/linux/reload-stop-go.png b/application/basilisk/themes/linux/reload-stop-go.png
index 1017be903..1017be903 100644
--- a/browser/themes/linux/reload-stop-go.png
+++ b/application/basilisk/themes/linux/reload-stop-go.png
diff --git a/browser/themes/linux/reload-stop-go@2x.png b/application/basilisk/themes/linux/reload-stop-go@2x.png
index 38b27bf0c..38b27bf0c 100644
--- a/browser/themes/linux/reload-stop-go@2x.png
+++ b/application/basilisk/themes/linux/reload-stop-go@2x.png
diff --git a/browser/themes/linux/sanitizeDialog.css b/application/basilisk/themes/linux/sanitizeDialog.css
index e73cd27e7..e73cd27e7 100644
--- a/browser/themes/linux/sanitizeDialog.css
+++ b/application/basilisk/themes/linux/sanitizeDialog.css
diff --git a/browser/themes/linux/searchbar.css b/application/basilisk/themes/linux/searchbar.css
index cb4103db0..cb4103db0 100644
--- a/browser/themes/linux/searchbar.css
+++ b/application/basilisk/themes/linux/searchbar.css
diff --git a/browser/themes/linux/setDesktopBackground.css b/application/basilisk/themes/linux/setDesktopBackground.css
index 585284c7b..585284c7b 100644
--- a/browser/themes/linux/setDesktopBackground.css
+++ b/application/basilisk/themes/linux/setDesktopBackground.css
diff --git a/browser/themes/linux/slowStartup-16.png b/application/basilisk/themes/linux/slowStartup-16.png
index 834dc0f1c..834dc0f1c 100644
--- a/browser/themes/linux/slowStartup-16.png
+++ b/application/basilisk/themes/linux/slowStartup-16.png
diff --git a/browser/themes/linux/sync-128.png b/application/basilisk/themes/linux/sync-128.png
index 1ea34818c..1ea34818c 100644
--- a/browser/themes/linux/sync-128.png
+++ b/application/basilisk/themes/linux/sync-128.png
diff --git a/browser/themes/linux/sync-16.png b/application/basilisk/themes/linux/sync-16.png
index 0afb1c719..0afb1c719 100644
--- a/browser/themes/linux/sync-16.png
+++ b/application/basilisk/themes/linux/sync-16.png
diff --git a/browser/themes/linux/sync-32.png b/application/basilisk/themes/linux/sync-32.png
index 7a762cb98..7a762cb98 100644
--- a/browser/themes/linux/sync-32.png
+++ b/application/basilisk/themes/linux/sync-32.png
diff --git a/browser/themes/linux/sync-bg.png b/application/basilisk/themes/linux/sync-bg.png
index 893a27d76..893a27d76 100644
--- a/browser/themes/linux/sync-bg.png
+++ b/application/basilisk/themes/linux/sync-bg.png
diff --git a/browser/themes/linux/sync-horizontalbar.png b/application/basilisk/themes/linux/sync-horizontalbar.png
index 824d4691b..824d4691b 100644
--- a/browser/themes/linux/sync-horizontalbar.png
+++ b/application/basilisk/themes/linux/sync-horizontalbar.png
diff --git a/browser/themes/linux/sync-horizontalbar@2x.png b/application/basilisk/themes/linux/sync-horizontalbar@2x.png
index fadb57586..fadb57586 100644
--- a/browser/themes/linux/sync-horizontalbar@2x.png
+++ b/application/basilisk/themes/linux/sync-horizontalbar@2x.png
diff --git a/browser/themes/linux/sync-notification-24.png b/application/basilisk/themes/linux/sync-notification-24.png
index d67eb47ac..d67eb47ac 100644
--- a/browser/themes/linux/sync-notification-24.png
+++ b/application/basilisk/themes/linux/sync-notification-24.png
diff --git a/browser/themes/linux/syncCommon.css b/application/basilisk/themes/linux/syncCommon.css
index 1378c9c40..1378c9c40 100644
--- a/browser/themes/linux/syncCommon.css
+++ b/application/basilisk/themes/linux/syncCommon.css
diff --git a/browser/themes/linux/syncProgress-horizontalbar.png b/application/basilisk/themes/linux/syncProgress-horizontalbar.png
index 48cd11055..48cd11055 100644
--- a/browser/themes/linux/syncProgress-horizontalbar.png
+++ b/application/basilisk/themes/linux/syncProgress-horizontalbar.png
diff --git a/browser/themes/linux/syncProgress-horizontalbar@2x.png b/application/basilisk/themes/linux/syncProgress-horizontalbar@2x.png
index e1de4763d..e1de4763d 100644
--- a/browser/themes/linux/syncProgress-horizontalbar@2x.png
+++ b/application/basilisk/themes/linux/syncProgress-horizontalbar@2x.png
diff --git a/browser/themes/linux/syncProgress-menuPanel.png b/application/basilisk/themes/linux/syncProgress-menuPanel.png
index 6fd6f9c16..6fd6f9c16 100644
--- a/browser/themes/linux/syncProgress-menuPanel.png
+++ b/application/basilisk/themes/linux/syncProgress-menuPanel.png
diff --git a/browser/themes/linux/syncProgress-menuPanel@2x.png b/application/basilisk/themes/linux/syncProgress-menuPanel@2x.png
index 04b2cae00..04b2cae00 100644
--- a/browser/themes/linux/syncProgress-menuPanel@2x.png
+++ b/application/basilisk/themes/linux/syncProgress-menuPanel@2x.png
diff --git a/browser/themes/linux/syncProgress-toolbar-inverted.png b/application/basilisk/themes/linux/syncProgress-toolbar-inverted.png
index 4ede4387d..4ede4387d 100644
--- a/browser/themes/linux/syncProgress-toolbar-inverted.png
+++ b/application/basilisk/themes/linux/syncProgress-toolbar-inverted.png
diff --git a/browser/themes/linux/syncProgress-toolbar.png b/application/basilisk/themes/linux/syncProgress-toolbar.png
index 49e224f0d..49e224f0d 100644
--- a/browser/themes/linux/syncProgress-toolbar.png
+++ b/application/basilisk/themes/linux/syncProgress-toolbar.png
diff --git a/browser/themes/linux/syncQuota.css b/application/basilisk/themes/linux/syncQuota.css
index 1577de8a3..1577de8a3 100644
--- a/browser/themes/linux/syncQuota.css
+++ b/application/basilisk/themes/linux/syncQuota.css
diff --git a/browser/themes/linux/syncSetup.css b/application/basilisk/themes/linux/syncSetup.css
index 1c79e2f50..1c79e2f50 100644
--- a/browser/themes/linux/syncSetup.css
+++ b/application/basilisk/themes/linux/syncSetup.css
diff --git a/browser/themes/linux/syncedtabs/sidebar.css b/application/basilisk/themes/linux/syncedtabs/sidebar.css
index 04e00a7d4..04e00a7d4 100644
--- a/browser/themes/linux/syncedtabs/sidebar.css
+++ b/application/basilisk/themes/linux/syncedtabs/sidebar.css
diff --git a/browser/themes/linux/tabbrowser/alltabs-inverted.png b/application/basilisk/themes/linux/tabbrowser/alltabs-inverted.png
index f3261f1da..f3261f1da 100644
--- a/browser/themes/linux/tabbrowser/alltabs-inverted.png
+++ b/application/basilisk/themes/linux/tabbrowser/alltabs-inverted.png
diff --git a/browser/themes/linux/tabbrowser/alltabs.png b/application/basilisk/themes/linux/tabbrowser/alltabs.png
index a7abe7396..a7abe7396 100644
--- a/browser/themes/linux/tabbrowser/alltabs.png
+++ b/application/basilisk/themes/linux/tabbrowser/alltabs.png
diff --git a/browser/themes/linux/tabbrowser/newtab-inverted.svg b/application/basilisk/themes/linux/tabbrowser/newtab-inverted.svg
index 2728cda5c..2728cda5c 100644
--- a/browser/themes/linux/tabbrowser/newtab-inverted.svg
+++ b/application/basilisk/themes/linux/tabbrowser/newtab-inverted.svg
diff --git a/browser/themes/linux/tabbrowser/newtab.svg b/application/basilisk/themes/linux/tabbrowser/newtab.svg
index 40548da4a..40548da4a 100644
--- a/browser/themes/linux/tabbrowser/newtab.svg
+++ b/application/basilisk/themes/linux/tabbrowser/newtab.svg
diff --git a/browser/themes/linux/tabbrowser/tab-active-middle.png b/application/basilisk/themes/linux/tabbrowser/tab-active-middle.png
index b7e6d6f77..b7e6d6f77 100644
--- a/browser/themes/linux/tabbrowser/tab-active-middle.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-active-middle.png
diff --git a/browser/themes/linux/tabbrowser/tab-active-middle@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-active-middle@2x.png
index 1e92acbda..1e92acbda 100644
--- a/browser/themes/linux/tabbrowser/tab-active-middle@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-active-middle@2x.png
diff --git a/browser/themes/linux/tabbrowser/tab-arrow-left-inverted.png b/application/basilisk/themes/linux/tabbrowser/tab-arrow-left-inverted.png
index 16cd7a277..16cd7a277 100644
--- a/browser/themes/linux/tabbrowser/tab-arrow-left-inverted.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-arrow-left-inverted.png
diff --git a/browser/themes/linux/tabbrowser/tab-arrow-left.png b/application/basilisk/themes/linux/tabbrowser/tab-arrow-left.png
index e0fb348d6..e0fb348d6 100644
--- a/browser/themes/linux/tabbrowser/tab-arrow-left.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-arrow-left.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-end.png b/application/basilisk/themes/linux/tabbrowser/tab-background-end.png
index fb353b17e..fb353b17e 100644
--- a/browser/themes/linux/tabbrowser/tab-background-end.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-end.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-end@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-background-end@2x.png
index eefb6ac47..eefb6ac47 100644
--- a/browser/themes/linux/tabbrowser/tab-background-end@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-end@2x.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-middle.png b/application/basilisk/themes/linux/tabbrowser/tab-background-middle.png
index 51e066c2e..51e066c2e 100644
--- a/browser/themes/linux/tabbrowser/tab-background-middle.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-middle.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-middle@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-background-middle@2x.png
index b26cb95de..b26cb95de 100644
--- a/browser/themes/linux/tabbrowser/tab-background-middle@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-middle@2x.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-start.png b/application/basilisk/themes/linux/tabbrowser/tab-background-start.png
index cf0dc852a..cf0dc852a 100644
--- a/browser/themes/linux/tabbrowser/tab-background-start.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-start.png
diff --git a/browser/themes/linux/tabbrowser/tab-background-start@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-background-start@2x.png
index bbfc77dd1..bbfc77dd1 100644
--- a/browser/themes/linux/tabbrowser/tab-background-start@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-background-start@2x.png
diff --git a/browser/themes/linux/tabbrowser/tab-stroke-end.png b/application/basilisk/themes/linux/tabbrowser/tab-stroke-end.png
index 2aa5711f8..2aa5711f8 100644
--- a/browser/themes/linux/tabbrowser/tab-stroke-end.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-stroke-end.png
diff --git a/browser/themes/linux/tabbrowser/tab-stroke-end@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-stroke-end@2x.png
index a87002a83..a87002a83 100644
--- a/browser/themes/linux/tabbrowser/tab-stroke-end@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-stroke-end@2x.png
diff --git a/browser/themes/linux/tabbrowser/tab-stroke-start.png b/application/basilisk/themes/linux/tabbrowser/tab-stroke-start.png
index 4e4e41f63..4e4e41f63 100644
--- a/browser/themes/linux/tabbrowser/tab-stroke-start.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-stroke-start.png
diff --git a/browser/themes/linux/tabbrowser/tab-stroke-start@2x.png b/application/basilisk/themes/linux/tabbrowser/tab-stroke-start@2x.png
index 13bd6add1..13bd6add1 100644
--- a/browser/themes/linux/tabbrowser/tab-stroke-start@2x.png
+++ b/application/basilisk/themes/linux/tabbrowser/tab-stroke-start@2x.png
diff --git a/browser/themes/linux/tabbrowser/tabDragIndicator.png b/application/basilisk/themes/linux/tabbrowser/tabDragIndicator.png
index df7d914f8..df7d914f8 100644
--- a/browser/themes/linux/tabbrowser/tabDragIndicator.png
+++ b/application/basilisk/themes/linux/tabbrowser/tabDragIndicator.png
diff --git a/browser/themes/linux/webRTC-indicator.css b/application/basilisk/themes/linux/webRTC-indicator.css
index c22f942ec..c22f942ec 100644
--- a/browser/themes/linux/webRTC-indicator.css
+++ b/application/basilisk/themes/linux/webRTC-indicator.css
diff --git a/browser/themes/moz.build b/application/basilisk/themes/moz.build
index 843567b00..843567b00 100644
--- a/browser/themes/moz.build
+++ b/application/basilisk/themes/moz.build
diff --git a/browser/themes/osx/Info.png b/application/basilisk/themes/osx/Info.png
index 7dd795ac9..7dd795ac9 100644
--- a/browser/themes/osx/Info.png
+++ b/application/basilisk/themes/osx/Info.png
diff --git a/browser/themes/osx/Privacy-16.png b/application/basilisk/themes/osx/Privacy-16.png
index 5291abce4..5291abce4 100644
--- a/browser/themes/osx/Privacy-16.png
+++ b/application/basilisk/themes/osx/Privacy-16.png
diff --git a/browser/themes/osx/Toolbar-background-noise.png b/application/basilisk/themes/osx/Toolbar-background-noise.png
index aab0a02c8..aab0a02c8 100644
--- a/browser/themes/osx/Toolbar-background-noise.png
+++ b/application/basilisk/themes/osx/Toolbar-background-noise.png
diff --git a/browser/themes/osx/Toolbar-inverted.png b/application/basilisk/themes/osx/Toolbar-inverted.png
index 60f001ffa..60f001ffa 100644
--- a/browser/themes/osx/Toolbar-inverted.png
+++ b/application/basilisk/themes/osx/Toolbar-inverted.png
diff --git a/browser/themes/osx/Toolbar-inverted@2x.png b/application/basilisk/themes/osx/Toolbar-inverted@2x.png
index 511470b21..511470b21 100644
--- a/browser/themes/osx/Toolbar-inverted@2x.png
+++ b/application/basilisk/themes/osx/Toolbar-inverted@2x.png
diff --git a/browser/themes/osx/Toolbar-yosemite.png b/application/basilisk/themes/osx/Toolbar-yosemite.png
index 05594f2f5..05594f2f5 100644
--- a/browser/themes/osx/Toolbar-yosemite.png
+++ b/application/basilisk/themes/osx/Toolbar-yosemite.png
diff --git a/browser/themes/osx/Toolbar-yosemite@2x.png b/application/basilisk/themes/osx/Toolbar-yosemite@2x.png
index 369e2385b..369e2385b 100644
--- a/browser/themes/osx/Toolbar-yosemite@2x.png
+++ b/application/basilisk/themes/osx/Toolbar-yosemite@2x.png
diff --git a/browser/themes/osx/Toolbar.png b/application/basilisk/themes/osx/Toolbar.png
index 45d616d94..45d616d94 100644
--- a/browser/themes/osx/Toolbar.png
+++ b/application/basilisk/themes/osx/Toolbar.png
diff --git a/browser/themes/osx/Toolbar@2x.png b/application/basilisk/themes/osx/Toolbar@2x.png
index 25ab9feba..25ab9feba 100644
--- a/browser/themes/osx/Toolbar@2x.png
+++ b/application/basilisk/themes/osx/Toolbar@2x.png
diff --git a/browser/themes/osx/aboutSessionRestore-window-icon.png b/application/basilisk/themes/osx/aboutSessionRestore-window-icon.png
index 02dc44208..02dc44208 100644
--- a/browser/themes/osx/aboutSessionRestore-window-icon.png
+++ b/application/basilisk/themes/osx/aboutSessionRestore-window-icon.png
diff --git a/browser/themes/osx/aboutSyncTabs.css b/application/basilisk/themes/osx/aboutSyncTabs.css
index 4cedad649..4cedad649 100644
--- a/browser/themes/osx/aboutSyncTabs.css
+++ b/application/basilisk/themes/osx/aboutSyncTabs.css
diff --git a/browser/themes/osx/actionicon-tab.png b/application/basilisk/themes/osx/actionicon-tab.png
index ab7861313..ab7861313 100644
--- a/browser/themes/osx/actionicon-tab.png
+++ b/application/basilisk/themes/osx/actionicon-tab.png
diff --git a/browser/themes/osx/actionicon-tab@2x.png b/application/basilisk/themes/osx/actionicon-tab@2x.png
index f53fdda57..f53fdda57 100644
--- a/browser/themes/osx/actionicon-tab@2x.png
+++ b/application/basilisk/themes/osx/actionicon-tab@2x.png
diff --git a/browser/themes/osx/browser-lightweightTheme.css b/application/basilisk/themes/osx/browser-lightweightTheme.css
index aeae9d925..aeae9d925 100644
--- a/browser/themes/osx/browser-lightweightTheme.css
+++ b/application/basilisk/themes/osx/browser-lightweightTheme.css
diff --git a/browser/themes/osx/browser.css b/application/basilisk/themes/osx/browser.css
index 5a83c74b2..808bb20b1 100644
--- a/browser/themes/osx/browser.css
+++ b/application/basilisk/themes/osx/browser.css
@@ -3091,8 +3091,8 @@ menulist.translate-infobar-element > .menulist-dropmarker {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 %include downloads/indicator.css
@@ -3192,24 +3192,6 @@ menulist.translate-infobar-element > .menulist-dropmarker {
 }
 
 @media (min-resolution: 2dppx) {
-  .customization-tipPanel-infoBox {
-    background-image: url(chrome://browser/skin/customizableui/info-icon-customizeTip@2x.png);
-    background-size: 25px 25px;
-  }
-
-  .customization-tipPanel-contentImage {
-    list-style-image: url(chrome://browser/skin/customizableui/customize-illustration@2x.png);
-  }
-
-  .customization-tipPanel-contentImage:-moz-locale-dir(rtl) {
-    list-style-image: url(chrome://browser/skin/customizableui/customize-illustration-rtl@2x.png);
-  }
-
-  #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
-  #customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
-    list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip@2x.png");
-  }
-
   .customization-lwtheme-menu-theme[defaulttheme] {
     list-style-image: url(chrome://browser/skin/theme-switcher-icon@2x.png);
   }
@@ -3279,24 +3261,6 @@ menulist.translate-infobar-element > .menulist-dropmarker {
   -moz-box-ordinal-group: 0;
 }
 
-%include ../shared/UITour.inc.css
-
-#UITourTooltipDescription {
-  font-size: 1.18rem;
-  line-height: 2rem;
-}
-
-#UITourTooltipClose {
-  margin-inline-end: -10px;
-  margin-top: -14px;
-}
-
-@media (min-resolution: 2dppx) {
-  #UITourTooltipClose > .toolbarbutton-icon {
-    width: 16px;
-  }
-}
-
 %include ../shared/contextmenu.inc.css
 
 #context-navigation > .menuitem-iconic {
diff --git a/browser/themes/osx/click-to-play-warning-stripes.png b/application/basilisk/themes/osx/click-to-play-warning-stripes.png
index 29f15f7b8..29f15f7b8 100644
--- a/browser/themes/osx/click-to-play-warning-stripes.png
+++ b/application/basilisk/themes/osx/click-to-play-warning-stripes.png
diff --git a/browser/themes/osx/communicator/communicator.css b/application/basilisk/themes/osx/communicator/communicator.css
index 0b57574fd..0b57574fd 100644
--- a/browser/themes/osx/communicator/communicator.css
+++ b/application/basilisk/themes/osx/communicator/communicator.css
diff --git a/browser/themes/osx/communicator/jar.mn b/application/basilisk/themes/osx/communicator/jar.mn
index dfd20c523..dfd20c523 100644
--- a/browser/themes/osx/communicator/jar.mn
+++ b/application/basilisk/themes/osx/communicator/jar.mn
diff --git a/browser/themes/osx/communicator/moz.build b/application/basilisk/themes/osx/communicator/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/themes/osx/communicator/moz.build
+++ b/application/basilisk/themes/osx/communicator/moz.build
diff --git a/browser/themes/osx/controlcenter/panel.css b/application/basilisk/themes/osx/controlcenter/panel.css
index b87fa2ac9..b87fa2ac9 100644
--- a/browser/themes/osx/controlcenter/panel.css
+++ b/application/basilisk/themes/osx/controlcenter/panel.css
diff --git a/browser/themes/osx/customizableui/background-noise-toolbar.png b/application/basilisk/themes/osx/customizableui/background-noise-toolbar.png
index d09ba9daf..d09ba9daf 100644
--- a/browser/themes/osx/customizableui/background-noise-toolbar.png
+++ b/application/basilisk/themes/osx/customizableui/background-noise-toolbar.png
diff --git a/browser/themes/osx/customizableui/customize-titleBar-toggle.png b/application/basilisk/themes/osx/customizableui/customize-titleBar-toggle.png
index fb0edd256..fb0edd256 100644
--- a/browser/themes/osx/customizableui/customize-titleBar-toggle.png
+++ b/application/basilisk/themes/osx/customizableui/customize-titleBar-toggle.png
diff --git a/browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png b/application/basilisk/themes/osx/customizableui/customize-titleBar-toggle@2x.png
index 7200e74c2..7200e74c2 100644
--- a/browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png
+++ b/application/basilisk/themes/osx/customizableui/customize-titleBar-toggle@2x.png
diff --git a/browser/themes/osx/customizableui/customizeMode-gridTexture.png b/application/basilisk/themes/osx/customizableui/customizeMode-gridTexture.png
index a7c2775cf..a7c2775cf 100644
--- a/browser/themes/osx/customizableui/customizeMode-gridTexture.png
+++ b/application/basilisk/themes/osx/customizableui/customizeMode-gridTexture.png
diff --git a/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png b/application/basilisk/themes/osx/customizableui/customizeMode-separatorHorizontal.png
index 5e17cb4db..5e17cb4db 100644
--- a/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png
+++ b/application/basilisk/themes/osx/customizableui/customizeMode-separatorHorizontal.png
diff --git a/browser/themes/osx/customizableui/customizeMode-separatorVertical.png b/application/basilisk/themes/osx/customizableui/customizeMode-separatorVertical.png
index dc4caee81..dc4caee81 100644
--- a/browser/themes/osx/customizableui/customizeMode-separatorVertical.png
+++ b/application/basilisk/themes/osx/customizableui/customizeMode-separatorVertical.png
diff --git a/browser/themes/osx/customizableui/panelUI.css b/application/basilisk/themes/osx/customizableui/panelUI.css
index 09f23b398..09f23b398 100644
--- a/browser/themes/osx/customizableui/panelUI.css
+++ b/application/basilisk/themes/osx/customizableui/panelUI.css
diff --git a/browser/themes/osx/devedition.css b/application/basilisk/themes/osx/devedition.css
index c7a2bdd71..c7a2bdd71 100644
--- a/browser/themes/osx/devedition.css
+++ b/application/basilisk/themes/osx/devedition.css
diff --git a/browser/themes/osx/downloads/allDownloadsViewOverlay.css b/application/basilisk/themes/osx/downloads/allDownloadsViewOverlay.css
index dbdced970..dbdced970 100644
--- a/browser/themes/osx/downloads/allDownloadsViewOverlay.css
+++ b/application/basilisk/themes/osx/downloads/allDownloadsViewOverlay.css
diff --git a/browser/themes/osx/downloads/download-glow-menuPanel.png b/application/basilisk/themes/osx/downloads/download-glow-menuPanel.png
index 583dac86e..583dac86e 100644
--- a/browser/themes/osx/downloads/download-glow-menuPanel.png
+++ b/application/basilisk/themes/osx/downloads/download-glow-menuPanel.png
diff --git a/browser/themes/osx/downloads/download-glow-menuPanel@2x.png b/application/basilisk/themes/osx/downloads/download-glow-menuPanel@2x.png
index 9b48fbd12..9b48fbd12 100644
--- a/browser/themes/osx/downloads/download-glow-menuPanel@2x.png
+++ b/application/basilisk/themes/osx/downloads/download-glow-menuPanel@2x.png
diff --git a/browser/themes/osx/downloads/download-notification-finish.png b/application/basilisk/themes/osx/downloads/download-notification-finish.png
index 139bf0b53..139bf0b53 100644
--- a/browser/themes/osx/downloads/download-notification-finish.png
+++ b/application/basilisk/themes/osx/downloads/download-notification-finish.png
diff --git a/browser/themes/osx/downloads/download-notification-finish@2x.png b/application/basilisk/themes/osx/downloads/download-notification-finish@2x.png
index 4a2512181..4a2512181 100644
--- a/browser/themes/osx/downloads/download-notification-finish@2x.png
+++ b/application/basilisk/themes/osx/downloads/download-notification-finish@2x.png
diff --git a/browser/themes/osx/downloads/download-notification-start.png b/application/basilisk/themes/osx/downloads/download-notification-start.png
index bd548b183..bd548b183 100644
--- a/browser/themes/osx/downloads/download-notification-start.png
+++ b/application/basilisk/themes/osx/downloads/download-notification-start.png
diff --git a/browser/themes/osx/downloads/download-notification-start@2x.png b/application/basilisk/themes/osx/downloads/download-notification-start@2x.png
index 1d6278050..1d6278050 100644
--- a/browser/themes/osx/downloads/download-notification-start@2x.png
+++ b/application/basilisk/themes/osx/downloads/download-notification-start@2x.png
diff --git a/browser/themes/osx/downloads/downloads.css b/application/basilisk/themes/osx/downloads/downloads.css
index af78dcfe9..af78dcfe9 100644
--- a/browser/themes/osx/downloads/downloads.css
+++ b/application/basilisk/themes/osx/downloads/downloads.css
diff --git a/browser/themes/osx/downloads/indicator.css b/application/basilisk/themes/osx/downloads/indicator.css
index eb88f074e..eb88f074e 100644
--- a/browser/themes/osx/downloads/indicator.css
+++ b/application/basilisk/themes/osx/downloads/indicator.css
diff --git a/browser/themes/osx/feeds/feedIcon.png b/application/basilisk/themes/osx/feeds/feedIcon.png
index 236b5f821..236b5f821 100644
--- a/browser/themes/osx/feeds/feedIcon.png
+++ b/application/basilisk/themes/osx/feeds/feedIcon.png
diff --git a/browser/themes/osx/feeds/feedIcon16.png b/application/basilisk/themes/osx/feeds/feedIcon16.png
index a489de3bf..a489de3bf 100644
--- a/browser/themes/osx/feeds/feedIcon16.png
+++ b/application/basilisk/themes/osx/feeds/feedIcon16.png
diff --git a/browser/themes/osx/feeds/subscribe-ui.css b/application/basilisk/themes/osx/feeds/subscribe-ui.css
index 4d0744b3a..4d0744b3a 100644
--- a/browser/themes/osx/feeds/subscribe-ui.css
+++ b/application/basilisk/themes/osx/feeds/subscribe-ui.css
diff --git a/browser/themes/osx/feeds/subscribe.css b/application/basilisk/themes/osx/feeds/subscribe.css
index 6d1fa8da2..6d1fa8da2 100644
--- a/browser/themes/osx/feeds/subscribe.css
+++ b/application/basilisk/themes/osx/feeds/subscribe.css
diff --git a/browser/themes/osx/jar.mn b/application/basilisk/themes/osx/jar.mn
index 27802843d..27802843d 100644
--- a/browser/themes/osx/jar.mn
+++ b/application/basilisk/themes/osx/jar.mn
diff --git a/browser/themes/osx/keyhole-circle.png b/application/basilisk/themes/osx/keyhole-circle.png
index fc177587f..fc177587f 100644
--- a/browser/themes/osx/keyhole-circle.png
+++ b/application/basilisk/themes/osx/keyhole-circle.png
diff --git a/browser/themes/osx/keyhole-circle@2x.png b/application/basilisk/themes/osx/keyhole-circle@2x.png
index 288702805..288702805 100644
--- a/browser/themes/osx/keyhole-circle@2x.png
+++ b/application/basilisk/themes/osx/keyhole-circle@2x.png
diff --git a/browser/themes/osx/menu-back.png b/application/basilisk/themes/osx/menu-back.png
index 82a74c7b8..82a74c7b8 100644
--- a/browser/themes/osx/menu-back.png
+++ b/application/basilisk/themes/osx/menu-back.png
diff --git a/browser/themes/osx/menu-forward.png b/application/basilisk/themes/osx/menu-forward.png
index b3b40e394..b3b40e394 100644
--- a/browser/themes/osx/menu-forward.png
+++ b/application/basilisk/themes/osx/menu-forward.png
diff --git a/browser/themes/osx/menuPanel-customize-yosemite.png b/application/basilisk/themes/osx/menuPanel-customize-yosemite.png
index 93b660692..93b660692 100644
--- a/browser/themes/osx/menuPanel-customize-yosemite.png
+++ b/application/basilisk/themes/osx/menuPanel-customize-yosemite.png
diff --git a/browser/themes/osx/menuPanel-customize-yosemite@2x.png b/application/basilisk/themes/osx/menuPanel-customize-yosemite@2x.png
index 43cde4a68..43cde4a68 100644
--- a/browser/themes/osx/menuPanel-customize-yosemite@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-customize-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-customize.png b/application/basilisk/themes/osx/menuPanel-customize.png
index b0772d822..b0772d822 100644
--- a/browser/themes/osx/menuPanel-customize.png
+++ b/application/basilisk/themes/osx/menuPanel-customize.png
diff --git a/browser/themes/osx/menuPanel-customize@2x.png b/application/basilisk/themes/osx/menuPanel-customize@2x.png
index aba481aeb..aba481aeb 100644
--- a/browser/themes/osx/menuPanel-customize@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-customize@2x.png
diff --git a/browser/themes/osx/menuPanel-exit-yosemite.png b/application/basilisk/themes/osx/menuPanel-exit-yosemite.png
index 4115b53ec..4115b53ec 100644
--- a/browser/themes/osx/menuPanel-exit-yosemite.png
+++ b/application/basilisk/themes/osx/menuPanel-exit-yosemite.png
diff --git a/browser/themes/osx/menuPanel-exit-yosemite@2x.png b/application/basilisk/themes/osx/menuPanel-exit-yosemite@2x.png
index af3160621..af3160621 100644
--- a/browser/themes/osx/menuPanel-exit-yosemite@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-exit-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-exit.png b/application/basilisk/themes/osx/menuPanel-exit.png
index 126cde088..126cde088 100644
--- a/browser/themes/osx/menuPanel-exit.png
+++ b/application/basilisk/themes/osx/menuPanel-exit.png
diff --git a/browser/themes/osx/menuPanel-exit@2x.png b/application/basilisk/themes/osx/menuPanel-exit@2x.png
index 1ccdd65b9..1ccdd65b9 100644
--- a/browser/themes/osx/menuPanel-exit@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-exit@2x.png
diff --git a/browser/themes/osx/menuPanel-help-yosemite.png b/application/basilisk/themes/osx/menuPanel-help-yosemite.png
index ad1783de6..ad1783de6 100644
--- a/browser/themes/osx/menuPanel-help-yosemite.png
+++ b/application/basilisk/themes/osx/menuPanel-help-yosemite.png
diff --git a/browser/themes/osx/menuPanel-help-yosemite@2x.png b/application/basilisk/themes/osx/menuPanel-help-yosemite@2x.png
index 4a4c3bcae..4a4c3bcae 100644
--- a/browser/themes/osx/menuPanel-help-yosemite@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-help-yosemite@2x.png
diff --git a/browser/themes/osx/menuPanel-help.png b/application/basilisk/themes/osx/menuPanel-help.png
index a9b34c132..a9b34c132 100644
--- a/browser/themes/osx/menuPanel-help.png
+++ b/application/basilisk/themes/osx/menuPanel-help.png
diff --git a/browser/themes/osx/menuPanel-help@2x.png b/application/basilisk/themes/osx/menuPanel-help@2x.png
index acf2e531c..acf2e531c 100644
--- a/browser/themes/osx/menuPanel-help@2x.png
+++ b/application/basilisk/themes/osx/menuPanel-help@2x.png
diff --git a/browser/themes/osx/monitor.png b/application/basilisk/themes/osx/monitor.png
index ad90e5520..ad90e5520 100644
--- a/browser/themes/osx/monitor.png
+++ b/application/basilisk/themes/osx/monitor.png
diff --git a/browser/themes/osx/monitor_16-10.png b/application/basilisk/themes/osx/monitor_16-10.png
index fb3fdbc4f..fb3fdbc4f 100644
--- a/browser/themes/osx/monitor_16-10.png
+++ b/application/basilisk/themes/osx/monitor_16-10.png
diff --git a/browser/themes/osx/moz.build b/application/basilisk/themes/osx/moz.build
index b787ab08e..b787ab08e 100644
--- a/browser/themes/osx/moz.build
+++ b/application/basilisk/themes/osx/moz.build
diff --git a/browser/themes/osx/newtab/newTab.css b/application/basilisk/themes/osx/newtab/newTab.css
index 0a5bace75..0a5bace75 100644
--- a/browser/themes/osx/newtab/newTab.css
+++ b/application/basilisk/themes/osx/newtab/newTab.css
diff --git a/browser/themes/osx/page-livemarks.png b/application/basilisk/themes/osx/page-livemarks.png
index e52645846..e52645846 100644
--- a/browser/themes/osx/page-livemarks.png
+++ b/application/basilisk/themes/osx/page-livemarks.png
diff --git a/browser/themes/osx/page-livemarks@2x.png b/application/basilisk/themes/osx/page-livemarks@2x.png
index 7b170897c..7b170897c 100644
--- a/browser/themes/osx/page-livemarks@2x.png
+++ b/application/basilisk/themes/osx/page-livemarks@2x.png
diff --git a/browser/themes/osx/pageInfo.css b/application/basilisk/themes/osx/pageInfo.css
index 748b7b3fa..748b7b3fa 100644
--- a/browser/themes/osx/pageInfo.css
+++ b/application/basilisk/themes/osx/pageInfo.css
diff --git a/browser/themes/osx/panel-expander-closed.png b/application/basilisk/themes/osx/panel-expander-closed.png
index f0e97b22e..f0e97b22e 100644
--- a/browser/themes/osx/panel-expander-closed.png
+++ b/application/basilisk/themes/osx/panel-expander-closed.png
diff --git a/browser/themes/osx/panel-expander-closed@2x.png b/application/basilisk/themes/osx/panel-expander-closed@2x.png
index 0e7ded50f..0e7ded50f 100644
--- a/browser/themes/osx/panel-expander-closed@2x.png
+++ b/application/basilisk/themes/osx/panel-expander-closed@2x.png
diff --git a/browser/themes/osx/panel-expander-open.png b/application/basilisk/themes/osx/panel-expander-open.png
index e3febf4ff..e3febf4ff 100644
--- a/browser/themes/osx/panel-expander-open.png
+++ b/application/basilisk/themes/osx/panel-expander-open.png
diff --git a/browser/themes/osx/panel-expander-open@2x.png b/application/basilisk/themes/osx/panel-expander-open@2x.png
index 391337030..391337030 100644
--- a/browser/themes/osx/panel-expander-open@2x.png
+++ b/application/basilisk/themes/osx/panel-expander-open@2x.png
diff --git a/browser/themes/osx/panel-plus-sign.png b/application/basilisk/themes/osx/panel-plus-sign.png
index 375601e68..375601e68 100644
--- a/browser/themes/osx/panel-plus-sign.png
+++ b/application/basilisk/themes/osx/panel-plus-sign.png
diff --git a/browser/themes/osx/places/allBookmarks.png b/application/basilisk/themes/osx/places/allBookmarks.png
index d1abe8192..d1abe8192 100644
--- a/browser/themes/osx/places/allBookmarks.png
+++ b/application/basilisk/themes/osx/places/allBookmarks.png
diff --git a/browser/themes/osx/places/autocomplete-star.png b/application/basilisk/themes/osx/places/autocomplete-star.png
index 4ad9a95cf..4ad9a95cf 100644
--- a/browser/themes/osx/places/autocomplete-star.png
+++ b/application/basilisk/themes/osx/places/autocomplete-star.png
diff --git a/browser/themes/osx/places/autocomplete-star@2x.png b/application/basilisk/themes/osx/places/autocomplete-star@2x.png
index 4a9c203ff..4a9c203ff 100644
--- a/browser/themes/osx/places/autocomplete-star@2x.png
+++ b/application/basilisk/themes/osx/places/autocomplete-star@2x.png
diff --git a/browser/themes/osx/places/bookmarks-notification-finish.png b/application/basilisk/themes/osx/places/bookmarks-notification-finish.png
index cb4b53e07..cb4b53e07 100644
--- a/browser/themes/osx/places/bookmarks-notification-finish.png
+++ b/application/basilisk/themes/osx/places/bookmarks-notification-finish.png
diff --git a/browser/themes/osx/places/bookmarks-notification-finish@2x.png b/application/basilisk/themes/osx/places/bookmarks-notification-finish@2x.png
index 8db41cd75..8db41cd75 100644
--- a/browser/themes/osx/places/bookmarks-notification-finish@2x.png
+++ b/application/basilisk/themes/osx/places/bookmarks-notification-finish@2x.png
diff --git a/browser/themes/osx/places/bookmarksMenu.png b/application/basilisk/themes/osx/places/bookmarksMenu.png
index c27bd6a6f..c27bd6a6f 100644
--- a/browser/themes/osx/places/bookmarksMenu.png
+++ b/application/basilisk/themes/osx/places/bookmarksMenu.png
diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel.png b/application/basilisk/themes/osx/places/bookmarksToolbar-menuPanel.png
index 892125ad3..892125ad3 100644
--- a/browser/themes/osx/places/bookmarksToolbar-menuPanel.png
+++ b/application/basilisk/themes/osx/places/bookmarksToolbar-menuPanel.png
diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png b/application/basilisk/themes/osx/places/bookmarksToolbar-menuPanel@2x.png
index c81710a0e..c81710a0e 100644
--- a/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png
+++ b/application/basilisk/themes/osx/places/bookmarksToolbar-menuPanel@2x.png
diff --git a/browser/themes/osx/places/bookmarksToolbar.png b/application/basilisk/themes/osx/places/bookmarksToolbar.png
index 2047bffe5..2047bffe5 100644
--- a/browser/themes/osx/places/bookmarksToolbar.png
+++ b/application/basilisk/themes/osx/places/bookmarksToolbar.png
diff --git a/browser/themes/osx/places/bookmarksToolbar@2x.png b/application/basilisk/themes/osx/places/bookmarksToolbar@2x.png
index dd458981e..dd458981e 100644
--- a/browser/themes/osx/places/bookmarksToolbar@2x.png
+++ b/application/basilisk/themes/osx/places/bookmarksToolbar@2x.png
diff --git a/browser/themes/osx/places/downloads.png b/application/basilisk/themes/osx/places/downloads.png
index 0756cb680..0756cb680 100644
--- a/browser/themes/osx/places/downloads.png
+++ b/application/basilisk/themes/osx/places/downloads.png
diff --git a/browser/themes/osx/places/editBookmarkOverlay.css b/application/basilisk/themes/osx/places/editBookmarkOverlay.css
index 584a830ac..584a830ac 100644
--- a/browser/themes/osx/places/editBookmarkOverlay.css
+++ b/application/basilisk/themes/osx/places/editBookmarkOverlay.css
diff --git a/browser/themes/osx/places/folderDropArrow.png b/application/basilisk/themes/osx/places/folderDropArrow.png
index 8d722ccd5..8d722ccd5 100644
--- a/browser/themes/osx/places/folderDropArrow.png
+++ b/application/basilisk/themes/osx/places/folderDropArrow.png
diff --git a/browser/themes/osx/places/folderDropArrow@2x.png b/application/basilisk/themes/osx/places/folderDropArrow@2x.png
index 9efb6d95d..9efb6d95d 100644
--- a/browser/themes/osx/places/folderDropArrow@2x.png
+++ b/application/basilisk/themes/osx/places/folderDropArrow@2x.png
diff --git a/browser/themes/osx/places/history.png b/application/basilisk/themes/osx/places/history.png
index e5a00b56d..e5a00b56d 100644
--- a/browser/themes/osx/places/history.png
+++ b/application/basilisk/themes/osx/places/history.png
diff --git a/browser/themes/osx/places/history@2x.png b/application/basilisk/themes/osx/places/history@2x.png
index 684b374ff..684b374ff 100644
--- a/browser/themes/osx/places/history@2x.png
+++ b/application/basilisk/themes/osx/places/history@2x.png
diff --git a/browser/themes/osx/places/livemark-item.png b/application/basilisk/themes/osx/places/livemark-item.png
index 9184b9518..9184b9518 100644
--- a/browser/themes/osx/places/livemark-item.png
+++ b/application/basilisk/themes/osx/places/livemark-item.png
diff --git a/browser/themes/osx/places/minus-active.png b/application/basilisk/themes/osx/places/minus-active.png
index d43c58fe0..d43c58fe0 100644
--- a/browser/themes/osx/places/minus-active.png
+++ b/application/basilisk/themes/osx/places/minus-active.png
diff --git a/browser/themes/osx/places/minus.png b/application/basilisk/themes/osx/places/minus.png
index ba868c1b2..ba868c1b2 100644
--- a/browser/themes/osx/places/minus.png
+++ b/application/basilisk/themes/osx/places/minus.png
diff --git a/browser/themes/osx/places/organizer.css b/application/basilisk/themes/osx/places/organizer.css
index 4e3682d4c..4e3682d4c 100644
--- a/browser/themes/osx/places/organizer.css
+++ b/application/basilisk/themes/osx/places/organizer.css
diff --git a/browser/themes/osx/places/places.css b/application/basilisk/themes/osx/places/places.css
index 5eaad2791..5eaad2791 100644
--- a/browser/themes/osx/places/places.css
+++ b/application/basilisk/themes/osx/places/places.css
diff --git a/browser/themes/osx/places/plus-active.png b/application/basilisk/themes/osx/places/plus-active.png
index 2d1dd11be..2d1dd11be 100644
--- a/browser/themes/osx/places/plus-active.png
+++ b/application/basilisk/themes/osx/places/plus-active.png
diff --git a/browser/themes/osx/places/plus.png b/application/basilisk/themes/osx/places/plus.png
index c1cc60688..c1cc60688 100644
--- a/browser/themes/osx/places/plus.png
+++ b/application/basilisk/themes/osx/places/plus.png
diff --git a/browser/themes/osx/places/query.png b/application/basilisk/themes/osx/places/query.png
index 0ccb84702..0ccb84702 100644
--- a/browser/themes/osx/places/query.png
+++ b/application/basilisk/themes/osx/places/query.png
diff --git a/browser/themes/osx/places/query@2x.png b/application/basilisk/themes/osx/places/query@2x.png
index 20b458aac..20b458aac 100644
--- a/browser/themes/osx/places/query@2x.png
+++ b/application/basilisk/themes/osx/places/query@2x.png
diff --git a/browser/themes/osx/places/starred48.png b/application/basilisk/themes/osx/places/starred48.png
index bdcc7e757..bdcc7e757 100644
--- a/browser/themes/osx/places/starred48.png
+++ b/application/basilisk/themes/osx/places/starred48.png
diff --git a/browser/themes/osx/places/starred48@2x.png b/application/basilisk/themes/osx/places/starred48@2x.png
index 0ed76af19..0ed76af19 100644
--- a/browser/themes/osx/places/starred48@2x.png
+++ b/application/basilisk/themes/osx/places/starred48@2x.png
diff --git a/browser/themes/osx/places/tag.png b/application/basilisk/themes/osx/places/tag.png
index a4038bb4f..a4038bb4f 100644
--- a/browser/themes/osx/places/tag.png
+++ b/application/basilisk/themes/osx/places/tag.png
diff --git a/browser/themes/osx/places/tag@2x.png b/application/basilisk/themes/osx/places/tag@2x.png
index 673814bb5..673814bb5 100644
--- a/browser/themes/osx/places/tag@2x.png
+++ b/application/basilisk/themes/osx/places/tag@2x.png
diff --git a/browser/themes/osx/places/toolbar-lion.png b/application/basilisk/themes/osx/places/toolbar-lion.png
index ac3358c91..ac3358c91 100644
--- a/browser/themes/osx/places/toolbar-lion.png
+++ b/application/basilisk/themes/osx/places/toolbar-lion.png
diff --git a/browser/themes/osx/places/toolbar.png b/application/basilisk/themes/osx/places/toolbar.png
index 168daf9ce..168daf9ce 100644
--- a/browser/themes/osx/places/toolbar.png
+++ b/application/basilisk/themes/osx/places/toolbar.png
diff --git a/browser/themes/osx/places/toolbarDropMarker.png b/application/basilisk/themes/osx/places/toolbarDropMarker.png
index a217b0ed8..a217b0ed8 100644
--- a/browser/themes/osx/places/toolbarDropMarker.png
+++ b/application/basilisk/themes/osx/places/toolbarDropMarker.png
diff --git a/browser/themes/osx/places/unfiledBookmarks.png b/application/basilisk/themes/osx/places/unfiledBookmarks.png
index 69495dac0..69495dac0 100644
--- a/browser/themes/osx/places/unfiledBookmarks.png
+++ b/application/basilisk/themes/osx/places/unfiledBookmarks.png
diff --git a/browser/themes/osx/places/unfiledBookmarks@2x.png b/application/basilisk/themes/osx/places/unfiledBookmarks@2x.png
index 44efd6aba..44efd6aba 100644
--- a/browser/themes/osx/places/unfiledBookmarks@2x.png
+++ b/application/basilisk/themes/osx/places/unfiledBookmarks@2x.png
diff --git a/browser/themes/osx/places/unstarred48.png b/application/basilisk/themes/osx/places/unstarred48.png
index 8b82aab4b..8b82aab4b 100644
--- a/browser/themes/osx/places/unstarred48.png
+++ b/application/basilisk/themes/osx/places/unstarred48.png
diff --git a/browser/themes/osx/preferences/alwaysAsk.png b/application/basilisk/themes/osx/preferences/alwaysAsk.png
index c792d1488..c792d1488 100644
--- a/browser/themes/osx/preferences/alwaysAsk.png
+++ b/application/basilisk/themes/osx/preferences/alwaysAsk.png
diff --git a/browser/themes/osx/preferences/application.png b/application/basilisk/themes/osx/preferences/application.png
index b4c1ca7d0..b4c1ca7d0 100644
--- a/browser/themes/osx/preferences/application.png
+++ b/application/basilisk/themes/osx/preferences/application.png
diff --git a/browser/themes/osx/preferences/applications.css b/application/basilisk/themes/osx/preferences/applications.css
index 8a4a01500..8a4a01500 100644
--- a/browser/themes/osx/preferences/applications.css
+++ b/application/basilisk/themes/osx/preferences/applications.css
diff --git a/browser/themes/osx/preferences/in-content/dialog.css b/application/basilisk/themes/osx/preferences/in-content/dialog.css
index 46a6cb91c..46a6cb91c 100644
--- a/browser/themes/osx/preferences/in-content/dialog.css
+++ b/application/basilisk/themes/osx/preferences/in-content/dialog.css
diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/application/basilisk/themes/osx/preferences/in-content/preferences.css
index c59b08283..c59b08283 100644
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/application/basilisk/themes/osx/preferences/in-content/preferences.css
diff --git a/browser/themes/osx/preferences/preferences.css b/application/basilisk/themes/osx/preferences/preferences.css
index da0e66b6e..4f17ec58d 100644
--- a/browser/themes/osx/preferences/preferences.css
+++ b/application/basilisk/themes/osx/preferences/preferences.css
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-%include ../../../../toolkit/themes/osx/global/shared.inc
+%include ../../../../../toolkit/themes/osx/global/shared.inc
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
diff --git a/browser/themes/osx/preferences/saveFile.png b/application/basilisk/themes/osx/preferences/saveFile.png
index 7177f8df3..7177f8df3 100644
--- a/browser/themes/osx/preferences/saveFile.png
+++ b/application/basilisk/themes/osx/preferences/saveFile.png
diff --git a/browser/themes/osx/privatebrowsing-mask-short.png b/application/basilisk/themes/osx/privatebrowsing-mask-short.png
index 92f60e29f..92f60e29f 100644
--- a/browser/themes/osx/privatebrowsing-mask-short.png
+++ b/application/basilisk/themes/osx/privatebrowsing-mask-short.png
diff --git a/browser/themes/osx/privatebrowsing-mask-short@2x.png b/application/basilisk/themes/osx/privatebrowsing-mask-short@2x.png
index ec1cf7452..ec1cf7452 100644
--- a/browser/themes/osx/privatebrowsing-mask-short@2x.png
+++ b/application/basilisk/themes/osx/privatebrowsing-mask-short@2x.png
diff --git a/browser/themes/osx/privatebrowsing-mask.png b/application/basilisk/themes/osx/privatebrowsing-mask.png
index 586d3d9f0..586d3d9f0 100644
--- a/browser/themes/osx/privatebrowsing-mask.png
+++ b/application/basilisk/themes/osx/privatebrowsing-mask.png
diff --git a/browser/themes/osx/privatebrowsing-mask@2x.png b/application/basilisk/themes/osx/privatebrowsing-mask@2x.png
index efb6d9b80..efb6d9b80 100644
--- a/browser/themes/osx/privatebrowsing-mask@2x.png
+++ b/application/basilisk/themes/osx/privatebrowsing-mask@2x.png
diff --git a/browser/themes/osx/reload-stop-go-yosemite.png b/application/basilisk/themes/osx/reload-stop-go-yosemite.png
index 5efbf0b94..5efbf0b94 100644
--- a/browser/themes/osx/reload-stop-go-yosemite.png
+++ b/application/basilisk/themes/osx/reload-stop-go-yosemite.png
diff --git a/browser/themes/osx/reload-stop-go-yosemite@2x.png b/application/basilisk/themes/osx/reload-stop-go-yosemite@2x.png
index b681f8930..b681f8930 100644
--- a/browser/themes/osx/reload-stop-go-yosemite@2x.png
+++ b/application/basilisk/themes/osx/reload-stop-go-yosemite@2x.png
diff --git a/browser/themes/osx/reload-stop-go.png b/application/basilisk/themes/osx/reload-stop-go.png
index 699ef2326..699ef2326 100644
--- a/browser/themes/osx/reload-stop-go.png
+++ b/application/basilisk/themes/osx/reload-stop-go.png
diff --git a/browser/themes/osx/reload-stop-go@2x.png b/application/basilisk/themes/osx/reload-stop-go@2x.png
index 704c7a894..704c7a894 100644
--- a/browser/themes/osx/reload-stop-go@2x.png
+++ b/application/basilisk/themes/osx/reload-stop-go@2x.png
diff --git a/browser/themes/osx/sanitizeDialog.css b/application/basilisk/themes/osx/sanitizeDialog.css
index 14a6ce527..14a6ce527 100644
--- a/browser/themes/osx/sanitizeDialog.css
+++ b/application/basilisk/themes/osx/sanitizeDialog.css
diff --git a/browser/themes/osx/searchbar.css b/application/basilisk/themes/osx/searchbar.css
index 4b6aeeb21..4b6aeeb21 100644
--- a/browser/themes/osx/searchbar.css
+++ b/application/basilisk/themes/osx/searchbar.css
diff --git a/browser/themes/osx/setDesktopBackground.css b/application/basilisk/themes/osx/setDesktopBackground.css
index f9b16ec2b..f9b16ec2b 100644
--- a/browser/themes/osx/setDesktopBackground.css
+++ b/application/basilisk/themes/osx/setDesktopBackground.css
diff --git a/browser/themes/osx/shared.inc b/application/basilisk/themes/osx/shared.inc
index b3ea4e199..3076450e2 100644
--- a/browser/themes/osx/shared.inc
+++ b/application/basilisk/themes/osx/shared.inc
@@ -1,4 +1,4 @@
-%include ../../../toolkit/themes/osx/global/shared.inc

+%include ../../../../toolkit/themes/osx/global/shared.inc

 %include ../shared/browser.inc

 

 %filter substitution

diff --git a/browser/themes/osx/slowStartup-16.png b/application/basilisk/themes/osx/slowStartup-16.png
index 439bec340..439bec340 100644
--- a/browser/themes/osx/slowStartup-16.png
+++ b/application/basilisk/themes/osx/slowStartup-16.png
diff --git a/browser/themes/osx/subtle-pattern.png b/application/basilisk/themes/osx/subtle-pattern.png
index 701239ec0..701239ec0 100644
--- a/browser/themes/osx/subtle-pattern.png
+++ b/application/basilisk/themes/osx/subtle-pattern.png
diff --git a/browser/themes/osx/sync-128.png b/application/basilisk/themes/osx/sync-128.png
index 1ea34818c..1ea34818c 100644
--- a/browser/themes/osx/sync-128.png
+++ b/application/basilisk/themes/osx/sync-128.png
diff --git a/browser/themes/osx/sync-16.png b/application/basilisk/themes/osx/sync-16.png
index 0afb1c719..0afb1c719 100644
--- a/browser/themes/osx/sync-16.png
+++ b/application/basilisk/themes/osx/sync-16.png
diff --git a/browser/themes/osx/sync-32.png b/application/basilisk/themes/osx/sync-32.png
index 7a762cb98..7a762cb98 100644
--- a/browser/themes/osx/sync-32.png
+++ b/application/basilisk/themes/osx/sync-32.png
diff --git a/browser/themes/osx/sync-bg.png b/application/basilisk/themes/osx/sync-bg.png
index 893a27d76..893a27d76 100644
--- a/browser/themes/osx/sync-bg.png
+++ b/application/basilisk/themes/osx/sync-bg.png
diff --git a/browser/themes/osx/sync-horizontalbar-yosemite.png b/application/basilisk/themes/osx/sync-horizontalbar-yosemite.png
index 43e911462..43e911462 100644
--- a/browser/themes/osx/sync-horizontalbar-yosemite.png
+++ b/application/basilisk/themes/osx/sync-horizontalbar-yosemite.png
diff --git a/browser/themes/osx/sync-horizontalbar-yosemite@2x.png b/application/basilisk/themes/osx/sync-horizontalbar-yosemite@2x.png
index c9472b70e..c9472b70e 100644
--- a/browser/themes/osx/sync-horizontalbar-yosemite@2x.png
+++ b/application/basilisk/themes/osx/sync-horizontalbar-yosemite@2x.png
diff --git a/browser/themes/osx/sync-horizontalbar.png b/application/basilisk/themes/osx/sync-horizontalbar.png
index 4223d3bcb..4223d3bcb 100644
--- a/browser/themes/osx/sync-horizontalbar.png
+++ b/application/basilisk/themes/osx/sync-horizontalbar.png
diff --git a/browser/themes/osx/sync-horizontalbar@2x.png b/application/basilisk/themes/osx/sync-horizontalbar@2x.png
index fdc126681..fdc126681 100644
--- a/browser/themes/osx/sync-horizontalbar@2x.png
+++ b/application/basilisk/themes/osx/sync-horizontalbar@2x.png
diff --git a/browser/themes/osx/sync-notification-24.png b/application/basilisk/themes/osx/sync-notification-24.png
index 8d2ec8fa8..8d2ec8fa8 100644
--- a/browser/themes/osx/sync-notification-24.png
+++ b/application/basilisk/themes/osx/sync-notification-24.png
diff --git a/browser/themes/osx/syncCommon.css b/application/basilisk/themes/osx/syncCommon.css
index 2d39aa179..2d39aa179 100644
--- a/browser/themes/osx/syncCommon.css
+++ b/application/basilisk/themes/osx/syncCommon.css
diff --git a/browser/themes/osx/syncProgress-horizontalbar.png b/application/basilisk/themes/osx/syncProgress-horizontalbar.png
index 48cd11055..48cd11055 100644
--- a/browser/themes/osx/syncProgress-horizontalbar.png
+++ b/application/basilisk/themes/osx/syncProgress-horizontalbar.png
diff --git a/browser/themes/osx/syncProgress-horizontalbar@2x.png b/application/basilisk/themes/osx/syncProgress-horizontalbar@2x.png
index 741dd2ed4..741dd2ed4 100644
--- a/browser/themes/osx/syncProgress-horizontalbar@2x.png
+++ b/application/basilisk/themes/osx/syncProgress-horizontalbar@2x.png
diff --git a/browser/themes/osx/syncProgress-menuPanel.png b/application/basilisk/themes/osx/syncProgress-menuPanel.png
index 6fd6f9c16..6fd6f9c16 100644
--- a/browser/themes/osx/syncProgress-menuPanel.png
+++ b/application/basilisk/themes/osx/syncProgress-menuPanel.png
diff --git a/browser/themes/osx/syncProgress-menuPanel@2x.png b/application/basilisk/themes/osx/syncProgress-menuPanel@2x.png
index 04b2cae00..04b2cae00 100644
--- a/browser/themes/osx/syncProgress-menuPanel@2x.png
+++ b/application/basilisk/themes/osx/syncProgress-menuPanel@2x.png
diff --git a/browser/themes/osx/syncProgress-toolbar-inverted.png b/application/basilisk/themes/osx/syncProgress-toolbar-inverted.png
index 42f3da363..42f3da363 100644
--- a/browser/themes/osx/syncProgress-toolbar-inverted.png
+++ b/application/basilisk/themes/osx/syncProgress-toolbar-inverted.png
diff --git a/browser/themes/osx/syncProgress-toolbar-inverted@2x.png b/application/basilisk/themes/osx/syncProgress-toolbar-inverted@2x.png
index eee4a5dd0..eee4a5dd0 100644
--- a/browser/themes/osx/syncProgress-toolbar-inverted@2x.png
+++ b/application/basilisk/themes/osx/syncProgress-toolbar-inverted@2x.png
diff --git a/browser/themes/osx/syncProgress-toolbar.png b/application/basilisk/themes/osx/syncProgress-toolbar.png
index 49e224f0d..49e224f0d 100644
--- a/browser/themes/osx/syncProgress-toolbar.png
+++ b/application/basilisk/themes/osx/syncProgress-toolbar.png
diff --git a/browser/themes/osx/syncProgress-toolbar@2x.png b/application/basilisk/themes/osx/syncProgress-toolbar@2x.png
index fd2038725..fd2038725 100644
--- a/browser/themes/osx/syncProgress-toolbar@2x.png
+++ b/application/basilisk/themes/osx/syncProgress-toolbar@2x.png
diff --git a/browser/themes/osx/syncQuota.css b/application/basilisk/themes/osx/syncQuota.css
index 1577de8a3..1577de8a3 100644
--- a/browser/themes/osx/syncQuota.css
+++ b/application/basilisk/themes/osx/syncQuota.css
diff --git a/browser/themes/osx/syncSetup.css b/application/basilisk/themes/osx/syncSetup.css
index 0861df831..0861df831 100644
--- a/browser/themes/osx/syncSetup.css
+++ b/application/basilisk/themes/osx/syncSetup.css
diff --git a/browser/themes/osx/syncedtabs/sidebar.css b/application/basilisk/themes/osx/syncedtabs/sidebar.css
index 4d1de766c..4d1de766c 100644
--- a/browser/themes/osx/syncedtabs/sidebar.css
+++ b/application/basilisk/themes/osx/syncedtabs/sidebar.css
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
index 295b4ad74..295b4ad74 100644
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
index 23889d7cc..23889d7cc 100644
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
index 4d71308d2..4d71308d2 100644
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
index 875f73c5e..875f73c5e 100644
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
index 94a11fe5f..94a11fe5f 100644
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted.png b/application/basilisk/themes/osx/tabbrowser/newtab-inverted.png
index 2d29c2cbe..2d29c2cbe 100644
--- a/browser/themes/osx/tabbrowser/newtab-inverted.png
+++ b/application/basilisk/themes/osx/tabbrowser/newtab-inverted.png
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/newtab-inverted@2x.png
index 6feba0e83..6feba0e83 100644
--- a/browser/themes/osx/tabbrowser/newtab-inverted@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/newtab-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/newtab.png b/application/basilisk/themes/osx/tabbrowser/newtab.png
index 32e42b04c..32e42b04c 100644
--- a/browser/themes/osx/tabbrowser/newtab.png
+++ b/application/basilisk/themes/osx/tabbrowser/newtab.png
diff --git a/browser/themes/osx/tabbrowser/newtab@2x.png b/application/basilisk/themes/osx/tabbrowser/newtab@2x.png
index ffde5f050..ffde5f050 100644
--- a/browser/themes/osx/tabbrowser/newtab@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/newtab@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
index 9f74c4e76..9f74c4e76 100644
--- a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
index 50961db7e..50961db7e 100644
--- a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle.png
index c3e5e18ba..c3e5e18ba 100644
--- a/browser/themes/osx/tabbrowser/tab-active-middle.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle.png
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle@2x.png
index 6cdc4472e..6cdc4472e 100644
--- a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted.png
index b0826024d..b0826024d 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
index 4ca8ec0ba..4ca8ec0ba 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left.png
index 61ad41ae9..61ad41ae9 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-left.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left@2x.png
index 20bf78db2..20bf78db2 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted.png
index 0cd8f37a6..0cd8f37a6 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
index e4ab8cbaa..e4ab8cbaa 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right.png
index 37ccf8cfe..37ccf8cfe 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-right.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right.png
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right@2x.png
index d319accc5..d319accc5 100644
--- a/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-end.png b/application/basilisk/themes/osx/tabbrowser/tab-background-end.png
index 2e515a39e..2e515a39e 100644
--- a/browser/themes/osx/tabbrowser/tab-background-end.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-end.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-end@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-end@2x.png
index 18dba9693..18dba9693 100644
--- a/browser/themes/osx/tabbrowser/tab-background-end@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-end@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle.png b/application/basilisk/themes/osx/tabbrowser/tab-background-middle.png
index addb64b13..addb64b13 100644
--- a/browser/themes/osx/tabbrowser/tab-background-middle.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-middle.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-middle@2x.png
index 41eba94af..41eba94af 100644
--- a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-middle@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-start.png b/application/basilisk/themes/osx/tabbrowser/tab-background-start.png
index 243bf0099..243bf0099 100644
--- a/browser/themes/osx/tabbrowser/tab-background-start.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-start.png
diff --git a/browser/themes/osx/tabbrowser/tab-background-start@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-start@2x.png
index 86403921d..86403921d 100644
--- a/browser/themes/osx/tabbrowser/tab-background-start@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-start@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg b/application/basilisk/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
index decefab6e..decefab6e 100644
--- a/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
+++ b/application/basilisk/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
diff --git a/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg b/application/basilisk/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
index e29bab297..e29bab297 100644
--- a/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
+++ b/application/basilisk/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
index 4206f0c7d..4206f0c7d 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
index 21ac89270..21ac89270 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end.png
index 099978580..099978580 100755..100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-end.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end@2x.png
index d321ca579..d321ca579 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
index 2acbac438..2acbac438 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
index a12fc39a7..a12fc39a7 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start.png
index e5a7b5ee9..e5a7b5ee9 100755..100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-start.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start.png
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start@2x.png
index 64449115c..64449115c 100644
--- a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start@2x.png
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator.png b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator.png
index a373cae53..a373cae53 100644
--- a/browser/themes/osx/tabbrowser/tabDragIndicator.png
+++ b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator.png
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator@2x.png
index b51b873cb..b51b873cb 100644
--- a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
+++ b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator@2x.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker-lion.png b/application/basilisk/themes/osx/toolbarbutton-dropmarker-lion.png
index 09d80a1b2..09d80a1b2 100644
--- a/browser/themes/osx/toolbarbutton-dropmarker-lion.png
+++ b/application/basilisk/themes/osx/toolbarbutton-dropmarker-lion.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png b/application/basilisk/themes/osx/toolbarbutton-dropmarker-lion@2x.png
index 631fb1352..631fb1352 100644
--- a/browser/themes/osx/toolbarbutton-dropmarker-lion@2x.png
+++ b/application/basilisk/themes/osx/toolbarbutton-dropmarker-lion@2x.png
diff --git a/browser/themes/osx/toolbarbutton-dropmarker.png b/application/basilisk/themes/osx/toolbarbutton-dropmarker.png
index f4cdb664b..f4cdb664b 100644
--- a/browser/themes/osx/toolbarbutton-dropmarker.png
+++ b/application/basilisk/themes/osx/toolbarbutton-dropmarker.png
diff --git a/browser/themes/osx/urlbar-history-dropmarker.png b/application/basilisk/themes/osx/urlbar-history-dropmarker.png
index 53bd1cb0c..53bd1cb0c 100644
--- a/browser/themes/osx/urlbar-history-dropmarker.png
+++ b/application/basilisk/themes/osx/urlbar-history-dropmarker.png
diff --git a/browser/themes/osx/urlbar-history-dropmarker@2x.png b/application/basilisk/themes/osx/urlbar-history-dropmarker@2x.png
index e7d4937b8..e7d4937b8 100644
--- a/browser/themes/osx/urlbar-history-dropmarker@2x.png
+++ b/application/basilisk/themes/osx/urlbar-history-dropmarker@2x.png
diff --git a/browser/themes/osx/urlbar-popup-blocked.png b/application/basilisk/themes/osx/urlbar-popup-blocked.png
index 8c4f4d96f..8c4f4d96f 100644
--- a/browser/themes/osx/urlbar-popup-blocked.png
+++ b/application/basilisk/themes/osx/urlbar-popup-blocked.png
diff --git a/browser/themes/osx/urlbar-popup-blocked@2x.png b/application/basilisk/themes/osx/urlbar-popup-blocked@2x.png
index 4d6aa6f20..4d6aa6f20 100644
--- a/browser/themes/osx/urlbar-popup-blocked@2x.png
+++ b/application/basilisk/themes/osx/urlbar-popup-blocked@2x.png
diff --git a/browser/themes/osx/webRTC-indicator.css b/application/basilisk/themes/osx/webRTC-indicator.css
index 759dbd813..759dbd813 100644
--- a/browser/themes/osx/webRTC-indicator.css
+++ b/application/basilisk/themes/osx/webRTC-indicator.css
diff --git a/browser/themes/osx/webRTC-sharingDevice-menubar.png b/application/basilisk/themes/osx/webRTC-sharingDevice-menubar.png
index fb74738dd..fb74738dd 100644
--- a/browser/themes/osx/webRTC-sharingDevice-menubar.png
+++ b/application/basilisk/themes/osx/webRTC-sharingDevice-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingDevice-menubar@2x.png b/application/basilisk/themes/osx/webRTC-sharingDevice-menubar@2x.png
index 8f64887a8..8f64887a8 100644
--- a/browser/themes/osx/webRTC-sharingDevice-menubar@2x.png
+++ b/application/basilisk/themes/osx/webRTC-sharingDevice-menubar@2x.png
diff --git a/browser/themes/osx/webRTC-sharingMicrophone-menubar.png b/application/basilisk/themes/osx/webRTC-sharingMicrophone-menubar.png
index c47f5827d..c47f5827d 100644
--- a/browser/themes/osx/webRTC-sharingMicrophone-menubar.png
+++ b/application/basilisk/themes/osx/webRTC-sharingMicrophone-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingMicrophone-menubar@2x.png b/application/basilisk/themes/osx/webRTC-sharingMicrophone-menubar@2x.png
index 2c45c8bcc..2c45c8bcc 100644
--- a/browser/themes/osx/webRTC-sharingMicrophone-menubar@2x.png
+++ b/application/basilisk/themes/osx/webRTC-sharingMicrophone-menubar@2x.png
diff --git a/browser/themes/osx/webRTC-sharingScreen-menubar.png b/application/basilisk/themes/osx/webRTC-sharingScreen-menubar.png
index 6d9e49cfd..6d9e49cfd 100644
--- a/browser/themes/osx/webRTC-sharingScreen-menubar.png
+++ b/application/basilisk/themes/osx/webRTC-sharingScreen-menubar.png
diff --git a/browser/themes/osx/webRTC-sharingScreen-menubar@2x.png b/application/basilisk/themes/osx/webRTC-sharingScreen-menubar@2x.png
index 0f3d62ec5..0f3d62ec5 100644
--- a/browser/themes/osx/webRTC-sharingScreen-menubar@2x.png
+++ b/application/basilisk/themes/osx/webRTC-sharingScreen-menubar@2x.png
diff --git a/browser/themes/preprocess-tab-svgs.py b/application/basilisk/themes/preprocess-tab-svgs.py
index ab3e6ca88..ab3e6ca88 100755..100644
--- a/browser/themes/preprocess-tab-svgs.py
+++ b/application/basilisk/themes/preprocess-tab-svgs.py
diff --git a/browser/themes/shared/aboutNetError.css b/application/basilisk/themes/shared/aboutNetError.css
index c0b76aa47..c0b76aa47 100644
--- a/browser/themes/shared/aboutNetError.css
+++ b/application/basilisk/themes/shared/aboutNetError.css
diff --git a/browser/themes/shared/aboutSessionRestore.css b/application/basilisk/themes/shared/aboutSessionRestore.css
index 52488af40..52488af40 100644
--- a/browser/themes/shared/aboutSessionRestore.css
+++ b/application/basilisk/themes/shared/aboutSessionRestore.css
diff --git a/browser/themes/shared/aboutSocialError.css b/application/basilisk/themes/shared/aboutSocialError.css
index f5a922ff4..f5a922ff4 100644
--- a/browser/themes/shared/aboutSocialError.css
+++ b/application/basilisk/themes/shared/aboutSocialError.css
diff --git a/browser/themes/shared/aboutTabCrashed.css b/application/basilisk/themes/shared/aboutTabCrashed.css
index 264fb4275..264fb4275 100644
--- a/browser/themes/shared/aboutTabCrashed.css
+++ b/application/basilisk/themes/shared/aboutTabCrashed.css
diff --git a/browser/themes/shared/aboutWelcomeBack.css b/application/basilisk/themes/shared/aboutWelcomeBack.css
index 815ad462e..815ad462e 100644
--- a/browser/themes/shared/aboutWelcomeBack.css
+++ b/application/basilisk/themes/shared/aboutWelcomeBack.css
diff --git a/browser/themes/shared/addons/addon-install-anchor.svg b/application/basilisk/themes/shared/addons/addon-install-anchor.svg
index 1ee69ca0d..1ee69ca0d 100644
--- a/browser/themes/shared/addons/addon-install-anchor.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-anchor.svg
diff --git a/browser/themes/shared/addons/addon-install-blocked.svg b/application/basilisk/themes/shared/addons/addon-install-blocked.svg
index caaaa466b..caaaa466b 100644
--- a/browser/themes/shared/addons/addon-install-blocked.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-blocked.svg
diff --git a/browser/themes/shared/addons/addon-install-confirm.svg b/application/basilisk/themes/shared/addons/addon-install-confirm.svg
index a16455253..a16455253 100644
--- a/browser/themes/shared/addons/addon-install-confirm.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-confirm.svg
diff --git a/browser/themes/shared/addons/addon-install-downloading.svg b/application/basilisk/themes/shared/addons/addon-install-downloading.svg
index 9dcc8069c..9dcc8069c 100644
--- a/browser/themes/shared/addons/addon-install-downloading.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-downloading.svg
diff --git a/browser/themes/shared/addons/addon-install-error.svg b/application/basilisk/themes/shared/addons/addon-install-error.svg
index e25950f25..e25950f25 100644
--- a/browser/themes/shared/addons/addon-install-error.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-error.svg
diff --git a/browser/themes/shared/addons/addon-install-installed.svg b/application/basilisk/themes/shared/addons/addon-install-installed.svg
index 3b352c21d..3b352c21d 100644
--- a/browser/themes/shared/addons/addon-install-installed.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-installed.svg
diff --git a/browser/themes/shared/addons/addon-install-restart.svg b/application/basilisk/themes/shared/addons/addon-install-restart.svg
index e3269c3b1..e3269c3b1 100644
--- a/browser/themes/shared/addons/addon-install-restart.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-restart.svg
diff --git a/browser/themes/shared/addons/addon-install-warning.svg b/application/basilisk/themes/shared/addons/addon-install-warning.svg
index bac1903c6..bac1903c6 100644
--- a/browser/themes/shared/addons/addon-install-warning.svg
+++ b/application/basilisk/themes/shared/addons/addon-install-warning.svg
diff --git a/browser/themes/shared/autocomplete.inc.css b/application/basilisk/themes/shared/autocomplete.inc.css
index d9923a7e7..d9923a7e7 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/application/basilisk/themes/shared/autocomplete.inc.css
diff --git a/browser/themes/shared/blockedSite.css b/application/basilisk/themes/shared/blockedSite.css
index 49846ee89..49846ee89 100644
--- a/browser/themes/shared/blockedSite.css
+++ b/application/basilisk/themes/shared/blockedSite.css
diff --git a/browser/themes/shared/browser.inc b/application/basilisk/themes/shared/browser.inc
index 81caf94d6..81caf94d6 100644
--- a/browser/themes/shared/browser.inc
+++ b/application/basilisk/themes/shared/browser.inc
diff --git a/browser/themes/shared/content-contextmenu.svg b/application/basilisk/themes/shared/content-contextmenu.svg
index 6b53c13d9..6b53c13d9 100644
--- a/browser/themes/shared/content-contextmenu.svg
+++ b/application/basilisk/themes/shared/content-contextmenu.svg
diff --git a/browser/themes/shared/contextmenu.inc.css b/application/basilisk/themes/shared/contextmenu.inc.css
index 2ec60b55b..2ec60b55b 100644
--- a/browser/themes/shared/contextmenu.inc.css
+++ b/application/basilisk/themes/shared/contextmenu.inc.css
diff --git a/browser/themes/shared/controlcenter/arrow-subview-back.svg b/application/basilisk/themes/shared/controlcenter/arrow-subview-back.svg
index 9f681207c..9f681207c 100644
--- a/browser/themes/shared/controlcenter/arrow-subview-back.svg
+++ b/application/basilisk/themes/shared/controlcenter/arrow-subview-back.svg
diff --git a/browser/themes/shared/controlcenter/arrow-subview.svg b/application/basilisk/themes/shared/controlcenter/arrow-subview.svg
index 2802fa055..2802fa055 100644
--- a/browser/themes/shared/controlcenter/arrow-subview.svg
+++ b/application/basilisk/themes/shared/controlcenter/arrow-subview.svg
diff --git a/browser/themes/shared/controlcenter/conn-not-secure.svg b/application/basilisk/themes/shared/controlcenter/conn-not-secure.svg
index ef2df7c69..ef2df7c69 100644
--- a/browser/themes/shared/controlcenter/conn-not-secure.svg
+++ b/application/basilisk/themes/shared/controlcenter/conn-not-secure.svg
diff --git a/browser/themes/shared/controlcenter/connection.svg b/application/basilisk/themes/shared/controlcenter/connection.svg
index 85396d68f..85396d68f 100644
--- a/browser/themes/shared/controlcenter/connection.svg
+++ b/application/basilisk/themes/shared/controlcenter/connection.svg
diff --git a/browser/themes/shared/controlcenter/mcb-disabled.svg b/application/basilisk/themes/shared/controlcenter/mcb-disabled.svg
index 76bad47ee..76bad47ee 100644
--- a/browser/themes/shared/controlcenter/mcb-disabled.svg
+++ b/application/basilisk/themes/shared/controlcenter/mcb-disabled.svg
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/application/basilisk/themes/shared/controlcenter/panel.inc.css
index a0f3aa854..a0f3aa854 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/application/basilisk/themes/shared/controlcenter/panel.inc.css
diff --git a/browser/themes/shared/controlcenter/permissions.svg b/application/basilisk/themes/shared/controlcenter/permissions.svg
index 77f0f3e50..77f0f3e50 100644
--- a/browser/themes/shared/controlcenter/permissions.svg
+++ b/application/basilisk/themes/shared/controlcenter/permissions.svg
diff --git a/browser/themes/shared/controlcenter/tracking-protection.svg b/application/basilisk/themes/shared/controlcenter/tracking-protection.svg
index 1779378c1..1779378c1 100644
--- a/browser/themes/shared/controlcenter/tracking-protection.svg
+++ b/application/basilisk/themes/shared/controlcenter/tracking-protection.svg
diff --git a/browser/themes/shared/controlcenter/warning-gray.svg b/application/basilisk/themes/shared/controlcenter/warning-gray.svg
index 5f122c3ee..5f122c3ee 100644
--- a/browser/themes/shared/controlcenter/warning-gray.svg
+++ b/application/basilisk/themes/shared/controlcenter/warning-gray.svg
diff --git a/browser/themes/shared/controlcenter/warning-yellow.svg b/application/basilisk/themes/shared/controlcenter/warning-yellow.svg
index e2d3a3664..e2d3a3664 100644
--- a/browser/themes/shared/controlcenter/warning-yellow.svg
+++ b/application/basilisk/themes/shared/controlcenter/warning-yellow.svg
diff --git a/browser/themes/shared/ctrlTab.inc.css b/application/basilisk/themes/shared/ctrlTab.inc.css
index 1205d0499..1205d0499 100644
--- a/browser/themes/shared/ctrlTab.inc.css
+++ b/application/basilisk/themes/shared/ctrlTab.inc.css
diff --git a/browser/themes/shared/customizableui/customize-illustration-rtl.png b/application/basilisk/themes/shared/customizableui/customize-illustration-rtl.png
index 12005095c..12005095c 100644
--- a/browser/themes/shared/customizableui/customize-illustration-rtl.png
+++ b/application/basilisk/themes/shared/customizableui/customize-illustration-rtl.png
diff --git a/browser/themes/shared/customizableui/customize-illustration-rtl@2x.png b/application/basilisk/themes/shared/customizableui/customize-illustration-rtl@2x.png
index c1af12990..c1af12990 100644
--- a/browser/themes/shared/customizableui/customize-illustration-rtl@2x.png
+++ b/application/basilisk/themes/shared/customizableui/customize-illustration-rtl@2x.png
diff --git a/browser/themes/shared/customizableui/customize-illustration.png b/application/basilisk/themes/shared/customizableui/customize-illustration.png
index 9131951b0..9131951b0 100644
--- a/browser/themes/shared/customizableui/customize-illustration.png
+++ b/application/basilisk/themes/shared/customizableui/customize-illustration.png
diff --git a/browser/themes/shared/customizableui/customize-illustration@2x.png b/application/basilisk/themes/shared/customizableui/customize-illustration@2x.png
index 50c0d1949..50c0d1949 100644
--- a/browser/themes/shared/customizableui/customize-illustration@2x.png
+++ b/application/basilisk/themes/shared/customizableui/customize-illustration@2x.png
diff --git a/browser/themes/shared/customizableui/customizeFavicon.ico b/application/basilisk/themes/shared/customizableui/customizeFavicon.ico
index c7bd84339..c7bd84339 100644
--- a/browser/themes/shared/customizableui/customizeFavicon.ico
+++ b/application/basilisk/themes/shared/customizableui/customizeFavicon.ico
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/application/basilisk/themes/shared/customizableui/customizeMode.inc.css
index 48681d9f3..d99933388 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/application/basilisk/themes/shared/customizableui/customizeMode.inc.css
@@ -457,5 +457,3 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
 .customization-lwtheme-menu-footeritem:first-child {
   border-inline-end: 1px solid var(--panel-separator-color);
 }
-
-%include customizeTip.inc.css
diff --git a/browser/themes/shared/customizableui/info-icon-customizeTip.png b/application/basilisk/themes/shared/customizableui/info-icon-customizeTip.png
index 0dfbbce5d..0dfbbce5d 100644
--- a/browser/themes/shared/customizableui/info-icon-customizeTip.png
+++ b/application/basilisk/themes/shared/customizableui/info-icon-customizeTip.png
diff --git a/browser/themes/shared/customizableui/info-icon-customizeTip@2x.png b/application/basilisk/themes/shared/customizableui/info-icon-customizeTip@2x.png
index 7a87fac20..7a87fac20 100644
--- a/browser/themes/shared/customizableui/info-icon-customizeTip@2x.png
+++ b/application/basilisk/themes/shared/customizableui/info-icon-customizeTip@2x.png
diff --git a/browser/themes/shared/customizableui/menuPanel-customizeFinish.png b/application/basilisk/themes/shared/customizableui/menuPanel-customizeFinish.png
index 07be6a76a..07be6a76a 100644
--- a/browser/themes/shared/customizableui/menuPanel-customizeFinish.png
+++ b/application/basilisk/themes/shared/customizableui/menuPanel-customizeFinish.png
diff --git a/browser/themes/shared/customizableui/menuPanel-customizeFinish@2x.png b/application/basilisk/themes/shared/customizableui/menuPanel-customizeFinish@2x.png
index 7562e138c..7562e138c 100644
--- a/browser/themes/shared/customizableui/menuPanel-customizeFinish@2x.png
+++ b/application/basilisk/themes/shared/customizableui/menuPanel-customizeFinish@2x.png
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/application/basilisk/themes/shared/customizableui/panelUI.inc.css
index ba36da995..ba36da995 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/application/basilisk/themes/shared/customizableui/panelUI.inc.css
diff --git a/browser/themes/shared/customizableui/panelarrow-customizeTip.png b/application/basilisk/themes/shared/customizableui/panelarrow-customizeTip.png
index cbdf4692b..cbdf4692b 100644
--- a/browser/themes/shared/customizableui/panelarrow-customizeTip.png
+++ b/application/basilisk/themes/shared/customizableui/panelarrow-customizeTip.png
diff --git a/browser/themes/shared/customizableui/panelarrow-customizeTip@2x.png b/application/basilisk/themes/shared/customizableui/panelarrow-customizeTip@2x.png
index cfd7ba966..cfd7ba966 100644
--- a/browser/themes/shared/customizableui/panelarrow-customizeTip@2x.png
+++ b/application/basilisk/themes/shared/customizableui/panelarrow-customizeTip@2x.png
diff --git a/browser/themes/shared/customizableui/subView-arrow-back-inverted-rtl.png b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted-rtl.png
index cf4198c60..cf4198c60 100644
--- a/browser/themes/shared/customizableui/subView-arrow-back-inverted-rtl.png
+++ b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted-rtl.png
diff --git a/browser/themes/shared/customizableui/subView-arrow-back-inverted-rtl@2x.png b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted-rtl@2x.png
index bb250403d..bb250403d 100644
--- a/browser/themes/shared/customizableui/subView-arrow-back-inverted-rtl@2x.png
+++ b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted-rtl@2x.png
diff --git a/browser/themes/shared/customizableui/subView-arrow-back-inverted.png b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted.png
index 86178abfe..86178abfe 100644
--- a/browser/themes/shared/customizableui/subView-arrow-back-inverted.png
+++ b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted.png
diff --git a/browser/themes/shared/customizableui/subView-arrow-back-inverted@2x.png b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted@2x.png
index 1c8e86db3..1c8e86db3 100644
--- a/browser/themes/shared/customizableui/subView-arrow-back-inverted@2x.png
+++ b/application/basilisk/themes/shared/customizableui/subView-arrow-back-inverted@2x.png
diff --git a/browser/themes/shared/devedition.inc.css b/application/basilisk/themes/shared/devedition.inc.css
index a5c0db948..a5c0db948 100644
--- a/browser/themes/shared/devedition.inc.css
+++ b/application/basilisk/themes/shared/devedition.inc.css
diff --git a/browser/themes/shared/devedition/urlbar-history-dropmarker.svg b/application/basilisk/themes/shared/devedition/urlbar-history-dropmarker.svg
index 115fbf127..115fbf127 100644
--- a/browser/themes/shared/devedition/urlbar-history-dropmarker.svg
+++ b/application/basilisk/themes/shared/devedition/urlbar-history-dropmarker.svg
diff --git a/browser/themes/shared/downloads/allDownloadsViewOverlay.inc.css b/application/basilisk/themes/shared/downloads/allDownloadsViewOverlay.inc.css
index bdb8b7df8..bdb8b7df8 100644
--- a/browser/themes/shared/downloads/allDownloadsViewOverlay.inc.css
+++ b/application/basilisk/themes/shared/downloads/allDownloadsViewOverlay.inc.css
diff --git a/browser/themes/shared/downloads/contentAreaDownloadsView.css b/application/basilisk/themes/shared/downloads/contentAreaDownloadsView.css
index aef7df1d9..aef7df1d9 100644
--- a/browser/themes/shared/downloads/contentAreaDownloadsView.css
+++ b/application/basilisk/themes/shared/downloads/contentAreaDownloadsView.css
diff --git a/browser/themes/shared/downloads/download-blocked.svg b/application/basilisk/themes/shared/downloads/download-blocked.svg
index e73efe99e..e73efe99e 100644
--- a/browser/themes/shared/downloads/download-blocked.svg
+++ b/application/basilisk/themes/shared/downloads/download-blocked.svg
diff --git a/browser/themes/shared/downloads/download-summary.svg b/application/basilisk/themes/shared/downloads/download-summary.svg
index c10ee95fc..c10ee95fc 100644
--- a/browser/themes/shared/downloads/download-summary.svg
+++ b/application/basilisk/themes/shared/downloads/download-summary.svg
diff --git a/browser/themes/shared/downloads/downloads.inc.css b/application/basilisk/themes/shared/downloads/downloads.inc.css
index b4d670648..b4d670648 100644
--- a/browser/themes/shared/downloads/downloads.inc.css
+++ b/application/basilisk/themes/shared/downloads/downloads.inc.css
diff --git a/browser/themes/shared/downloads/menubutton-dropmarker.svg b/application/basilisk/themes/shared/downloads/menubutton-dropmarker.svg
index 76af113a7..76af113a7 100644
--- a/browser/themes/shared/downloads/menubutton-dropmarker.svg
+++ b/application/basilisk/themes/shared/downloads/menubutton-dropmarker.svg
diff --git a/browser/themes/shared/downloads/progressmeter.inc.css b/application/basilisk/themes/shared/downloads/progressmeter.inc.css
index 22e780e09..22e780e09 100644
--- a/browser/themes/shared/downloads/progressmeter.inc.css
+++ b/application/basilisk/themes/shared/downloads/progressmeter.inc.css
diff --git a/browser/themes/shared/drm-icon.svg b/application/basilisk/themes/shared/drm-icon.svg
index db2b36df6..db2b36df6 100644
--- a/browser/themes/shared/drm-icon.svg
+++ b/application/basilisk/themes/shared/drm-icon.svg
diff --git a/browser/themes/shared/e10s-64@2x.png b/application/basilisk/themes/shared/e10s-64@2x.png
index 1dc243865..1dc243865 100644
--- a/browser/themes/shared/e10s-64@2x.png
+++ b/application/basilisk/themes/shared/e10s-64@2x.png
diff --git a/browser/themes/shared/error-pages.css b/application/basilisk/themes/shared/error-pages.css
index 0711be9c7..0711be9c7 100644
--- a/browser/themes/shared/error-pages.css
+++ b/application/basilisk/themes/shared/error-pages.css
diff --git a/browser/themes/shared/favicon-search-16.svg b/application/basilisk/themes/shared/favicon-search-16.svg
index e839cc804..e839cc804 100644
--- a/browser/themes/shared/favicon-search-16.svg
+++ b/application/basilisk/themes/shared/favicon-search-16.svg
diff --git a/browser/themes/shared/filters.svg b/application/basilisk/themes/shared/filters.svg
index 8fccb13cc..8fccb13cc 100644
--- a/browser/themes/shared/filters.svg
+++ b/application/basilisk/themes/shared/filters.svg
diff --git a/browser/themes/shared/fullscreen/insecure.svg b/application/basilisk/themes/shared/fullscreen/insecure.svg
index eec272f7c..eec272f7c 100644
--- a/browser/themes/shared/fullscreen/insecure.svg
+++ b/application/basilisk/themes/shared/fullscreen/insecure.svg
diff --git a/browser/themes/shared/fullscreen/secure.svg b/application/basilisk/themes/shared/fullscreen/secure.svg
index 960fc1df0..960fc1df0 100644
--- a/browser/themes/shared/fullscreen/secure.svg
+++ b/application/basilisk/themes/shared/fullscreen/secure.svg
diff --git a/browser/themes/shared/fullscreen/warning.inc.css b/application/basilisk/themes/shared/fullscreen/warning.inc.css
index 7111a57c7..7111a57c7 100644
--- a/browser/themes/shared/fullscreen/warning.inc.css
+++ b/application/basilisk/themes/shared/fullscreen/warning.inc.css
diff --git a/browser/themes/shared/fxa/android.png b/application/basilisk/themes/shared/fxa/android.png
index e0a37a85e..e0a37a85e 100644
--- a/browser/themes/shared/fxa/android.png
+++ b/application/basilisk/themes/shared/fxa/android.png
diff --git a/browser/themes/shared/fxa/android@2x.png b/application/basilisk/themes/shared/fxa/android@2x.png
index bb6bab5e0..bb6bab5e0 100644
--- a/browser/themes/shared/fxa/android@2x.png
+++ b/application/basilisk/themes/shared/fxa/android@2x.png
diff --git a/browser/themes/shared/fxa/default-avatar.svg b/application/basilisk/themes/shared/fxa/default-avatar.svg
index 540234911..540234911 100644
--- a/browser/themes/shared/fxa/default-avatar.svg
+++ b/application/basilisk/themes/shared/fxa/default-avatar.svg
diff --git a/browser/themes/shared/fxa/ios.png b/application/basilisk/themes/shared/fxa/ios.png
index 40c90b1fa..40c90b1fa 100644
--- a/browser/themes/shared/fxa/ios.png
+++ b/application/basilisk/themes/shared/fxa/ios.png
diff --git a/browser/themes/shared/fxa/ios@2x.png b/application/basilisk/themes/shared/fxa/ios@2x.png
index af2d5ace5..af2d5ace5 100644
--- a/browser/themes/shared/fxa/ios@2x.png
+++ b/application/basilisk/themes/shared/fxa/ios@2x.png
diff --git a/browser/themes/shared/fxa/logo.png b/application/basilisk/themes/shared/fxa/logo.png
index 63c006c29..63c006c29 100644
--- a/browser/themes/shared/fxa/logo.png
+++ b/application/basilisk/themes/shared/fxa/logo.png
diff --git a/browser/themes/shared/fxa/logo@2x.png b/application/basilisk/themes/shared/fxa/logo@2x.png
index 283b091df..283b091df 100644
--- a/browser/themes/shared/fxa/logo@2x.png
+++ b/application/basilisk/themes/shared/fxa/logo@2x.png
diff --git a/browser/themes/shared/fxa/sync-illustration.png b/application/basilisk/themes/shared/fxa/sync-illustration.png
index 3d3730849..3d3730849 100644
--- a/browser/themes/shared/fxa/sync-illustration.png
+++ b/application/basilisk/themes/shared/fxa/sync-illustration.png
diff --git a/browser/themes/shared/fxa/sync-illustration.svg b/application/basilisk/themes/shared/fxa/sync-illustration.svg
index dd2b7bde6..dd2b7bde6 100644
--- a/browser/themes/shared/fxa/sync-illustration.svg
+++ b/application/basilisk/themes/shared/fxa/sync-illustration.svg
diff --git a/browser/themes/shared/fxa/sync-illustration@2x.png b/application/basilisk/themes/shared/fxa/sync-illustration@2x.png
index 23a38587d..23a38587d 100644
--- a/browser/themes/shared/fxa/sync-illustration@2x.png
+++ b/application/basilisk/themes/shared/fxa/sync-illustration@2x.png
diff --git a/browser/themes/shared/heartbeat-icon.svg b/application/basilisk/themes/shared/heartbeat-icon.svg
index db2cb5f03..db2cb5f03 100644
--- a/browser/themes/shared/heartbeat-icon.svg
+++ b/application/basilisk/themes/shared/heartbeat-icon.svg
diff --git a/browser/themes/shared/heartbeat-star-lit.svg b/application/basilisk/themes/shared/heartbeat-star-lit.svg
index 3f59099b9..3f59099b9 100644
--- a/browser/themes/shared/heartbeat-star-lit.svg
+++ b/application/basilisk/themes/shared/heartbeat-star-lit.svg
diff --git a/browser/themes/shared/heartbeat-star-off.svg b/application/basilisk/themes/shared/heartbeat-star-off.svg
index 143fe48e2..143fe48e2 100644
--- a/browser/themes/shared/heartbeat-star-off.svg
+++ b/application/basilisk/themes/shared/heartbeat-star-off.svg
diff --git a/browser/themes/shared/icon-colors.inc.svg b/application/basilisk/themes/shared/icon-colors.inc.svg
index dc29d6055..dc29d6055 100644
--- a/browser/themes/shared/icon-colors.inc.svg
+++ b/application/basilisk/themes/shared/icon-colors.inc.svg
diff --git a/browser/themes/shared/icon.png b/application/basilisk/themes/shared/icon.png
index 891e7afb1..891e7afb1 100644
--- a/browser/themes/shared/icon.png
+++ b/application/basilisk/themes/shared/icon.png
diff --git a/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg b/application/basilisk/themes/shared/identity-block/connection-mixed-active-loaded.svg
index 35d84784a..35d84784a 100644
--- a/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg
+++ b/application/basilisk/themes/shared/identity-block/connection-mixed-active-loaded.svg
diff --git a/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg b/application/basilisk/themes/shared/identity-block/connection-mixed-passive-loaded.svg
index 66cb96ee0..66cb96ee0 100644
--- a/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg
+++ b/application/basilisk/themes/shared/identity-block/connection-mixed-passive-loaded.svg
diff --git a/browser/themes/shared/identity-block/connection-secure.svg b/application/basilisk/themes/shared/identity-block/connection-secure.svg
index 5dad8903b..5dad8903b 100644
--- a/browser/themes/shared/identity-block/connection-secure.svg
+++ b/application/basilisk/themes/shared/identity-block/connection-secure.svg
diff --git a/browser/themes/shared/identity-block/icons.inc.css b/application/basilisk/themes/shared/identity-block/icons.inc.css
index 6cf300061..6cf300061 100644
--- a/browser/themes/shared/identity-block/icons.inc.css
+++ b/application/basilisk/themes/shared/identity-block/icons.inc.css
diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/application/basilisk/themes/shared/identity-block/identity-block.inc.css
index 6fa40e9db..6fa40e9db 100644
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/application/basilisk/themes/shared/identity-block/identity-block.inc.css
diff --git a/browser/themes/shared/identity-block/identity-icon.svg b/application/basilisk/themes/shared/identity-block/identity-icon.svg
index 9f4c81655..9f4c81655 100755..100644
--- a/browser/themes/shared/identity-block/identity-icon.svg
+++ b/application/basilisk/themes/shared/identity-block/identity-icon.svg
diff --git a/browser/themes/shared/identity-block/tracking-protection-16.svg b/application/basilisk/themes/shared/identity-block/tracking-protection-16.svg
index 6517fe36b..6517fe36b 100755..100644
--- a/browser/themes/shared/identity-block/tracking-protection-16.svg
+++ b/application/basilisk/themes/shared/identity-block/tracking-protection-16.svg
diff --git a/browser/themes/shared/incontent-icons/cert-error.svg b/application/basilisk/themes/shared/incontent-icons/cert-error.svg
index 9d23267bb..9d23267bb 100644
--- a/browser/themes/shared/incontent-icons/cert-error.svg
+++ b/application/basilisk/themes/shared/incontent-icons/cert-error.svg
diff --git a/browser/themes/shared/incontent-icons/icon-search-64.svg b/application/basilisk/themes/shared/incontent-icons/icon-search-64.svg
index 56ba96fff..56ba96fff 100644
--- a/browser/themes/shared/incontent-icons/icon-search-64.svg
+++ b/application/basilisk/themes/shared/incontent-icons/icon-search-64.svg
diff --git a/browser/themes/shared/incontent-icons/session-restore.svg b/application/basilisk/themes/shared/incontent-icons/session-restore.svg
index f545a3362..f545a3362 100644
--- a/browser/themes/shared/incontent-icons/session-restore.svg
+++ b/application/basilisk/themes/shared/incontent-icons/session-restore.svg
diff --git a/browser/themes/shared/incontent-icons/tab-crashed.svg b/application/basilisk/themes/shared/incontent-icons/tab-crashed.svg
index 41470df5c..41470df5c 100644
--- a/browser/themes/shared/incontent-icons/tab-crashed.svg
+++ b/application/basilisk/themes/shared/incontent-icons/tab-crashed.svg
diff --git a/browser/themes/shared/incontent-icons/welcome-back.svg b/application/basilisk/themes/shared/incontent-icons/welcome-back.svg
index 2fbea04b4..2fbea04b4 100644
--- a/browser/themes/shared/incontent-icons/welcome-back.svg
+++ b/application/basilisk/themes/shared/incontent-icons/welcome-back.svg
diff --git a/browser/themes/shared/incontent-icons/wifi.svg b/application/basilisk/themes/shared/incontent-icons/wifi.svg
index 39fd93623..39fd93623 100644
--- a/browser/themes/shared/incontent-icons/wifi.svg
+++ b/application/basilisk/themes/shared/incontent-icons/wifi.svg
diff --git a/browser/themes/shared/incontentprefs/containers.css b/application/basilisk/themes/shared/incontentprefs/containers.css
index 5446dccce..5446dccce 100644
--- a/browser/themes/shared/incontentprefs/containers.css
+++ b/application/basilisk/themes/shared/incontentprefs/containers.css
diff --git a/browser/themes/shared/incontentprefs/dialog.inc.css b/application/basilisk/themes/shared/incontentprefs/dialog.inc.css
index 27de416ab..27de416ab 100644
--- a/browser/themes/shared/incontentprefs/dialog.inc.css
+++ b/application/basilisk/themes/shared/incontentprefs/dialog.inc.css
diff --git a/browser/themes/shared/incontentprefs/favicon.ico b/application/basilisk/themes/shared/incontentprefs/favicon.ico
index 4d07d2b5d..4d07d2b5d 100644
--- a/browser/themes/shared/incontentprefs/favicon.ico
+++ b/application/basilisk/themes/shared/incontentprefs/favicon.ico
diff --git a/browser/themes/shared/incontentprefs/icons.svg b/application/basilisk/themes/shared/incontentprefs/icons.svg
index 2d0b67155..2d0b67155 100644
--- a/browser/themes/shared/incontentprefs/icons.svg
+++ b/application/basilisk/themes/shared/incontentprefs/icons.svg
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/application/basilisk/themes/shared/incontentprefs/preferences.inc.css
index 0e62660de..0e62660de 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/application/basilisk/themes/shared/incontentprefs/preferences.inc.css
diff --git a/browser/themes/shared/incontentprefs/search.css b/application/basilisk/themes/shared/incontentprefs/search.css
index f3c206b41..f3c206b41 100644
--- a/browser/themes/shared/incontentprefs/search.css
+++ b/application/basilisk/themes/shared/incontentprefs/search.css
diff --git a/browser/themes/shared/info.svg b/application/basilisk/themes/shared/info.svg
index 9ff38dd68..9ff38dd68 100644
--- a/browser/themes/shared/info.svg
+++ b/application/basilisk/themes/shared/info.svg
diff --git a/browser/themes/shared/jar.inc.mn b/application/basilisk/themes/shared/jar.inc.mn
index 588cf5364..588cf5364 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/application/basilisk/themes/shared/jar.inc.mn
diff --git a/browser/themes/shared/menuPanel-small.svg b/application/basilisk/themes/shared/menuPanel-small.svg
index db28992e2..db28992e2 100644
--- a/browser/themes/shared/menuPanel-small.svg
+++ b/application/basilisk/themes/shared/menuPanel-small.svg
diff --git a/browser/themes/shared/menuPanel.svg b/application/basilisk/themes/shared/menuPanel.svg
index e20f0197c..e20f0197c 100644
--- a/browser/themes/shared/menuPanel.svg
+++ b/application/basilisk/themes/shared/menuPanel.svg
diff --git a/browser/themes/shared/menupanel.inc.css b/application/basilisk/themes/shared/menupanel.inc.css
index 266e1c83e..266e1c83e 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/application/basilisk/themes/shared/menupanel.inc.css
diff --git a/browser/themes/shared/newtab/close.png b/application/basilisk/themes/shared/newtab/close.png
index ea6ada49e..ea6ada49e 100644
--- a/browser/themes/shared/newtab/close.png
+++ b/application/basilisk/themes/shared/newtab/close.png
diff --git a/browser/themes/shared/newtab/controls.svg b/application/basilisk/themes/shared/newtab/controls.svg
index 6eb00965d..6eb00965d 100644
--- a/browser/themes/shared/newtab/controls.svg
+++ b/application/basilisk/themes/shared/newtab/controls.svg
diff --git a/browser/themes/shared/newtab/newTab.inc.css b/application/basilisk/themes/shared/newtab/newTab.inc.css
index 8ecd603c9..8ecd603c9 100644
--- a/browser/themes/shared/newtab/newTab.inc.css
+++ b/application/basilisk/themes/shared/newtab/newTab.inc.css
diff --git a/browser/themes/shared/newtab/whimsycorn.png b/application/basilisk/themes/shared/newtab/whimsycorn.png
index 5c5c2f498..5c5c2f498 100644
--- a/browser/themes/shared/newtab/whimsycorn.png
+++ b/application/basilisk/themes/shared/newtab/whimsycorn.png
diff --git a/browser/themes/shared/notification-icons.inc.css b/application/basilisk/themes/shared/notification-icons.inc.css
index 86dce73a1..86dce73a1 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/application/basilisk/themes/shared/notification-icons.inc.css
diff --git a/browser/themes/shared/notification-icons.svg b/application/basilisk/themes/shared/notification-icons.svg
index 206157cf2..206157cf2 100644
--- a/browser/themes/shared/notification-icons.svg
+++ b/application/basilisk/themes/shared/notification-icons.svg
diff --git a/browser/themes/shared/panel-icons.svg b/application/basilisk/themes/shared/panel-icons.svg
index 2092e0f64..2092e0f64 100644
--- a/browser/themes/shared/panel-icons.svg
+++ b/application/basilisk/themes/shared/panel-icons.svg
diff --git a/browser/themes/shared/panic-panel/header-small.png b/application/basilisk/themes/shared/panic-panel/header-small.png
index ef1956fb8..ef1956fb8 100644
--- a/browser/themes/shared/panic-panel/header-small.png
+++ b/application/basilisk/themes/shared/panic-panel/header-small.png
diff --git a/browser/themes/shared/panic-panel/header-small@2x.png b/application/basilisk/themes/shared/panic-panel/header-small@2x.png
index ae445a4a9..ae445a4a9 100644
--- a/browser/themes/shared/panic-panel/header-small@2x.png
+++ b/application/basilisk/themes/shared/panic-panel/header-small@2x.png
diff --git a/browser/themes/shared/panic-panel/header.png b/application/basilisk/themes/shared/panic-panel/header.png
index edac3e6d6..edac3e6d6 100644
--- a/browser/themes/shared/panic-panel/header.png
+++ b/application/basilisk/themes/shared/panic-panel/header.png
diff --git a/browser/themes/shared/panic-panel/header@2x.png b/application/basilisk/themes/shared/panic-panel/header@2x.png
index f137928e5..f137928e5 100644
--- a/browser/themes/shared/panic-panel/header@2x.png
+++ b/application/basilisk/themes/shared/panic-panel/header@2x.png
diff --git a/browser/themes/shared/panic-panel/icons.png b/application/basilisk/themes/shared/panic-panel/icons.png
index f7f9a3e08..f7f9a3e08 100644
--- a/browser/themes/shared/panic-panel/icons.png
+++ b/application/basilisk/themes/shared/panic-panel/icons.png
diff --git a/browser/themes/shared/panic-panel/icons@2x.png b/application/basilisk/themes/shared/panic-panel/icons@2x.png
index 959ebf586..959ebf586 100644
--- a/browser/themes/shared/panic-panel/icons@2x.png
+++ b/application/basilisk/themes/shared/panic-panel/icons@2x.png
diff --git a/browser/themes/shared/plugin-doorhanger.inc.css b/application/basilisk/themes/shared/plugin-doorhanger.inc.css
index dd315bb8b..dd315bb8b 100644
--- a/browser/themes/shared/plugin-doorhanger.inc.css
+++ b/application/basilisk/themes/shared/plugin-doorhanger.inc.css
diff --git a/browser/themes/shared/preferences/containers.css b/application/basilisk/themes/shared/preferences/containers.css
index 3fb965331..3fb965331 100644
--- a/browser/themes/shared/preferences/containers.css
+++ b/application/basilisk/themes/shared/preferences/containers.css
diff --git a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css b/application/basilisk/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
index 923aa929b..923aa929b 100644
--- a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+++ b/application/basilisk/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
diff --git a/browser/themes/shared/privatebrowsing/attention.png b/application/basilisk/themes/shared/privatebrowsing/attention.png
index 8706928ff..8706928ff 100755..100644
--- a/browser/themes/shared/privatebrowsing/attention.png
+++ b/application/basilisk/themes/shared/privatebrowsing/attention.png
diff --git a/browser/themes/shared/privatebrowsing/attention@2x.png b/application/basilisk/themes/shared/privatebrowsing/attention@2x.png
index 5b32888c8..5b32888c8 100755..100644
--- a/browser/themes/shared/privatebrowsing/attention@2x.png
+++ b/application/basilisk/themes/shared/privatebrowsing/attention@2x.png
diff --git a/browser/themes/shared/privatebrowsing/check.png b/application/basilisk/themes/shared/privatebrowsing/check.png
index 59ca51b7b..59ca51b7b 100755..100644
--- a/browser/themes/shared/privatebrowsing/check.png
+++ b/application/basilisk/themes/shared/privatebrowsing/check.png
diff --git a/browser/themes/shared/privatebrowsing/check.svg b/application/basilisk/themes/shared/privatebrowsing/check.svg
index a8e4bcc2b..a8e4bcc2b 100644
--- a/browser/themes/shared/privatebrowsing/check.svg
+++ b/application/basilisk/themes/shared/privatebrowsing/check.svg
diff --git a/browser/themes/shared/privatebrowsing/check@2x.png b/application/basilisk/themes/shared/privatebrowsing/check@2x.png
index 031685cbf..031685cbf 100755..100644
--- a/browser/themes/shared/privatebrowsing/check@2x.png
+++ b/application/basilisk/themes/shared/privatebrowsing/check@2x.png
diff --git a/browser/themes/shared/privatebrowsing/favicon.svg b/application/basilisk/themes/shared/privatebrowsing/favicon.svg
index 6de9c6450..6de9c6450 100644
--- a/browser/themes/shared/privatebrowsing/favicon.svg
+++ b/application/basilisk/themes/shared/privatebrowsing/favicon.svg
diff --git a/browser/themes/shared/privatebrowsing/private-browsing.svg b/application/basilisk/themes/shared/privatebrowsing/private-browsing.svg
index cc37bc4f3..cc37bc4f3 100644
--- a/browser/themes/shared/privatebrowsing/private-browsing.svg
+++ b/application/basilisk/themes/shared/privatebrowsing/private-browsing.svg
diff --git a/browser/themes/shared/privatebrowsing/shield-page.png b/application/basilisk/themes/shared/privatebrowsing/shield-page.png
index 2ddcf34e9..2ddcf34e9 100755..100644
--- a/browser/themes/shared/privatebrowsing/shield-page.png
+++ b/application/basilisk/themes/shared/privatebrowsing/shield-page.png
diff --git a/browser/themes/shared/privatebrowsing/shield-page@2x.png b/application/basilisk/themes/shared/privatebrowsing/shield-page@2x.png
index 72a0b8273..72a0b8273 100755..100644
--- a/browser/themes/shared/privatebrowsing/shield-page@2x.png
+++ b/application/basilisk/themes/shared/privatebrowsing/shield-page@2x.png
diff --git a/browser/themes/shared/privatebrowsing/tracking-protection-off.svg b/application/basilisk/themes/shared/privatebrowsing/tracking-protection-off.svg
index 7da0ca78a..7da0ca78a 100644
--- a/browser/themes/shared/privatebrowsing/tracking-protection-off.svg
+++ b/application/basilisk/themes/shared/privatebrowsing/tracking-protection-off.svg
diff --git a/browser/themes/shared/privatebrowsing/tracking-protection.svg b/application/basilisk/themes/shared/privatebrowsing/tracking-protection.svg
index d22fe7df3..d22fe7df3 100644
--- a/browser/themes/shared/privatebrowsing/tracking-protection.svg
+++ b/application/basilisk/themes/shared/privatebrowsing/tracking-protection.svg
diff --git a/browser/themes/shared/reader/reader-mode-16.png b/application/basilisk/themes/shared/reader/reader-mode-16.png
index 12e2fd991..12e2fd991 100644
--- a/browser/themes/shared/reader/reader-mode-16.png
+++ b/application/basilisk/themes/shared/reader/reader-mode-16.png
diff --git a/browser/themes/shared/reader/reader-mode-16@2x.png b/application/basilisk/themes/shared/reader/reader-mode-16@2x.png
index 236f52d8f..236f52d8f 100644
--- a/browser/themes/shared/reader/reader-mode-16@2x.png
+++ b/application/basilisk/themes/shared/reader/reader-mode-16@2x.png
diff --git a/browser/themes/shared/reader/reader-tour.png b/application/basilisk/themes/shared/reader/reader-tour.png
index be346b384..be346b384 100644
--- a/browser/themes/shared/reader/reader-tour.png
+++ b/application/basilisk/themes/shared/reader/reader-tour.png
diff --git a/browser/themes/shared/reader/reader-tour@2x.png b/application/basilisk/themes/shared/reader/reader-tour@2x.png
index 1a60d93ca..1a60d93ca 100644
--- a/browser/themes/shared/reader/reader-tour@2x.png
+++ b/application/basilisk/themes/shared/reader/reader-tour@2x.png
diff --git a/browser/themes/shared/reader/readerMode.svg b/application/basilisk/themes/shared/reader/readerMode.svg
index 9293d1df2..9293d1df2 100644
--- a/browser/themes/shared/reader/readerMode.svg
+++ b/application/basilisk/themes/shared/reader/readerMode.svg
diff --git a/browser/themes/shared/search/badge-add-engine.png b/application/basilisk/themes/shared/search/badge-add-engine.png
index 226b7bf2b..226b7bf2b 100644
--- a/browser/themes/shared/search/badge-add-engine.png
+++ b/application/basilisk/themes/shared/search/badge-add-engine.png
diff --git a/browser/themes/shared/search/badge-add-engine@2x.png b/application/basilisk/themes/shared/search/badge-add-engine@2x.png
index abf084aad..abf084aad 100644
--- a/browser/themes/shared/search/badge-add-engine@2x.png
+++ b/application/basilisk/themes/shared/search/badge-add-engine@2x.png
diff --git a/browser/themes/shared/search/gear.svg b/application/basilisk/themes/shared/search/gear.svg
index b765f3dfe..b765f3dfe 100755..100644
--- a/browser/themes/shared/search/gear.svg
+++ b/application/basilisk/themes/shared/search/gear.svg
diff --git a/browser/themes/shared/search/history-icon.svg b/application/basilisk/themes/shared/search/history-icon.svg
index 213694a8b..213694a8b 100644
--- a/browser/themes/shared/search/history-icon.svg
+++ b/application/basilisk/themes/shared/search/history-icon.svg
diff --git a/browser/themes/shared/search/search-arrow-go.svg b/application/basilisk/themes/shared/search/search-arrow-go.svg
index 66d4bc913..66d4bc913 100644
--- a/browser/themes/shared/search/search-arrow-go.svg
+++ b/application/basilisk/themes/shared/search/search-arrow-go.svg
diff --git a/browser/themes/shared/search/search-engine-placeholder.png b/application/basilisk/themes/shared/search/search-engine-placeholder.png
index bff355bf4..bff355bf4 100644
--- a/browser/themes/shared/search/search-engine-placeholder.png
+++ b/application/basilisk/themes/shared/search/search-engine-placeholder.png
diff --git a/browser/themes/shared/search/search-engine-placeholder@2x.png b/application/basilisk/themes/shared/search/search-engine-placeholder@2x.png
index 1565fc55d..1565fc55d 100644
--- a/browser/themes/shared/search/search-engine-placeholder@2x.png
+++ b/application/basilisk/themes/shared/search/search-engine-placeholder@2x.png
diff --git a/browser/themes/shared/search/search-indicator-badge-add.png b/application/basilisk/themes/shared/search/search-indicator-badge-add.png
index 62bf01b3d..62bf01b3d 100644
--- a/browser/themes/shared/search/search-indicator-badge-add.png
+++ b/application/basilisk/themes/shared/search/search-indicator-badge-add.png
diff --git a/browser/themes/shared/search/search-indicator-badge-add@2x.png b/application/basilisk/themes/shared/search/search-indicator-badge-add@2x.png
index 81056248f..81056248f 100644
--- a/browser/themes/shared/search/search-indicator-badge-add@2x.png
+++ b/application/basilisk/themes/shared/search/search-indicator-badge-add@2x.png
diff --git a/browser/themes/shared/search/search-indicator-magnifying-glass.svg b/application/basilisk/themes/shared/search/search-indicator-magnifying-glass.svg
index 15bddfba4..15bddfba4 100644
--- a/browser/themes/shared/search/search-indicator-magnifying-glass.svg
+++ b/application/basilisk/themes/shared/search/search-indicator-magnifying-glass.svg
diff --git a/browser/themes/shared/search/search-indicator.png b/application/basilisk/themes/shared/search/search-indicator.png
index a4eab0d7a..a4eab0d7a 100644
--- a/browser/themes/shared/search/search-indicator.png
+++ b/application/basilisk/themes/shared/search/search-indicator.png
diff --git a/browser/themes/shared/search/search-indicator@2x.png b/application/basilisk/themes/shared/search/search-indicator@2x.png
index 2722c1697..2722c1697 100644
--- a/browser/themes/shared/search/search-indicator@2x.png
+++ b/application/basilisk/themes/shared/search/search-indicator@2x.png
diff --git a/browser/themes/shared/searchReset.css b/application/basilisk/themes/shared/searchReset.css
index 3573d7d15..3573d7d15 100644
--- a/browser/themes/shared/searchReset.css
+++ b/application/basilisk/themes/shared/searchReset.css
diff --git a/browser/themes/shared/sync-desktopIcon.svg b/application/basilisk/themes/shared/sync-desktopIcon.svg
index d3279a984..d3279a984 100644
--- a/browser/themes/shared/sync-desktopIcon.svg
+++ b/application/basilisk/themes/shared/sync-desktopIcon.svg
diff --git a/browser/themes/shared/sync-mobileIcon.svg b/application/basilisk/themes/shared/sync-mobileIcon.svg
index df19994f8..df19994f8 100644
--- a/browser/themes/shared/sync-mobileIcon.svg
+++ b/application/basilisk/themes/shared/sync-mobileIcon.svg
diff --git a/browser/themes/shared/syncedtabs/sidebar.inc.css b/application/basilisk/themes/shared/syncedtabs/sidebar.inc.css
index 4e76a7fc5..4e76a7fc5 100644
--- a/browser/themes/shared/syncedtabs/sidebar.inc.css
+++ b/application/basilisk/themes/shared/syncedtabs/sidebar.inc.css
diff --git a/browser/themes/shared/tab-selected.svg b/application/basilisk/themes/shared/tab-selected.svg
index ca66d8116..ca66d8116 100644
--- a/browser/themes/shared/tab-selected.svg
+++ b/application/basilisk/themes/shared/tab-selected.svg
diff --git a/browser/themes/shared/tabbrowser/connecting.png b/application/basilisk/themes/shared/tabbrowser/connecting.png
index e564fb570..e564fb570 100644
--- a/browser/themes/shared/tabbrowser/connecting.png
+++ b/application/basilisk/themes/shared/tabbrowser/connecting.png
diff --git a/browser/themes/shared/tabbrowser/connecting@2x.png b/application/basilisk/themes/shared/tabbrowser/connecting@2x.png
index 97e2b2eb6..97e2b2eb6 100644
--- a/browser/themes/shared/tabbrowser/connecting@2x.png
+++ b/application/basilisk/themes/shared/tabbrowser/connecting@2x.png
diff --git a/browser/themes/shared/tabbrowser/crashed.svg b/application/basilisk/themes/shared/tabbrowser/crashed.svg
index 85f3d8514..85f3d8514 100644
--- a/browser/themes/shared/tabbrowser/crashed.svg
+++ b/application/basilisk/themes/shared/tabbrowser/crashed.svg
diff --git a/browser/themes/shared/tabbrowser/pendingpaint.png b/application/basilisk/themes/shared/tabbrowser/pendingpaint.png
index 7bbf0fe4b..7bbf0fe4b 100644
--- a/browser/themes/shared/tabbrowser/pendingpaint.png
+++ b/application/basilisk/themes/shared/tabbrowser/pendingpaint.png
diff --git a/browser/themes/shared/tabbrowser/tab-audio-small.svg b/application/basilisk/themes/shared/tabbrowser/tab-audio-small.svg
index abfe71268..abfe71268 100644
--- a/browser/themes/shared/tabbrowser/tab-audio-small.svg
+++ b/application/basilisk/themes/shared/tabbrowser/tab-audio-small.svg
diff --git a/browser/themes/shared/tabbrowser/tab-audio.svg b/application/basilisk/themes/shared/tabbrowser/tab-audio.svg
index 274e10c29..274e10c29 100644
--- a/browser/themes/shared/tabbrowser/tab-audio.svg
+++ b/application/basilisk/themes/shared/tabbrowser/tab-audio.svg
diff --git a/browser/themes/shared/tabbrowser/tab-overflow-indicator.png b/application/basilisk/themes/shared/tabbrowser/tab-overflow-indicator.png
index 17d27c99e..17d27c99e 100644
--- a/browser/themes/shared/tabbrowser/tab-overflow-indicator.png
+++ b/application/basilisk/themes/shared/tabbrowser/tab-overflow-indicator.png
diff --git a/browser/themes/shared/tabs.inc.css b/application/basilisk/themes/shared/tabs.inc.css
index c505416e4..c505416e4 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/application/basilisk/themes/shared/tabs.inc.css
diff --git a/browser/themes/shared/theme-switcher-icon.png b/application/basilisk/themes/shared/theme-switcher-icon.png
index 891e7afb1..891e7afb1 100644
--- a/browser/themes/shared/theme-switcher-icon.png
+++ b/application/basilisk/themes/shared/theme-switcher-icon.png
diff --git a/browser/themes/shared/theme-switcher-icon@2x.png b/application/basilisk/themes/shared/theme-switcher-icon@2x.png
index 286adfeaa..286adfeaa 100644
--- a/browser/themes/shared/theme-switcher-icon@2x.png
+++ b/application/basilisk/themes/shared/theme-switcher-icon@2x.png
diff --git a/browser/themes/shared/toolbarbutton-dropdown-arrow.png b/application/basilisk/themes/shared/toolbarbutton-dropdown-arrow.png
index 08d9da1d1..08d9da1d1 100644
--- a/browser/themes/shared/toolbarbutton-dropdown-arrow.png
+++ b/application/basilisk/themes/shared/toolbarbutton-dropdown-arrow.png
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/application/basilisk/themes/shared/toolbarbuttons.inc.css
index c043b8192..c043b8192 100644
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/application/basilisk/themes/shared/toolbarbuttons.inc.css
diff --git a/browser/themes/shared/translation/infobar.inc.css b/application/basilisk/themes/shared/translation/infobar.inc.css
index 50d1acc01..50d1acc01 100644
--- a/browser/themes/shared/translation/infobar.inc.css
+++ b/application/basilisk/themes/shared/translation/infobar.inc.css
diff --git a/browser/themes/shared/translation/translating-16.png b/application/basilisk/themes/shared/translation/translating-16.png
index 71ca37c22..71ca37c22 100644
--- a/browser/themes/shared/translation/translating-16.png
+++ b/application/basilisk/themes/shared/translation/translating-16.png
diff --git a/browser/themes/shared/translation/translating-16@2x.png b/application/basilisk/themes/shared/translation/translating-16@2x.png
index ab6184047..ab6184047 100644
--- a/browser/themes/shared/translation/translating-16@2x.png
+++ b/application/basilisk/themes/shared/translation/translating-16@2x.png
diff --git a/browser/themes/shared/translation/translation-16.png b/application/basilisk/themes/shared/translation/translation-16.png
index 4b42dedcf..4b42dedcf 100644
--- a/browser/themes/shared/translation/translation-16.png
+++ b/application/basilisk/themes/shared/translation/translation-16.png
diff --git a/browser/themes/shared/translation/translation-16@2x.png b/application/basilisk/themes/shared/translation/translation-16@2x.png
index 2105a3e4a..2105a3e4a 100644
--- a/browser/themes/shared/translation/translation-16@2x.png
+++ b/application/basilisk/themes/shared/translation/translation-16@2x.png
diff --git a/browser/themes/shared/undoCloseTab.png b/application/basilisk/themes/shared/undoCloseTab.png
index 1d629c82c..1d629c82c 100644
--- a/browser/themes/shared/undoCloseTab.png
+++ b/application/basilisk/themes/shared/undoCloseTab.png
diff --git a/browser/themes/shared/undoCloseTab@2x.png b/application/basilisk/themes/shared/undoCloseTab@2x.png
index 4854c5681..4854c5681 100644
--- a/browser/themes/shared/undoCloseTab@2x.png
+++ b/application/basilisk/themes/shared/undoCloseTab@2x.png
diff --git a/browser/themes/shared/update-badge-failed.svg b/application/basilisk/themes/shared/update-badge-failed.svg
index e31e6ec6b..e31e6ec6b 100644
--- a/browser/themes/shared/update-badge-failed.svg
+++ b/application/basilisk/themes/shared/update-badge-failed.svg
diff --git a/browser/themes/shared/update-badge.svg b/application/basilisk/themes/shared/update-badge.svg
index 3b692e526..3b692e526 100644
--- a/browser/themes/shared/update-badge.svg
+++ b/application/basilisk/themes/shared/update-badge.svg
diff --git a/browser/themes/shared/urlbar-star.svg b/application/basilisk/themes/shared/urlbar-star.svg
index 3080aca1a..3080aca1a 100644
--- a/browser/themes/shared/urlbar-star.svg
+++ b/application/basilisk/themes/shared/urlbar-star.svg
diff --git a/browser/themes/shared/urlbar-tab.svg b/application/basilisk/themes/shared/urlbar-tab.svg
index 87a2c7f12..87a2c7f12 100644
--- a/browser/themes/shared/urlbar-tab.svg
+++ b/application/basilisk/themes/shared/urlbar-tab.svg
diff --git a/browser/themes/shared/urlbarSearchSuggestionsNotification.inc.css b/application/basilisk/themes/shared/urlbarSearchSuggestionsNotification.inc.css
index a34c2bf11..a34c2bf11 100644
--- a/browser/themes/shared/urlbarSearchSuggestionsNotification.inc.css
+++ b/application/basilisk/themes/shared/urlbarSearchSuggestionsNotification.inc.css
diff --git a/browser/themes/shared/warning-white.svg b/application/basilisk/themes/shared/warning-white.svg
index 942c23cf6..942c23cf6 100644
--- a/browser/themes/shared/warning-white.svg
+++ b/application/basilisk/themes/shared/warning-white.svg
diff --git a/browser/themes/shared/warning.svg b/application/basilisk/themes/shared/warning.svg
index 7befd73d9..7befd73d9 100644
--- a/browser/themes/shared/warning.svg
+++ b/application/basilisk/themes/shared/warning.svg
diff --git a/browser/themes/shared/webrtc/camera-white-16.png b/application/basilisk/themes/shared/webrtc/camera-white-16.png
index e1e360bd8..e1e360bd8 100644
--- a/browser/themes/shared/webrtc/camera-white-16.png
+++ b/application/basilisk/themes/shared/webrtc/camera-white-16.png
diff --git a/browser/themes/shared/webrtc/camera-white-16@2x.png b/application/basilisk/themes/shared/webrtc/camera-white-16@2x.png
index ddbbf5083..ddbbf5083 100644
--- a/browser/themes/shared/webrtc/camera-white-16@2x.png
+++ b/application/basilisk/themes/shared/webrtc/camera-white-16@2x.png
diff --git a/browser/themes/shared/webrtc/microphone-white-16.png b/application/basilisk/themes/shared/webrtc/microphone-white-16.png
index 0091529ba..0091529ba 100644
--- a/browser/themes/shared/webrtc/microphone-white-16.png
+++ b/application/basilisk/themes/shared/webrtc/microphone-white-16.png
diff --git a/browser/themes/shared/webrtc/microphone-white-16@2x.png b/application/basilisk/themes/shared/webrtc/microphone-white-16@2x.png
index 5bf1f5c62..5bf1f5c62 100644
--- a/browser/themes/shared/webrtc/microphone-white-16@2x.png
+++ b/application/basilisk/themes/shared/webrtc/microphone-white-16@2x.png
diff --git a/browser/themes/shared/webrtc/screen-white-16.png b/application/basilisk/themes/shared/webrtc/screen-white-16.png
index 045bfd35a..045bfd35a 100644
--- a/browser/themes/shared/webrtc/screen-white-16.png
+++ b/application/basilisk/themes/shared/webrtc/screen-white-16.png
diff --git a/browser/themes/shared/webrtc/screen-white-16@2x.png b/application/basilisk/themes/shared/webrtc/screen-white-16@2x.png
index 1e5fca5d6..1e5fca5d6 100644
--- a/browser/themes/shared/webrtc/screen-white-16@2x.png
+++ b/application/basilisk/themes/shared/webrtc/screen-white-16@2x.png
diff --git a/browser/themes/tab-svgs.mozbuild b/application/basilisk/themes/tab-svgs.mozbuild
index b1259b04e..5601ac85a 100644
--- a/browser/themes/tab-svgs.mozbuild
+++ b/application/basilisk/themes/tab-svgs.mozbuild
@@ -4,8 +4,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/.
 
-script = '/browser/themes/preprocess-tab-svgs.py'
-input = ['/browser/themes/shared/tab-selected.svg']
+script = '/application/basilisk/themes/preprocess-tab-svgs.py'
+input = ['/application/basilisk/themes/shared/tab-selected.svg']
 
 # Context variables can't be used inside functions, so hack around that.
 generated_files = GENERATED_FILES
diff --git a/browser/themes/windows/Info.png b/application/basilisk/themes/windows/Info.png
index f5dfb65a3..f5dfb65a3 100644
--- a/browser/themes/windows/Info.png
+++ b/application/basilisk/themes/windows/Info.png
diff --git a/browser/themes/windows/Privacy-16.png b/application/basilisk/themes/windows/Privacy-16.png
index ff0c565a8..ff0c565a8 100644
--- a/browser/themes/windows/Privacy-16.png
+++ b/application/basilisk/themes/windows/Privacy-16.png
diff --git a/browser/themes/windows/Toolbar-inverted.png b/application/basilisk/themes/windows/Toolbar-inverted.png
index 2311803d8..2311803d8 100644
--- a/browser/themes/windows/Toolbar-inverted.png
+++ b/application/basilisk/themes/windows/Toolbar-inverted.png
diff --git a/browser/themes/windows/Toolbar-inverted@2x.png b/application/basilisk/themes/windows/Toolbar-inverted@2x.png
index 289c57380..289c57380 100644
--- a/browser/themes/windows/Toolbar-inverted@2x.png
+++ b/application/basilisk/themes/windows/Toolbar-inverted@2x.png
diff --git a/browser/themes/windows/Toolbar-win7.png b/application/basilisk/themes/windows/Toolbar-win7.png
index b191ce2aa..b191ce2aa 100644
--- a/browser/themes/windows/Toolbar-win7.png
+++ b/application/basilisk/themes/windows/Toolbar-win7.png
diff --git a/browser/themes/windows/Toolbar-win7@2x.png b/application/basilisk/themes/windows/Toolbar-win7@2x.png
index 033d87dff..033d87dff 100644
--- a/browser/themes/windows/Toolbar-win7@2x.png
+++ b/application/basilisk/themes/windows/Toolbar-win7@2x.png
diff --git a/browser/themes/windows/Toolbar-win8.png b/application/basilisk/themes/windows/Toolbar-win8.png
index 7e06de7f1..7e06de7f1 100644
--- a/browser/themes/windows/Toolbar-win8.png
+++ b/application/basilisk/themes/windows/Toolbar-win8.png
diff --git a/browser/themes/windows/Toolbar-win8@2x.png b/application/basilisk/themes/windows/Toolbar-win8@2x.png
index 6b205ea6f..6b205ea6f 100644
--- a/browser/themes/windows/Toolbar-win8@2x.png
+++ b/application/basilisk/themes/windows/Toolbar-win8@2x.png
diff --git a/browser/themes/windows/Toolbar.png b/application/basilisk/themes/windows/Toolbar.png
index 4ae11be4d..4ae11be4d 100644
--- a/browser/themes/windows/Toolbar.png
+++ b/application/basilisk/themes/windows/Toolbar.png
diff --git a/browser/themes/windows/Toolbar@2x.png b/application/basilisk/themes/windows/Toolbar@2x.png
index 33c63fdbb..33c63fdbb 100644
--- a/browser/themes/windows/Toolbar@2x.png
+++ b/application/basilisk/themes/windows/Toolbar@2x.png
diff --git a/browser/themes/windows/aboutSessionRestore-window-icon.png b/application/basilisk/themes/windows/aboutSessionRestore-window-icon.png
index c2d15ad7b..c2d15ad7b 100644
--- a/browser/themes/windows/aboutSessionRestore-window-icon.png
+++ b/application/basilisk/themes/windows/aboutSessionRestore-window-icon.png
diff --git a/browser/themes/windows/aboutSyncTabs.css b/application/basilisk/themes/windows/aboutSyncTabs.css
index 4cedad649..4cedad649 100644
--- a/browser/themes/windows/aboutSyncTabs.css
+++ b/application/basilisk/themes/windows/aboutSyncTabs.css
diff --git a/browser/themes/windows/actionicon-tab-win7.png b/application/basilisk/themes/windows/actionicon-tab-win7.png
index 8437c7655..8437c7655 100644
--- a/browser/themes/windows/actionicon-tab-win7.png
+++ b/application/basilisk/themes/windows/actionicon-tab-win7.png
diff --git a/browser/themes/windows/actionicon-tab.png b/application/basilisk/themes/windows/actionicon-tab.png
index 52169a480..52169a480 100644
--- a/browser/themes/windows/actionicon-tab.png
+++ b/application/basilisk/themes/windows/actionicon-tab.png
diff --git a/browser/themes/windows/actionicon-tab@2x.png b/application/basilisk/themes/windows/actionicon-tab@2x.png
index 6a4be3741..6a4be3741 100644
--- a/browser/themes/windows/actionicon-tab@2x.png
+++ b/application/basilisk/themes/windows/actionicon-tab@2x.png
diff --git a/browser/themes/windows/browser-aero.css b/application/basilisk/themes/windows/browser-aero.css
index dbac6bb7a..dbac6bb7a 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/application/basilisk/themes/windows/browser-aero.css
diff --git a/browser/themes/windows/browser-lightweightTheme.css b/application/basilisk/themes/windows/browser-lightweightTheme.css
index d2a1b840c..d2a1b840c 100644
--- a/browser/themes/windows/browser-lightweightTheme.css
+++ b/application/basilisk/themes/windows/browser-lightweightTheme.css
diff --git a/browser/themes/windows/browser.css b/application/basilisk/themes/windows/browser.css
index b364dbc36..2ed3e7e6a 100644
--- a/browser/themes/windows/browser.css
+++ b/application/basilisk/themes/windows/browser.css
@@ -2254,8 +2254,8 @@ notification[value="translation"] {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../devtools/client/themes/commandline.inc.css
+%include ../../../../devtools/client/themes/responsivedesign.inc.css
+%include ../../../../devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 notification.pluginVulnerable > .notification-inner > .messageCloseButton {
@@ -2328,14 +2328,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton {
   border-bottom: 1px solid @toolbarShadowColor@;
 }
 
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] {
-  margin-right: -2px;
-}
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
-  margin-left: -2px;
-}
-
 /* End customization mode */
 
 /* Private browsing indicators */
@@ -2422,18 +2414,6 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton {
 
 /* End private browsing indicators */
 
-%include ../shared/UITour.inc.css
-
-#UITourTooltipButtons {
-  /**
-   * Override the --arrowpanel-padding so the background extends
-   * to the sides and bottom of the panel.
-   */
-  margin-left: -10px;
-  margin-right: -10px;
-  margin-bottom: -10px;
-}
-
 %include ../shared/contextmenu.inc.css
 
 #context-navigation {
diff --git a/browser/themes/windows/caption-buttons.svg b/application/basilisk/themes/windows/caption-buttons.svg
index 9cb42d539..9cb42d539 100644
--- a/browser/themes/windows/caption-buttons.svg
+++ b/application/basilisk/themes/windows/caption-buttons.svg
diff --git a/browser/themes/windows/click-to-play-warning-stripes.png b/application/basilisk/themes/windows/click-to-play-warning-stripes.png
index cb4b71e50..cb4b71e50 100644
--- a/browser/themes/windows/click-to-play-warning-stripes.png
+++ b/application/basilisk/themes/windows/click-to-play-warning-stripes.png
diff --git a/browser/themes/windows/communicator/communicator.css b/application/basilisk/themes/windows/communicator/communicator.css
index 0b57574fd..0b57574fd 100644
--- a/browser/themes/windows/communicator/communicator.css
+++ b/application/basilisk/themes/windows/communicator/communicator.css
diff --git a/browser/themes/windows/communicator/jar.mn b/application/basilisk/themes/windows/communicator/jar.mn
index dfd20c523..dfd20c523 100644
--- a/browser/themes/windows/communicator/jar.mn
+++ b/application/basilisk/themes/windows/communicator/jar.mn
diff --git a/browser/themes/windows/communicator/moz.build b/application/basilisk/themes/windows/communicator/moz.build
index eb4454d28..eb4454d28 100644
--- a/browser/themes/windows/communicator/moz.build
+++ b/application/basilisk/themes/windows/communicator/moz.build
diff --git a/browser/themes/windows/content-contextmenu.svg b/application/basilisk/themes/windows/content-contextmenu.svg
index b72b24708..b72b24708 100644
--- a/browser/themes/windows/content-contextmenu.svg
+++ b/application/basilisk/themes/windows/content-contextmenu.svg
diff --git a/browser/themes/windows/controlcenter/panel.css b/application/basilisk/themes/windows/controlcenter/panel.css
index fab9aa3a4..fab9aa3a4 100644
--- a/browser/themes/windows/controlcenter/panel.css
+++ b/application/basilisk/themes/windows/controlcenter/panel.css
diff --git a/browser/themes/windows/customizableui/background-noise-toolbar.png b/application/basilisk/themes/windows/customizableui/background-noise-toolbar.png
index d09ba9daf..d09ba9daf 100644
--- a/browser/themes/windows/customizableui/background-noise-toolbar.png
+++ b/application/basilisk/themes/windows/customizableui/background-noise-toolbar.png
diff --git a/browser/themes/windows/customizableui/customize-titleBar-toggle.png b/application/basilisk/themes/windows/customizableui/customize-titleBar-toggle.png
index 3cf9f163d..3cf9f163d 100644
--- a/browser/themes/windows/customizableui/customize-titleBar-toggle.png
+++ b/application/basilisk/themes/windows/customizableui/customize-titleBar-toggle.png
diff --git a/browser/themes/windows/customizableui/customize-titleBar-toggle@2x.png b/application/basilisk/themes/windows/customizableui/customize-titleBar-toggle@2x.png
index 8e1beaec5..8e1beaec5 100644
--- a/browser/themes/windows/customizableui/customize-titleBar-toggle@2x.png
+++ b/application/basilisk/themes/windows/customizableui/customize-titleBar-toggle@2x.png
diff --git a/browser/themes/windows/customizableui/customizeMode-gridTexture.png b/application/basilisk/themes/windows/customizableui/customizeMode-gridTexture.png
index ca6c1196c..ca6c1196c 100644
--- a/browser/themes/windows/customizableui/customizeMode-gridTexture.png
+++ b/application/basilisk/themes/windows/customizableui/customizeMode-gridTexture.png
diff --git a/browser/themes/windows/customizableui/customizeMode-separatorHorizontal.png b/application/basilisk/themes/windows/customizableui/customizeMode-separatorHorizontal.png
index 5e17cb4db..5e17cb4db 100644
--- a/browser/themes/windows/customizableui/customizeMode-separatorHorizontal.png
+++ b/application/basilisk/themes/windows/customizableui/customizeMode-separatorHorizontal.png
diff --git a/browser/themes/windows/customizableui/customizeMode-separatorVertical.png b/application/basilisk/themes/windows/customizableui/customizeMode-separatorVertical.png
index dc4caee81..dc4caee81 100644
--- a/browser/themes/windows/customizableui/customizeMode-separatorVertical.png
+++ b/application/basilisk/themes/windows/customizableui/customizeMode-separatorVertical.png
diff --git a/browser/themes/windows/customizableui/menu-arrow.svg b/application/basilisk/themes/windows/customizableui/menu-arrow.svg
index 8437779fd..8437779fd 100644
--- a/browser/themes/windows/customizableui/menu-arrow.svg
+++ b/application/basilisk/themes/windows/customizableui/menu-arrow.svg
diff --git a/browser/themes/windows/customizableui/panelUI.css b/application/basilisk/themes/windows/customizableui/panelUI.css
index a01a2f3e3..a01a2f3e3 100644
--- a/browser/themes/windows/customizableui/panelUI.css
+++ b/application/basilisk/themes/windows/customizableui/panelUI.css
diff --git a/browser/themes/windows/devedition.css b/application/basilisk/themes/windows/devedition.css
index bdf4bb80e..bdf4bb80e 100644
--- a/browser/themes/windows/devedition.css
+++ b/application/basilisk/themes/windows/devedition.css
diff --git a/browser/themes/windows/downloads/allDownloadsViewOverlay.css b/application/basilisk/themes/windows/downloads/allDownloadsViewOverlay.css
index 0ee83f669..0ee83f669 100644
--- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css
+++ b/application/basilisk/themes/windows/downloads/allDownloadsViewOverlay.css
diff --git a/browser/themes/windows/downloads/download-glow-menuPanel-win7.png b/application/basilisk/themes/windows/downloads/download-glow-menuPanel-win7.png
index 7ff7e6a03..7ff7e6a03 100644
--- a/browser/themes/windows/downloads/download-glow-menuPanel-win7.png
+++ b/application/basilisk/themes/windows/downloads/download-glow-menuPanel-win7.png
diff --git a/browser/themes/windows/downloads/download-glow-menuPanel.png b/application/basilisk/themes/windows/downloads/download-glow-menuPanel.png
index d05b07b57..d05b07b57 100644
--- a/browser/themes/windows/downloads/download-glow-menuPanel.png
+++ b/application/basilisk/themes/windows/downloads/download-glow-menuPanel.png
diff --git a/browser/themes/windows/downloads/download-glow-win7.png b/application/basilisk/themes/windows/downloads/download-glow-win7.png
index e7415e83d..e7415e83d 100644
--- a/browser/themes/windows/downloads/download-glow-win7.png
+++ b/application/basilisk/themes/windows/downloads/download-glow-win7.png
diff --git a/browser/themes/windows/downloads/download-glow.png b/application/basilisk/themes/windows/downloads/download-glow.png
index 1239ada52..1239ada52 100644
--- a/browser/themes/windows/downloads/download-glow.png
+++ b/application/basilisk/themes/windows/downloads/download-glow.png
diff --git a/browser/themes/windows/downloads/download-notification-finish.png b/application/basilisk/themes/windows/downloads/download-notification-finish.png
index 2ef1420ad..2ef1420ad 100644
--- a/browser/themes/windows/downloads/download-notification-finish.png
+++ b/application/basilisk/themes/windows/downloads/download-notification-finish.png
diff --git a/browser/themes/windows/downloads/download-notification-start.png b/application/basilisk/themes/windows/downloads/download-notification-start.png
index a2fca743b..a2fca743b 100644
--- a/browser/themes/windows/downloads/download-notification-start.png
+++ b/application/basilisk/themes/windows/downloads/download-notification-start.png
diff --git a/browser/themes/windows/downloads/downloads.css b/application/basilisk/themes/windows/downloads/downloads.css
index 4b60da149..4b60da149 100644
--- a/browser/themes/windows/downloads/downloads.css
+++ b/application/basilisk/themes/windows/downloads/downloads.css
diff --git a/browser/themes/windows/downloads/indicator.css b/application/basilisk/themes/windows/downloads/indicator.css
index 7f921f8de..7f921f8de 100644
--- a/browser/themes/windows/downloads/indicator.css
+++ b/application/basilisk/themes/windows/downloads/indicator.css
diff --git a/browser/themes/windows/feeds/feedIcon.png b/application/basilisk/themes/windows/feeds/feedIcon.png
index 59b22d8a2..59b22d8a2 100644
--- a/browser/themes/windows/feeds/feedIcon.png
+++ b/application/basilisk/themes/windows/feeds/feedIcon.png
diff --git a/browser/themes/windows/feeds/feedIcon16.png b/application/basilisk/themes/windows/feeds/feedIcon16.png
index 071979903..071979903 100644
--- a/browser/themes/windows/feeds/feedIcon16.png
+++ b/application/basilisk/themes/windows/feeds/feedIcon16.png
diff --git a/browser/themes/windows/feeds/subscribe-ui.css b/application/basilisk/themes/windows/feeds/subscribe-ui.css
index f1650036e..f1650036e 100644
--- a/browser/themes/windows/feeds/subscribe-ui.css
+++ b/application/basilisk/themes/windows/feeds/subscribe-ui.css
diff --git a/browser/themes/windows/feeds/subscribe.css b/application/basilisk/themes/windows/feeds/subscribe.css
index 81168a144..81168a144 100644
--- a/browser/themes/windows/feeds/subscribe.css
+++ b/application/basilisk/themes/windows/feeds/subscribe.css
diff --git a/browser/themes/windows/jar.mn b/application/basilisk/themes/windows/jar.mn
index e8db7eed2..e8db7eed2 100644
--- a/browser/themes/windows/jar.mn
+++ b/application/basilisk/themes/windows/jar.mn
diff --git a/browser/themes/windows/keyhole-forward-mask.svg b/application/basilisk/themes/windows/keyhole-forward-mask.svg
index 051f6d87c..051f6d87c 100644
--- a/browser/themes/windows/keyhole-forward-mask.svg
+++ b/application/basilisk/themes/windows/keyhole-forward-mask.svg
diff --git a/browser/themes/windows/livemark-folder.png b/application/basilisk/themes/windows/livemark-folder.png
index 0be774e63..0be774e63 100644
--- a/browser/themes/windows/livemark-folder.png
+++ b/application/basilisk/themes/windows/livemark-folder.png
diff --git a/browser/themes/windows/loop/toolbar-win10.png b/application/basilisk/themes/windows/loop/toolbar-win10.png
index 59337608d..59337608d 100644
--- a/browser/themes/windows/loop/toolbar-win10.png
+++ b/application/basilisk/themes/windows/loop/toolbar-win10.png
diff --git a/browser/themes/windows/loop/toolbar-win10@2x.png b/application/basilisk/themes/windows/loop/toolbar-win10@2x.png
index b87e1ffa3..b87e1ffa3 100644
--- a/browser/themes/windows/loop/toolbar-win10@2x.png
+++ b/application/basilisk/themes/windows/loop/toolbar-win10@2x.png
diff --git a/browser/themes/windows/menu-back.png b/application/basilisk/themes/windows/menu-back.png
index 7c1d4620a..7c1d4620a 100644
--- a/browser/themes/windows/menu-back.png
+++ b/application/basilisk/themes/windows/menu-back.png
diff --git a/browser/themes/windows/menu-forward.png b/application/basilisk/themes/windows/menu-forward.png
index 82cd87483..82cd87483 100644
--- a/browser/themes/windows/menu-forward.png
+++ b/application/basilisk/themes/windows/menu-forward.png
diff --git a/browser/themes/windows/menuPanel-customize.png b/application/basilisk/themes/windows/menuPanel-customize.png
index 161426f89..161426f89 100644
--- a/browser/themes/windows/menuPanel-customize.png
+++ b/application/basilisk/themes/windows/menuPanel-customize.png
diff --git a/browser/themes/windows/menuPanel-customize@2x.png b/application/basilisk/themes/windows/menuPanel-customize@2x.png
index 5ce3b766a..5ce3b766a 100644
--- a/browser/themes/windows/menuPanel-customize@2x.png
+++ b/application/basilisk/themes/windows/menuPanel-customize@2x.png
diff --git a/browser/themes/windows/menuPanel-exit.png b/application/basilisk/themes/windows/menuPanel-exit.png
index 8daaffe95..8daaffe95 100644
--- a/browser/themes/windows/menuPanel-exit.png
+++ b/application/basilisk/themes/windows/menuPanel-exit.png
diff --git a/browser/themes/windows/menuPanel-exit@2x.png b/application/basilisk/themes/windows/menuPanel-exit@2x.png
index d48426546..d48426546 100644
--- a/browser/themes/windows/menuPanel-exit@2x.png
+++ b/application/basilisk/themes/windows/menuPanel-exit@2x.png
diff --git a/browser/themes/windows/menuPanel-help.png b/application/basilisk/themes/windows/menuPanel-help.png
index 2f2b010bc..2f2b010bc 100644
--- a/browser/themes/windows/menuPanel-help.png
+++ b/application/basilisk/themes/windows/menuPanel-help.png
diff --git a/browser/themes/windows/menuPanel-help@2x.png b/application/basilisk/themes/windows/menuPanel-help@2x.png
index b8f0a80fa..b8f0a80fa 100644
--- a/browser/themes/windows/menuPanel-help@2x.png
+++ b/application/basilisk/themes/windows/menuPanel-help@2x.png
diff --git a/browser/themes/windows/monitor.png b/application/basilisk/themes/windows/monitor.png
index 3c26d2674..3c26d2674 100644
--- a/browser/themes/windows/monitor.png
+++ b/application/basilisk/themes/windows/monitor.png
diff --git a/browser/themes/windows/monitor_16-10.png b/application/basilisk/themes/windows/monitor_16-10.png
index 06d91ea37..06d91ea37 100644
--- a/browser/themes/windows/monitor_16-10.png
+++ b/application/basilisk/themes/windows/monitor_16-10.png
diff --git a/browser/themes/windows/moz.build b/application/basilisk/themes/windows/moz.build
index b787ab08e..b787ab08e 100644
--- a/browser/themes/windows/moz.build
+++ b/application/basilisk/themes/windows/moz.build
diff --git a/browser/themes/windows/newtab/newTab.css b/application/basilisk/themes/windows/newtab/newTab.css
index 0f7aae6de..0f7aae6de 100644
--- a/browser/themes/windows/newtab/newTab.css
+++ b/application/basilisk/themes/windows/newtab/newTab.css
diff --git a/browser/themes/windows/pageInfo.css b/application/basilisk/themes/windows/pageInfo.css
index 97d7615c1..97d7615c1 100644
--- a/browser/themes/windows/pageInfo.css
+++ b/application/basilisk/themes/windows/pageInfo.css
diff --git a/browser/themes/windows/pageInfo.png b/application/basilisk/themes/windows/pageInfo.png
index bc1b97c55..bc1b97c55 100644
--- a/browser/themes/windows/pageInfo.png
+++ b/application/basilisk/themes/windows/pageInfo.png
diff --git a/browser/themes/windows/places/allBookmarks.png b/application/basilisk/themes/windows/places/allBookmarks.png
index 5331798e3..5331798e3 100644
--- a/browser/themes/windows/places/allBookmarks.png
+++ b/application/basilisk/themes/windows/places/allBookmarks.png
diff --git a/browser/themes/windows/places/autocomplete-star-win7.png b/application/basilisk/themes/windows/places/autocomplete-star-win7.png
index af694e91c..af694e91c 100644
--- a/browser/themes/windows/places/autocomplete-star-win7.png
+++ b/application/basilisk/themes/windows/places/autocomplete-star-win7.png
diff --git a/browser/themes/windows/places/autocomplete-star.png b/application/basilisk/themes/windows/places/autocomplete-star.png
index 9ba69f727..9ba69f727 100644
--- a/browser/themes/windows/places/autocomplete-star.png
+++ b/application/basilisk/themes/windows/places/autocomplete-star.png
diff --git a/browser/themes/windows/places/autocomplete-star@2x.png b/application/basilisk/themes/windows/places/autocomplete-star@2x.png
index f30523e3d..f30523e3d 100644
--- a/browser/themes/windows/places/autocomplete-star@2x.png
+++ b/application/basilisk/themes/windows/places/autocomplete-star@2x.png
diff --git a/browser/themes/windows/places/bookmarks-notification-finish.png b/application/basilisk/themes/windows/places/bookmarks-notification-finish.png
index 1e3f565f9..1e3f565f9 100644
--- a/browser/themes/windows/places/bookmarks-notification-finish.png
+++ b/application/basilisk/themes/windows/places/bookmarks-notification-finish.png
diff --git a/browser/themes/windows/places/bookmarksMenu.png b/application/basilisk/themes/windows/places/bookmarksMenu.png
index 84032e1f0..84032e1f0 100644
--- a/browser/themes/windows/places/bookmarksMenu.png
+++ b/application/basilisk/themes/windows/places/bookmarksMenu.png
diff --git a/browser/themes/windows/places/bookmarksToolbar-menuPanel.png b/application/basilisk/themes/windows/places/bookmarksToolbar-menuPanel.png
index 7cbe93d7a..7cbe93d7a 100644
--- a/browser/themes/windows/places/bookmarksToolbar-menuPanel.png
+++ b/application/basilisk/themes/windows/places/bookmarksToolbar-menuPanel.png
diff --git a/browser/themes/windows/places/bookmarksToolbar.png b/application/basilisk/themes/windows/places/bookmarksToolbar.png
index 70bba1457..70bba1457 100644
--- a/browser/themes/windows/places/bookmarksToolbar.png
+++ b/application/basilisk/themes/windows/places/bookmarksToolbar.png
diff --git a/browser/themes/windows/places/calendar.png b/application/basilisk/themes/windows/places/calendar.png
index 4127e5988..4127e5988 100644
--- a/browser/themes/windows/places/calendar.png
+++ b/application/basilisk/themes/windows/places/calendar.png
diff --git a/browser/themes/windows/places/downloads.png b/application/basilisk/themes/windows/places/downloads.png
index f21a170cf..f21a170cf 100644
--- a/browser/themes/windows/places/downloads.png
+++ b/application/basilisk/themes/windows/places/downloads.png
diff --git a/browser/themes/windows/places/editBookmarkOverlay.css b/application/basilisk/themes/windows/places/editBookmarkOverlay.css
index 3d67cd3f4..3d67cd3f4 100644
--- a/browser/themes/windows/places/editBookmarkOverlay.css
+++ b/application/basilisk/themes/windows/places/editBookmarkOverlay.css
diff --git a/browser/themes/windows/places/history.png b/application/basilisk/themes/windows/places/history.png
index 656626930..656626930 100644
--- a/browser/themes/windows/places/history.png
+++ b/application/basilisk/themes/windows/places/history.png
diff --git a/browser/themes/windows/places/libraryToolbar.png b/application/basilisk/themes/windows/places/libraryToolbar.png
index 31cee7a49..31cee7a49 100644
--- a/browser/themes/windows/places/libraryToolbar.png
+++ b/application/basilisk/themes/windows/places/libraryToolbar.png
diff --git a/browser/themes/windows/places/livemark-item.png b/application/basilisk/themes/windows/places/livemark-item.png
index 4522a20ae..4522a20ae 100644
--- a/browser/themes/windows/places/livemark-item.png
+++ b/application/basilisk/themes/windows/places/livemark-item.png
diff --git a/browser/themes/windows/places/organizer.css b/application/basilisk/themes/windows/places/organizer.css
index 9ae4c8370..9ae4c8370 100644
--- a/browser/themes/windows/places/organizer.css
+++ b/application/basilisk/themes/windows/places/organizer.css
diff --git a/browser/themes/windows/places/places.css b/application/basilisk/themes/windows/places/places.css
index 769cfcc25..769cfcc25 100644
--- a/browser/themes/windows/places/places.css
+++ b/application/basilisk/themes/windows/places/places.css
diff --git a/browser/themes/windows/places/query.png b/application/basilisk/themes/windows/places/query.png
index 18b65bd71..18b65bd71 100644
--- a/browser/themes/windows/places/query.png
+++ b/application/basilisk/themes/windows/places/query.png
diff --git a/browser/themes/windows/places/starred48.png b/application/basilisk/themes/windows/places/starred48.png
index be9afdf3f..be9afdf3f 100644
--- a/browser/themes/windows/places/starred48.png
+++ b/application/basilisk/themes/windows/places/starred48.png
diff --git a/browser/themes/windows/places/tag.png b/application/basilisk/themes/windows/places/tag.png
index ebe70a6b9..ebe70a6b9 100644
--- a/browser/themes/windows/places/tag.png
+++ b/application/basilisk/themes/windows/places/tag.png
diff --git a/browser/themes/windows/places/toolbarDropMarker.png b/application/basilisk/themes/windows/places/toolbarDropMarker.png
index 6c1b61d30..6c1b61d30 100644
--- a/browser/themes/windows/places/toolbarDropMarker.png
+++ b/application/basilisk/themes/windows/places/toolbarDropMarker.png
diff --git a/browser/themes/windows/places/unsortedBookmarks.png b/application/basilisk/themes/windows/places/unsortedBookmarks.png
index b8d3e69ab..b8d3e69ab 100644
--- a/browser/themes/windows/places/unsortedBookmarks.png
+++ b/application/basilisk/themes/windows/places/unsortedBookmarks.png
diff --git a/browser/themes/windows/places/unstarred48.png b/application/basilisk/themes/windows/places/unstarred48.png
index c287f0c4a..c287f0c4a 100644
--- a/browser/themes/windows/places/unstarred48.png
+++ b/application/basilisk/themes/windows/places/unstarred48.png
diff --git a/browser/themes/windows/preferences/alwaysAsk.png b/application/basilisk/themes/windows/preferences/alwaysAsk.png
index b2ee5c0ce..b2ee5c0ce 100644
--- a/browser/themes/windows/preferences/alwaysAsk.png
+++ b/application/basilisk/themes/windows/preferences/alwaysAsk.png
diff --git a/browser/themes/windows/preferences/application.png b/application/basilisk/themes/windows/preferences/application.png
index e4b09204e..e4b09204e 100644
--- a/browser/themes/windows/preferences/application.png
+++ b/application/basilisk/themes/windows/preferences/application.png
diff --git a/browser/themes/windows/preferences/applications.css b/application/basilisk/themes/windows/preferences/applications.css
index 96ddb7ed0..96ddb7ed0 100644
--- a/browser/themes/windows/preferences/applications.css
+++ b/application/basilisk/themes/windows/preferences/applications.css
diff --git a/browser/themes/windows/preferences/in-content/dialog.css b/application/basilisk/themes/windows/preferences/in-content/dialog.css
index 3b1ae45e0..3b1ae45e0 100644
--- a/browser/themes/windows/preferences/in-content/dialog.css
+++ b/application/basilisk/themes/windows/preferences/in-content/dialog.css
diff --git a/browser/themes/windows/preferences/in-content/preferences.css b/application/basilisk/themes/windows/preferences/in-content/preferences.css
index 5ba7c49a4..5ba7c49a4 100644
--- a/browser/themes/windows/preferences/in-content/preferences.css
+++ b/application/basilisk/themes/windows/preferences/in-content/preferences.css
diff --git a/browser/themes/windows/preferences/preferences.css b/application/basilisk/themes/windows/preferences/preferences.css
index bd1ec3083..bd1ec3083 100644
--- a/browser/themes/windows/preferences/preferences.css
+++ b/application/basilisk/themes/windows/preferences/preferences.css
diff --git a/browser/themes/windows/preferences/saveFile.png b/application/basilisk/themes/windows/preferences/saveFile.png
index ca4b12589..ca4b12589 100644
--- a/browser/themes/windows/preferences/saveFile.png
+++ b/application/basilisk/themes/windows/preferences/saveFile.png
diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png b/application/basilisk/themes/windows/privatebrowsing-mask-tabstrip-win7.png
index bd5d46a76..bd5d46a76 100644
--- a/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png
+++ b/application/basilisk/themes/windows/privatebrowsing-mask-tabstrip-win7.png
diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip.png b/application/basilisk/themes/windows/privatebrowsing-mask-tabstrip.png
index e2eba8b89..e2eba8b89 100644
--- a/browser/themes/windows/privatebrowsing-mask-tabstrip.png
+++ b/application/basilisk/themes/windows/privatebrowsing-mask-tabstrip.png
diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png
index 4a723c54e..4a723c54e 100644
--- a/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png
+++ b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png
diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar-win7.png
index 835912b53..835912b53 100644
--- a/browser/themes/windows/privatebrowsing-mask-titlebar-win7.png
+++ b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar-win7.png
diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar.png b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar.png
index 111dc7d04..111dc7d04 100644
--- a/browser/themes/windows/privatebrowsing-mask-titlebar.png
+++ b/application/basilisk/themes/windows/privatebrowsing-mask-titlebar.png
diff --git a/browser/themes/windows/reload-stop-go-win7.png b/application/basilisk/themes/windows/reload-stop-go-win7.png
index 3ef32c3ce..3ef32c3ce 100644
--- a/browser/themes/windows/reload-stop-go-win7.png
+++ b/application/basilisk/themes/windows/reload-stop-go-win7.png
diff --git a/browser/themes/windows/reload-stop-go-win7@2x.png b/application/basilisk/themes/windows/reload-stop-go-win7@2x.png
index 38b27bf0c..38b27bf0c 100644
--- a/browser/themes/windows/reload-stop-go-win7@2x.png
+++ b/application/basilisk/themes/windows/reload-stop-go-win7@2x.png
diff --git a/browser/themes/windows/reload-stop-go.png b/application/basilisk/themes/windows/reload-stop-go.png
index 8b3f398c0..8b3f398c0 100644
--- a/browser/themes/windows/reload-stop-go.png
+++ b/application/basilisk/themes/windows/reload-stop-go.png
diff --git a/browser/themes/windows/reload-stop-go@2x.png b/application/basilisk/themes/windows/reload-stop-go@2x.png
index f116eb98f..f116eb98f 100644
--- a/browser/themes/windows/reload-stop-go@2x.png
+++ b/application/basilisk/themes/windows/reload-stop-go@2x.png
diff --git a/browser/themes/windows/sanitizeDialog.css b/application/basilisk/themes/windows/sanitizeDialog.css
index 58e1f2983..58e1f2983 100644
--- a/browser/themes/windows/sanitizeDialog.css
+++ b/application/basilisk/themes/windows/sanitizeDialog.css
diff --git a/browser/themes/windows/searchbar.css b/application/basilisk/themes/windows/searchbar.css
index ef24f7c5e..ef24f7c5e 100644
--- a/browser/themes/windows/searchbar.css
+++ b/application/basilisk/themes/windows/searchbar.css
diff --git a/browser/themes/windows/setDesktopBackground.css b/application/basilisk/themes/windows/setDesktopBackground.css
index 585284c7b..585284c7b 100644
--- a/browser/themes/windows/setDesktopBackground.css
+++ b/application/basilisk/themes/windows/setDesktopBackground.css
diff --git a/browser/themes/windows/slowStartup-16.png b/application/basilisk/themes/windows/slowStartup-16.png
index 6d09fa99d..6d09fa99d 100644
--- a/browser/themes/windows/slowStartup-16.png
+++ b/application/basilisk/themes/windows/slowStartup-16.png
diff --git a/browser/themes/windows/sync-128.png b/application/basilisk/themes/windows/sync-128.png
index 0647fb080..0647fb080 100644
--- a/browser/themes/windows/sync-128.png
+++ b/application/basilisk/themes/windows/sync-128.png
diff --git a/browser/themes/windows/sync-16.png b/application/basilisk/themes/windows/sync-16.png
index 63cd02a8b..63cd02a8b 100644
--- a/browser/themes/windows/sync-16.png
+++ b/application/basilisk/themes/windows/sync-16.png
diff --git a/browser/themes/windows/sync-32.png b/application/basilisk/themes/windows/sync-32.png
index 0e9c0dfd3..0e9c0dfd3 100644
--- a/browser/themes/windows/sync-32.png
+++ b/application/basilisk/themes/windows/sync-32.png
diff --git a/browser/themes/windows/sync-bg.png b/application/basilisk/themes/windows/sync-bg.png
index 893a27d76..893a27d76 100644
--- a/browser/themes/windows/sync-bg.png
+++ b/application/basilisk/themes/windows/sync-bg.png
diff --git a/browser/themes/windows/sync-horizontalbar-win7.png b/application/basilisk/themes/windows/sync-horizontalbar-win7.png
index 2c97ce6db..2c97ce6db 100644
--- a/browser/themes/windows/sync-horizontalbar-win7.png
+++ b/application/basilisk/themes/windows/sync-horizontalbar-win7.png
diff --git a/browser/themes/windows/sync-horizontalbar-win7@2x.png b/application/basilisk/themes/windows/sync-horizontalbar-win7@2x.png
index ee117ab73..ee117ab73 100644
--- a/browser/themes/windows/sync-horizontalbar-win7@2x.png
+++ b/application/basilisk/themes/windows/sync-horizontalbar-win7@2x.png
diff --git a/browser/themes/windows/sync-horizontalbar.png b/application/basilisk/themes/windows/sync-horizontalbar.png
index cabbb7bce..cabbb7bce 100644
--- a/browser/themes/windows/sync-horizontalbar.png
+++ b/application/basilisk/themes/windows/sync-horizontalbar.png
diff --git a/browser/themes/windows/sync-horizontalbar@2x.png b/application/basilisk/themes/windows/sync-horizontalbar@2x.png
index fadb57586..fadb57586 100644
--- a/browser/themes/windows/sync-horizontalbar@2x.png
+++ b/application/basilisk/themes/windows/sync-horizontalbar@2x.png
diff --git a/browser/themes/windows/sync-notification-24.png b/application/basilisk/themes/windows/sync-notification-24.png
index fa2476c7b..fa2476c7b 100644
--- a/browser/themes/windows/sync-notification-24.png
+++ b/application/basilisk/themes/windows/sync-notification-24.png
diff --git a/browser/themes/windows/syncCommon.css b/application/basilisk/themes/windows/syncCommon.css
index 862cc404d..862cc404d 100644
--- a/browser/themes/windows/syncCommon.css
+++ b/application/basilisk/themes/windows/syncCommon.css
diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7.png b/application/basilisk/themes/windows/syncProgress-horizontalbar-win7.png
index 48cd11055..48cd11055 100644
--- a/browser/themes/windows/syncProgress-horizontalbar-win7.png
+++ b/application/basilisk/themes/windows/syncProgress-horizontalbar-win7.png
diff --git a/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png b/application/basilisk/themes/windows/syncProgress-horizontalbar-win7@2x.png
index 741dd2ed4..741dd2ed4 100644
--- a/browser/themes/windows/syncProgress-horizontalbar-win7@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-horizontalbar-win7@2x.png
diff --git a/browser/themes/windows/syncProgress-horizontalbar.png b/application/basilisk/themes/windows/syncProgress-horizontalbar.png
index 79d972389..79d972389 100644
--- a/browser/themes/windows/syncProgress-horizontalbar.png
+++ b/application/basilisk/themes/windows/syncProgress-horizontalbar.png
diff --git a/browser/themes/windows/syncProgress-horizontalbar@2x.png b/application/basilisk/themes/windows/syncProgress-horizontalbar@2x.png
index e1de4763d..e1de4763d 100644
--- a/browser/themes/windows/syncProgress-horizontalbar@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-horizontalbar@2x.png
diff --git a/browser/themes/windows/syncProgress-menuPanel.png b/application/basilisk/themes/windows/syncProgress-menuPanel.png
index 6fd6f9c16..6fd6f9c16 100644
--- a/browser/themes/windows/syncProgress-menuPanel.png
+++ b/application/basilisk/themes/windows/syncProgress-menuPanel.png
diff --git a/browser/themes/windows/syncProgress-menuPanel@2x.png b/application/basilisk/themes/windows/syncProgress-menuPanel@2x.png
index 04b2cae00..04b2cae00 100644
--- a/browser/themes/windows/syncProgress-menuPanel@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-menuPanel@2x.png
diff --git a/browser/themes/windows/syncProgress-toolbar-inverted.png b/application/basilisk/themes/windows/syncProgress-toolbar-inverted.png
index 4ede4387d..4ede4387d 100644
--- a/browser/themes/windows/syncProgress-toolbar-inverted.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar-inverted.png
diff --git a/browser/themes/windows/syncProgress-toolbar-inverted@2x.png b/application/basilisk/themes/windows/syncProgress-toolbar-inverted@2x.png
index eee4a5dd0..eee4a5dd0 100644
--- a/browser/themes/windows/syncProgress-toolbar-inverted@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar-inverted@2x.png
diff --git a/browser/themes/windows/syncProgress-toolbar-win7.png b/application/basilisk/themes/windows/syncProgress-toolbar-win7.png
index 49e224f0d..49e224f0d 100644
--- a/browser/themes/windows/syncProgress-toolbar-win7.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar-win7.png
diff --git a/browser/themes/windows/syncProgress-toolbar-win7@2x.png b/application/basilisk/themes/windows/syncProgress-toolbar-win7@2x.png
index fd2038725..fd2038725 100644
--- a/browser/themes/windows/syncProgress-toolbar-win7@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar-win7@2x.png
diff --git a/browser/themes/windows/syncProgress-toolbar.png b/application/basilisk/themes/windows/syncProgress-toolbar.png
index 05078a9c8..05078a9c8 100644
--- a/browser/themes/windows/syncProgress-toolbar.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar.png
diff --git a/browser/themes/windows/syncProgress-toolbar@2x.png b/application/basilisk/themes/windows/syncProgress-toolbar@2x.png
index 4493d7c74..4493d7c74 100644
--- a/browser/themes/windows/syncProgress-toolbar@2x.png
+++ b/application/basilisk/themes/windows/syncProgress-toolbar@2x.png
diff --git a/browser/themes/windows/syncQuota.css b/application/basilisk/themes/windows/syncQuota.css
index 1577de8a3..1577de8a3 100644
--- a/browser/themes/windows/syncQuota.css
+++ b/application/basilisk/themes/windows/syncQuota.css
diff --git a/browser/themes/windows/syncSetup.css b/application/basilisk/themes/windows/syncSetup.css
index 67335d87d..67335d87d 100644
--- a/browser/themes/windows/syncSetup.css
+++ b/application/basilisk/themes/windows/syncSetup.css
diff --git a/browser/themes/windows/syncedtabs/sidebar.css b/application/basilisk/themes/windows/syncedtabs/sidebar.css
index 6473206bc..6473206bc 100644
--- a/browser/themes/windows/syncedtabs/sidebar.css
+++ b/application/basilisk/themes/windows/syncedtabs/sidebar.css
diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg b/application/basilisk/themes/windows/tabbrowser/newtab-inverted-win7.svg
index 10ffbc745..10ffbc745 100644
--- a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-inverted-win7.svg
diff --git a/browser/themes/windows/tabbrowser/newtab-inverted.svg b/application/basilisk/themes/windows/tabbrowser/newtab-inverted.svg
index 2728cda5c..2728cda5c 100644
--- a/browser/themes/windows/tabbrowser/newtab-inverted.svg
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-inverted.svg
diff --git a/browser/themes/windows/tabbrowser/newtab-win7.svg b/application/basilisk/themes/windows/tabbrowser/newtab-win7.svg
index 3f431c9db..3f431c9db 100644
--- a/browser/themes/windows/tabbrowser/newtab-win7.svg
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-win7.svg
diff --git a/browser/themes/windows/tabbrowser/newtab.svg b/application/basilisk/themes/windows/tabbrowser/newtab.svg
index 40548da4a..40548da4a 100644
--- a/browser/themes/windows/tabbrowser/newtab.svg
+++ b/application/basilisk/themes/windows/tabbrowser/newtab.svg
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle.png b/application/basilisk/themes/windows/tabbrowser/tab-active-middle.png
index b7e6d6f77..b7e6d6f77 100644
--- a/browser/themes/windows/tabbrowser/tab-active-middle.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-active-middle.png
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-active-middle@2x.png
index 1e92acbda..1e92acbda 100644
--- a/browser/themes/windows/tabbrowser/tab-active-middle@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-active-middle@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
index 13d3beb95..13d3beb95 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-win7.svg
index 41bb5ab13..41bb5ab13 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-win7.svg
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left.svg
index 9bd59ddd3..9bd59ddd3 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left.svg
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left.svg
diff --git a/browser/themes/windows/tabbrowser/tab-background-end-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10.png
index fb353b17e..fb353b17e 100644
--- a/browser/themes/windows/tabbrowser/tab-background-end-preWin10.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
index eefb6ac47..eefb6ac47 100644
--- a/browser/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-end.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end.png
index d68ea6da6..d68ea6da6 100644
--- a/browser/themes/windows/tabbrowser/tab-background-end.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-end@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end@2x.png
index 8ed84ab37..8ed84ab37 100644
--- a/browser/themes/windows/tabbrowser/tab-background-end@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10.png
index 51e066c2e..51e066c2e 100644
--- a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
index b26cb95de..b26cb95de 100644
--- a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle.png
index faaf7e38e..faaf7e38e 100644
--- a/browser/themes/windows/tabbrowser/tab-background-middle.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle@2x.png
index c9d245f4f..c9d245f4f 100644
--- a/browser/themes/windows/tabbrowser/tab-background-middle@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-start-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10.png
index cf0dc852a..cf0dc852a 100644
--- a/browser/themes/windows/tabbrowser/tab-background-start-preWin10.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
index bbfc77dd1..bbfc77dd1 100644
--- a/browser/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-start.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start.png
index d1f0b5561..d1f0b5561 100644
--- a/browser/themes/windows/tabbrowser/tab-background-start.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start.png
diff --git a/browser/themes/windows/tabbrowser/tab-background-start@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start@2x.png
index e860275a6..e860275a6 100644
--- a/browser/themes/windows/tabbrowser/tab-background-start@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end.png
index 2aa5711f8..2aa5711f8 100644
--- a/browser/themes/windows/tabbrowser/tab-stroke-end.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end.png
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end@2x.png
index a87002a83..a87002a83 100644
--- a/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end@2x.png
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start.png
index 4e4e41f63..4e4e41f63 100644
--- a/browser/themes/windows/tabbrowser/tab-stroke-start.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start.png
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start@2x.png
index 13bd6add1..13bd6add1 100644
--- a/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start@2x.png
diff --git a/browser/themes/windows/tabbrowser/tabDragIndicator.png b/application/basilisk/themes/windows/tabbrowser/tabDragIndicator.png
index 63c4eccad..63c4eccad 100644
--- a/browser/themes/windows/tabbrowser/tabDragIndicator.png
+++ b/application/basilisk/themes/windows/tabbrowser/tabDragIndicator.png
diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png b/application/basilisk/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
index af4c7af0b..af4c7af0b 100644
--- a/browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
+++ b/application/basilisk/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
diff --git a/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png b/application/basilisk/themes/windows/toolbarbutton-dropdown-arrow-win7.png
index 5f892f532..5f892f532 100644
--- a/browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png
+++ b/application/basilisk/themes/windows/toolbarbutton-dropdown-arrow-win7.png
diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7.png b/application/basilisk/themes/windows/urlbar-history-dropmarker-win7.png
index b03338822..b03338822 100644
--- a/browser/themes/windows/urlbar-history-dropmarker-win7.png
+++ b/application/basilisk/themes/windows/urlbar-history-dropmarker-win7.png
diff --git a/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png b/application/basilisk/themes/windows/urlbar-history-dropmarker-win7@2x.png
index bff2997f8..bff2997f8 100644
--- a/browser/themes/windows/urlbar-history-dropmarker-win7@2x.png
+++ b/application/basilisk/themes/windows/urlbar-history-dropmarker-win7@2x.png
diff --git a/browser/themes/windows/urlbar-history-dropmarker.png b/application/basilisk/themes/windows/urlbar-history-dropmarker.png
index 01432f7e9..01432f7e9 100644
--- a/browser/themes/windows/urlbar-history-dropmarker.png
+++ b/application/basilisk/themes/windows/urlbar-history-dropmarker.png
diff --git a/browser/themes/windows/urlbar-history-dropmarker@2x.png b/application/basilisk/themes/windows/urlbar-history-dropmarker@2x.png
index 6e710139a..6e710139a 100644
--- a/browser/themes/windows/urlbar-history-dropmarker@2x.png
+++ b/application/basilisk/themes/windows/urlbar-history-dropmarker@2x.png
diff --git a/browser/themes/windows/urlbar-popup-blocked.png b/application/basilisk/themes/windows/urlbar-popup-blocked.png
index 56dbd2d0d..56dbd2d0d 100644
--- a/browser/themes/windows/urlbar-popup-blocked.png
+++ b/application/basilisk/themes/windows/urlbar-popup-blocked.png
diff --git a/browser/themes/windows/webRTC-indicator.css b/application/basilisk/themes/windows/webRTC-indicator.css
index c22f942ec..c22f942ec 100644
--- a/browser/themes/windows/webRTC-indicator.css
+++ b/application/basilisk/themes/windows/webRTC-indicator.css
diff --git a/browser/themes/windows/windowsShared.inc b/application/basilisk/themes/windows/windowsShared.inc
index 199a62292..199a62292 100644
--- a/browser/themes/windows/windowsShared.inc
+++ b/application/basilisk/themes/windows/windowsShared.inc
diff --git a/browser/tools/mozscreenshots/.eslintrc.js b/application/basilisk/tools/mozscreenshots/.eslintrc.js
index 55b05398e..55b05398e 100644
--- a/browser/tools/mozscreenshots/.eslintrc.js
+++ b/application/basilisk/tools/mozscreenshots/.eslintrc.js
diff --git a/browser/tools/mozscreenshots/browser.ini b/application/basilisk/tools/mozscreenshots/browser.ini
index e72a3acb4..e72a3acb4 100644
--- a/browser/tools/mozscreenshots/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/browser.ini
diff --git a/browser/tools/mozscreenshots/browser_screenshots.js b/application/basilisk/tools/mozscreenshots/browser_screenshots.js
index 502f90fec..502f90fec 100644
--- a/browser/tools/mozscreenshots/browser_screenshots.js
+++ b/application/basilisk/tools/mozscreenshots/browser_screenshots.js
diff --git a/browser/tools/mozscreenshots/controlCenter/browser.ini b/application/basilisk/tools/mozscreenshots/controlCenter/browser.ini
index f5b084edc..f5b084edc 100644
--- a/browser/tools/mozscreenshots/controlCenter/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/controlCenter/browser.ini
diff --git a/browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js b/application/basilisk/tools/mozscreenshots/controlCenter/browser_controlCenter.js
index 7e1ffb125..7e1ffb125 100644
--- a/browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js
+++ b/application/basilisk/tools/mozscreenshots/controlCenter/browser_controlCenter.js
diff --git a/browser/tools/mozscreenshots/devtools/browser.ini b/application/basilisk/tools/mozscreenshots/devtools/browser.ini
index e4fa0a988..e4fa0a988 100644
--- a/browser/tools/mozscreenshots/devtools/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/devtools/browser.ini
diff --git a/browser/tools/mozscreenshots/devtools/browser_devtools.js b/application/basilisk/tools/mozscreenshots/devtools/browser_devtools.js
index a47548958..a47548958 100644
--- a/browser/tools/mozscreenshots/devtools/browser_devtools.js
+++ b/application/basilisk/tools/mozscreenshots/devtools/browser_devtools.js
diff --git a/browser/tools/mozscreenshots/head.js b/application/basilisk/tools/mozscreenshots/head.js
index c1702ab08..c1702ab08 100644
--- a/browser/tools/mozscreenshots/head.js
+++ b/application/basilisk/tools/mozscreenshots/head.js
diff --git a/browser/tools/mozscreenshots/moz.build b/application/basilisk/tools/mozscreenshots/moz.build
index 0c8b98b6a..0c8b98b6a 100644
--- a/browser/tools/mozscreenshots/moz.build
+++ b/application/basilisk/tools/mozscreenshots/moz.build
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/Makefile.in b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/Makefile.in
index b0004aaa7..b0004aaa7 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Makefile.in
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/Makefile.in
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
index c43514e94..c43514e94 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
index 557b867b9..557b867b9 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
index c7e238606..c7e238606 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/bootstrap.js
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
index 5dbb2c1e2..5dbb2c1e2 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
index 97d8354d5..97d8354d5 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
index ed4d92b4f..1201ed692 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -195,7 +195,6 @@ this.ControlCenter = {
     trackingProtectionEnabled: {
       applyConfig: Task.async(function* () {
         Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
-        Services.prefs.setIntPref("privacy.trackingprotection.introCount", 20);
         yield UrlClassifierTestUtils.addTestTrackers();
 
         yield loadPage(TRACKING_PAGE);
@@ -208,7 +207,6 @@ this.ControlCenter = {
         let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
         let gBrowser = browserWindow.gBrowser;
         Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
-        Services.prefs.setIntPref("privacy.trackingprotection.introCount", 20);
         yield UrlClassifierTestUtils.addTestTrackers();
 
         yield loadPage(TRACKING_PAGE);
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
index bb856508b..bb856508b 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevEdition.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/DevEdition.jsm
index fd981bca3..fd981bca3 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevEdition.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/DevEdition.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
index f06000b4c..f06000b4c 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
index 52d0c2207..52d0c2207 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
index 5e5a988c4..5e5a988c4 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
index aa2b3f2a7..aa2b3f2a7 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
index f2ff43561..f2ff43561 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
index 5b9d7d9b9..5b9d7d9b9 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
index ee284bf97..ee284bf97 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
index 5cc0d6522..5cc0d6522 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/install.rdf b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/install.rdf
index 429a35840..429a35840 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/install.rdf
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/install.rdf
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/jar.mn
index 0f403013a..0f403013a 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/jar.mn
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/jar.mn
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/black_theme.png b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/black_theme.png
index 78e47207b..78e47207b 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/black_theme.png
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/black_theme.png
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/borderify.xpi b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/borderify.xpi
index 66ae92ed2..66ae92ed2 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/borderify.xpi
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/borderify.xpi
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed.html
index 9d2ef75c0..9d2ef75c0 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_active.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_active.html
index f43ff079f..f43ff079f 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_active.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_active.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_passive.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_passive.html
index ba8978267..ba8978267 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_passive.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/mixed_passive.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/password.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/password.html
index 010384270..010384270 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/password.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/password.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/tracking.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/tracking.html
index 6fb230645..6fb230645 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/tracking.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/controlCenter/tracking.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js
index 66cdd8c86..66cdd8c86 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-script.js
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css
index 145a4e57d..145a4e57d 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots-style.css
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html
index 6778cf7da..6778cf7da 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/mozscreenshots.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
index de8310666..de8310666 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png
index 1c4899aaf..1c4899aaf 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png
index 6b0c501a1..6b0c501a1 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/moz.build
index d23c7e925..d23c7e925 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/moz.build
diff --git a/browser/tools/mozscreenshots/permissionPrompts/browser.ini b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser.ini
index 5cbe196c8..5cbe196c8 100644
--- a/browser/tools/mozscreenshots/permissionPrompts/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser.ini
diff --git a/browser/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js
index af63217f2..af63217f2 100644
--- a/browser/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js
+++ b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js
diff --git a/browser/tools/mozscreenshots/preferences/browser.ini b/application/basilisk/tools/mozscreenshots/preferences/browser.ini
index 975d91681..975d91681 100644
--- a/browser/tools/mozscreenshots/preferences/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/preferences/browser.ini
diff --git a/browser/tools/mozscreenshots/preferences/browser_preferences.js b/application/basilisk/tools/mozscreenshots/preferences/browser_preferences.js
index c590f194f..c590f194f 100644
--- a/browser/tools/mozscreenshots/preferences/browser_preferences.js
+++ b/application/basilisk/tools/mozscreenshots/preferences/browser_preferences.js
diff --git a/browser/tools/mozscreenshots/primaryUI/browser.ini b/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini
index 628520b23..628520b23 100644
--- a/browser/tools/mozscreenshots/primaryUI/browser.ini
+++ b/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini
diff --git a/browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js b/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js
index 6d0eaa1d6..6d0eaa1d6 100644
--- a/browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js
+++ b/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 000113fe7..014550190 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -433,8 +433,6 @@ pref("browser.tabs.loadDivertedInBackground", false);
 pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.noWindowActivationOnExternal", false);
 pref("browser.tabs.tabClipWidth", 140);
-pref("browser.tabs.tabMinWidth", 100);
-pref("browser.tabs.tabMaxWidth", 250);
 pref("browser.tabs.animate", true);
 pref("browser.tabs.onTop", true);
 #ifdef XP_WIN
diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index 76e49436c..a2970aefc 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -43,6 +43,8 @@ tabbrowser {
 
 .tabbrowser-tab:not([pinned]) {
   -moz-box-flex: 100;
+  max-width: 250px;
+  min-width: 100px;
   width: 0;
   transition: min-width 175ms ease-out,
               max-width 200ms ease-out,
@@ -65,12 +67,6 @@ tabbrowser {
   display: none;
 }
 
-.tabbrowser-tab[pinned] {
-  -moz-box-flex: 0;
-  min-width: 0 !important;
-  max-width: none !important;
-}
-
 .tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
   position: fixed !important;
   display: block; /* position:fixed already does this (bug 579776), but let's be explicit */
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 4bdac7850..a51b73fe8 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -64,7 +64,7 @@ XPCOMUtils.defineLazyGetter(window, "gFindBar", function() {
 
   // Force a style flush to ensure that our binding is attached.
   findbar.clientTop;
-  findbar.browser = gBrowser;
+  findbar.browser = gBrowser.mCurrentBrowser;
   window.gFindBarInitialized = true;
   return findbar;
 });
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 10f109ce8..12319a62b 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -1445,9 +1445,6 @@
               t.setAttribute("label", aURI);
 
             t.setAttribute("crop", "end");
-            t.style.maxWidth = this.tabContainer.mTabMaxWidth + "px";
-            t.style.minWidth = this.tabContainer.mTabMinWidth + "px";
-            t.width = 0;
             t.setAttribute("validate", "never"); //PMed
             t.setAttribute("onerror", "this.removeAttribute('image');");
             t.className = "tabbrowser-tab";
@@ -3096,13 +3093,25 @@
               break;
             }
             case "Findbar:Keypress":
-              if (!gFindBarInitialized) {
-                // If the find bar for this tab is not yet alive, change that,
-                // and make sure we return the result:
-                return gFindBar.receiveMessage(aMessage);
+              // If the find bar for this tab is not yet alive, only initialize
+              // it if there's a possibility FindAsYouType will be used.
+              // There's no point in doing it for most random keypresses.
+              if (!gFindBarInitialized && aMessage.data.shouldFastFind) {
+                let shouldFastFind = this._findAsYouType;
+                if (!shouldFastFind) {
+                  // Please keep in sync with toolkit/content/widgets/findbar.xml
+                  const FAYT_LINKS_KEY = "'";
+                  const FAYT_TEXT_KEY = "/";
+                  let charCode = aMessage.data.fakeEvent.charCode;
+                  let key = charCode ? String.fromCharCode(charCode) : null;
+                  shouldFastFind = key == FAYT_LINKS_KEY || key == FAYT_TEXT_KEY;
+                }
+                if (shouldFastFind) {
+                  // Make sure we return the result.
+                  return gFindBar.receiveMessage(aMessage);
+                }
               }
               break;
-
           }
         ]]></body>
       </method>
@@ -3169,6 +3178,10 @@
                                               this.mCurrentBrowser);
           }
           messageManager.addMessageListener("DOMWebNotificationClicked", this);
+
+          // To correctly handle keypresses for potential FindAsYouType, while
+          // the tab's find bar is not yet initialized.
+          this._findAsYouType = Services.prefs.getBoolPref("accessibility.typeaheadfind");
           messageManager.addMessageListener("Findbar:Keypress", this);
         ]]>
       </constructor>
@@ -3413,8 +3426,6 @@
     <implementation implements="nsIDOMEventListener">
       <constructor>
         <![CDATA[
-          this.mTabMinWidth = Services.prefs.getIntPref("browser.tabs.tabMinWidth");
-          this.mTabMaxWidth = Services.prefs.getIntPref("browser.tabs.tabMaxWidth");
           this.mTabClipWidth = Services.prefs.getIntPref("browser.tabs.tabClipWidth");
           this.mCloseButtons = Services.prefs.getIntPref("browser.tabs.closeButtons");
           this._closeWindowWithLastTab = Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab");
@@ -3422,13 +3433,11 @@
           var tab = this.firstChild;
           tab.setAttribute("label",
                            this.tabbrowser.mStringBundle.getString("tabs.emptyTabTitle"));
-          tab.style.minWidth = this.mTabMinWidth + "px";
-          tab.style.maxWidth = this.mTabMaxWidth + "px";
-          tab.width = 0;
           tab.setAttribute("crop", "end");
           tab.setAttribute("onerror", "this.removeAttribute('image');");
           this.adjustTabstrip();
 
+          Services.prefs.addObserver("accessibility.typeaheadfind", this._prefObserver, false);
           Services.prefs.addObserver("browser.tabs.", this._prefObserver, false);
           window.addEventListener("resize", this, false);
           window.addEventListener("load", this, false);
@@ -3444,6 +3453,7 @@
 
       <destructor>
         <![CDATA[
+          Services.prefs.removeObserver("accessibility.typeaheadfind", this._prefObserver);
           Services.prefs.removeObserver("browser.tabs.", this._prefObserver);
         ]]>
       </destructor>
@@ -3509,6 +3519,9 @@
 
         observe: function (subject, topic, data) {
           switch (data) {
+            case "accessibility.typeaheadfind":
+              this._findAsYouType = Services.prefs.getBoolPref(data);
+              break;
             case "browser.tabs.closeButtons":
               this.tabContainer.mCloseButtons = Services.prefs.getIntPref(data);
               this.tabContainer.adjustTabstrip();
diff --git a/application/palemoon/branding/unstable/pref/palemoon-branding.js b/application/palemoon/branding/unstable/pref/palemoon-branding.js
index dda6f86a5..a95390cb6 100644
--- a/application/palemoon/branding/unstable/pref/palemoon-branding.js
+++ b/application/palemoon/branding/unstable/pref/palemoon-branding.js
@@ -12,7 +12,7 @@ pref("general.useragent.compatMode.gecko", true);
 pref("general.useragent.compatMode.firefox", true);

 

 // ========================= updates ========================

-#if defined(XP_WIN)

+#if defined(XP_WIN) || defined(XP_LINUX)

 // Enable auto-updates for this channel

 pref("app.update.auto", true);

 

@@ -32,7 +32,7 @@ pref("app.update.url.manual", "http://www.palemoon.org/unstable/");
 // supplied in the "An update is available" page of the update wizard. 

 pref("app.update.url.details", "http://www.palemoon.org/unstable/");

 #else

-// Updates disabled (Linux, etc.)

+// Updates disabled (Mac, etc.)

 pref("app.update.enabled", false);

 pref("app.update.url", "");

 #endif

diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt
index da03daefe..90398d629 100644
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@@ -1 +1 @@
-28.0.0a2
\ No newline at end of file
+28.0.0a3
\ No newline at end of file
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index fb5441832..26b4969d6 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -56,7 +56,7 @@
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/palemoon-l10n.js
 @RESPATH@/browser/searchplugins/*
-#ifdef HAVE_MAKENSISU
+#ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
diff --git a/application/palemoon/installer/windows/Makefile.in b/application/palemoon/installer/windows/Makefile.in
index 8c434c54f..7ba70d912 100644
--- a/application/palemoon/installer/windows/Makefile.in
+++ b/application/palemoon/installer/windows/Makefile.in
@@ -32,12 +32,12 @@ include $(topsrcdir)/config/config.mk
 
 ifdef LOCALE_MERGEDIR
 PPL_LOCALE_ARGS = \
-  --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \
-  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \
-  --l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \
+  --l10n-dir=$(LOCALE_MERGEDIR)/application/palemoon/installer \
+  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/palemoon/locales)/installer \
+  --l10n-dir=$(topsrcdir)/application/palemoon/locales/en-US/installer \
   $(NULL)
 else
-PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer
+PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/palemoon/locales)/installer
 endif
 
 OVERRIDE_DEFAULT_GOAL := installer
diff --git a/browser/build.mk b/browser/build.mk
deleted file mode 100644
index 1bcba59d0..000000000
--- a/browser/build.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/.
-
-installer:
-	@$(MAKE) -C browser/installer installer
-
-package:
-	@$(MAKE) -C browser/installer
-
-package-compare:
-	@$(MAKE) -C browser/installer package-compare
-
-stage-package:
-	@$(MAKE) -C browser/installer stage-package
-
-sdk:
-	@$(MAKE) -C browser/installer make-sdk
-
-install::
-	@$(MAKE) -C browser/installer install
-
-clean::
-	@$(MAKE) -C browser/installer clean
-
-distclean::
-	@$(MAKE) -C browser/installer distclean
-
-source-package::
-	@$(MAKE) -C browser/installer source-package
-
-upload::
-	@$(MAKE) -C browser/installer upload
-
-source-upload::
-	@$(MAKE) -C browser/installer source-upload
-
-hg-bundle::
-	@$(MAKE) -C browser/installer hg-bundle
-
-l10n-check::
-	@$(MAKE) -C browser/locales l10n-check
-
-ifdef ENABLE_TESTS
-# Implemented in testing/testsuite-targets.mk
-
-mochitest-browser-chrome:
-	$(RUN_MOCHITEST) --flavor=browser
-	$(CHECK_TEST_ERROR)
-
-mochitest:: mochitest-browser-chrome
-
-.PHONY: mochitest-browser-chrome
-
-endif
diff --git a/browser/components/uitour/UITour-lib.js b/browser/components/uitour/UITour-lib.js
deleted file mode 100644
index 7fe820185..000000000
--- a/browser/components/uitour/UITour-lib.js
+++ /dev/null
@@ -1,331 +0,0 @@
-/* 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/. */
-
-// create namespace
-if (typeof Mozilla == 'undefined') {
-  var Mozilla = {};
-}
-
-(function($) {
-  'use strict';
-
-  // create namespace
-  if (typeof Mozilla.UITour == 'undefined') {
-    Mozilla.UITour = {};
-  }
-
-  var themeIntervalId = null;
-  function _stopCyclingThemes() {
-    if (themeIntervalId) {
-      clearInterval(themeIntervalId);
-      themeIntervalId = null;
-    }
-  }
-
-  function _sendEvent(action, data) {
-    var event = new CustomEvent('mozUITour', {
-      bubbles: true,
-      detail: {
-	action: action,
-	data: data || {}
-      }
-    });
-
-    document.dispatchEvent(event);
-  }
-
-  function _generateCallbackID() {
-    return Math.random().toString(36).replace(/[^a-z]+/g, '');
-  }
-
-  function _waitForCallback(callback) {
-    var id = _generateCallbackID();
-
-    function listener(event) {
-      if (typeof event.detail != 'object')
-	return;
-      if (event.detail.callbackID != id)
-	return;
-
-      document.removeEventListener('mozUITourResponse', listener);
-      callback(event.detail.data);
-    }
-    document.addEventListener('mozUITourResponse', listener);
-
-    return id;
-  }
-
-  var notificationListener = null;
-  function _notificationListener(event) {
-    if (typeof event.detail != 'object')
-      return;
-    if (typeof notificationListener != 'function')
-      return;
-
-    notificationListener(event.detail.event, event.detail.params);
-  }
-
-  Mozilla.UITour.DEFAULT_THEME_CYCLE_DELAY = 10 * 1000;
-
-  Mozilla.UITour.CONFIGNAME_SYNC = 'sync';
-  Mozilla.UITour.CONFIGNAME_AVAILABLETARGETS = 'availableTargets';
-
-  Mozilla.UITour.ping = function(callback) {
-    var data = {};
-    if (callback) {
-      data.callbackID = _waitForCallback(callback);
-    }
-    _sendEvent('ping', data);
-  };
-
-  Mozilla.UITour.observe = function(listener, callback) {
-    notificationListener = listener;
-
-    if (listener) {
-      document.addEventListener('mozUITourNotification',
-                                _notificationListener);
-      Mozilla.UITour.ping(callback);
-    } else {
-      document.removeEventListener('mozUITourNotification',
-                                   _notificationListener);
-    }
-  };
-
-  Mozilla.UITour.registerPageID = function(pageID) {
-    _sendEvent('registerPageID', {
-      pageID: pageID
-    });
-  };
-
-  Mozilla.UITour.showHeartbeat = function(message, thankyouMessage, flowId, engagementURL,
-					  learnMoreLabel, learnMoreURL, options) {
-    var args = {
-      message: message,
-      thankyouMessage: thankyouMessage,
-      flowId: flowId,
-      engagementURL: engagementURL,
-      learnMoreLabel: learnMoreLabel,
-      learnMoreURL: learnMoreURL,
-    };
-
-    if (options) {
-      for (var option in options) {
-	if (!options.hasOwnProperty(option)) {
-	  continue;
-	}
-	args[option] = options[option];
-      }
-    }
-
-    _sendEvent('showHeartbeat', args);
-  };
-
-  Mozilla.UITour.showHighlight = function(target, effect) {
-    _sendEvent('showHighlight', {
-      target: target,
-      effect: effect
-    });
-  };
-
-  Mozilla.UITour.hideHighlight = function() {
-    _sendEvent('hideHighlight');
-  };
-
-  Mozilla.UITour.showInfo = function(target, title, text, icon, buttons, options) {
-    var buttonData = [];
-    if (Array.isArray(buttons)) {
-      for (var i = 0; i < buttons.length; i++) {
-	buttonData.push({
-	  label: buttons[i].label,
-	  icon: buttons[i].icon,
-	  style: buttons[i].style,
-	  callbackID: _waitForCallback(buttons[i].callback)
-	});
-      }
-    }
-
-    var closeButtonCallbackID, targetCallbackID;
-    if (options && options.closeButtonCallback)
-      closeButtonCallbackID = _waitForCallback(options.closeButtonCallback);
-    if (options && options.targetCallback)
-      targetCallbackID = _waitForCallback(options.targetCallback);
-
-    _sendEvent('showInfo', {
-      target: target,
-      title: title,
-      text: text,
-      icon: icon,
-      buttons: buttonData,
-      closeButtonCallbackID: closeButtonCallbackID,
-      targetCallbackID: targetCallbackID
-    });
-  };
-
-  Mozilla.UITour.hideInfo = function() {
-    _sendEvent('hideInfo');
-  };
-
-  Mozilla.UITour.previewTheme = function(theme) {
-    _stopCyclingThemes();
-
-    _sendEvent('previewTheme', {
-      theme: JSON.stringify(theme)
-    });
-  };
-
-  Mozilla.UITour.resetTheme = function() {
-    _stopCyclingThemes();
-
-    _sendEvent('resetTheme');
-  };
-
-  Mozilla.UITour.cycleThemes = function(themes, delay, callback) {
-    _stopCyclingThemes();
-
-    if (!delay) {
-      delay = Mozilla.UITour.DEFAULT_THEME_CYCLE_DELAY;
-    }
-
-    function nextTheme() {
-      var theme = themes.shift();
-      themes.push(theme);
-
-      _sendEvent('previewTheme', {
-	theme: JSON.stringify(theme),
-	state: true
-      });
-
-      callback(theme);
-    }
-
-    themeIntervalId = setInterval(nextTheme, delay);
-    nextTheme();
-  };
-
-  Mozilla.UITour.showMenu = function(name, callback) {
-    var showCallbackID;
-    if (callback)
-      showCallbackID = _waitForCallback(callback);
-
-    _sendEvent('showMenu', {
-      name: name,
-      showCallbackID: showCallbackID,
-    });
-  };
-
-  Mozilla.UITour.hideMenu = function(name) {
-    _sendEvent('hideMenu', {
-      name: name
-    });
-  };
-
-  Mozilla.UITour.showNewTab = function() {
-    _sendEvent('showNewTab');
-  };
-
-  Mozilla.UITour.getConfiguration = function(configName, callback) {
-    _sendEvent('getConfiguration', {
-      callbackID: _waitForCallback(callback),
-      configuration: configName,
-    });
-  };
-
-  Mozilla.UITour.setConfiguration = function(configName, configValue) {
-    _sendEvent('setConfiguration', {
-      configuration: configName,
-      value: configValue,
-    });
-  };
-
-  /**
-   * Request the browser open the Firefox Accounts page.
-   *
-   * @param {Object} extraURLCampaignParams - An object containing additional
-   * paramaters for the URL opened by the browser for reasons of promotional
-   * campaign tracking. Each attribute of the object must have a name that
-   * is a string, begins with "utm_" and contains only only alphanumeric
-   * characters, dashes or underscores. The values may be any string and will
-   * automatically be encoded.
-   */
-  Mozilla.UITour.showFirefoxAccounts = function(extraURLCampaignParams) {
-    _sendEvent('showFirefoxAccounts', {
-      extraURLCampaignParams: JSON.stringify(extraURLCampaignParams),
-    });
-  };
-
-  Mozilla.UITour.resetFirefox = function() {
-    _sendEvent('resetFirefox');
-  };
-
-  Mozilla.UITour.addNavBarWidget= function(name, callback) {
-    _sendEvent('addNavBarWidget', {
-      name: name,
-      callbackID: _waitForCallback(callback),
-    });
-  };
-
-  Mozilla.UITour.setDefaultSearchEngine = function(identifier) {
-    _sendEvent('setDefaultSearchEngine', {
-      identifier: identifier,
-    });
-  };
-
-  Mozilla.UITour.setTreatmentTag = function(name, value) {
-    _sendEvent('setTreatmentTag', {
-      name: name,
-      value: value
-    });
-  };
-
-  Mozilla.UITour.getTreatmentTag = function(name, callback) {
-    _sendEvent('getTreatmentTag', {
-      name: name,
-      callbackID: _waitForCallback(callback)
-    });
-  };
-
-  Mozilla.UITour.setSearchTerm = function(term) {
-    _sendEvent('setSearchTerm', {
-      term: term
-    });
-  };
-
-  Mozilla.UITour.openSearchPanel = function(callback) {
-    _sendEvent('openSearchPanel', {
-      callbackID: _waitForCallback(callback)
-    });
-  };
-
-  Mozilla.UITour.forceShowReaderIcon = function() {
-    _sendEvent('forceShowReaderIcon');
-  };
-
-  Mozilla.UITour.toggleReaderMode = function() {
-    _sendEvent('toggleReaderMode');
-  };
-
-  Mozilla.UITour.openPreferences = function(pane) {
-    _sendEvent('openPreferences', {
-      pane: pane
-    });
-  };
-
-  /**
-   * Closes the tab where this code is running. As usual, if the tab is in the
-   * foreground, the tab that was displayed before is selected.
-   *
-   * The last tab in the current window will never be closed, in which case
-   * this call will have no effect. The calling code is expected to take an
-   * action after a small timeout in order to handle this case, for example by
-   * displaying a goodbye message or a button to restart the tour.
-   */
-  Mozilla.UITour.closeTab = function() {
-    _sendEvent('closeTab');
-  };
-})();
-
-// Make this library Require-able.
-if (typeof module !== 'undefined' && module.exports) {
-  module.exports = Mozilla.UITour;
-}
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
deleted file mode 100644
index b92715963..000000000
--- a/browser/components/uitour/UITour.jsm
+++ /dev/null
@@ -1,2111 +0,0 @@
-// 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/.
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["UITour"];
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://gre/modules/AppConstants.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/Promise.jsm");
-Cu.import("resource:///modules/RecentWindow.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/TelemetryController.jsm");
-Cu.import("resource://gre/modules/Timer.jsm");
-
-Cu.importGlobalProperties(["URL"]);
-
-XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
-  "resource://gre/modules/LightweightThemeManager.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ResetProfile",
-  "resource://gre/modules/ResetProfile.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
-  "resource:///modules/CustomizableUI.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry",
-  "resource://gre/modules/UITelemetry.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
-  "resource:///modules/BrowserUITelemetry.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-  "resource://gre/modules/PrivateBrowsingUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
-  "resource://gre/modules/ReaderMode.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent",
-  "resource:///modules/ReaderParent.jsm");
-
-// See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
-const PREF_LOG_LEVEL      = "browser.uitour.loglevel";
-const PREF_SEENPAGEIDS    = "browser.uitour.seenPageIDs";
-const PREF_READERVIEW_TRIGGER = "browser.uitour.readerViewTrigger";
-const PREF_SURVEY_DURATION = "browser.uitour.surveyDuration";
-
-const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([
-  "forceShowReaderIcon",
-  "getConfiguration",
-  "getTreatmentTag",
-  "hideHighlight",
-  "hideInfo",
-  "hideMenu",
-  "ping",
-  "registerPageID",
-  "setConfiguration",
-  "setTreatmentTag",
-]);
-const MAX_BUTTONS         = 4;
-
-const BUCKET_NAME         = "UITour";
-const BUCKET_TIMESTEPS    = [
-  1 * 60 * 1000, // Until 1 minute after tab is closed/inactive.
-  3 * 60 * 1000, // Until 3 minutes after tab is closed/inactive.
-  10 * 60 * 1000, // Until 10 minutes after tab is closed/inactive.
-  60 * 60 * 1000, // Until 1 hour after tab is closed/inactive.
-];
-
-// Time after which seen Page IDs expire.
-const SEENPAGEID_EXPIRY  = 8 * 7 * 24 * 60 * 60 * 1000; // 8 weeks.
-
-// Prefix for any target matching a search engine.
-const TARGET_SEARCHENGINE_PREFIX = "searchEngine-";
-
-// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
-XPCOMUtils.defineLazyGetter(this, "log", () => {
-  let ConsoleAPI = Cu.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI;
-  let consoleOptions = {
-    maxLogLevelPref: PREF_LOG_LEVEL,
-    prefix: "UITour",
-  };
-  return new ConsoleAPI(consoleOptions);
-});
-
-this.UITour = {
-  url: null,
-  seenPageIDs: null,
-  // This map is not persisted and is used for
-  // building the content source of a potential tour.
-  pageIDsForSession: new Map(),
-  pageIDSourceBrowsers: new WeakMap(),
-  /* Map from browser chrome windows to a Set of <browser>s in which a tour is open (both visible and hidden) */
-  tourBrowsersByWindow: new WeakMap(),
-  appMenuOpenForAnnotation: new Set(),
-  availableTargetsCache: new WeakMap(),
-  clearAvailableTargetsCache() {
-    this.availableTargetsCache = new WeakMap();
-  },
-
-  _annotationPanelMutationObservers: new WeakMap(),
-
-  highlightEffects: ["random", "wobble", "zoom", "color"],
-  targets: new Map([
-    ["accountStatus", {
-      query: (aDocument) => {
-        // If the user is logged in, use the avatar element.
-        let fxAFooter = aDocument.getElementById("PanelUI-footer-fxa");
-        if (fxAFooter.getAttribute("fxastatus")) {
-          return aDocument.getElementById("PanelUI-fxa-avatar");
-        }
-
-        // Otherwise use the sync setup icon.
-        let statusButton = aDocument.getElementById("PanelUI-fxa-label");
-        return aDocument.getAnonymousElementByAttribute(statusButton,
-                                                        "class",
-                                                        "toolbarbutton-icon");
-      },
-      // This is a fake widgetName starting with the "PanelUI-" prefix so we know
-      // to automatically open the appMenu when annotating this target.
-      widgetName: "PanelUI-fxa-label",
-    }],
-    ["addons",      {query: "#add-ons-button"}],
-    ["appMenu",     {
-      addTargetListener: (aDocument, aCallback) => {
-        let panelPopup = aDocument.getElementById("PanelUI-popup");
-        panelPopup.addEventListener("popupshown", aCallback);
-      },
-      query: "#PanelUI-button",
-      removeTargetListener: (aDocument, aCallback) => {
-        let panelPopup = aDocument.getElementById("PanelUI-popup");
-        panelPopup.removeEventListener("popupshown", aCallback);
-      },
-    }],
-    ["backForward", {
-      query: "#back-button",
-      widgetName: "urlbar-container",
-    }],
-    ["bookmarks",   {query: "#bookmarks-menu-button"}],
-    ["controlCenter-trackingUnblock", controlCenterTrackingToggleTarget(true)],
-    ["controlCenter-trackingBlock", controlCenterTrackingToggleTarget(false)],
-    ["customize",   {
-      query: (aDocument) => {
-        let customizeButton = aDocument.getElementById("PanelUI-customize");
-        return aDocument.getAnonymousElementByAttribute(customizeButton,
-                                                        "class",
-                                                        "toolbarbutton-icon");
-      },
-      widgetName: "PanelUI-customize",
-    }],
-    ["devtools",    {query: "#developer-button"}],
-    ["help",        {query: "#PanelUI-help"}],
-    ["home",        {query: "#home-button"}],
-    ["forget", {
-      allowAdd: true,
-      query: "#panic-button",
-      widgetName: "panic-button",
-    }],
-    ["pocket", {
-      allowAdd: true,
-      query: "#pocket-button",
-      widgetName: "pocket-button",
-    }],
-    ["privateWindow",  {query: "#privatebrowsing-button"}],
-    ["quit",        {query: "#PanelUI-quit"}],
-    ["readerMode-urlBar", {query: "#reader-mode-button"}],
-    ["search",      {
-      infoPanelOffsetX: 18,
-      infoPanelPosition: "after_start",
-      query: "#searchbar",
-      widgetName: "search-container",
-    }],
-    ["searchIcon", {
-      query: (aDocument) => {
-        let searchbar = aDocument.getElementById("searchbar");
-        return aDocument.getAnonymousElementByAttribute(searchbar,
-                                                        "anonid",
-                                                        "searchbar-search-button");
-      },
-      widgetName: "search-container",
-    }],
-    ["searchPrefsLink", {
-      query: (aDocument) => {
-        let element = null;
-        let popup = aDocument.getElementById("PopupSearchAutoComplete");
-        if (popup.state != "open")
-          return null;
-        element = aDocument.getAnonymousElementByAttribute(popup,
-                                                           "anonid",
-                                                           "search-settings");
-        if (!element || !UITour.isElementVisible(element)) {
-          return null;
-        }
-        return element;
-      },
-    }],
-    ["selectedTabIcon", {
-      query: (aDocument) => {
-        let selectedtab = aDocument.defaultView.gBrowser.selectedTab;
-        let element = aDocument.getAnonymousElementByAttribute(selectedtab,
-                                                               "anonid",
-                                                               "tab-icon-image");
-        if (!element || !UITour.isElementVisible(element)) {
-          return null;
-        }
-        return element;
-      },
-    }],
-    ["trackingProtection", {
-      query: "#tracking-protection-icon",
-    }],
-    ["urlbar",      {
-      query: "#urlbar",
-      widgetName: "urlbar-container",
-    }],
-    ["webide",      {query: "#webide-button"}],
-  ]),
-
-  init: function() {
-    log.debug("Initializing UITour");
-    // Lazy getter is initialized here so it can be replicated any time
-    // in a test.
-    delete this.seenPageIDs;
-    Object.defineProperty(this, "seenPageIDs", {
-      get: this.restoreSeenPageIDs.bind(this),
-      configurable: true,
-    });
-
-    delete this.url;
-    XPCOMUtils.defineLazyGetter(this, "url", function () {
-      return Services.urlFormatter.formatURLPref("browser.uitour.url");
-    });
-
-    // Clear the availableTargetsCache on widget changes.
-    let listenerMethods = [
-      "onWidgetAdded",
-      "onWidgetMoved",
-      "onWidgetRemoved",
-      "onWidgetReset",
-      "onAreaReset",
-    ];
-    CustomizableUI.addListener(listenerMethods.reduce((listener, method) => {
-      listener[method] = () => this.clearAvailableTargetsCache();
-      return listener;
-    }, {}));
-  },
-
-  restoreSeenPageIDs: function() {
-    delete this.seenPageIDs;
-
-    if (UITelemetry.enabled) {
-      let dateThreshold = Date.now() - SEENPAGEID_EXPIRY;
-
-      try {
-        let data = Services.prefs.getCharPref(PREF_SEENPAGEIDS);
-        data = new Map(JSON.parse(data));
-
-        for (let [pageID, details] of data) {
-
-          if (typeof pageID != "string" ||
-              typeof details != "object" ||
-              typeof details.lastSeen != "number" ||
-              details.lastSeen < dateThreshold) {
-
-            data.delete(pageID);
-          }
-        }
-
-        this.seenPageIDs = data;
-      } catch (e) {}
-    }
-
-    if (!this.seenPageIDs)
-      this.seenPageIDs = new Map();
-
-    this.persistSeenIDs();
-
-    return this.seenPageIDs;
-  },
-
-  addSeenPageID: function(aPageID) {
-    if (!UITelemetry.enabled)
-      return;
-
-    this.seenPageIDs.set(aPageID, {
-      lastSeen: Date.now(),
-    });
-
-    this.persistSeenIDs();
-  },
-
-  persistSeenIDs: function() {
-    if (this.seenPageIDs.size === 0) {
-      Services.prefs.clearUserPref(PREF_SEENPAGEIDS);
-      return;
-    }
-
-    Services.prefs.setCharPref(PREF_SEENPAGEIDS,
-                               JSON.stringify([...this.seenPageIDs]));
-  },
-
-  get _readerViewTriggerRegEx() {
-    delete this._readerViewTriggerRegEx;
-    let readerViewUITourTrigger = Services.prefs.getCharPref(PREF_READERVIEW_TRIGGER);
-    return this._readerViewTriggerRegEx = new RegExp(readerViewUITourTrigger, "i");
-  },
-
-  onLocationChange: function(aLocation) {
-    // The ReaderView tour page is expected to run in Reader View,
-    // which disables JavaScript on the page. To get around that, we
-    // automatically start a pre-defined tour on page load (for hysterical
-    // raisins the ReaderView tour is known as "readinglist")
-    let originalUrl = ReaderMode.getOriginalUrl(aLocation);
-    if (this._readerViewTriggerRegEx.test(originalUrl)) {
-      this.startSubTour("readinglist");
-    }
-  },
-
-  onPageEvent: function(aMessage, aEvent) {
-    let browser = aMessage.target;
-    let window = browser.ownerGlobal;
-
-    // Does the window have tabs? We need to make sure since windowless browsers do
-    // not have tabs.
-    if (!window.gBrowser) {
-      // When using windowless browsers we don't have a valid |window|. If that's the case,
-      // use the most recent window as a target for UITour functions (see Bug 1111022).
-      window = Services.wm.getMostRecentWindow("navigator:browser");
-    }
-
-    let messageManager = browser.messageManager;
-
-    log.debug("onPageEvent:", aEvent.detail, aMessage);
-
-    if (typeof aEvent.detail != "object") {
-      log.warn("Malformed event - detail not an object");
-      return false;
-    }
-
-    let action = aEvent.detail.action;
-    if (typeof action != "string" || !action) {
-      log.warn("Action not defined");
-      return false;
-    }
-
-    let data = aEvent.detail.data;
-    if (typeof data != "object") {
-      log.warn("Malformed event - data not an object");
-      return false;
-    }
-
-    if ((aEvent.pageVisibilityState == "hidden" ||
-         aEvent.pageVisibilityState == "unloaded") &&
-        !BACKGROUND_PAGE_ACTIONS_ALLOWED.has(action)) {
-      log.warn("Ignoring disallowed action from a hidden page:", action);
-      return false;
-    }
-
-    switch (action) {
-      case "registerPageID": {
-        if (typeof data.pageID != "string") {
-          log.warn("registerPageID: pageID must be a string");
-          break;
-        }
-
-        this.pageIDsForSession.set(data.pageID, {lastSeen: Date.now()});
-
-        // The rest is only relevant if Telemetry is enabled.
-        if (!UITelemetry.enabled) {
-          log.debug("registerPageID: Telemetry disabled, not doing anything");
-          break;
-        }
-
-        // We don't want to allow BrowserUITelemetry.BUCKET_SEPARATOR in the
-        // pageID, as it could make parsing the telemetry bucket name difficult.
-        if (data.pageID.includes(BrowserUITelemetry.BUCKET_SEPARATOR)) {
-          log.warn("registerPageID: Invalid page ID specified");
-          break;
-        }
-
-        this.addSeenPageID(data.pageID);
-        this.pageIDSourceBrowsers.set(browser, data.pageID);
-        this.setTelemetryBucket(data.pageID);
-
-        break;
-      }
-
-      case "showHeartbeat": {
-        // Validate the input parameters.
-        if (typeof data.message !== "string" || data.message === "") {
-          log.error("showHeartbeat: Invalid message specified.");
-          return false;
-        }
-
-        if (typeof data.thankyouMessage !== "string" || data.thankyouMessage === "") {
-          log.error("showHeartbeat: Invalid thank you message specified.");
-          return false;
-        }
-
-        if (typeof data.flowId !== "string" || data.flowId === "") {
-          log.error("showHeartbeat: Invalid flowId specified.");
-          return false;
-        }
-
-        if (data.engagementButtonLabel && typeof data.engagementButtonLabel != "string") {
-          log.error("showHeartbeat: Invalid engagementButtonLabel specified");
-          return false;
-        }
-
-        let heartbeatWindow = window;
-        if (data.privateWindowsOnly && !PrivateBrowsingUtils.isWindowPrivate(heartbeatWindow)) {
-          heartbeatWindow = RecentWindow.getMostRecentBrowserWindow({ private: true });
-          if (!heartbeatWindow) {
-            log.debug("showHeartbeat: No private window found");
-            return false;
-          }
-        }
-
-        // Finally show the Heartbeat UI.
-        this.showHeartbeat(heartbeatWindow, data);
-        break;
-      }
-
-      case "showHighlight": {
-        let targetPromise = this.getTarget(window, data.target);
-        targetPromise.then(target => {
-          if (!target.node) {
-            log.error("UITour: Target could not be resolved: " + data.target);
-            return;
-          }
-          let effect = undefined;
-          if (this.highlightEffects.indexOf(data.effect) !== -1) {
-            effect = data.effect;
-          }
-          this.showHighlight(window, target, effect);
-        }).catch(log.error);
-        break;
-      }
-
-      case "hideHighlight": {
-        this.hideHighlight(window);
-        break;
-      }
-
-      case "showInfo": {
-        let targetPromise = this.getTarget(window, data.target, true);
-        targetPromise.then(target => {
-          if (!target.node) {
-            log.error("UITour: Target could not be resolved: " + data.target);
-            return;
-          }
-
-          let iconURL = null;
-          if (typeof data.icon == "string")
-            iconURL = this.resolveURL(browser, data.icon);
-
-          let buttons = [];
-          if (Array.isArray(data.buttons) && data.buttons.length > 0) {
-            for (let buttonData of data.buttons) {
-              if (typeof buttonData == "object" &&
-                  typeof buttonData.label == "string" &&
-                  typeof buttonData.callbackID == "string") {
-                let callback = buttonData.callbackID;
-                let button = {
-                  label: buttonData.label,
-                  callback: event => {
-                    this.sendPageCallback(messageManager, callback);
-                  },
-                };
-
-                if (typeof buttonData.icon == "string")
-                  button.iconURL = this.resolveURL(browser, buttonData.icon);
-
-                if (typeof buttonData.style == "string")
-                  button.style = buttonData.style;
-
-                buttons.push(button);
-
-                if (buttons.length == MAX_BUTTONS) {
-                  log.warn("showInfo: Reached limit of allowed number of buttons");
-                  break;
-                }
-              }
-            }
-          }
-
-          let infoOptions = {};
-          if (typeof data.closeButtonCallbackID == "string") {
-            infoOptions.closeButtonCallback = () => {
-              this.sendPageCallback(messageManager, data.closeButtonCallbackID);
-            };
-          }
-          if (typeof data.targetCallbackID == "string") {
-            infoOptions.targetCallback = details => {
-              this.sendPageCallback(messageManager, data.targetCallbackID, details);
-            };
-          }
-
-          this.showInfo(window, target, data.title, data.text, iconURL, buttons, infoOptions);
-        }).catch(log.error);
-        break;
-      }
-
-      case "hideInfo": {
-        this.hideInfo(window);
-        break;
-      }
-
-      case "previewTheme": {
-        this.previewTheme(data.theme);
-        break;
-      }
-
-      case "resetTheme": {
-        this.resetTheme();
-        break;
-      }
-
-      case "showMenu": {
-        this.showMenu(window, data.name, () => {
-          if (typeof data.showCallbackID == "string")
-            this.sendPageCallback(messageManager, data.showCallbackID);
-        });
-        break;
-      }
-
-      case "hideMenu": {
-        this.hideMenu(window, data.name);
-        break;
-      }
-
-      case "showNewTab": {
-        this.showNewTab(window, browser);
-        break;
-      }
-
-      case "getConfiguration": {
-        if (typeof data.configuration != "string") {
-          log.warn("getConfiguration: No configuration option specified");
-          return false;
-        }
-
-        this.getConfiguration(messageManager, window, data.configuration, data.callbackID);
-        break;
-      }
-
-      case "setConfiguration": {
-        if (typeof data.configuration != "string") {
-          log.warn("setConfiguration: No configuration option specified");
-          return false;
-        }
-
-        this.setConfiguration(window, data.configuration, data.value);
-        break;
-      }
-
-      case "openPreferences": {
-        if (typeof data.pane != "string" && typeof data.pane != "undefined") {
-          log.warn("openPreferences: Invalid pane specified");
-          return false;
-        }
-
-        window.openPreferences(data.pane);
-        break;
-      }
-
-      case "showFirefoxAccounts": {
-        // 'signup' is the only action that makes sense currently, so we don't
-        // accept arbitrary actions just to be safe...
-        let p = new URLSearchParams("action=signup&entrypoint=uitour");
-        // Call our helper to validate extraURLCampaignParams and populate URLSearchParams
-        if (!this._populateCampaignParams(p, data.extraURLCampaignParams)) {
-          log.warn("showFirefoxAccounts: invalid campaign args specified");
-          return false;
-        }
-
-        // We want to replace the current tab.
-        browser.loadURI("about:accounts?" + p.toString());
-        break;
-      }
-
-      case "resetFirefox": {
-        // Open a reset profile dialog window.
-        if (ResetProfile.resetSupported()) {
-          ResetProfile.openConfirmationDialog(window);
-        }
-        break;
-      }
-
-      case "addNavBarWidget": {
-        // Add a widget to the toolbar
-        let targetPromise = this.getTarget(window, data.name);
-        targetPromise.then(target => {
-          this.addNavBarWidget(target, messageManager, data.callbackID);
-        }).catch(log.error);
-        break;
-      }
-
-      case "setDefaultSearchEngine": {
-        let enginePromise = this.selectSearchEngine(data.identifier);
-        enginePromise.catch(Cu.reportError);
-        break;
-      }
-
-      case "setTreatmentTag": {
-        let name = data.name;
-        let value = data.value;
-        let string = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
-        string.data = value;
-        Services.prefs.setComplexValue("browser.uitour.treatment." + name,
-                                       Ci.nsISupportsString, string);
-        // The notification is only meant to be used in tests.
-        UITourHealthReport.recordTreatmentTag(name, value)
-                          .then(() => this.notify("TreatmentTag:TelemetrySent"));
-        break;
-      }
-
-      case "getTreatmentTag": {
-        let name = data.name;
-        let value;
-        try {
-          value = Services.prefs.getComplexValue("browser.uitour.treatment." + name,
-                                                 Ci.nsISupportsString).data;
-        } catch (ex) {}
-        this.sendPageCallback(messageManager, data.callbackID, { value: value });
-        break;
-      }
-
-      case "setSearchTerm": {
-        let targetPromise = this.getTarget(window, "search");
-        targetPromise.then(target => {
-          let searchbar = target.node;
-          searchbar.value = data.term;
-          searchbar.updateGoButtonVisibility();
-        });
-        break;
-      }
-
-      case "openSearchPanel": {
-        let targetPromise = this.getTarget(window, "search");
-        targetPromise.then(target => {
-          let searchbar = target.node;
-
-          if (searchbar.textbox.open) {
-            this.sendPageCallback(messageManager, data.callbackID);
-          } else {
-            let onPopupShown = () => {
-              searchbar.textbox.popup.removeEventListener("popupshown", onPopupShown);
-              this.sendPageCallback(messageManager, data.callbackID);
-            };
-
-            searchbar.textbox.popup.addEventListener("popupshown", onPopupShown);
-            searchbar.openSuggestionsPanel();
-          }
-        }).then(null, Cu.reportError);
-        break;
-      }
-
-      case "ping": {
-        if (typeof data.callbackID == "string")
-          this.sendPageCallback(messageManager, data.callbackID);
-        break;
-      }
-
-      case "forceShowReaderIcon": {
-        ReaderParent.forceShowReaderIcon(browser);
-        break;
-      }
-
-      case "toggleReaderMode": {
-        let targetPromise = this.getTarget(window, "readerMode-urlBar");
-        targetPromise.then(target => {
-          ReaderParent.toggleReaderMode({target: target.node});
-        });
-        break;
-      }
-
-      case "closeTab": {
-        // Find the <tabbrowser> element of the <browser> for which the event
-        // was generated originally. If the browser where the UI tour is loaded
-        // is windowless, just ignore the request to close the tab. The request
-        // is also ignored if this is the only tab in the window.
-        let tabBrowser = browser.ownerGlobal.gBrowser;
-        if (tabBrowser && tabBrowser.browsers.length > 1) {
-          tabBrowser.removeTab(tabBrowser.getTabForBrowser(browser));
-        }
-        break;
-      }
-    }
-
-    this.initForBrowser(browser, window);
-
-    return true;
-  },
-
-  initForBrowser(aBrowser, window) {
-    let gBrowser = window.gBrowser;
-
-    if (gBrowser) {
-        gBrowser.tabContainer.addEventListener("TabSelect", this);
-    }
-
-    if (!this.tourBrowsersByWindow.has(window)) {
-      this.tourBrowsersByWindow.set(window, new Set());
-    }
-    this.tourBrowsersByWindow.get(window).add(aBrowser);
-
-    Services.obs.addObserver(this, "message-manager-close", false);
-
-    window.addEventListener("SSWindowClosing", this);
-  },
-
-  handleEvent: function(aEvent) {
-    log.debug("handleEvent: type =", aEvent.type, "event =", aEvent);
-    switch (aEvent.type) {
-      case "TabSelect": {
-        let window = aEvent.target.ownerGlobal;
-
-        // Teardown the browser of the tab we just switched away from.
-        if (aEvent.detail && aEvent.detail.previousTab) {
-          let previousTab = aEvent.detail.previousTab;
-          let openTourWindows = this.tourBrowsersByWindow.get(window);
-          if (openTourWindows.has(previousTab.linkedBrowser)) {
-            this.teardownTourForBrowser(window, previousTab.linkedBrowser, false);
-          }
-        }
-
-        break;
-      }
-
-      case "SSWindowClosing": {
-        let window = aEvent.target;
-        this.teardownTourForWindow(window);
-        break;
-      }
-    }
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    log.debug("observe: aTopic =", aTopic);
-    switch (aTopic) {
-      // The browser message manager is disconnected when the <browser> is
-      // destroyed and we want to teardown at that point.
-      case "message-manager-close": {
-        let winEnum = Services.wm.getEnumerator("navigator:browser");
-        while (winEnum.hasMoreElements()) {
-          let window = winEnum.getNext();
-          if (window.closed)
-            continue;
-
-          let tourBrowsers = this.tourBrowsersByWindow.get(window);
-          if (!tourBrowsers)
-            continue;
-
-          for (let browser of tourBrowsers) {
-            let messageManager = browser.messageManager;
-            if (aSubject != messageManager) {
-              continue;
-            }
-
-            this.teardownTourForBrowser(window, browser, true);
-            return;
-          }
-        }
-        break;
-      }
-    }
-  },
-
-  // Given a string that is a JSONified represenation of an object with
-  // additional utm_* URL params that should be appended, validate and append
-  // them to the passed URLSearchParams object. Returns true if the params
-  // were validated and appended, and false if the request should be ignored.
-  _populateCampaignParams: function(urlSearchParams, extraURLCampaignParams) {
-    // We are extra paranoid about what params we allow to be appended.
-    if (typeof extraURLCampaignParams == "undefined") {
-      // no params, so it's all good.
-      return true;
-    }
-    if (typeof extraURLCampaignParams != "string") {
-      log.warn("_populateCampaignParams: extraURLCampaignParams is not a string");
-      return false;
-    }
-    let campaignParams;
-    try {
-      if (extraURLCampaignParams) {
-        campaignParams = JSON.parse(extraURLCampaignParams);
-        if (typeof campaignParams != "object") {
-          log.warn("_populateCampaignParams: extraURLCampaignParams is not a stringified object");
-          return false;
-        }
-      }
-    } catch (ex) {
-      log.warn("_populateCampaignParams: extraURLCampaignParams is not a JSON object");
-      return false;
-    }
-    if (campaignParams) {
-      // The regex that the name of each param must match - there's no
-      // character restriction on the value - they will be escaped as necessary.
-      let reSimpleString = /^[-_a-zA-Z0-9]*$/;
-      for (let name in campaignParams) {
-        let value = campaignParams[name];
-        if (typeof name != "string" || typeof value != "string" ||
-            !name.startsWith("utm_") ||
-            value.length == 0 ||
-            !reSimpleString.test(name)) {
-          log.warn("_populateCampaignParams: invalid campaign param specified");
-          return false;
-        }
-        urlSearchParams.append(name, value);
-      }
-    }
-    return true;
-  },
-
-  setTelemetryBucket: function(aPageID) {
-    let bucket = BUCKET_NAME + BrowserUITelemetry.BUCKET_SEPARATOR + aPageID;
-    BrowserUITelemetry.setBucket(bucket);
-  },
-
-  setExpiringTelemetryBucket: function(aPageID, aType) {
-    let bucket = BUCKET_NAME + BrowserUITelemetry.BUCKET_SEPARATOR + aPageID +
-                 BrowserUITelemetry.BUCKET_SEPARATOR + aType;
-
-    BrowserUITelemetry.setExpiringBucket(bucket,
-                                         BUCKET_TIMESTEPS);
-  },
-
-  // This is registered with UITelemetry by BrowserUITelemetry, so that UITour
-  // can remain lazy-loaded on-demand.
-  getTelemetry: function() {
-    return {
-      seenPageIDs: [...this.seenPageIDs.keys()],
-    };
-  },
-
-  /**
-   * Tear down a tour from a tab e.g. upon switching/closing tabs.
-   */
-  teardownTourForBrowser: function(aWindow, aBrowser, aTourPageClosing = false) {
-    log.debug("teardownTourForBrowser: aBrowser = ", aBrowser, aTourPageClosing);
-
-    if (this.pageIDSourceBrowsers.has(aBrowser)) {
-      let pageID = this.pageIDSourceBrowsers.get(aBrowser);
-      this.setExpiringTelemetryBucket(pageID, aTourPageClosing ? "closed" : "inactive");
-    }
-
-    let openTourBrowsers = this.tourBrowsersByWindow.get(aWindow);
-    if (aTourPageClosing && openTourBrowsers) {
-      openTourBrowsers.delete(aBrowser);
-    }
-
-    this.hideHighlight(aWindow);
-    this.hideInfo(aWindow);
-    // Ensure the menu panel is hidden before calling recreatePopup so popup events occur.
-    this.hideMenu(aWindow, "appMenu");
-    this.hideMenu(aWindow, "controlCenter");
-
-    // Clean up panel listeners after calling hideMenu above.
-    aWindow.PanelUI.panel.removeEventListener("popuphiding", this.hideAppMenuAnnotations);
-    aWindow.PanelUI.panel.removeEventListener("ViewShowing", this.hideAppMenuAnnotations);
-    aWindow.PanelUI.panel.removeEventListener("popuphidden", this.onPanelHidden);
-    let controlCenterPanel = aWindow.gIdentityHandler._identityPopup;
-    controlCenterPanel.removeEventListener("popuphidden", this.onPanelHidden);
-    controlCenterPanel.removeEventListener("popuphiding", this.hideControlCenterAnnotations);
-
-    this.resetTheme();
-
-    // If there are no more tour tabs left in the window, teardown the tour for the whole window.
-    if (!openTourBrowsers || openTourBrowsers.size == 0) {
-      this.teardownTourForWindow(aWindow);
-    }
-  },
-
-  /**
-   * Tear down all tours for a ChromeWindow.
-   */
-  teardownTourForWindow: function(aWindow) {
-    log.debug("teardownTourForWindow");
-    aWindow.gBrowser.tabContainer.removeEventListener("TabSelect", this);
-    aWindow.removeEventListener("SSWindowClosing", this);
-
-    let openTourBrowsers = this.tourBrowsersByWindow.get(aWindow);
-    if (openTourBrowsers) {
-      for (let browser of openTourBrowsers) {
-        if (this.pageIDSourceBrowsers.has(browser)) {
-          let pageID = this.pageIDSourceBrowsers.get(browser);
-          this.setExpiringTelemetryBucket(pageID, "closed");
-        }
-      }
-    }
-
-    this.tourBrowsersByWindow.delete(aWindow);
-  },
-
-  // This function is copied to UITourListener.
-  isSafeScheme: function(aURI) {
-    let allowedSchemes = new Set(["https", "about"]);
-    if (!Services.prefs.getBoolPref("browser.uitour.requireSecure"))
-      allowedSchemes.add("http");
-
-    if (!allowedSchemes.has(aURI.scheme)) {
-      log.error("Unsafe scheme:", aURI.scheme);
-      return false;
-    }
-
-    return true;
-  },
-
-  resolveURL: function(aBrowser, aURL) {
-    try {
-      let uri = Services.io.newURI(aURL, null, aBrowser.currentURI);
-
-      if (!this.isSafeScheme(uri))
-        return null;
-
-      return uri.spec;
-    } catch (e) {}
-
-    return null;
-  },
-
-  sendPageCallback: function(aMessageManager, aCallbackID, aData = {}) {
-    let detail = {data: aData, callbackID: aCallbackID};
-    log.debug("sendPageCallback", detail);
-    aMessageManager.sendAsyncMessage("UITour:SendPageCallback", detail);
-  },
-
-  isElementVisible: function(aElement) {
-    let targetStyle = aElement.ownerGlobal.getComputedStyle(aElement);
-    return !aElement.ownerDocument.hidden &&
-             targetStyle.display != "none" &&
-             targetStyle.visibility == "visible";
-  },
-
-  getTarget: function(aWindow, aTargetName, aSticky = false) {
-    log.debug("getTarget:", aTargetName);
-    let deferred = Promise.defer();
-    if (typeof aTargetName != "string" || !aTargetName) {
-      log.warn("getTarget: Invalid target name specified");
-      deferred.reject("Invalid target name specified");
-      return deferred.promise;
-    }
-
-    let targetObject = this.targets.get(aTargetName);
-    if (!targetObject) {
-      log.warn("getTarget: The specified target name is not in the allowed set");
-      deferred.reject("The specified target name is not in the allowed set");
-      return deferred.promise;
-    }
-
-    let targetQuery = targetObject.query;
-    aWindow.PanelUI.ensureReady().then(() => {
-      let node;
-      if (typeof targetQuery == "function") {
-        try {
-          node = targetQuery(aWindow.document);
-        } catch (ex) {
-          log.warn("getTarget: Error running target query:", ex);
-          node = null;
-        }
-      } else {
-        node = aWindow.document.querySelector(targetQuery);
-      }
-
-      deferred.resolve({
-        addTargetListener: targetObject.addTargetListener,
-        infoPanelOffsetX: targetObject.infoPanelOffsetX,
-        infoPanelOffsetY: targetObject.infoPanelOffsetY,
-        infoPanelPosition: targetObject.infoPanelPosition,
-        node: node,
-        removeTargetListener: targetObject.removeTargetListener,
-        targetName: aTargetName,
-        widgetName: targetObject.widgetName,
-        allowAdd: targetObject.allowAdd,
-      });
-    }).catch(log.error);
-    return deferred.promise;
-  },
-
-  targetIsInAppMenu: function(aTarget) {
-    let placement = CustomizableUI.getPlacementOfWidget(aTarget.widgetName || aTarget.node.id);
-    if (placement && placement.area == CustomizableUI.AREA_PANEL) {
-      return true;
-    }
-
-    let targetElement = aTarget.node;
-    // Use the widget for filtering if it exists since the target may be the icon inside.
-    if (aTarget.widgetName) {
-      targetElement = aTarget.node.ownerDocument.getElementById(aTarget.widgetName);
-    }
-
-    // Handle the non-customizable buttons at the bottom of the menu which aren't proper widgets.
-    return targetElement.id.startsWith("PanelUI-")
-             && targetElement.id != "PanelUI-button";
-  },
-
-  /**
-   * Called before opening or after closing a highlight or info panel to see if
-   * we need to open or close the appMenu to see the annotation's anchor.
-   */
-  _setAppMenuStateForAnnotation: function(aWindow, aAnnotationType, aShouldOpenForHighlight, aCallback = null) {
-    log.debug("_setAppMenuStateForAnnotation:", aAnnotationType);
-    log.debug("_setAppMenuStateForAnnotation: Menu is expected to be:", aShouldOpenForHighlight ? "open" : "closed");
-
-    // If the panel is in the desired state, we're done.
-    let panelIsOpen = aWindow.PanelUI.panel.state != "closed";
-    if (aShouldOpenForHighlight == panelIsOpen) {
-      log.debug("_setAppMenuStateForAnnotation: Panel already in expected state");
-      if (aCallback)
-        aCallback();
-      return;
-    }
-
-    // Don't close the menu if it wasn't opened by us (e.g. via showmenu instead).
-    if (!aShouldOpenForHighlight && !this.appMenuOpenForAnnotation.has(aAnnotationType)) {
-      log.debug("_setAppMenuStateForAnnotation: Menu not opened by us, not closing");
-      if (aCallback)
-        aCallback();
-      return;
-    }
-
-    if (aShouldOpenForHighlight) {
-      this.appMenuOpenForAnnotation.add(aAnnotationType);
-    } else {
-      this.appMenuOpenForAnnotation.delete(aAnnotationType);
-    }
-
-    // Actually show or hide the menu
-    if (this.appMenuOpenForAnnotation.size) {
-      log.debug("_setAppMenuStateForAnnotation: Opening the menu");
-      this.showMenu(aWindow, "appMenu", aCallback);
-    } else {
-      log.debug("_setAppMenuStateForAnnotation: Closing the menu");
-      this.hideMenu(aWindow, "appMenu");
-      if (aCallback)
-        aCallback();
-    }
-
-  },
-
-  previewTheme: function(aTheme) {
-    let origin = Services.prefs.getCharPref("browser.uitour.themeOrigin");
-    let data = LightweightThemeManager.parseTheme(aTheme, origin);
-    if (data)
-      LightweightThemeManager.previewTheme(data);
-  },
-
-  resetTheme: function() {
-    LightweightThemeManager.resetPreview();
-  },
-
-  /**
-   * Show the Heartbeat UI to request user feedback. This function reports back to the
-   * caller using |notify|. The notification event name reflects the current status the UI
-   * is in (either "Heartbeat:NotificationOffered", "Heartbeat:NotificationClosed",
-   * "Heartbeat:LearnMore", "Heartbeat:Engaged", "Heartbeat:Voted",
-   * "Heartbeat:SurveyExpired" or "Heartbeat:WindowClosed").
-   * When a "Heartbeat:Voted" event is notified
-   * the data payload contains a |score| field which holds the rating picked by the user.
-   * Please note that input parameters are already validated by the caller.
-   *
-   * @param aChromeWindow
-   *        The chrome window that the heartbeat notification is displayed in.
-   * @param {Object} aOptions Options object.
-   * @param {String} aOptions.message
-   *        The message, or question, to display on the notification.
-   * @param {String} aOptions.thankyouMessage
-   *        The thank you message to display after user votes.
-   * @param {String} aOptions.flowId
-   *        An identifier for this rating flow. Please note that this is only used to
-   *        identify the notification box.
-   * @param {String} [aOptions.engagementButtonLabel=null]
-   *        The text of the engagement button to use instad of stars. If this is null
-   *        or invalid, rating stars are used.
-   * @param {String} [aOptions.engagementURL=null]
-   *        The engagement URL to open in a new tab once user has engaged. If this is null
-   *        or invalid, no new tab is opened.
-   * @param {String} [aOptions.learnMoreLabel=null]
-   *        The label of the learn more link. No link will be shown if this is null.
-   * @param {String} [aOptions.learnMoreURL=null]
-   *        The learn more URL to open when clicking on the learn more link. No learn more
-   *        will be shown if this is an invalid URL.
-   * @param {boolean} [aOptions.privateWindowsOnly=false]
-   *        Whether the heartbeat UI should only be targeted at a private window (if one exists).
-   *        No notifications should be fired when this is true.
-   * @param {String} [aOptions.surveyId]
-   *        An ID for the survey, reflected in the Telemetry ping.
-   * @param {Number} [aOptions.surveyVersion]
-   *        Survey's version number, reflected in the Telemetry ping.
-   * @param {boolean} [aOptions.testing]
-   *        Whether this is a test survey, reflected in the Telemetry ping.
-   */
-  showHeartbeat(aChromeWindow, aOptions) {
-    // Initialize survey state
-    let pingSent = false;
-    let surveyResults = {};
-    let surveyEndTimer = null;
-
-    /**
-     * Accumulates survey events and submits to Telemetry after the survey ends.
-     *
-     * @param {String} aEventName
-     *        Heartbeat event name
-     * @param {Object} aParams
-     *        Additional parameters and their values
-     */
-    let maybeNotifyHeartbeat = (aEventName, aParams = {}) => {
-      // Return if event occurred after the ping was sent
-      if (pingSent) {
-        log.warn("maybeNotifyHeartbeat: event occurred after ping sent:", aEventName, aParams);
-        return;
-      }
-
-      // No Telemetry from private-window-only Heartbeats
-      if (aOptions.privateWindowsOnly) {
-        return;
-      }
-
-      let ts = Date.now();
-      let sendPing = false;
-      switch (aEventName) {
-        case "Heartbeat:NotificationOffered":
-          surveyResults.flowId = aOptions.flowId;
-          surveyResults.offeredTS = ts;
-          break;
-        case "Heartbeat:LearnMore":
-          // record only the first click
-          if (!surveyResults.learnMoreTS) {
-            surveyResults.learnMoreTS = ts;
-          }
-          break;
-        case "Heartbeat:Engaged":
-          surveyResults.engagedTS = ts;
-          break;
-        case "Heartbeat:Voted":
-          surveyResults.votedTS = ts;
-          surveyResults.score = aParams.score;
-          break;
-        case "Heartbeat:SurveyExpired":
-          surveyResults.expiredTS = ts;
-          break;
-        case "Heartbeat:NotificationClosed":
-          // this is the final event in most surveys
-          surveyResults.closedTS = ts;
-          sendPing = true;
-          break;
-        case "Heartbeat:WindowClosed":
-          surveyResults.windowClosedTS = ts;
-          sendPing = true;
-          break;
-        default:
-          log.error("maybeNotifyHeartbeat: unrecognized event:", aEventName);
-          break;
-      }
-
-      aParams.timestamp = ts;
-      aParams.flowId = aOptions.flowId;
-      this.notify(aEventName, aParams);
-
-      if (!sendPing) {
-        return;
-      }
-
-      // Send the ping to Telemetry
-      let payload = Object.assign({}, surveyResults);
-      payload.version = 1;
-      for (let meta of ["surveyId", "surveyVersion", "testing"]) {
-        if (aOptions.hasOwnProperty(meta)) {
-          payload[meta] = aOptions[meta];
-        }
-      }
-
-      log.debug("Sending payload to Telemetry: aEventName:", aEventName,
-                "payload:", payload);
-
-      TelemetryController.submitExternalPing("heartbeat", payload, {
-        addClientId: true,
-        addEnvironment: true,
-      });
-
-      // only for testing
-      this.notify("Heartbeat:TelemetrySent", payload);
-
-      // Survey is complete, clear out the expiry timer & survey configuration
-      if (surveyEndTimer) {
-        clearTimeout(surveyEndTimer);
-        surveyEndTimer = null;
-      }
-
-      pingSent = true;
-      surveyResults = {};
-    };
-
-    let nb = aChromeWindow.document.getElementById("high-priority-global-notificationbox");
-    let buttons = null;
-
-    if (aOptions.engagementButtonLabel) {
-      buttons = [{
-        label: aOptions.engagementButtonLabel,
-        callback: () => {
-          // Let the consumer know user engaged.
-          maybeNotifyHeartbeat("Heartbeat:Engaged");
-
-          userEngaged(new Map([
-            ["type", "button"],
-            ["flowid", aOptions.flowId]
-          ]));
-
-          // Return true so that the notification bar doesn't close itself since
-          // we have a thank you message to show.
-          return true;
-        },
-      }];
-    }
-
-    let defaultIcon = "chrome://browser/skin/heartbeat-icon.svg";
-    let iconURL = defaultIcon;
-    try {
-      // Take the optional icon URL if specified
-      if (aOptions.iconURL) {
-        iconURL = new URL(aOptions.iconURL);
-        // For now, only allow chrome URIs.
-        if (iconURL.protocol != "chrome:") {
-          iconURL = defaultIcon;
-          throw new Error("Invalid protocol");
-        }
-      }
-    } catch (error) {
-      log.error("showHeartbeat: Invalid icon URL specified.");
-    }
-
-    // Create the notification. Prefix its ID to decrease the chances of collisions.
-    let notice = nb.appendNotification(aOptions.message, "heartbeat-" + aOptions.flowId,
-                                       iconURL,
-                                       nb.PRIORITY_INFO_HIGH, buttons,
-                                       (aEventType) => {
-                                         if (aEventType != "removed") {
-                                           return;
-                                         }
-                                         // Let the consumer know the notification bar was closed.
-                                         // This also happens after voting.
-                                         maybeNotifyHeartbeat("Heartbeat:NotificationClosed");
-                                       });
-
-    // Get the elements we need to style.
-    let messageImage =
-      aChromeWindow.document.getAnonymousElementByAttribute(notice, "anonid", "messageImage");
-    let messageText =
-      aChromeWindow.document.getAnonymousElementByAttribute(notice, "anonid", "messageText");
-
-    function userEngaged(aEngagementParams) {
-      // Make the heartbeat icon pulse twice.
-      notice.label = aOptions.thankyouMessage;
-      messageImage.classList.remove("pulse-onshow");
-      messageImage.classList.add("pulse-twice");
-
-      // Remove all the children of the notice (rating container
-      // and the flex).
-      while (notice.firstChild) {
-        notice.removeChild(notice.firstChild);
-      }
-
-      // Make sure that we have a valid URL. If we haven't, do not open the engagement page.
-      let engagementURL = null;
-      try {
-        engagementURL = new URL(aOptions.engagementURL);
-      } catch (error) {
-        log.error("showHeartbeat: Invalid URL specified.");
-      }
-
-      // Just open the engagement tab if we have a valid engagement URL.
-      if (engagementURL) {
-        for (let [param, value] of aEngagementParams) {
-          engagementURL.searchParams.append(param, value);
-        }
-
-        // Open the engagement URL in a new tab.
-        aChromeWindow.gBrowser.selectedTab =
-          aChromeWindow.gBrowser.addTab(engagementURL.toString(), {
-            owner: aChromeWindow.gBrowser.selectedTab,
-            relatedToCurrent: true
-          });
-      }
-
-      // Remove the notification bar after 3 seconds.
-      aChromeWindow.setTimeout(() => {
-        nb.removeNotification(notice);
-      }, 3000);
-    }
-
-    // Create the fragment holding the rating UI.
-    let frag = aChromeWindow.document.createDocumentFragment();
-
-    // Build the Heartbeat star rating.
-    const numStars = aOptions.engagementButtonLabel ? 0 : 5;
-    let ratingContainer = aChromeWindow.document.createElement("hbox");
-    ratingContainer.id = "star-rating-container";
-
-    for (let i = 0; i < numStars; i++) {
-      // Create a star rating element.
-      let ratingElement = aChromeWindow.document.createElement("toolbarbutton");
-
-      // Style it.
-      let starIndex = numStars - i;
-      ratingElement.className = "plain star-x";
-      ratingElement.id = "star" + starIndex;
-      ratingElement.setAttribute("data-score", starIndex);
-
-      // Add the click handler.
-      ratingElement.addEventListener("click", function (evt) {
-        let rating = Number(evt.target.getAttribute("data-score"), 10);
-
-        // Let the consumer know user voted.
-        maybeNotifyHeartbeat("Heartbeat:Voted", { score: rating });
-
-        // Append the score data to the engagement URL.
-        userEngaged(new Map([
-          ["type", "stars"],
-          ["score", rating],
-          ["flowid", aOptions.flowId]
-        ]));
-      }.bind(this));
-
-      // Add it to the container.
-      ratingContainer.appendChild(ratingElement);
-    }
-
-    frag.appendChild(ratingContainer);
-
-    // Make sure the stars are not pushed to the right by the spacer.
-    let rightSpacer = aChromeWindow.document.createElement("spacer");
-    rightSpacer.flex = 20;
-    frag.appendChild(rightSpacer);
-
-    messageText.flex = 0; // Collapse the space before the stars.
-    let leftSpacer = messageText.nextSibling;
-    leftSpacer.flex = 0;
-
-    // Make sure that we have a valid learn more URL.
-    let learnMoreURL = null;
-    try {
-      learnMoreURL = new URL(aOptions.learnMoreURL);
-    } catch (error) {
-      log.error("showHeartbeat: Invalid learnMore URL specified.");
-    }
-
-    // Add the learn more link.
-    if (aOptions.learnMoreLabel && learnMoreURL) {
-      let learnMore = aChromeWindow.document.createElement("label");
-      learnMore.className = "text-link";
-      learnMore.href = learnMoreURL.toString();
-      learnMore.setAttribute("value", aOptions.learnMoreLabel);
-      learnMore.addEventListener("click", () => maybeNotifyHeartbeat("Heartbeat:LearnMore"));
-      frag.appendChild(learnMore);
-    }
-
-    // Append the fragment and apply the styling.
-    notice.appendChild(frag);
-    notice.classList.add("heartbeat");
-    messageImage.classList.add("heartbeat", "pulse-onshow");
-    messageText.classList.add("heartbeat");
-
-    // Let the consumer know the notification was shown.
-    maybeNotifyHeartbeat("Heartbeat:NotificationOffered");
-
-    // End the survey if the user quits, closes the window, or
-    // hasn't responded before expiration.
-    if (!aOptions.privateWindowsOnly) {
-      function handleWindowClosed(aTopic) {
-        maybeNotifyHeartbeat("Heartbeat:WindowClosed");
-        aChromeWindow.removeEventListener("SSWindowClosing", handleWindowClosed);
-      }
-      aChromeWindow.addEventListener("SSWindowClosing", handleWindowClosed);
-
-      let surveyDuration = Services.prefs.getIntPref(PREF_SURVEY_DURATION) * 1000;
-      surveyEndTimer = setTimeout(() => {
-        maybeNotifyHeartbeat("Heartbeat:SurveyExpired");
-        nb.removeNotification(notice);
-      }, surveyDuration);
-    }
-  },
-
-  /**
-   * The node to which a highlight or notification(-popup) is anchored is sometimes
-   * obscured because it may be inside an overflow menu. This function should figure
-   * that out and offer the overflow chevron as an alternative.
-   *
-   * @param {Node} aAnchor The element that's supposed to be the anchor
-   * @type {Node}
-   */
-  _correctAnchor: function(aAnchor) {
-    // If the target is in the overflow panel, just return the overflow button.
-    if (aAnchor.getAttribute("overflowedItem")) {
-      let doc = aAnchor.ownerDocument;
-      let placement = CustomizableUI.getPlacementOfWidget(aAnchor.id);
-      let areaNode = doc.getElementById(placement.area);
-      return areaNode.overflowable._chevron;
-    }
-
-    return aAnchor;
-  },
-
-  /**
-   * @param aChromeWindow The chrome window that the highlight is in. Necessary since some targets
-   *                      are in a sub-frame so the defaultView is not the same as the chrome
-   *                      window.
-   * @param aTarget    The element to highlight.
-   * @param aEffect    (optional) The effect to use from UITour.highlightEffects or "none".
-   * @see UITour.highlightEffects
-   */
-  showHighlight: function(aChromeWindow, aTarget, aEffect = "none") {
-    function showHighlightPanel() {
-      let highlighter = aChromeWindow.document.getElementById("UITourHighlight");
-
-      let effect = aEffect;
-      if (effect == "random") {
-        // Exclude "random" from the randomly selected effects.
-        let randomEffect = 1 + Math.floor(Math.random() * (this.highlightEffects.length - 1));
-        if (randomEffect == this.highlightEffects.length)
-          randomEffect--; // On the order of 1 in 2^62 chance of this happening.
-        effect = this.highlightEffects[randomEffect];
-      }
-      // Toggle the effect attribute to "none" and flush layout before setting it so the effect plays.
-      highlighter.setAttribute("active", "none");
-      aChromeWindow.getComputedStyle(highlighter).animationName;
-      highlighter.setAttribute("active", effect);
-      highlighter.parentElement.setAttribute("targetName", aTarget.targetName);
-      highlighter.parentElement.hidden = false;
-
-      let highlightAnchor = this._correctAnchor(aTarget.node);
-      let targetRect = highlightAnchor.getBoundingClientRect();
-      let highlightHeight = targetRect.height;
-      let highlightWidth = targetRect.width;
-      let minDimension = Math.min(highlightHeight, highlightWidth);
-      let maxDimension = Math.max(highlightHeight, highlightWidth);
-
-      // If the dimensions are within 200% of each other (to include the bookmarks button),
-      // make the highlight a circle with the largest dimension as the diameter.
-      if (maxDimension / minDimension <= 3.0) {
-        highlightHeight = highlightWidth = maxDimension;
-        highlighter.style.borderRadius = "100%";
-      } else {
-        highlighter.style.borderRadius = "";
-      }
-
-      highlighter.style.height = highlightHeight + "px";
-      highlighter.style.width = highlightWidth + "px";
-
-      // Close a previous highlight so we can relocate the panel.
-      if (highlighter.parentElement.state == "showing" || highlighter.parentElement.state == "open") {
-        log.debug("showHighlight: Closing previous highlight first");
-        highlighter.parentElement.hidePopup();
-      }
-      /* The "overlap" position anchors from the top-left but we want to centre highlights at their
-         minimum size. */
-      let highlightWindow = aChromeWindow;
-      let containerStyle = highlightWindow.getComputedStyle(highlighter.parentElement);
-      let paddingTopPx = 0 - parseFloat(containerStyle.paddingTop);
-      let paddingLeftPx = 0 - parseFloat(containerStyle.paddingLeft);
-      let highlightStyle = highlightWindow.getComputedStyle(highlighter);
-      let highlightHeightWithMin = Math.max(highlightHeight, parseFloat(highlightStyle.minHeight));
-      let highlightWidthWithMin = Math.max(highlightWidth, parseFloat(highlightStyle.minWidth));
-      let offsetX = paddingTopPx
-                      - (Math.max(0, highlightWidthWithMin - targetRect.width) / 2);
-      let offsetY = paddingLeftPx
-                      - (Math.max(0, highlightHeightWithMin - targetRect.height) / 2);
-      this._addAnnotationPanelMutationObserver(highlighter.parentElement);
-      highlighter.parentElement.openPopup(highlightAnchor, "overlap", offsetX, offsetY);
-    }
-
-    // Prevent showing a panel at an undefined position.
-    if (!this.isElementVisible(aTarget.node)) {
-      log.warn("showHighlight: Not showing a highlight since the target isn't visible", aTarget);
-      return;
-    }
-
-    this._setAppMenuStateForAnnotation(aChromeWindow, "highlight",
-                                       this.targetIsInAppMenu(aTarget),
-                                       showHighlightPanel.bind(this));
-  },
-
-  hideHighlight: function(aWindow) {
-    let highlighter = aWindow.document.getElementById("UITourHighlight");
-    this._removeAnnotationPanelMutationObserver(highlighter.parentElement);
-    highlighter.parentElement.hidePopup();
-    highlighter.removeAttribute("active");
-
-    this._setAppMenuStateForAnnotation(aWindow, "highlight", false);
-  },
-
-  /**
-   * Show an info panel.
-   *
-   * @param {ChromeWindow} aChromeWindow
-   * @param {Node}     aAnchor
-   * @param {String}   [aTitle=""]
-   * @param {String}   [aDescription=""]
-   * @param {String}   [aIconURL=""]
-   * @param {Object[]} [aButtons=[]]
-   * @param {Object}   [aOptions={}]
-   * @param {String}   [aOptions.closeButtonCallback]
-   * @param {String}   [aOptions.targetCallback]
-   */
-  showInfo(aChromeWindow, aAnchor, aTitle = "", aDescription = "",
-           aIconURL = "", aButtons = [], aOptions = {}) {
-    function showInfoPanel(aAnchorEl) {
-      aAnchorEl.focus();
-
-      let document = aChromeWindow.document;
-      let tooltip = document.getElementById("UITourTooltip");
-      let tooltipTitle = document.getElementById("UITourTooltipTitle");
-      let tooltipDesc = document.getElementById("UITourTooltipDescription");
-      let tooltipIcon = document.getElementById("UITourTooltipIcon");
-      let tooltipButtons = document.getElementById("UITourTooltipButtons");
-
-      if (tooltip.state == "showing" || tooltip.state == "open") {
-        tooltip.hidePopup();
-      }
-
-      tooltipTitle.textContent = aTitle || "";
-      tooltipDesc.textContent = aDescription || "";
-      tooltipIcon.src = aIconURL || "";
-      tooltipIcon.hidden = !aIconURL;
-
-      while (tooltipButtons.firstChild)
-        tooltipButtons.firstChild.remove();
-
-      for (let button of aButtons) {
-        let isButton = button.style != "text";
-        let el = document.createElement(isButton ? "button" : "label");
-        el.setAttribute(isButton ? "label" : "value", button.label);
-
-        if (isButton) {
-          if (button.iconURL)
-            el.setAttribute("image", button.iconURL);
-
-          if (button.style == "link")
-            el.setAttribute("class", "button-link");
-
-          if (button.style == "primary")
-            el.setAttribute("class", "button-primary");
-
-          // Don't close the popup or call the callback for style=text as they
-          // aren't links/buttons.
-          let callback = button.callback;
-          el.addEventListener("command", event => {
-            tooltip.hidePopup();
-            callback(event);
-          });
-        }
-
-        tooltipButtons.appendChild(el);
-      }
-
-      tooltipButtons.hidden = !aButtons.length;
-
-      let tooltipClose = document.getElementById("UITourTooltipClose");
-      let closeButtonCallback = (event) => {
-        this.hideInfo(document.defaultView);
-        if (aOptions && aOptions.closeButtonCallback) {
-          aOptions.closeButtonCallback();
-        }
-      };
-      tooltipClose.addEventListener("command", closeButtonCallback);
-
-      let targetCallback = (event) => {
-        let details = {
-          target: aAnchor.targetName,
-          type: event.type,
-        };
-        aOptions.targetCallback(details);
-      };
-      if (aOptions.targetCallback && aAnchor.addTargetListener) {
-        aAnchor.addTargetListener(document, targetCallback);
-      }
-
-      tooltip.addEventListener("popuphiding", function tooltipHiding(event) {
-        tooltip.removeEventListener("popuphiding", tooltipHiding);
-        tooltipClose.removeEventListener("command", closeButtonCallback);
-        if (aOptions.targetCallback && aAnchor.removeTargetListener) {
-          aAnchor.removeTargetListener(document, targetCallback);
-        }
-      });
-
-      tooltip.setAttribute("targetName", aAnchor.targetName);
-      tooltip.hidden = false;
-      let alignment = "bottomcenter topright";
-      if (aAnchor.infoPanelPosition) {
-        alignment = aAnchor.infoPanelPosition;
-      }
-
-      let { infoPanelOffsetX: xOffset, infoPanelOffsetY: yOffset } = aAnchor;
-
-      this._addAnnotationPanelMutationObserver(tooltip);
-      tooltip.openPopup(aAnchorEl, alignment, xOffset || 0, yOffset || 0);
-      if (tooltip.state == "closed") {
-        document.defaultView.addEventListener("endmodalstate", function endModalStateHandler() {
-          document.defaultView.removeEventListener("endmodalstate", endModalStateHandler);
-          tooltip.openPopup(aAnchorEl, alignment);
-        }, false);
-      }
-    }
-
-    // Prevent showing a panel at an undefined position.
-    if (!this.isElementVisible(aAnchor.node)) {
-      log.warn("showInfo: Not showing since the target isn't visible", aAnchor);
-      return;
-    }
-
-    this._setAppMenuStateForAnnotation(aChromeWindow, "info",
-                                       this.targetIsInAppMenu(aAnchor),
-                                       showInfoPanel.bind(this, this._correctAnchor(aAnchor.node)));
-  },
-
-  isInfoOnTarget(aChromeWindow, aTargetName) {
-    let document = aChromeWindow.document;
-    let tooltip = document.getElementById("UITourTooltip");
-    return tooltip.getAttribute("targetName") == aTargetName && tooltip.state != "closed";
-  },
-
-  hideInfo: function(aWindow) {
-    let document = aWindow.document;
-
-    let tooltip = document.getElementById("UITourTooltip");
-    this._removeAnnotationPanelMutationObserver(tooltip);
-    tooltip.hidePopup();
-    this._setAppMenuStateForAnnotation(aWindow, "info", false);
-
-    let tooltipButtons = document.getElementById("UITourTooltipButtons");
-    while (tooltipButtons.firstChild)
-      tooltipButtons.firstChild.remove();
-  },
-
-  showMenu: function(aWindow, aMenuName, aOpenCallback = null) {
-    log.debug("showMenu:", aMenuName);
-    function openMenuButton(aMenuBtn) {
-      if (!aMenuBtn || !aMenuBtn.boxObject || aMenuBtn.open) {
-        if (aOpenCallback)
-          aOpenCallback();
-        return;
-      }
-      if (aOpenCallback)
-        aMenuBtn.addEventListener("popupshown", onPopupShown);
-      aMenuBtn.boxObject.openMenu(true);
-    }
-    function onPopupShown(event) {
-      this.removeEventListener("popupshown", onPopupShown);
-      aOpenCallback(event);
-    }
-
-    if (aMenuName == "appMenu") {
-      aWindow.PanelUI.panel.setAttribute("noautohide", "true");
-      // If the popup is already opened, don't recreate the widget as it may cause a flicker.
-      if (aWindow.PanelUI.panel.state != "open") {
-        this.recreatePopup(aWindow.PanelUI.panel);
-      }
-      aWindow.PanelUI.panel.addEventListener("popuphiding", this.hideAppMenuAnnotations);
-      aWindow.PanelUI.panel.addEventListener("ViewShowing", this.hideAppMenuAnnotations);
-      aWindow.PanelUI.panel.addEventListener("popuphidden", this.onPanelHidden);
-      if (aOpenCallback) {
-        aWindow.PanelUI.panel.addEventListener("popupshown", onPopupShown);
-      }
-      aWindow.PanelUI.show();
-    } else if (aMenuName == "bookmarks") {
-      let menuBtn = aWindow.document.getElementById("bookmarks-menu-button");
-      openMenuButton(menuBtn);
-    } else if (aMenuName == "controlCenter") {
-      let popup = aWindow.gIdentityHandler._identityPopup;
-
-      // Add the listener even if the panel is already open since it will still
-      // only get registered once even if it was UITour that opened it.
-      popup.addEventListener("popuphiding", this.hideControlCenterAnnotations);
-      popup.addEventListener("popuphidden", this.onPanelHidden);
-
-      popup.setAttribute("noautohide", true);
-      this.clearAvailableTargetsCache();
-
-      if (popup.state == "open") {
-        if (aOpenCallback) {
-          aOpenCallback();
-        }
-        return;
-      }
-
-      this.recreatePopup(popup);
-
-      // Open the control center
-      if (aOpenCallback) {
-        popup.addEventListener("popupshown", onPopupShown);
-      }
-      aWindow.document.getElementById("identity-box").click();
-    } else if (aMenuName == "pocket") {
-      this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) {
-        let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName);
-        if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) {
-          log.error("Can't open the pocket menu without a view");
-          return;
-        }
-        let placement = CustomizableUI.getPlacementOfWidget(target.widgetName);
-        if (!placement || !placement.area) {
-          log.error("Can't open the pocket menu without a placement");
-          return;
-        }
-
-        if (placement.area == CustomizableUI.AREA_PANEL) {
-          // Open the appMenu and wait for it if it's not already opened or showing a subview.
-          yield new Promise((resolve, reject) => {
-            if (aWindow.PanelUI.panel.state != "closed") {
-              if (aWindow.PanelUI.multiView.showingSubView) {
-                reject("A subview is already showing");
-                return;
-              }
-
-              resolve();
-              return;
-            }
-
-            aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() {
-              aWindow.PanelUI.panel.removeEventListener("popupshown", onShown);
-              resolve();
-            });
-
-            aWindow.PanelUI.show();
-          });
-        }
-
-        let widgetWrapper = widgetGroupWrapper.forWindow(aWindow);
-        aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId,
-                                    widgetWrapper.anchor,
-                                    placement.area);
-      })).catch(log.error);
-    }
-  },
-
-  hideMenu: function(aWindow, aMenuName) {
-    log.debug("hideMenu:", aMenuName);
-    function closeMenuButton(aMenuBtn) {
-      if (aMenuBtn && aMenuBtn.boxObject)
-        aMenuBtn.boxObject.openMenu(false);
-    }
-
-    if (aMenuName == "appMenu") {
-      aWindow.PanelUI.hide();
-    } else if (aMenuName == "bookmarks") {
-      let menuBtn = aWindow.document.getElementById("bookmarks-menu-button");
-      closeMenuButton(menuBtn);
-    } else if (aMenuName == "controlCenter") {
-      let panel = aWindow.gIdentityHandler._identityPopup;
-      panel.hidePopup();
-    }
-  },
-
-  showNewTab: function(aWindow, aBrowser) {
-    aWindow.openLinkIn("about:newtab", "current", {targetBrowser: aBrowser});
-  },
-
-  hideAnnotationsForPanel: function(aEvent, aTargetPositionCallback) {
-    let win = aEvent.target.ownerGlobal;
-    let annotationElements = new Map([
-      // [annotationElement (panel), method to hide the annotation]
-      [win.document.getElementById("UITourHighlightContainer"), UITour.hideHighlight.bind(UITour)],
-      [win.document.getElementById("UITourTooltip"), UITour.hideInfo.bind(UITour)],
-    ]);
-    annotationElements.forEach((hideMethod, annotationElement) => {
-      if (annotationElement.state != "closed") {
-        let targetName = annotationElement.getAttribute("targetName");
-        UITour.getTarget(win, targetName).then((aTarget) => {
-          // Since getTarget is async, we need to make sure that the target hasn't
-          // changed since it may have just moved to somewhere outside of the app menu.
-          if (annotationElement.getAttribute("targetName") != aTarget.targetName ||
-              annotationElement.state == "closed" ||
-              !aTargetPositionCallback(aTarget)) {
-            return;
-          }
-          hideMethod(win);
-        }).catch(log.error);
-      }
-    });
-    UITour.appMenuOpenForAnnotation.clear();
-  },
-
-  hideAppMenuAnnotations: function(aEvent) {
-    UITour.hideAnnotationsForPanel(aEvent, UITour.targetIsInAppMenu);
-  },
-
-  hideControlCenterAnnotations(aEvent) {
-    UITour.hideAnnotationsForPanel(aEvent, (aTarget) => {
-      return aTarget.targetName.startsWith("controlCenter-");
-    });
-  },
-
-  onPanelHidden: function(aEvent) {
-    aEvent.target.removeAttribute("noautohide");
-    UITour.recreatePopup(aEvent.target);
-    UITour.clearAvailableTargetsCache();
-  },
-
-  recreatePopup: function(aPanel) {
-    // After changing popup attributes that relate to how the native widget is created
-    // (e.g. @noautohide) we need to re-create the frame/widget for it to take effect.
-    if (aPanel.hidden) {
-      // If the panel is already hidden, we don't need to recreate it but flush
-      // in case someone just hid it.
-      aPanel.clientWidth; // flush
-      return;
-    }
-    aPanel.hidden = true;
-    aPanel.clientWidth; // flush
-    aPanel.hidden = false;
-  },
-
-  getConfiguration: function(aMessageManager, aWindow, aConfiguration, aCallbackID) {
-    switch (aConfiguration) {
-      case "appinfo":
-        let props = ["defaultUpdateChannel", "version"];
-        let appinfo = {};
-        props.forEach(property => appinfo[property] = Services.appinfo[property]);
-
-        // Identifier of the partner repack, as stored in preference "distribution.id"
-        // and included in Firefox and other update pings. Note this is not the same as
-        // Services.appinfo.distributionID (value of MOZ_DISTRIBUTION_ID is set at build time).
-        let distribution = "default";
-        try {
-          distribution = Services.prefs.getDefaultBranch("distribution.").getCharPref("id");
-        } catch (e) {}
-        appinfo["distribution"] = distribution;
-
-        let isDefaultBrowser = null;
-        try {
-          let shell = aWindow.getShellService();
-          if (shell) {
-            isDefaultBrowser = shell.isDefaultBrowser(false);
-          }
-        } catch (e) {}
-        appinfo["defaultBrowser"] = isDefaultBrowser;
-
-        let canSetDefaultBrowserInBackground = true;
-        if (AppConstants.isPlatformAndVersionAtLeast("win", "6.2") ||
-            AppConstants.isPlatformAndVersionAtLeast("macosx", "10.10")) {
-          canSetDefaultBrowserInBackground = false;
-        } else if (AppConstants.platform == "linux") {
-          // The ShellService may not exist on some versions of Linux.
-          try {
-            aWindow.getShellService();
-          } catch (e) {
-            canSetDefaultBrowserInBackground = null;
-          }
-        }
-
-        appinfo["canSetDefaultBrowserInBackground"] =
-          canSetDefaultBrowserInBackground;
-
-        this.sendPageCallback(aMessageManager, aCallbackID, appinfo);
-        break;
-      case "availableTargets":
-        this.getAvailableTargets(aMessageManager, aWindow, aCallbackID);
-        break;
-      case "search":
-      case "selectedSearchEngine":
-        Services.search.init(rv => {
-          let data;
-          if (Components.isSuccessCode(rv)) {
-            let engines = Services.search.getVisibleEngines();
-            data = {
-              searchEngineIdentifier: Services.search.defaultEngine.identifier,
-              engines: engines.filter((engine) => engine.identifier)
-                              .map((engine) => TARGET_SEARCHENGINE_PREFIX + engine.identifier)
-            };
-          } else {
-            data = {engines: [], searchEngineIdentifier: ""};
-          }
-          this.sendPageCallback(aMessageManager, aCallbackID, data);
-        });
-        break;
-      case "sync":
-        this.sendPageCallback(aMessageManager, aCallbackID, {
-          setup: Services.prefs.prefHasUserValue("services.sync.username"),
-          desktopDevices: Preferences.get("services.sync.clients.devices.desktop", 0),
-          mobileDevices: Preferences.get("services.sync.clients.devices.mobile", 0),
-          totalDevices: Preferences.get("services.sync.numClients", 0),
-        });
-        break;
-      case "canReset":
-        this.sendPageCallback(aMessageManager, aCallbackID, ResetProfile.resetSupported());
-        break;
-      default:
-        log.error("getConfiguration: Unknown configuration requested: " + aConfiguration);
-        break;
-    }
-  },
-
-  setConfiguration: function(aWindow, aConfiguration, aValue) {
-    switch (aConfiguration) {
-      case "defaultBrowser":
-        // Ignore aValue in this case because the default browser can only
-        // be set, not unset.
-        try {
-          let shell = aWindow.getShellService();
-          if (shell) {
-            shell.setDefaultBrowser(true, false);
-          }
-        } catch (e) {}
-        break;
-      default:
-        log.error("setConfiguration: Unknown configuration requested: " + aConfiguration);
-        break;
-    }
-  },
-
-  getAvailableTargets: function(aMessageManager, aChromeWindow, aCallbackID) {
-    Task.spawn(function*() {
-      let window = aChromeWindow;
-      let data = this.availableTargetsCache.get(window);
-      if (data) {
-        log.debug("getAvailableTargets: Using cached targets list", data.targets.join(","));
-        this.sendPageCallback(aMessageManager, aCallbackID, data);
-        return;
-      }
-
-      let promises = [];
-      for (let targetName of this.targets.keys()) {
-        promises.push(this.getTarget(window, targetName));
-      }
-      let targetObjects = yield Promise.all(promises);
-
-      let targetNames = [];
-      for (let targetObject of targetObjects) {
-        if (targetObject.node)
-          targetNames.push(targetObject.targetName);
-      }
-
-      data = {
-        targets: targetNames,
-      };
-      this.availableTargetsCache.set(window, data);
-      this.sendPageCallback(aMessageManager, aCallbackID, data);
-    }.bind(this)).catch(err => {
-      log.error(err);
-      this.sendPageCallback(aMessageManager, aCallbackID, {
-        targets: [],
-      });
-    });
-  },
-
-  startSubTour: function (aFeature) {
-    if (aFeature != "string") {
-      log.error("startSubTour: No feature option specified");
-      return;
-    }
-
-    if (aFeature == "readinglist") {
-      ReaderParent.showReaderModeInfoPanel(browser);
-    } else {
-      log.error("startSubTour: Unknown feature option specified");
-      return;
-    }
-  },
-
-  addNavBarWidget: function (aTarget, aMessageManager, aCallbackID) {
-    if (aTarget.node) {
-      log.error("addNavBarWidget: can't add a widget already present:", aTarget);
-      return;
-    }
-    if (!aTarget.allowAdd) {
-      log.error("addNavBarWidget: not allowed to add this widget:", aTarget);
-      return;
-    }
-    if (!aTarget.widgetName) {
-      log.error("addNavBarWidget: can't add a widget without a widgetName property:", aTarget);
-      return;
-    }
-
-    CustomizableUI.addWidgetToArea(aTarget.widgetName, CustomizableUI.AREA_NAVBAR);
-    this.sendPageCallback(aMessageManager, aCallbackID);
-  },
-
-  _addAnnotationPanelMutationObserver: function(aPanelEl) {
-    if (AppConstants.platform == "linux") {
-      let observer = this._annotationPanelMutationObservers.get(aPanelEl);
-      if (observer) {
-        return;
-      }
-      let win = aPanelEl.ownerGlobal;
-      observer = new win.MutationObserver(this._annotationMutationCallback);
-      this._annotationPanelMutationObservers.set(aPanelEl, observer);
-      let observerOptions = {
-        attributeFilter: ["height", "width"],
-        attributes: true,
-      };
-      observer.observe(aPanelEl, observerOptions);
-    }
-  },
-
-  _removeAnnotationPanelMutationObserver: function(aPanelEl) {
-    if (AppConstants.platform == "linux") {
-      let observer = this._annotationPanelMutationObservers.get(aPanelEl);
-      if (observer) {
-        observer.disconnect();
-        this._annotationPanelMutationObservers.delete(aPanelEl);
-      }
-    }
-  },
-
-/**
- * Workaround for Ubuntu panel craziness in bug 970788 where incorrect sizes get passed to
- * nsXULPopupManager::PopupResized and lead to incorrect width and height attributes getting
- * set on the panel.
- */
-  _annotationMutationCallback: function(aMutations) {
-    for (let mutation of aMutations) {
-      // Remove both attributes at once and ignore remaining mutations to be proccessed.
-      mutation.target.removeAttribute("width");
-      mutation.target.removeAttribute("height");
-      return;
-    }
-  },
-
-  selectSearchEngine(aID) {
-    return new Promise((resolve, reject) => {
-      Services.search.init((rv) => {
-        if (!Components.isSuccessCode(rv)) {
-          reject("selectSearchEngine: search service init failed: " + rv);
-          return;
-        }
-
-        let engines = Services.search.getVisibleEngines();
-        for (let engine of engines) {
-          if (engine.identifier == aID) {
-            Services.search.defaultEngine = engine;
-            resolve();
-            return;
-          }
-        }
-        reject("selectSearchEngine could not find engine with given ID");
-        return;
-      });
-    });
-  },
-
-  notify(eventName, params) {
-    let winEnum = Services.wm.getEnumerator("navigator:browser");
-    while (winEnum.hasMoreElements()) {
-      let window = winEnum.getNext();
-      if (window.closed)
-        continue;
-
-      let openTourBrowsers = this.tourBrowsersByWindow.get(window);
-      if (!openTourBrowsers)
-        continue;
-
-      for (let browser of openTourBrowsers) {
-        let messageManager = browser.messageManager;
-        if (!messageManager) {
-          log.error("notify: Trying to notify a browser without a messageManager", browser);
-          continue;
-        }
-        let detail = {
-          event: eventName,
-          params: params,
-        };
-        messageManager.sendAsyncMessage("UITour:SendPageNotification", detail);
-      }
-    }
-  },
-};
-
-function controlCenterTrackingToggleTarget(aUnblock) {
-  return {
-    infoPanelPosition: "rightcenter topleft",
-    query(aDocument) {
-      let popup = aDocument.defaultView.gIdentityHandler._identityPopup;
-      if (popup.state != "open") {
-        return null;
-      }
-      let buttonId = null;
-      if (aUnblock) {
-        if (PrivateBrowsingUtils.isWindowPrivate(aDocument.defaultView)) {
-          buttonId = "tracking-action-unblock-private";
-        } else {
-          buttonId = "tracking-action-unblock";
-        }
-      } else {
-        buttonId = "tracking-action-block";
-      }
-      let element = aDocument.getElementById(buttonId);
-      return UITour.isElementVisible(element) ? element : null;
-    },
-  };
-}
-
-this.UITour.init();
-
-/**
- * UITour Health Report
- */
-/**
- * Public API to be called by the UITour code
- */
-const UITourHealthReport = {
-  recordTreatmentTag: function(tag, value) {
-    return TelemetryController.submitExternalPing("uitour-tag",
-      {
-        version: 1,
-        tagName: tag,
-        tagValue: value,
-      },
-      {
-        addClientId: true,
-        addEnvironment: true,
-      });
-  }
-};
diff --git a/browser/components/uitour/content-UITour.js b/browser/components/uitour/content-UITour.js
deleted file mode 100644
index c33d687e8..000000000
--- a/browser/components/uitour/content-UITour.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* 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/. */
-
-var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-const PREF_TEST_WHITELIST = "browser.uitour.testingOrigins";
-const UITOUR_PERMISSION   = "uitour";
-
-var UITourListener = {
-  handleEvent: function (event) {
-    if (!Services.prefs.getBoolPref("browser.uitour.enabled")) {
-      return;
-    }
-    if (!this.ensureTrustedOrigin()) {
-      return;
-    }
-    addMessageListener("UITour:SendPageCallback", this);
-    addMessageListener("UITour:SendPageNotification", this);
-    sendAsyncMessage("UITour:onPageEvent", {
-      detail: event.detail,
-      type: event.type,
-      pageVisibilityState: content.document.visibilityState,
-    });
-  },
-
-  isTestingOrigin: function(aURI) {
-    if (Services.prefs.getPrefType(PREF_TEST_WHITELIST) != Services.prefs.PREF_STRING) {
-      return false;
-    }
-
-    // Add any testing origins (comma-seperated) to the whitelist for the session.
-    for (let origin of Services.prefs.getCharPref(PREF_TEST_WHITELIST).split(",")) {
-      try {
-        let testingURI = Services.io.newURI(origin, null, null);
-        if (aURI.prePath == testingURI.prePath) {
-          return true;
-        }
-      } catch (ex) {
-        Cu.reportError(ex);
-      }
-    }
-    return false;
-  },
-
-  // This function is copied from UITour.jsm.
-  isSafeScheme: function(aURI) {
-    let allowedSchemes = new Set(["https", "about"]);
-    if (!Services.prefs.getBoolPref("browser.uitour.requireSecure"))
-      allowedSchemes.add("http");
-
-    if (!allowedSchemes.has(aURI.scheme))
-      return false;
-
-    return true;
-  },
-
-  ensureTrustedOrigin: function() {
-    if (content.top != content)
-      return false;
-
-    let uri = content.document.documentURIObject;
-
-    if (uri.schemeIs("chrome"))
-      return true;
-
-    if (!this.isSafeScheme(uri))
-      return false;
-
-    let permission = Services.perms.testPermission(uri, UITOUR_PERMISSION);
-    if (permission == Services.perms.ALLOW_ACTION)
-      return true;
-
-    return this.isTestingOrigin(uri);
-  },
-
-  receiveMessage: function(aMessage) {
-    switch (aMessage.name) {
-      case "UITour:SendPageCallback":
-        this.sendPageEvent("Response", aMessage.data);
-        break;
-      case "UITour:SendPageNotification":
-        this.sendPageEvent("Notification", aMessage.data);
-        break;
-      }
-  },
-
-  sendPageEvent: function (type, detail) {
-    if (!this.ensureTrustedOrigin()) {
-      return;
-    }
-
-    let doc = content.document;
-    let eventName = "mozUITour" + type;
-    let event = new doc.defaultView.CustomEvent(eventName, {
-      bubbles: true,
-      detail: Cu.cloneInto(detail, doc.defaultView)
-    });
-    doc.dispatchEvent(event);
-  }
-};
-
-addEventListener("mozUITour", UITourListener, false, true);
diff --git a/browser/components/uitour/jar.mn b/browser/components/uitour/jar.mn
deleted file mode 100644
index 966a69c96..000000000
--- a/browser/components/uitour/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/.
-
-browser.jar:
-       content/browser/content-UITour.js
diff --git a/browser/components/uitour/moz.build b/browser/components/uitour/moz.build
deleted file mode 100644
index c8b1450b9..000000000
--- a/browser/components/uitour/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/.
-
-EXTRA_JS_MODULES += [
-    'UITour.jsm',
-]
-
-JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/modules/SelfSupportBackend.jsm b/browser/modules/SelfSupportBackend.jsm
deleted file mode 100644
index 3a3f8cb8b..000000000
--- a/browser/modules/SelfSupportBackend.jsm
+++ /dev/null
@@ -1,331 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["SelfSupportBackend"];
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Cu.import("resource://gre/modules/Log.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "HiddenFrame",
-  "resource:///modules/HiddenFrame.jsm");
-
-// Enables or disables the Self Support.
-const PREF_ENABLED = "browser.selfsupport.enabled";
-// Url to open in the Self Support browser, in the urlFormatter service format.
-const PREF_URL = "browser.selfsupport.url";
-// Unified Telemetry status.
-const PREF_TELEMETRY_UNIFIED = "toolkit.telemetry.unified";
-// UITour status.
-const PREF_UITOUR_ENABLED = "browser.uitour.enabled";
-
-// Controls the interval at which the self support page tries to reload in case of
-// errors.
-const RETRY_INTERVAL_MS = 30000;
-// Maximum number of SelfSupport page load attempts in case of failure.
-const MAX_RETRIES = 5;
-// The delay after which to load the self-support, at startup.
-const STARTUP_DELAY_MS = 5000;
-
-const LOGGER_NAME = "Browser.SelfSupportBackend";
-const PREF_BRANCH_LOG = "browser.selfsupport.log.";
-const PREF_LOG_LEVEL = PREF_BRANCH_LOG + "level";
-const PREF_LOG_DUMP = PREF_BRANCH_LOG + "dump";
-
-const HTML_NS = "http://www.w3.org/1999/xhtml";
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-const UITOUR_FRAME_SCRIPT = "chrome://browser/content/content-UITour.js";
-
-// Whether the FHR/Telemetry unification features are enabled.
-// Changing this pref requires a restart.
-const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_TELEMETRY_UNIFIED, false);
-
-var gLogAppenderDump = null;
-
-this.SelfSupportBackend = Object.freeze({
-  init: function () {
-    SelfSupportBackendInternal.init();
-  },
-
-  uninit: function () {
-    SelfSupportBackendInternal.uninit();
-  },
-});
-
-var SelfSupportBackendInternal = {
-  // The browser element that will load the SelfSupport page.
-  _browser: null,
-  // The Id of the timer triggering delayed SelfSupport page load.
-  _delayedLoadTimerId: null,
-  // The HiddenFrame holding the _browser element.
-  _frame: null,
-  _log: null,
-  _progressListener: null,
-
-  /**
-   * Initializes the self support backend.
-   */
-  init: function () {
-    this._configureLogging();
-
-    this._log.trace("init");
-
-    Preferences.observe(PREF_BRANCH_LOG, this._configureLogging, this);
-
-    // Only allow to use SelfSupport if Unified Telemetry is enabled.
-    let reportingEnabled = IS_UNIFIED_TELEMETRY;
-    if (!reportingEnabled) {
-      this._log.config("init - Disabling SelfSupport because FHR and Unified Telemetry are disabled.");
-      return;
-    }
-
-    // Make sure UITour is enabled.
-    let uiTourEnabled = Preferences.get(PREF_UITOUR_ENABLED, false);
-    if (!uiTourEnabled) {
-      this._log.config("init - Disabling SelfSupport because UITour is disabled.");
-      return;
-    }
-
-    // Check the preferences to see if we want this to be active.
-    if (!Preferences.get(PREF_ENABLED, true)) {
-      this._log.config("init - SelfSupport is disabled.");
-      return;
-    }
-
-    Services.obs.addObserver(this, "sessionstore-windows-restored", false);
-  },
-
-  /**
-   * Shut down the self support backend, if active.
-   */
-  uninit: function () {
-    this._log.trace("uninit");
-
-    Preferences.ignore(PREF_BRANCH_LOG, this._configureLogging, this);
-
-    // Cancel delayed loading, if still active, when shutting down.
-    clearTimeout(this._delayedLoadTimerId);
-
-    // Dispose of the hidden browser.
-    if (this._browser !== null) {
-      if (this._browser.contentWindow) {
-        this._browser.contentWindow.removeEventListener("DOMWindowClose", this, true);
-      }
-
-      if (this._progressListener) {
-        this._browser.removeProgressListener(this._progressListener);
-        this._progressListener.destroy();
-        this._progressListener = null;
-      }
-
-      this._browser.remove();
-      this._browser = null;
-    }
-
-    if (this._frame) {
-      this._frame.destroy();
-      this._frame = null;
-    }
-  },
-
-  /**
-   * Handle notifications. Once all windows are created, we wait a little bit more
-   * since tabs might still be loading. Then, we open the self support.
-   */
-  observe: function (aSubject, aTopic, aData) {
-    this._log.trace("observe - Topic " + aTopic);
-
-    if (aTopic === "sessionstore-windows-restored") {
-      Services.obs.removeObserver(this, "sessionstore-windows-restored");
-      this._delayedLoadTimerId = setTimeout(this._loadSelfSupport.bind(this), STARTUP_DELAY_MS);
-    }
-  },
-
-  /**
-   * Configure the logger based on the preferences.
-   */
-  _configureLogging: function() {
-    if (!this._log) {
-      this._log = Log.repository.getLogger(LOGGER_NAME);
-
-      // Log messages need to go to the browser console.
-      let consoleAppender = new Log.ConsoleAppender(new Log.BasicFormatter());
-      this._log.addAppender(consoleAppender);
-    }
-
-    // Make sure the logger keeps up with the logging level preference.
-    this._log.level = Log.Level[Preferences.get(PREF_LOG_LEVEL, "Warn")];
-
-    // If enabled in the preferences, add a dump appender.
-    let logDumping = Preferences.get(PREF_LOG_DUMP, false);
-    if (logDumping != !!gLogAppenderDump) {
-      if (logDumping) {
-        gLogAppenderDump = new Log.DumpAppender(new Log.BasicFormatter());
-        this._log.addAppender(gLogAppenderDump);
-      } else {
-        this._log.removeAppender(gLogAppenderDump);
-        gLogAppenderDump = null;
-      }
-    }
-  },
-
-  /**
-   * Create an hidden frame to host our |browser|, then load the SelfSupport page in it.
-   * @param aURL The URL to load in the browser.
-   */
-  _makeHiddenBrowser: function(aURL) {
-    this._frame = new HiddenFrame();
-    return this._frame.get().then(aFrame => {
-      let doc = aFrame.document;
-
-      this._browser = doc.createElementNS(XUL_NS, "browser");
-      this._browser.setAttribute("type", "content");
-      this._browser.setAttribute("disableglobalhistory", "true");
-      this._browser.setAttribute("src", aURL);
-
-      doc.documentElement.appendChild(this._browser);
-    });
-  },
-
-  handleEvent: function(aEvent) {
-    this._log.trace("handleEvent - aEvent.type " + aEvent.type + ", Trusted " + aEvent.isTrusted);
-
-    if (aEvent.type === "DOMWindowClose") {
-      let window = this._browser.contentDocument.defaultView;
-      let target = aEvent.target;
-
-      if (target == window) {
-        // preventDefault stops the default window.close(). We need to do that to prevent
-        // Services.appShell.hiddenDOMWindow from being destroyed.
-        aEvent.preventDefault();
-
-        this.uninit();
-      }
-    }
-  },
-
-  /**
-   * Called when the self support page correctly loads.
-   */
-  _pageSuccessCallback: function() {
-    this._log.debug("_pageSuccessCallback - Page correctly loaded.");
-    this._browser.removeProgressListener(this._progressListener);
-    this._progressListener.destroy();
-    this._progressListener = null;
-
-    // Allow SelfSupportBackend to catch |window.close()| issued by the content.
-    this._browser.contentWindow.addEventListener("DOMWindowClose", this, true);
-  },
-
-  /**
-   * Called when the self support page fails to load.
-   */
-  _pageLoadErrorCallback: function() {
-    this._log.info("_pageLoadErrorCallback - Too many failed load attempts. Giving up.");
-    this.uninit();
-  },
-
-  /**
-   * Create a browser and attach it to an hidden window. The browser will contain the
-   * self support page and attempt to load the page content. If loading fails, try again
-   * after an interval.
-   */
-  _loadSelfSupport: function() {
-    // Fetch the Self Support URL from the preferences.
-    let unformattedURL = Preferences.get(PREF_URL, null);
-    let url = Services.urlFormatter.formatURL(unformattedURL);
-    if (!url.startsWith("https:")) {
-      this._log.error("_loadSelfSupport - Non HTTPS URL provided: " + url);
-      return;
-    }
-
-    this._log.config("_loadSelfSupport - URL " + url);
-
-    // Create the hidden browser.
-    this._makeHiddenBrowser(url).then(() => {
-      // Load UITour frame script.
-      this._browser.messageManager.loadFrameScript(UITOUR_FRAME_SCRIPT, true);
-
-      // We need to watch for load errors as well and, in case, try to reload
-      // the self support page.
-      const webFlags = Ci.nsIWebProgress.NOTIFY_STATE_WINDOW |
-                       Ci.nsIWebProgress.NOTIFY_STATE_REQUEST |
-                       Ci.nsIWebProgress.NOTIFY_LOCATION;
-
-      this._progressListener = new ProgressListener(() => this._pageLoadErrorCallback(),
-                                                    () => this._pageSuccessCallback());
-
-      this._browser.addProgressListener(this._progressListener, webFlags);
-    });
-  }
-};
-
-/**
- * A progress listener object which notifies of page load error and load success
- * through callbacks. When the page fails to load, the progress listener tries to
- * reload it up to MAX_RETRIES times. The page is not loaded again immediately, but
- * after a timeout.
- *
- * @param aLoadErrorCallback Called when a page failed to load MAX_RETRIES times.
- * @param aLoadSuccessCallback Called when a page correctly loads.
- */
-function ProgressListener(aLoadErrorCallback, aLoadSuccessCallback) {
-  this._loadErrorCallback = aLoadErrorCallback;
-  this._loadSuccessCallback = aLoadSuccessCallback;
-  // The number of page loads attempted.
-  this._loadAttempts = 0;
-  this._log = Log.repository.getLogger(LOGGER_NAME);
-  // The Id of the timer which triggers page load again in case of errors.
-  this._reloadTimerId = null;
-}
-
-ProgressListener.prototype = {
-  onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
-    if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
-      this._log.warn("onLocationChange - There was a problem fetching the SelfSupport URL (attempt " +
-                     this._loadAttempts + ").");
-
-      // Increase the number of attempts and bail out if we failed too many times.
-      this._loadAttempts++;
-      if (this._loadAttempts > MAX_RETRIES) {
-        this._loadErrorCallback();
-        return;
-      }
-
-      // Reload the page after the retry interval expires. The interval is multiplied
-      // by the number of attempted loads, so that it takes a bit more to try to reload
-      // when frequently failing.
-      this._reloadTimerId = setTimeout(() => {
-        this._log.debug("onLocationChange - Reloading SelfSupport URL in the hidden browser.");
-        aWebProgress.DOMWindow.location.reload();
-      }, RETRY_INTERVAL_MS * this._loadAttempts);
-    }
-  },
-
-  onStateChange: function (aWebProgress, aRequest, aFlags, aStatus) {
-    if (aFlags & Ci.nsIWebProgressListener.STATE_STOP &&
-        aFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK &&
-        aFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW &&
-        Components.isSuccessCode(aStatus)) {
-      this._loadSuccessCallback();
-    }
-  },
-
-  destroy: function () {
-    // Make sure we don't try to reload self support when shutting down.
-    clearTimeout(this._reloadTimerId);
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
-                                         Ci.nsISupportsWeakReference]),
-};
diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css
deleted file mode 100644
index bc89ade76..000000000
--- a/browser/themes/shared/UITour.inc.css
+++ /dev/null
@@ -1,293 +0,0 @@
-%if 0
-/* 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/. */
-%endif
-
-/* UI Tour */
-
-#UITourHighlightContainer {
-  -moz-appearance: none;
-  -moz-window-shadow: none;
-  border: none;
-  background-color: transparent;
-  /* This is a buffer to compensate for the movement in the "wobble" effect,
-     and for the box-shadow of #UITourHighlight. */
-  padding: 4px;
-}
-
-#UITourHighlight {
-  background-image: radial-gradient(50% 100%, rgba(0,149,220,0.4) 50%, rgba(0,149,220,0.6) 100%);
-  border-radius: 40px;
-  border: 1px solid white;
-  /* The box-shadow opacity needs to be < 0.5 so it doesn't appear at 100% opacity
-     on Linux without an X compositor where opacity is either 0 or 1. */
-  box-shadow: 0 0 3px 0 rgba(0,0,0,0.49);
-  min-height: 32px;
-  min-width: 32px;
-}
-
-#UITourTooltipBody {
-  -moz-box-align: start;
-}
-
-#UITourTooltipTitleContainer {
-  -moz-box-align: start;
-  margin-bottom: 10px;
-}
-
-#UITourTooltipIcon {
-  width: 48px;
-  height: 48px;
-  margin-inline-end: 10px;
-}
-
-#UITourTooltipTitle,
-#UITourTooltipDescription {
-  max-width: 20rem;
-}
-
-#UITourTooltipTitle {
-  font-size: 1.45rem;
-  font-weight: bold;
-  margin: 0;
-}
-
-#UITourTooltipDescription {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-  font-size: 1.15rem;
-  line-height: 1.8rem;
-  margin-bottom: 0; /* Override global.css */
-}
-
-#UITourTooltipClose {
-  position: relative;
-  -moz-appearance: none;
-  border: none;
-  background-color: transparent;
-  min-width: 0;
-  margin-inline-start: 4px;
-  margin-top: -2px;
-}
-
-#UITourTooltipClose > .toolbarbutton-text {
-  display: none;
-}
-
-#UITourTooltipButtons {
-  -moz-box-pack: end;
-  background-color: hsla(210,4%,10%,.07);
-  border-top: 1px solid hsla(210,4%,10%,.14);
-  margin: 10px -16px -16px;
-  padding: 16px;
-}
-
-#UITourTooltipButtons > label,
-#UITourTooltipButtons > button {
-  margin: 0 15px;
-}
-
-#UITourTooltipButtons > label:first-child,
-#UITourTooltipButtons > button:first-child {
-  margin-inline-start: 0;
-}
-
-#UITourTooltipButtons > label:last-child,
-#UITourTooltipButtons > button:last-child {
-  margin-inline-end: 0;
-}
-
-#UITourTooltipButtons > button[image] > .button-box > .button-icon {
-  width: 16px;
-  height: 16px;
-  margin-inline-end: 5px;
-}
-
-#UITourTooltipButtons > label,
-#UITourTooltipButtons > button .button-text {
-  font-size: 1.15rem;
-}
-
-#UITourTooltipButtons > button:not(.button-link) {
-  -moz-appearance: none;
-  background-color: rgb(251,251,251);
-  border-radius: 3px;
-  border: 1px solid;
-  border-color: rgb(192,192,192);
-  color: rgb(71,71,71);
-  padding: 4px 30px;
-  transition-property: background-color, border-color;
-  transition-duration: 150ms;
-}
-
-#UITourTooltipButtons > button:not(.button-link):not(:active):hover {
-  background-color: hsla(210,4%,10%,.15);
-  border-color: hsla(210,4%,10%,.15);
-  box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
-}
-
-#UITourTooltipButtons > label,
-#UITourTooltipButtons > button.button-link {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  box-shadow: none;
-  color: rgba(0,0,0,0.35);
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-#UITourTooltipButtons > button.button-link:hover {
-  color: black;
-}
-
-/* The primary button gets the same color as the customize button. */
-#UITourTooltipButtons > button.button-primary {
-  background-color: rgb(116,191,67);
-  color: white;
-  padding-left: 30px;
-  padding-right: 30px;
-}
-
-#UITourTooltipButtons > button.button-primary:not(:active):hover {
-  background-color: rgb(105,173,61);
-}
-
-/* Notification overrides for Heartbeat UI */
-
-notification.heartbeat {
-%ifdef XP_MACOSX
-  background-image: linear-gradient(-179deg, #FBFBFB 0%, #EBEBEB 100%);
-%else
-  background-color: #F1F1F1;
-%endif
-  border-bottom: 1px solid #C1C1C1;
-  height: 40px;
-}
-
-/* In themes/osx/global/notification.css the close icon is inverted because notifications
-   on OSX are usually dark. Heartbeat is light, so override that behaviour. */
-
-%ifdef XP_MACOSX
-notification.heartbeat[type="info"] .close-icon:not(:hover) {
-  -moz-image-region: rect(0, 16px, 16px, 0px) !important;
-}
-@media (min-resolution: 2dppx) {
-  notification.heartbeat[type="info"] .close-icon:not(:hover) {
-    -moz-image-region: rect(0, 32px, 32px, 0px) !important;
-  }
-}
-%endif
-
-@keyframes pulse-onshow {
- 0% {
-   opacity: 0;
-   transform: scale(1.0);
- }
- 25% {
-   opacity: 1;
-   transform: scale(1.1);
- }
- 50% {
-   transform: scale(1.0);
- }
- 75% {
-   transform: scale(1.1);
- }
- 100% {
-   transform: scale(1.0);
- }
-}
-
-@keyframes pulse-twice {
- 0% {
-   transform: scale(1.1);
- }
- 50% {
-   transform: scale(0.8);
- }
- 100% {
-   transform: scale(1);
- }
-}
-
-.messageText.heartbeat {
-  color: #333333;
-  text-shadow: none;
-  margin-inline-start: 0px;
-  /* The !important is required to override OSX default style. */
-  margin-inline-end: 12px !important;
-}
-
-.messageImage.heartbeat {
-  width: 24px;
-  height: 24px;
-  margin-inline-start: 8px;
-  margin-inline-end: 8px;
-}
-
-.messageImage.heartbeat.pulse-onshow {
-  animation-name: pulse-onshow;
-  animation-duration: 1.5s;
-  animation-iteration-count: 1;
-  animation-timing-function: cubic-bezier(.7,1.8,.9,1.1);
-}
-
-.messageImage.heartbeat.pulse-twice {
-  animation-name: pulse-twice;
-  animation-duration: 1s;
-  animation-iteration-count: 2;
-  animation-timing-function: linear;
-}
-
-/* Learn More link styles */
-.heartbeat > .text-link {
-  color: #0095DD;
-  margin-inline-start: 0px;
-}
-
-.heartbeat > .text-link:hover {
-  color: #008ACB;
-  text-decoration: none;
-}
-
-.heartbeat > .text-link:hover:active {
-  color: #006B9D;
-}
-
-/* Heartbeat UI Rating Star Classes */
-.heartbeat > #star-rating-container {
-  display: -moz-box;
-  margin-bottom: 4px;
-}
-
-.heartbeat > #star-rating-container > #star5 {
-  -moz-box-ordinal-group: 5;
-}
-
-.heartbeat > #star-rating-container > #star4 {
-  -moz-box-ordinal-group: 4;
-}
-
-.heartbeat > #star-rating-container > #star3 {
-  -moz-box-ordinal-group: 3;
-}
-
-.heartbeat > #star-rating-container > #star2 {
-  -moz-box-ordinal-group: 2;
-}
-
-.heartbeat > #star-rating-container > .star-x  {
-  background: url("chrome://browser/skin/heartbeat-star-off.svg");
-  cursor: pointer;
-  /* Overrides the margin-inline-end for all platforms defined in the .plain class */
-  margin-inline-end: 4px !important;
-  width: 16px;
-  height: 16px;
-}
-
-.heartbeat > #star-rating-container > .star-x:hover,
-.heartbeat > #star-rating-container > .star-x:hover ~ .star-x {
-  background: url("chrome://browser/skin/heartbeat-star-lit.svg");
-}
diff --git a/browser/themes/shared/customizableui/customizeTip.inc.css b/browser/themes/shared/customizableui/customizeTip.inc.css
deleted file mode 100644
index 26c6ee1ea..000000000
--- a/browser/themes/shared/customizableui/customizeTip.inc.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 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/. */
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-  margin: 0;
-  min-width: 400px;
-  max-width: 1000px;
-  min-height: 200px;
-  border-radius: 3px;
-  background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);
-  border: 0px solid rgba(0,148,221,.5);
-  box-shadow: 0 1px 5px 0 rgba(0,0,0,.5), inset 0 1px 1px 0 #fff;
-  color: rgb(51,51,51);
-}
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) {
-  background-image: linear-gradient(90deg, #ceeeff 0%, #a0dfff 100%);
-}
-
-.customization-tipPanel-infoBox {
-  margin: 20px 25px 25px;
-  width: 25px;
-  background-image: url(chrome://browser/skin/customizableui/info-icon-customizeTip.png);
-  background-repeat: no-repeat;
-}
-
-.customization-tipPanel-content {
-  margin: 25px 0;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.customization-tipPanel-em {
-  margin: 0;
-  font-weight: bold;
-}
-
-.customization-tipPanel-contentImage {
-  margin-top: 25px;
-  list-style-image: url(chrome://browser/skin/customizableui/customize-illustration.png);
-  min-width: 300px;
-  max-width: 300px;
-  min-height: 190px;
-  max-height: 190px;
-  display: -moz-box;
-}
-
-.customization-tipPanel-contentImage:-moz-locale-dir(rtl) {
-  list-style-image: url(chrome://browser/skin/customizableui/customize-illustration-rtl.png);
-}
-
-.customization-tipPanel-link {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  box-shadow: none;
-  color: rgb(25,82,171);
-  margin: 0;
-  cursor: pointer;
-}
-
-.customization-tipPanel-link > .button-box > .button-text {
-  margin: 0 !important;
-}
-
-.customization-tipPanel-closeBox > .close-icon {
-  -moz-appearance: none;
-  border: 0;
-  margin-inline-end: -25px;
-}
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
-  list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip.png");
-}
diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index c47d792f4..82d0b43fc 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -176,8 +176,8 @@ if test "$GNU_CC"; then
         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
     fi
-    CFLAGS="$CFLAGS -fno-math-errno"
-    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
+    CFLAGS="$CFLAGS -fno-math-errno -msse2 -mfpmath=sse"
+    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -msse2 -mfpmath=sse"
 
     if test -z "$CLANG_CC"; then
         case "$CC_VERSION" in
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 5f7e9b3ee..7664591ad 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -607,8 +607,9 @@ def include_project_configure(project, external_source_dir, build_env, help):
 
     build_app = project[0]
 
-    # Uncomment when browser becomes application/basilisk
-    #if build_app == 'browser':
+    # XXX: Change this when 'browser' becomes invalid as an alias
+    if build_app == 'browser':
+        build_app = 'basilisk'
         #die('The project "browser" is no longer valid. Perhaps you meant "basilisk" or "palemoon"?')
     
     path_project_src_dir_application = os.path.join(base_dir, 'application/' + build_app, 'moz.configure')
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index c1ad71d5f..20bde1eee 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -213,6 +213,7 @@ def old_configure_options(*options):
     '--enable-pie',
     '--enable-png-arm-neon-support',
     '--enable-posix-nspr-emulation',
+    '--enable-precompiled-startupcache',
     '--enable-pref-extensions',
     '--enable-private-build',
     '--enable-pulseaudio',
diff --git a/client.mk b/client.mk
index 42133d2eb..af7776e44 100644
--- a/client.mk
+++ b/client.mk
@@ -321,8 +321,6 @@ CONFIG_STATUS_DEPS := \
   $(TOPSRCDIR)/CLOBBER \
   $(TOPSRCDIR)/nsprpub/configure \
   $(TOPSRCDIR)/config/milestone.txt \
-  $(TOPSRCDIR)/browser/config/version.txt \
-  $(TOPSRCDIR)/browser/config/version_display.txt \
   $(TOPSRCDIR)/build/virtualenv_packages.txt \
   $(TOPSRCDIR)/python/mozbuild/mozbuild/virtualenv.py \
   $(TOPSRCDIR)/testing/mozbase/packages.txt \
diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp
index b0eabb13d..468449698 100644
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
@@ -1041,12 +1041,17 @@ nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP)
 
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  nsIPrincipal* principal = mDocument->NodePrincipal();
+  nsCOMPtr<nsIPrincipal> principal = mDocument->NodePrincipal();
   nsCOMPtr<nsIContentSecurityPolicy> preloadCsp;
   nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(mDocument);
   nsresult rv = principal->EnsurePreloadCSP(domDoc, getter_AddRefs(preloadCsp));
   NS_ENSURE_SUCCESS_VOID(rv);
 
+  if (!preloadCsp) {
+    // XXX: System principals can't preload CSP. We're done here.
+    return;
+  }
+
   // please note that meta CSPs and CSPs delivered through a header need
   // to be joined together.
   rv = preloadCsp->AppendPolicy(aCSP,
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index f654db769..1bd5b8d34 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -541,6 +541,16 @@ class Build(MachCommandBase):
                 # as when doing OSX Universal builds)
                 pass
 
+        # Check if there are any unpreprocessed files in '@MOZ_OBJDIR@/dist/bin'
+        # See python/mozbuild/mozbuild/preprocessor.py#L293-L309 for the list of directives
+        # We skip if, ifdef, ifndef, else, elif, elifdef and elifndef, because they are never used alone
+        grepcmd = 'grep -E -r "^(#|%)(define|endif|error|expand|filter|include|literal|undef|unfilter)" '\
+                  + '--include=\*.{css,dtd,html,js,jsm,xhtml,xml,xul,manifest,properties,rdf} '\
+                  + self.topobjdir + '/dist/bin | grep -v ".css:#"'
+        grepresult = subprocess.Popen(grepcmd, stdout=subprocess.PIPE, shell=True).communicate()[0]
+        if grepresult:
+            print('\nERROR: preprocessor was not applied to the following files:\n\n' + grepresult)
+
         return status
 
     @Command('configure', category='build',
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index d30ae89f5..515828d29 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -297,10 +297,6 @@ user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
 user_pref("browser.newtabpage.directory.source", 'data:application/json,{"testing":1}');
 user_pref("browser.newtabpage.directory.ping", "");
 
-// Ensure UITour won't hit the network
-user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab");
-user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour");
-
 // Tell the search service we are running in the US.  This also has the desired
 // side-effect of preventing our geoip lookup.
 user_pref("browser.search.isUS", true);
diff --git a/toolkit/components/reader/JSDOMParser.js b/toolkit/components/reader/JSDOMParser.js
index 38f59c4ea..dd9d37230 100644
--- a/toolkit/components/reader/JSDOMParser.js
+++ b/toolkit/components/reader/JSDOMParser.js
@@ -560,7 +560,8 @@
     },
   };
 
-  var Document = function () {
+  var Document = function (url) {
+    this.documentURI = url;
     this.styleSheets = [];
     this.childNodes = [];
     this.children = [];
@@ -600,6 +601,20 @@
       node.textContent = text;
       return node;
     },
+
+    get baseURI() {
+      if (!this.hasOwnProperty("_baseURI")) {
+        this._baseURI = this.documentURI;
+        var baseElements = this.getElementsByTagName("base");
+        var href = baseElements[0] && baseElements[0].getAttribute("href");
+        if (href) {
+          try {
+            this._baseURI = (new URL(href, this._baseURI)).href;
+          } catch (ex) {/* Just fall back to documentURI */}
+        }
+      }
+      return this._baseURI;
+    },
   };
 
   var Element = function (tag) {
@@ -1118,9 +1133,9 @@
     /**
      * Parses an HTML string and returns a JS implementation of the Document.
      */
-    parse: function (html) {
+    parse: function (html, url) {
       this.html = html;
-      var doc = this.doc = new Document();
+      var doc = this.doc = new Document(url);
       this.readChildren(doc);
 
       // If this is an HTML document, remove root-level children except for the
diff --git a/toolkit/components/reader/Readability.js b/toolkit/components/reader/Readability.js
index 04949dc61..064d2ae88 100644
--- a/toolkit/components/reader/Readability.js
+++ b/toolkit/components/reader/Readability.js
@@ -41,6 +41,7 @@ function Readability(uri, doc, options) {
   this._articleTitle = null;
   this._articleByline = null;
   this._articleDir = null;
+  this._attempts = [];
 
   // Configurable options
   this._debug = !!options.debug;
@@ -275,34 +276,20 @@ Readability.prototype = {
    * @return void
    */
   _fixRelativeUris: function(articleContent) {
-    var scheme = this._uri.scheme;
-    var prePath = this._uri.prePath;
-    var pathBase = this._uri.pathBase;
-
+    var baseURI = this._doc.baseURI;
+    var documentURI = this._doc.documentURI;
     function toAbsoluteURI(uri) {
-      // If this is already an absolute URI, return it.
-      if (/^[a-zA-Z][a-zA-Z0-9\+\-\.]*:/.test(uri))
-        return uri;
-
-      // Scheme-rooted relative URI.
-      if (uri.substr(0, 2) == "//")
-        return scheme + "://" + uri.substr(2);
-
-      // Prepath-rooted relative URI.
-      if (uri[0] == "/")
-        return prePath + uri;
-
-      // Dotslash relative URI.
-      if (uri.indexOf("./") === 0)
-        return pathBase + uri.slice(2);
-
-      // Ignore hash URIs:
-      if (uri[0] == "#")
+      // Leave hash links alone if the base URI matches the document URI:
+      if (baseURI == documentURI && uri.charAt(0) == "#") {
         return uri;
-
-      // Standard relative URI; add entire path. pathBase already includes a
-      // trailing "/".
-      return pathBase + uri;
+      }
+      // Otherwise, resolve against base URI:
+      try {
+        return new URL(uri, baseURI).href;
+      } catch (ex) {
+        // Something went wrong, just return the original:
+      }
+      return uri;
     }
 
     var links = articleContent.getElementsByTagName("a");
@@ -535,6 +522,7 @@ Readability.prototype = {
     this._clean(articleContent, "embed");
     this._clean(articleContent, "h1");
     this._clean(articleContent, "footer");
+    this._clean(articleContent, "link");
 
     // Clean out elements have "share" in their id/class combinations from final top candidates,
     // which means we don't remove the top candidates even they have "share".
@@ -1089,24 +1077,45 @@ Readability.prototype = {
       if (this._debug)
         this.log("Article content after paging: " + articleContent.innerHTML);
 
+      var parseSuccessful = true;
+
       // Now that we've gone through the full algorithm, check to see if
       // we got any meaningful content. If we didn't, we may need to re-run
       // grabArticle with different flags set. This gives us a higher likelihood of
       // finding the content, and the sieve approach gives us a higher likelihood of
       // finding the -right- content.
-      if (this._getInnerText(articleContent, true).length < this._wordThreshold) {
+      var textLength = this._getInnerText(articleContent, true).length;
+      if (textLength < this._wordThreshold) {
+        parseSuccessful = false;
         page.innerHTML = pageCacheHtml;
 
         if (this._flagIsActive(this.FLAG_STRIP_UNLIKELYS)) {
           this._removeFlag(this.FLAG_STRIP_UNLIKELYS);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else if (this._flagIsActive(this.FLAG_WEIGHT_CLASSES)) {
           this._removeFlag(this.FLAG_WEIGHT_CLASSES);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else if (this._flagIsActive(this.FLAG_CLEAN_CONDITIONALLY)) {
           this._removeFlag(this.FLAG_CLEAN_CONDITIONALLY);
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
         } else {
-          return null;
+          this._attempts.push({articleContent: articleContent, textLength: textLength});
+          // No luck after removing flags, just return the longest text we found during the different loops
+          this._attempts.sort(function (a, b) {
+            return a.textLength < b.textLength;
+          });
+
+          // But first check if we actually have something
+          if (!this._attempts[0].textLength) {
+            return null;
+          }
+
+          articleContent = this._attempts[0].articleContent;
+          parseSuccessful = true;
         }
-      } else {
+      }
+
+      if (parseSuccessful) {
         // Find out text direction from ancestors of final top candidate.
         var ancestors = [parentOfTopCandidate, topCandidate].concat(this._getNodeAncestors(parentOfTopCandidate));
         this._someNode(ancestors, function(ancestor) {
diff --git a/toolkit/components/reader/ReaderWorker.js b/toolkit/components/reader/ReaderWorker.js
index 9ae589d7d..69426788b 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/toolkit/components/reader/ReaderWorker.js
@@ -47,7 +47,7 @@ var Agent = {
    * @return {object} Article object returned from Readability.
    */
   parseDocument(uri, serializedDoc, options) {
-    let doc = new JSDOMParser().parse(serializedDoc);
+    let doc = new JSDOMParser().parse(serializedDoc, uri.spec);
     return new Readability(uri, doc, options).parse();
   },
 };
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index b392aaf88..e1114672c 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -841,6 +841,36 @@ var FindBar = {
         fakeEvent[k] = event[k];
       }
     }
+#ifdef MC_PALEMOON
+    let findBarId = "FindToolbar";
+    // The FindBar is in the chrome window's context, not in tabbrowser
+    // - see also bug 537013
+    let chromeWin = null;
+    try {
+       chromeWin = content
+         .QueryInterface(Ci.nsIInterfaceRequestor)
+         .getInterface(Ci.nsIWebNavigation)
+         .QueryInterface(Ci.nsIDocShellTreeItem)
+         .rootTreeItem
+         .QueryInterface(Ci.nsIInterfaceRequestor)
+         .getInterface(Ci.nsIDOMWindow)
+         .QueryInterface(Ci.nsIDOMChromeWindow);
+    } catch (e) {
+      Cu.reportError(
+          "The FindBar - the chrome window's context was not detected:\n" + e);
+    }
+    if (chromeWin && chromeWin.document.getElementById(findBarId)) {
+      try {
+        chromeWin.document.getElementById(findBarId)
+            .browser = Services.wm.getMostRecentWindow("navigator:browser")
+                .gBrowser.mCurrentBrowser;
+      } catch (e) {
+        Cu.reportError(
+            "The FindBar - cannot set the property 'browser':\n" + e);
+      }
+    }
+#endif
+
     // sendSyncMessage returns an array of the responses from all listeners
     let rv = sendSyncMessage("Findbar:Keypress", {
       fakeEvent: fakeEvent,
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index f0d4a62a4..72a7952c4 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -37,8 +37,8 @@ toolkit.jar:
    content/global/plugins.html
    content/global/plugins.css
    content/global/browser-child.js
-   content/global/browser-content.js
-*   content/global/buildconfig.html
+*  content/global/browser-content.js
+*  content/global/buildconfig.html
    content/global/contentAreaUtils.js
 #ifndef MOZ_FENNEC
    content/global/customizeToolbar.css
@@ -56,7 +56,7 @@ toolkit.jar:
    content/global/filepicker.properties
    content/global/globalOverlay.js
    content/global/memoriam.xhtml
-*   content/global/mozilla.css
+*  content/global/mozilla.css
    content/global/mozilla.xhtml
 #ifdef MOZ_PHOENIX
    content/global/logopage.xhtml
diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py
index 40f31646a..1a144823c 100644
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -156,16 +156,15 @@ def precompile_cache(registry, source_path, gre_path, app_path):
             extra_env['TSAN_OPTIONS'] = 'report_bugs=0'
         if buildconfig.substs.get('MOZ_ASAN'):
             extra_env['ASAN_OPTIONS'] = 'detect_leaks=0'
-        if buildconfig.substs.get('MOZ_DISABLE_PRECOMPILED_STARTUPCACHE') != '1':
-            if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
-                                '-f', os.path.join(os.path.dirname(__file__),
-                                'precompile_cache.js'),
-                                '-e', 'precompile_startupcache("resource://%s/");'
-                                      % resource],
-                               extra_linker_path=gre_path,
-                               extra_env=extra_env):
-                errors.fatal('Error while running startup cache precompilation')
-                return
+        if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
+                            '-f', os.path.join(os.path.dirname(__file__),
+                            'precompile_cache.js'),
+                            '-e', 'precompile_startupcache("resource://%s/");'
+                                  % resource],
+                           extra_linker_path=gre_path,
+                           extra_env=extra_env):
+            errors.fatal('Error while running startup cache precompilation')
+            return
         from mozpack.mozjar import JarReader
         jar = JarReader(cache)
         resource = '/resource/%s/' % resource
@@ -392,7 +391,8 @@ def main():
 
     # Fill startup cache
     if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \
-      and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1':
+      and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1' \
+      and buildconfig.substs['MOZ_DISABLE_PRECOMPILED_STARTUPCACHE'] != '1':
         gre_path = None
         def get_bases():
             for b in sink.packager.get_bases(addons=False):