Index: dependencies
===================================================================
--- a/dependencies
+++ b/dependencies
@@ -2,4 +2,4 @@
 _self = buildtools/ensure_dependencies.py
 buildtools = buildtools hg:d9e8c5035624 git:0c8a9db
 adblockpluscore = adblockpluscore hg:000df4267bc8 git:563b247
-adblockplusui = adblockplusui hg:f70786b535e3 git:8103830
\ No newline at end of file
+adblockplusui = adblockplusui hg:08bd84805764 git:93b2850
Index: lib/prefs.js
===================================================================
--- a/lib/prefs.js
+++ b/lib/prefs.js
@@ -155,7 +155,7 @@
 /**
  * Whether to show tracking warning in options page when both
  * Acceptable Ads and subscription of type "Privacy" are enabled.
- * 
+ *
  * @type {boolean}
  */
 defaults.ui_warn_tracking = true;
@@ -183,7 +183,7 @@
 defaults.show_devtools_panel = true;
 
 /**
- * Whether to suppress the first run page. This preference isn't
+ * Whether to suppress the first run and updates page. This preference isn't
  * set by the extension but can be pre-configured externally.
  *
  * @see https://adblockplus.org/development-builds/suppressing-the-first-run-page-on-chrome
@@ -201,6 +201,14 @@
 defaults.additional_subscriptions = [];
 
 /**
+ * The version of major updates that the user is aware of. If it's too low,
+ * the updates page will be shown to inform the user about intermediate changes.
+ *
+ * @type {number}
+ */
+defaults.last_updates_page_displayed = 0;
+
+/**
   * @namespace
   * @static
   */
Index: lib/subscriptionInit.js
===================================================================
--- a/lib/subscriptionInit.js
+++ b/lib/subscriptionInit.js
@@ -23,10 +23,12 @@
        SpecialSubscription} = require("subscriptionClasses");
 const {FilterStorage} = require("filterStorage");
 const {FilterNotifier} = require("filterNotifier");
+const info = require("info");
 const {Prefs} = require("prefs");
 const {Synchronizer} = require("synchronizer");
 const {Utils} = require("utils");
 const {initNotifications} = require("notificationHelper");
+const {updatesVersion} = require("../adblockplusui/lib/prefs");
 
 let firstRun;
 let subscriptionsCallback = null;
@@ -48,7 +50,7 @@
   if (firstRun && (!FilterStorage.firstRun || Prefs.currentVersion))
     exports.reinitialized = true;
 
-  Prefs.currentVersion = require("info").addonVersion;
+  Prefs.currentVersion = info.addonVersion;
 }
 
 /**
@@ -204,8 +206,30 @@
       Synchronizer.execute(subscription);
   }
 
-  if (firstRun && !Prefs.suppress_first_run_page)
-    browser.tabs.create({url: browser.extension.getURL("firstRun.html")});
+  if (!Prefs.suppress_first_run_page)
+  {
+    let page = null;
+    if (firstRun)
+    {
+      page = "firstRun.html";
+    }
+    // For now we're limiting the updates page to users of
+    // Chromium-based browsers to gage its impact
+    else if (info.platform == "chromium" &&
+             updatesVersion > Prefs.last_updates_page_displayed)
+    {
+      page = "updates.html";
+    }
+
+    if (page)
+    {
+      browser.tabs.create({url: browser.extension.getURL(page)});
+
+      // For new users and users that have already seen this updates page we
+      // want to avoid showing it again for subsequent updates.
+      Prefs.last_updates_page_displayed = updatesVersion;
+    }
+  }
 
   initNotifications();
 }
Index: metadata.chrome
===================================================================
--- a/metadata.chrome
+++ b/metadata.chrome
@@ -46,6 +46,7 @@
 i18n.js = adblockplusui/i18n.js
 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png
 skin/common.css = adblockplusui/skin/common.css
+skin/fonts.css = adblockplusui/skin/fonts.css
 skin/firstRun.css = adblockplusui/skin/firstRun.css
 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg
 skin/ajax-loader.gif = adblockplusui/skin/ajax-loader.gif
@@ -56,21 +57,66 @@
 skin/abb-logo.png = adblockplusui/skin/abb-logo.png
 skin/fonts/CreteRound-Italic.otf = adblockplusui/skin/fonts/CreteRound-Italic.otf
 skin/fonts/CreteRound-Regular.otf = adblockplusui/skin/fonts/CreteRound-Regular.otf
-skin/fonts/SourceSansPro-Regular.woff = adblockplusui/skin/fonts/SourceSansPro-Regular.woff
-skin/fonts/SourceSansPro-Light.woff = adblockplusui/skin/fonts/SourceSansPro-Light.woff
-skin/fonts/SourceSansPro-bold.woff = adblockplusui/skin/fonts/SourceSansPro-bold.woff
+skin/fonts/Source-Sans-Pro/LICENSE.txt = adblockplusui/skin/fonts/Source-Sans-Pro/LICENSE.txt
+skin/fonts/Source-Sans-Pro/300/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic.woff2
+skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2
+skin/fonts/Source-Sans-Pro/300/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek.woff2
+skin/fonts/Source-Sans-Pro/300/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek-ext.woff2
+skin/fonts/Source-Sans-Pro/300/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin.woff2
+skin/fonts/Source-Sans-Pro/300/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin-ext.woff2
+skin/fonts/Source-Sans-Pro/300/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/vietnamese.woff2
+skin/fonts/Source-Sans-Pro/400/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic.woff2
+skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2
+skin/fonts/Source-Sans-Pro/400/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek.woff2
+skin/fonts/Source-Sans-Pro/400/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek-ext.woff2
+skin/fonts/Source-Sans-Pro/400/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin.woff2
+skin/fonts/Source-Sans-Pro/400/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin-ext.woff2
+skin/fonts/Source-Sans-Pro/400/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/vietnamese.woff2
+skin/fonts/Source-Sans-Pro/700/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic.woff2
+skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2
+skin/fonts/Source-Sans-Pro/700/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek.woff2
+skin/fonts/Source-Sans-Pro/700/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek-ext.woff2
+skin/fonts/Source-Sans-Pro/700/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin.woff2
+skin/fonts/Source-Sans-Pro/700/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin-ext.woff2
+skin/fonts/Source-Sans-Pro/700/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/vietnamese.woff2
+skin/icons/attention.svg = adblockplusui/skin/icons/attention.svg
 skin/icons/checkbox.png = adblockplusui/skin/icons/checkbox.png
+skin/icons/checkbox.svg = adblockplusui/skin/icons/checkbox.svg
+skin/icons/checkmark.svg = adblockplusui/skin/icons/checkmark.svg
+skin/icons/code.svg = adblockplusui/skin/icons/code.svg
+skin/icons/delete.svg = adblockplusui/skin/icons/delete.svg
+skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg
+skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg
+skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg
+skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg
+skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg
+skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg
 skin/social/facebook.png = adblockplusui/skin/social/facebook.png
+skin/social/facebook.svg = adblockplusui/skin/social/facebook.svg
 skin/social/googleplus.png = adblockplusui/skin/social/googleplus.png
+skin/social/googleplus.svg = adblockplusui/skin/social/googleplus.svg
 skin/social/renren.png = adblockplusui/skin/social/renren.png
 skin/social/twitter.png = adblockplusui/skin/social/twitter.png
+skin/social/twitter.svg = adblockplusui/skin/social/twitter.svg
 skin/social/weibo.png = adblockplusui/skin/social/weibo.png
+skin/updates/appstore-bg.svg = adblockplusui/skin/updates/appstore-bg.svg
+skin/updates/base-graphic.svg = adblockplusui/skin/updates/base-graphic.svg
+skin/updates/googleplay-bg.svg = adblockplusui/skin/updates/googleplay-bg.svg
+skin/updates/icon-mobile.svg = adblockplusui/skin/updates/icon-mobile.svg
+skin/updates/icon-rocket.svg = adblockplusui/skin/updates/icon-rocket.svg
+skin/updates/icon-thumbs-up.svg = adblockplusui/skin/updates/icon-thumbs-up.svg
 devtools-panel.html = adblockplusui/devtools-panel.html
 devtools-panel.js = adblockplusui/devtools-panel.js
 skin/devtools-panel.css = adblockplusui/skin/devtools-panel.css
 issue-reporter.html = adblockplusui/issue-reporter.html
 issue-reporter.js = adblockplusui/issue-reporter.js
 skin/issue-reporter.css = adblockplusui/skin/issue-reporter.css
+desktop-options.html = adblockplusui/desktop-options.html
+desktop-options.js = adblockplusui/desktop-options.js
+skin/desktop-options.css = adblockplusui/skin/desktop-options.css
+updates.html = adblockplusui/updates.html
+updates.js = adblockplusui/updates.js
+skin/updates.css = adblockplusui/skin/updates.css
 
 [bundles]
 lib/adblockplus.js =
@@ -95,6 +141,9 @@
   qunit/tests/cssEscaping.js
 
 [import_locales]
+adblockplusui/locale/*/antiadblockInit.json = *
+adblockplusui/locale/*/common.json = *
+adblockplusui/locale/*/desktop-options.json = *
 adblockplusui/locale/*/firstRun.json = *
-adblockplusui/locale/*/antiadblockInit.json = *
 adblockplusui/locale/*/issue-reporter.json = *
+adblockplusui/locale/*/updates.json = *
Index: metadata.gecko
===================================================================
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -12,33 +12,13 @@
 [mapping]
 mobile-options.html = adblockplusui/mobile-options.html
 mobile-options.js = adblockplusui/mobile-options.js
-desktop-options.html = adblockplusui/desktop-options.html
-desktop-options.js = adblockplusui/desktop-options.js
-skin/desktop-options.css = adblockplusui/skin/desktop-options.css
 skin/mobile-options.css = adblockplusui/skin/mobile-options.css
 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg
 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg
 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg
-skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg
-skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg
-skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg
-skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg
-skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg
-skin/icons/code.svg = adblockplusui/skin/icons/code.svg
-skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg
-skin/icons/delete.svg = adblockplusui/skin/icons/delete.svg
-skin/icons/attention.svg = adblockplusui/skin/icons/attention.svg
-skin/icons/checkmark.svg = adblockplusui/skin/icons/checkmark.svg
-skin/icons/checkbox.png = adblockplusui/skin/icons/checkbox.png
-skin/icons/checkbox.svg = adblockplusui/skin/icons/checkbox.svg
-skin/social/twitter.svg = adblockplusui/skin/social/twitter.svg
-skin/social/facebook.svg = adblockplusui/skin/social/facebook.svg
-skin/social/googleplus.svg = adblockplusui/skin/social/googleplus.svg
 
 [bundles]
 lib/adblockplus.js += lib/firefoxDataCleanup.js
 
 [import_locales]
 adblockplusui/locale/*/mobile-options.json = *
-adblockplusui/locale/*/desktop-options.json = *
-adblockplusui/locale/*/common.json = *