Merge branch 'master' into release

22 files changed, 83 insertions, 276 deletions

diff --git a/basilisk/app/blocklist.xml b/basilisk/app/blocklist.xml
index 435d0e7..db42193 100644
--- a/basilisk/app/blocklist.xml
+++ b/basilisk/app/blocklist.xml
@@ -3252,14 +3252,6 @@
         <device>0x0046</device>
       </devices>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g1216">
-      <os>WINNT 5.2</os>
-      <vendor>0x8086</vendor>
-      <feature>HARDWARE_VIDEO_DECODING</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>10.18.10.3947</driverVersion>
-      <driverVersionComparator>EQUAL</driverVersionComparator>
-    </gfxBlacklistEntry>
     <gfxBlacklistEntry blockID="g1220">
       <os>WINNT 6.3</os>
       <vendor>0x8086</vendor>
@@ -3288,28 +3280,12 @@
       <driverVersion>8.982.0.0</driverVersion>
       <driverVersionComparator>EQUAL</driverVersionComparator>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g511">
-      <os>WINNT 5.1</os>
-      <vendor>0x8086</vendor>
-      <feature>DIRECT3D_9_LAYERS</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>6.14.10.5218</driverVersion>
-      <driverVersionComparator>LESS_THAN</driverVersionComparator>
-    </gfxBlacklistEntry>
     <gfxBlacklistEntry blockID="g230">
       <os>Darwin 10</os>
       <vendor>0x1002</vendor>
       <feature>WEBGL_MSAA</feature>
       <featureStatus>BLOCKED_DEVICE</featureStatus>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g1215">
-      <os>WINNT 5.1</os>
-      <vendor>0x8086</vendor>
-      <feature>HARDWARE_VIDEO_DECODING</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>10.18.10.3947</driverVersion>
-      <driverVersionComparator>EQUAL</driverVersionComparator>
-    </gfxBlacklistEntry>
     <gfxBlacklistEntry blockID="g192">
       <os>WINNT 6.2</os>
       <vendor>0x1002</vendor>
@@ -3454,14 +3430,6 @@
         <device>0x9807</device>
       </devices>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g1217">
-      <os>WINNT 6.0</os>
-      <vendor>0x8086</vendor>
-      <feature>HARDWARE_VIDEO_DECODING</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>10.18.10.3947</driverVersion>
-      <driverVersionComparator>EQUAL</driverVersionComparator>
-    </gfxBlacklistEntry>
     <gfxBlacklistEntry blockID="g202">
       <os>Darwin 12</os>
       <vendor>0x10de</vendor>
@@ -3551,15 +3519,6 @@
       <driverVersion>8.982.0.0</driverVersion>
       <driverVersionComparator>EQUAL</driverVersionComparator>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g1251">
-      <os>WINNT 5.1</os>
-      <vendor>0x8086</vendor>
-      <feature>WEBGL_ANGLE</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>6.14.10.5218</driverVersion>
-      <driverVersionComparator>LESS_THAN</driverVersionComparator>
-      <versionRange maxVersion="49.9"/>
-    </gfxBlacklistEntry>
     <gfxBlacklistEntry blockID="g974">
       <os>WINNT 10.0</os>
       <vendor>0x1002</vendor>
@@ -3598,13 +3557,5 @@
       <driverVersion>8.15.10.2413</driverVersion>
       <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator>
     </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g37">
-      <os>WINNT 5.1</os>
-      <vendor>0x10de</vendor>
-      <feature>DIRECT3D_9_LAYERS</feature>
-      <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-      <driverVersion>7.0.0.0</driverVersion>
-      <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator>
-    </gfxBlacklistEntry>
   </gfxItems>
 </blocklist>
diff --git a/basilisk/app/profile/basilisk.js b/basilisk/app/profile/basilisk.js
index 0ca123f..2304aa5 100644
--- a/basilisk/app/profile/basilisk.js
+++ b/basilisk/app/profile/basilisk.js
@@ -116,7 +116,7 @@ pref("app.update.enabled", true);
 // If set to true, the Update Service will automatically download updates when
 // app updates are enabled per the app.update.enabled preference and if the user
 // can apply updates.
-pref("app.update.auto", true);
+pref("app.update.auto", false);
 
 // If set to true, the Update Service will present no UI for any event.
 pref("app.update.silent", false);
@@ -986,6 +986,7 @@ pref("services.sync.prefs.sync.privacy.clearOnShutdown.offlineApps", true);
 pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true);
 pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true);
 pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true);
+pref("services.sync.prefs.sync.privacy.GPCheader.enabled", true);
 pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true);
 pref("services.sync.prefs.sync.security.OCSP.enabled", true);
 pref("services.sync.prefs.sync.security.OCSP.require", true);
diff --git a/basilisk/base/content/aboutDialog.js b/basilisk/base/content/aboutDialog.js
index 8537146..f957162 100644
--- a/basilisk/base/content/aboutDialog.js
+++ b/basilisk/base/content/aboutDialog.js
@@ -61,6 +61,14 @@ function init(aEvent)
     document.getElementById("communityDesc").hidden = true;
   }
 
+  // Append "(32-bit)" or "(64-bit)" build architecture to the version number:
+  let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+  let archResource = Services.appinfo.is64Bit
+                     ? "aboutDialog.architecture.sixtyFourBit"
+                     : "aboutDialog.architecture.thirtyTwoBit";
+  let arch = bundle.GetStringFromName(archResource);
+  versionField.textContent += ` (${arch})`;
+
   // Get Release Notes URL from Preferences
   let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL");
   document.getElementById("releasenotes").setAttribute("href", releaseNotesURL);
diff --git a/basilisk/branding/official/pref/basilisk-branding.js b/basilisk/branding/official/pref/basilisk-branding.js
index d76b49f..4238e21 100644
--- a/basilisk/branding/official/pref/basilisk-branding.js
+++ b/basilisk/branding/official/pref/basilisk-branding.js
@@ -40,6 +40,7 @@ pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPAT
 // Provide UA Gecko and Firefox slices for web compatibility
 pref("general.useragent.compatMode.firefox",true);
 pref("general.useragent.compatMode.gecko",true);
+pref("general.useragent.compatMode.version", "102.0");
 
 // Shared User Agent Overrides
 #include ../../shared/uaoverrides.inc
diff --git a/basilisk/components/migration/IEProfileMigrator.js b/basilisk/components/migration/IEProfileMigrator.js
index 53c1323..ad5274d 100644
--- a/basilisk/components/migration/IEProfileMigrator.js
+++ b/basilisk/components/migration/IEProfileMigrator.js
@@ -477,7 +477,7 @@ IEProfileMigrator.prototype.getResources = function IE_getResources() {
     MSMigrationUtils.getCookiesMigrator(),
     new Settings(),
   ];
-  // Only support the form password migrator for Windows XP to 7.
+  // Only support the form password migrator for Windows 7.
   if (AppConstants.isPlatformAndVersionAtMost("win", "6.1")) {
     resources.push(new IE7FormPasswords());
   }
diff --git a/basilisk/components/nsBrowserGlue.js b/basilisk/components/nsBrowserGlue.js
index 2b2daeb..8406a9c 100644
--- a/basilisk/components/nsBrowserGlue.js
+++ b/basilisk/components/nsBrowserGlue.js
@@ -1524,7 +1524,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function() {
-    const UI_VERSION = 43;
+    const UI_VERSION = 45;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul";
 
     let currentUIVersion;
@@ -1858,6 +1858,20 @@ BrowserGlue.prototype = {
       Services.prefs.clearUserPref("layers.acceleration.force-enabled");
     }
 
+    if (currentUIVersion < 44) {
+      // DoNotTrack is now GPC. Carry across user preference.
+      if (Services.prefs.prefHasUserValue("privacy.donottrackheader.enabled")) {
+        let DNTEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
+        Services.prefs.setBoolPref("privacy.GPCheader.enabled", DNTEnabled);
+        Services.prefs.clearUserPref("privacy.donottrackheader.enabled");
+      }
+    }
+
+    if (currentUIVersion < 45) {
+      // Clear hardware decoding failure flag to re-test. (UXP #1898)
+      Services.prefs.clearUserPref("media.hardware-video-decoding.failed");
+    }
+
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
diff --git a/basilisk/components/preferences/in-content/privacy.xul b/basilisk/components/preferences/in-content/privacy.xul
index 917e2e6..a9d256e 100644
--- a/basilisk/components/preferences/in-content/privacy.xul
+++ b/basilisk/components/preferences/in-content/privacy.xul
@@ -9,9 +9,9 @@
 
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
-  <!-- Tracking -->
-  <preference id="privacy.donottrackheader.enabled"
-              name="privacy.donottrackheader.enabled"
+  <!-- Global Privacy Control -->
+  <preference id="privacy.GPCheader.enabled"
+              name="privacy.GPCheader.enabled"
               type="bool"/>
 
   <!-- XXX button prefs -->
@@ -80,18 +80,18 @@
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>
 
-<!-- Tracking -->
-<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true">
-  <vbox id="donottrackbox">
-    <caption><label>&tracking.label;</label></caption>
+<!-- Global Privacy Control -->
+<groupbox id="dataPrivacyGroup" data-category="panePrivacy" hidden="true">
+  <vbox id="privacygpcbox">
+    <caption><label>&dataPrivacy.label;</label></caption>
     <hbox align="center">
-      <checkbox id="DoNotTrack"
-                preference="privacy.donottrackheader.enabled"
-                accesskey="&doNotTrack.accesskey;"
-                label="&doNotTrack.label;" />
+      <checkbox id="GPC"
+                preference="privacy.GPCheader.enabled"
+                accesskey="&GPC.accesskey;"
+                label="&GPCLabel.label;" />
       <label class="text-link"
-             value="&doNotTrackLearnMore.label;"
-             href="https://www.mozilla.org/dnt"/>
+             value="&GPCLearnMore.label;"
+             href="https://www.palemoon.org/support/global-privacy-control"/>
     </hbox>
   </vbox>
 </groupbox>
diff --git a/basilisk/extensions/pdfjs/content/PdfJsTelemetry.jsm b/basilisk/extensions/pdfjs/content/PdfJsTelemetry.jsm
deleted file mode 100644
index 275da9d..0000000
--- a/basilisk/extensions/pdfjs/content/PdfJsTelemetry.jsm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2013 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* jshint esnext:true, maxlen: 100 */
-/* globals Components, Services */
-
-'use strict';
-
-this.EXPORTED_SYMBOLS = ['PdfJsTelemetry'];
-
-const Cu = Components.utils;
-Cu.import('resource://gre/modules/Services.jsm');
-
-this.PdfJsTelemetry = {
-  onViewerIsUsed: function () {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_USED');
-    histogram.add(true);
-  },
-  onFallback: function () {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_FALLBACK_SHOWN');
-    histogram.add(true);
-  },
-  onDocumentSize: function (size) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_DOCUMENT_SIZE_KB');
-    histogram.add(size / 1024);
-  },
-  onDocumentVersion: function (versionId) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_DOCUMENT_VERSION');
-    histogram.add(versionId);
-  },
-  onDocumentGenerator: function (generatorId) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_DOCUMENT_GENERATOR');
-    histogram.add(generatorId);
-  },
-  onEmbed: function (isObject) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_EMBED');
-    histogram.add(isObject);
-  },
-  onFontType: function (fontTypeId) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_FONT_TYPES');
-    histogram.add(fontTypeId);
-  },
-  onForm: function (isAcroform) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_FORM');
-    histogram.add(isAcroform);
-  },
-  onPrint: function () {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_PRINT');
-    histogram.add(true);
-  },
-  onStreamType: function (streamTypeId) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_STREAM_TYPES');
-    histogram.add(streamTypeId);
-  },
-  onTimeToView: function (ms) {
-    let histogram = Services.telemetry.getHistogramById('PDF_VIEWER_TIME_TO_VIEW_MS');
-    histogram.add(ms);
-  }
-};
diff --git a/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm b/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm
index b5b21f2..d4a0f05 100644
--- a/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm
+++ b/basilisk/extensions/pdfjs/content/PdfStreamConverter.jsm
@@ -14,7 +14,7 @@
  */
 /* jshint esnext:true */
 /* globals Components, Services, XPCOMUtils, NetUtil, PrivateBrowsingUtils,
-           dump, NetworkManager, PdfJsTelemetry, PdfjsContentUtils */
+           dump, NetworkManager, PdfjsContentUtils */
 
 'use strict';
 
@@ -44,9 +44,6 @@ XPCOMUtils.defineLazyModuleGetter(this, 'NetworkManager',
 XPCOMUtils.defineLazyModuleGetter(this, 'PrivateBrowsingUtils',
   'resource://gre/modules/PrivateBrowsingUtils.jsm');
 
-XPCOMUtils.defineLazyModuleGetter(this, 'PdfJsTelemetry',
-  'resource://pdf.js/PdfJsTelemetry.jsm');
-
 XPCOMUtils.defineLazyModuleGetter(this, 'PdfjsContentUtils',
   'resource://pdf.js/PdfjsContentUtils.jsm');
 
@@ -214,13 +211,6 @@ PdfDataListener.prototype = {
 function ChromeActions(domWindow, contentDispositionFilename) {
   this.domWindow = domWindow;
   this.contentDispositionFilename = contentDispositionFilename;
-  this.telemetryState = {
-    documentInfo: false,
-    firstPageInfo: false,
-    streamTypesUsed: [],
-    fontTypesUsed: [],
-    startAt: Date.now()
-  };
 }
 
 ChromeActions.prototype = {
@@ -356,62 +346,6 @@ ChromeActions.prototype = {
       metaKey: Services.prefs.getIntPref('mousewheel.with_meta.action', 1) === 3,
     };
   },
-  reportTelemetry: function (data) {
-    var probeInfo = JSON.parse(data);
-    switch (probeInfo.type) {
-      case 'documentInfo':
-        if (!this.telemetryState.documentInfo) {
-          PdfJsTelemetry.onDocumentVersion(probeInfo.version | 0);
-          PdfJsTelemetry.onDocumentGenerator(probeInfo.generator | 0);
-          if (probeInfo.formType) {
-            PdfJsTelemetry.onForm(probeInfo.formType === 'acroform');
-          }
-          this.telemetryState.documentInfo = true;
-        }
-        break;
-      case 'pageInfo':
-        if (!this.telemetryState.firstPageInfo) {
-          var duration = Date.now() - this.telemetryState.startAt;
-          PdfJsTelemetry.onTimeToView(duration);
-          this.telemetryState.firstPageInfo = true;
-        }
-        break;
-      case 'documentStats':
-        // documentStats can be called several times for one documents.
-        // if stream/font types are reported, trying not to submit the same
-        // enumeration value multiple times.
-        var documentStats = probeInfo.stats;
-        if (!documentStats || typeof documentStats !== 'object') {
-          break;
-        }
-        var i, streamTypes = documentStats.streamTypes;
-        if (Array.isArray(streamTypes)) {
-          var STREAM_TYPE_ID_LIMIT = 20;
-          for (i = 0; i < STREAM_TYPE_ID_LIMIT; i++) {
-            if (streamTypes[i] &&
-                !this.telemetryState.streamTypesUsed[i]) {
-              PdfJsTelemetry.onStreamType(i);
-              this.telemetryState.streamTypesUsed[i] = true;
-            }
-          }
-        }
-        var fontTypes = documentStats.fontTypes;
-        if (Array.isArray(fontTypes)) {
-          var FONT_TYPE_ID_LIMIT = 20;
-          for (i = 0; i < FONT_TYPE_ID_LIMIT; i++) {
-            if (fontTypes[i] &&
-                !this.telemetryState.fontTypesUsed[i]) {
-              PdfJsTelemetry.onFontType(i);
-              this.telemetryState.fontTypesUsed[i] = true;
-            }
-          }
-        }
-        break;
-      case 'print':
-        PdfJsTelemetry.onPrint();
-        break;
-    }
-  },
   fallback: function(args, sendResponse) {
     var featureId = args.featureId;
     var url = args.url;
@@ -425,7 +359,6 @@ ChromeActions.prototype = {
     } else {
       message = getLocalizedString(strings, 'unsupported_feature');
     }
-    PdfJsTelemetry.onFallback();
     PdfjsContentUtils.displayWarning(domWindow, message,
       getLocalizedString(strings, 'open_with_different_viewer'),
       getLocalizedString(strings, 'open_with_different_viewer', 'accessKey'));
@@ -940,9 +873,6 @@ PdfStreamConverter.prototype = {
       aRequest.setResponseHeader('Refresh', '', false);
     }
 
-    PdfJsTelemetry.onViewerIsUsed();
-    PdfJsTelemetry.onDocumentSize(aRequest.contentLength);
-
     // Creating storage for PDF data
     var contentLength = aRequest.contentLength;
     this.dataListener = new PdfDataListener(contentLength);
@@ -996,7 +926,6 @@ PdfStreamConverter.prototype = {
         if (domWindow.frameElement) {
           var isObjectEmbed = domWindow.frameElement.tagName !== 'IFRAME' ||
             domWindow.frameElement.className === 'previewPluginContentFrame';
-          PdfJsTelemetry.onEmbed(isObjectEmbed);
         }
       }
     };
diff --git a/basilisk/extensions/pdfjs/content/web/viewer.js b/basilisk/extensions/pdfjs/content/web/viewer.js
index 35fef2c..8baa5cf 100644
--- a/basilisk/extensions/pdfjs/content/web/viewer.js
+++ b/basilisk/extensions/pdfjs/content/web/viewer.js
@@ -6494,8 +6494,6 @@ var pdfjsWebLibs;
         },
         fallback: function (data, callback) {
         },
-        reportTelemetry: function (data) {
-        },
         createDownloadManager: function () {
           return new downloadManagerLib.DownloadManager();
         },
@@ -7259,12 +7257,6 @@ var pdfjsWebLibs;
               }.bind(null, info.Producer.toLowerCase()));
             }
             var formType = !info.IsAcroFormPresent ? null : info.IsXFAPresent ? 'xfa' : 'acroform';
-            self.externalServices.reportTelemetry({
-              type: 'documentInfo',
-              version: versionId,
-              generator: generatorId,
-              formType: formType
-            });
           });
         },
         setInitialView: function pdfViewSetInitialView(storedHash, options) {
@@ -7330,7 +7322,6 @@ var pdfjsWebLibs;
           this.printService = printService;
           this.forceRendering();
           printService.layout();
-          this.externalServices.reportTelemetry({ type: 'print' });
         },
         // Whether all pages of the PDF have the same width and height.
         get hasEqualPageSizes() {
@@ -7640,14 +7631,6 @@ var pdfjsWebLibs;
         if (pageView.error) {
           PDFViewerApplication.error(mozL10n.get('rendering_error', null, 'An error occurred while rendering the page.'), pageView.error);
         }
-        PDFViewerApplication.externalServices.reportTelemetry({ type: 'pageInfo' });
-        // It is a good time to report stream and font types.
-        PDFViewerApplication.pdfDocument.getStats().then(function (stats) {
-          PDFViewerApplication.externalServices.reportTelemetry({
-            type: 'documentStats',
-            stats: stats
-          });
-        });
       }
       function webViewerTextLayerRendered(e) {
         if (e.numTextDivs > 0 && !PDFViewerApplication.supportsDocumentColors) {
@@ -8507,9 +8490,6 @@ var pdfjsWebLibs;
         fallback: function (data, callback) {
           FirefoxCom.request('fallback', data, callback);
         },
-        reportTelemetry: function (data) {
-          FirefoxCom.request('reportTelemetry', JSON.stringify(data));
-        },
         createDownloadManager: function () {
           return new DownloadManager();
         },
@@ -8668,4 +8648,4 @@ function webViewerLoad() {
   window.PDFViewerApplication = pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication;
   pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication.run(config);
 }
-document.addEventListener('DOMContentLoaded', webViewerLoad, true);
\ No newline at end of file
+document.addEventListener('DOMContentLoaded', webViewerLoad, true);
diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in
index f8dab66..dffa76a 100644
--- a/basilisk/installer/windows/nsis/defines.nsi.in
+++ b/basilisk/installer/windows/nsis/defines.nsi.in
@@ -40,9 +40,14 @@
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
+#ifdef HAVE_64BIT_BUILD
 !define HAVE_64BIT_BUILD
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows 7 x64"
+#else
+!define ARCH "x86"
+!define MinSupportedVer "Microsoft Windows 7"
+#endif
 
 !define MinSupportedCPU "SSE2"
 
diff --git a/basilisk/installer/windows/nsis/installer.nsi b/basilisk/installer/windows/nsis/installer.nsi
index 9c79302..6b4b5ab 100644
--- a/basilisk/installer/windows/nsis/installer.nsi
+++ b/basilisk/installer/windows/nsis/installer.nsi
@@ -123,7 +123,11 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
-InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!ifdef HAVE_64BIT_BUILD
+  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!else
+  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
+!endif
 ShowInstDetails nevershow
 
 ################################################################################
@@ -1057,12 +1061,14 @@ Function .onInit
     Quit
   ${EndIf}
 
+!ifdef HAVE_64BIT_BUILD
   ${Unless} ${RunningX64}
     MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2
     ExecShell "open" "${URLSystemRequirements}"
     Quit
   ${EndUnless}
   SetRegView 64
+!endif
 
   ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
 
diff --git a/basilisk/installer/windows/nsis/shared.nsh b/basilisk/installer/windows/nsis/shared.nsh
index 1996fb9..0ab40b7 100644
--- a/basilisk/installer/windows/nsis/shared.nsh
+++ b/basilisk/installer/windows/nsis/shared.nsh
@@ -1116,17 +1116,6 @@
       System::Call 'advapi32::CloseServiceHandle(i R7) n'
       ; Open the service with SERVICE_QUERY_CONFIG so its status can be queried.
       System::Call 'advapi32::OpenServiceW(i R6, t "MpsSvc", i ${SERVICE_QUERY_STATUS}) i.R7'
-    ${Else}
-      ; SharedAccess is the Firewall service on Windows XP.
-      ; When opening the service with SERVICE_QUERY_CONFIG the return value will
-      ; be 0 if the service is not installed.
-      System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_CONFIG}) i.R7'
-      ${If} $R7 != 0
-        System::Call 'advapi32::CloseServiceHandle(i R7) n'
-        ; Open the service with SERVICE_QUERY_CONFIG so its status can be
-        ; queried.
-        System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_STATUS}) i.R7'
-      ${EndIf}
     ${EndIf}
     ; Did the calls to OpenServiceW succeed?
     ${If} $R7 != 0
diff --git a/basilisk/installer/windows/nsis/uninstaller.nsi b/basilisk/installer/windows/nsis/uninstaller.nsi
index fe4e9d0..7f577d2 100644
--- a/basilisk/installer/windows/nsis/uninstaller.nsi
+++ b/basilisk/installer/windows/nsis/uninstaller.nsi
@@ -120,7 +120,11 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 
 Name "${BrandFullName}"
 OutFile "helper.exe"
-InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!ifdef HAVE_64BIT_BUILD
+  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!else
+  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
+!endif
 ShowUnInstDetails nevershow
 
 ################################################################################
diff --git a/basilisk/locales/en-US/chrome/browser/browser.dtd b/basilisk/locales/en-US/chrome/browser/browser.dtd
index e651760..6afe43c 100644
--- a/basilisk/locales/en-US/chrome/browser/browser.dtd
+++ b/basilisk/locales/en-US/chrome/browser/browser.dtd
@@ -243,8 +243,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
 
-<!ENTITY webDeveloperMenu.label       "Web Developer">
-<!ENTITY webDeveloperMenu.accesskey   "W">
+<!ENTITY webDeveloperMenu.label       "Developer Tools">
+<!ENTITY webDeveloperMenu.accesskey   "v">
 
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
diff --git a/basilisk/locales/en-US/chrome/browser/browser.properties b/basilisk/locales/en-US/chrome/browser/browser.properties
index c9a05af..9d06176 100644
--- a/basilisk/locales/en-US/chrome/browser/browser.properties
+++ b/basilisk/locales/en-US/chrome/browser/browser.properties
@@ -418,7 +418,7 @@ safeModeRestartButton=Restart
 # "true" (spelled and capitalized exactly that way) to show the "Text
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Text Encoding"
-# menu will always be accessible via the "Web Developer" menu.
+# menu will always be accessible via the "Developer Tools" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Text Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
diff --git a/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
index e9f3984..370740d 100644
--- a/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -2,10 +2,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY tracking.label                 "Tracking">
-<!ENTITY doNotTrack.label               "Send a signal that you don’t want to be tracked">
-<!ENTITY doNotTrack.accesskey           "T">
-<!ENTITY doNotTrackLearnMore.label      "Learn More">
+<!ENTITY dataPrivacy.label              "Data Privacy">
+<!ENTITY GPCLabel.label                 "Tell sites not to share or sell my data">
+<!ENTITY GPC.accesskey                  "n">
+<!ENTITY GPCLearnMore.label             "Learn More">
 
 <!ENTITY  history.label                 "History">
 
diff --git a/basilisk/locales/generic/profile/bookmarks.html.in b/basilisk/locales/generic/profile/bookmarks.html.in
index e9121f0..79d561d 100644
--- a/basilisk/locales/generic/profile/bookmarks.html.in
+++ b/basilisk/locales/generic/profile/bookmarks.html.in
@@ -5,27 +5,23 @@
 #define AB_CD ja
 #endif
 
-#define mozilla_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=
-
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE NETSCAPE-Bookmark-file-1>
 <meta charset="UTF-8">
-<title>@bookmarks_title@</title>
-<h1>@bookmarks_heading@</h1>
+<TITLE>@bookmarks_title@</TITLE>
+<H1>@bookmarks_heading@</H1>
 
-<dl><p>
-    <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
-    <dd>@bookmarks_toolbarfolder_description@
-        <dl>
-            <p><dt><a href="http://www.basilisk-browser.org/">Basilisk</a></dt>
-        </dl>
-    <p><dt><h3>@firefox_heading@</h3></dt>
-        <dl><p>
-            <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@mozilla_icon@">@firefox_help@</a>
-            <dt><a href="https://www.mozilla.org/@AB_CD@/firefox/customize/" icon="@mozilla_icon@">@firefox_customize@</a>
-            <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
-            <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
-        </dl>
-</dl>
+<DL><p>
+    <DT><H3>Basilisk</H3>
+    <DL><p>
+        <DT><A HREF="https://basilisk-browser.org/" ICON_URI="https://basilisk-browser.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFbklEQVRYhaWXbUxTZxTH7xfFD6vl9gU0cYkOMpaRmBk+bIsmM84ZG9+2LMsyHSoU6Upb8QPtxYkMLC8tSKaMewuIZTAVASdqwOILyhQogmyoICpv810ZgaFShML978O1BeQWetlJTnJzn+T+f8855znPuQQhwOaFrlkijgtXksmqLDI1qoJMVteSyeoa7lmVJY4LV84LXbNEyDdntpCQOb57leESs6ZRSutZGWOAjDFAzlBTXEYbIGX0rMSkafCNCwsjQkLm/C9tkX7reklGdKeMHhf0Z2Lx6bH92FKRD11VCXZdPgHluSNYWXwACyy7J8Ok7+yYH/P9OuHKikAf0qjKldJ6Vk4bIGMorC7NRGFrPXodr+DJBl4Poay9GV+fPuQGkdJ6ljRGZhPBwXO9E9+4XESaddWuMH98NB2V3bfBsqxHYT778/kDrD2R5Y4GadJcIr5Z+c7MO58grqsqgcM5Ikh4ojnHxmBuOA+/iRDTRYI0qnJd+U6ur/S46/6hQZS1N6OsvRnPBl/MCHL8znX4W2IhYwwgjZHZvOIiKnSDlNazcoZCTPVJsCwLlmXRNzSIa0+7cfR2I+JqzkDxO42FE4rNn4nFl6dycOHvtmnTlHez1l0TUwszOHiuJGNXp5yhsKrkIIZHnThx7y+sKMrgPW6efHtlIfqGBnkBWJaF8twRDmJ/dPukIyqOD1fKaAP8GAqNT+8jv8XuleBnxT9DW1U86d3SgmQcaLoEh3N4CkTP4Au8dygeMsYA37iwsPHcm7VNcobC1rMF6HW8wuJDe70C+MC6D6tKDkJGT10703GTNxJGuw1yhoLEpGkgCIIgfLYpAly5v/zgLrJvXBUUdk/+XbmVF+Dhiz74vamFedvXLibECRGRMtqAIGsinGNj2HQqe9aiHxWmwPBHGay37PBjYtH9by8vxOrSTMgYA8Rx4UqCTFJb5AyFLRW/YnjUiUU5ewSJfnI0HZbmK2jv75l0Cr46nYvDt+p4AeJryyFnKJDJqiyCTImyyRkKP149jRs9jwSJJ9RVYHjUyStS0FKP7bZC3rWitkYOwBRVTkhMWrucoWC6dh7H71z3StjfEouitkbej7ts4LUDH+Yb0d7XM2Wtsrv1TQTUNW6AjOsX3RU6k6dcOzetuMuO3G7AiqIM9L+e3BvOdrWMA5CpXAqS6m2IeNMopvMFlt0YGB7yCoBlWWguFmN1aSYevex3vy9q4yJNpmoq3EX4w4UirDvJzAjgx1Bo7X3iFQAADDlH8EXpL0isq4D1Vh06+nuQ3nhhvAjF+7hjGPKbCcsKU71KweclmXCOjXkNca/vOaru33FH5dvyw5DTFHcMfZQbA7nBg/I4avF5fovdawAAqHnUCYAbWhbl7OEakWt+lKbpmoQ2nSBrIv5xvPQaYIzlIua6ZyRmTeP4ZZS4Y8fEuU9Iux0VkAqHcwTLClMhow3w3asMf+s6ju4S3H5pCqrzxzw2o7ctrYErPun+nR1TJmZRzOZNrktJqK87yeDZq4Fpxesed2Fh9m5IaT0r0m9ZzzsVSZLUebNJhZyhsKwwFXf7nvOKt/Y+wfuHE7m50KjK9TgTEopAHzJNe2W2EEHWRDT3PJwkXvu4E0HWRO7cm3XVhCLQxzMAQRCETjGfNM8eIiDvJ9ifdMHhHIHRbsMC1zBq1lYTG5eLphefEAlJkjpvtjXxbs4eLC1I4QqO1rOkUZU78855TBSzeZMkI7pLSINyuYyhIMnY1SmiQjcIFp5kwcFzxQnKCGmarknKcD+n0wlLaT1LpmmbxPHhSu9/x7w0n0hFgDghIpJMUlvIlCibxKS1S0xaO5mms5FJaos4ISLSZ5siQMg3/wOwZ8XZGxPSYQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Basilisk Homepage</A>
+        <DD>A XUL-based web-browser demonstrating the Unified XUL Platform (UXP).
+        <DT><A HREF="https://forum.palemoon.org/viewforum.php?f=61" ICON_URI="https://forum.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=" LAST_CHARSET="UTF-8">Basilisk - Pale Moon Forum</A>
+        <DT><A HREF="https://repo.palemoon.org/MoonchildProductions/UXP" ICON_URI="https://repo.palemoon.org/img/favicon.png" ICON="data:image/png;base64,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" LAST_CHARSET="UTF-8">UXP Source Repository</A>
+        <DD>UXP - Unified XUL Platform
+        <DT><A HREF="https://repo.palemoon.org/Basilisk-Dev/Basilisk" ICON_URI="https://repo.palemoon.org/img/favicon.png" ICON="data:image/png;base64,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" LAST_CHARSET="UTF-8">Basilisk Source Repository</A>
+        <DD>Basilisk
+    </DL><p>
+</DL>
diff --git a/basilisk/themes/shared/incontentprefs/preferences.inc.css b/basilisk/themes/shared/incontentprefs/preferences.inc.css
index 9f0b0d6..fe0b041 100644
--- a/basilisk/themes/shared/incontentprefs/preferences.inc.css
+++ b/basilisk/themes/shared/incontentprefs/preferences.inc.css
@@ -236,13 +236,13 @@ treecol {
 
 /* Privacy pane */
 
-.doNotTrackLearnMore {
+.GPCLearnMore {
   margin-inline-start: calc(1em + 30px);
   margin-bottom: 1em;
   font-weight: normal;
 }
 
-.doNotTrackLearnMore > label {
+.GPCLearnMore > label {
   font-size: 1em !important;
   margin-left: 0;
 }
diff --git a/basilisk/themes/windows/browser.css b/basilisk/themes/windows/browser.css
index 7d55168..3f21478 100644
--- a/basilisk/themes/windows/browser.css
+++ b/basilisk/themes/windows/browser.css
@@ -127,7 +127,7 @@ toolbar:-moz-lwtheme {
   #navigator-toolbox {
     /* Override the global style for Windows 10 that adds a bottom border */
     border-bottom: none;
-  };
+  }
 }
 
 #navigator-toolbox::after {
diff --git a/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm b/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
index aa2b3f2..d7127f9 100644
--- a/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -22,7 +22,6 @@ this.Preferences = {
       ["paneContent", null],
       ["paneApplications", null],
       ["panePrivacy", null],
-      ["panePrivacy", null, DNTDialog],
       ["panePrivacy", null, clearRecentHistoryDialog],
       ["paneSecurity", null],
       ["paneSync", null],
@@ -96,12 +95,6 @@ function paintPromise(browserWindow) {
   });
 }
 
-function* DNTDialog(aBrowser) {
-  yield ContentTask.spawn(aBrowser, null, function* () {
-    content.document.getElementById("doNotTrackSettings").click();
-  });
-}
-
 function* connectionDialog(aBrowser) {
   yield ContentTask.spawn(aBrowser, null, function* () {
     content.document.getElementById("connectionSettings").click();
diff --git a/platform b/platform
-Subproject b110549cbd2a6f9efd11b33180b4a410f271923
+Subproject 4898c4f29719ebe9867f2cda3121d52672da92c