diff --git a/README.MD b/README.MD
index 78ad019..a52863b 100644
--- a/README.MD
+++ b/README.MD
@@ -4,7 +4,7 @@ Restarting fresh
 
 A patch driven fork of uBlock Origin.
 
-Upstream commit pin: `c3b0fd31f64bd7ffecdd282fb1208fe07aac3eb0` or `1.17.4`
+Upstream commit pin: `0341a5e1f995ec44ba39ebf72480e7e40f27e717` or `1.17.5rc0+3`
 
 **Please submit issues to the
 [Nano Core issues tracker](https://github.com/NanoAdblocker/NanoCore/issues).**
diff --git a/config.nano.js b/config.nano.js
index d4ac22e..624f4a7 100644
--- a/config.nano.js
+++ b/config.nano.js
@@ -76,8 +76,6 @@
 
             "./patches/30_0_link_resources.patch",
 
-            "./patches/90_0_micro_optimizations.patch",
-
             /*****************************************************************/
 
         ],
diff --git a/patches/00_0_textarea_spacing.patch b/patches/00_0_textarea_spacing.patch
index 238f2d0..030540b 100644
--- a/patches/00_0_textarea_spacing.patch
+++ b/patches/00_0_textarea_spacing.patch
@@ -1,5 +1,5 @@
 diff --git a/src/css/common.css b/src/css/common.css
-index a483215d..3683de3c 100644
+index c6499ef5..a09ae70a 100644
 --- a/src/css/common.css
 +++ b/src/css/common.css
 @@ -25,6 +25,7 @@ code {
diff --git a/patches/20_0_configuration_tweaks.patch b/patches/20_0_configuration_tweaks.patch
index e949e29..92cfa68 100644
--- a/patches/20_0_configuration_tweaks.patch
+++ b/patches/20_0_configuration_tweaks.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/assets.js b/src/js/assets.js
-index b6821bbd..26bf4ada 100644
+index 23a12902..3d66f772 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
-@@ -285,7 +285,7 @@ var registerAssetSource = function(assetKey, dict) {
+@@ -311,7 +311,7 @@ const registerAssetSource = function(assetKey, dict) {
          entry.contentURL = [];
      }
      if ( typeof entry.updateAfter !== 'number' ) {
@@ -11,7 +11,7 @@ index b6821bbd..26bf4ada 100644
      }
      if ( entry.submitter ) {
          entry.submitTime = Date.now(); // To detect stale entries
-@@ -902,7 +902,7 @@ api.rmrf = function() {
+@@ -898,7 +898,7 @@ api.rmrf = function() {
  // Asset updater area.
  var updaterStatus,
      updaterTimer,
@@ -21,10 +21,10 @@ index b6821bbd..26bf4ada 100644
      updaterUpdated = [],
      updaterFetched = new Set(),
 diff --git a/src/js/background.js b/src/js/background.js
-index 17e5b034..88d5542e 100644
+index f1d0e741..6f66b049 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
-@@ -40,8 +40,8 @@ const µBlock = (function() { // jshint ignore:line
+@@ -40,15 +40,15 @@ const µBlock = (function() { // jshint ignore:line
  
      const hiddenSettingsDefault = {
          assetFetchTimeout: 30,
@@ -32,10 +32,9 @@ index 17e5b034..88d5542e 100644
 -        autoUpdatePeriod: 7,
 +        autoUpdateAssetFetchPeriod: 300,
 +        autoUpdatePeriod: 4,
-         benchmarkingPane: false,
          cacheStorageCompression: true,
          cacheControlForFirefox1376932: 'no-cache, no-store, must-revalidate',
-@@ -49,7 +49,7 @@ const µBlock = (function() { // jshint ignore:line
+         debugScriptlets: false,
          disableWebAssembly: false,
          ignoreRedirectFilters: false,
          ignoreScriptInjectFilters: false,
@@ -44,7 +43,7 @@ index 17e5b034..88d5542e 100644
          nanoIgnoreThirdPartyWhitelist: false,
          nanoMakeThirdPartyFiltersPrivileged: false,
          nanoMakeUserFiltersPrivileged: false,
-@@ -65,6 +65,7 @@ const µBlock = (function() { // jshint ignore:line
+@@ -64,6 +64,7 @@ const µBlock = (function() { // jshint ignore:line
          'chrome-extension-scheme',
          'chrome-scheme',
          'moz-extension-scheme',
@@ -53,10 +52,10 @@ index 17e5b034..88d5542e 100644
          'vivaldi-scheme',
          'wyciwyg-scheme',   // Firefox's "What-You-Cache-Is-What-You-Get"
 diff --git a/src/js/start.js b/src/js/start.js
-index 7307a494..1ed193cc 100644
+index 1a99a0fb..aa382f03 100644
 --- a/src/js/start.js
 +++ b/src/js/start.js
-@@ -223,13 +223,6 @@ var onUserSettingsReady = function(fetched) {
+@@ -231,13 +231,6 @@ var onUserSettingsReady = function(fetched) {
      µb.sessionURLFiltering.assign(µb.permanentURLFiltering);
      µb.permanentSwitches.fromString(fetched.hostnameSwitchesString);
      µb.sessionSwitches.assign(µb.permanentSwitches);
@@ -70,7 +69,7 @@ index 7307a494..1ed193cc 100644
  };
  
  /******************************************************************************/
-@@ -316,6 +309,7 @@ var onSelectedFilterListsLoaded = function() {
+@@ -324,6 +317,7 @@ var onSelectedFilterListsLoaded = function() {
          ].join('\n'),
          'urlFilteringString': '',
          'hostnameSwitchesString': [
@@ -79,10 +78,10 @@ index 7307a494..1ed193cc 100644
              'no-scripting: behind-the-scene false'
          ].join('\n'),
 diff --git a/src/js/storage.js b/src/js/storage.js
-index acaa3e88..a0b69e06 100644
+index f48ad6e0..edfbf6ef 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
-@@ -1272,7 +1272,7 @@
+@@ -1293,7 +1293,7 @@
              next = 0;
              var µb = µBlock;
              µb.assets.updateStart({
@@ -91,7 +90,7 @@ index acaa3e88..a0b69e06 100644
              });
          }, updateDelay);
      };
-@@ -1367,7 +1367,7 @@
+@@ -1391,7 +1391,7 @@
              this.loadFilterLists();
          }
          if ( this.userSettings.autoUpdate ) {
diff --git a/patches/20_1_header_parsing.patch b/patches/20_1_header_parsing.patch
index c76bd32..f607445 100644
--- a/patches/20_1_header_parsing.patch
+++ b/patches/20_1_header_parsing.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/storage.js b/src/js/storage.js
-index a0b69e06..06eb54f6 100644
+index edfbf6ef..17c14f2f 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
-@@ -764,15 +764,33 @@
+@@ -775,15 +775,33 @@
      }
      // Extract update frequency information
      let matches = head.match(/(?:^|\n)(?:!|# )[\t ]*Expires[\t ]*:[\t ]*(\d+)[\t ]*(h)?/i);
diff --git a/patches/20_3_reset_hard.patch b/patches/20_3_reset_hard.patch
index c09b7d4..ff47019 100644
--- a/patches/20_3_reset_hard.patch
+++ b/patches/20_3_reset_hard.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/messaging.js b/src/js/messaging.js
-index bbc2212c..2becceb7 100644
+index 3acd1d88..5c8ac0ab 100644
 --- a/src/js/messaging.js
 +++ b/src/js/messaging.js
-@@ -846,11 +846,8 @@ var restoreUserData = function(request) {
+@@ -851,11 +851,8 @@ var restoreUserData = function(request) {
      vAPI.localStorage.removeItem('immediateHiddenSettings');
  };
  
@@ -15,7 +15,7 @@ index bbc2212c..2becceb7 100644
      let countdown = ( ) => {
          count -= 1;
          if ( count === 0 ) {
-@@ -859,8 +856,7 @@ var resetUserData = function() {
+@@ -864,8 +861,7 @@ var resetUserData = function() {
      };
      µb.cacheStorage.clear(countdown); // 1
      vAPI.storage.clear(countdown);    // 2
diff --git a/patches/20_4_log_script_snippet_errors.patch b/patches/20_4_log_script_snippet_errors.patch
index 8ad62ee..8ee8eb7 100644
--- a/patches/20_4_log_script_snippet_errors.patch
+++ b/patches/20_4_log_script_snippet_errors.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index a644d619..ca16cd0f 100644
+index 86c31dd7..c4abf10d 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
-@@ -187,7 +187,9 @@
+@@ -195,7 +195,9 @@
              content =
                  'try {\n' +
                      content.replace('{{nano}}', '') + '\n' +
diff --git a/patches/20_6_warn_unsaved.patch b/patches/20_6_warn_unsaved.patch
index bdd9d43..8208f66 100644
--- a/patches/20_6_warn_unsaved.patch
+++ b/patches/20_6_warn_unsaved.patch
@@ -27,7 +27,7 @@ index 42ea241f..f81090b9 100644
      uDom('#buttonPurgeAll').toggleClass(
          'disabled',
 diff --git a/src/js/dashboard.js b/src/js/dashboard.js
-index f80e7724..ca676b2b 100644
+index d038c5d0..5ec05c8b 100644
 --- a/src/js/dashboard.js
 +++ b/src/js/dashboard.js
 @@ -62,7 +62,10 @@ let onTabClickHandler = function(e) {
@@ -42,7 +42,7 @@ index f80e7724..ca676b2b 100644
          window.location.replace(url);
          loadDashboardPanel();
      }
-@@ -85,4 +88,32 @@ loadDashboardPanel();
+@@ -81,4 +84,32 @@ loadDashboardPanel();
  
  /******************************************************************************/
  
@@ -76,7 +76,7 @@ index f80e7724..ca676b2b 100644
 +
  })();
 diff --git a/src/js/dyna-rules.js b/src/js/dyna-rules.js
-index 8ffe536b..09670b26 100644
+index 5e36ce91..cf4fc938 100644
 --- a/src/js/dyna-rules.js
 +++ b/src/js/dyna-rules.js
 @@ -25,6 +25,10 @@
@@ -90,7 +90,7 @@ index 8ffe536b..09670b26 100644
  (function() {
  
  /******************************************************************************/
-@@ -348,6 +352,7 @@ var onTextChanged = (function() {
+@@ -385,6 +389,7 @@ const onTextChanged = (function() {
              input.setAttribute('disabled', '');
              CodeMirror.commands.save = editSaveHandler;
          }
diff --git a/patches/90_0_micro_optimizations.patch b/patches/90_0_micro_optimizations.patch
deleted file mode 100644
index de87607..0000000
--- a/patches/90_0_micro_optimizations.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/js/assets.js b/src/js/assets.js
-index 26bf4ada..aeab4f7c 100644
---- a/src/js/assets.js
-+++ b/src/js/assets.js
-@@ -368,8 +368,7 @@ var getAssetSourceRegistry = function(callback) {
-     var registryReady = function() {
-         var callers = assetSourceRegistryStatus;
-         assetSourceRegistryStatus = 'ready';
--        var fn;
--        while ( (fn = callers.shift()) ) {
-+        for ( var fn of callers ) {
-             fn(assetSourceRegistry);
-         }
-     };
-@@ -439,8 +438,7 @@ var getAssetCacheRegistry = function(callback) {
-     var registryReady = function() {
-         var callers = assetCacheRegistryStatus;
-         assetCacheRegistryStatus = 'ready';
--        var fn;
--        while ( (fn = callers.shift()) ) {
-+        for ( var fn of callers ) {
-             fn(assetCacheRegistry);
-         }
-     };
-diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index 0dfb566b..ce5a0e75 100644
---- a/src/js/redirect-engine.js
-+++ b/src/js/redirect-engine.js
-@@ -347,8 +347,8 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
-         return;
-     }
- 
--    // Need one single type -- not negated.
--    if ( type === undefined || type.startsWith('~') ) {
-+    // Need one single supported type.
-+    if ( type === undefined ) {
-         nano.flintw('nano_r_no_supported_type');
-         return;
-     }
-diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index c1ed276f..f2d6d151 100644
---- a/src/js/static-net-filtering.js
-+++ b/src/js/static-net-filtering.js
-@@ -2180,12 +2180,7 @@ FilterContainer.prototype.fromSelfie = function(selfie) {
- FilterContainer.prototype.compile = function(raw, writer) {
-     // ORDER OF TESTS IS IMPORTANT!
- 
--    // Ignore empty lines
--    var s = raw.trim();
--    if ( s.length === 0 ) {
--        return false;
--    }
--
-+    var s = raw;
-     var parsed = this.filterParser.parse(s);
- 
-     // Ignore element-hiding filters
-diff --git a/src/js/storage.js b/src/js/storage.js
-index 06eb54f6..6f6fb232 100644
---- a/src/js/storage.js
-+++ b/src/js/storage.js
-@@ -674,7 +674,7 @@
- 
-         // We need to build a complete list of assets to pull first: this is
-         // because it *may* happens that some load operations are synchronous:
--        // This happens for assets which do not exist, ot assets with no
-+        // This happens for assets which do not exist, or assets with no
-         // content.
-         var toLoad = [];
-         for ( var assetKey in lists ) {
diff --git a/patches/README.MD b/patches/README.MD
index d36e59f..0decacc 100644
--- a/patches/README.MD
+++ b/patches/README.MD
@@ -39,7 +39,3 @@ category because a pull request is opened upstream.
 ## Group `30`: User Interface Changes
 
 `30_0_link_resources.patch`: Link useful resources in the dashboard.
-
-## Group `90`: Other Changes
-
-`90_0_micro_optimizations.patch`: Minor optimizations and typo fixes.
diff --git a/patches/integration/00_1_version_parsing.patch b/patches/integration/00_1_version_parsing.patch
index 639923f..4da8307 100644
--- a/patches/integration/00_1_version_parsing.patch
+++ b/patches/integration/00_1_version_parsing.patch
@@ -1,5 +1,5 @@
 diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
-index c556ee59..0ae63186 100644
+index 1df622c5..2d8f76c9 100644
 --- a/platform/chromium/vapi-background.js
 +++ b/platform/chromium/vapi-background.js
 @@ -66,16 +66,9 @@ var noopFunc = function(){};
diff --git a/patches/integration/00_2_vapi_icon.patch b/patches/integration/00_2_vapi_icon.patch
index c275f35..b206d6d 100644
--- a/patches/integration/00_2_vapi_icon.patch
+++ b/patches/integration/00_2_vapi_icon.patch
@@ -1,8 +1,8 @@
 diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
-index 0ae63186..d344fdca 100644
+index 2d8f76c9..2696807d 100644
 --- a/platform/chromium/vapi-background.js
 +++ b/platform/chromium/vapi-background.js
-@@ -647,10 +647,10 @@ vAPI.setIcon = (function() {
+@@ -663,10 +663,10 @@ vAPI.setIcon = (function() {
              ' ({badge})';
      const icons = [
          {
diff --git a/patches/integration/00_3_favicon.patch b/patches/integration/00_3_favicon.patch
index 28b1e7f..85e10e3 100644
--- a/patches/integration/00_3_favicon.patch
+++ b/patches/integration/00_3_favicon.patch
@@ -1,5 +1,5 @@
 diff --git a/src/asset-viewer.html b/src/asset-viewer.html
-index fbcadf5e..d2809138 100644
+index 8d02d2e1..5459131a 100644
 --- a/src/asset-viewer.html
 +++ b/src/asset-viewer.html
 @@ -8,7 +8,7 @@
@@ -11,8 +11,31 @@ index fbcadf5e..d2809138 100644
  <style>
  body {
      border: 0;
+diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css
+index ad99cacf..c606cc0e 100644
+--- a/src/css/logger-ui.css
++++ b/src/css/logger-ui.css
+@@ -51,6 +51,18 @@ textarea {
+     height: auto;
+     width: 1em;
+     }
++#nano_l_logger_popup_on, #nano_l_logger_popup_off {
++    filter: initial !important;
++    user-select: none;
++    -webkit-user-select: none;
++    -moz-user-select: none;
++    }
++#showpopup:not(.active) > #nano_l_logger_popup_on {
++    display: none;
++    }
++#showpopup.active > #nano_l_logger_popup_off {
++    display: none;
++    }
+ #info {
+     fill: #ccc;
+     padding-left: 0.5em;
 diff --git a/src/dashboard.html b/src/dashboard.html
-index 43329706..379240b9 100644
+index 3e3106ad..14abf2d6 100644
 --- a/src/dashboard.html
 +++ b/src/dashboard.html
 @@ -12,7 +12,7 @@
@@ -24,3 +47,19 @@ index 43329706..379240b9 100644
       --><a class="tabButton" href="#settings.html" data-i18n="settingsPageName"></a><!--
       --><a class="tabButton" href="#3p-filters.html" data-i18n="3pPageName"></a><!--
       --><a class="tabButton" href="#1p-filters.html" data-i18n="1pPageName"></a><!--
+diff --git a/src/logger-ui.html b/src/logger-ui.html
+index 887c2ded..e786df6a 100644
+--- a/src/logger-ui.html
++++ b/src/logger-ui.html
+@@ -21,7 +21,10 @@
+     </select>
+     <span id="refresh" class="button fa-icon disabled needdom" data-i18n-title="loggerReloadTip">refresh</span>
+     <span id="showdom" class="button fa-icon disabled needdom" data-i18n-title="loggerDomInspectorTip">code</span>
+-    <span id="showpopup" class="button ubo-icon disabled needdom" data-i18n-title="loggerPopupPanelTip"><svg><use href="/img/ublock-defs.svg#ubo-solid"></use></svg></span>
++    <span id="showpopup" class="button ubo-icon disabled needdom" data-i18n-title="loggerPopupPanelTip">
++        <img id="nano_l_logger_popup_off" src="img/128_off.png">
++        <img id="nano_l_logger_popup_on" src="img/128_on.png">
++    </span>
+     <a id="info" class="button fa-icon" href="https://github.com/gorhill/uBlock/wiki/The-logger" target="_blank" data-i18n-title="loggerInfoTip">info-circle</a>
+ </div>
+ 
diff --git a/patches/integration/10_0_load_scripts.patch b/patches/integration/10_0_load_scripts.patch
index 3b820b2..615e3aa 100644
--- a/patches/integration/10_0_load_scripts.patch
+++ b/patches/integration/10_0_load_scripts.patch
@@ -1,5 +1,5 @@
 diff --git a/src/background.html b/src/background.html
-index fa1327b3..ef802e13 100644
+index 29b9a297..b6f4e760 100644
 --- a/src/background.html
 +++ b/src/background.html
 @@ -8,11 +8,14 @@
@@ -18,10 +18,10 @@ index fa1327b3..ef802e13 100644
  <script src="js/hntrie.js"></script>
  <script src="js/utils.js"></script>
 diff --git a/src/js/background.js b/src/js/background.js
-index f0f5b794..2cf32f60 100644
+index 86f1cd16..33c6b859 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
-@@ -189,3 +189,7 @@ const µBlock = (function() { // jshint ignore:line
+@@ -188,3 +188,7 @@ const µBlock = (function() { // jshint ignore:line
  })();
  
  /******************************************************************************/
diff --git a/patches/integration/10_1_compile_flags.patch b/patches/integration/10_1_compile_flags.patch
index e67e9f0..1b27ad9 100644
--- a/patches/integration/10_1_compile_flags.patch
+++ b/patches/integration/10_1_compile_flags.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index 2cf32f60..7aed8e34 100644
+index 33c6b859..a8b7710c 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
-@@ -50,6 +50,9 @@ const µBlock = (function() { // jshint ignore:line
+@@ -49,6 +49,9 @@ const µBlock = (function() { // jshint ignore:line
          ignoreRedirectFilters: false,
          ignoreScriptInjectFilters: false,
          manualUpdateAssetFetchPeriod: 500,
@@ -12,7 +12,7 @@ index 2cf32f60..7aed8e34 100644
          popupFontSize: 'unset',
          requestJournalProcessPeriod: 1000,
          strictBlockingBypassDuration: 120,
-@@ -155,6 +158,7 @@ const µBlock = (function() { // jshint ignore:line
+@@ -154,6 +157,7 @@ const µBlock = (function() { // jshint ignore:line
          assetsBootstrapLocation: 'assets/assets.json',
  
          userFiltersPath: 'user-filters',
@@ -21,10 +21,10 @@ index 2cf32f60..7aed8e34 100644
  
          selectedFilterLists: [],
 diff --git a/src/js/static-ext-filtering.js b/src/js/static-ext-filtering.js
-index 6a0b1deb..b2ca3612 100644
+index 51b31a6b..95593d6e 100644
 --- a/src/js/static-ext-filtering.js
 +++ b/src/js/static-ext-filtering.js
-@@ -709,6 +709,8 @@
+@@ -756,6 +756,8 @@
          // Exception filter?
          parsed.exception = raw.charCodeAt(lpos + 1) === 0x40 /* '@' */;
  
@@ -34,10 +34,10 @@ index 6a0b1deb..b2ca3612 100644
          if ( lpos === 0 ) {
              parsed.hostnames = emptyArray;
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index 99003116..197eebd6 100644
+index dc8382d4..f9c91647 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
-@@ -1561,6 +1561,10 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1586,6 +1586,10 @@ FilterParser.prototype.parseOptions = function(s) {
          }
          // https://github.com/uBlockOrigin/uAssets/issues/192
          if ( opt === 'badfilter' ) {
@@ -48,7 +48,7 @@ index 99003116..197eebd6 100644
              this.badFilter = true;
              continue;
          }
-@@ -1700,6 +1704,10 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1725,6 +1729,10 @@ FilterParser.prototype.parse = function(raw) {
      // block or allow filter?
      // Important: this must be executed before parsing options
      if ( s.startsWith('@@') ) {
@@ -60,41 +60,39 @@ index 99003116..197eebd6 100644
          s = s.slice(2);
      }
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 05dc0e72..f7b3d82a 100644
+index 9bc87342..3d147fed 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
-@@ -410,7 +410,7 @@
-     var µb = this;
- 
-     var onSaved = function() {
--        var compiledFilters = µb.compileFilters(filters),
-+        var compiledFilters = µb.compileFilters(filters, µb.nanoPartialUserFiltersPath),
-             snfe = µb.staticNetFilteringEngine,
-             cfe = µb.cosmeticFilteringEngine,
-             acceptedCount = snfe.acceptedCount + cfe.acceptedCount,
-@@ -702,7 +702,7 @@
- 
-     var onCompiledListLoaded2 = function(details) {
-         if ( details.content === '' ) {
--            details.content = µb.compileFilters(rawContent);
-+            details.content = µb.compileFilters(rawContent, assetKey);
-             µb.assets.put(compiledPath, details.content);
-         }
-         rawContent = undefined;
-@@ -784,9 +784,11 @@
+@@ -410,7 +410,8 @@
+     const onSaved = ( ) => {
+         const compiledFilters = this.compileFilters(
+             filters,
+-            { assetKey: this.userFiltersPath }
++            { assetKey: this.userFiltersPath },
++            µb.nanoPartialUserFiltersPath
+         );
+         const snfe = this.staticNetFilteringEngine;
+         const cfe = this.cosmeticFilteringEngine;
+@@ -794,7 +795,7 @@
  
  /******************************************************************************/
  
--µBlock.compileFilters = function(rawText) {
-+µBlock.compileFilters = function(rawText, nanoKey) {
+-µBlock.compileFilters = function(rawText, details) {
++µBlock.compileFilters = function(rawText, details, nanoAssetKeyOverride) {
      let writer = new this.CompiledLineIO.Writer();
  
+     // Populate the writer with information potentially useful to the
+@@ -805,6 +806,9 @@
+         }
+     }
+ 
++    const nanoKey = nanoAssetKeyOverride || details.assetKey;
 +    nano.cf.update(nanoKey);
 +
      // Useful references:
      //    https://adblockplus.org/en/filter-cheatsheet
      //    https://adblockplus.org/en/filters
-@@ -846,6 +848,8 @@
+@@ -864,6 +868,8 @@
          staticNetFilteringEngine.compile(line, writer);
      }
  
@@ -103,12 +101,3 @@ index 05dc0e72..f7b3d82a 100644
      return writer.toString();
  };
  
-@@ -1256,7 +1260,7 @@
-                     );
-                     this.assets.put(
-                         'compiled/' + details.assetKey,
--                        this.compileFilters(details.content)
-+                        this.compileFilters(details.content, details.assetKey)
-                     );
-                 }
-             } else {
diff --git a/patches/integration/10_2_extended_resources.patch b/patches/integration/10_2_extended_resources.patch
index 4083e3f..b422c99 100644
--- a/patches/integration/10_2_extended_resources.patch
+++ b/patches/integration/10_2_extended_resources.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/assets.js b/src/js/assets.js
-index f1da642a..b6821bbd 100644
+index b80c6ba2..23a12902 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
-@@ -954,6 +954,9 @@ var updateNext = function() {
+@@ -950,6 +950,9 @@ var updateNext = function() {
              if ( assetKey === 'ublock-resources' && noRemoteResources ) {
                  continue;
              }
@@ -13,10 +13,10 @@ index f1da642a..b6821bbd 100644
                  fireNotification(
                      'before-asset-updated',
 diff --git a/src/js/messaging.js b/src/js/messaging.js
-index 4d64f42f..94e0d6ff 100644
+index 63473e96..a0e2a76e 100644
 --- a/src/js/messaging.js
 +++ b/src/js/messaging.js
-@@ -1074,10 +1074,14 @@ var onMessage = function(request, sender, callback) {
+@@ -1071,10 +1071,14 @@ var onMessage = function(request, sender, callback) {
          µb.assets.purge(request.assetKey);
          µb.assets.remove('compiled/' + request.assetKey);
          // https://github.com/gorhill/uBlock/pull/2314#issuecomment-278716960
@@ -33,10 +33,10 @@ index 4d64f42f..94e0d6ff 100644
  
      case 'readHiddenSettings':
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index 258d580e..ea3bb631 100644
+index 57441bf8..e9282765 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
-@@ -186,7 +186,7 @@
+@@ -194,7 +194,7 @@
              }
              content =
                  'try {\n' +
@@ -45,7 +45,7 @@ index 258d580e..ea3bb631 100644
                  '} catch ( e ) { }';
              scriptletCache.add(raw, content);
          }
-@@ -249,6 +249,14 @@
+@@ -256,6 +256,14 @@
              return;
          }
  
@@ -61,10 +61,10 @@ index 258d580e..ea3bb631 100644
          //   Ignore instances of exception filter with negated hostnames,
          //   because there is no way to create an exception to an exception.
 diff --git a/src/js/storage.js b/src/js/storage.js
-index f7b3d82a..2c8f73f8 100644
+index 3d147fed..10c5e313 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
-@@ -924,7 +924,7 @@
+@@ -944,7 +944,7 @@
  
  /******************************************************************************/
  
@@ -73,7 +73,7 @@ index f7b3d82a..2c8f73f8 100644
      var µb = this,
          content = '';
  
-@@ -939,9 +939,28 @@
+@@ -959,9 +959,28 @@
          onDone();
      };
  
@@ -104,7 +104,7 @@ index f7b3d82a..2c8f73f8 100644
          }
          if ( µb.hiddenSettings.userResourcesLocation === 'unset' ) {
              return onDone();
-@@ -949,16 +968,24 @@
+@@ -969,16 +988,24 @@
          µb.assets.fetchText(µb.hiddenSettings.userResourcesLocation, onUserResourcesLoaded);
      };
  
@@ -133,7 +133,7 @@ index f7b3d82a..2c8f73f8 100644
      µb.redirectEngine.resourcesFromSelfie(onSelfieReady);
  };
  
-@@ -1237,7 +1264,10 @@
+@@ -1258,7 +1285,10 @@
              }
          }
          // https://github.com/gorhill/uBlock/issues/2594
@@ -145,7 +145,7 @@ index f7b3d82a..2c8f73f8 100644
              if (
                  this.hiddenSettings.ignoreRedirectFilters === true &&
                  this.hiddenSettings.ignoreScriptInjectFilters === true
-@@ -1275,6 +1305,11 @@
+@@ -1299,6 +1329,11 @@
              if ( cached ) {
                  this.loadRedirectResources(details.content);
              }
diff --git a/patches/integration/10_3_force_recompile.patch b/patches/integration/10_3_force_recompile.patch
index de2ec0e..c1c92ea 100644
--- a/patches/integration/10_3_force_recompile.patch
+++ b/patches/integration/10_3_force_recompile.patch
@@ -44,10 +44,10 @@ index b65ad7a1..62d0a4ca 100644
  renderAdvancedSettings(true);
  
 diff --git a/src/js/messaging.js b/src/js/messaging.js
-index 94e0d6ff..d3f50ee3 100644
+index a0e2a76e..95fb6d24 100644
 --- a/src/js/messaging.js
 +++ b/src/js/messaging.js
-@@ -1104,6 +1104,10 @@ var onMessage = function(request, sender, callback) {
+@@ -1101,6 +1101,10 @@ var onMessage = function(request, sender, callback) {
          µb.changeHiddenSettings(µb.hiddenSettingsFromString(request.content));
          break;
  
diff --git a/patches/integration/10_4_extended_options.patch b/patches/integration/10_4_extended_options.patch
index 0c70416..e187e74 100644
--- a/patches/integration/10_4_extended_options.patch
+++ b/patches/integration/10_4_extended_options.patch
@@ -1,34 +1,21 @@
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index 8b106449..f6880985 100644
+index 2faf39cd..d27c40d6 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -322,7 +322,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
-             srcs = option.slice(7).split('|');
-             continue;
-         }
--        if ( option === 'first-party' ) {
-+        if ( option === 'first-party' || option === '1p' ) {
-             srcs.push(µburi.domainFromHostnameNoCache(des) || des);
-             continue;
-         }
-@@ -384,6 +384,12 @@ RedirectEngine.prototype.supportedTypes = (function() {
-     types.stylesheet = 'stylesheet';
-     types.subdocument = 'sub_frame';
-     types.xmlhttprequest = 'xmlhttprequest';
-+
-+    types.css = 'stylesheet';
-+    types.frame = 'sub_frame';
-+    types.iframe = 'sub_frame';
-+    types.xhr = 'xmlhttprequest';
+@@ -370,6 +370,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
+     [ 'subdocument', 'sub_frame' ],
+     [ 'xhr', 'xmlhttprequest' ],
+     [ 'xmlhttprequest', 'xmlhttprequest' ],
 +
-     return types;
- })();
++    [ 'iframe', 'sub_frame' ],
+ ]);
  
+ /******************************************************************************/
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index 197eebd6..f462904c 100644
+index f9c91647..1f887ab4 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
-@@ -1383,7 +1383,10 @@ FilterParser.prototype.toNormalizedType = {
+@@ -1408,7 +1408,10 @@ FilterParser.prototype.toNormalizedType = {
                 'xhr': 'xmlhttprequest',
      'xmlhttprequest': 'xmlhttprequest',
              'webrtc': 'unsupported',
@@ -40,7 +27,7 @@ index 197eebd6..f462904c 100644
  };
  
  /******************************************************************************/
-@@ -1501,7 +1504,7 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1526,7 +1529,7 @@ FilterParser.prototype.parseOptions = function(s) {
          // https://issues.adblockplus.org/ticket/616
          // `generichide` concept already supported, just a matter of
          // adding support for the new keyword.
@@ -49,7 +36,7 @@ index 197eebd6..f462904c 100644
              if ( not === false ) {
                  this.parseTypeOption('generichide', false);
                  continue;
-@@ -1555,8 +1558,11 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1580,8 +1583,11 @@ FilterParser.prototype.parseOptions = function(s) {
              this.dataStr = '';
              continue;
          }
diff --git a/patches/integration/10_5_linters.patch b/patches/integration/10_5_linters.patch
index a957953..d55dbbd 100644
--- a/patches/integration/10_5_linters.patch
+++ b/patches/integration/10_5_linters.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/messaging.js b/src/js/messaging.js
-index d3f50ee3..eb72003f 100644
+index 95fb6d24..99b4720f 100644
 --- a/src/js/messaging.js
 +++ b/src/js/messaging.js
-@@ -1108,6 +1108,13 @@ var onMessage = function(request, sender, callback) {
+@@ -1105,6 +1105,13 @@ var onMessage = function(request, sender, callback) {
          nano.recompile_filters();
          break;
  
diff --git a/patches/integration/10_6_lint_filters.patch b/patches/integration/10_6_lint_filters.patch
index 5bc4f37..acfc701 100644
--- a/patches/integration/10_6_lint_filters.patch
+++ b/patches/integration/10_6_lint_filters.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/cosmetic-filtering.js b/src/js/cosmetic-filtering.js
-index 1b0d608d..60be622c 100644
+index f2754a5e..90d80975 100644
 --- a/src/js/cosmetic-filtering.js
 +++ b/src/js/cosmetic-filtering.js
-@@ -561,7 +561,7 @@ FilterContainer.prototype.compile = function(parsed, writer) {
+@@ -542,7 +542,7 @@ FilterContainer.prototype.compile = function(parsed, writer) {
          this.compileSpecificSelector(hostname, parsed, writer);
      }
      if ( applyGlobally ) {
@@ -11,24 +11,23 @@ index 1b0d608d..60be622c 100644
      }
  
      return true;
-@@ -579,7 +579,11 @@ FilterContainer.prototype.compileGenericSelector = function(parsed, writer) {
+@@ -562,7 +562,8 @@ FilterContainer.prototype.compileGenericSelector = function(parsed, writer) {
  
- /******************************************************************************/
- 
--FilterContainer.prototype.compileGenericHideSelector = function(parsed, writer) {
-+FilterContainer.prototype.compileGenericHideSelector = function(
-+    parsed,
+ FilterContainer.prototype.compileGenericHideSelector = function(
+     parsed,
+-    writer
 +    writer,
 +    nanoIsGlobal
-+) {
-     let selector = parsed.suffix;
- 
-     // For some selectors, it is mandatory to have a hostname or entity:
-@@ -601,6 +605,11 @@ FilterContainer.prototype.compileGenericHideSelector = function(parsed, writer)
-             'error',
-             'Cosmetic filtering – invalid generic filter: ##' + selector
-         );
-+        if ( nanoIsGlobal === true ) {
+ ) {
+     const selector = parsed.suffix;
+     const type = selector.charCodeAt(0);
+@@ -601,6 +602,13 @@ FilterContainer.prototype.compileGenericHideSelector = function(
+         µb.logger.writeOne({
+             error: `Invalid generic cosmetic filter in ${who} : ##${selector}`
+         });
++        if ( compiled === undefined ) {
++            nano.flinte('nano_l_filter_bad_selector');
++        } else if ( nanoIsGlobal === true ) {
 +            nano.flintw('nano_l_filter_converted_to_exception');
 +        } else {
 +            nano.flinte('nano_l_filter_too_expensive');
@@ -36,101 +35,38 @@ index 1b0d608d..60be622c 100644
          return;
      }
  
-@@ -608,7 +617,10 @@ FilterContainer.prototype.compileGenericHideSelector = function(parsed, writer)
- 
-     if ( type === 0x23 /* '#' */ ) {
-         let key = this.keyFromSelector(selector);
--        if ( key === undefined ) { return; }
-+        if ( key === undefined ) {
-+            nano.flinte('nano_l_filter_bad_selector');
-+            return;
-+        }
-         // Simple selector-based CSS rule: no need to test for whether the
-         // selector is valid, the regex took care of this. Most generic
-         // selector falls into that category.
-@@ -619,13 +631,18 @@ FilterContainer.prototype.compileGenericHideSelector = function(parsed, writer)
-         // Complex selector-based CSS rule.
-         if ( µb.staticExtFilteringEngine.compileSelector(selector) !== undefined ) {
-             writer.push([ 1 /* lg+ */, key.slice(1), selector ]);
-+        } else {
-+            nano.flinte('nano_l_filter_bad_selector');
-         }
-         return;
-     }
- 
-     if ( type === 0x2E /* '.' */ ) {
-         let key = this.keyFromSelector(selector);
--        if ( key === undefined ) { return; }
-+        if ( key === undefined ) {
-+            nano.flinte('nano_l_filter_bad_selector');
-+            return;
-+        }
-         // Simple selector-based CSS rule: no need to test for whether the
-         // selector is valid, the regex took care of this. Most generic
-         // selector falls into that category.
-@@ -636,12 +653,17 @@ FilterContainer.prototype.compileGenericHideSelector = function(parsed, writer)
-         // Complex selector-based CSS rule.
-         if ( µb.staticExtFilteringEngine.compileSelector(selector) !== undefined ) {
-             writer.push([ 3 /* lg+ */, key.slice(1), selector ]);
-+        } else {
-+            nano.flinte('nano_l_filter_bad_selector');
-         }
+@@ -660,6 +668,7 @@ FilterContainer.prototype.compileGenericUnhideSelector = function(
+         µb.logger.writeOne({
+             error: `Invalid cosmetic filter in ${who} : #@#${parsed.suffix}`
+         });
++        nano.flinte('nano_l_filter_bad_selector');
          return;
      }
  
-     let compiled = µb.staticExtFilteringEngine.compileSelector(selector);
--    if ( compiled === undefined ) { return; }
-+    if ( compiled === undefined ) {
-+        nano.flinte('nano_l_filter_bad_selector');
-+        return;
-+    }
-     // TODO: Detect and error on procedural cosmetic filters.
- 
-     // https://github.com/gorhill/uBlock/issues/909
-@@ -684,7 +706,10 @@ FilterContainer.prototype.compileGenericUnhideSelector = function(
- ) {
-     // Procedural cosmetic filters are acceptable as generic exception filters.
-     let compiled = µb.staticExtFilteringEngine.compileSelector(parsed.suffix);
--    if ( compiled === undefined ) { return; }
-+    if ( compiled === undefined ) {
+@@ -689,6 +698,7 @@ FilterContainer.prototype.compileSpecificSelector = function(
+         µb.logger.writeOne({
+             error: `Invalid cosmetic filter in ${who} : ##${parsed.suffix}`
+         });
 +        nano.flinte('nano_l_filter_bad_selector');
-+        return;
-+    }
- 
-     // https://github.com/chrisaljoudi/uBlock/issues/497
-     //   All generic exception filters are put in the same bucket: they are
-@@ -707,7 +732,10 @@ FilterContainer.prototype.compileSpecificSelector = function(
+         return;
      }
  
-     let compiled = µb.staticExtFilteringEngine.compileSelector(parsed.suffix);
--    if ( compiled === undefined ) { return; }
-+    if ( compiled === undefined ) {
-+        nano.flinte('nano_l_filter_bad_selector');
-+        return;
-+    }
- 
-     let hash = µb.staticExtFilteringEngine.compileHostnameToHash(hostname);
- 
 diff --git a/src/js/html-filtering.js b/src/js/html-filtering.js
-index cac9e075..f5a94105 100644
+index 0863eec8..cf1083f5 100644
 --- a/src/js/html-filtering.js
 +++ b/src/js/html-filtering.js
-@@ -230,7 +230,10 @@
-     api.compile = function(parsed, writer) {
-         let selector = parsed.suffix.slice(1).trim(),
-             compiled = µb.staticExtFilteringEngine.compileSelector(selector);
--        if ( compiled === undefined ) { return; }
-+        if ( compiled === undefined ) {
+@@ -246,6 +246,7 @@
+             µb.logger.writeOne({
+                 error: `Invalid HTML filter in ${who} : ##${selector}`
+             });
 +            nano.flinte('nano_l_filter_bad_selector');
-+            return;
-+        }
+             return;
+         }
  
-         // 1002 = html filtering
-         writer.select(1002);
-@@ -238,7 +241,10 @@
+@@ -255,7 +256,10 @@
          // TODO: Mind negated hostnames, they are currently discarded.
  
-         for ( let hn of parsed.hostnames ) {
+         for ( const hn of parsed.hostnames ) {
 -            if ( hn.charCodeAt(0) === 0x7E /* '~' */ ) { continue; }
 +            if ( hn.charCodeAt(0) === 0x7E /* '~' */ ) {
 +                nano.flintw('nano_l_filter_negated_html_filtering');
@@ -140,49 +76,63 @@ index cac9e075..f5a94105 100644
              if ( parsed.exception ) {
                  hash |= 0b0001;
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index f6880985..0dfb566b 100644
+index d27c40d6..deb1209b 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -302,6 +302,10 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
+@@ -300,7 +300,13 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
+ 
  RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
-     var matches = this.reFilterParser.exec(line);
-     if ( matches === null || matches.length !== 4 ) {
+     const matches = this.reFilterParser.exec(line);
+-    if ( matches === null || matches.length !== 4 ) { return; }
++    if ( matches === null || matches.length !== 4 ) {
 +        nano.flintw(
 +            'nano_r_does_not_match_re',
 +            ['{{regexp}}', this.reFilterParser.toString()]
 +        );
-         return;
-     }
-     var µburi = µBlock.URI,
-@@ -329,6 +333,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
++        return;
++    }
+ 
+     let des = matches[1] || '';
+     const pattern = (des + matches[2]).replace(/[.+?{}()|[\]\/\\]/g, '\\$&')
+@@ -324,17 +330,26 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+         }
          // One and only one type must be specified.
-         if ( option in this.supportedTypes ) {
-             if ( type !== undefined ) {
+         if ( this.supportedTypes.has(option) ) {
+-            if ( type !== undefined ) { return; }
++            if ( type !== undefined ) {
 +                nano.flintw('nano_r_too_many_types');
-                 return;
-             }
-             type = this.supportedTypes[option];
-@@ -338,11 +343,13 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
++                return;
++            }
+             type = this.supportedTypes.get(option);
+             continue;
+         }
+     }
  
      // Need a resource token.
-     if ( redirect === '' ) {
+-    if ( redirect === '' ) { return; }
++    if ( redirect === '' ) {
 +        nano.flintw('nano_r_no_resource_token');
-         return;
-     }
++        return;
++    }
  
      // Need one single type -- not negated.
-     if ( type === undefined || type.startsWith('~') ) {
+-    if ( type === undefined ) { return; }
++    if ( type === undefined ) {
 +        nano.flintw('nano_r_no_supported_type');
-         return;
-     }
++        return;
++    }
  
-@@ -362,11 +369,18 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
-             continue;
-         }
-         if ( src.startsWith('~') ) {
+     if ( des === '' ) {
+         des = '*';
+@@ -347,10 +362,19 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+     const out = [];
+     for ( const src of srcs ) {
+         if ( src === '' ) { continue; }
+-        if ( src.startsWith('~') ) { continue; }
++        if ( src.startsWith('~') ) {
 +            nano.flintw('nano_r_negated_domain');
-             continue;
-         }
++            continue;
++        }
          out.push(src + '\t' + des + '\t' + type + '\t' + pattern + '\t' + redirect);
      }
  
@@ -196,10 +146,10 @@ index f6880985..0dfb566b 100644
  };
  
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index ea3bb631..a644d619 100644
+index e9282765..86c31dd7 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
-@@ -245,6 +245,8 @@
+@@ -252,6 +252,8 @@
          if ( parsed.hostnames.length === 0 ) {
              if ( parsed.exception ) {
                  writer.push([ 32, 0 | 0b0001, '', parsed.suffix ]);
@@ -208,7 +158,7 @@ index ea3bb631..a644d619 100644
              }
              return;
          }
-@@ -254,8 +256,10 @@
+@@ -261,8 +263,10 @@
              !nano.cf.is_privileged &&
              nanoInjectArgs.startsWith(nano.privileged_assets_previx)
          ) {
@@ -219,7 +169,7 @@ index ea3bb631..a644d619 100644
  
          // https://github.com/gorhill/uBlock/issues/3375
          //   Ignore instances of exception filter with negated hostnames,
-@@ -268,7 +272,10 @@
+@@ -275,7 +279,10 @@
              }
              let hash = µb.staticExtFilteringEngine.compileHostnameToHash(hn);
              if ( parsed.exception ) {
@@ -232,10 +182,10 @@ index ea3bb631..a644d619 100644
              } else if ( negated ) {
                  hash |= 0b0001;
 diff --git a/src/js/static-ext-filtering.js b/src/js/static-ext-filtering.js
-index b2ca3612..433c5ea4 100644
+index 95593d6e..2f387b0b 100644
 --- a/src/js/static-ext-filtering.js
 +++ b/src/js/static-ext-filtering.js
-@@ -693,7 +693,10 @@
+@@ -740,7 +740,10 @@
          let cCode = raw.charCodeAt(rpos - 1);
          if ( cCode !== 0x23 /* '#' */ && cCode !== 0x40 /* '@' */ ) {
              // Adguard's scriptlet injection: not supported.
@@ -247,7 +197,7 @@ index b2ca3612..433c5ea4 100644
              // Not a known extended filter.
              if ( cCode !== 0x24 /* '$' */ && cCode !== 0x3F /* '?' */ ) {
                  return false;
-@@ -701,7 +704,10 @@
+@@ -748,7 +751,10 @@
              // Adguard's style injection: translate to uBO's format.
              if ( cCode === 0x24 /* '$' */ ) {
                  suffix = translateAdguardCSSInjectionFilter(suffix);
@@ -259,7 +209,7 @@ index b2ca3612..433c5ea4 100644
                  parsed.suffix = suffix;
              }
          }
-@@ -728,6 +734,7 @@
+@@ -771,6 +777,7 @@
                  suffix = parsed.suffix = '+js' + suffix.slice(13);
              } else if ( suffix.startsWith('script:contains') ) {
                  suffix = parsed.suffix = '^script:has-text' + suffix.slice(15);
@@ -268,10 +218,10 @@ index b2ca3612..433c5ea4 100644
          }
  
 diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
-index f462904c..c1ed276f 100644
+index 1f887ab4..ee674b8e 100644
 --- a/src/js/static-net-filtering.js
 +++ b/src/js/static-net-filtering.js
-@@ -1438,6 +1438,10 @@ FilterParser.prototype.parseTypeOption = function(raw, not) {
+@@ -1463,6 +1463,10 @@ FilterParser.prototype.parseTypeOption = function(raw, not) {
  
      // Non-discrete network types can't be negated.
      if ( (typeBit & this.allNetRequestTypeBits) === 0 ) {
@@ -282,7 +232,7 @@ index f462904c..c1ed276f 100644
          return;
      }
  
-@@ -1510,6 +1514,7 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1535,6 +1539,7 @@ FilterParser.prototype.parseOptions = function(s) {
                  continue;
              }
              this.unsupported = true;
@@ -290,7 +240,7 @@ index f462904c..c1ed276f 100644
              break;
          }
          // Test before handling all other types.
-@@ -1519,6 +1524,7 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1544,6 +1549,7 @@ FilterParser.prototype.parseOptions = function(s) {
                  continue;
              }
              this.unsupported = true;
@@ -298,7 +248,7 @@ index f462904c..c1ed276f 100644
              break;
          }
          if ( this.toNormalizedType.hasOwnProperty(opt) ) {
-@@ -1532,6 +1538,7 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1557,6 +1563,7 @@ FilterParser.prototype.parseOptions = function(s) {
              this.domainOpt = this.parseDomainOption(opt.slice(7));
              if ( this.domainOpt === '' ) {
                  this.unsupported = true;
@@ -306,7 +256,7 @@ index f462904c..c1ed276f 100644
                  break;
              }
              continue;
-@@ -1549,6 +1556,8 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1574,6 +1581,8 @@ FilterParser.prototype.parseOptions = function(s) {
                  this.parseTypeOption('data', not);
                  this.dataType = 'csp';
                  this.dataStr = opt.slice(4).trim();
@@ -315,7 +265,7 @@ index f462904c..c1ed276f 100644
              }
              continue;
          }
-@@ -1563,6 +1572,8 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1588,6 +1597,8 @@ FilterParser.prototype.parseOptions = function(s) {
              this.fopts = opts.join(',');
              var pos = this.raw.lastIndexOf('$');
              this.raw = this.raw.slice(0, pos + 1) + this.fopts;
@@ -324,7 +274,7 @@ index f462904c..c1ed276f 100644
              continue;
          }
          // https://github.com/uBlockOrigin/uAssets/issues/192
-@@ -1576,6 +1587,7 @@ FilterParser.prototype.parseOptions = function(s) {
+@@ -1601,6 +1612,7 @@ FilterParser.prototype.parseOptions = function(s) {
          }
          // Unrecognized filter option: ignore whole filter.
          this.unsupported = true;
@@ -332,7 +282,7 @@ index f462904c..c1ed276f 100644
          break;
      }
  };
-@@ -1703,6 +1715,7 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1728,6 +1740,7 @@ FilterParser.prototype.parse = function(raw) {
          if ( c === '#' || c === '@' ) {
              console.error('static-net-filtering.js > unexpected cosmetic filters');
              this.elemHiding = true;
@@ -340,7 +290,7 @@ index f462904c..c1ed276f 100644
              return this;
          }
      }
-@@ -1729,6 +1742,7 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1754,6 +1767,7 @@ FilterParser.prototype.parse = function(raw) {
              //   Discard Adguard-specific `$$` filters.
              if ( s.indexOf('$$') !== -1 ) {
                  this.unsupported = true;
@@ -348,7 +298,7 @@ index f462904c..c1ed276f 100644
                  return this;
              }
              this.parseOptions(s.slice(pos + 1));
-@@ -1739,7 +1753,10 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1764,7 +1778,10 @@ FilterParser.prototype.parse = function(raw) {
                  this.types &= ~this.unsupportedTypeBit;
                  if ( this.types === 0 ) {
                      this.unsupported = true;
@@ -359,7 +309,7 @@ index f462904c..c1ed276f 100644
                  }
              }
              s = s.slice(0, pos);
-@@ -1761,6 +1778,7 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1786,6 +1803,7 @@ FilterParser.prototype.parse = function(raw) {
                  normalizeRegexSource.message
              );
              this.unsupported = true;
@@ -367,7 +317,7 @@ index f462904c..c1ed276f 100644
          }
          return this;
      }
-@@ -1785,6 +1803,7 @@ FilterParser.prototype.parse = function(raw) {
+@@ -1810,6 +1828,7 @@ FilterParser.prototype.parse = function(raw) {
          // https://github.com/chrisaljoudi/uBlock/issues/1096
          if ( s.startsWith('^') ) {
              this.unsupported = true;
@@ -375,7 +325,7 @@ index f462904c..c1ed276f 100644
              return this;
          }
  
-@@ -2274,6 +2293,9 @@ FilterContainer.prototype.compileToAtomicFilter = function(
+@@ -2305,6 +2324,9 @@ FilterContainer.prototype.compileToAtomicFilter = function(
      // Typeless
      if ( type === 0 ) {
          writer.push([ descBits, parsed.tokenHash, fdata ]);
@@ -386,7 +336,7 @@ index f462904c..c1ed276f 100644
      }
  
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 2c8f73f8..acaa3e88 100644
+index 10c5e313..f48ad6e0 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
 @@ -393,7 +393,11 @@
@@ -402,9 +352,9 @@ index 2c8f73f8..acaa3e88 100644
      this.assets.put(this.userFiltersPath, content, callback);
      this.removeCompiledFilterList(this.userFiltersPath);
  };
-@@ -788,6 +792,12 @@
-     let writer = new this.CompiledLineIO.Writer();
+@@ -808,6 +812,12 @@
  
+     const nanoKey = nanoAssetKeyOverride || details.assetKey;
      nano.cf.update(nanoKey);
 +    if ( nanoKey === nano.ub.userFiltersPath ) {
 +        nano.fl.reset();
@@ -415,8 +365,8 @@ index 2c8f73f8..acaa3e88 100644
  
      // Useful references:
      //    https://adblockplus.org/en/filter-cheatsheet
-@@ -801,6 +811,10 @@
-         lineIter = new this.LineIterator(this.processDirectives(rawText));
+@@ -821,6 +831,10 @@
+     const lineIter = new this.LineIterator(this.processDirectives(rawText));
  
      while ( lineIter.eot() === false ) {
 +        if ( nano.cf.first_party ) {
@@ -426,10 +376,10 @@ index 2c8f73f8..acaa3e88 100644
          // rhill 2014-04-18: The trim is important here, as without it there
          // could be a lingering `\r` which would cause problems in the
          // following parsing code.
-@@ -809,7 +823,11 @@
+@@ -829,7 +843,11 @@
  
          // Strip comments
-         let c = line.charAt(0);
+         const c = line.charAt(0);
 -        if ( c === '!' || c === '[' ) { continue; }
 +        if ( c === '!' ) { continue; }
 +        if ( c === '[' ) {
@@ -439,15 +389,15 @@ index 2c8f73f8..acaa3e88 100644
  
          // Parse or skip cosmetic filters
          // All cosmetic filters are caught here
-@@ -830,6 +848,7 @@
-         let pos = line.indexOf('#');
+@@ -850,6 +868,7 @@
+         const pos = line.indexOf('#');
          if ( pos !== -1 && reIsWhitespaceChar.test(line.charAt(pos - 1)) ) {
              line = line.slice(0, pos).trim();
 +            nano.flintw('nano_l_filter_inline_comment');
          }
  
          // https://github.com/gorhill/httpswitchboard/issues/15
-@@ -839,15 +858,24 @@
+@@ -859,15 +878,24 @@
              // Ignore hosts file redirect configuration
              // 127.0.0.1 localhost
              // 255.255.255.255 broadcasthost
diff --git a/patches/integration/10_8_filter_viewer.patch b/patches/integration/10_8_filter_viewer.patch
index 7b4e64a..61a700f 100644
--- a/patches/integration/10_8_filter_viewer.patch
+++ b/patches/integration/10_8_filter_viewer.patch
@@ -1,5 +1,5 @@
 diff --git a/src/asset-viewer.html b/src/asset-viewer.html
-index d2809138..4470edb6 100644
+index 5459131a..96daeb50 100644
 --- a/src/asset-viewer.html
 +++ b/src/asset-viewer.html
 @@ -4,10 +4,7 @@
@@ -22,7 +22,7 @@ index d2809138..4470edb6 100644
      height: 100vh;
      width: 100vw;
      }
-@@ -25,15 +22,9 @@ body {
+@@ -30,15 +27,9 @@ body {
  
  <div id="content" class="codeMirrorContainer"></div>
  
@@ -41,7 +41,7 @@ index d2809138..4470edb6 100644
  
  <script src="js/vapi.js"></script>
  <script src="js/vapi-common.js"></script>
-@@ -41,7 +32,7 @@ body {
+@@ -46,7 +37,7 @@ body {
  <script src="js/udom.js"></script>
  <script src="js/i18n.js"></script>
  <script src="js/dashboard-common.js"></script>
diff --git a/patches/integration/20_0_popup_tweaks.patch b/patches/integration/20_0_popup_tweaks.patch
index e582831..4ae0345 100644
--- a/patches/integration/20_0_popup_tweaks.patch
+++ b/patches/integration/20_0_popup_tweaks.patch
@@ -1,5 +1,5 @@
 diff --git a/src/css/popup.css b/src/css/popup.css
-index 853b8cc0..7069e82e 100644
+index b1b95b88..99cae3f8 100644
 --- a/src/css/popup.css
 +++ b/src/css/popup.css
 @@ -16,7 +16,6 @@ h2 {
@@ -10,24 +10,25 @@ index 853b8cc0..7069e82e 100644
      font-size: 100%;
      font-weight: normal;
      padding: 0.2em;
-@@ -100,18 +99,21 @@ p {
- #switch .fa {
-     color: #0046ff;
+@@ -98,19 +97,22 @@ p {
+ #switch .fa-icon {
+     fill: #0046ff;
      cursor: pointer;
 -    font-size: 700%;
 +    font-size: 600%;
      margin: 0;
+     padding: 0;
      }
- #switch .fa:hover {
+ #switch .fa-icon:hover {
 -    opacity: 0.9;
 +    opacity: 0.8;
      }
- body.off #switch .fa {
-     color: #ccc;
+ body.off #switch .fa-icon {
+     fill: #ccc;
      }
 -#basicTools {
 +#basicTools, #basicTools2 {
-     margin: 0.8em 0 0.4em 0;
+     margin: 1.2em 0 0.5em 0;
      }
 +#basicTools {
 +    margin-bottom: 1.2em;
@@ -35,51 +36,42 @@ index 853b8cc0..7069e82e 100644
  .tool:first-child {
      margin-left: 0;
      }
-@@ -119,7 +121,7 @@ body.off #switch .fa {
-     color: #aaa;
-     cursor: pointer;
-     visibility: hidden;
--    margin-left: 0.4em;
-+    margin-left: 0.6em;
-     min-width: 1em;
-     padding: 0 0.2em;
-     unicode-bidi: embed;
-@@ -189,26 +191,18 @@ body[dir="rtl"] #extraTools > span > span.badge {
-     color: #333;
+@@ -178,26 +180,22 @@ body.off #switch .fa-icon {
+     fill: #222;
      }
  
--#refresh {
++#nanoCacheControlStrip {
++    margin: 0px;
++    }
+ #refresh {
 -    background-color: #ffe;
 -    border: 1px solid #ddc;
 -    border-radius: 4px;
--    color: #888;
--    cursor: pointer;
+     cursor: pointer;
 -    display: none;
--    font-size: 3.5em;
++    display: flex;
+     fill: #888;
+-    font-size: 3em;
++    font-size: 2.3em;
+     justify-content: center;
 -    left: 4px;
--    line-height: 1;
--    padding: 4px 8px;
+     line-height: 1;
+-    padding: 0.15em;
 -    position: absolute;
 -    right: 4px;
--    text-align: center;
-+#nanoCacheControlStrip {
-+    font-size: 2em;
-+    margin: 0px;
-+    }
-+#nanoCacheControlStrip .tool {
-+    margin-left: 0px;
      }
  body.dirty #refresh {
--    display: block;
-+    color: red;
+-    display: flex;
++    fill: red;
      }
- body.dirty #refresh:hover {
--    color: black;
-+    color: #444;
+-body.dirty #refresh:hover {
+-    fill: #000
++#refresh:hover {
++    fill: #444 !important;
      }
  
  #tooltip {
-@@ -238,8 +232,6 @@ body[dir="rtl"] #tooltip {
+@@ -227,8 +225,6 @@ body[dir="rtl"] #tooltip {
      direction: rtl;
      }
  #tooltip.show {
@@ -89,33 +81,33 @@ index 853b8cc0..7069e82e 100644
      opacity: 1;
      }
 diff --git a/src/js/popup.js b/src/js/popup.js
-index 16badf43..0ff2bc23 100644
+index 4d19907c..7664459d 100644
 --- a/src/js/popup.js
 +++ b/src/js/popup.js
-@@ -539,7 +539,7 @@ var renderTooltips = function(selector) {
+@@ -535,7 +535,7 @@ const renderTooltips = function(selector) {
  
- var tooltipTargetSelectors = new Map([
+ const tooltipTargetSelectors = new Map([
      [
 -        '#switch',
-+        '#switch .fa',
++        '#switch .fa-icon',
          {
              state: 'body.off',
              i18n: 'popupPowerSwitchInfo',
-@@ -698,7 +698,7 @@ var toggleNetFilteringSwitch = function(ev) {
+@@ -694,7 +694,7 @@ const toggleNetFilteringSwitch = function(ev) {
              tabId: popupData.tabId
          }
      );
 -    renderTooltips('#switch');
-+    renderTooltips('#switch .fa');
++    renderTooltips('#switch .fa-icon');
      hashFromPopupData();
  };
  
-@@ -1125,10 +1125,10 @@ var onHideTooltip = function() {
+@@ -1116,10 +1116,10 @@ const onHideTooltip = function() {
      getPopupData(tabId);
  })();
  
 -uDom('#switch').on('click', toggleNetFilteringSwitch);
-+uDom('#switch .fa').on('click', toggleNetFilteringSwitch);
++uDom('#switch .fa-icon').on('click', toggleNetFilteringSwitch);
  uDom('#gotoZap').on('click', gotoZap);
  uDom('#gotoPick').on('click', gotoPick);
 -uDom('h2').on('click', toggleFirewallPane);
@@ -124,39 +116,39 @@ index 16badf43..0ff2bc23 100644
  uDom('.hnSwitch').on('click', toggleHostnameSwitch);
  uDom('#saveRules').on('click', saveFirewallRules);
 diff --git a/src/popup.html b/src/popup.html
-index 0fd128f0..d0aec45f 100644
+index fef2daa6..7fc037c9 100644
 --- a/src/popup.html
 +++ b/src/popup.html
-@@ -14,23 +14,29 @@
- <span id="appinfo"><span id="appname">&nbsp;</span> <span id="version">&nbsp;</span></span>
+@@ -15,23 +15,29 @@
+ <div id="appinfo"><span id="appname">&nbsp;</span>&nbsp;<span id="version">&nbsp;</span></div>
  <div id="panes">
      <div class="tooltipContainer">
--        <p id="switch" role="button" aria-label data-tip-position="under" tabindex="0"><span class="fa">&#xf011;</span></p>
-+        <p id="switch" role="button" aria-label tabindex="0"><span class="fa" data-tip-position="under">&#xf011;</span></p>
+-        <p id="switch" role="button" aria-label data-tip-position="under" tabindex="0"><span class="fa-icon">power-off</span></p>
++        <p id="switch" role="button" tabindex="0"><span class="fa-icon" aria-label data-tip-position="under">power-off</span></p>
          <p id="basicTools">
--            <span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span>
-             <span id="gotoPick" class="fa tool" data-i18n-tip="popupTipPicker" data-tip-position="under">&#xf1fb;</span>
+-            <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
+             <span id="gotoPick" class="fa-icon tool" data-i18n-tip="popupTipPicker" data-tip-position="under">eye-dropper</span>
 +            <span id="nanoFirewallPaneToggle" class="fa tool enabled" data-i18n-tip="nano_p_open_firewall_pane" data-tip-position="under">&#xf0db;</span>
-             <a href="logger-ui.html#tab_active" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">&#xf022;</a>
--            <a href="dashboard.html" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">&#xf1de;</a>
+             <a href="logger-ui.html#tab_active" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">list-alt</a>
+-            <a href="dashboard.html" class="fa-icon tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">sliders</a>
 +            <a href="dashboard.html" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">&#xf0ad;</a>
 +        </p>
 +        <p id="basicTools2">
-+            <span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span>
++            <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
          </p>
          <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
          <p class="statName">
              <span data-i18n="popupBlockedOnThisPagePrompt">&nbsp;</span>
          </p>
          <p class="statValue" id="page-blocked">?</p>
--        <div id="refresh" class="fa">&#xf021;</div>
+-        <div id="refresh" class="fa-icon">refresh</div>
          <p class="statName">
              <span data-i18n="popupBlockedSinceInstallPrompt">&nbsp;</span>
          </p>
          <p class="statValue" id="total-blocked">?</p>
 +        <h2 data-i18n="nano_p_cache_control">&nbsp;</h2>
 +        <p id="nanoCacheControlStrip">
-+            <span id="refresh" class="fa tool enabled" data-i18n-tip="nano_p_refresh_button">&#xf021;</span>
++            <span id="refresh" class="fa-icon" data-i18n-tip="nano_p_refresh_button">refresh</span>
 +        </p>
          <h2 data-i18n="popupHitDomainCountPrompt">&nbsp;</h2>
          <p class="statValue" id="popupHitDomainCount">&nbsp;</p>
diff --git a/patches/integration/20_1_force_scroll.patch b/patches/integration/20_1_force_scroll.patch
index c371098..2ab9776 100644
--- a/patches/integration/20_1_force_scroll.patch
+++ b/patches/integration/20_1_force_scroll.patch
@@ -1,5 +1,5 @@
 diff --git a/src/js/messaging.js b/src/js/messaging.js
-index eb72003f..bbc2212c 100644
+index 99b4720f..3acd1d88 100644
 --- a/src/js/messaging.js
 +++ b/src/js/messaging.js
 @@ -140,6 +140,10 @@ var onMessage = function(request, sender, callback) {
@@ -14,10 +14,10 @@ index eb72003f..bbc2212c 100644
          µb.openNewTab(request.details);
          break;
 diff --git a/src/js/popup.js b/src/js/popup.js
-index 0ff2bc23..092ecdcf 100644
+index 7664459d..2d58ca47 100644
 --- a/src/js/popup.js
 +++ b/src/js/popup.js
-@@ -436,6 +436,7 @@ var renderPopup = function() {
+@@ -432,6 +432,7 @@ const renderPopup = function() {
                             popupData.netFilteringSwitch === true;
      uDom.nodeFromId('gotoPick').classList.toggle('enabled', canElementPicker);
      uDom.nodeFromId('gotoZap').classList.toggle('enabled', canElementPicker);
@@ -25,11 +25,11 @@ index 0ff2bc23..092ecdcf 100644
  
      let blocked = popupData.pageBlockedRequestCount,
          total = popupData.pageAllowedRequestCount + blocked,
-@@ -733,6 +734,20 @@ var gotoPick = function() {
+@@ -729,6 +730,20 @@ const gotoPick = function() {
  
  /******************************************************************************/
  
-+var nanoForceEnableScroll = function() {
++const nanoForceEnableScroll = function() {
 +    messaging.send(
 +        'popupPanel',
 +        {
@@ -43,11 +43,11 @@ index 0ff2bc23..092ecdcf 100644
 +
 +/******************************************************************************/
 +
- var gotoURL = function(ev) {
+ const gotoURL = function(ev) {
      if ( this.hasAttribute('href') === false ) { return; }
  
-@@ -1128,6 +1143,7 @@ var onHideTooltip = function() {
- uDom('#switch .fa').on('click', toggleNetFilteringSwitch);
+@@ -1119,6 +1134,7 @@ const onHideTooltip = function() {
+ uDom('#switch .fa-icon').on('click', toggleNetFilteringSwitch);
  uDom('#gotoZap').on('click', gotoZap);
  uDom('#gotoPick').on('click', gotoPick);
 +uDom('#nanoForceEnableScroll').on('click', nanoForceEnableScroll);
@@ -55,13 +55,13 @@ index 0ff2bc23..092ecdcf 100644
  uDom('#refresh').on('click', reloadTab);
  uDom('.hnSwitch').on('click', toggleHostnameSwitch);
 diff --git a/src/popup.html b/src/popup.html
-index d0aec45f..9297c527 100644
+index 7fc037c9..bcde27d9 100644
 --- a/src/popup.html
 +++ b/src/popup.html
-@@ -23,6 +23,7 @@
+@@ -24,6 +24,7 @@
          </p>
          <p id="basicTools2">
-             <span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span>
+             <span id="gotoZap" class="fa-icon tool" data-i18n-tip="popupTipZapper" data-tip-position="under">bolt</span>
 +            <span id="nanoForceEnableScroll" class="fa tool" data-i18n-tip="nano_p_force_scroll" data-tip-position="under">&#xf103;</span>
          </p>
          <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
diff --git a/patches/integration/30_1_editor_settings.patch b/patches/integration/30_1_editor_settings.patch
index 7da90ea..4b2165b 100644
--- a/patches/integration/30_1_editor_settings.patch
+++ b/patches/integration/30_1_editor_settings.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index 7aed8e34..17e5b034 100644
+index a8b7710c..f1d0e741 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
-@@ -87,6 +87,8 @@ const µBlock = (function() { // jshint ignore:line
+@@ -86,6 +86,8 @@ const µBlock = (function() { // jshint ignore:line
              hyperlinkAuditingDisabled: true,
              ignoreGenericCosmeticFilters: false,
              largeMediaSize: 50,
diff --git a/patches/integration/90_0_edgyfy.patch b/patches/integration/90_0_edgyfy.patch
index aead348..ef7cf68 100644
--- a/patches/integration/90_0_edgyfy.patch
+++ b/patches/integration/90_0_edgyfy.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/popup.js b/src/js/popup.js
-index 092ecdcf..470ae1e9 100644
+index 2d58ca47..8b5223a4 100644
 --- a/src/js/popup.js
 +++ b/src/js/popup.js
-@@ -1158,4 +1158,10 @@ uDom('a[href]').on('click', gotoURL);
+@@ -1149,4 +1149,10 @@ uDom('a[href]').on('click', gotoURL);
  
  /******************************************************************************/
  
@@ -34,10 +34,10 @@ index c7e24297..04a4c251 100644
  
  /******************************************************************************/
 diff --git a/src/js/ublock.js b/src/js/ublock.js
-index 1df50ed8..22713257 100644
+index 3bdc64e5..dff1aa86 100644
 --- a/src/js/ublock.js
 +++ b/src/js/ublock.js
-@@ -417,7 +417,9 @@ var matchBucket = function(url, hostname, bucket, start) {
+@@ -427,7 +427,9 @@ var matchBucket = function(url, hostname, bucket, start) {
              runAt: 'document_end'
          },
          ( ) => {
diff --git a/patches/integration/90_1_settings_migration.patch b/patches/integration/90_1_settings_migration.patch
index f7d80fd..12746ed 100644
--- a/patches/integration/90_1_settings_migration.patch
+++ b/patches/integration/90_1_settings_migration.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/start.js b/src/js/start.js
-index 28f6cf2e..7307a494 100644
+index ad7ba5e7..1a99a0fb 100644
 --- a/src/js/start.js
 +++ b/src/js/start.js
-@@ -169,42 +169,22 @@ var onVersionReady = function(lastVersion) {
+@@ -177,42 +177,22 @@ var onVersionReady = function(lastVersion) {
      // If unused, just comment out for when we need to compare versions in the
      // future.
      let intFromVersion = function(s) {
diff --git a/src/assets.json b/src/assets.json
index 5e0a1a1..d47a647 100644
--- a/src/assets.json
+++ b/src/assets.json
@@ -194,6 +194,14 @@
     ],
     "supportURL": "https://forums.lanik.us/"
   },
+  "nano-contrib-0": {
+    "content": "filters",
+    "group": "ads",
+    "updateAfter": 5,
+    "off": true,
+    "title": "Nano contrib filter – Placeholder buster",
+    "contentURL": "https://gitcdn.xyz/repo/NanoAdblockerLab/NanoContrib/master/dist/placeholder-buster.txt"
+  },
 
 
   "adguard-spyware": {
diff --git a/src/js/nano-editor.js b/src/js/nano-editor.js
index 465c206..7353d23 100644
--- a/src/js/nano-editor.js
+++ b/src/js/nano-editor.js
@@ -367,7 +367,7 @@ ace.define("ace/mode/nano_filters_hr", function (require, exports, module) {
                             "first-party",
                             "1p"
                         ].join("|") + ")",
-                        "document",
+                        "doc(?:ument)?",
                         "important",
                         "badfilter"
                     ].join("|"))
diff --git a/term/build.js b/term/build.js
index af9da27..dfc67f6 100644
--- a/term/build.js
+++ b/term/build.js
@@ -165,6 +165,7 @@ exports.build_core = async (browser) => {
     assert(typeof src === "string");
 
     await fs.copy(r(src, "src/css"), r(output, "css"));
+    await fs.copy(r(src, "src/img/fontawesome"), r(output, "img/fontawesome"));
     await fs.copy(r(src, "src/js"), r(output, "js"));
     await fs.copy(r(src, "src/lib"), r(output, "lib"));
     await fs.copy(r(src, "src"), r(output), f(r(src, "src"), ".html"));
@@ -178,11 +179,11 @@ exports.build_core = async (browser) => {
         f(r(src, "platform/chromium"), ".js", false),
     );
 
-    await fs.copy(r("./src/fonts"), r(output, "css/fonts"));
-    await fs.copy(r("./src/js"), r(output, "js"));
     await fs.copy(r("./src/ace"), r(output, "lib/ace"));
+    await fs.copy(r("./src/fonts"), r(output, "css/fonts"));
     await fs.copy(r("./src/img"), r(output, "img"));
     await fs.copy(r("./src/icons/icon_16.png"), r(output, "img/icon_16.png"));
+    await fs.copy(r("./src/js"), r(output, "js"));
     await fs.copy(r("./LICENSE"), r(output, "LICENSE"));
 
     // This must be after copying platform files
diff --git a/term/data.js b/term/data.js
index 819168d..0692fbe 100644
--- a/term/data.js
+++ b/term/data.js
@@ -38,7 +38,7 @@ const assert = require("assert");
  * Version number.
  * @const {string}
  */
-exports.version = "1.0.0.83";
+exports.version = "1.0.0.84";
 
 /**
  * The based on string.
@@ -47,8 +47,8 @@ exports.version = "1.0.0.83";
 exports.based_on = [
     "uBlock Origin",
 
-    "Version/1.17.4",
-    "Commit/c3b0fd3",
+    "Version/1.17.5rc0+3",
+    "Commit/0341a5e",
 
     "UserCSS/disabled",
 ].join(" ");