diff --git a/README.md b/README.md
index bdba5a0a4..16ecc63e6 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 ### Firefox Versions
 
 - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `142.0.1`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 142.0.1`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index bd5e2ba6b..d233c0aa3 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-df0d5e625b9e55c502d3e9e81b29a0d52d0f8d20
\ No newline at end of file
+900c4f612d9432ae34a1a596a271fd2ce343dd18
\ No newline at end of file
diff --git a/build/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template
index 0a5d6d8b0..5e2b9538d 100644
--- a/build/flatpak/app.zen_browser.zen.yml.template
+++ b/build/flatpak/app.zen_browser.zen.yml.template
@@ -29,6 +29,7 @@ finish-args:
   - --system-talk-name=org.freedesktop.NetworkManager
   - --talk-name=org.a11y.Bus
   - --talk-name=org.gtk.vfs.*
+  - --talk-name=org.freedesktop.Notifications
   - --own-name=org.mpris.MediaPlayer2.firefox.*
   - --own-name=org.mozilla.zen.*
 cleanup:
diff --git a/package.json b/package.json
index 737a39e6e..b19b48c6a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,8 @@
     "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
     "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
     "lc": "surfer license-check",
-    "lc:fix": "surfer license-check --fix"
+    "lc:fix": "surfer license-check --fix",
+    "use-moz-src": "cd engine && ./mach use-moz-src"
   },
   "repository": {
     "type": "git",
diff --git a/prefs/browser.yaml b/prefs/browser.yaml
index 08c1a567a..de4ddcf6a 100644
--- a/prefs/browser.yaml
+++ b/prefs/browser.yaml
@@ -76,3 +76,6 @@
 
 - name: browser.urlbar.scotchBonnet.enableOverride
   value: false
+
+- name: browser.tabs.groups.hoverPreview.enabled
+  value: false
diff --git a/prefs/disablemozilla.yaml b/prefs/disablemozilla.yaml
index 048b75e18..388be59fa 100644
--- a/prefs/disablemozilla.yaml
+++ b/prefs/disablemozilla.yaml
@@ -37,3 +37,7 @@
 
 - name: browser.newtabpage.activity-stream.showSponsoredCheckboxes
   value: false
+
+- name: sidebar.verticalTabs.dragToPinPromo.dismissed
+  value: true
+  locked: true
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
index 6904cc90d..05d10f361 100644
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -10,21 +10,16 @@ IGNORE_FILES=(
 
 # Recursively find all .patch files in the current directory and its subdirectories
 find src -type f -name "*.patch" | while read -r patch_file; do
-  # Replace all - with . and remove the .patch extension
-  new_file="${patch_file%/*}/$(basename "$patch_file" | sed 's/-/./' | sed 's/\.patch$//').patch"
-  new_file="${new_file%.patch}"
-  new_file="${new_file#src/}"
-
-  if [[ $new_file == *-mjs ]]; then
-    new_file="${new_file/-mjs/.mjs}"
-  fi
-  if [[ $new_file == *-ftl ]]; then
-    new_file="${new_file/-ftl/.ftl}"
+  # Get the file from the inside of the file as indicated by the patch
+  target_file=$(grep -m 1 -oP '(?<=\+\+\+ b/).+' "$patch_file")
+  if [[ -z "$target_file" ]]; then
+    echo "No target file found in patch: $patch_file"
+    continue
   fi
 
-  new_file_base=$(basename "$new_file")
+  new_file_base=$(basename "$target_file")
   if [[ ! " ${IGNORE_FILES[@]} " =~ " ${new_file_base} " ]]; then
-    npm run export ${new_file}
+    npm run export ${target_file}
   fi
 done
 
diff --git a/scripts/update_ts_types.py b/scripts/update_ts_types.py
index f5a175628..afc9a4684 100644
--- a/scripts/update_ts_types.py
+++ b/scripts/update_ts_types.py
@@ -6,6 +6,13 @@ import os
 
 FILES = [
     "index.d.ts",
+    "lib.gecko.tweaks.d.ts",
+    "lib.gecko.xpidl.d.ts",
+]
+
+GENERATED_FILES = [
+    "lib.gecko.win32.d.ts",
+    "lib.gecko.xpcom.d.ts",
     "lib.gecko.darwin.d.ts",
     "lib.gecko.dom.d.ts",
     "lib.gecko.glean.d.ts",
@@ -13,21 +20,21 @@ FILES = [
     "lib.gecko.modules.d.ts",
     "lib.gecko.nsresult.d.ts",
     "lib.gecko.services.d.ts",
-    "lib.gecko.tweaks.d.ts",
-    "lib.gecko.win32.d.ts",
-    "lib.gecko.xpcom.d.ts",
-    "lib.gecko.xpidl.d.ts",
 ]
 
 ENGINE_PATH = os.path.join("engine", "tools", "@types")
+GENERATED_PATH = os.path.join(ENGINE_PATH, "generated")
 SRC_PATH = os.path.join("src", "zen", "@types")
 
 
 def update_ts_types():
   os.system("cd engine && ./mach ts build && ./mach ts update")
   # copy the files from engine/tools/@types to src/@types
-  for file in FILES:
-    src_file = os.path.join(ENGINE_PATH, file)
+  for file in FILES + GENERATED_FILES:
+    if file in GENERATED_FILES:
+      src_file = os.path.join(GENERATED_PATH, file)
+    else:
+      src_file = os.path.join(ENGINE_PATH, file)
     dest_file = os.path.join(SRC_PATH, file)
     if os.path.exists(src_file):
       os.system(f"cp {src_file} {dest_file}")
diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch
index 11e71b9db..e33677b06 100644
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index fe4eff865884fb79983f636861897648c36491b5..a9516246ffacfd50b7e4198967bebb71b2c73eca 100644
+index 2ac65181b1a9561ee4760e0569dfdd621c684142..b159fd8a351ba7c6541e8994a815de8150db619f 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4067,8 +4067,6 @@ dependencies = [
+@@ -4029,8 +4029,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
index 7617d5bae..e4b55038b 100644
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,5 +1,5 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index c41cc4f4e68e5b30e1a290e07b2c5061db4400cc..7fa5402b32116922766ee1463b441d3fc86c1eff 100644
+index 0fdad8b956be8119f5a914b9cee01bb6520cd13d..f1414b5afd5c66c61d1585184de6b32f9918670d 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -218,6 +218,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
diff --git a/src/browser/actors/WebRTCParent-sys-mjs.patch b/src/browser/actors/WebRTCParent-sys-mjs.patch
index 321d1b520..fed9ceb84 100644
--- a/src/browser/actors/WebRTCParent-sys-mjs.patch
+++ b/src/browser/actors/WebRTCParent-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index 49ba7724801e699c60fac72d67b3b2d11b6c8c93..5a9f209b3e6b625c6346083ab7eace552a81a3b4 100644
+index f327e1684d0966a0dcfdcdbf8cc70259b27a4504..c8f722bda4cf297f5d0a6aa22dafbe27c4218123 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
 @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
diff --git a/src/browser/app/macbuild/Contents/Info-plist-in.patch b/src/browser/app/macbuild/Contents/Info-plist-in.patch
index d683c6419..c6684c4ce 100644
--- a/src/browser/app/macbuild/Contents/Info-plist-in.patch
+++ b/src/browser/app/macbuild/Contents/Info-plist-in.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
-index 73b400d58fd25ac13132f1a3fe3ea619e4f4e4f9..ee90ce7ac67bd9aa7bbc2a656843875afb985591 100644
+index ea28831b90662b12bdcb137c35b6bb83626c77e7..d28f4eca976ad9de12b03d995d2363e643224421 100644
 --- a/browser/app/macbuild/Contents/Info.plist.in
 +++ b/browser/app/macbuild/Contents/Info.plist.in
 @@ -191,7 +191,7 @@
diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index b74708a70..318539af9 100644
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index 061edde0e05e0744ba1aa80df5f9699e264fe69b..cc2b2f04758ee9690429ea6c4aad959d858218e8 100644
+index d7542a38a0242dd9c9c6390171d59992d75a0c19..d20e5a9fa42c88c7ba28fac1ef13dd693f1f1135 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
-@@ -1057,7 +1057,7 @@ var gXPInstallObserver = {
+@@ -1064,7 +1064,7 @@ var gXPInstallObserver = {
        persistent: true,
        hideClose: true,
        popupOptions: {
@@ -11,7 +11,7 @@ index 061edde0e05e0744ba1aa80df5f9699e264fe69b..cc2b2f04758ee9690429ea6c4aad959d
        },
      };
  
-@@ -1266,7 +1266,7 @@ var gXPInstallObserver = {
+@@ -1273,7 +1273,7 @@ var gXPInstallObserver = {
        hideClose: true,
        timeout: Date.now() + 30000,
        popupOptions: {
@@ -20,7 +20,7 @@ index 061edde0e05e0744ba1aa80df5f9699e264fe69b..cc2b2f04758ee9690429ea6c4aad959d
        },
      };
  
-@@ -2571,7 +2571,7 @@ var gUnifiedExtensions = {
+@@ -2608,7 +2608,7 @@ var gUnifiedExtensions = {
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
@@ -29,7 +29,7 @@ index 061edde0e05e0744ba1aa80df5f9699e264fe69b..cc2b2f04758ee9690429ea6c4aad959d
            triggerEvent: aEvent,
          });
        }
-@@ -2758,18 +2758,20 @@ var gUnifiedExtensions = {
+@@ -2795,18 +2795,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index 10216d64e..7e98cf714 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index b0b2383453ef771af3eb9260618f1e2e3022eb4e..d631cc8db95b4285e892ac8fcb5e72b7da489850 100644
+index 637e9dda83df5b490d6340367dd63077904ea056..6ffb1dc6ed1d6e58b4e8de1faca887f6b38115cb 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -318,6 +318,10 @@ var BrowserCommands = {
+@@ -317,6 +317,10 @@ var BrowserCommands = {
        }
      }
  
@@ -13,7 +13,7 @@ index b0b2383453ef771af3eb9260618f1e2e3022eb4e..d631cc8db95b4285e892ac8fcb5e72b7
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -402,6 +406,11 @@ var BrowserCommands = {
+@@ -401,6 +405,11 @@ var BrowserCommands = {
        return;
      }
  
@@ -25,7 +25,7 @@ index b0b2383453ef771af3eb9260618f1e2e3022eb4e..d631cc8db95b4285e892ac8fcb5e72b7
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -409,8 +418,8 @@ var BrowserCommands = {
+@@ -408,8 +417,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {
diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index ddf7c2095..b71398c94 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index c61a424d3871d94e7086418c72ce22d5aef0a047..b6e3939b1ce67185acc3b9a66385869bd5490a39 100644
+index d477ac782e0cb921203f8cd38da70a003ac41b39..648d0b4066b630a9b31da0bb8490f29da701dd3d 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -431,10 +431,10 @@ var FullScreen = {
+@@ -427,10 +427,10 @@ var FullScreen = {
      gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
  
      let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index 69de60ba6..9b3a7c42d 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index bcbfab4a3781ff3c7349115751b3830976eec4bf..b1b774e0d335ed3c5ca565a45cd624c7ea2718af 100644
+index e4a94863c0f0810d1894475b020814b2ad32ffb3..515f61d2df5d4a593fc32d3f32e8fdec2b8f5983 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -186,6 +186,7 @@ var gBrowserInit = {
+@@ -191,6 +191,7 @@ var gBrowserInit = {
    },
  
    onLoad() {
@@ -10,7 +10,7 @@ index bcbfab4a3781ff3c7349115751b3830976eec4bf..b1b774e0d335ed3c5ca565a45cd624c7
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
        PopupBlockerObserver.handleEvent(e)
      );
-@@ -344,6 +345,7 @@ var gBrowserInit = {
+@@ -359,6 +360,7 @@ var gBrowserInit = {
  
      this._handleURIToLoad();
  
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 2c8f9416d..afc190969 100644
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,16 +1,16 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 05f6aec3dac31231e15cb316f6e06d66ee87bea9..3bbbe8553777056798ea9ddce1744a8e48848a37 100644
+index c5b7ef2616c1dab9f42970605897e862d57ab7d0..77f0731db6c4a8d835cf8733115d27ae7782a987 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -29,6 +29,7 @@ ChromeUtils.defineESModuleGetters(this, {
-   ContextualIdentityService:
+@@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
      "resource://gre/modules/ContextualIdentityService.sys.mjs",
-   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
-+  ZenCustomizableUI: "chrome://browser/content/ZenCustomizableUI.sys.mjs",
+   CustomizableUI:
+     "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
++  ZenCustomizableUI: "resource:///modules/ZenCustomizableUI.sys.mjs",
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2287,6 +2288,8 @@ var XULBrowserWindow = {
+@@ -2291,6 +2292,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -19,25 +19,7 @@ index 05f6aec3dac31231e15cb316f6e06d66ee87bea9..3bbbe8553777056798ea9ddce1744a8e
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4630,7 +4633,7 @@ function switchToTabHavingURI(
-       ignoreQueryString || replaceQueryString,
-       ignoreFragmentWhenComparing
-     );
--    let browsers = aWindow.gBrowser.browsers;
-+    let browsers = aWindow.gZenWorkspaces.allUsedBrowsers;
-     for (let i = 0; i < browsers.length; i++) {
-       let browser = browsers[i];
-       let browserCompare = cleanURL(
-@@ -4673,7 +4676,7 @@ function switchToTabHavingURI(
-         }
- 
-         if (!doAdopt) {
--          aWindow.gBrowser.tabContainer.selectedIndex = i;
-+          aWindow.gZenWorkspaces.switchIfNeeded(browser);
-         }
- 
-         return true;
-@@ -5489,6 +5492,9 @@ var ConfirmationHint = {
+@@ -5232,6 +5235,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
      document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
diff --git a/src/browser/base/content/browser-places-js.patch b/src/browser/base/content/browser-places-js.patch
index 2f0d03519..e7baf596a 100644
--- a/src/browser/base/content/browser-places-js.patch
+++ b/src/browser/base/content/browser-places-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index 62b3665394a8256ebedf88a8f10bb6766977cf57..12ac643f913290b20fb7adba8f224f49bb82bf5c 100644
+index 5ba2b6a58776e2b1d70b80e8cb1533cb20caafc6..65736705968732a185e81561b2866bfbe6f3233a 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
 @@ -252,6 +252,8 @@ var StarUI = {
diff --git a/src/browser/base/content/browser-sets-inc.patch b/src/browser/base/content/browser-sets-inc.patch
index 54f3f1f5d..837f55c92 100644
--- a/src/browser/base/content/browser-sets-inc.patch
+++ b/src/browser/base/content/browser-sets-inc.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
-index 269b025d7fb942602c1b1b6c9747540bcde11375..9dcecfe205cadacace5195ec84d8b2ee292a0632 100644
+index 2e7654036647796715aec392f9e714e7256c9864..0b3b76ab479bb6ae5439dd424b69f641d3b86c28 100644
 --- a/browser/base/content/browser-sets.inc
 +++ b/browser/base/content/browser-sets.inc
 @@ -405,3 +405,4 @@
diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch
index 78d0fb929..b2968174e 100644
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 61aef2d420a78fb1910f556b71f6db75a16180ed..a3a1e70bedb760c165c338c28de6f2ee924df8de 100644
+index 9cff49a7b86f7697f70c4ef61d3c3561f058dc45..15ac9a8a79e8642b3add2f6df63ed32eb0c8bcb9 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -250,7 +250,7 @@ document.addEventListener(
+@@ -253,7 +253,7 @@ document.addEventListener(
          }
        });
  
diff --git a/src/browser/base/content/browser-siteIdentity-js.patch b/src/browser/base/content/browser-siteIdentity-js.patch
index cc5edc8fc..0da25c7ce 100644
--- a/src/browser/base/content/browser-siteIdentity-js.patch
+++ b/src/browser/base/content/browser-siteIdentity-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index a2a5f6ff71b9a6587e2a033aee39385abd319645..8111c6bcffdcfd51d03cc9dea4aac902d57c83d8 100644
+index 65354e0ad3097e10de72f36e257c94472524baf7..bc9527ec9ddfab11c0839398d3f3953872ad9632 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
-@@ -825,7 +825,7 @@ var gIdentityHandler = {
+@@ -834,7 +834,7 @@ var gIdentityHandler = {
        // This is a secure internal Firefox page.
        this._identityBox.className = "chromeUI";
        let brandBundle = document.getElementById("bundle_brand");
@@ -11,7 +11,7 @@ index a2a5f6ff71b9a6587e2a033aee39385abd319645..8111c6bcffdcfd51d03cc9dea4aac902
      } else if (this._pageExtensionPolicy) {
        // This is a WebExtension page.
        this._identityBox.className = "extensionPage";
-@@ -1143,6 +1143,12 @@ var gIdentityHandler = {
+@@ -1163,6 +1163,12 @@ var gIdentityHandler = {
        }
      }
  
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index 91a5e11a9..7b1a16f57 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0b2e6bc02 100644
+index 7c4c05b72845dfb37c11317d011b8e7c6ba07934..856c368e4d6fe7c7d7ab468423348c844cbf1cdf 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -10,7 +10,7 @@ index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -103,8 +104,10 @@
+@@ -105,8 +106,10 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -21,7 +21,7 @@ index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -126,9 +129,11 @@
+@@ -128,9 +131,11 @@
      </vbox>
    </html:template>
  
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index 9a3003ff5..c185ae782 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 198c188e074b7062169764fb7d81c692d3a2bdae..b412a3c1fabdc6470b4ea9e7be34c426cc76aafd 100644
+index fc219ea3dc901fe2ed351161240700113efb8799..f25bdbf886733e2081a4dff55614809056e9885e 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -201,6 +201,10 @@
+@@ -208,6 +208,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 198c188e074b7062169764fb7d81c692d3a2bdae..b412a3c1fabdc6470b4ea9e7be34c426
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -226,6 +230,7 @@
+@@ -233,6 +237,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
@@ -21,7 +21,7 @@ index 198c188e074b7062169764fb7d81c692d3a2bdae..b412a3c1fabdc6470b4ea9e7be34c426
      </panel>
    </html:template>
  
-@@ -567,6 +572,8 @@
+@@ -613,6 +618,8 @@
  
  #include popup-notifications.inc.xhtml
  
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 2008a4fab..2297b8efd 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 3484906e59f5da958a3f0c810c7b89cfce643d9a..7434caf4710af872d42ef4703ed8347cd8b07af2 100644
+index 8e56b24b39e9c1607e3ff208d284a9b555a91ebb..2402848ae564234ec22d5a317c43864ea1b36f29 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -11,27 +11,27 @@ index 3484906e59f5da958a3f0c810c7b89cfce643d9a..7434caf4710af872d42ef4703ed8347c
    <script src="chrome://browser/content/navigator-toolbox.js" />
  
    <!-- Menu -->
-@@ -17,9 +17,9 @@
+@@ -18,9 +18,8 @@
  #include browser-menubar.inc
      </toolbaritem>
      <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
 -#include titlebar-items.inc.xhtml
    </toolbar>
- 
+-
 +<hbox id="titlebar">
    <toolbar id="TabsToolbar"
             class="browser-toolbar browser-titlebar"
             fullscreentoolbar="true"
-@@ -56,6 +56,8 @@
- # the current structure that we may want to revisit.
-           <arrowscrollbox id="pinned-tabs-container" orient="horizontal"></arrowscrollbox>
+@@ -62,6 +61,8 @@
+           <html:sidebar-pins-promo id="drag-to-pin-promo-card"></html:sidebar-pins-promo>
+           <arrowscrollbox id="pinned-tabs-container" orient="horizontal" clicktoscroll=""></arrowscrollbox>
            <splitter orient="vertical" id="vertical-pinned-tabs-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<html:div id="zen-essentials" skipintoolbarset="true"></html:div>
 +<html:div id="zen-tabs-wrapper">
            <hbox class="tab-drop-indicator" hidden="true"/>
            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
-@@ -75,6 +77,7 @@
+@@ -81,6 +82,7 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
@@ -39,7 +39,7 @@ index 3484906e59f5da958a3f0c810c7b89cfce643d9a..7434caf4710af872d42ef4703ed8347c
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -100,9 +103,10 @@
+@@ -106,9 +108,10 @@
  #include private-browsing-indicator.inc.xhtml
      <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
  
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index c79ece8d2..e775bcd15 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 31d0ee325847834e7c58c1079225adf43d738bcd..4d2c69d4dd7e313bdb085530b3289dc9d93530a5 100644
+index 413bad2a62058a1c434d6a44e927e44eb397289d..b621c586e679bb8686fe9a5e6743512e71604425 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch
index 15d825b58..633a2916f 100644
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index b12427b3c23447ab26499120f8395c716dae9e82..934f5c1f1b38d035cd7d3a5253a8d3cecad385f8 100644
+index bc71ba720ef3603e8b90d295fb16d8415ba114c4..99677f70e22258f61cc9bda31e4d8745d7ca9395 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1054,6 +1054,8 @@ export class nsContextMenu {
+@@ -1095,6 +1095,8 @@ export class nsContextMenu {
          !this.isSecureAboutPage()
      );
  
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index aaf4bced9..7fe689ff0 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -8,7 +8,6 @@
         content/browser/zen-sets.js                                             (../../zen/common/zen-sets.js)
         content/browser/ZenUIManager.mjs                                        (../../zen/common/ZenUIManager.mjs)
         content/browser/zen-components/ZenActorsManager.mjs                     (../../zen/common/ZenActorsManager.mjs)
-        content/browser/ZenCustomizableUI.sys.mjs                               (../../zen/common/ZenCustomizableUI.sys.mjs)
         content/browser/zen-components/ZenUIMigration.mjs                       (../../zen/common/ZenUIMigration.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/ZenCommonUtils.mjs)
         content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/ZenSessionStore.mjs)
diff --git a/src/browser/base/jar-mn.patch b/src/browser/base/jar-mn.patch
index 90ff34745..a935240d2 100644
--- a/src/browser/base/jar-mn.patch
+++ b/src/browser/base/jar-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index f5a94b47c95304399bce8159dd9fb5d2911ea60a..f63cb861e8807294d597a341ddb408f236ee2df2 100644
+index b1f7121a1f3926fe3eb89540edb7dcbb68734039..61c98964cf5efd0a603500cf36559713e1f231f7 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -106,3 +106,5 @@ browser.jar:
+@@ -109,3 +109,5 @@ browser.jar:
  
  # L10n resources and overrides.
  % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
diff --git a/src/browser/base/moz-build.patch b/src/browser/base/moz-build.patch
index 892446d29..06cd8ea3f 100644
--- a/src/browser/base/moz-build.patch
+++ b/src/browser/base/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 803f8a5b62608af58fc43bd9fab298a63fa549a4..2e00cb9d02dade5cd9b8d3dea5d948ac6e829c26 100644
+index 2f2807a246c262298d0802a6a80abe211c99732c..089a86c9e7f69b994657f20fb2392f3dcc8646bf 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -81,3 +81,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
  DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]
diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch
index a0ab7bf03..bfe87274f 100644
--- a/src/browser/components/BrowserContentHandler-sys-mjs.patch
+++ b/src/browser/components/BrowserContentHandler-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 81f72563b93b9ce77191ad4cf200489222e0122e..40bc484301b3d66542c4171921f527c2ac6ed047 100644
+index 8630614d23147365628e0cb7e9625b8f2a160588..0750869f16336452a458f27627e6fe0492aae462 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
 @@ -1276,6 +1276,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index b7b59f874..ba2d411ef 100644
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index f3253d2565cf735bdf33792697f91db9ca9ba5e9..5a6a62e3de3d510a3ae514773e6f8886ef8f9a09 100644
+index eae3ed9518ad9ce2103bb912963465c1b10ac050..51859cd542bc69f524d891a67e725c30d4cf14bb 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,7 +10,7 @@ index f3253d2565cf735bdf33792697f91db9ca9ba5e9..5a6a62e3de3d510a3ae514773e6f8886
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
    ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1490,7 +1491,7 @@ BrowserGlue.prototype = {
+@@ -1448,7 +1449,7 @@ BrowserGlue.prototype = {
        windowcount++;
        let tabbrowser = win.gBrowser;
        if (tabbrowser) {
@@ -19,7 +19,7 @@ index f3253d2565cf735bdf33792697f91db9ca9ba5e9..5a6a62e3de3d510a3ae514773e6f8886
        }
      }
  
-@@ -1653,6 +1654,8 @@ BrowserGlue.prototype = {
+@@ -1611,6 +1612,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
      }
diff --git a/src/browser/components/aboutlogins/content/components/login-list-css.patch b/src/browser/components/aboutlogins/content/components/login-list-css.patch
index 1988e118e..e2a10dbec 100644
--- a/src/browser/components/aboutlogins/content/components/login-list-css.patch
+++ b/src/browser/components/aboutlogins/content/components/login-list-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/aboutlogins/content/components/login-list.css b/browser/components/aboutlogins/content/components/login-list.css
-index bc8e72a3cd07e8746c6fbf190bdd2bf70f4000d4..07031dfdfadf393db5fd848948e33510bd7225d7 100644
+index 3c766eaa80c00ef145168f7a2ceced95ce94295e..db7a7da03c8346f97b472b8e561fec79c1036337 100644
 --- a/browser/components/aboutlogins/content/components/login-list.css
 +++ b/browser/components/aboutlogins/content/components/login-list.css
 @@ -3,7 +3,7 @@
@@ -11,7 +11,7 @@ index bc8e72a3cd07e8746c6fbf190bdd2bf70f4000d4..07031dfdfadf393db5fd848948e33510
    background-color: var(--background-color-box);
    display: flex;
    flex-direction: column;
-@@ -161,3 +161,8 @@ ol {
+@@ -162,3 +162,8 @@ ol {
    font-size: 0.85em;
    color: var(--text-color-deemphasized);
  }
diff --git a/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
index e6231c38c..5c65723d4 100644
--- a/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
+++ b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
-index 768768c7d44860e1725f41594da9bcc8c92f4a1d..c04b0d54a41fbf8a22b516524809186d29842b21 100644
+index 225340c698f775a321bf5f82c0156bb0e3e2aa96..59e6613638efadfd2961999bd77b388c4529314b 100644
 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
 +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
 @@ -28,7 +28,7 @@
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 4b3c469e7..396dbf5a9 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,16 +1,16 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1969f4fed 100644
+index 4f62449d670701c77c681ae36e00bae8bf2f636c..132c77e396cb259181ed13ca8ff784e0ade05e3b 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
-@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
-   AddonManagerPrivate: "resource://gre/modules/AddonManager.sys.mjs",
+@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
-   CustomizableWidgets: "resource:///modules/CustomizableWidgets.sys.mjs",
-+  ZenCustomizableUI: "chrome://browser/content/ZenCustomizableUI.sys.mjs",
+   CustomizableWidgets:
+     "moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs",
++  ZenCustomizableUI: "resource:///modules/ZenCustomizableUI.sys.mjs",
    HomePage: "resource:///modules/HomePage.sys.mjs",
-   PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
-   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-@@ -331,19 +332,14 @@ var CustomizableUIInternal = {
+   PanelMultiView:
+     "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
+@@ -333,19 +334,14 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
        "stop-reload-button",
@@ -31,7 +31,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -351,8 +347,6 @@ var CustomizableUIInternal = {
+@@ -353,8 +349,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -40,7 +40,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
          ],
          defaultCollapsed: false,
        },
-@@ -376,10 +370,7 @@ var CustomizableUIInternal = {
+@@ -378,10 +372,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -51,7 +51,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -461,6 +452,7 @@ var CustomizableUIInternal = {
+@@ -463,6 +454,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -59,7 +59,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1245,6 +1237,9 @@ var CustomizableUIInternal = {
+@@ -1247,6 +1239,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -69,7 +69,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1752,7 +1747,7 @@ var CustomizableUIInternal = {
+@@ -1754,7 +1749,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -78,7 +78,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1762,7 +1757,7 @@ var CustomizableUIInternal = {
+@@ -1764,7 +1759,7 @@ var CustomizableUIInternal = {
          // We also need to remove the panel context menu if it's there:
          this.ensureButtonContextMenu(widgetNode);
          if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -87,7 +87,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1930,16 +1925,16 @@ var CustomizableUIInternal = {
+@@ -1932,16 +1927,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -107,7 +107,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2181,6 +2176,10 @@ var CustomizableUIInternal = {
+@@ -2183,6 +2178,10 @@ var CustomizableUIInternal = {
     *   The identifier string of the area that aNode is being inserted into.
     */
    insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) {
@@ -118,7 +118,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -3301,7 +3300,6 @@ var CustomizableUIInternal = {
+@@ -3303,7 +3302,6 @@ var CustomizableUIInternal = {
      if (!this.isWidgetRemovable(aWidgetId)) {
        return;
      }
@@ -126,7 +126,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      let placements = gPlacements.get(oldPlacement.area);
      let position = placements.indexOf(aWidgetId);
      if (position != -1) {
-@@ -4536,7 +4534,7 @@ var CustomizableUIInternal = {
+@@ -4538,7 +4536,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -135,7 +135,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4547,7 +4545,7 @@ var CustomizableUIInternal = {
+@@ -4549,7 +4547,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -144,7 +144,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5838,6 +5836,7 @@ export var CustomizableUI = {
+@@ -5840,6 +5838,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -152,7 +152,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7885,11 +7884,11 @@ class OverflowableToolbar {
+@@ -7887,11 +7886,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -166,7 +166,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      });
  
      lazy.log.debug(
-@@ -7899,7 +7898,8 @@ class OverflowableToolbar {
+@@ -7901,7 +7900,8 @@ class OverflowableToolbar {
      // If the target has min-width: 0, their children might actually overflow
      // it, so check for both cases explicitly.
      let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -176,7 +176,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7993,7 +7993,7 @@ class OverflowableToolbar {
+@@ -7995,7 +7995,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -185,7 +185,7 @@ index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8338,7 +8338,7 @@ class OverflowableToolbar {
+@@ -8340,7 +8340,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
index ace1b7e90..6ceefc12b 100644
--- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
-index bc601c9cd248637f304b8f3219862e8e6f6c7506..da28068906ddeb81337696da568608edb43223b7 100644
+index fd3c54a1d80f5800ffd2dcaaf594eed4bd2d300c..259af2688e5a8bca88017e5da0bfdb488ab59f59 100644
 --- a/browser/components/customizableui/CustomizeMode.sys.mjs
 +++ b/browser/components/customizableui/CustomizeMode.sys.mjs
-@@ -502,7 +502,7 @@ export class CustomizeMode {
+@@ -503,7 +503,7 @@ export class CustomizeMode {
        this.#transitioning = true;
  
        let customizer = document.getElementById("customization-container");
@@ -11,7 +11,7 @@ index bc601c9cd248637f304b8f3219862e8e6f6c7506..da28068906ddeb81337696da568608ed
        browser.hidden = true;
        customizer.hidden = false;
  
-@@ -639,7 +639,7 @@ export class CustomizeMode {
+@@ -640,7 +640,7 @@ export class CustomizeMode {
      }
  
      let customizer = document.getElementById("customization-container");
@@ -20,7 +20,7 @@ index bc601c9cd248637f304b8f3219862e8e6f6c7506..da28068906ddeb81337696da568608ed
      customizer.hidden = true;
      browser.hidden = false;
  
-@@ -1175,6 +1175,7 @@ export class CustomizeMode {
+@@ -1176,6 +1176,7 @@ export class CustomizeMode {
      return (
        aNode.localName == "toolbarbutton" ||
        aNode.localName == "toolbaritem" ||
@@ -28,7 +28,7 @@ index bc601c9cd248637f304b8f3219862e8e6f6c7506..da28068906ddeb81337696da568608ed
        aNode.localName == "toolbarseparator" ||
        aNode.localName == "toolbarspring" ||
        aNode.localName == "toolbarspacer"
-@@ -3127,6 +3128,20 @@ export class CustomizeMode {
+@@ -3128,6 +3129,20 @@ export class CustomizeMode {
          if (makeSpaceImmediately) {
            aDraggedOverItem.setAttribute("notransition", "true");
          }
diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index 7c8c286f4..7cee05643 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index 0924175cecdceade096a325b2d4cd2656da24524..3c1e4a179d13aac740069c23e9bf8e40376d5032 100644
+index 852cf2eee9113753fa0797be6dec80dcb9207703..93bb093e679320033a37b2af14e8e0e3c7621f94 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -241,8 +241,8 @@ export var ToolbarContextMenu = {
+@@ -242,8 +242,8 @@ export var ToolbarContextMenu = {
      // Show/hide sidebar and vertical tabs menu items
      let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
      let showSidebarActions =
diff --git a/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch b/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
index 27e47d2fb..1fb4adb95 100644
--- a/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
+++ b/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml b/browser/components/customizableui/content/panelUI.inc.xhtml
-index c78f08bdd3fc4d01e10552ef65c2d5813dd053e8..154fb1de2ab9384937d02c14cb7c9c607b330da9 100644
+index 85acb96a3deefed708ea768b2f163e7fd6480b97..bb3aed53758da7dafcfed4492acb0cbf2b80cd2f 100644
 --- a/browser/components/customizableui/content/panelUI.inc.xhtml
 +++ b/browser/components/customizableui/content/panelUI.inc.xhtml
 @@ -132,7 +132,7 @@
diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch
index 2b26a90ed..c20733de9 100644
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index b3c4898fa5aa7ba997d84a2b4fdce398978e1150..736d7aca6232e94a1de0afe2c292060c5c622565 100644
+index 7156397d597579f745ea20ae2b9327433a31c8ec..13b844a63e79e227c96faf153ee5908759306407 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -517,8 +517,7 @@ const PanelUI = {
+@@ -518,8 +518,7 @@ const PanelUI = {
          tempPanel.setAttribute("animate", "false");
        }
        tempPanel.setAttribute("context", "");
@@ -12,7 +12,7 @@ index b3c4898fa5aa7ba997d84a2b4fdce398978e1150..736d7aca6232e94a1de0afe2c292060c
          .appendChild(tempPanel);
  
        let multiView = document.createXULElement("panelmultiview");
-@@ -609,10 +608,12 @@ const PanelUI = {
+@@ -610,10 +609,12 @@ const PanelUI = {
      if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
        this.navbar.setAttribute("nonemptyoverflow", "true");
        this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -25,7 +25,7 @@ index b3c4898fa5aa7ba997d84a2b4fdce398978e1150..736d7aca6232e94a1de0afe2c292060c
      }
    },
  
-@@ -960,7 +961,7 @@ const PanelUI = {
+@@ -961,7 +962,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 253d5553e..3bace1f05 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 1e382981a33ca341c306a78ed81718e4ad7c2b3e..e98f76f1e9dd381116328d6d9b901585ea80dce4 100644
+index 0baa038232d7e0fd9942f392c48acf7ea5ba50ed..093e1c29c3538d18eb2162b4e4b23ba40c695739 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
 @@ -351,6 +351,7 @@ class TabTracker extends TabTrackerBase {
diff --git a/src/browser/components/extensions/parent/ext-tabs-js.patch b/src/browser/components/extensions/parent/ext-tabs-js.patch
index 133de2147..4f5fca683 100644
--- a/src/browser/components/extensions/parent/ext-tabs-js.patch
+++ b/src/browser/components/extensions/parent/ext-tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index a53a12f91817a9e3d1773480928e858bc3182c77..10f6559ffb128906be31de220c93320e9a6d40e7 100644
+index bff93996b42aa1f88f1bfcbd813c3af4a5806f13..1252727b4811248e138cf7a38f8d1fd422576d28 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
-@@ -494,6 +494,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -501,6 +501,7 @@ this.tabs = class extends ExtensionAPIPersistent {
          }
  
          let tab = tabManager.getWrapper(updatedTab);
@@ -10,7 +10,7 @@ index a53a12f91817a9e3d1773480928e858bc3182c77..10f6559ffb128906be31de220c93320e
  
          let changeInfo = {};
          for (let prop of needed) {
-@@ -848,6 +849,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -855,6 +856,7 @@ this.tabs = class extends ExtensionAPIPersistent {
                });
              }
  
diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
index edf5c7643..f6b6cbd07 100644
--- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
+++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543dce50234 100644
+index 86cc499f9b959ef87ab57fc4195e0c65f25e8c7c..a928ea83b9f4d0133238e744d2fb91318d36d4de 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
-@@ -59,6 +59,7 @@ class BookmarkState {
+@@ -60,6 +60,7 @@ class BookmarkState {
      info,
      tags = "",
      keyword = "",
@@ -10,7 +10,7 @@ index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543
      isFolder = false,
      children = [],
      autosave = false,
-@@ -83,12 +84,18 @@ class BookmarkState {
+@@ -84,12 +85,18 @@ class BookmarkState {
        keyword,
        parentGuid: info.parentGuid,
        index,
@@ -29,7 +29,7 @@ index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543
    /**
     * Save edited title for the bookmark
     *
-@@ -182,6 +189,14 @@ class BookmarkState {
+@@ -183,6 +190,14 @@ class BookmarkState {
        "BookmarkState::createBookmark"
      );
      this._guid = results?.[0];
@@ -44,7 +44,7 @@ index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543
      return this._guid;
    }
  
-@@ -215,6 +230,14 @@ class BookmarkState {
+@@ -216,6 +231,14 @@ class BookmarkState {
        "BookmarkState::save::createFolder"
      );
      this._guid = results[0];
@@ -59,7 +59,7 @@ index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543
      return this._guid;
    }
  
-@@ -301,11 +324,97 @@ class BookmarkState {
+@@ -302,11 +325,97 @@ class BookmarkState {
        await lazy.PlacesTransactions.batch(transactions, "BookmarkState::save");
      }
  
@@ -157,7 +157,7 @@ index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543
    /**
     * Append transactions to update tags by given information.
     *
-@@ -903,7 +1012,7 @@ export var PlacesUIUtils = {
+@@ -904,7 +1013,7 @@ export var PlacesUIUtils = {
      aNode,
      aWhere,
      aWindow,
diff --git a/src/browser/components/places/content/browserPlacesViews-js.patch b/src/browser/components/places/content/browserPlacesViews-js.patch
index cbf6ad134..bf9dad21b 100644
--- a/src/browser/components/places/content/browserPlacesViews-js.patch
+++ b/src/browser/components/places/content/browserPlacesViews-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index ad138a38340e8e8510d395f46c30ec4121d731bb..52beaa66395e2b240a7122936cd4d2452b386724 100644
+index 29fb3308dcc98d785a3345dee78050d633927db2..0ae28fa0618def4a146723b19a22280956a25371 100644
 --- a/browser/components/places/content/browserPlacesViews.js
 +++ b/browser/components/places/content/browserPlacesViews.js
 @@ -330,12 +330,23 @@ class PlacesViewBase {
diff --git a/src/browser/components/places/content/editBookmark-js.patch b/src/browser/components/places/content/editBookmark-js.patch
index 3ffb9fb05..100ee182d 100644
--- a/src/browser/components/places/content/editBookmark-js.patch
+++ b/src/browser/components/places/content/editBookmark-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js
-index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08fb697811b 100644
+index f562f19741d882d92365da531b55e2810a0e79ea..9339e1158b074c41fc19bf91cbfde3c4016594b9 100644
 --- a/browser/components/places/content/editBookmark.js
 +++ b/browser/components/places/content/editBookmark.js
-@@ -386,6 +386,10 @@ var gEditItemOverlay = {
+@@ -387,6 +387,10 @@ var gEditItemOverlay = {
          this._keywordField.readOnly = this.readOnly;
        }
  
@@ -13,7 +13,7 @@ index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08f
        // Collapse the tag selector if the item does not accept tags.
        if (showOrCollapse("tagsRow", isBookmark || bulkTagging, "tags")) {
          this._initTagsField();
-@@ -692,6 +696,7 @@ var gEditItemOverlay = {
+@@ -693,6 +697,7 @@ var gEditItemOverlay = {
        if (this._paneInfo.isBookmark) {
          options.tags = this._element("tagsField").value;
          options.keyword = this._keyword;
@@ -21,7 +21,7 @@ index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08f
        }
  
        if (this._paneInfo.bulkTagging) {
-@@ -1193,6 +1198,9 @@ var gEditItemOverlay = {
+@@ -1194,6 +1199,9 @@ var gEditItemOverlay = {
            case "editBMPanel_tagsSelectorExpander":
              this.toggleTagsSelector().catch(console.error);
              break;
@@ -31,7 +31,7 @@ index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08f
          }
          break;
      }
-@@ -1279,6 +1287,148 @@ var gEditItemOverlay = {
+@@ -1280,6 +1288,148 @@ var gEditItemOverlay = {
    get bookmarkState() {
      return this._bookmarkState;
    },
@@ -180,7 +180,7 @@ index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08f
  };
  
  ChromeUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => {
-@@ -1317,6 +1467,9 @@ for (let elt of [
+@@ -1318,6 +1468,9 @@ for (let elt of [
    "locationField",
    "keywordField",
    "tagsField",
diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch
index e2c5bec7f..591370981 100644
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 118709048e7de13f6ac10d0047e446b72303428f..c8cc2d7ee551b96be668a7844dab1db5abc9d684 100644
+index eac1fc65c01107cc7f1a3f3aeb1e8caac3c4a3f5..c3bd265acc924bcf26816e9e78f314c31af41f6d 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -26,3 +26,5 @@ browser.jar:
+@@ -27,3 +27,5 @@ browser.jar:
     content/browser/preferences/widgets/setting-control.mjs              (widgets/setting-control/setting-control.mjs)
     content/browser/preferences/widgets/setting-group.mjs                (widgets/setting-group/setting-group.mjs)
     content/browser/preferences/widgets/setting-group.css                (widgets/setting-group/setting-group.css)
diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch
index b44afbba6..7fe5eeb4e 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index a60831d9309ed73ea6d37725f9b9177dd6677501..c4d357d300b08b5adbe24d38eef5bd20842df665 100644
+index 3f578f3888684a1830d456f2a4896e8a5f6630fd..7de18a724d3953a5616577f65a8cf9a18f71893c 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -443,7 +443,7 @@ function getBundleForLocales(newLocales) {
+@@ -424,7 +424,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index a6655e7cd..9a6458fdd 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index a50fc9cae85527a10c3949163594ce43b68b14c0..82aec0fb0ebd6ffc6dc3143ddb56e9fe102f0caa 100644
+index 21d951a19df06da67a28f717b9f80f8f4ebf77d2..b1f998f2b3ed99b19666e81e61428587541b0da5 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -44,6 +44,8 @@
diff --git a/src/browser/components/preferences/sync-inc-xhtml.patch b/src/browser/components/preferences/sync-inc-xhtml.patch
index 8ca7a8588..d712db631 100644
--- a/src/browser/components/preferences/sync-inc-xhtml.patch
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index 492491a369b53797aded1d3e4cf24d6f11394267..b294aa3005b11276ba8f1c58730b85043a19bf3f 100644
+index e59c536fc2fa06b11be9378a28285ac16fd16958..cf17ee3b6347b950fcf5bf260cd0631c77ffd1d3 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
-@@ -229,6 +229,10 @@
+@@ -223,6 +223,10 @@
                      <image class="sync-engine-image sync-engine-prefs" alt=""/>
                      <label data-l10n-id="sync-currently-syncing-settings"/>
                    </html:div>
diff --git a/src/browser/components/search/SearchUIUtils-sys-mjs.patch b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
index c6927f012..850fac1ff 100644
--- a/src/browser/components/search/SearchUIUtils-sys-mjs.patch
+++ b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/search/SearchUIUtils.sys.mjs b/browser/components/search/SearchUIUtils.sys.mjs
-index dfd18da85323751c4be7963cb5ab2357de488d83..e228bf594a0a736396cabd247bac4033091afccc 100644
+index 6ef224ce377cf3ff511e435f3c7a5dc1de819c60..5b4c395c222c6317fd88499a1aa5307032ea13f8 100644
 --- a/browser/components/search/SearchUIUtils.sys.mjs
 +++ b/browser/components/search/SearchUIUtils.sys.mjs
-@@ -412,7 +412,7 @@ export var SearchUIUtils = {
+@@ -426,7 +426,7 @@ export var SearchUIUtils = {
          triggeringSearchEngine: engine.name,
        },
      });
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index e1686a69f..af429e2ed 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c292756c3 100644
+index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..fcd331a25a34e406e8f74d15db8567f79bdefd9e 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -2135,7 +2135,6 @@ var SessionStoreInternal = {
+@@ -2133,7 +2133,6 @@ var SessionStoreInternal = {
        if (closedWindowState) {
          let newWindowState;
          if (
@@ -10,7 +10,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
            !lazy.SessionStartup.willRestore()
          ) {
            // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2368,11 +2367,9 @@ var SessionStoreInternal = {
+@@ -2366,11 +2365,9 @@ var SessionStoreInternal = {
            tabbrowser.selectedTab.label;
        }
  
@@ -22,7 +22,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
  
        // Store the window's close date to figure out when each individual tab
        // was closed. This timestamp should allow re-arranging data based on how
-@@ -3357,7 +3354,7 @@ var SessionStoreInternal = {
+@@ -3355,7 +3352,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -31,7 +31,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        return;
      }
  
-@@ -4069,6 +4066,11 @@ var SessionStoreInternal = {
+@@ -4067,6 +4064,11 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -43,7 +43,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4505,6 +4507,7 @@ var SessionStoreInternal = {
+@@ -4503,6 +4505,7 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -51,7 +51,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5360,7 +5363,7 @@ var SessionStoreInternal = {
+@@ -5358,7 +5361,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -60,7 +60,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
          removableTabs.push(tab);
        }
      }
-@@ -5420,7 +5423,7 @@ var SessionStoreInternal = {
+@@ -5418,7 +5421,7 @@ var SessionStoreInternal = {
      }
  
      let workspaceID = aWindow.getWorkspaceID();
@@ -69,7 +69,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        winData.workspaceID = workspaceID;
      }
    },
-@@ -5611,11 +5614,12 @@ var SessionStoreInternal = {
+@@ -5609,11 +5612,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -83,7 +83,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5626,6 +5630,7 @@ var SessionStoreInternal = {
+@@ -5624,6 +5628,7 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -91,7 +91,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5638,7 +5643,7 @@ var SessionStoreInternal = {
+@@ -5636,7 +5641,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -100,7 +100,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5750,8 +5755,8 @@ var SessionStoreInternal = {
+@@ -5748,8 +5753,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -111,7 +111,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5794,6 +5799,8 @@ var SessionStoreInternal = {
+@@ -5792,6 +5797,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -120,7 +120,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6351,6 +6358,22 @@ var SessionStoreInternal = {
+@@ -6349,6 +6356,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -139,11 +139,14 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
 +    }
 +    if (tabData.zenDefaultUserContextId) {
 +      tab.setAttribute("zenDefaultUserContextId", true);
++    }
++    if (tabData.zenWorkspace) {
++      tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
 +    }
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7266,7 +7289,7 @@ var SessionStoreInternal = {
+@@ -7264,7 +7290,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
index 159be856b..4f1be7371 100644
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 178c05099b671c4ec8d4c225955e65cff73824e2..6abb0ee2d4be94f997ee8d4bc755a393d9759099 100644
+index f62decaa3f7400787b245b3e765197f4e70dffbb..329240cf434fdbefcf145a733179bd565a814280 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
-@@ -729,7 +729,7 @@ var SidebarController = {
+@@ -779,7 +779,7 @@ var SidebarController = {
    setPosition() {
      // First reset all ordinals to match DOM ordering.
      let contentArea = document.getElementById("tabbrowser-tabbox");
diff --git a/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
index 713fc9dba..cb6c9b42f 100644
--- a/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
+++ b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index 6753641cb579032306453be3f5054d7bc7661e8c..bf21f6c14f825fbe2d322900595cd34456fe1231 100644
+index 22db482e62e754135d8a6cf824914a3e3e06c45c..bdc18d575b33e788f9628b4cb648d5c3e8781666 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
 @@ -252,7 +252,8 @@ var ctrlTab = {
@@ -12,7 +12,7 @@ index 6753641cb579032306453be3f5054d7bc7661e8c..bf21f6c14f825fbe2d322900595cd344
    },
  
    init: function ctrlTab_init() {
-@@ -459,7 +460,7 @@ var ctrlTab = {
+@@ -463,7 +464,7 @@ var ctrlTab = {
      // If the tab is hidden, don't add it to the list unless it's selected
      // (Normally hidden tabs would be unhidden when selected, but that doesn't
      // happen for Firefox View).
@@ -21,7 +21,7 @@ index 6753641cb579032306453be3f5054d7bc7661e8c..bf21f6c14f825fbe2d322900595cd344
        return;
      }
  
-@@ -483,7 +484,7 @@ var ctrlTab = {
+@@ -487,7 +488,7 @@ var ctrlTab = {
    },
  
    open: function ctrlTab_open() {
@@ -30,7 +30,7 @@ index 6753641cb579032306453be3f5054d7bc7661e8c..bf21f6c14f825fbe2d322900595cd344
        return;
      }
  
-@@ -761,7 +762,7 @@ var ctrlTab = {
+@@ -765,7 +766,7 @@ var ctrlTab = {
    _initRecentlyUsedTabs() {
      this._recentlyUsedTabs = Array.prototype.filter.call(
        gBrowser.tabs,
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 048785825..ec789ce49 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3888a6a64 100644
+index fd2465046407261e8c29b4cd3d56122d232e701c..937068562975a26834572c408e9a75453bdf49cb 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -21,19 +21,25 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
          </hbox>
        </stack>
        `;
-@@ -97,9 +100,9 @@
-           "src=image,triggeringprincipal=iconloadingprincipal,requestcontextid,fadein,pinned,selected=visuallyselected,busy,crashed,sharing,pictureinpicture,pending,discarded",
-         ".tab-sharing-icon-overlay": "sharing,selected=visuallyselected,pinned",
-         ".tab-icon-overlay":
+@@ -84,7 +87,7 @@
+         ".tab-content":
+           "pinned,selected=visuallyselected,multiselected,titlechanged,attention",
+         ".tab-icon-stack":
 -          "sharing,pictureinpicture,crashed,busy,soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked",
 +          "zen-essential,sharing,pictureinpicture,crashed,busy,soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked",
+         ".tab-throbber":
+           "fadein,pinned,busy,progress,selected=visuallyselected",
+         ".tab-icon-pending":
+@@ -95,7 +98,7 @@
+         ".tab-icon-overlay":
+           "sharing,pictureinpicture,crashed,busy,soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked",
          ".tab-audio-button":
 -          "crashed,soundplaying,soundplaying-scheduledremoval,pinned,muted,activemedia-blocked",
 +          "zen-essential,crashed,soundplaying,soundplaying-scheduledremoval,pinned,muted,activemedia-blocked",
          ".tab-label-container":
            "pinned,selected=visuallyselected,labeldirection",
          ".tab-label":
-@@ -188,7 +191,7 @@
+@@ -184,7 +187,7 @@
      }
  
      set _visuallySelected(val) {
@@ -42,12 +48,14 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
          return;
        }
  
-@@ -224,9 +227,21 @@
+@@ -220,11 +223,21 @@
      }
  
      get visible() {
 -      return (
--        this.isOpen && !this.hidden && (!this.group?.collapsed || this.selected)
+-        this.isOpen &&
+-        !this.hidden &&
+-        (!this.group || this.group.isTabVisibleInGroup(this))
 -      );
 +      if (!this.isOpen || this.hidden || this.hasAttribute("zen-empty-tab")) {
 +        return false;
@@ -67,7 +75,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
      }
  
      get hidden() {
-@@ -297,7 +312,7 @@
+@@ -295,7 +308,7 @@
          return false;
        }
  
@@ -76,7 +84,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
      }
  
      get lastAccessed() {
-@@ -374,8 +389,11 @@
+@@ -372,8 +385,11 @@
      }
  
      get group() {
@@ -90,7 +98,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
        }
        return null;
      }
-@@ -469,6 +487,8 @@
+@@ -459,6 +475,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -99,7 +107,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -523,6 +543,10 @@
+@@ -513,6 +531,10 @@
        this.style.MozUserFocus = "";
      }
  
@@ -110,7 +118,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
      on_click(event) {
        if (event.button != 0) {
          return;
-@@ -571,6 +595,7 @@
+@@ -561,6 +583,7 @@
              )
            );
          } else {
@@ -118,7 +126,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
-@@ -583,6 +608,14 @@
+@@ -573,6 +596,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -133,7 +141,7 @@ index f261f0f2c7945cbdb41e5d1b6067a8db38bef117..f126879aa9e843c74992aa751795aef3
      }
  
      on_dblclick(event) {
-@@ -606,6 +639,8 @@
+@@ -596,6 +627,8 @@
            animate: true,
            triggeringEvent: event,
          });
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 703cdfd4b..46fdcd3c5 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c328341c6e6eb 100644
+index 3204f253c23551650991d3385dd256d55892a012..78727727a0c623e0213177700124869b2163b89c 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -422,15 +422,64 @@
+@@ -427,15 +427,64 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -69,7 +69,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -578,6 +627,7 @@
+@@ -583,6 +632,7 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -77,7 +77,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -863,9 +913,13 @@
+@@ -868,9 +918,13 @@
        }
  
        this.showTab(aTab);
@@ -92,7 +92,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -878,11 +932,15 @@
+@@ -883,11 +937,15 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -109,7 +109,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1060,6 +1118,8 @@
+@@ -1065,6 +1123,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -118,7 +118,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1070,6 +1130,9 @@
+@@ -1075,6 +1135,9 @@
          );
          return;
        }
@@ -128,7 +128,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1319,6 +1382,7 @@
+@@ -1333,6 +1396,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -136,7 +136,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1471,6 +1535,9 @@
+@@ -1485,6 +1549,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -146,7 +146,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1794,7 +1861,8 @@
+@@ -1808,7 +1875,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -156,7 +156,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          return false;
        }
  
-@@ -1902,7 +1970,7 @@
+@@ -1916,7 +1984,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -165,7 +165,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2166,6 +2234,7 @@
+@@ -2191,6 +2259,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -173,7 +173,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2239,8 +2308,7 @@
+@@ -2264,8 +2333,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -183,7 +183,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          b.setAttribute("transparent", "true");
        }
  
-@@ -2405,7 +2473,7 @@
+@@ -2430,7 +2498,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -192,7 +192,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2464,8 +2532,8 @@
+@@ -2489,8 +2557,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -203,7 +203,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2629,7 +2697,6 @@
+@@ -2654,7 +2722,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -211,7 +211,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2709,6 +2776,8 @@
+@@ -2734,6 +2801,8 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -220,7 +220,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2719,6 +2788,12 @@
+@@ -2744,6 +2813,12 @@
          );
        }
  
@@ -233,7 +233,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2782,6 +2857,19 @@
+@@ -2807,6 +2882,19 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -253,7 +253,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -2790,6 +2878,7 @@
+@@ -2815,6 +2903,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -261,7 +261,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -2808,6 +2897,7 @@
+@@ -2833,6 +2922,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -269,7 +269,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          }));
  
          if (focusUrlBar) {
-@@ -2928,6 +3018,12 @@
+@@ -2953,6 +3043,12 @@
          }
        }
  
@@ -282,7 +282,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3016,10 +3112,10 @@
+@@ -3041,10 +3137,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -294,7 +294,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        }
  
        if (!color) {
-@@ -3040,9 +3136,14 @@
+@@ -3065,9 +3161,14 @@
          label,
          isAdoptingGroup
        );
@@ -311,7 +311,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        );
        group.addTabs(tabs);
  
-@@ -3163,7 +3264,7 @@
+@@ -3188,7 +3289,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -320,7 +320,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        );
      }
  
-@@ -3365,6 +3466,7 @@
+@@ -3390,6 +3491,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -328,7 +328,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3434,6 +3536,7 @@
+@@ -3459,6 +3561,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -336,7 +336,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          });
        }
  
-@@ -3621,7 +3724,7 @@
+@@ -3646,7 +3749,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -345,7 +345,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3658,8 +3761,10 @@
+@@ -3683,8 +3786,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -357,7 +357,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            if (select) {
              tabToSelect = tab;
            }
-@@ -3671,7 +3776,8 @@
+@@ -3696,7 +3801,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -367,7 +367,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3685,7 +3791,10 @@
+@@ -3710,7 +3816,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -379,7 +379,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3730,9 +3839,23 @@
+@@ -3755,9 +3864,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -403,7 +403,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -3923,11 +4046,14 @@
+@@ -3948,11 +4071,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -419,7 +419,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3939,7 +4065,7 @@
+@@ -3964,7 +4090,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -428,7 +428,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
              tabGroup = previousTab.group;
            }
            if (
-@@ -3950,7 +4076,7 @@
+@@ -3975,7 +4101,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -437,7 +437,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -3978,14 +4104,14 @@
+@@ -4003,14 +4129,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -456,7 +456,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -3996,7 +4122,7 @@
+@@ -4021,7 +4147,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -465,7 +465,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
            // Place at the front of, or between tabs in, the same tab group
            this.tabContainer.insertBefore(tab, itemAfter);
-@@ -4032,6 +4158,7 @@
+@@ -4057,6 +4183,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -473,7 +473,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        TabBarVisibility.update();
      }
-@@ -4321,6 +4448,9 @@
+@@ -4346,6 +4473,9 @@
          return;
        }
  
@@ -483,7 +483,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4582,6 +4712,7 @@
+@@ -4607,6 +4737,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -491,7 +491,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4671,6 +4802,7 @@
+@@ -4696,6 +4827,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -499,7 +499,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } catch (e) {
          console.error(e);
        }
-@@ -4709,6 +4841,12 @@
+@@ -4734,6 +4866,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -512,7 +512,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4723,6 +4861,9 @@
+@@ -4748,6 +4886,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -522,7 +522,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4771,7 +4912,9 @@
+@@ -4796,7 +4937,9 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -532,7 +532,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          return;
        }
  
-@@ -4905,7 +5048,7 @@
+@@ -4930,7 +5073,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -541,7 +541,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4929,6 +5072,7 @@
+@@ -4954,6 +5097,7 @@
  
          newTab = true;
        }
@@ -549,7 +549,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4969,13 +5113,7 @@
+@@ -4994,13 +5138,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -564,7 +564,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } else {
          TabBarVisibility.update();
        }
-@@ -5108,6 +5246,7 @@
+@@ -5133,6 +5271,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -572,7 +572,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5320,6 +5459,7 @@
+@@ -5345,6 +5484,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -580,7 +580,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5332,13 +5472,13 @@
+@@ -5357,13 +5497,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -596,7 +596,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5354,7 +5494,7 @@
+@@ -5379,7 +5519,7 @@
        }
  
        if (tab) {
@@ -605,7 +605,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5375,7 +5515,7 @@
+@@ -5400,7 +5540,7 @@
          });
        }
  
@@ -614,7 +614,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
      }
  
      _blurTab(aTab) {
-@@ -5777,10 +5917,10 @@
+@@ -5802,10 +5942,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -627,7 +627,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5839,6 +5979,7 @@
+@@ -5864,6 +6004,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -635,7 +635,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -5972,7 +6113,7 @@
+@@ -5997,7 +6138,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -644,7 +644,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
      }
  
      /**
-@@ -6048,8 +6189,8 @@
+@@ -6073,8 +6214,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -655,7 +655,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6075,10 +6216,16 @@
+@@ -6100,10 +6241,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -674,7 +674,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6136,23 +6283,28 @@
+@@ -6161,23 +6308,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -709,7 +709,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        } else if (!element.pinned && targetElement && targetElement.pinned) {
          // If the caller asks to move an unpinned element next to a pinned
          // tab, move the unpinned element to be the first unpinned element
-@@ -6165,14 +6317,34 @@
+@@ -6190,14 +6342,34 @@
          //    move the tab group right before the first unpinned tab.
          // 4. Moving a tab group and the first unpinned tab is grouped:
          //    move the tab group right before the first unpinned tab's tab group.
@@ -745,7 +745,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6181,7 +6353,7 @@
+@@ -6206,7 +6378,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -754,7 +754,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6227,10 +6399,10 @@
+@@ -6252,10 +6424,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -767,7 +767,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6261,6 +6433,7 @@
+@@ -6285,6 +6457,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -775,7 +775,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6287,7 +6460,7 @@
+@@ -6311,7 +6484,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -784,7 +784,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6324,6 +6497,10 @@
+@@ -6348,6 +6521,10 @@
  
        moveActionCallback();
  
@@ -795,7 +795,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7221,7 +7398,7 @@
+@@ -7249,7 +7426,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -804,7 +804,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -8166,6 +8343,7 @@
+@@ -8199,6 +8376,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -812,7 +812,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9157,7 +9335,7 @@ var TabContextMenu = {
+@@ -9200,7 +9378,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -821,7 +821,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9476,6 +9654,7 @@ var TabContextMenu = {
+@@ -9520,6 +9698,7 @@ var TabContextMenu = {
          )
        );
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabgroup-js.patch b/src/browser/components/tabbrowser/content/tabgroup-js.patch
index 99fb979dd..5c7ca9e35 100644
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99bf10038d7 100644
+index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..503e97a4ec87625b154627aa5839fb4f8d050f86 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -13,10 +13,12 @@
@@ -51,10 +51,10 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
  
        this._initialized = true;
        this.saveOnWindowClose = true;
-@@ -97,11 +107,14 @@
-       this.#labelElement.container = gBrowser.tabContainer;
-       this.#labelElement.group = this;
+@@ -99,11 +109,14 @@
  
+       this.#labelElement.addEventListener("mouseover", this);
+       this.#labelElement.addEventListener("mouseout", this);
 -      this.#labelElement.addEventListener("contextmenu", e => {
 -        e.preventDefault();
 -        gBrowser.tabGroupMenu.openEditModal(this);
@@ -71,7 +71,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
  
        this.#updateLabelAriaAttributes();
        this.#updateCollapsedAriaAttributes();
-@@ -127,6 +140,8 @@
+@@ -129,6 +142,8 @@
        // mounts after getting created by `Tabbrowser.adoptTabGroup`.
        this.#wasCreatedByAdoption = false;
      }
@@ -80,7 +80,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -197,7 +212,10 @@
+@@ -213,7 +228,10 @@
            }
          });
        }
@@ -92,7 +92,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
      }
  
      get color() {
-@@ -285,6 +303,9 @@
+@@ -307,6 +325,9 @@
      }
  
      set collapsed(val) {
@@ -102,7 +102,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
        if (!!val == this.collapsed) {
          return;
        }
-@@ -338,12 +359,61 @@
+@@ -364,7 +385,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -110,6 +110,9 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
          });
      }
  
+@@ -383,7 +403,57 @@
+      * @returns {MozTabbrowserTab[]}
+      */
      get tabs() {
 -      return Array.from(this.children).filter(node => node.matches("tab"));
 +      // add other group tabs if they are under this group
@@ -166,7 +169,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
      }
  
      /**
-@@ -374,7 +444,6 @@
+@@ -442,7 +512,6 @@
      addTabs(tabs, metricsContext) {
        for (let tab of tabs) {
          if (tab.pinned) {
@@ -174,7 +177,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
          }
          let tabToMove =
            this.ownerGlobal === tab.ownerGlobal
-@@ -437,7 +506,7 @@
+@@ -505,7 +574,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -183,7 +186,7 @@ index caea196b22b4689f55780a528661d87b52f4e728..725a2dfb10216df3e63d7980e2f1c99b
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -470,5 +539,6 @@
+@@ -570,5 +639,6 @@
      }
    }
  
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 23cd7f990..9e6585b09 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,18 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa24888de67ccb 100644
+index c7557dad38db9ef02b981c46de9595df77cb67db..4c5972fceb4cf46718e994200bf48d39cb1923c0 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -332,7 +332,7 @@
+@@ -44,6 +44,9 @@
+    * @returns {MozTabbrowserTab|vbox}
+    */
+   const elementToMove = element => {
++    if (element.group?.hasAttribute("split-view-group")) {
++      return element.group;
++    }
+     if (isTab(element)) {
+       return element;
+     }
+@@ -411,7 +414,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -11,7 +21,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -413,7 +413,6 @@
+@@ -492,7 +495,6 @@
              });
            }
          } else if (isTabGroupLabel(event.target)) {
@@ -19,7 +29,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          } else if (
            event.originalTarget.closest("scrollbox") &&
            !Services.prefs.getBoolPref(
-@@ -449,6 +448,9 @@
+@@ -528,6 +530,9 @@
      }
  
      on_keydown(event) {
@@ -29,7 +39,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        let { altKey, shiftKey } = event;
        let [accel, nonAccel] =
          AppConstants.platform == "macosx"
-@@ -686,7 +688,7 @@
+@@ -765,7 +770,7 @@
        if (this.#isContainerVerticalPinnedGrid(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -38,7 +48,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          let tabsPerRow = 0;
          let position = RTL_UI
            ? window.windowUtils.getBoundsWithoutFlushing(
-@@ -851,7 +853,7 @@
+@@ -930,7 +935,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -47,7 +57,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
        tab._dragData = {
          offsetX: this.verticalMode
-@@ -861,7 +863,7 @@
+@@ -940,7 +945,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
@@ -56,15 +66,15 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
              ? this.pinnedTabsContainer.scrollPosition
              : this.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -887,6 +889,7 @@
-           this.#moveTogetherSelectedTabs(tab);
-         } else if (collapseTabGroupDuringDrag) {
-           tab.group.collapsed = true;
+@@ -969,6 +974,7 @@
+ 
+           if (collapseTabGroupDuringDrag) {
+             tab.group.collapsed = true;
 +          gZenFolders.collapseVisibleTab(tab.group);
+           }
          }
        }
- 
-@@ -932,6 +935,10 @@
+@@ -1015,6 +1021,10 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -75,7 +85,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -1095,6 +1102,18 @@
+@@ -1196,6 +1206,18 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -94,7 +104,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -1119,8 +1138,9 @@
+@@ -1220,8 +1242,9 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -106,7 +116,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
          if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -1136,8 +1156,8 @@
+@@ -1237,8 +1260,8 @@
            }
          } else {
            let tabs = this.ariaFocusableItems.slice(
@@ -117,21 +127,21 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            );
            let size = this.verticalMode ? "height" : "width";
            let screenAxis = this.verticalMode ? "screenY" : "screenX";
-@@ -1178,11 +1198,9 @@
-         }
- 
+@@ -1287,11 +1310,13 @@
+           this.dragToPinPromoCard,
+         ];
          let shouldPin =
--          numPinned &&
--          this.pinnedTabsContainer.contains(event.target) &&
--          !draggedTab.pinned;
-+          false;
++          false &&
+           isTab(draggedTab) &&
+           !draggedTab.pinned &&
+           (overPinnedDropIndicator ||
+             dragToPinTargets.some(el => el.contains(event.target)));
          let shouldUnpin =
--          this.arrowScrollbox.contains(event.target) && draggedTab.pinned;
-+          false;
-         let shouldTranslate =
-           !gReduceMotion &&
-           !shouldCreateGroupOnDrop &&
-@@ -1195,6 +1213,7 @@
++          false &&
+           isTab(draggedTab) &&
+           draggedTab.pinned &&
+           this.arrowScrollbox.contains(event.target);
+@@ -1309,6 +1334,7 @@
              (oldTranslateY && oldTranslateY != newTranslateY);
          } else if (this.verticalMode) {
            shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
@@ -139,7 +149,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          } else {
            shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
          }
-@@ -1376,6 +1395,7 @@
+@@ -1503,6 +1529,7 @@
  
            let nextItem = this.ariaFocusableItems[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -147,11 +157,10 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -1408,6 +1428,17 @@
+@@ -1541,6 +1568,16 @@
+       }
+       this.#resetTabsAfterDrop(draggedTab.ownerDocument);
  
-       this.finishMoveTogetherSelectedTabs(draggedTab);
-       this.finishAnimateTabMove();
-+
 +      if (!dt.mozUserCancelled && dt.dropEffect == "none" && !this._isCustomizing) {
 +        const moved = gZenViewSplitter.moveTabToSplitView(event, draggedTab);
 +        if (moved) {
@@ -162,10 +171,10 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
 +        if (gZenViewSplitter._lastOpenedTab) gZenViewSplitter._lastOpenedTab._visuallySelected = false;
 +      }
 +
-       this.#expandGroupOnDrop(draggedTab);
-       this.#resetTabsAfterDrop(draggedTab.ownerDocument);
- 
-@@ -1577,7 +1608,6 @@
+       if (
+         dt.mozUserCancelled ||
+         dt.dropEffect != "none" ||
+@@ -1707,7 +1744,6 @@
  
        this.toggleAttribute("overflow", true);
        this._updateCloseButtons();
@@ -173,7 +182,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
        document
          .getElementById("tab-preview-panel")
-@@ -1635,7 +1665,7 @@
+@@ -1765,7 +1801,7 @@
      }
  
      get newTabButton() {
@@ -182,7 +191,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
      }
  
      get verticalMode() {
-@@ -1651,6 +1681,7 @@
+@@ -1781,6 +1817,7 @@
      }
  
      get overflowing() {
@@ -190,21 +199,27 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        return this.hasAttribute("overflow");
      }
  
-@@ -1659,26 +1690,54 @@
+@@ -1789,31 +1826,51 @@
        if (this.#allTabs) {
          return this.#allTabs;
        }
--      let children = Array.from(this.arrowScrollbox.children);
+-      // Remove temporary periphery element added at drag start.
+-      let pinnedChildren = Array.from(this.pinnedTabsContainer.children);
+-      if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
+-        pinnedChildren.pop();
+-      }
+-      let unpinnedChildren = Array.from(this.arrowScrollbox.children);
+-      // remove arrowScrollbox periphery element.
+-      unpinnedChildren.pop();
+-
 +      let children = gZenWorkspaces.tabboxChildren;
-       // remove arrowScrollbox periphery element
-       children.pop();
- 
++      children.pop(); 
        // explode tab groups
        // Iterate backwards over the array to preserve indices while we modify
        // things in place
--      for (let i = children.length - 1; i >= 0; i--) {
--        if (children[i].tagName == "tab-group") {
--          children.splice(i, 1, ...children[i].tabs);
+-      for (let i = unpinnedChildren.length - 1; i >= 0; i--) {
+-        if (unpinnedChildren[i].tagName == "tab-group") {
+-          unpinnedChildren.splice(i, 1, ...unpinnedChildren[i].tabs);
 +      const pinnedTabs = [...gZenWorkspaces.getCurrentEssentialsContainer().children, ...this.pinnedTabsContainer.children];
 +      const expandTabs = (tabs) => {
 +        for (let i = tabs.length - 1; i >= 0; i--) {
@@ -218,7 +233,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          }
        }
 -
--      this.#allTabs = [...this.pinnedTabsContainer.children, ...children];
+-      this.#allTabs = [...pinnedChildren, ...unpinnedChildren];
 +      expandTabs(pinnedTabs);
 +      expandTabs(children);
 +      const allTabs = [
@@ -246,24 +261,28 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
      }
  
      get allGroups() {
-       let children = Array.from(this.arrowScrollbox.children);
+-      let children = Array.from(this.arrowScrollbox.children);
 -      return children.filter(node => node.tagName == "tab-group");
 +      return gZenWorkspaces.allTabGroups;
      }
  
      /**
-@@ -1745,32 +1804,27 @@
+@@ -1880,29 +1937,23 @@
  
        let elementIndex = 0;
  
--      for (let i = 0; i < this.pinnedTabsContainer.childElementCount; i++) {
--        this.pinnedTabsContainer.children[i].elementIndex = elementIndex++;
--      }
--      let children = Array.from(this.arrowScrollbox.children);
+-      let unpinnedChildren = Array.from(this.arrowScrollbox.children);
+-      let pinnedChildren = Array.from(this.pinnedTabsContainer.children);
 +      let children = gZenWorkspaces.tabboxChildrenWithoutEmpty;
  
        let focusableItems = [];
--      for (let child of children) {
+-      for (let child of pinnedChildren) {
+-        if (isTab(child)) {
+-          child.elementIndex = elementIndex++;
+-          focusableItems.push(child);
+-        }
+-      }
+-      for (let child of unpinnedChildren) {
 +      for (let child of [...gZenWorkspaces.getCurrentEssentialsContainer().children, ...this.pinnedTabsContainer.children, ...children]) {
          if (isTab(child) && child.visible) {
            child.elementIndex = elementIndex++;
@@ -276,25 +295,18 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
 -          visibleTabsInGroup.forEach(tab => {
 -            tab.elementIndex = elementIndex++;
 -          });
+-          focusableItems.push(...visibleTabsInGroup);
 +          if (!child.hasAttribute("split-view-group")) {
 +            let visibleTabsInGroup = child.childGroupsAndTabs.filter(tab => tab.visible);
 +            visibleTabsInGroup.forEach(tab => {
 +              tab.elementIndex = elementIndex++;
 +            });
-           focusableItems.push(...visibleTabsInGroup);
++           focusableItems.push(...visibleTabsInGroup);
 +          }
          }
        }
  
--      this.#focusableItems = [
--        ...this.pinnedTabsContainer.children,
--        ...focusableItems,
--      ];
-+      this.#focusableItems = focusableItems;
- 
-       return this.#focusableItems;
-     }
-@@ -1778,6 +1832,7 @@
+@@ -1914,6 +1965,7 @@
      _invalidateCachedTabs() {
        this.#allTabs = null;
        this._invalidateCachedVisibleTabs();
@@ -302,18 +314,18 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
      }
  
      _invalidateCachedVisibleTabs() {
-@@ -1793,8 +1848,8 @@
+@@ -1929,8 +1981,8 @@
      #isContainerVerticalPinnedGrid(tab) {
        return (
          this.verticalMode &&
--        tab.hasAttribute("pinned") &&
+-        tab.pinned &&
 -        this.hasAttribute("expanded") &&
 +        (tab.hasAttribute("zen-essential")) &&
 +        (this.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
          !this.expandOnHover
        );
      }
-@@ -1810,7 +1865,7 @@
+@@ -1946,7 +1998,7 @@
  
        if (node == null) {
          // We have a container for non-tab elements at the end of the scrollbox.
@@ -322,7 +334,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        }
  
        node.before(tab);
-@@ -1905,7 +1960,7 @@
+@@ -2041,7 +2093,7 @@
            // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
            // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
            // Attach the long click popup to all of them.
@@ -331,20 +343,27 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            const newTab2 = this.newTabButton;
            const newTabVertical = document.getElementById(
              "vertical-tabs-newtab-button"
-@@ -2000,10 +2055,12 @@
- 
+@@ -2139,8 +2191,10 @@
+      */
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
 +      if (!selectedTab) return;
-       if (this.overflowing) {
-         this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
-       }
+       this.#ensureTabIsVisible(selectedTab, aInstant);
  
 +      gZenCompactModeManager.flashSidebarIfNecessary(aInstant);
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -2140,6 +2197,16 @@
+@@ -2149,7 +2203,7 @@
+      * @param {boolean} [shouldScrollInstantly=false]
+      */
+     #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
+-      let arrowScrollbox = tab.closest("arrowscrollbox");
++      let arrowScrollbox = this.arrowScrollbox;
+       if (arrowScrollbox.overflowing) {
+         arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
+       }
+@@ -2288,6 +2342,16 @@
        when the tab is first selected to be dragged.
      */
      #updateTabStylesOnDrag(tab) {
@@ -361,7 +380,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        let isPinned = tab.pinned;
        let numPinned = gBrowser.pinnedTabCount;
        let allTabs = this.ariaFocusableItems;
-@@ -2398,7 +2465,7 @@
+@@ -2540,7 +2604,7 @@
          return;
        }
  
@@ -370,7 +389,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2407,6 +2474,8 @@
+@@ -2549,6 +2613,8 @@
  
        let { width: tabWidth, height: tabHeight } =
          draggedTab.getBoundingClientRect();
@@ -379,7 +398,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        let shiftSizeX = tabWidth * movingTabs.length;
        let shiftSizeY = tabHeight;
        dragData.tabWidth = tabWidth;
-@@ -2443,8 +2512,8 @@
+@@ -2585,8 +2651,8 @@
        let lastBoundX =
          lastTabInRow.screenX +
          lastTabInRow.getBoundingClientRect().width -
@@ -390,18 +409,9 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
        translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
  
-@@ -2560,7 +2629,7 @@
-       }
+@@ -2743,13 +2809,18 @@
  
-       dragData.animDropElementIndex = newIndex;
--      dragData.dropElement = tabs[newIndex];
-+      dragData.dropElement = tabs[Math.min(newIndex, tabs.length - 1)];
-       dragData.dropBefore = newIndex < tabs.length;
- 
-       // Shift background tabs to leave a gap where the dragged tab
-@@ -2593,13 +2662,18 @@
- 
-       this.#clearDragOverCreateGroupTimer();
+       this.#clearDragOverGroupingTimer();
  
 -      let isPinned = draggedTab.pinned;
 -      let numPinned = gBrowser.pinnedTabCount;
@@ -422,23 +432,17 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
        if (this.#rtlMode) {
          tabs.reverse();
-@@ -2610,7 +2684,7 @@
+@@ -2760,7 +2831,7 @@
        let screenAxis = this.verticalMode ? "screenY" : "screenX";
        let size = this.verticalMode ? "height" : "width";
        let translateAxis = this.verticalMode ? "translateY" : "translateX";
 -      let { width: tabWidth, height: tabHeight } = bounds(draggedTab);
 +      let { width: tabWidth, height: tabHeight } = bounds(draggedTab.group?.hasAttribute("split-view-group") ? draggedTab.group : draggedTab);
+       let tabSize = this.verticalMode ? tabHeight : tabWidth;
        let translateX = event.screenX - dragData.screenX;
        let translateY = event.screenY - dragData.screenY;
- 
-@@ -2620,10 +2694,16 @@
-       dragData.translateY = translateY;
- 
-       // Move the dragged tab based on the mouse position.
--      let firstTab = allTabs.at(this.#rtlMode ? -1 : 0);
--      let lastTab = allTabs.at(this.#rtlMode ? 0 : -1);
-+      let firstTab = tabs.at(this.#rtlMode ? -1 : 0);
-+      let lastTab = tabs.at(this.#rtlMode ? 0 : -1);
+@@ -2776,6 +2847,12 @@
+       );
        let lastMovingTab = movingTabs.at(-1);
        let firstMovingTab = movingTabs[0];
 +      if (lastMovingTab.group?.hasAttribute("split-view-group")) {
@@ -450,35 +454,19 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
        let lastMovingTabScreen = endEdge(lastMovingTab);
        let firstMovingTabScreen = firstMovingTab[screenAxis];
-@@ -2632,6 +2712,7 @@
-       // Constrain the range over which the moving tabs can move between the first and last tab
-       let firstBound = firstTab[screenAxis] - firstMovingTabScreen;
-       let lastBound = endEdge(lastTab) - lastMovingTabScreen;
-+      lastBound = gZenPinnedTabManager.getLastTabBound(lastBound, lastTab, isDraggingFolder);
+@@ -2790,6 +2867,11 @@
+       let endBound = this.#rtlMode
+         ? endEdge(this) - lastMovingTabScreen
+         : periphery[screenAxis] - 1 - lastMovingTabScreen;
++      let firstTab = tabs.at(this.#rtlMode ? -1 : 0);
++      let lastTab = tabs.at(this.#rtlMode ? 0 : -1);
++      startBound = firstTab[screenAxis] - firstMovingTabScreen;
++      endBound = endEdge(lastTab) - lastMovingTabScreen;
++      endBound = gZenPinnedTabManager.getLastTabBound(endBound, lastTab, isDraggingFolder);
+       translate = Math.min(Math.max(translate, startBound), endBound);
  
        // Center the tab under the cursor if the tab is not under the cursor while dragging
-       if (
-@@ -2649,6 +2730,9 @@
-           // Shift the `.tab-group-label-container` to shift the label element.
-           item = item.parentElement;
-         }
-+        if (item.parentElement?.hasAttribute("split-view-group")) {
-+          item = item.parentElement;
-+        }
-         item.style.transform = `${translateAxis}(${translate}px)`;
-       }
- 
-@@ -2786,6 +2870,9 @@
-             break;
-           }
-           let element = tabs[mid];
-+          if (element?.group?.hasAttribute("split-view-group")) {
-+            element = element.group.labelElement;
-+          }
-           let elementForSize = isTabGroupLabel(element)
-             ? element.parentElement
-             : element;
-@@ -2805,6 +2892,8 @@
+@@ -2979,6 +3061,8 @@
        };
  
        let dropElement = getOverlappedElement();
@@ -487,19 +475,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
  
        let newDropElementIndex;
        if (dropElement) {
-@@ -2869,7 +2958,10 @@
-       let shouldCreateGroupOnDrop;
-       let dropBefore;
-       if (dropElement) {
--        let dropElementForOverlap = isTabGroupLabel(dropElement)
-+        if (dropElement?.group?.hasAttribute("split-view-group") || dropElement.hasAttribute("split-view-group")) {
-+          dropElement = dropElement.group.labelElement ?? dropElement.labelElement;
-+        }
-+        let dropElementForOverlap = isTabGroupLabel(dropElement) && !dropElement.group?.hasAttribute("split-view-group")
-           ? dropElement.parentElement
-           : dropElement;
- 
-@@ -2889,7 +2981,7 @@
+@@ -3060,7 +3144,7 @@
            ? Services.prefs.getIntPref(
                "browser.tabs.dragDrop.moveOverThresholdPercent"
              ) / 100
@@ -508,30 +484,15 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
          let shouldMoveOver = overlapPercent > moveOverThreshold;
          if (logicalForward && shouldMoveOver) {
-@@ -2921,44 +3013,21 @@
- 
+@@ -3093,6 +3177,7 @@
          // If dragging a group over another group, don't make it look like it is
          // possible to drop the dragged group inside the other group.
--        if (
--          isTabGroupLabel(draggedTab) &&
--          dropElement?.group &&
--          !dropElement.group.collapsed
--        ) {
--          let overlappedGroup = dropElement.group;
--
--          if (isTabGroupLabel(dropElement)) {
--            dropBefore = true;
--            newDropElementIndex = dropElement.elementIndex;
--          } else {
--            dropBefore = false;
--            newDropElementIndex = overlappedGroup.tabs.at(-1).elementIndex + 1;
--          }
--
--          dropElement = overlappedGroup;
--        }
- 
-         // Constrain drop direction at the boundary between pinned and
-         // unpinned tabs so that they don't mix together.
+         if (
++          false &&
+           isTabGroupLabel(draggedTab) &&
+           dropElement?.group &&
+           (!dropElement.group.collapsed ||
+@@ -3119,20 +3204,13 @@
          let isOutOfBounds = isPinned
            ? dropElement.elementIndex >= numPinned
            : dropElement.elementIndex < numPinned;
@@ -550,28 +511,29 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
 -      ) {
 +      if (isTab(draggedTab) || isTabGroupLabel(draggedTab)) {
          let dragOverGroupingThreshold = 1 - moveOverThreshold;
- 
 +        if (draggedTab && !dropElement?.group) {
 +          gZenFolders.highlightGroupOnDragOver(null);
 +        }
-+
+         let groupingDelay = Services.prefs.getIntPref(
+           "browser.tabs.dragDrop.createGroup.delayMS"
+         );
+@@ -3140,6 +3218,7 @@
          // When dragging tab(s) over an ungrouped tab, signal to the user
          // that dropping the tab(s) will create a new tab group.
-         shouldCreateGroupOnDrop =
-@@ -2968,12 +3037,6 @@
+         let shouldCreateGroupOnDrop =
++          false &&
+           !movingTabsSet.has(dropElement) &&
+           isTab(dropElement) &&
+           !dropElement?.group &&
+@@ -3148,6 +3227,7 @@
+         // When dragging tab(s) over a collapsed tab group label, signal to the
+         // user that dropping the tab(s) will add them to the group.
+         let shouldDropIntoCollapsedTabGroup =
++          false &&
+           isTabGroupLabel(dropElement) &&
+           dropElement.group.collapsed &&
            overlapPercent > dragOverGroupingThreshold;
- 
-         if (shouldCreateGroupOnDrop) {
--          this.#dragOverCreateGroupTimer = setTimeout(
--            () => this.#triggerDragOverCreateGroup(dragData, dropElement),
--            Services.prefs.getIntPref(
--              "browser.tabs.dragDrop.createGroup.delayMS"
--            )
--          );
-         } else {
-           this.removeAttribute("movingtab-createGroup");
-           document
-@@ -3000,19 +3063,14 @@
+@@ -3192,19 +3272,14 @@
              dropElement = dropElementGroup;
              colorCode = undefined;
            } else if (isTabGroupLabel(dropElement)) {
@@ -598,8 +560,8 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
 +            ));
            }
            this.#setDragOverGroupColor(colorCode);
-           this.toggleAttribute("movingtab-ungroup", !colorCode);
-@@ -3030,19 +3088,28 @@
+           this.toggleAttribute("movingtab-addToGroup", colorCode);
+@@ -3223,11 +3298,11 @@
        dragData.dropElement = dropElement;
        dragData.dropBefore = dropBefore;
        dragData.animDropElementIndex = newDropElementIndex;
@@ -613,25 +575,8 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            continue;
          }
  
-         let shift = getTabShift(item, newDropElementIndex);
-         let transform = shift ? `${translateAxis}(${shift}px)` : "";
-+        if (item.group?.hasAttribute("split-view-group")) {
-+          item = item.group;
-+        }
-+        if (item.group?.hasAttribute("has-active") && draggedTab.group != item.group) {
-+          item = item.group;
-+        }
-         if (isTabGroupLabel(item)) {
-           // Shift the `.tab-group-label-container` to shift the label element.
-           item = item.parentElement;
-+          if (item.parentElement?.hasAttribute("split-view-group")) {
-+            item = item.parentElement;
-+          }
-         }
-         item.style.transform = transform;
-       }
-@@ -3095,12 +3162,14 @@
-       );
+@@ -3346,12 +3421,14 @@
+       element?.removeAttribute("dragover-groupTarget");
      }
  
 -    finishAnimateTabMove() {
@@ -646,27 +591,8 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
 +      gZenFolders.highlightGroupOnDragOver(null);
  
        for (let item of this.ariaFocusableItems) {
-         if (isTabGroupLabel(item)) {
-@@ -3108,6 +3177,18 @@
-           item = item.parentElement;
-         }
-         item.style.transform = "";
-+        if (item.closest("zen-folder")?.hasAttribute("has-active")) item.closest("zen-folder").style.transform = "";
-+        if (item.closest("zen-folder")?.hasAttribute("has-active")) {
-+          for (let tab of item.closest("zen-folder").tabs) {
-+            tab.style.transform = "";
-+          }
-+        }
-+        if (item.closest("tab-group")?.hasAttribute("split-view-group")) item.closest("tab-group").style.transform = "";
-+        if (item.closest("tab-group")?.hasAttribute("split-view-group")) {
-+          for (let tab of item.closest("tab-group").tabs) {
-+            tab.style.transform = "";
-+          }
-+        }
-         item.removeAttribute("dragover-createGroup");
-       }
-       this.removeAttribute("movingtab-createGroup");
-@@ -3129,16 +3210,15 @@
+         this.#resetGroupTarget(item);
+@@ -3394,7 +3471,7 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";
@@ -675,9 +601,8 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        }
        for (let label of draggedTabDocument.getElementsByClassName(
          "tab-group-label-container"
-       )) {
-         label.style.width = "";
--        label.style.height = "";
+@@ -3403,7 +3480,7 @@
+         label.style.height = "";
          label.style.left = "";
          label.style.top = "";
 -        label.removeAttribute("dragtarget");
@@ -685,7 +610,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
        }
        let periphery = draggedTabDocument.getElementById(
          "tabbrowser-arrowscrollbox-periphery"
-@@ -3211,7 +3291,7 @@
+@@ -3475,7 +3552,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -694,7 +619,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3384,7 +3464,7 @@
+@@ -3639,7 +3716,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -703,7 +628,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
          return;
        }
  
-@@ -3493,7 +3573,10 @@
+@@ -3748,7 +3825,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -715,7 +640,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
            break;
          }
          target = target.parentNode;
-@@ -3510,6 +3593,9 @@
+@@ -3765,6 +3845,9 @@
            return null;
          }
        }
diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index 56c78c498..884bfb156 100644
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index 4f85be7203f44c16944924d50947a89e436f00bc..518956c320af4e7045e8ff9fe63b70f8c2430b22 100644
+index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..28b59c7c3a95febafc3f2a6e0ac3493b9785ff1a 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -410,7 +410,7 @@ export class UrlbarController {
+@@ -411,7 +411,7 @@ export class UrlbarController {
          // When there's no search string and no view selection, we want to focus
          // the next toolbar item instead, for accessibility reasons.
          let allowTabbingThroughResults =
 -          this.input.focusedViaMousedown ||
 +          true ||
            this.input.searchMode?.isPreview ||
-           this.view.selectedElement ||
-           (this.input.value &&
+           this.input.searchMode?.source ==
+             lazy.UrlbarUtils.RESULT_SOURCE.ACTIONS ||
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 21b854544..dcc631387 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,9 +1,9 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cfca59af8e 100644
+index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..5becdf9c01b1f12356963ce214142c492ade5f6e 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
-   false
+@@ -74,6 +74,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
+   lazy.UrlbarUtils.getLogger({ prefix: "Input" })
  );
  
 +XPCOMUtils.defineLazyPreferenceGetter(
@@ -14,9 +14,9 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
 +);
 +
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
- const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -380,7 +387,16 @@ export class UrlbarInput {
+ const UNLIMITED_MAX_RESULTS = 99;
+@@ -355,7 +362,16 @@ export class UrlbarInput {
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -456,6 +472,10 @@ export class UrlbarInput {
+@@ -431,6 +447,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -44,7 +44,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      // We only need to update the searchModeUI on tab switch conditionally
      // as we only persist searchMode with ScotchBonnet enabled.
      if (
-@@ -728,8 +748,16 @@ export class UrlbarInput {
+@@ -703,8 +723,16 @@ export class UrlbarInput {
          return;
        }
      }
@@ -62,7 +62,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
    }
  
    /**
-@@ -1143,7 +1171,11 @@ export class UrlbarInput {
+@@ -1116,7 +1144,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      }
  
      if (isCanonized) {
-@@ -2208,6 +2240,10 @@ export class UrlbarInput {
+@@ -2191,6 +2223,10 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -86,7 +86,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2222,6 +2258,12 @@ export class UrlbarInput {
+@@ -2205,6 +2241,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -99,7 +99,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2241,6 +2283,24 @@ export class UrlbarInput {
+@@ -2224,6 +2266,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -124,7 +124,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2561,6 +2621,7 @@ export class UrlbarInput {
+@@ -2544,6 +2604,7 @@ export class UrlbarInput {
      let updateKey = {};
      this._layoutBreakoutUpdateKey = updateKey;
  
@@ -132,7 +132,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      await this.window.promiseDocumentFlushed(() => {});
      await new Promise(resolve => {
        this.window.requestAnimationFrame(() => {
-@@ -2570,7 +2631,7 @@ export class UrlbarInput {
+@@ -2553,7 +2614,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -141,7 +141,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -2586,6 +2647,7 @@ export class UrlbarInput {
+@@ -2569,6 +2630,7 @@ export class UrlbarInput {
          this.textbox.showPopover();
          this.#updateTextboxPosition();
  
@@ -149,7 +149,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
          resolve();
        });
      });
-@@ -2985,6 +3047,7 @@ export class UrlbarInput {
+@@ -2986,6 +3048,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -157,7 +157,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3086,7 +3149,7 @@ export class UrlbarInput {
+@@ -3087,7 +3150,7 @@ export class UrlbarInput {
     */
    _trimValue(val) {
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -166,7 +166,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3307,6 +3370,7 @@ export class UrlbarInput {
+@@ -3303,6 +3366,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -174,7 +174,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      // No point in setting these because we'll handleRevert() a few rows below.
      if (openUILinkWhere == "current") {
        // Make sure URL is formatted properly (don't show punycode).
-@@ -3459,6 +3523,10 @@ export class UrlbarInput {
+@@ -3455,6 +3519,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -185,7 +185,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3466,6 +3534,9 @@ export class UrlbarInput {
+@@ -3462,6 +3530,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -195,7 +195,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
      return where;
    }
  
-@@ -3723,6 +3794,7 @@ export class UrlbarInput {
+@@ -3719,6 +3790,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -203,7 +203,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
  
        this._suppressStartQuery = false;
      });
-@@ -3730,7 +3802,6 @@ export class UrlbarInput {
+@@ -3726,7 +3798,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -211,7 +211,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4138,6 +4209,7 @@ export class UrlbarInput {
+@@ -4130,6 +4201,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -219,7 +219,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4249,6 +4321,11 @@ export class UrlbarInput {
+@@ -4241,6 +4313,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -230,8 +230,8 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
 +
      if (
        event.target == this.inputField ||
-       event.target == this._inputContainer ||
-@@ -4320,7 +4397,7 @@ export class UrlbarInput {
+       event.target == this._inputContainer
+@@ -4311,7 +4388,7 @@ export class UrlbarInput {
        }
      }
  
@@ -240,7 +240,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4360,9 +4437,16 @@ export class UrlbarInput {
+@@ -4351,9 +4428,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -258,7 +258,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
  
          if (
            event.target != this.inputField &&
-@@ -4374,6 +4458,10 @@ export class UrlbarInput {
+@@ -4364,6 +4448,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -269,7 +269,7 @@ index db1a780f36d16c1b63ad50af76887b16e88ca8fe..440ef03a7a43d6848c371fbe0cac62cf
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4414,7 +4502,7 @@ export class UrlbarInput {
+@@ -4399,7 +4487,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
diff --git a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
index 74e480433..607d78a00 100644
--- a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-index 57463d2c4e39e67eeec7e2c752fe5236a662c7d2..4ca28540a71594e935847679a4b676ae48eb10d8 100644
+index cdc476a3eb2ee2cb6193d215513b65ed375f6153..a2b106916d6cca25096d37b80bea45f016ad82a5 100644
 --- a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 +++ b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-@@ -845,6 +845,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -855,6 +855,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
      }
  
      if (result.providerName == lazy.UrlbarProviderTabToSearch.name) {
diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
index 14b3f2c86..5767343e4 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index b3608bb8b851979b893da9c83e86d08b54288047..97ffb0b855b1f1c3fe5c4081aa1ec03ceda82b05 100644
+index fdbab8806fd320f4aacec46a42c8ef953580d00c..a1be83735cd2b69d335cd36d3287cd3b3e3f2a5b 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -609,7 +609,7 @@ export class UrlbarView {
+@@ -613,7 +613,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {
@@ -11,7 +11,7 @@ index b3608bb8b851979b893da9c83e86d08b54288047..97ffb0b855b1f1c3fe5c4081aa1ec03c
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
-@@ -1333,7 +1333,7 @@ export class UrlbarView {
+@@ -1341,7 +1341,7 @@ export class UrlbarView {
            includeHiddenExposures: true,
          });
        let canBeVisible =
@@ -20,7 +20,7 @@ index b3608bb8b851979b893da9c83e86d08b54288047..97ffb0b855b1f1c3fe5c4081aa1ec03c
        if (result.isHiddenExposure) {
          if (canBeVisible) {
            this.controller.engagementEvent.addExposure(
-@@ -3061,7 +3061,7 @@ export class UrlbarView {
+@@ -3189,7 +3189,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
index a5333d96e..608533a1e 100644
--- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
+++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-index f4eca54a9638072a03b4c0e406fe14388b85db61..7f0c5f724558bdb004114f2a6bea266c94facdf9 100644
+index 1a482b6de24468ccfec069586f374937d8ef68dd..8614beda3fdfc038092f31f11b2604d5cfb843a1 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -260,7 +260,7 @@ export const PREFS_CONFIG = new Map([
+@@ -248,7 +248,7 @@ export const PREFS_CONFIG = new Map([
      "showSponsoredTopSites",
      {
        title: "Show sponsored top sites",
diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch
index 89dfeca63..7cc6a9526 100644
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 861ba1c484a4688857a3025455532ea9551b616a..570ac5122f50275d40e4deeeda0caeb577ee1bfd 100644
+index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -384,17 +384,17 @@ bin/libfreebl_64int_3.so
+@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
diff --git a/src/browser/installer/windows/nsis/defines-nsi-in.patch b/src/browser/installer/windows/nsis/defines-nsi-in.patch
index 1ece2b169..2f7d2923e 100644
--- a/src/browser/installer/windows/nsis/defines-nsi-in.patch
+++ b/src/browser/installer/windows/nsis/defines-nsi-in.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index eb9e403c36510bfda09eb84b8a35dff731279f5d..939d34dff255122947bf3eeabc9087685f101568 100644
+index f78af1e3634dd503089ff8bdab5adba614a87892..4a19de8e89efadf2456011e2da2907a1135fe766 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
 @@ -90,7 +90,7 @@
@@ -11,7 +11,7 @@ index eb9e403c36510bfda09eb84b8a35dff731279f5d..939d34dff255122947bf3eeabc908768
  
  # ARCH is used when it is necessary to differentiate the x64 registry keys from
  # the x86 registry keys (e.g. the uninstall registry key).
-@@ -148,7 +148,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -154,7 +154,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
  !define APPROXIMATE_REQUIRED_SPACE_MB "145"
  
  # Constants for parts of the telemetry submission URL
diff --git a/src/browser/installer/windows/nsis/installer-nsi.patch b/src/browser/installer/windows/nsis/installer-nsi.patch
index 07b96b437..e3a9aa0b8 100644
--- a/src/browser/installer/windows/nsis/installer-nsi.patch
+++ b/src/browser/installer/windows/nsis/installer-nsi.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index 491bcbbd8430410fa930e7b52491ea62f2c48bbc..42d960f4adb4837009e0106a137c14fcbd7a55f9 100755
+index 92eb3f11ea8035ce72eb5b1e110c98b1ef8665d1..e6b91ecfa8f16d2b884c70468ec1d3a0197351d1 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
-@@ -837,7 +837,7 @@ Section "-InstallEndCleanup"
+@@ -841,7 +841,7 @@ Section "-InstallEndCleanup"
    ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
    ; invoked when we're running silently.
    ${If} ${Silent}
@@ -11,7 +11,7 @@ index 491bcbbd8430410fa930e7b52491ea62f2c48bbc..42d960f4adb4837009e0106a137c14fc
    ${EndIf}
  SectionEnd
  
-@@ -1965,5 +1965,5 @@ FunctionEnd
+@@ -1969,5 +1969,5 @@ FunctionEnd
  
  Function .onGUIEnd
    ${OnEndCommon}
diff --git a/src/browser/modules/ExtensionsUI-sys-mjs.patch b/src/browser/modules/ExtensionsUI-sys-mjs.patch
index 7a591ad77..9cb95334a 100644
--- a/src/browser/modules/ExtensionsUI-sys-mjs.patch
+++ b/src/browser/modules/ExtensionsUI-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/ExtensionsUI.sys.mjs b/browser/modules/ExtensionsUI.sys.mjs
-index 3302b1e9a66c8495e1a627b33488b952e8ef72b1..1de6ee8b59595da4acbb91bc625cd380be32845a 100644
+index 17cad7b3fbdd6dff862483892f37f72c00792c88..72d87d70182abfbf664b1dc86f4b4a3ecb2b1d01 100644
 --- a/browser/modules/ExtensionsUI.sys.mjs
 +++ b/browser/modules/ExtensionsUI.sys.mjs
-@@ -466,7 +466,7 @@ export var ExtensionsUI = {
+@@ -478,7 +478,7 @@ export var ExtensionsUI = {
          eventCallback,
          removeOnDismissal: true,
          popupOptions: {
diff --git a/src/browser/modules/URILoadingHelper-sys-mjs.patch b/src/browser/modules/URILoadingHelper-sys-mjs.patch
index de0a5219c..ee763d2b8 100644
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index ce594b69f55f9b9245a56fe8c962cf8a83cfe9a1..f3b99524f49f5a624c2fc213257a911862cd70c2 100644
+index f7a3e8272f1f22286a26bf50d78b23aa82b49df8..a690732012331dfc40cc08fef4453c28c6587a24 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
-@@ -516,7 +516,7 @@ export const URILoadingHelper = {
+@@ -541,7 +541,7 @@ export const URILoadingHelper = {
        // page. If a load request bounces off for the currently selected tab,
        // we'll open a new tab instead.
        let tab = w.gBrowser.getTabForBrowser(targetBrowser);
@@ -11,3 +11,21 @@ index ce594b69f55f9b9245a56fe8c962cf8a83cfe9a1..f3b99524f49f5a624c2fc213257a9118
          where = "tab";
          targetBrowser = null;
        } else if (
+@@ -971,7 +971,7 @@ export const URILoadingHelper = {
+         ignoreQueryString || replaceQueryString,
+         ignoreFragmentWhenComparing
+       );
+-      let browsers = aWindow.gBrowser.browsers;
++      let browsers = aWindow.gZenWorkspaces.allUsedBrowsers;
+       for (let i = 0; i < browsers.length; i++) {
+         let browser = browsers[i];
+         let browserCompare = cleanURL(
+@@ -1017,7 +1017,7 @@ export const URILoadingHelper = {
+           }
+ 
+           if (!doAdopt) {
+-            aWindow.gBrowser.tabContainer.selectedIndex = i;
++            aWindow.gZenWorkspaces.switchIfNeeded(browser);
+           }
+ 
+           return true;
diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch
index 258dc3936..4478db4a7 100644
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index dadb198cbf968dc622d2d0ee6c754f3541c052a2..ef8ed137443a089e5ac084bb8f86533ddd2086a1 100644
+index 9723a8199cc5b8d25bb92c46992792b8c94a3565..3496c3ae4bacf39b788f1b0f740e89cdd9d7de5b 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
 @@ -43,7 +43,8 @@
diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch
index 4533adb87..c48477643 100644
--- a/src/browser/themes/osx/browser-css.patch
+++ b/src/browser/themes/osx/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index 9bea393a6a54db16d3f35bb70d217563bd2e3951..6487baeaacd9ff175be51747ea637e81b68a51ee 100644
+index c209151370225d8efade7c51aea30ce7365e5f4f..4dd5cf4a98ea010b2d347ac0ba7314ae81320e75 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
 @@ -38,7 +38,7 @@
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
index 8b235373c..b76cd554b 100644
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 7fcb1d906c3aaec3e6b099ae731267c2b9d0b96a..ea8e0f510b09faaed0955e9974a2d9f285a52649 100644
+index c612e7d021122e3e4823994071cd613563d3e12e..682d7a47624460ce33e8fcb5ff9c995f3413bab2 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -78,7 +78,7 @@ body {
+@@ -99,7 +99,7 @@ body {
    --toolbarbutton-border-radius: 4px;
    --identity-box-margin-inline: 4px;
    --urlbar-min-height: max(32px, 1.4em);
@@ -11,7 +11,7 @@ index 7fcb1d906c3aaec3e6b099ae731267c2b9d0b96a..ea8e0f510b09faaed0955e9974a2d9f2
  
    /* This should be used for icons and chiclets inside the input field. It makes
       the gap around them more uniform when they are close to the field edges */
-@@ -148,8 +148,6 @@ body {
+@@ -167,8 +167,6 @@ body {
     */
    &.fullscreen-with-menubar {
      z-index: var(--browser-area-z-index-toolbox-while-animating);
diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch
index ff1a3e939..32a0bd35f 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index 13b1659ed5a3b9bb0342b601998d0fd5c9760e22..4f13c401f23f51962986fe8caf197aa5306fc276 100644
+index 8edca63dc52ec207475ed9965559d28c06e27971..884343473857c6b6256922d47085fac6eabe74fb 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
-@@ -81,7 +81,7 @@
+@@ -83,7 +83,7 @@
  
  #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
  #urlbar-label-box {
@@ -11,7 +11,7 @@ index 13b1659ed5a3b9bb0342b601998d0fd5c9760e22..4f13c401f23f51962986fe8caf197aa5
    color: var(--urlbar-box-text-color);
    padding-inline: 8px;
    border-radius: var(--urlbar-icon-border-radius);
-@@ -175,16 +175,17 @@
+@@ -178,16 +178,17 @@
    }
  
    #identity-icon {
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index 9814e8e95..09c2b92d2 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index c2bebf7e96a1d7a36c5e3168cf65504361da821b..5f55741b2a467341f93f648c5f084f863a6de32c 100644
+index bc47c162cd4792c7df17565014aac1c2258c6d40..21c0b7ddb04cbb828c758dad34885f91c1ddde6c 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -290,3 +290,5 @@
-   skin/classic/browser/weather/night-partly-cloudy-with-showers.svg (../shared/weather/night-partly-cloudy-with-showers.svg)
-   skin/classic/browser/weather/night-partly-cloudy-with-thunderstorms.svg (../shared/weather/night-partly-cloudy-with-thunderstorms.svg)
+@@ -316,3 +316,5 @@
    skin/classic/browser/weather/night-mostly-cloudy-with-flurries.svg (../shared/weather/night-mostly-cloudy-with-flurries.svg)
+ 
+   skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
 +
 +#include zen-sources.inc.mn
 \ No newline at end of file
diff --git a/src/browser/themes/shared/tabbrowser/content-area-css.patch b/src/browser/themes/shared/tabbrowser/content-area-css.patch
index 03c15e882..9511724fd 100644
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index 5c721ee07f0be1318a50cb381ddf59550a04d496..fa2d21687dd8ea7dd03fb4cc2952fe783782a955 100644
+index 44f6c942f2e4b08f784b2ff96f785e9beed01ecd..834e174186972c3297a552bbd579f0ea1261c19e 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -237,7 +237,7 @@
+@@ -276,7 +276,7 @@
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
diff --git a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
index 46476f612..57b20ea25 100644
--- a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
+++ b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/themes/shared/tabbrowser/ctrlTab.css b/browser/themes/shared/tabbrowser/ctrlTab.css
-index 50045ec27abcde91d5aea12fc7faaefbddf50229..f4e98dce5195ff3298fb98714d56cf5d3bdaaf48 100644
+index aaeae8fd0e999aecda02bf287b39c4d96ad73f3c..d8196d9b1b5491d73b18a7c7d7fef55bc11fe31b 100644
 --- a/browser/themes/shared/tabbrowser/ctrlTab.css
 +++ b/browser/themes/shared/tabbrowser/ctrlTab.css
-@@ -12,6 +12,7 @@
-   --panel-color: white;
+@@ -11,6 +11,7 @@
    --panel-border-color: transparent;
    --panel-padding: 20px 10px 10px;
+   -moz-window-shadow: none;
 +  --panel-shadow-margin: 0;
- }
- 
- @media (-moz-platform: macos) {
+   @media not (-moz-platform: macos) {
+     font-weight: bold;
+   }
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 64bb6302b..85140752a 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a1e768135 100644
+index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..665b8c431be11dc0ef5f1f30f4c2ef884c231e46 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -19,7 +19,7 @@
+@@ -21,7 +21,7 @@
    --tab-group-line-thickness: 2px;
    --tab-group-line-toolbar-border-distance: 1px;
    /* Collapsed tabs should be square, so set width to match the min height */
@@ -11,7 +11,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    --tab-collapsed-width: calc(var(--tab-collapsed-background-width) + 2 * var(--tab-inner-inline-margin));
    --tab-inner-inline-margin: var(--space-medium);
    --tab-inline-padding: 8px;
-@@ -33,9 +33,9 @@
+@@ -35,9 +35,9 @@
    --tab-block-margin: 4px;
    --tab-icon-end-margin: 5.5px;
    --tab-label-line-height: 1.7;
@@ -23,7 +23,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    --tab-selected-bgcolor: var(--toolbar-bgcolor);
    --tab-selected-color-scheme: var(--toolbar-color-scheme);
    &[lwt-tab-selected="light"] {
-@@ -255,7 +255,6 @@
+@@ -259,7 +259,6 @@
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -31,7 +31,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    }
  
    &:is([selected], [multiselected]) {
-@@ -269,6 +268,7 @@
+@@ -273,6 +272,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -39,7 +39,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
  
      &::before {
        position: absolute;
-@@ -468,14 +468,11 @@
+@@ -472,14 +472,11 @@
  .tab-icon-image {
    -moz-context-properties: fill, stroke;
    fill: currentColor;
@@ -55,7 +55,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -492,10 +489,6 @@
+@@ -496,10 +493,6 @@
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
@@ -66,7 +66,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -568,7 +561,7 @@
+@@ -572,7 +565,7 @@
    z-index: 1; /* Overlay tab title */
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -75,7 +75,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    }
  
    &[crashed] {
-@@ -576,7 +569,7 @@
+@@ -580,7 +573,7 @@
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -84,7 +84,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -633,7 +626,7 @@
+@@ -637,7 +630,7 @@
      }
    }
  
@@ -93,7 +93,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    &[crashed] {
      display: revert;
    }
-@@ -734,7 +727,7 @@
+@@ -738,7 +731,7 @@
        has not been added to root. There are certain scenarios when that attribute is temporarily
        removed from root such as when toggling the sidebar to expand with the toolbar button. */
      #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -102,16 +102,16 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1039,7 +1032,7 @@ tab-group {
+@@ -1137,7 +1130,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
 -  tab-group > :is(.tab-group-label-container, .tabbrowser-tab),
 +  tab-group > :is(.tab-group-label-container, .tab-group-container, .tabbrowser-tab),
-   &[movingtab][movingtab-addToGroup]:not([movingtab-createGroup], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
+   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -1457,7 +1450,7 @@ tab-group {
+@@ -1567,7 +1560,7 @@ tab-group {
    }
  }
  
@@ -120,7 +120,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -1468,7 +1461,7 @@ tab-group {
+@@ -1578,7 +1571,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -129,7 +129,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    }
  
    &:hover {
-@@ -1492,7 +1485,7 @@ tab-group {
+@@ -1602,7 +1595,7 @@ tab-group {
   * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
   * we don't want a gap (between tabs), so we have to add some margin.
   */
@@ -138,7 +138,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
    margin-block: var(--tab-block-margin);
  }
  
-@@ -1687,7 +1680,6 @@ tab-group {
+@@ -1793,7 +1786,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -146,7 +146,7 @@ index b710cbf2aa3febc0693bdc6aef48ef4aea855235..61c813322c866ae823dac6c0826d572a
      }
  
      .tab-background {
-@@ -1847,7 +1839,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1953,7 +1945,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  
diff --git a/src/browser/themes/shared/toolbarbuttons-css.patch b/src/browser/themes/shared/toolbarbuttons-css.patch
index 36bde8e07..12714ef02 100644
--- a/src/browser/themes/shared/toolbarbuttons-css.patch
+++ b/src/browser/themes/shared/toolbarbuttons-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index 1f91bda717979f3e81d2f6b243336078d97c5cb9..4232ec4761cb15ff96e9b18810b05f548a6f5fd9 100644
+index e7b1c17391ffae02226015d0dd8bbe8eca29731f..938a8cb8c3d854a75fe300db2a7330d188c9ed6f 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
 @@ -256,7 +256,7 @@ toolbar .toolbaritem-combined-buttons > separator {
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index 6f04c4e68..f0608a0f6 100644
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,33 +1,33 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index d6c0b56270aee3dd0e74840314ea25af3ca8050a..17b22809744a8903b916b7769681a0c14d054f45 100644
+index 11636a976736ba56dcc5a58081cee998bbdf58d4..0a6ca26f25511c799d8b40484b6bd1c81ceeb4e0 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -5,7 +5,7 @@
- @namespace html url("http://www.w3.org/1999/xhtml");
+@@ -6,7 +6,7 @@
  
  :root {
+   --urlbar-container-min-width: 310px;
 -  --urlbar-container-padding: 1px;
 +  --urlbar-container-padding: 2px;
    --urlbar-margin-inline: 5px;
    --urlbar-padding-block: 4px;
- }
-@@ -23,7 +23,7 @@
- #urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
- #urlbar:not([focused]) > .urlbar-input-container > .urlbar-go-button,
- #urlbar-revert-button-container {
+ 
+@@ -33,7 +33,7 @@
+ #urlbar[usertyping] > .urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
+ .urlbar:is(:not([usertyping]), :not([focused])) > .urlbar-input-container > .urlbar-go-button,
+ .urlbar-revert-button-container {
 -  display: none;
 +  display: none !important;
  }
  
  /* When rich suggestions are enabled the urlbar identity icon is given extra padding to
-@@ -288,10 +288,14 @@
+@@ -307,10 +307,14 @@
  
- #urlbar[breakout][breakout-extend] {
+ .urlbar[breakout][breakout-extend] {
    height: auto;
++  align-items: center;
 +  :root:not([zen-single-toolbar='true']) {
    margin-left: calc(-1 * var(--urlbar-margin-inline));
 +  }
-+  align-items: center;
    width: calc(var(--urlbar-width) + 2 * var(--urlbar-margin-inline));
  
    > .urlbar-input-container {
diff --git a/src/browser/themes/shared/urlbarView-css.patch b/src/browser/themes/shared/urlbarView-css.patch
index dd7c8cec0..bba5d89a9 100644
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 428ce749239be2a54c86e0feff123772d1a1d697..bfef48f520dac8968f79d06cbef2e5a047ded748 100644
+index 743b1bc81474378ac994ca9cfeb8f4cc6b434581..3486cebd74efa2df481d2a112e89b219bd6bb8a2 100644
 --- a/browser/themes/shared/urlbarView.css
 +++ b/browser/themes/shared/urlbarView.css
 @@ -20,7 +20,7 @@
@@ -11,7 +11,7 @@ index 428ce749239be2a54c86e0feff123772d1a1d697..bfef48f520dac8968f79d06cbef2e5a0
    --urlbarView-row-gutter: 2px;
    --urlbarView-item-inline-padding: var(--urlbar-icon-padding);
    --urlbarView-item-block-padding: 6px;
-@@ -168,7 +168,6 @@
+@@ -173,7 +173,6 @@
        min-height: 32px;
      }
      :root[uidensity="touch"] & {
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index f35e5e149..4efa5edda 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -20,10 +20,6 @@
   list-style-image: url('back.svg') !important;
 }
 
-#zenSplitViewModifierActivateReallocation > image {
-  list-style-image: url('move-tab.svg') !important;
-}
-
 #forward-button {
   list-style-image: url('forward.svg') !important;
 }
@@ -770,7 +766,7 @@
   list-style-image: url('chrome://global/skin/media/picture-in-picture-open.svg');
 }
 
-#zenCreateNewPopup > menuitem image {
+#zenCreateNewPopup > menuitem img {
   -moz-context-properties: fill;
   fill: currentColor;
 }
@@ -817,7 +813,7 @@
   }
 }
 
-.zen-workspace-context-icon image {
+.zen-workspace-context-icon img {
   -moz-context-properties: fill;
   fill: currentColor;
   scale: 1.6;
diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 780b1249d..098bd9c63 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 4f960ae35aa69a1d1ce4ad368f5bae365229bbdf..a60d16adee588a1ab0d06d7676bbe80f179e088d 100644
+index 4485369284ee762bc8b35afb84fec0874a831fff..7096e2e5d50cda99b62a2aa7118fea6371e76b85 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
 @@ -31,7 +31,6 @@
diff --git a/src/devtools/server/actors/animation-type-longhand-js.patch b/src/devtools/server/actors/animation-type-longhand-js.patch
index 77775ed87..d9872df5a 100644
--- a/src/devtools/server/actors/animation-type-longhand-js.patch
+++ b/src/devtools/server/actors/animation-type-longhand-js.patch
@@ -1,8 +1,8 @@
 diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
-index a7faa2a2f17144198338aa80207ccf33b631cf32..7c15f8d8d533721b661866643cf10b37c99cb051 100644
+index 17960549c60ebab9ac7c50a70cb69a6b1f8c37dd..9a9ec4539d39f20dccf449cbdcd066efee145b50 100644
 --- a/devtools/server/actors/animation-type-longhand.js
 +++ b/devtools/server/actors/animation-type-longhand.js
-@@ -341,6 +341,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
+@@ -343,6 +343,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
        "transform-origin",
        "translate",
        "-moz-window-transform",
diff --git a/src/devtools/startup/DevToolsStartup-sys-mjs.patch b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
index a87033050..b9c5e983d 100644
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index 91b27e5b5fd938f8c5f141214b934999e0ad871e..d2fdae0b0de64c016abbdd5bf124da278d425b24 100644
+index 175edde2720f31c796e8ae8823e2aff17944f423..d9d4f7f5e53064b1ba07870dced2e1452fdde6b1 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
-@@ -813,6 +813,7 @@ DevToolsStartup.prototype = {
+@@ -816,6 +816,7 @@ DevToolsStartup.prototype = {
      // account (see bug 832984).
      const mainKeyset = doc.getElementById("mainKeyset");
      mainKeyset.parentNode.insertBefore(keyset, mainKeyset);
diff --git a/src/docshell/base/nsAboutRedirector-cpp.patch b/src/docshell/base/nsAboutRedirector-cpp.patch
index 177208a85..61966825d 100644
--- a/src/docshell/base/nsAboutRedirector-cpp.patch
+++ b/src/docshell/base/nsAboutRedirector-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index df5658c7231e73c52ee00e35eeccc47166528391..8bfdceb0fc00c618326e932990c9503af13d9e69 100644
+index 83d84537f94863d47a30887362fa1ce5a9809427..104d170d5e5114f965b7698fc59d2bad12265261 100644
 --- a/docshell/base/nsAboutRedirector.cpp
 +++ b/docshell/base/nsAboutRedirector.cpp
 @@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = {
diff --git a/src/dom/base/Document-cpp.patch b/src/dom/base/Document-cpp.patch
index 0c437f6e0..022968aaa 100644
--- a/src/dom/base/Document-cpp.patch
+++ b/src/dom/base/Document-cpp.patch
@@ -1,24 +1,23 @@
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 40da41ae4ac7d8d61c664e25bec8a74091d8b3e0..59773e80c6220115d0c51e268bb1eff0fe208010 100644
+index 7d7a93e9e76b4957e3ac5860dfc730b7c4e6ad1d..c7c689b73c6599e9e736f73a67bb402d083964a0 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -10,6 +10,7 @@
- 
- #include "mozilla/dom/Document.h"
- #include "mozilla/dom/DocumentInlines.h"
+@@ -467,6 +467,7 @@
+ #include "prtime.h"
+ #include "prtypes.h"
+ #include "xpcpublic.h"
 +#include "mozilla/ZenStyleSheetCache.h"
  
- #include <inttypes.h>
- #include <stdlib.h>
-@@ -3306,6 +3307,11 @@ void Document::FillStyleSetUserAndUASheets() {
+ // clang-format off
+ #include "mozilla/Encoding.h"
+@@ -3345,6 +3346,10 @@ void Document::FillStyleSetUserAndUASheets() {
+   for (StyleSheet* sheet : *sheetService->UserStyleSheets()) {
      styleSet.AppendStyleSheet(*sheet);
    }
- 
 +  if (auto sheet = zen::ZenStyleSheetCache::Singleton()->GetModsSheet(); sheet && IsInChromeDocShell()) {
 +    // The mods sheet is only used in the chrome docshell.
 +    styleSet.AppendStyleSheet(*sheet);
 +  }
-+
+ 
    StyleSheet* sheet = IsInChromeDocShell() ? cache->GetUserChromeSheet()
                                             : cache->GetUserContentSheet();
-   if (sheet) {
diff --git a/src/dom/base/use_counter_metrics-yaml.patch b/src/dom/base/use_counter_metrics-yaml.patch
index 700cacc9f..e8f250c47 100644
--- a/src/dom/base/use_counter_metrics-yaml.patch
+++ b/src/dom/base/use_counter_metrics-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml
-index c8dd3cca62e788eed5e5df5294fa7c9f3a2e9492..91e6281f4eb1c4c6aa1dddd8a0f06aa0c15a71ab 100644
+index adf8d1ed451a54426d92e65557801cffa2f64281..0bf810d3544e42689ad530468bfce5380a51e274 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -21460,6 +21460,22 @@ use.counter.css.page:
+@@ -21477,6 +21477,22 @@ use.counter.css.page:
      send_in_pings:
        - use-counters
  
@@ -25,7 +25,7 @@ index c8dd3cca62e788eed5e5df5294fa7c9f3a2e9492..91e6281f4eb1c4c6aa1dddd8a0f06aa0
    css_transform_origin:
      type: counter
      description: >
-@@ -33447,6 +33463,22 @@ use.counter.css.doc:
+@@ -33481,6 +33497,22 @@ use.counter.css.doc:
      send_in_pings:
        - use-counters
  
diff --git a/src/dom/media/mediacontrol/MediaController-cpp.patch b/src/dom/media/mediacontrol/MediaController-cpp.patch
index 68b730922..7c588afe2 100644
--- a/src/dom/media/mediacontrol/MediaController-cpp.patch
+++ b/src/dom/media/mediacontrol/MediaController-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/media/mediacontrol/MediaController.cpp b/dom/media/mediacontrol/MediaController.cpp
-index 3f08d24d4ed56bb72ed513ed602b2c8fa48afe7b..98dfe4df48f5daebd2b619f0d4d4eb3ac873a66f 100644
+index 8a1735b70f2003b7ee554230c4ad93c68793fce2..86d86a83545287356be5e455501b8c30062adc3a 100644
 --- a/dom/media/mediacontrol/MediaController.cpp
 +++ b/dom/media/mediacontrol/MediaController.cpp
 @@ -51,6 +51,25 @@ void MediaController::GetSupportedKeys(
diff --git a/src/dom/media/mediacontrol/MediaController-h.patch b/src/dom/media/mediacontrol/MediaController-h.patch
index f2fec73c4..d86b5d3f4 100644
--- a/src/dom/media/mediacontrol/MediaController-h.patch
+++ b/src/dom/media/mediacontrol/MediaController-h.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/media/mediacontrol/MediaController.h b/dom/media/mediacontrol/MediaController.h
-index 8fec9c59e38bc24b9ff6d30ddbaebff67107bc76..5e7f3634f9edef48d6f96b4900f82a7ebbd730be 100644
+index 327ea6201304b3d26a2b4f0267b1c926c73ee9e4..ad14bb2572c29df4897672e14afc185b9b517da4 100644
 --- a/dom/media/mediacontrol/MediaController.h
 +++ b/dom/media/mediacontrol/MediaController.h
 @@ -90,6 +90,7 @@ class MediaController final : public DOMEventTargetHelper,
diff --git a/src/dom/html/HTMLMediaElement-cpp.patch b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
similarity index 74%
rename from src/dom/html/HTMLMediaElement-cpp.patch
rename to src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
index 9160debaf..60236c198 100644
--- a/src/dom/html/HTMLMediaElement-cpp.patch
+++ b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
@@ -1,7 +1,7 @@
-diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
-index 2becc049b5a0ee8544819b08d65f1df0a4c23658..6e7a05f135c6ab2c4955a679c1a4ac0e9aae7592 100644
---- a/dom/html/HTMLMediaElement.cpp
-+++ b/dom/html/HTMLMediaElement.cpp
+diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
+index d46d5edc1d66c1eee8780abad444289fdc36a518..0e0d69819d9eee82add726792ec829c05551a076 100644
+--- a/dom/media/mediaelement/HTMLMediaElement.cpp
++++ b/dom/media/mediaelement/HTMLMediaElement.cpp
 @@ -453,6 +453,7 @@ class HTMLMediaElement::MediaControlKeyListener final
      // audible state. Therefore, in that case we would noitfy the audible state
      // when media starts playing.
diff --git a/src/gfx/wr/webrender/src/picture-rs.patch b/src/gfx/wr/webrender/src/picture-rs.patch
index 05d8c2560..90bc5d113 100644
--- a/src/gfx/wr/webrender/src/picture-rs.patch
+++ b/src/gfx/wr/webrender/src/picture-rs.patch
@@ -1,8 +1,8 @@
 diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs
-index e860f36ef2b42a7377047c64dd4f9405f26b3249..8057172482aa042e9951fc7367891a66eed75f5e 100644
+index 79e062a40ed097fa6614abc6b5201f868c447733..91c10d17f0dca55eafec522ddc94b91bf4cd2cfb 100644
 --- a/gfx/wr/webrender/src/picture.rs
 +++ b/gfx/wr/webrender/src/picture.rs
-@@ -8112,7 +8112,12 @@ fn get_relative_scale_offset(
+@@ -8121,7 +8121,12 @@ fn get_relative_scale_offset(
          CoordinateSpaceMapping::Local => ScaleOffset::identity(),
          CoordinateSpaceMapping::ScaleOffset(scale_offset) => scale_offset,
          CoordinateSpaceMapping::Transform(m) => {
diff --git a/src/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch
index e47c115b5..66f1b822d 100644
--- a/src/layout/generic/nsIFrame-cpp.patch
+++ b/src/layout/generic/nsIFrame-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp
-index e13628eccc51f0e81fc1404b061840d816502757..85cca51cf37db83f6e79c6e6af080646d2c49670 100644
+index 0fca54d43aed64e711c3470a5745a94baaed8886..17097bc8f39e7d5140afa4d91811bca2071a8ad1 100644
 --- a/layout/generic/nsIFrame.cpp
 +++ b/layout/generic/nsIFrame.cpp
-@@ -11901,6 +11901,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+@@ -11933,6 +11933,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
    gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms(
        uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel));
  
diff --git a/src/layout/base/nsStyleSheetService-h.patch b/src/layout/style/nsStyleSheetService-h.patch
similarity index 69%
rename from src/layout/base/nsStyleSheetService-h.patch
rename to src/layout/style/nsStyleSheetService-h.patch
index 9959493be..80f767f5b 100644
--- a/src/layout/base/nsStyleSheetService-h.patch
+++ b/src/layout/style/nsStyleSheetService-h.patch
@@ -1,7 +1,7 @@
-diff --git a/layout/base/nsStyleSheetService.h b/layout/base/nsStyleSheetService.h
+diff --git a/layout/style/nsStyleSheetService.h b/layout/style/nsStyleSheetService.h
 index 83fc829aad19f8b80692e67bddb781778fbc4f8d..04806a1f51686a82c1dc2555dae86a4397b181fb 100644
---- a/layout/base/nsStyleSheetService.h
-+++ b/layout/base/nsStyleSheetService.h
+--- a/layout/style/nsStyleSheetService.h
++++ b/layout/style/nsStyleSheetService.h
 @@ -50,6 +50,8 @@ class nsStyleSheetService final : public nsIStyleSheetService,
  
    size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
diff --git a/src/layout/style/nsStyleStruct-cpp.patch b/src/layout/style/nsStyleStruct-cpp.patch
index ba1e4553c..677018f5d 100644
--- a/src/layout/style/nsStyleStruct-cpp.patch
+++ b/src/layout/style/nsStyleStruct-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
-index 4b979fc1f9d0986f5382cab0c39bf99ed34ef39e..90f67c73c13fbfdcfff86125c6d7258850ca62b0 100644
+index 3fc58a635189d2160be84c3c8083e63abce611f0..7aac552365a4414229879e2dd9586f7fbd98816d 100644
 --- a/layout/style/nsStyleStruct.cpp
 +++ b/layout/style/nsStyleStruct.cpp
-@@ -3237,6 +3237,9 @@ nsStyleUIReset::nsStyleUIReset()
+@@ -3266,6 +3266,9 @@ nsStyleUIReset::nsStyleUIReset()
        mWindowShadow(StyleWindowShadow::Auto),
        mWindowOpacity(1.0),
        mMozWindowInputRegionMargin(StyleLength::Zero()),
@@ -12,7 +12,7 @@ index 4b979fc1f9d0986f5382cab0c39bf99ed34ef39e..90f67c73c13fbfdcfff86125c6d72588
        mTransitions(
            nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
        mTransitionTimingFunctionCount(1),
-@@ -3281,6 +3284,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+@@ -3310,6 +3313,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
        mWindowOpacity(aSource.mWindowOpacity),
        mMozWindowInputRegionMargin(aSource.mMozWindowInputRegionMargin),
        mMozWindowTransform(aSource.mMozWindowTransform),
diff --git a/src/layout/style/nsStyleStruct-h.patch b/src/layout/style/nsStyleStruct-h.patch
index 5ab373834..0eeede686 100644
--- a/src/layout/style/nsStyleStruct-h.patch
+++ b/src/layout/style/nsStyleStruct-h.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
-index 3236244280edaae2bbe4440e76da3455015ab722..3474d4bcfab2944aae9635250350b674a8ed1c42 100644
+index 9db1b385ac12e0142921c49e6b6c2ba0fadccf95..919089fd9bc278b0c2fede4b2babe133acd4632e 100644
 --- a/layout/style/nsStyleStruct.h
 +++ b/layout/style/nsStyleStruct.h
-@@ -2033,6 +2033,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+@@ -2075,6 +2075,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
    // The margin of the window region that should be transparent to events.
    mozilla::StyleLength mMozWindowInputRegionMargin;
    mozilla::StyleTransform mMozWindowTransform;
diff --git a/src/layout/style/test/ListCSSProperties-cpp.patch b/src/layout/style/test/ListCSSProperties-cpp.patch
index bc7700138..31a2d1c8f 100644
--- a/src/layout/style/test/ListCSSProperties-cpp.patch
+++ b/src/layout/style/test/ListCSSProperties-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
-index df06ffac358c1b245c84432aa6f143f9c5806029..0bca4b9b40b3b030c54fc36c659966dd3a8894f7 100644
+index 673c1677703ef2de3fafbe86f0ffab720738f4cb..267556f66de3180fc6ae91d5b54b8648f1b41cc4 100644
 --- a/layout/style/test/ListCSSProperties.cpp
 +++ b/layout/style/test/ListCSSProperties.cpp
-@@ -109,6 +109,7 @@ const char* gInaccessibleProperties[] = {
+@@ -110,6 +110,7 @@ const char* gInaccessibleProperties[] = {
      "-moz-window-opacity",                // chrome-only internal properties
      "-moz-window-transform",              // chrome-only internal properties
      "-moz-window-shadow",                 // chrome-only internal properties
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index 670438552..d46f3b54a 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 30a19900c13cd0720008980202077af1df705856..136e3a13b810215be7a102786dce54651b38829d 100644
+index a6c49438aaf3464e70bf9c75c2849a6062bd096a..2ee33493ed541b36a29f29c104d1275b80e5a20a 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -19119,6 +19119,7 @@
+@@ -19222,6 +19215,7 @@
    mirror: always
  #endif
  
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index 2f0624d89..fd2ce91cd 100644
--- a/src/servo/components/style/gecko/media_features-rs.patch
+++ b/src/servo/components/style/gecko/media_features-rs.patch
@@ -1,5 +1,5 @@
 diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
-index c66f1e26b22a6eeb2192d531e365ba34a61e220d..097ffce888ee0e180cc06448ea34860e6a467a2a 100644
+index 3d4630e2250476729d21cdcb1726a7af93f9fd75..489d1dc624bb1e7b3f7ed22a0073d3ada29846e4 100644
 --- a/servo/components/style/gecko/media_features.rs
 +++ b/servo/components/style/gecko/media_features.rs
 @@ -13,6 +13,9 @@ use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
@@ -12,39 +12,32 @@ index c66f1e26b22a6eeb2192d531e365ba34a61e220d..097ffce888ee0e180cc06448ea34860e
  
  fn device_size(device: &Device) -> Size2D<Au> {
      let mut width = 0;
-@@ -610,6 +613,13 @@ fn eval_moz_overlay_scrollbars(context: &Context) -> bool {
+@@ -609,6 +612,13 @@ fn eval_scripting(context: &Context, query_value: Option<Scripting>) -> bool {
+ fn eval_moz_overlay_scrollbars(context: &Context) -> bool {
      unsafe { bindings::Gecko_MediaFeatures_UseOverlayScrollbars(context.device().document()) }
  }
- 
++ 
 +fn eval_moz_bool_pref(_: &Context, pref: Option<&AtomString>) -> KleeneValue {
 +    let Some(pref) = pref else {
 +        return KleeneValue::False;
 +    };
 +    KleeneValue::from(unsafe { bindings::Gecko_EvalMozPrefFeature(pref.as_ptr(), &MozPrefFeatureValue::<i32>::None) })
 +}
-+
+ 
  fn get_lnf_int(int_id: i32) -> i32 {
      unsafe { bindings::Gecko_GetLookAndFeelInt(int_id) }
- }
-@@ -657,7 +667,7 @@ macro_rules! lnf_int_feature {
+@@ -641,7 +651,13 @@ macro_rules! lnf_int_feature {
  /// to support new types in these entries and (2) ensuring that either
  /// nsPresContext::MediaFeatureValuesChanged is called when the value that
  /// would be returned by the evaluator function could change.
--pub static MEDIA_FEATURES: [QueryFeatureDescription; 62] = [
-+pub static MEDIA_FEATURES: [QueryFeatureDescription; 63] = [
-     feature!(
-         atom!("width"),
-         AllowsRanges::Yes,
-@@ -928,6 +938,12 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 62] = [
-         Evaluator::BoolInteger(eval_moz_overlay_scrollbars),
-         FeatureFlags::CHROME_AND_UA_ONLY,
-     ),
+-pub static MEDIA_FEATURES: [QueryFeatureDescription; 58] = [
++pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
 +    feature!(
 +        atom!("-moz-bool-pref"),
 +        AllowsRanges::No,
 +        Evaluator::String(eval_moz_bool_pref),
 +        FeatureFlags::CHROME_AND_UA_ONLY,
 +    ),
-     lnf_int_feature!(
-         atom!("-moz-scrollbar-start-backward"),
-         ScrollArrowStyle,
+     feature!(
+         atom!("width"),
+         AllowsRanges::Yes,
diff --git a/src/servo/components/style/properties/longhands/ui-mako-rs.patch b/src/servo/components/style/properties/longhands/ui-mako-rs.patch
index 81ab53731..1d5c6685b 100644
--- a/src/servo/components/style/properties/longhands/ui-mako-rs.patch
+++ b/src/servo/components/style/properties/longhands/ui-mako-rs.patch
@@ -1,8 +1,8 @@
 diff --git a/servo/components/style/properties/longhands/ui.mako.rs b/servo/components/style/properties/longhands/ui.mako.rs
-index b7d24fe7bb54b1c143876e3bc9da59c64324ffa5..c36f7edcf076e31209e847af0b59361033d3b4da 100644
+index 24e1e1b7e8fe4d4b70aaa4f5f022500c3dcfcbae..1176bf5d12885b4d96abb2f72288f6c631072578 100644
 --- a/servo/components/style/properties/longhands/ui.mako.rs
 +++ b/servo/components/style/properties/longhands/ui.mako.rs
-@@ -286,6 +286,18 @@ ${helpers.predefined_type(
+@@ -284,6 +284,18 @@ ${helpers.predefined_type(
      affects="",
  )}
  
diff --git a/src/testing/mochitest/browser-test-js.patch b/src/testing/mochitest/browser-test-js.patch
index b58503ab2..474a8f07c 100644
--- a/src/testing/mochitest/browser-test-js.patch
+++ b/src/testing/mochitest/browser-test-js.patch
@@ -1,8 +1,8 @@
 diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
-index ef29179988bb37e7ea441aa051b692e3ccc90f21..6c9641ed27722b5febd83f6e121df24d46b00067 100644
+index 11217c210dd8dc5f7c4bdc6043df9aeb361529c6..18c3c4d658170d0646483cd289fe8ad1f21ffae0 100644
 --- a/testing/mochitest/browser-test.js
 +++ b/testing/mochitest/browser-test.js
-@@ -444,11 +444,11 @@ Tester.prototype = {
+@@ -440,11 +440,11 @@ Tester.prototype = {
        this.currentTest &&
        window.gBrowser &&
        AppConstants.MOZ_APP_NAME != "thunderbird" &&
@@ -16,7 +16,7 @@ index ef29179988bb37e7ea441aa051b692e3ccc90f21..6c9641ed27722b5febd83f6e121df24d
          let lastTab = gBrowser.tabs[gBrowser.tabs.length - 1];
          if (!lastTab.closing) {
            // Report the stale tab as an error only when they're not closing.
-@@ -483,12 +483,12 @@ Tester.prototype = {
+@@ -479,12 +479,12 @@ Tester.prototype = {
  
      // Replace the last tab with a fresh one
      if (window.gBrowser && AppConstants.MOZ_APP_NAME != "thunderbird") {
diff --git a/src/testing/profiles/mochitest/user-js.patch b/src/testing/profiles/mochitest/user-js.patch
index 85f820ba2..f2e596177 100644
--- a/src/testing/profiles/mochitest/user-js.patch
+++ b/src/testing/profiles/mochitest/user-js.patch
@@ -1,11 +1,11 @@
 diff --git a/testing/profiles/mochitest/user.js b/testing/profiles/mochitest/user.js
-index c43196b3c9cf8c90fa1cca5b6d205c410adec022..854aec05b568aa3dfe7d9b994c0ee7ee9a6b5fd8 100644
+index a4068ac3f61161d014c49d54ae7a3bf886868f1b..7771d8c99aa20105b1382437881cdc02b17688c2 100644
 --- a/testing/profiles/mochitest/user.js
 +++ b/testing/profiles/mochitest/user.js
-@@ -44,3 +44,7 @@ user_pref("geo.prompt.open_system_prefs", false);
- 
- // Enable Nimbus debug logging.
- user_pref("messaging-system.log", "all");
+@@ -41,3 +41,7 @@ user_pref("places.history.floodingPrevention.enabled", false);
+ // permission, and we can open it and wait for the user to give permission, then
+ // don't do that.
+ user_pref("geo.prompt.open_system_prefs", false);
 +
 +user_pref("zen.welcome-screen.seen", true);
 +user_pref("zen.watermark.enabled", false);
diff --git a/src/toolkit/components/extensions/parent/ext-downloads-js.patch b/src/toolkit/components/extensions/parent/ext-downloads-js.patch
index f867d171d..5fdf9dbaf 100644
--- a/src/toolkit/components/extensions/parent/ext-downloads-js.patch
+++ b/src/toolkit/components/extensions/parent/ext-downloads-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js
-index ea6929d23d432958def5be46e42e329bc224d3aa..942cfddc090399ef239cc34ab47682cab6a33cd4 100644
+index 3b81d5e60a5e3006b80a2acec0b6720ccb7e5b33..5b6272986e13b48047f3bae1ec4205fc3e8012ef 100644
 --- a/toolkit/components/extensions/parent/ext-downloads.js
 +++ b/toolkit/components/extensions/parent/ext-downloads.js
 @@ -87,6 +87,7 @@ const FILTER_IMAGES_EXTENSIONS = [
diff --git a/src/toolkit/components/extensions/parent/ext-runtime-js.patch b/src/toolkit/components/extensions/parent/ext-runtime-js.patch
index d56116c25..cc8d19e1a 100644
--- a/src/toolkit/components/extensions/parent/ext-runtime-js.patch
+++ b/src/toolkit/components/extensions/parent/ext-runtime-js.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/components/extensions/parent/ext-runtime.js b/toolkit/components/extensions/parent/ext-runtime.js
-index ff7aae6e5f1919d8d4ff1c7e85b6150332adc20f..5d935e3d0dfb91cd01268d4e2c4dee4696c33efe 100644
+index 0d7a3e505b6bd30548c6dda1504dd343a517b083..71bab6f1562ef6ec43541e52573d2ed5c4e8e3af 100644
 --- a/toolkit/components/extensions/parent/ext-runtime.js
 +++ b/toolkit/components/extensions/parent/ext-runtime.js
-@@ -331,7 +331,7 @@ this.runtime = class extends ExtensionAPIPersistent {
+@@ -333,7 +333,7 @@ this.runtime = class extends ExtensionAPIPersistent {
  
          getBrowserInfo: function () {
            const { name, vendor, version, appBuildID } = Services.appinfo;
diff --git a/src/toolkit/content/widgets/browser-custom-element-mjs.patch b/src/toolkit/content/widgets/browser-custom-element-mjs.patch
index 7c21e5238..cb7820fe0 100644
--- a/src/toolkit/content/widgets/browser-custom-element-mjs.patch
+++ b/src/toolkit/content/widgets/browser-custom-element-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/browser-custom-element.mjs b/toolkit/content/widgets/browser-custom-element.mjs
-index 8eeea2a403ba2007a1a1e6074bb982b24f40fef5..29bae869dfd8c9df6039b3c9b8b1603092e517ea 100644
+index ef01902583d6ff1c563e9b2886f3048b127fe383..01f353f5eb4c67b2cf01a14e337a81e93358586f 100644
 --- a/toolkit/content/widgets/browser-custom-element.mjs
 +++ b/toolkit/content/widgets/browser-custom-element.mjs
 @@ -482,11 +482,11 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
diff --git a/src/toolkit/content/widgets/infobar-css.patch b/src/toolkit/content/widgets/infobar-css.patch
index 59ca689d9..e612fa27b 100644
--- a/src/toolkit/content/widgets/infobar-css.patch
+++ b/src/toolkit/content/widgets/infobar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
-index e2272e913ad0215fa733c5fa01d180ccfa919abc..f6da9321fcdc70ab4a81f01787c3d2a55057fda9 100644
+index a13978527bf921b412ec4729612ce8f831caccb9..8f0dfad852d7f5e4fbade48e2d114767bacdda36 100644
 --- a/toolkit/content/widgets/infobar.css
 +++ b/toolkit/content/widgets/infobar.css
 @@ -102,3 +102,18 @@ strong {
diff --git a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
index 1d382a16f..766f3435b 100644
--- a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
+++ b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.css b/toolkit/content/widgets/moz-toggle/moz-toggle.css
-index 8509f15f02f01b3259e6b6ddf97203e7aa8e9e60..b94fcc8fa002c497941c81623145942ba566d80a 100644
+index 7b9ec91bf0cfd8fda6a161995c9de57270557f6c..b1049bd2b2c03104e5b35978a9b81674d6920d53 100644
 --- a/toolkit/content/widgets/moz-toggle/moz-toggle.css
 +++ b/toolkit/content/widgets/moz-toggle/moz-toggle.css
-@@ -34,8 +34,8 @@
+@@ -6,8 +6,8 @@
    --toggle-background-color: var(--button-background-color);
    --toggle-background-color-hover: var(--button-background-color-hover);
    --toggle-background-color-active: var(--button-background-color-active);
diff --git a/src/toolkit/content/xul-css.patch b/src/toolkit/content/xul-css.patch
index 4f91ad09f..3f25b9b81 100644
--- a/src/toolkit/content/xul-css.patch
+++ b/src/toolkit/content/xul-css.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
-index ba7642c9264ac201fec7be1bd492bc778bb147a2..9e89735e8a0886183ae7ecf98e6ce08142bf3bbc 100644
+index badef34e6072da6e0e1180f5f08ab201a89fa195..2842eee9d5655444ccac8c085f19df0247886d64 100644
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -456,7 +456,8 @@ deck > *|*:not(:-moz-native-anonymous) {
+@@ -461,7 +461,8 @@ deck > *|*:not(:-moz-native-anonymous) {
  }
  
  tabpanels > .deck-selected,
diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch
index 847630ede..a384e5c2e 100644
--- a/src/toolkit/modules/moz-build.patch
+++ b/src/toolkit/modules/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index 8c020ddc23afd11b2592bfd98b3131613b084202..045be1fa401d24932d0fe4197a9dc0d7a63bcd20 100644
+index 990244af276576d0af0b371a370287aa780f42c1..cd43715aea607fc7dbafda589e14e1462568dd61 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
-@@ -280,6 +280,7 @@ for var in (
+@@ -281,6 +281,7 @@ for var in (
      "DLL_SUFFIX",
      "DEBUG_JS_MODULES",
      "OMNIJAR_NAME",
diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch
index 8867d4b21..2b4335893 100644
--- a/src/toolkit/moz-configure.patch
+++ b/src/toolkit/moz-configure.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 87abe60e93bc7dfb84052c9735ddddc75b74c229..f4649e9d48a2a2892c48ce536da105dcfa72d73b 100644
+index 44b91b7bb3e0196b7f1f923c43fb8967f569cd28..907f7059cb44b990b5eb3a90d5df523075cd6ae1 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
@@ -18,7 +18,7 @@ index 87abe60e93bc7dfb84052c9735ddddc75b74c229..f4649e9d48a2a2892c48ce536da105dc
      nargs=1,
      help='Used for application.ini\'s "Profile" field, which controls profile location',
  )
-@@ -87,10 +89,13 @@ option(
+@@ -86,10 +88,13 @@ option(
  )
  set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO")
  
@@ -33,7 +33,7 @@ index 87abe60e93bc7dfb84052c9735ddddc75b74c229..f4649e9d48a2a2892c48ce536da105dc
      help="Set distribution-specific id",
  )
  set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
-@@ -932,9 +937,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
+@@ -931,9 +936,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
  option("--disable-jxl", help="Disable jxl image support")
  
  
@@ -46,7 +46,7 @@ index 87abe60e93bc7dfb84052c9735ddddc75b74c229..f4649e9d48a2a2892c48ce536da105dc
          return True
  
  
-@@ -2065,7 +2070,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
+@@ -2064,7 +2069,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
  # ==============================================================
  @depends(milestone)
  def require_signing(milestone):
diff --git a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
index 474ec0df6..6ed13c08c 100644
--- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 14b57fcca58409671361ac5a5d753d8b71235ea5..e75a8939c4b1c574213ed3e2db6377de99218a1f 100644
+index f544f44cf7a73858213ddfc07c0ad693e2f56504..01293cb38ad53ff36c545ccb392071e20fe1d62b 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-@@ -1221,12 +1221,12 @@ var AddonManagerInternal = {
+@@ -1227,12 +1227,12 @@ var AddonManagerInternal = {
          ITEM_VERSION: aAddon.version,
          ITEM_STATUS: addonStatus,
          APP_ID: Services.appinfo.ID,
diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
index 1e88ee608..d35981b3b 100644
--- a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
+++ b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
-index d8ccfe4b25f8139127c5ef48e739d79d960a7c91..93c6f3b6ec84be3e2f0081d5f7257488f47c7c26 100644
+index 733396c68be4f1dd9de99bd602c9f8cde8843957..e0d9489a89e366e3f6dab2a6f472c6752a8815b3 100644
 --- a/toolkit/mozapps/extensions/content/aboutaddons.css
 +++ b/toolkit/mozapps/extensions/content/aboutaddons.css
 @@ -105,6 +105,13 @@ h2 {
diff --git a/src/toolkit/mozapps/update/updater/updater-common-build.patch b/src/toolkit/mozapps/update/updater/updater-common-build.patch
index ce7193d25..03390b4c7 100644
--- a/src/toolkit/mozapps/update/updater/updater-common-build.patch
+++ b/src/toolkit/mozapps/update/updater/updater-common-build.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/update/updater/updater-common.build b/toolkit/mozapps/update/updater/updater-common.build
-index 6c6d0adf6f56b66c06494b95982b4afae52de536..67e381659dba0c6938a12d16fe12bc2f3e2039ae 100644
+index 57ea0415653678bb300e277e66c97e332e756cc7..5f757e68a685948c83fee8f963c49bee71a8e4a4 100644
 --- a/toolkit/mozapps/update/updater/updater-common.build
 +++ b/toolkit/mozapps/update/updater/updater-common.build
-@@ -78,6 +78,11 @@ if link_with_nss:
+@@ -88,6 +88,11 @@ if link_with_nss:
          "nss",
          "signmar",
      ]
diff --git a/src/toolkit/themes/shared/aboutReader-css.patch b/src/toolkit/themes/shared/aboutReader-css.patch
index 36949c661..5b830814d 100644
--- a/src/toolkit/themes/shared/aboutReader-css.patch
+++ b/src/toolkit/themes/shared/aboutReader-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
-index cef17d0cbed2c50e12534c898f828a16b236a649..e0b200efe9c15329321c4b5cae7ec6a3cc2b695a 100644
+index bf425379af81f442fb0b4ad7d2921c3f06196f26..6c2cc0faade92de995b675eea2696f061dfda571 100644
 --- a/toolkit/themes/shared/aboutReader.css
 +++ b/toolkit/themes/shared/aboutReader.css
 @@ -1189,3 +1189,43 @@ pre code {
diff --git a/src/toolkit/themes/shared/in-content/common-shared-css.patch b/src/toolkit/themes/shared/in-content/common-shared-css.patch
index 663ec2110..9fe5ceab3 100644
--- a/src/toolkit/themes/shared/in-content/common-shared-css.patch
+++ b/src/toolkit/themes/shared/in-content/common-shared-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index 3c72faca31b8a52a1668f78c8154a5726790a6dc..583348194113521b0a47d6ee3272c485fcd33db9 100644
+index c45d48dc3106a2dc36f6dd704ebb2721817f016e..cfaf394d8ada7f4256037ead08fd338b7e28df32 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
 @@ -4,7 +4,7 @@
@@ -11,7 +11,7 @@ index 3c72faca31b8a52a1668f78c8154a5726790a6dc..583348194113521b0a47d6ee3272c485
  @namespace html "http://www.w3.org/1999/xhtml";
  @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
  
-@@ -777,7 +777,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
+@@ -708,7 +708,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
    fill-opacity: 1;
  }
  
@@ -20,7 +20,7 @@ index 3c72faca31b8a52a1668f78c8154a5726790a6dc..583348194113521b0a47d6ee3272c485
    :root {
      --in-content-sidebar-width: 118px;
    }
-@@ -1167,7 +1167,7 @@ xul|*.sidebar-footer-link {
+@@ -1098,7 +1098,7 @@ xul|*.sidebar-footer-link {
    user-select: none;
  }
  
diff --git a/src/widget/cocoa/nsCocoaWindow-mm.patch b/src/widget/cocoa/nsCocoaWindow-mm.patch
index 4286b6fca..ecbe7de1e 100644
--- a/src/widget/cocoa/nsCocoaWindow-mm.patch
+++ b/src/widget/cocoa/nsCocoaWindow-mm.patch
@@ -1,8 +1,8 @@
 diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
-index f753a7a8bf132044060bdcd7bf14b134ca785f4a..ec1f2b26ea2bc178c66c386dc078d6a8f2ec3423 100644
+index 827dc774a429d0595028314a522722078a202edc..11ba33c2c316c0fc53053f6f8d0feab97c93bc72 100644
 --- a/widget/cocoa/nsCocoaWindow.mm
 +++ b/widget/cocoa/nsCocoaWindow.mm
-@@ -7398,7 +7398,7 @@ static NSMutableSet* gSwizzledFrameViewClasses = nil;
+@@ -7540,7 +7540,7 @@ static NSMutableSet* gSwizzledFrameViewClasses = nil;
  
  // Returns an autoreleased NSImage.
  static NSImage* GetMenuMaskImage() {
diff --git a/src/xpfe/appshell/AppWindow-cpp.patch b/src/xpfe/appshell/AppWindow-cpp.patch
index 64f5558af..70df53122 100644
--- a/src/xpfe/appshell/AppWindow-cpp.patch
+++ b/src/xpfe/appshell/AppWindow-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index ddd7fb3ff3008b4761ddc63b32c7c265ada024df..d18cddc6e00bc68789435f47fd505e04a4789383 100644
+index 0b7788ec179d1c1021d2e5692c652b367646d33b..f5d48ca47a899b82f9d9cb7823eeb096f542c0ea 100644
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -1880,7 +1880,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
+@@ -1873,7 +1873,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
      }
    }
  
diff --git a/src/zen/@types/index.d.ts b/src/zen/@types/index.d.ts
index 5d7c7fe7c..b59acd110 100644
--- a/src/zen/@types/index.d.ts
+++ b/src/zen/@types/index.d.ts
@@ -1,22 +1,22 @@
-// 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/.
-/**
- * NOTE: Do not modify this file by hand.
- * If you're updating some of the sources, see README for instructions.
- */
+/* 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/. */
 
-/// <reference types="./lib.gecko.dom.d.ts" />
-/// <reference types="./lib.gecko.glean.d.ts" />
-/// <reference types="./lib.gecko.nsresult.d.ts" />
-/// <reference types="./lib.gecko.services.d.ts" />
-/// <reference types="./lib.gecko.xpcom.d.ts" />
+/// <reference lib="es2024" />
+/// <reference lib="esnext.iterator" />
+
+/// <reference types="./lib.gecko.custom.d.ts" />
+/// <reference types="./generated/lib.gecko.dom.d.ts" />
+/// <reference types="./generated/lib.gecko.glean.d.ts" />
+/// <reference types="./generated/lib.gecko.nsresult.d.ts" />
+/// <reference types="./generated/lib.gecko.services.d.ts" />
+/// <reference types="./generated/lib.gecko.xpcom.d.ts" />
 /// <reference types="./lib.gecko.xpidl.d.ts" />
 
 /// Platform specific XPCOM modules.
-/// <reference types="./lib.gecko.darwin.d.ts" />
-/// <reference types="./lib.gecko.linux.d.ts" />
-/// <reference types="./lib.gecko.win32.d.ts" />
+/// <reference types="./generated/lib.gecko.darwin.d.ts" />
+/// <reference types="./generated/lib.gecko.linux.d.ts" />
+/// <reference types="./generated/lib.gecko.win32.d.ts" />
 
 /// Order of references matters here, for overriding type signatures.
 /// <reference types="./lib.gecko.tweaks.d.ts" />
diff --git a/src/zen/@types/lib.gecko.darwin.d.ts b/src/zen/@types/lib.gecko.darwin.d.ts
index 9fbe0954c..400ad03f7 100644
--- a/src/zen/@types/lib.gecko.darwin.d.ts
+++ b/src/zen/@types/lib.gecko.darwin.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
diff --git a/src/zen/@types/lib.gecko.dom.d.ts b/src/zen/@types/lib.gecko.dom.d.ts
index 1a5552b6d..024b28296 100644
--- a/src/zen/@types/lib.gecko.dom.d.ts
+++ b/src/zen/@types/lib.gecko.dom.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source .webidl files.
@@ -8,7 +5,6 @@
  */
 
 /// <reference no-default-lib="true" />
-/// <reference lib="es2024" />
 
 type HTMLCollectionOf<T> = any;
 type IsInstance<T> = (obj: any) => obj is T;
@@ -127,7 +123,7 @@ interface AudioDataCopyToOptions {
 }
 
 interface AudioDataInit {
-  data: ArrayBufferView | ArrayBuffer;
+  data: AllowSharedBufferSource;
   format: AudioSampleFormat;
   numberOfChannels: number;
   numberOfFrames: number;
@@ -138,7 +134,7 @@ interface AudioDataInit {
 
 interface AudioDecoderConfig {
   codec: string;
-  description?: ArrayBufferView | ArrayBuffer;
+  description?: AllowSharedBufferSource;
   numberOfChannels: number;
   sampleRate: number;
 }
@@ -217,7 +213,10 @@ interface AudioWorkletNodeOptions extends AudioNodeOptions {
 interface AuthenticationExtensionsClientInputs {
   appid?: string;
   credProps?: boolean;
+  credentialProtectionPolicy?: CredentialProtectionPolicy;
+  enforceCredentialProtectionPolicy?: boolean;
   hmacCreateSecret?: boolean;
+  largeBlob?: AuthenticationExtensionsLargeBlobInputs;
   minPinLength?: boolean;
   prf?: AuthenticationExtensionsPRFInputs;
 }
@@ -225,7 +224,10 @@ interface AuthenticationExtensionsClientInputs {
 interface AuthenticationExtensionsClientInputsJSON {
   appid?: string;
   credProps?: boolean;
+  credentialProtectionPolicy?: CredentialProtectionPolicy;
+  enforceCredentialProtectionPolicy?: boolean;
   hmacCreateSecret?: boolean;
+  largeBlob?: AuthenticationExtensionsLargeBlobInputsJSON;
   minPinLength?: boolean;
   prf?: AuthenticationExtensionsPRFInputsJSON;
 }
@@ -234,9 +236,28 @@ interface AuthenticationExtensionsClientOutputs {
   appid?: boolean;
   credProps?: CredentialPropertiesOutput;
   hmacCreateSecret?: boolean;
+  largeBlob?: AuthenticationExtensionsLargeBlobOutputs;
   prf?: AuthenticationExtensionsPRFOutputs;
 }
 
+interface AuthenticationExtensionsLargeBlobInputs {
+  read?: boolean;
+  support?: string;
+  write?: BufferSource;
+}
+
+interface AuthenticationExtensionsLargeBlobInputsJSON {
+  read?: boolean;
+  support?: string;
+  write?: Base64URLString;
+}
+
+interface AuthenticationExtensionsLargeBlobOutputs {
+  blob?: ArrayBuffer;
+  supported?: boolean;
+  written?: boolean;
+}
+
 interface AuthenticationExtensionsPRFInputs {
   eval?: AuthenticationExtensionsPRFValues;
   evalByCredential?: Record<string, AuthenticationExtensionsPRFValues>;
@@ -334,6 +355,21 @@ interface CSSCustomPropertyRegisteredEventInit extends EventInit {
   propertyDefinition: InspectorCSSPropertyDefinition;
 }
 
+interface CSSMatrixComponentOptions {
+  is2D?: boolean;
+}
+
+interface CSSNumericType {
+  angle?: number;
+  flex?: number;
+  frequency?: number;
+  length?: number;
+  percent?: number;
+  percentHint?: CSSNumericBaseType;
+  resolution?: number;
+  time?: number;
+}
+
 interface CSSStyleSheetInit {
   baseURL?: string;
   disabled?: boolean;
@@ -462,6 +498,11 @@ interface CollectedData {
   xpath?: Record<string, CollectedFormDataValue>;
 }
 
+interface CommandEventInit extends EventInit {
+  command?: string;
+  source?: Element | null;
+}
+
 interface CompileScriptOptionsDictionary {
   charset?: string;
   filename?: string;
@@ -548,7 +589,13 @@ interface CookieInit {
 }
 
 interface CookieListItem {
+  domain?: string | null;
+  expires?: DOMHighResTimeStamp | null;
   name?: string;
+  partitioned?: boolean;
+  path?: string;
+  sameSite?: CookieSameSite;
+  secure?: boolean;
   value?: string;
 }
 
@@ -570,7 +617,6 @@ interface CopyOptions {
 }
 
 interface CredentialCreationOptions {
-  identity?: IdentityCredentialInit;
   publicKey?: PublicKeyCredentialCreationOptions;
   signal?: AbortSignal;
 }
@@ -780,7 +826,7 @@ interface ElementDefinitionOptions {
 }
 
 interface EncodedAudioChunkInit {
-  data: ArrayBufferView | ArrayBuffer;
+  data: AllowSharedBufferSource;
   duration?: number;
   timestamp: number;
   transfer?: ArrayBuffer[];
@@ -792,7 +838,7 @@ interface EncodedAudioChunkMetadata {
 }
 
 interface EncodedVideoChunkInit {
-  data: ArrayBufferView | ArrayBuffer;
+  data: AllowSharedBufferSource;
   duration?: number;
   timestamp: number;
   type: EncodedVideoChunkType;
@@ -991,6 +1037,7 @@ interface GPUBindGroupLayoutDescriptor extends GPUObjectDescriptorBase {
 interface GPUBindGroupLayoutEntry {
   binding: GPUIndex32;
   buffer?: GPUBufferBindingLayout;
+  externalTexture?: GPUExternalTextureBindingLayout;
   sampler?: GPUSamplerBindingLayout;
   storageTexture?: GPUStorageTextureBindingLayout;
   texture?: GPUTextureBindingLayout;
@@ -1100,6 +1147,13 @@ interface GPUExtent3DDict {
   width: GPUIntegerCoordinate;
 }
 
+interface GPUExternalTextureBindingLayout {}
+
+interface GPUExternalTextureDescriptor extends GPUObjectDescriptorBase {
+  colorSpace?: PredefinedColorSpace;
+  source: HTMLVideoElement | VideoFrame;
+}
+
 interface GPUFragmentState extends GPUProgrammableStage {
   targets: GPUColorTargetState[];
 }
@@ -1129,6 +1183,10 @@ interface GPUPipelineDescriptorBase extends GPUObjectDescriptorBase {
   layout: GPUPipelineLayout | GPUAutoLayoutMode;
 }
 
+interface GPUPipelineErrorInit {
+  reason: GPUPipelineErrorReason;
+}
+
 interface GPUPipelineLayoutDescriptor extends GPUObjectDescriptorBase {
   bindGroupLayouts: GPUBindGroupLayout[];
 }
@@ -1163,10 +1221,11 @@ interface GPURenderBundleEncoderDescriptor extends GPURenderPassLayout {
 
 interface GPURenderPassColorAttachment {
   clearValue?: GPUColor;
+  depthSlice?: GPUIntegerCoordinate;
   loadOp: GPULoadOp;
-  resolveTarget?: GPUTextureView;
+  resolveTarget?: GPUTexture | GPUTextureView;
   storeOp: GPUStoreOp;
-  view: GPUTextureView;
+  view: GPUTexture | GPUTextureView;
 }
 
 interface GPURenderPassDepthStencilAttachment {
@@ -1178,7 +1237,7 @@ interface GPURenderPassDepthStencilAttachment {
   stencilLoadOp?: GPULoadOp;
   stencilReadOnly?: boolean;
   stencilStoreOp?: GPUStoreOp;
-  view: GPUTextureView;
+  view: GPUTexture | GPUTextureView;
 }
 
 interface GPURenderPassDescriptor extends GPUObjectDescriptorBase {
@@ -1209,8 +1268,10 @@ interface GPURenderPipelineDescriptor extends GPUPipelineDescriptorBase {
 }
 
 interface GPURequestAdapterOptions {
+  featureLevel?: string;
   forceFallbackAdapter?: boolean;
   powerPreference?: GPUPowerPreference;
+  xrCompatible?: boolean;
 }
 
 interface GPUSamplerBindingLayout {
@@ -1352,6 +1413,10 @@ interface GetChildrenOptions {
   ignoreAbsent?: boolean;
 }
 
+interface GetComposedRangesOptions {
+  shadowRoots?: ShadowRoot[];
+}
+
 interface GetHTMLOptions {
   serializableShadowRoots?: boolean;
   shadowRoots?: ShadowRoot[];
@@ -1442,34 +1507,24 @@ interface IdentityCredentialDisconnectOptions extends IdentityProviderConfig {
   accountHint: string;
 }
 
-interface IdentityCredentialInit {
-  effectiveOrigins?: string[];
-  effectiveQueryURL?: string;
-  effectiveType?: string;
-  id: string;
-  token?: string;
-  uiHint?: IdentityCredentialUserData;
-}
-
 interface IdentityCredentialRequestOptions {
-  providers?: IdentityProviderConfig[];
-}
-
-interface IdentityCredentialUserData {
-  expiresAfter?: number;
-  iconURL: string;
-  name: string;
+  mode?: IdentityCredentialRequestOptionsMode;
+  providers: IdentityProviderRequestOptions[];
 }
 
 interface IdentityProviderConfig {
-  clientId?: string;
-  configURL?: string;
-  effectiveQueryURL?: string;
-  effectiveType?: string;
-  loginTarget?: IdentityLoginTargetType;
-  loginURL?: string;
+  clientId: string;
+  configURL: string;
+}
+
+interface IdentityProviderRequestOptions extends IdentityProviderConfig {
+  domainHint?: string;
+  loginHint?: string;
   nonce?: string;
-  origin?: string;
+}
+
+interface IdentityResolveOptions {
+  accountId?: string;
 }
 
 interface IdleRequestOptions {
@@ -1523,6 +1578,33 @@ interface ImportESModuleOptionsDictionary {
   global?: ImportESModuleTargetGlobal;
 }
 
+interface InferenceSessionRunOptions {
+  logSeverityLevel?: number;
+  logVerbosityLevel?: number;
+  tag?: string;
+  terminate?: boolean;
+}
+
+interface InferenceSessionSessionOptions {
+  enableCpuMemArena?: boolean;
+  enableGraphCapture?: boolean;
+  enableMemPattern?: boolean;
+  enableProfiling?: boolean;
+  executionMode?: string;
+  executionProviders?: any[];
+  extra?: Record<string, any>;
+  freeDimensionOverrides?: Record<string, number>;
+  graphOptimizationLevel?: string;
+  interOpNumThreads?: number;
+  intraOpNumThreads?: number;
+  logId?: string;
+  logSeverityLevel?: number;
+  logVerbosityLevel?: number;
+  optimizedModelFilePath?: string;
+  preferredOutputLocation?: TensorDataLocation | Record<string, TensorDataLocation>;
+  profileFilePrefix?: string;
+}
+
 interface InputEventInit extends UIEventInit {
   data?: string | null;
   dataTransfer?: DataTransfer | null;
@@ -1553,6 +1635,11 @@ interface InspectorColorToResult {
   components: number[] | Float32Array;
 }
 
+interface InspectorDeclaration {
+  declarationOrigin: DeclarationOrigin;
+  style: CSSStyleDeclaration;
+}
+
 interface InspectorFontFeature {
   languageSystem: string;
   script: string;
@@ -1604,14 +1691,10 @@ interface InteractionData {
 interface IntersectionObserverInit {
   root?: Element | Document | null;
   rootMargin?: string;
+  scrollMargin?: string;
   threshold?: number | number[];
 }
 
-interface InvokeEventInit extends EventInit {
-  action?: string;
-  invoker?: Element | null;
-}
-
 interface KeySystemTrackConfiguration {
   encryptionScheme?: string | null;
   robustness?: string;
@@ -1690,10 +1773,10 @@ interface LibcConstants {
 interface LoadURIOptions {
   baseURI?: URI | null;
   cancelContentJSEpoch?: number;
-  csp?: ContentSecurityPolicy | null;
   hasValidUserGestureActivation?: boolean;
   headers?: InputStream | null;
   loadFlags?: number;
+  policyContainer?: PolicyContainer | null;
   postData?: InputStream | null;
   referrerInfo?: ReferrerInfo | null;
   remoteTypeOverride?: string | null;
@@ -2053,6 +2136,7 @@ interface MediaTrackCapabilities {
   groupId?: string;
   height?: ULongRange;
   noiseSuppression?: boolean[];
+  resizeMode?: string[];
   width?: ULongRange;
 }
 
@@ -2068,6 +2152,7 @@ interface MediaTrackConstraintSet {
   height?: ConstrainLong;
   mediaSource?: string;
   noiseSuppression?: ConstrainBoolean;
+  resizeMode?: ConstrainDOMString;
   scrollWithPage?: boolean;
   viewportHeight?: ConstrainLong;
   viewportOffsetX?: ConstrainLong;
@@ -2092,6 +2177,7 @@ interface MediaTrackSettings {
   height?: number;
   mediaSource?: string;
   noiseSuppression?: boolean;
+  resizeMode?: string;
   scrollWithPage?: boolean;
   viewportHeight?: number;
   viewportOffsetX?: number;
@@ -2114,6 +2200,7 @@ interface MediaTrackSupportedConstraints {
   latency?: boolean;
   mediaSource?: boolean;
   noiseSuppression?: boolean;
+  resizeMode?: boolean;
   sampleRate?: boolean;
   sampleSize?: boolean;
   scrollWithPage?: boolean;
@@ -2716,6 +2803,7 @@ interface PointerEventInit extends MouseEventInit {
   coalescedEvents?: PointerEvent[];
   height?: number;
   isPrimary?: boolean;
+  persistentDeviceId?: number;
   pointerId?: number;
   pointerType?: string;
   predictedEvents?: PointerEvent[];
@@ -2947,6 +3035,8 @@ interface QueuingStrategyInit {
   highWaterMark: number;
 }
 
+interface RTCAnswerOptions extends RTCOfferAnswerOptions {}
+
 interface RTCBandwidthEstimationInternal {
   maxPaddingBps?: number;
   pacerDelayMs?: number;
@@ -2995,7 +3085,6 @@ interface RTCDataChannelEventInit extends EventInit {
 interface RTCDataChannelInit {
   id?: number;
   maxPacketLifeTime?: number;
-  maxRetransmitTime?: number;
   maxRetransmits?: number;
   negotiated?: boolean;
   ordered?: boolean;
@@ -3049,6 +3138,7 @@ interface RTCIceCandidatePairStats extends RTCStats {
   bytesReceived?: number;
   bytesSent?: number;
   componentId?: number;
+  currentRoundTripTime?: number;
   lastPacketReceivedTimestamp?: DOMHighResTimeStamp;
   lastPacketSentTimestamp?: DOMHighResTimeStamp;
   localCandidateId?: string;
@@ -3056,8 +3146,10 @@ interface RTCIceCandidatePairStats extends RTCStats {
   priority?: number;
   readable?: boolean;
   remoteCandidateId?: string;
+  responsesReceived?: number;
   selected?: boolean;
   state?: RTCStatsIceCandidatePairState;
+  totalRoundTripTime?: number;
   transportId?: string;
   writable?: boolean;
 }
@@ -3123,30 +3215,40 @@ interface RTCInboundRtpStreamStats extends RTCReceivedRtpStreamStats {
   bytesReceived?: number;
   concealedSamples?: number;
   concealmentEvents?: number;
+  estimatedPlayoutTimestamp?: DOMHighResTimeStamp;
   fecPacketsDiscarded?: number;
   fecPacketsReceived?: number;
   firCount?: number;
   frameHeight?: number;
   frameWidth?: number;
+  framesAssembledFromMultiplePackets?: number;
   framesDecoded?: number;
   framesDropped?: number;
   framesPerSecond?: number;
   framesReceived?: number;
+  freezeCount?: number;
   headerBytesReceived?: number;
   insertedSamplesForDeceleration?: number;
   jitterBufferDelay?: number;
   jitterBufferEmittedCount?: number;
+  jitterBufferMinimumDelay?: number;
+  jitterBufferTargetDelay?: number;
+  keyFramesDecoded?: number;
   lastPacketReceivedTimestamp?: DOMHighResTimeStamp;
   mid?: string;
   nackCount?: number;
+  pauseCount?: number;
   pliCount?: number;
   qpSum?: number;
   remoteId?: string;
   removedSamplesForAcceleration?: number;
   silentConcealedSamples?: number;
+  totalAssemblyTime?: number;
   totalAudioEnergy?: number;
   totalDecodeTime?: number;
+  totalFreezesDuration?: number;
   totalInterFrameDelay?: number;
+  totalPausesDuration?: number;
   totalProcessingDelay?: number;
   totalSamplesDuration?: number;
   totalSamplesReceived?: number;
@@ -3258,6 +3360,7 @@ interface RTCRtpContributingSource {
 
 interface RTCRtpEncodingParameters {
   active?: boolean;
+  codec?: RTCRtpCodec;
   maxBitrate?: number;
   maxFramerate?: number;
   priority?: RTCPriorityType;
@@ -3513,6 +3616,11 @@ interface SVGPathDataSettings {
   normalize?: boolean;
 }
 
+interface SVGPathSegmentInit {
+  type: string;
+  values: number[] | Float32Array;
+}
+
 interface SanitizerAttributeNamespace {
   name: string;
   namespace?: string | null;
@@ -3558,10 +3666,6 @@ interface ScrollToOptions extends ScrollOptions {
   top?: number;
 }
 
-interface ScrollViewChangeEventInit extends EventInit {
-  state?: ScrollState;
-}
-
 interface SecurityPolicyViolationEventInit extends EventInit {
   blockedURI?: string;
   columnNumber?: number;
@@ -3590,6 +3694,10 @@ interface SetHTMLOptions {
   sanitizer?: Sanitizer | SanitizerConfig | SanitizerPresets;
 }
 
+interface SetHTMLUnsafeOptions {
+  sanitizer?: Sanitizer | SanitizerConfig | SanitizerPresets;
+}
+
 interface ShadowRootInit {
   clonable?: boolean;
   delegatesFocus?: boolean;
@@ -3605,6 +3713,10 @@ interface ShareData {
   url?: string;
 }
 
+interface ShowPopoverOptions {
+  source?: HTMLElement;
+}
+
 interface SizeToContentConstraints {
   maxHeight?: number;
   maxWidth?: number;
@@ -3730,6 +3842,10 @@ interface TaskPriorityChangeEventInit extends EventInit {
   previousPriority: TaskPriority;
 }
 
+interface TaskSignalAnyInit {
+  priority?: TaskPriority | TaskSignal;
+}
+
 interface TestInterfaceAsyncIterableSingleOptions {
   failToInit?: boolean;
 }
@@ -3786,6 +3902,10 @@ interface ToggleEventInit extends EventInit {
   oldState?: string;
 }
 
+interface TogglePopoverOptions extends ShowPopoverOptions {
+  force?: boolean;
+}
+
 interface TouchEventInit extends EventModifierInit {
   changedTouches?: Touch[];
   targetTouches?: Touch[];
@@ -3865,6 +3985,39 @@ interface ULongRange {
   min?: number;
 }
 
+interface URLPatternComponentResult {
+  groups?: Record<string, string | undefined>;
+  input?: string;
+}
+
+interface URLPatternInit {
+  baseURL?: string;
+  hash?: string;
+  hostname?: string;
+  password?: string;
+  pathname?: string;
+  port?: string;
+  protocol?: string;
+  search?: string;
+  username?: string;
+}
+
+interface URLPatternOptions {
+  ignoreCase?: boolean;
+}
+
+interface URLPatternResult {
+  hash?: URLPatternComponentResult;
+  hostname?: URLPatternComponentResult;
+  inputs?: URLPatternInput[];
+  password?: URLPatternComponentResult;
+  pathname?: URLPatternComponentResult;
+  port?: URLPatternComponentResult;
+  protocol?: URLPatternComponentResult;
+  search?: URLPatternComponentResult;
+  username?: URLPatternComponentResult;
+}
+
 interface UniFFIScaffoldingCallResult {
   code: UniFFIScaffoldingCallCode;
   data?: UniFFIScaffoldingValue;
@@ -3927,7 +4080,7 @@ interface VideoDecoderConfig {
   codedHeight?: number;
   codedWidth?: number;
   colorSpace?: VideoColorSpaceInit;
-  description?: ArrayBufferView | ArrayBuffer;
+  description?: AllowSharedBufferSource;
   displayAspectHeight?: number;
   displayAspectWidth?: number;
   hardwareAcceleration?: HardwareAcceleration;
@@ -4343,13 +4496,13 @@ type UniFFICallbackHandler =
       objectHandle: UniFFICallbackObjectHandle,
       methodIndex: number,
       ...args: UniFFIScaffoldingValue[]
-    ) => UniFFIScaffoldingValue | null)
+    ) => Promise<UniFFIScaffoldingCallResult>)
   | {
-      call(
+      callAsync(
         objectHandle: UniFFICallbackObjectHandle,
         methodIndex: number,
         ...args: UniFFIScaffoldingValue[]
-      ): UniFFIScaffoldingValue | null;
+      ): Promise<UniFFIScaffoldingCallResult>;
     };
 
 type XPathNSResolver =
@@ -4673,6 +4826,7 @@ interface Animation extends EventTarget {
   oncancel: ((this: Animation, ev: Event) => any) | null;
   onfinish: ((this: Animation, ev: Event) => any) | null;
   onremove: ((this: Animation, ev: Event) => any) | null;
+  readonly overallProgress: number | null;
   readonly pending: boolean;
   readonly playState: AnimationPlayState;
   playbackRate: number;
@@ -4892,7 +5046,7 @@ interface AudioData {
   allocationSize(options: AudioDataCopyToOptions): number;
   clone(): AudioData;
   close(): void;
-  copyTo(destination: ArrayBufferView | ArrayBuffer, options: AudioDataCopyToOptions): void;
+  copyTo(destination: AllowSharedBufferSource, options: AudioDataCopyToOptions): void;
 }
 
 declare var AudioData: {
@@ -5535,6 +5689,7 @@ interface BrowsingContext extends LoadContextMixin {
   isAppTab: boolean;
   readonly isDiscarded: boolean;
   readonly isInBFCache: boolean;
+  languageOverride: string;
   mediumOverride: string;
   readonly name: string;
   readonly opener: BrowsingContext | null;
@@ -5555,6 +5710,7 @@ interface BrowsingContext extends LoadContextMixin {
   readonly window: WindowProxy | null;
   getAllBrowsingContextsInSubtree(): BrowsingContext[];
   resetNavigationRateLimit(): void;
+  setGeolocationServiceOverride(position?: nsIDOMGeoPosition): void;
   setRDMPaneMaxTouchPoints(maxTouchPoints: number): void;
   setRDMPaneOrientation(type: OrientationType, rotationAngle: number): void;
 }
@@ -5651,6 +5807,27 @@ declare var CSSAnimation: {
   isInstance: IsInstance<CSSAnimation>;
 };
 
+interface CSSColor extends CSSColorValue {
+  alpha: CSSNumberish;
+  channels: CSSNumericValue[];
+  colorSpace: CSSKeywordish;
+}
+
+declare var CSSColor: {
+  prototype: CSSColor;
+  new (colorSpace: CSSKeywordish, channels: CSSColorPercent[], alpha?: CSSNumberish): CSSColor;
+  isInstance: IsInstance<CSSColor>;
+};
+
+interface CSSColorValue extends CSSStyleValue {}
+
+declare var CSSColorValue: {
+  prototype: CSSColorValue;
+  new (): CSSColorValue;
+  isInstance: IsInstance<CSSColorValue>;
+  parse(cssText: string): CSSColorValue | CSSStyleValue;
+};
+
 interface CSSConditionRule extends CSSGroupingRule {
   readonly conditionText: string;
 }
@@ -5752,6 +5929,40 @@ declare var CSSGroupingRule: {
   isInstance: IsInstance<CSSGroupingRule>;
 };
 
+interface CSSHSL extends CSSColorValue {
+  alpha: CSSColorPercent;
+  h: CSSColorAngle;
+  l: CSSColorPercent;
+  s: CSSColorPercent;
+}
+
+declare var CSSHSL: {
+  prototype: CSSHSL;
+  new (h: CSSColorAngle, s: CSSColorPercent, l: CSSColorPercent, alpha?: CSSColorPercent): CSSHSL;
+  isInstance: IsInstance<CSSHSL>;
+};
+
+interface CSSHWB extends CSSColorValue {
+  alpha: CSSNumberish;
+  b: CSSNumberish;
+  h: CSSNumericValue;
+  w: CSSNumberish;
+}
+
+declare var CSSHWB: {
+  prototype: CSSHWB;
+  new (h: CSSNumericValue, w: CSSNumberish, b: CSSNumberish, alpha?: CSSNumberish): CSSHWB;
+  isInstance: IsInstance<CSSHWB>;
+};
+
+interface CSSImageValue extends CSSStyleValue {}
+
+declare var CSSImageValue: {
+  prototype: CSSImageValue;
+  new (): CSSImageValue;
+  isInstance: IsInstance<CSSImageValue>;
+};
+
 interface CSSImportRule extends CSSRule {
   readonly href: string;
   readonly layerName: string | null;
@@ -5793,6 +6004,42 @@ declare var CSSKeyframesRule: {
   isInstance: IsInstance<CSSKeyframesRule>;
 };
 
+interface CSSKeywordValue extends CSSStyleValue {
+  value: string;
+}
+
+declare var CSSKeywordValue: {
+  prototype: CSSKeywordValue;
+  new (value: string): CSSKeywordValue;
+  isInstance: IsInstance<CSSKeywordValue>;
+};
+
+interface CSSLCH extends CSSColorValue {
+  alpha: CSSColorPercent;
+  c: CSSColorPercent;
+  h: CSSColorAngle;
+  l: CSSColorPercent;
+}
+
+declare var CSSLCH: {
+  prototype: CSSLCH;
+  new (l: CSSColorPercent, c: CSSColorPercent, h: CSSColorAngle, alpha?: CSSColorPercent): CSSLCH;
+  isInstance: IsInstance<CSSLCH>;
+};
+
+interface CSSLab extends CSSColorValue {
+  a: CSSColorNumber;
+  alpha: CSSColorPercent;
+  b: CSSColorNumber;
+  l: CSSColorPercent;
+}
+
+declare var CSSLab: {
+  prototype: CSSLab;
+  new (l: CSSColorPercent, a: CSSColorNumber, b: CSSColorNumber, alpha?: CSSColorPercent): CSSLab;
+  isInstance: IsInstance<CSSLab>;
+};
+
 interface CSSLayerBlockRule extends CSSGroupingRule {
   readonly name: string;
 }
@@ -5824,6 +6071,98 @@ declare var CSSMarginRule: {
   isInstance: IsInstance<CSSMarginRule>;
 };
 
+interface CSSMathClamp extends CSSMathValue {
+  readonly lower: CSSNumericValue;
+  readonly upper: CSSNumericValue;
+  readonly value: CSSNumericValue;
+}
+
+declare var CSSMathClamp: {
+  prototype: CSSMathClamp;
+  new (lower: CSSNumberish, value: CSSNumberish, upper: CSSNumberish): CSSMathClamp;
+  isInstance: IsInstance<CSSMathClamp>;
+};
+
+interface CSSMathInvert extends CSSMathValue {
+  readonly value: CSSNumericValue;
+}
+
+declare var CSSMathInvert: {
+  prototype: CSSMathInvert;
+  new (arg: CSSNumberish): CSSMathInvert;
+  isInstance: IsInstance<CSSMathInvert>;
+};
+
+interface CSSMathMax extends CSSMathValue {
+  readonly values: CSSNumericArray;
+}
+
+declare var CSSMathMax: {
+  prototype: CSSMathMax;
+  new (...args: CSSNumberish[]): CSSMathMax;
+  isInstance: IsInstance<CSSMathMax>;
+};
+
+interface CSSMathMin extends CSSMathValue {
+  readonly values: CSSNumericArray;
+}
+
+declare var CSSMathMin: {
+  prototype: CSSMathMin;
+  new (...args: CSSNumberish[]): CSSMathMin;
+  isInstance: IsInstance<CSSMathMin>;
+};
+
+interface CSSMathNegate extends CSSMathValue {
+  readonly value: CSSNumericValue;
+}
+
+declare var CSSMathNegate: {
+  prototype: CSSMathNegate;
+  new (arg: CSSNumberish): CSSMathNegate;
+  isInstance: IsInstance<CSSMathNegate>;
+};
+
+interface CSSMathProduct extends CSSMathValue {
+  readonly values: CSSNumericArray;
+}
+
+declare var CSSMathProduct: {
+  prototype: CSSMathProduct;
+  new (...args: CSSNumberish[]): CSSMathProduct;
+  isInstance: IsInstance<CSSMathProduct>;
+};
+
+interface CSSMathSum extends CSSMathValue {
+  readonly values: CSSNumericArray;
+}
+
+declare var CSSMathSum: {
+  prototype: CSSMathSum;
+  new (...args: CSSNumberish[]): CSSMathSum;
+  isInstance: IsInstance<CSSMathSum>;
+};
+
+interface CSSMathValue extends CSSNumericValue {
+  readonly operator: CSSMathOperator;
+}
+
+declare var CSSMathValue: {
+  prototype: CSSMathValue;
+  new (): CSSMathValue;
+  isInstance: IsInstance<CSSMathValue>;
+};
+
+interface CSSMatrixComponent extends CSSTransformComponent {
+  matrix: DOMMatrix;
+}
+
+declare var CSSMatrixComponent: {
+  prototype: CSSMatrixComponent;
+  new (matrix: DOMMatrixReadOnly, options?: CSSMatrixComponentOptions): CSSMatrixComponent;
+  isInstance: IsInstance<CSSMatrixComponent>;
+};
+
 interface CSSMediaRule extends CSSConditionRule {
   readonly media: MediaList;
 }
@@ -5863,6 +6202,67 @@ declare var CSSNestedDeclarations: {
   isInstance: IsInstance<CSSNestedDeclarations>;
 };
 
+interface CSSNumericArray {
+  readonly length: number;
+  forEach(
+    callbackfn: (value: CSSNumericValue, key: number, parent: CSSNumericArray) => void,
+    thisArg?: any
+  ): void;
+  [index: number]: CSSNumericValue;
+}
+
+declare var CSSNumericArray: {
+  prototype: CSSNumericArray;
+  new (): CSSNumericArray;
+  isInstance: IsInstance<CSSNumericArray>;
+};
+
+interface CSSNumericValue extends CSSStyleValue {
+  add(...values: CSSNumberish[]): CSSNumericValue;
+  div(...values: CSSNumberish[]): CSSNumericValue;
+  equals(...value: CSSNumberish[]): boolean;
+  max(...values: CSSNumberish[]): CSSNumericValue;
+  min(...values: CSSNumberish[]): CSSNumericValue;
+  mul(...values: CSSNumberish[]): CSSNumericValue;
+  sub(...values: CSSNumberish[]): CSSNumericValue;
+  to(unit: string): CSSUnitValue;
+  toSum(...units: string[]): CSSMathSum;
+  type(): CSSNumericType;
+}
+
+declare var CSSNumericValue: {
+  prototype: CSSNumericValue;
+  new (): CSSNumericValue;
+  isInstance: IsInstance<CSSNumericValue>;
+  parse(cssText: string): CSSNumericValue;
+};
+
+interface CSSOKLCH extends CSSColorValue {
+  alpha: CSSColorPercent;
+  c: CSSColorPercent;
+  h: CSSColorAngle;
+  l: CSSColorPercent;
+}
+
+declare var CSSOKLCH: {
+  prototype: CSSOKLCH;
+  new (l: CSSColorPercent, c: CSSColorPercent, h: CSSColorAngle, alpha?: CSSColorPercent): CSSOKLCH;
+  isInstance: IsInstance<CSSOKLCH>;
+};
+
+interface CSSOKLab extends CSSColorValue {
+  a: CSSColorNumber;
+  alpha: CSSColorPercent;
+  b: CSSColorNumber;
+  l: CSSColorPercent;
+}
+
+declare var CSSOKLab: {
+  prototype: CSSOKLab;
+  new (l: CSSColorPercent, a: CSSColorNumber, b: CSSColorNumber, alpha?: CSSColorPercent): CSSOKLab;
+  isInstance: IsInstance<CSSOKLab>;
+};
+
 interface CSSPageDescriptors {}
 
 interface CSSPageRule extends CSSGroupingRule {
@@ -5876,6 +6276,16 @@ declare var CSSPageRule: {
   isInstance: IsInstance<CSSPageRule>;
 };
 
+interface CSSPerspective extends CSSTransformComponent {
+  length: CSSPerspectiveValue;
+}
+
+declare var CSSPerspective: {
+  prototype: CSSPerspective;
+  new (length: CSSPerspectiveValue): CSSPerspective;
+  isInstance: IsInstance<CSSPerspective>;
+};
+
 interface CSSPositionTryDescriptors {}
 
 interface CSSPositionTryRule extends CSSRule {
@@ -5913,6 +6323,33 @@ declare var CSSPseudoElement: {
   isInstance: IsInstance<CSSPseudoElement>;
 };
 
+interface CSSRGB extends CSSColorValue {
+  alpha: CSSColorPercent;
+  b: CSSColorRGBComp;
+  g: CSSColorRGBComp;
+  r: CSSColorRGBComp;
+}
+
+declare var CSSRGB: {
+  prototype: CSSRGB;
+  new (r: CSSColorRGBComp, g: CSSColorRGBComp, b: CSSColorRGBComp, alpha?: CSSColorPercent): CSSRGB;
+  isInstance: IsInstance<CSSRGB>;
+};
+
+interface CSSRotate extends CSSTransformComponent {
+  angle: CSSNumericValue;
+  x: CSSNumberish;
+  y: CSSNumberish;
+  z: CSSNumberish;
+}
+
+declare var CSSRotate: {
+  prototype: CSSRotate;
+  new (angle: CSSNumericValue): CSSRotate;
+  new (x: CSSNumberish, y: CSSNumberish, z: CSSNumberish, angle: CSSNumericValue): CSSRotate;
+  isInstance: IsInstance<CSSRotate>;
+};
+
 interface CSSRule {
   cssText: string;
   readonly parentRule: CSSRule | null;
@@ -5964,6 +6401,18 @@ declare var CSSRuleList: {
   isInstance: IsInstance<CSSRuleList>;
 };
 
+interface CSSScale extends CSSTransformComponent {
+  x: CSSNumberish;
+  y: CSSNumberish;
+  z: CSSNumberish;
+}
+
+declare var CSSScale: {
+  prototype: CSSScale;
+  new (x: CSSNumberish, y: CSSNumberish, z?: CSSNumberish): CSSScale;
+  isInstance: IsInstance<CSSScale>;
+};
+
 interface CSSScopeRule extends CSSGroupingRule {
   readonly end: string | null;
   readonly start: string | null;
@@ -5975,6 +6424,37 @@ declare var CSSScopeRule: {
   isInstance: IsInstance<CSSScopeRule>;
 };
 
+interface CSSSkew extends CSSTransformComponent {
+  ax: CSSNumericValue;
+  ay: CSSNumericValue;
+}
+
+declare var CSSSkew: {
+  prototype: CSSSkew;
+  new (ax: CSSNumericValue, ay: CSSNumericValue): CSSSkew;
+  isInstance: IsInstance<CSSSkew>;
+};
+
+interface CSSSkewX extends CSSTransformComponent {
+  ax: CSSNumericValue;
+}
+
+declare var CSSSkewX: {
+  prototype: CSSSkewX;
+  new (ax: CSSNumericValue): CSSSkewX;
+  isInstance: IsInstance<CSSSkewX>;
+};
+
+interface CSSSkewY extends CSSTransformComponent {
+  ay: CSSNumericValue;
+}
+
+declare var CSSSkewY: {
+  prototype: CSSSkewY;
+  new (ay: CSSNumericValue): CSSSkewY;
+  isInstance: IsInstance<CSSSkewY>;
+};
+
 interface CSSStartingStyleRule extends CSSGroupingRule {}
 
 declare var CSSStartingStyleRule: {
@@ -6007,6 +6487,7 @@ interface CSSStyleRule extends CSSGroupingRule {
   readonly selectorCount: number;
   selectorText: string;
   readonly style: CSSStyleDeclaration;
+  readonly styleMap: StylePropertyMap;
   getSelectorWarnings(): SelectorWarning[];
   selectorMatchesElement(
     selectorIndex: number,
@@ -6043,6 +6524,18 @@ declare var CSSStyleSheet: {
   isInstance: IsInstance<CSSStyleSheet>;
 };
 
+interface CSSStyleValue {
+  toString(): string;
+}
+
+declare var CSSStyleValue: {
+  prototype: CSSStyleValue;
+  new (): CSSStyleValue;
+  isInstance: IsInstance<CSSStyleValue>;
+  parse(property: string, cssText: string): CSSStyleValue;
+  parseAll(property: string, cssText: string): CSSStyleValue[];
+};
+
 interface CSSSupportsRule extends CSSConditionRule {}
 
 declare var CSSSupportsRule: {
@@ -6051,6 +6544,35 @@ declare var CSSSupportsRule: {
   isInstance: IsInstance<CSSSupportsRule>;
 };
 
+interface CSSTransformComponent {
+  is2D: boolean;
+  toMatrix(): DOMMatrix;
+  toString(): string;
+}
+
+declare var CSSTransformComponent: {
+  prototype: CSSTransformComponent;
+  new (): CSSTransformComponent;
+  isInstance: IsInstance<CSSTransformComponent>;
+};
+
+interface CSSTransformValue extends CSSStyleValue {
+  readonly is2D: boolean;
+  readonly length: number;
+  toMatrix(): DOMMatrix;
+  forEach(
+    callbackfn: (value: CSSTransformComponent, key: number, parent: CSSTransformValue) => void,
+    thisArg?: any
+  ): void;
+  [index: number]: CSSTransformComponent;
+}
+
+declare var CSSTransformValue: {
+  prototype: CSSTransformValue;
+  new (transforms: CSSTransformComponent[]): CSSTransformValue;
+  isInstance: IsInstance<CSSTransformValue>;
+};
+
 interface CSSTransition extends Animation {
   readonly transitionProperty: string;
   addEventListener<K extends keyof AnimationEventMap>(
@@ -6081,6 +6603,55 @@ declare var CSSTransition: {
   isInstance: IsInstance<CSSTransition>;
 };
 
+interface CSSTranslate extends CSSTransformComponent {
+  x: CSSNumericValue;
+  y: CSSNumericValue;
+  z: CSSNumericValue;
+}
+
+declare var CSSTranslate: {
+  prototype: CSSTranslate;
+  new (x: CSSNumericValue, y: CSSNumericValue, z?: CSSNumericValue): CSSTranslate;
+  isInstance: IsInstance<CSSTranslate>;
+};
+
+interface CSSUnitValue extends CSSNumericValue {
+  readonly unit: string;
+  value: number;
+}
+
+declare var CSSUnitValue: {
+  prototype: CSSUnitValue;
+  new (value: number, unit: string): CSSUnitValue;
+  isInstance: IsInstance<CSSUnitValue>;
+};
+
+interface CSSUnparsedValue extends CSSStyleValue {
+  readonly length: number;
+  forEach(
+    callbackfn: (value: CSSUnparsedSegment, key: number, parent: CSSUnparsedValue) => void,
+    thisArg?: any
+  ): void;
+  [index: number]: CSSUnparsedSegment;
+}
+
+declare var CSSUnparsedValue: {
+  prototype: CSSUnparsedValue;
+  new (members: CSSUnparsedSegment[]): CSSUnparsedValue;
+  isInstance: IsInstance<CSSUnparsedValue>;
+};
+
+interface CSSVariableReferenceValue {
+  readonly fallback: CSSUnparsedValue | null;
+  variable: string;
+}
+
+declare var CSSVariableReferenceValue: {
+  prototype: CSSVariableReferenceValue;
+  new (variable: string, fallback?: CSSUnparsedValue | null): CSSVariableReferenceValue;
+  isInstance: IsInstance<CSSVariableReferenceValue>;
+};
+
 interface Cache {
   add(request: RequestInfo | URL): Promise<void>;
   addAll(requests: RequestInfo[]): Promise<void>;
@@ -6804,12 +7375,13 @@ declare var CloseWatcher: {
 };
 
 interface CommandEvent extends Event {
-  readonly command: string | null;
+  readonly command: string;
+  readonly source: Element | null;
 }
 
 declare var CommandEvent: {
   prototype: CommandEvent;
-  new (): CommandEvent;
+  new (type: string, eventInitDict?: CommandEventInit): CommandEvent;
   isInstance: IsInstance<CommandEvent>;
 };
 
@@ -6823,15 +7395,13 @@ declare var Comment: {
 
 interface CompositionEvent extends UIEvent {
   readonly data: string | null;
-  readonly locale: string;
   readonly ranges: TextClause[];
   initCompositionEvent(
     typeArg: string,
     canBubbleArg?: boolean,
     cancelableArg?: boolean,
     viewArg?: Window | null,
-    dataArg?: string | null,
-    localeArg?: string
+    dataArg?: string | null
   ): void;
 }
 
@@ -7551,13 +8121,13 @@ interface DataTransfer {
   effectAllowed: string;
   readonly files: FileList | null;
   readonly items: DataTransferItemList;
-  readonly mozCSP: ContentSecurityPolicy | null;
   mozCursor: string;
   readonly mozItemCount: number;
   mozShowFailAnimation: boolean;
   readonly mozSourceNode: Node | null;
   readonly mozTriggeringPrincipalURISpec: string;
   readonly mozUserCancelled: boolean;
+  readonly policyContainer: PolicyContainer | null;
   readonly sourceTopWindowContext: WindowContext | null;
   readonly types: string[];
   addElement(element: Element): void;
@@ -7787,7 +8357,6 @@ interface Document
   readonly contentType: string;
   cookie: string;
   readonly cookieJarSettings: nsICookieJarSettings;
-  readonly csp: ContentSecurityPolicy | null;
   readonly cspJSON: string;
   readonly currentScript: Element | null;
   readonly defaultView: WindowProxy | null;
@@ -7817,6 +8386,7 @@ interface Document
   readonly hidden: boolean;
   readonly images: HTMLCollection;
   readonly implementation: DOMImplementation;
+  readonly inAndroidPipMode: boolean;
   readonly inputEncoding: string;
   readonly isInitialDocument: boolean;
   readonly isSrcdocDocument: boolean;
@@ -7841,8 +8411,10 @@ interface Document
   onreadystatechange: ((this: Document, ev: Event) => any) | null;
   onvisibilitychange: ((this: Document, ev: Event) => any) | null;
   readonly partitionedPrincipal: Principal;
+  pausedByDevTools: boolean;
   readonly permDelegateHandler: nsIPermissionDelegateHandler;
   readonly plugins: HTMLCollection;
+  readonly policyContainer: PolicyContainer | null;
   readonly preferredStyleSheetSet: string | null;
   readonly readyState: string;
   readonly referrer: string;
@@ -7857,7 +8429,6 @@ interface Document
   readonly styleSheetSets: DOMStringList;
   readonly timeline: DocumentTimeline;
   title: string;
-  readonly userHasInteracted: boolean;
   readonly visibilityState: VisibilityState;
   vlinkColor: string;
   addCertException(isTemporary: boolean): Promise<any>;
@@ -7929,7 +8500,6 @@ interface Document
   createEvent(eventInterface: 'IDBVersionChangeEvent'): IDBVersionChangeEvent;
   createEvent(eventInterface: 'ImageCaptureErrorEvent'): ImageCaptureErrorEvent;
   createEvent(eventInterface: 'InputEvent'): InputEvent;
-  createEvent(eventInterface: 'InvokeEvent'): InvokeEvent;
   createEvent(eventInterface: 'KeyboardEvent'): KeyboardEvent;
   createEvent(eventInterface: 'MIDIConnectionEvent'): MIDIConnectionEvent;
   createEvent(eventInterface: 'MIDIMessageEvent'): MIDIMessageEvent;
@@ -7970,7 +8540,6 @@ interface Document
   createEvent(eventInterface: 'RTCPeerConnectionIceEvent'): RTCPeerConnectionIceEvent;
   createEvent(eventInterface: 'RTCTrackEvent'): RTCTrackEvent;
   createEvent(eventInterface: 'ScrollAreaEvent'): ScrollAreaEvent;
-  createEvent(eventInterface: 'ScrollViewChangeEvent'): ScrollViewChangeEvent;
   createEvent(eventInterface: 'SecurityPolicyViolationEvent'): SecurityPolicyViolationEvent;
   createEvent(eventInterface: 'SimpleGestureEvent'): SimpleGestureEvent;
   createEvent(eventInterface: 'SpeechRecognitionEvent'): SpeechRecognitionEvent;
@@ -8059,7 +8628,7 @@ interface Document
   hasFocus(): boolean;
   hasStorageAccess(): Promise<boolean>;
   importNode(node: Node, deep?: boolean): Node;
-  insertAnonymousContent(aForce?: boolean): AnonymousContent;
+  insertAnonymousContent(): AnonymousContent;
   isActive(): boolean;
   mozCancelFullScreen(): Promise<void>;
   mozSetImageElement(aImageElementId: string, aImageElement: Element | null): void;
@@ -8122,7 +8691,8 @@ declare var Document: {
   readonly KEYPRESS_EVENT_MODEL_SPLIT: 1;
   readonly KEYPRESS_EVENT_MODEL_CONFLATED: 2;
   isInstance: IsInstance<Document>;
-  parseHTMLUnsafe(html: TrustedHTML | string): Document;
+  parseHTML(html: string, options?: SetHTMLOptions): Document;
+  parseHTMLUnsafe(html: TrustedHTML | string, options?: SetHTMLUnsafeOptions): Document;
 };
 
 interface DocumentFragment extends Node, NonElementParentNode, ParentNode {}
@@ -8363,6 +8933,7 @@ interface Element
   attachShadow(shadowRootInitDict: ShadowRootInit): ShadowRoot;
   checkVisibility(options?: CheckVisibilityOptions): boolean;
   closest(selector: string): Element | null;
+  computedStyleMap(): StylePropertyMapReadOnly;
   getAsFlexContainer(): Flex | null;
   getAttribute(name: string): string | null;
   getAttributeNS(namespace: string | null, localName: string): string | null;
@@ -8428,7 +8999,7 @@ interface Element
   setCapture(retargetToElement?: boolean): void;
   setCaptureAlways(retargetToElement?: boolean): void;
   setHTML(aInnerHTML: string, options?: SetHTMLOptions): void;
-  setHTMLUnsafe(html: TrustedHTML | string): void;
+  setHTMLUnsafe(html: TrustedHTML | string, options?: SetHTMLUnsafeOptions): void;
   setPointerCapture(pointerId: number): void;
   toggleAttribute(name: string, force?: boolean): boolean;
   webkitMatchesSelector(selector: string): boolean;
@@ -8461,6 +9032,7 @@ declare var Element: {
 };
 
 interface ElementCSSInlineStyle {
+  readonly attributeStyleMap: StylePropertyMap;
   readonly style: CSSStyleDeclaration;
 }
 
@@ -8488,12 +9060,20 @@ declare var ElementInternals: {
   isInstance: IsInstance<ElementInternals>;
 };
 
+interface ElementOffsetAttributes {
+  readonly offsetHeight: number;
+  readonly offsetLeft: number;
+  readonly offsetParent: Element | null;
+  readonly offsetTop: number;
+  readonly offsetWidth: number;
+}
+
 interface EncodedAudioChunk {
   readonly byteLength: number;
   readonly duration: number | null;
   readonly timestamp: number;
   readonly type: EncodedAudioChunkType;
-  copyTo(destination: ArrayBufferView | ArrayBuffer): void;
+  copyTo(destination: AllowSharedBufferSource): void;
 }
 
 declare var EncodedAudioChunk: {
@@ -8507,7 +9087,7 @@ interface EncodedVideoChunk {
   readonly duration: number | null;
   readonly timestamp: number;
   readonly type: EncodedVideoChunkType;
-  copyTo(destination: ArrayBufferView | ArrayBuffer): void;
+  copyTo(destination: AllowSharedBufferSource): void;
 }
 
 declare var EncodedVideoChunk: {
@@ -8779,6 +9359,7 @@ interface File extends Blob {
   readonly mozFullPath: string;
   readonly name: string;
   readonly webkitRelativePath: string;
+  setMozRelativePath(name: string): void;
 }
 
 declare var File: {
@@ -9212,7 +9793,7 @@ declare var FormDataEvent: {
 };
 
 interface FragmentDirective {
-  createTextDirective(range: Range): Promise<string>;
+  createTextDirectiveForRanges(ranges: Range[]): Promise<string>;
   getTextDirectiveRanges(): Range[];
   removeAllTextDirectives(): void;
 }
@@ -9288,7 +9869,6 @@ declare var GPU: {
 interface GPUAdapter {
   readonly features: GPUSupportedFeatures;
   readonly info: GPUAdapterInfo;
-  readonly isFallbackAdapter: boolean;
   readonly limits: GPUSupportedLimits;
   readonly missingFeatures: number;
   requestDevice(descriptor?: GPUDeviceDescriptor): Promise<GPUDevice>;
@@ -9378,6 +9958,7 @@ declare var GPUBuffer: {
 interface GPUCanvasContext {
   readonly canvas: HTMLCanvasElement | OffscreenCanvas;
   configure(configuration: GPUCanvasConfiguration): void;
+  getConfiguration(): GPUCanvasConfiguration | null;
   getCurrentTexture(): GPUTexture;
   unconfigure(): void;
 }
@@ -9402,12 +9983,13 @@ interface GPUCommandEncoder extends GPUDebugCommandsMixin, GPUObjectBase {
   beginComputePass(descriptor?: GPUComputePassDescriptor): GPUComputePassEncoder;
   beginRenderPass(descriptor: GPURenderPassDescriptor): GPURenderPassEncoder;
   clearBuffer(buffer: GPUBuffer, offset?: GPUSize64, size?: GPUSize64): void;
+  copyBufferToBuffer(source: GPUBuffer, destination: GPUBuffer, size?: GPUSize64): void;
   copyBufferToBuffer(
     source: GPUBuffer,
     sourceOffset: GPUSize64,
     destination: GPUBuffer,
     destinationOffset: GPUSize64,
-    size: GPUSize64
+    size?: GPUSize64
   ): void;
   copyBufferToTexture(
     source: GPUTexelCopyBufferInfo,
@@ -9509,6 +10091,7 @@ interface GPUDeviceEventMap {
 
 /** Available only in secure contexts. */
 interface GPUDevice extends EventTarget, GPUObjectBase {
+  readonly adapterInfo: GPUAdapterInfo;
   readonly features: GPUSupportedFeatures;
   readonly limits: GPUSupportedLimits;
   readonly lost: Promise<GPUDeviceLostInfo>;
@@ -9529,6 +10112,7 @@ interface GPUDevice extends EventTarget, GPUObjectBase {
   createShaderModule(descriptor: GPUShaderModuleDescriptor): GPUShaderModule;
   createTexture(descriptor: GPUTextureDescriptor): GPUTexture;
   destroy(): void;
+  importExternalTexture(descriptor: GPUExternalTextureDescriptor): GPUExternalTexture;
   popErrorScope(): Promise<GPUError | null>;
   pushErrorScope(filter: GPUErrorFilter): void;
   addEventListener<K extends keyof GPUDeviceEventMap>(
@@ -9562,7 +10146,7 @@ declare var GPUDevice: {
 /** Available only in secure contexts. */
 interface GPUDeviceLostInfo {
   readonly message: string;
-  readonly reason: any;
+  readonly reason: GPUDeviceLostReason;
 }
 
 declare var GPUDeviceLostInfo: {
@@ -9617,6 +10201,17 @@ interface GPUPipelineBase {
   getBindGroupLayout(index: number): GPUBindGroupLayout;
 }
 
+/** Available only in secure contexts. */
+interface GPUPipelineError extends DOMException {
+  readonly reason: GPUPipelineErrorReason;
+}
+
+declare var GPUPipelineError: {
+  prototype: GPUPipelineError;
+  new (message?: string, options: GPUPipelineErrorInit): GPUPipelineError;
+  isInstance: IsInstance<GPUPipelineError>;
+};
+
 /** Available only in secure contexts. */
 interface GPUPipelineLayout extends GPUObjectBase {}
 
@@ -9651,13 +10246,13 @@ interface GPUQueue extends GPUObjectBase {
   writeBuffer(
     buffer: GPUBuffer,
     bufferOffset: GPUSize64,
-    data: BufferSource,
+    data: AllowSharedBufferSource,
     dataOffset?: GPUSize64,
     size?: GPUSize64
   ): void;
   writeTexture(
     destination: GPUTexelCopyTextureInfo,
-    data: BufferSource,
+    data: AllowSharedBufferSource,
     dataLayout: GPUTexelCopyBufferLayout,
     size: GPUExtent3D
   ): void;
@@ -9903,7 +10498,6 @@ interface Gamepad {
   readonly axes: number[];
   readonly buttons: GamepadButton[];
   readonly connected: boolean;
-  readonly displayId: number;
   readonly hand: GamepadHand;
   readonly hapticActuators: GamepadHapticActuator[];
   readonly id: string;
@@ -10243,6 +10837,16 @@ declare var GleanDenominator: {
   isInstance: IsInstance<GleanDenominator>;
 };
 
+interface GleanDualLabeledCounter extends GleanMetric {
+  get(aKey: string, aCategory: string): GleanCounter;
+}
+
+declare var GleanDualLabeledCounter: {
+  prototype: GleanDualLabeledCounter;
+  new (): GleanDualLabeledCounter;
+  isInstance: IsInstance<GleanDualLabeledCounter>;
+};
+
 interface GleanEvent extends GleanMetric {
   record(aExtra?: Record<string, string | null> | null): void;
   testGetValue(aPingName?: string): GleanEventRecord[] | null;
@@ -10441,6 +11045,7 @@ interface GlobalEventHandlersEventMap {
   animationstart: Event;
   auxclick: Event;
   beforeinput: Event;
+  beforematch: Event;
   beforetoggle: Event;
   blur: Event;
   cancel: Event;
@@ -10449,6 +11054,7 @@ interface GlobalEventHandlersEventMap {
   change: Event;
   click: Event;
   close: Event;
+  command: Event;
   contentvisibilityautostatechange: Event;
   contextlost: Event;
   contextmenu: Event;
@@ -10501,6 +11107,7 @@ interface GlobalEventHandlersEventMap {
   pointermove: Event;
   pointerout: Event;
   pointerover: Event;
+  pointerrawupdate: Event;
   pointerup: Event;
   progress: Event;
   ratechange: Event;
@@ -10541,6 +11148,7 @@ interface GlobalEventHandlers {
   onanimationstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onauxclick: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onbeforeinput: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+  onbeforematch: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onbeforetoggle: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onblur: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   oncancel: ((this: GlobalEventHandlers, ev: Event) => any) | null;
@@ -10549,6 +11157,7 @@ interface GlobalEventHandlers {
   onchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onclick: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onclose: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+  oncommand: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   oncontentvisibilityautostatechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   oncontextlost: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   oncontextmenu: ((this: GlobalEventHandlers, ev: Event) => any) | null;
@@ -10601,6 +11210,8 @@ interface GlobalEventHandlers {
   onpointermove: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onpointerout: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onpointerover: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+  /** Available only in secure contexts. */
+  onpointerrawupdate: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onpointerup: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onprogress: ((this: GlobalEventHandlers, ev: Event) => any) | null;
   onratechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
@@ -10976,7 +11587,9 @@ declare var HTMLBodyElement: {
   isInstance: IsInstance<HTMLBodyElement>;
 };
 
-interface HTMLButtonElement extends HTMLElement, InvokerElement, PopoverInvokerElement {
+interface HTMLButtonElement extends HTMLElement, PopoverInvokerElement {
+  command: string;
+  commandForElement: Element | null;
   disabled: boolean;
   readonly form: HTMLFormElement | null;
   formAction: string;
@@ -11198,9 +11811,11 @@ declare var HTMLDetailsElement: {
 };
 
 interface HTMLDialogElement extends HTMLElement {
+  closedBy: string;
   open: boolean;
   returnValue: string;
   close(returnValue?: string): void;
+  requestClose(returnValue?: string): void;
   show(): void;
   showModal(): void;
   addEventListener<K extends keyof HTMLElementEventMap>(
@@ -11330,6 +11945,7 @@ interface HTMLElementEventMap
 interface HTMLElement
   extends Element,
     ElementCSSInlineStyle,
+    ElementOffsetAttributes,
     GlobalEventHandlers,
     HTMLOrForeignElement,
     OnErrorEventHandlerForNodes,
@@ -11342,20 +11958,15 @@ interface HTMLElement
   dir: string;
   draggable: boolean;
   enterKeyHint: string;
-  hidden: boolean;
+  hidden: boolean | number | string | null;
   inert: boolean;
   innerText: string;
   inputMode: string;
   readonly internals: ElementInternals | null;
   readonly isContentEditable: boolean;
-  readonly isFormAssociatedCustomElements: boolean;
+  readonly isFormAssociatedCustomElement: boolean;
   lang: string;
   nonce: string;
-  readonly offsetHeight: number;
-  readonly offsetLeft: number;
-  readonly offsetParent: Element | null;
-  readonly offsetTop: number;
-  readonly offsetWidth: number;
   outerText: string;
   popover: string | null;
   spellcheck: boolean;
@@ -11364,8 +11975,8 @@ interface HTMLElement
   attachInternals(): ElementInternals;
   click(): void;
   hidePopover(): void;
-  showPopover(): void;
-  togglePopover(force?: boolean): boolean;
+  showPopover(options?: ShowPopoverOptions): void;
+  togglePopover(options?: TogglePopoverOptions | boolean): boolean;
   addEventListener<K extends keyof HTMLElementEventMap>(
     type: K,
     listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any,
@@ -11884,7 +12495,6 @@ declare var HTMLImageElement: {
 
 interface HTMLInputElement
   extends HTMLElement,
-    InvokerElement,
     MozEditableElement,
     MozImageLoadingContent,
     PopoverInvokerElement {
@@ -14093,17 +14703,29 @@ declare var IIRFilterNode: {
 
 /** Available only in secure contexts. */
 interface IdentityCredential extends Credential {
-  readonly origin: string;
+  readonly configURL: string;
+  readonly isAutoSelected: boolean;
   readonly token: string | null;
 }
 
 declare var IdentityCredential: {
   prototype: IdentityCredential;
-  new (init: IdentityCredentialInit): IdentityCredential;
+  new (): IdentityCredential;
   isInstance: IsInstance<IdentityCredential>;
   disconnect(options?: IdentityCredentialDisconnectOptions): Promise<void>;
 };
 
+/** Available only in secure contexts. */
+interface IdentityProvider {}
+
+declare var IdentityProvider: {
+  prototype: IdentityProvider;
+  new (): IdentityProvider;
+  isInstance: IsInstance<IdentityProvider>;
+  close(): void;
+  resolve(token: string, options?: IdentityResolveOptions): Promise<void>;
+};
+
 interface IdleDeadline {
   readonly didTimeout: boolean;
   timeRemaining(): DOMHighResTimeStamp;
@@ -14292,6 +14914,28 @@ declare var ImageTrackList: {
   isInstance: IsInstance<ImageTrackList>;
 };
 
+interface InferenceSession {
+  readonly inputNames: string[];
+  readonly outputNames: string[];
+  endProfiling(): void;
+  release(): Promise<void>;
+  run(
+    feeds: InferenceSessionFeedsType,
+    options?: InferenceSessionRunOptions
+  ): Promise<InferenceSessionReturnType>;
+  startProfiling(): void;
+}
+
+declare var InferenceSession: {
+  prototype: InferenceSession;
+  new (): InferenceSession;
+  isInstance: IsInstance<InferenceSession>;
+  create(
+    uriOrBuffer: string | Uint8Array,
+    options?: InferenceSessionSessionOptions
+  ): Promise<InferenceSession>;
+};
+
 interface InputEvent extends UIEvent {
   readonly data: string | null;
   readonly dataTransfer: DataTransfer | null;
@@ -14410,6 +15054,7 @@ declare var InstallTriggerImpl: {
 interface IntersectionObserver {
   readonly root: Node | null;
   readonly rootMargin: string;
+  readonly scrollMargin: string;
   readonly thresholds: number[];
   disconnect(): void;
   observe(target: Element): void;
@@ -14447,22 +15092,6 @@ interface IntlUtils {
   isAppLocaleRTL(): boolean;
 }
 
-interface InvokeEvent extends Event {
-  readonly action: string;
-  readonly invoker: Element | null;
-}
-
-declare var InvokeEvent: {
-  prototype: InvokeEvent;
-  new (type: string, eventInitDict?: InvokeEventInit): InvokeEvent;
-  isInstance: IsInstance<InvokeEvent>;
-};
-
-interface InvokerElement {
-  invokeAction: string;
-  invokeTargetElement: Element | null;
-}
-
 interface JSActor {
   readonly name: string;
   sendAsyncMessage(messageName: string, obj?: any, transferables?: any): void;
@@ -15213,7 +15842,7 @@ declare var L10nRegistry: {
   getInstance(): L10nRegistry;
 };
 
-interface LargestContentfulPaint extends PerformanceEntry {
+interface LargestContentfulPaint extends PerformanceEntry, PaintTimingMixin {
   readonly element: Element | null;
   readonly id: string;
   readonly loadTime: DOMHighResTimeStamp;
@@ -15528,6 +16157,7 @@ interface MLS {
     clientId: MLSBytesOrUint8Array,
     credential: MLSBytesOrUint8Array
   ): Promise<MLSKeyPackage>;
+  getGroupEpochFromMessage(message: MLSBytesOrUint8Array): Promise<MLSGroupEpoch>;
   getGroupIdFromMessage(message: MLSBytesOrUint8Array): Promise<MLSGroupId>;
   groupCreate(
     clientId: MLSBytesOrUint8Array,
@@ -15552,6 +16182,8 @@ interface MLSGroupView {
   readonly groupId: Uint8Array;
   add(keyPackage: MLSBytesOrUint8Array): Promise<MLSCommitOutput>;
   applyPendingCommit(): Promise<MLSReceived>;
+  clearPendingCommit(): Promise<MLSReceived>;
+  clearPendingProposals(): Promise<MLSReceived>;
   close(): Promise<MLSCommitOutput>;
   deleteState(): Promise<void>;
   details(): Promise<MLSGroupDetails>;
@@ -15560,6 +16192,8 @@ interface MLSGroupView {
     context: MLSBytesOrUint8Array,
     length: number
   ): Promise<MLSExporterOutput>;
+  hasPendingCommit(): Promise<MLSReceived>;
+  hasPendingProposals(): Promise<MLSReceived>;
   proposeAdd(keyPackage: MLSBytesOrUint8Array): Promise<MLSProposal>;
   proposeRemove(remClientId: MLSBytesOrUint8Array): Promise<MLSProposal>;
   receive(message: MLSBytesOrUint8Array): Promise<MLSReceived>;
@@ -15866,7 +16500,7 @@ interface MediaKeySessionEventMap {
 }
 
 interface MediaKeySession extends EventTarget {
-  readonly closed: Promise<void>;
+  readonly closed: Promise<MediaKeySessionClosedReason>;
   readonly error: MediaKeyError | null;
   readonly expiration: number;
   readonly keyStatuses: MediaKeyStatusMap;
@@ -16498,6 +17132,7 @@ interface MouseEvent extends UIEvent {
   readonly screenX: number;
   readonly screenY: number;
   readonly shiftKey: boolean;
+  readonly triggerEvent: Event | null;
   readonly x: number;
   readonly y: number;
   clickEventPrevented(): boolean;
@@ -17705,6 +18340,11 @@ declare var PaintRequestList: {
   isInstance: IsInstance<PaintRequestList>;
 };
 
+interface PaintTimingMixin {
+  readonly paintTime: DOMHighResTimeStamp;
+  readonly presentationTime: DOMHighResTimeStamp | null;
+}
+
 interface PannerNode extends AudioNode, AudioNodePassThrough {
   coneInnerAngle: number;
   coneOuterAngle: number;
@@ -17742,6 +18382,7 @@ interface ParentNode {
     name: string,
     value: string | null
   ): HTMLCollection;
+  moveBefore(node: Node, child: Node | null): void;
   prepend(...nodes: (Node | string)[]): void;
   querySelector<K extends keyof HTMLElementTagNameMap>(
     selectors: K
@@ -18212,7 +18853,9 @@ declare var PerformanceObserverEntryList: {
   isInstance: IsInstance<PerformanceObserverEntryList>;
 };
 
-interface PerformancePaintTiming extends PerformanceEntry {}
+interface PerformancePaintTiming extends PerformanceEntry, PaintTimingMixin {
+  toJSON(): any;
+}
 
 declare var PerformancePaintTiming: {
   prototype: PerformancePaintTiming;
@@ -18658,6 +19301,7 @@ interface PointerEvent extends MouseEvent {
   readonly azimuthAngle: number;
   readonly height: number;
   readonly isPrimary: boolean;
+  readonly persistentDeviceId: number;
   readonly pointerId: number;
   readonly pointerType: string;
   readonly pressure: number;
@@ -18962,7 +19606,6 @@ interface RTCDataChannel extends EventTarget {
   readonly ordered: boolean;
   readonly protocol: string;
   readonly readyState: RTCDataChannelState;
-  readonly reliable: boolean;
   close(): void;
   send(data: string): void;
   send(data: Blob): void;
@@ -19179,6 +19822,7 @@ interface RTCPeerConnection extends EventTarget {
   readonly remoteDescription: RTCSessionDescription | null;
   readonly sctp: RTCSctpTransport | null;
   readonly signalingState: RTCSignalingState;
+  addIceCandidate(candidate?: RTCIceCandidateInit | RTCIceCandidate): Promise<void>;
   addIceCandidate(
     candidate: RTCIceCandidateInit,
     successCallback: VoidFunction,
@@ -19191,11 +19835,13 @@ interface RTCPeerConnection extends EventTarget {
     init?: RTCRtpTransceiverInit
   ): RTCRtpTransceiver;
   close(): void;
+  createAnswer(options?: RTCAnswerOptions): Promise<RTCSessionDescriptionInit>;
   createAnswer(
     successCallback: RTCSessionDescriptionCallback,
     failureCallback: RTCPeerConnectionErrorCallback
   ): Promise<void>;
   createDataChannel(label: string, dataChannelDict?: RTCDataChannelInit): RTCDataChannel;
+  createOffer(options?: RTCOfferOptions): Promise<RTCSessionDescriptionInit>;
   createOffer(
     successCallback: RTCSessionDescriptionCallback,
     failureCallback: RTCPeerConnectionErrorCallback,
@@ -19216,11 +19862,13 @@ interface RTCPeerConnection extends EventTarget {
   restartIce(): void;
   setConfiguration(configuration?: RTCConfiguration): void;
   setIdentityProvider(provider: string, options?: RTCIdentityProviderOptions): void;
+  setLocalDescription(description?: RTCLocalSessionDescriptionInit): Promise<void>;
   setLocalDescription(
     description: RTCLocalSessionDescriptionInit,
     successCallback: VoidFunction,
     failureCallback: RTCPeerConnectionErrorCallback
   ): Promise<void>;
+  setRemoteDescription(description: RTCSessionDescriptionInit): Promise<void>;
   setRemoteDescription(
     description: RTCSessionDescriptionInit,
     successCallback: VoidFunction,
@@ -20192,35 +20840,6 @@ declare var SVGDescElement: {
   isInstance: IsInstance<SVGDescElement>;
 };
 
-interface SVGDiscardElement extends SVGAnimationElement {
-  addEventListener<K extends keyof SVGAnimationElementEventMap>(
-    type: K,
-    listener: (this: SVGDiscardElement, ev: SVGAnimationElementEventMap[K]) => any,
-    options?: boolean | AddEventListenerOptions
-  ): void;
-  addEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject,
-    options?: boolean | AddEventListenerOptions
-  ): void;
-  removeEventListener<K extends keyof SVGAnimationElementEventMap>(
-    type: K,
-    listener: (this: SVGDiscardElement, ev: SVGAnimationElementEventMap[K]) => any,
-    options?: boolean | EventListenerOptions
-  ): void;
-  removeEventListener(
-    type: string,
-    listener: EventListenerOrEventListenerObject,
-    options?: boolean | EventListenerOptions
-  ): void;
-}
-
-declare var SVGDiscardElement: {
-  prototype: SVGDiscardElement;
-  new (): SVGDiscardElement;
-  isInstance: IsInstance<SVGDiscardElement>;
-};
-
 interface SVGElementEventMap
   extends ElementEventMap,
     GlobalEventHandlersEventMap,
@@ -20867,6 +21486,7 @@ interface SVGFEImageElement
     SVGFilterPrimitiveStandardAttributes,
     SVGURIReference {
   crossOrigin: string | null;
+  fetchPriority: string;
   readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
   addEventListener<K extends keyof SVGElementEventMap>(
     type: K,
@@ -21392,8 +22012,6 @@ declare var SVGGradientElement: {
 };
 
 interface SVGGraphicsElement extends SVGElement, SVGTests {
-  readonly farthestViewportElement: SVGElement | null;
-  readonly nearestViewportElement: SVGElement | null;
   readonly transform: SVGAnimatedTransformList;
   getBBox(aOptions?: SVGBoundingBoxOptions): SVGRect;
   getCTM(): SVGMatrix | null;
@@ -21429,6 +22047,7 @@ declare var SVGGraphicsElement: {
 interface SVGImageElement extends SVGGraphicsElement, MozImageLoadingContent, SVGURIReference {
   crossOrigin: string | null;
   decoding: string;
+  fetchPriority: string;
   readonly height: SVGAnimatedLength;
   readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
   readonly width: SVGAnimatedLength;
@@ -21794,7 +22413,7 @@ declare var SVGNumberList: {
 
 interface SVGPathData {
   getPathData(settings?: SVGPathDataSettings): SVGPathSegment[];
-  setPathData(pathData: SVGPathSegment[]): void;
+  setPathData(pathData: SVGPathSegmentInit[]): void;
 }
 
 interface SVGPathElement extends SVGGeometryElement, SVGPathData {
@@ -22140,6 +22759,7 @@ interface SVGScriptElement extends SVGElement, SVGURIReference {
   async: boolean;
   crossOrigin: string | null;
   defer: boolean;
+  fetchPriority: string;
   type: string;
   addEventListener<K extends keyof SVGElementEventMap>(
     type: K,
@@ -22718,6 +23338,7 @@ declare var Sanitizer: {
 
 interface Scheduler {
   postTask(callback: SchedulerPostTaskCallback, options?: SchedulerPostTaskOptions): Promise<any>;
+  yield(): Promise<void>;
 }
 
 declare var Scheduler: {
@@ -22888,16 +23509,6 @@ declare var ScrollAreaEvent: {
   isInstance: IsInstance<ScrollAreaEvent>;
 };
 
-interface ScrollViewChangeEvent extends Event {
-  readonly state: ScrollState;
-}
-
-declare var ScrollViewChangeEvent: {
-  prototype: ScrollViewChangeEvent;
-  new (type: string, eventInit?: ScrollViewChangeEventInit): ScrollViewChangeEvent;
-  isInstance: IsInstance<ScrollViewChangeEvent>;
-};
-
 interface SecurityPolicyViolationEvent extends Event {
   readonly blockedURI: string;
   readonly columnNumber: number;
@@ -22952,7 +23563,10 @@ interface Selection {
   deleteFromDocument(): void;
   empty(): void;
   extend(node: Node, offset?: number): void;
-  getComposedRanges(...shadowRoots: ShadowRoot[]): StaticRange[];
+  getComposedRanges(
+    options?: ShadowRoot | GetComposedRangesOptions,
+    ...shadowRoots: ShadowRoot[]
+  ): StaticRange[];
   getRangeAt(index: number): Range;
   modify(alter?: string, direction?: string, granularity?: string): void;
   removeAllRanges(): void;
@@ -23159,7 +23773,8 @@ interface ShadowRoot extends DocumentFragment, DocumentOrShadowRoot {
   getHTML(options?: GetHTMLOptions): string;
   importNodeAndAppendChildAt(parentNode: Node, node: Node, deep?: boolean): Node;
   isUAWidget(): boolean;
-  setHTMLUnsafe(html: TrustedHTML | string): void;
+  setHTML(aInnerHTML: string, options?: SetHTMLOptions): void;
+  setHTMLUnsafe(html: TrustedHTML | string, options?: SetHTMLUnsafeOptions): void;
   setIsUAWidget(): void;
   addEventListener<K extends keyof ShadowRootEventMap>(
     type: K,
@@ -23805,6 +24420,36 @@ declare var StructuredCloneTester: {
   isInstance: IsInstance<StructuredCloneTester>;
 };
 
+interface StylePropertyMap extends StylePropertyMapReadOnly {
+  append(property: string, ...values: (CSSStyleValue | string)[]): void;
+  clear(): void;
+  delete(property: string): void;
+  set(property: string, ...values: (CSSStyleValue | string)[]): void;
+}
+
+declare var StylePropertyMap: {
+  prototype: StylePropertyMap;
+  new (): StylePropertyMap;
+  isInstance: IsInstance<StylePropertyMap>;
+};
+
+interface StylePropertyMapReadOnly {
+  readonly size: number;
+  get(property: string): undefined | CSSStyleValue;
+  getAll(property: string): CSSStyleValue[];
+  has(property: string): boolean;
+  forEach(
+    callbackfn: (value: CSSStyleValue[], key: string, parent: StylePropertyMapReadOnly) => void,
+    thisArg?: any
+  ): void;
+}
+
+declare var StylePropertyMapReadOnly: {
+  prototype: StylePropertyMapReadOnly;
+  new (): StylePropertyMapReadOnly;
+  isInstance: IsInstance<StylePropertyMapReadOnly>;
+};
+
 interface StyleSheet {
   readonly associatedDocument: Document | null;
   readonly constructed: boolean;
@@ -24125,6 +24770,30 @@ declare var TaskSignal: {
   prototype: TaskSignal;
   new (): TaskSignal;
   isInstance: IsInstance<TaskSignal>;
+  any(signals: AbortSignal[], init?: TaskSignalAnyInit): TaskSignal;
+};
+
+interface Tensor {
+  readonly data: ArrayBufferView;
+  dims: number[];
+  readonly location: TensorDataLocation;
+  readonly type: string;
+  dispose(): void;
+  getData(releaseData?: boolean): Promise<any>;
+}
+
+declare var Tensor: {
+  prototype: Tensor;
+  new (type: string, data: ArrayBufferView | any[], dims: number[]): Tensor;
+  isInstance: IsInstance<Tensor>;
+};
+
+interface TestChromeOnlyInterface {}
+
+declare var TestChromeOnlyInterface: {
+  prototype: TestChromeOnlyInterface;
+  new (): TestChromeOnlyInterface;
+  isInstance: IsInstance<TestChromeOnlyInterface>;
 };
 
 interface TestFunctions {
@@ -24161,8 +24830,9 @@ interface TestFunctions {
   testNotAllowShared(buffer: string): void;
   testThrowNsresult(): void;
   testThrowNsresultFromNative(): void;
-  testUnionOfAllowSharedBuffferSource(foo: ArrayBuffer | ArrayBufferView): void;
-  testUnionOfBuffferSource(foo: ArrayBuffer | ArrayBufferView | string): void;
+  testUnionOfAllowSharedBufferSource(foo: AllowSharedBufferSource): void;
+  testUnionOfBufferSource(foo: ArrayBuffer | ArrayBufferView | string): void;
+  testUnionWithAllowShared(foo: Int8Array | Int16Array): void;
   toJSON(): any;
 }
 
@@ -24170,6 +24840,7 @@ declare var TestFunctions: {
   prototype: TestFunctions;
   new (): TestFunctions;
   isInstance: IsInstance<TestFunctions>;
+  createTestChromeOnlyInterface(): TestChromeOnlyInterface;
   passThroughCallbackPromise(callback: PromiseReturner): Promise<any>;
   passThroughPromise(arg: any): Promise<any>;
   throwToRejectPromise(): Promise<any>;
@@ -25220,6 +25891,27 @@ declare var URL: {
 type webkitURL = URL;
 declare var webkitURL: typeof URL;
 
+interface URLPattern {
+  readonly hasRegExpGroups: boolean;
+  readonly hash: string;
+  readonly hostname: string;
+  readonly password: string;
+  readonly pathname: string;
+  readonly port: string;
+  readonly protocol: string;
+  readonly search: string;
+  readonly username: string;
+  exec(input?: URLPatternInput, baseURL?: string): URLPatternResult | null;
+  test(input?: URLPatternInput, baseURL?: string): boolean;
+}
+
+declare var URLPattern: {
+  prototype: URLPattern;
+  new (input: URLPatternInput, baseURL: string, options?: URLPatternOptions): URLPattern;
+  new (input?: URLPatternInput, options?: URLPatternOptions): URLPattern;
+  isInstance: IsInstance<URLPattern>;
+};
+
 interface URLSearchParams {
   readonly size: number;
   append(name: string, value: string): void;
@@ -25697,7 +26389,7 @@ interface VideoFrame {
   clone(): VideoFrame;
   close(): void;
   copyTo(
-    destination: ArrayBufferView | ArrayBuffer,
+    destination: AllowSharedBufferSource,
     options?: VideoFrameCopyToOptions
   ): Promise<PlaneLayout[]>;
 }
@@ -26739,8 +27431,7 @@ interface WebGL2RenderingContextBase {
     srcOffset: GLuint,
     length?: GLuint
   ): void;
-  bufferSubData(target: GLenum, offset: GLintptr, srcData: ArrayBuffer): void;
-  bufferSubData(target: GLenum, offset: GLintptr, srcData: ArrayBufferView): void;
+  bufferSubData(target: GLenum, offset: GLintptr, srcData: AllowSharedBufferSource): void;
   bufferSubData(
     target: GLenum,
     dstByteOffset: GLintptr,
@@ -28069,8 +28760,7 @@ interface WebGLRenderingContext extends WebGLRenderingContextBase {
   bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
   bufferData(target: GLenum, data: ArrayBuffer | null, usage: GLenum): void;
   bufferData(target: GLenum, data: ArrayBufferView, usage: GLenum): void;
-  bufferSubData(target: GLenum, offset: GLintptr, data: ArrayBuffer): void;
-  bufferSubData(target: GLenum, offset: GLintptr, data: ArrayBufferView): void;
+  bufferSubData(target: GLenum, offset: GLintptr, data: AllowSharedBufferSource): void;
   compressedTexImage2D(
     target: GLenum,
     level: GLint,
@@ -29511,6 +30201,7 @@ declare var Window: {
 interface WindowContext {
   allowJavascript: boolean;
   readonly browsingContext: BrowsingContext | null;
+  readonly hasActiveCloseWatcher: boolean;
   readonly hasBeforeUnload: boolean;
   readonly innerWindowId: number;
   readonly isInBFCache: boolean;
@@ -29522,6 +30213,7 @@ interface WindowContext {
   readonly topWindowContext: WindowContext;
   readonly usingStorageAccess: boolean;
   readonly windowGlobalChild: WindowGlobalChild | null;
+  processCloseRequest(): void;
 }
 
 declare var WindowContext: {
@@ -30494,6 +31186,7 @@ interface XULElementEventMap
 interface XULElement
   extends Element,
     ElementCSSInlineStyle,
+    ElementOffsetAttributes,
     GlobalEventHandlers,
     HTMLOrForeignElement,
     OnErrorEventHandlerForNodes,
@@ -30746,6 +31439,8 @@ interface XULTreeElement extends XULElement {
   focused: boolean;
   readonly rowHeight: number;
   readonly rowWidth: number;
+  readonly scrollbarMaxPosition: number;
+  readonly scrollbarPosition: number;
   readonly treeBody: Element | null;
   view: MozTreeView | null;
   beginUpdateBatch(): void;
@@ -30806,10 +31501,73 @@ declare namespace AddonManagerPermissions {
 
 declare namespace CSS {
   var highlights: HighlightRegistry;
+  function Hz(value: number): CSSUnitValue;
+  function Q(value: number): CSSUnitValue;
+  function _in(value: number): CSSUnitValue;
+  function cap(value: number): CSSUnitValue;
+  function ch(value: number): CSSUnitValue;
+  function cm(value: number): CSSUnitValue;
+  function cqb(value: number): CSSUnitValue;
+  function cqh(value: number): CSSUnitValue;
+  function cqi(value: number): CSSUnitValue;
+  function cqmax(value: number): CSSUnitValue;
+  function cqmin(value: number): CSSUnitValue;
+  function cqw(value: number): CSSUnitValue;
+  function deg(value: number): CSSUnitValue;
+  function dpcm(value: number): CSSUnitValue;
+  function dpi(value: number): CSSUnitValue;
+  function dppx(value: number): CSSUnitValue;
+  function dvb(value: number): CSSUnitValue;
+  function dvh(value: number): CSSUnitValue;
+  function dvi(value: number): CSSUnitValue;
+  function dvmax(value: number): CSSUnitValue;
+  function dvmin(value: number): CSSUnitValue;
+  function dvw(value: number): CSSUnitValue;
+  function em(value: number): CSSUnitValue;
   function escape(ident: string): string;
+  function ex(value: number): CSSUnitValue;
+  function fr(value: number): CSSUnitValue;
+  function grad(value: number): CSSUnitValue;
+  function ic(value: number): CSSUnitValue;
+  function kHz(value: number): CSSUnitValue;
+  function lh(value: number): CSSUnitValue;
+  function lvb(value: number): CSSUnitValue;
+  function lvh(value: number): CSSUnitValue;
+  function lvi(value: number): CSSUnitValue;
+  function lvmax(value: number): CSSUnitValue;
+  function lvmin(value: number): CSSUnitValue;
+  function lvw(value: number): CSSUnitValue;
+  function mm(value: number): CSSUnitValue;
+  function ms(value: number): CSSUnitValue;
+  function number(value: number): CSSUnitValue;
+  function pc(value: number): CSSUnitValue;
+  function percent(value: number): CSSUnitValue;
+  function pt(value: number): CSSUnitValue;
+  function px(value: number): CSSUnitValue;
+  function rad(value: number): CSSUnitValue;
+  function rcap(value: number): CSSUnitValue;
+  function rch(value: number): CSSUnitValue;
   function registerProperty(definition: PropertyDefinition): void;
+  function rem(value: number): CSSUnitValue;
+  function rex(value: number): CSSUnitValue;
+  function ric(value: number): CSSUnitValue;
+  function rlh(value: number): CSSUnitValue;
+  function s(value: number): CSSUnitValue;
   function supports(property: string, value: string): boolean;
   function supports(conditionText: string): boolean;
+  function svb(value: number): CSSUnitValue;
+  function svh(value: number): CSSUnitValue;
+  function svi(value: number): CSSUnitValue;
+  function svmax(value: number): CSSUnitValue;
+  function svmin(value: number): CSSUnitValue;
+  function svw(value: number): CSSUnitValue;
+  function turn(value: number): CSSUnitValue;
+  function vb(value: number): CSSUnitValue;
+  function vh(value: number): CSSUnitValue;
+  function vi(value: number): CSSUnitValue;
+  function vmax(value: number): CSSUnitValue;
+  function vmin(value: number): CSSUnitValue;
+  function vw(value: number): CSSUnitValue;
 }
 
 declare namespace ChromeUtils {
@@ -30822,8 +31580,11 @@ declare namespace ChromeUtils {
     options?: ProfilerMarkerOptions | DOMHighResTimeStamp,
     text?: string
   ): void;
+  function androidMoveTaskToBack(): void;
   function base64URLDecode(string: string, options: Base64URLDecodeOptions): ArrayBuffer;
   function base64URLEncode(source: BufferSource, options: Base64URLEncodeOptions): string;
+  function callFunctionAndLogException(targetGlobal: any, func: any): any;
+  function clearBfcacheByPrincipal(principal: Principal): void;
   function clearMessagingLayerSecurityState(): void;
   function clearMessagingLayerSecurityStateByPrincipal(principal: Principal): void;
   function clearMessagingLayerSecurityStateBySite(
@@ -30839,6 +31600,11 @@ declare namespace ChromeUtils {
     options?: CompileScriptOptionsDictionary
   ): Promise<PrecompiledScript>;
   function consumeInteractionData(): Record<string, InteractionData>;
+  function createCSPFromHeader(
+    header: string,
+    selfURI: URI,
+    loadingPrincipal: Principal
+  ): ContentSecurityPolicy;
   function createError(message: string, stack?: any): any;
   function createOriginAttributesFromOrigin(origin: string): OriginAttributesDictionary;
   function dateNow(): number;
@@ -30848,7 +31614,7 @@ declare namespace ChromeUtils {
     aOptions?: ImportESModuleOptionsDictionary
   ): void;
   function defineLazyGetter(aTarget: any, aName: any, aLambda: any): void;
-  function endWheelTransaction(): void;
+  function endWheelTransaction(window: WindowProxy): Promise<void>;
   function ensureHeadlessContentProcess(aRemoteType: string): Promise<nsIContentParentKeepAlive>;
   function ensureJSOracleStarted(): void;
   function fillNonDefaultOriginAttributes(
@@ -30880,6 +31646,7 @@ declare namespace ChromeUtils {
   function isDarkBackground(element: Element): boolean;
   function isDevToolsOpened(): boolean;
   function isISOStyleDate(str: string): boolean;
+  function isJSIdentifier(str: string): boolean;
   function isOriginAttributesEqual(
     aA?: OriginAttributesDictionary,
     aB?: OriginAttributesDictionary
@@ -30980,7 +31747,7 @@ declare namespace InspectorUtils {
   function addPseudoClassLock(element: Element, pseudoClass: string, enabled?: boolean): void;
   function clearPseudoClassLocks(element: Element): void;
   function colorTo(fromColor: string, toColorSpace: string): InspectorColorToResult | null;
-  function colorToRGBA(colorString: string, doc?: Document | null): InspectorRGBATuple | null;
+  function colorToRGBA(colorString: string): InspectorRGBATuple | null;
   function containingBlockOf(element: Element): Element | null;
   function cssPropertyIsShorthand(property: string): boolean;
   function cssPropertySupportsType(property: string, type: InspectorPropertyType): boolean;
@@ -31006,7 +31773,7 @@ declare namespace InspectorUtils {
     pseudo?: string,
     relevantLinkVisited?: boolean,
     withStartingStyle?: boolean
-  ): CSSRule[];
+  ): (CSSRule | InspectorDeclaration)[];
   function getOverflowingChildrenOfElement(element: Element): NodeList;
   function getParentForNode(node: Node, showingAnonymousContent: boolean): Node | null;
   function getRegisteredCssHighlights(document: Document, activeOnly?: boolean): string[];
@@ -31047,6 +31814,8 @@ declare namespace InspectorUtils {
   ): string | null;
   function rgbToColorName(r: number, g: number, b: number): string;
   function setContentState(element: Element, state: number): boolean;
+  function setDynamicToolbarMaxHeight(aContext: BrowsingContext | null, aHeight: number): void;
+  function setVerticalClipping(aContext: BrowsingContext | null, aOffset: number): void;
   function supports(conditionText: string, options?: SupportsOptions): boolean;
   function valueMatchesSyntax(document: Document, value: string, syntax: string): boolean;
 }
@@ -31712,8 +32481,6 @@ declare var intlUtils: IntlUtils;
 declare var isChromeWindow: boolean;
 declare var isFullyOccluded: boolean;
 declare var isInFullScreenTransition: boolean;
-// @ts-ignore
-declare var isInstance: IsInstance<Window>;
 declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
@@ -31856,8 +32623,6 @@ declare function sizeToContent(constraints?: SizeToContentConstraints): void;
 declare function stop(): void;
 declare function updateCommands(action: string): void;
 declare function toString(): string;
-// @ts-ignore
-declare var isInstance: IsInstance<EventTarget>;
 declare var ownerGlobal: WindowProxy | null;
 declare function dispatchEvent(event: Event): boolean;
 declare function getEventHandler(type: string): EventHandler;
@@ -31872,6 +32637,7 @@ declare var onanimationiteration: ((this: Window, ev: Event) => any) | null;
 declare var onanimationstart: ((this: Window, ev: Event) => any) | null;
 declare var onauxclick: ((this: Window, ev: Event) => any) | null;
 declare var onbeforeinput: ((this: Window, ev: Event) => any) | null;
+declare var onbeforematch: ((this: Window, ev: Event) => any) | null;
 declare var onbeforetoggle: ((this: Window, ev: Event) => any) | null;
 declare var onblur: ((this: Window, ev: Event) => any) | null;
 declare var oncancel: ((this: Window, ev: Event) => any) | null;
@@ -31880,6 +32646,7 @@ declare var oncanplaythrough: ((this: Window, ev: Event) => any) | null;
 declare var onchange: ((this: Window, ev: Event) => any) | null;
 declare var onclick: ((this: Window, ev: Event) => any) | null;
 declare var onclose: ((this: Window, ev: Event) => any) | null;
+declare var oncommand: ((this: Window, ev: Event) => any) | null;
 declare var oncontentvisibilityautostatechange: ((this: Window, ev: Event) => any) | null;
 declare var oncontextlost: ((this: Window, ev: Event) => any) | null;
 declare var oncontextmenu: ((this: Window, ev: Event) => any) | null;
@@ -31932,6 +32699,8 @@ declare var onpointerleave: ((this: Window, ev: Event) => any) | null;
 declare var onpointermove: ((this: Window, ev: Event) => any) | null;
 declare var onpointerout: ((this: Window, ev: Event) => any) | null;
 declare var onpointerover: ((this: Window, ev: Event) => any) | null;
+/** Available only in secure contexts. */
+declare var onpointerrawupdate: ((this: Window, ev: Event) => any) | null;
 declare var onpointerup: ((this: Window, ev: Event) => any) | null;
 declare var onprogress: ((this: Window, ev: Event) => any) | null;
 declare var onratechange: ((this: Window, ev: Event) => any) | null;
@@ -32038,11 +32807,21 @@ declare function removeEventListener(
   options?: boolean | EventListenerOptions
 ): void;
 type AlgorithmIdentifier = any;
+type AllowSharedBufferSource = ArrayBuffer | ArrayBufferView;
 type Base64URLString = string;
 type BinaryData = ArrayBuffer | ArrayBufferView;
 type BlobPart = BufferSource | Blob | string;
 type BodyInit = XMLHttpRequestBodyInit;
+type BufferSource = ArrayBufferView | ArrayBuffer;
 type COSEAlgorithmIdentifier = number;
+type CSSColorAngle = CSSNumberish | CSSKeywordish;
+type CSSColorNumber = CSSNumberish | CSSKeywordish;
+type CSSColorPercent = CSSNumberish | CSSKeywordish;
+type CSSColorRGBComp = CSSNumberish | CSSKeywordish;
+type CSSKeywordish = string | CSSKeywordValue;
+type CSSNumberish = number | CSSNumericValue;
+type CSSPerspectiveValue = CSSNumericValue | CSSKeywordish;
+type CSSUnparsedSegment = string | CSSVariableReferenceValue;
 type CanvasImageSource =
   | HTMLOrSVGImageElement
   | HTMLCanvasElement
@@ -32081,7 +32860,13 @@ type GLsizei = number;
 type GLsizeiptr = number;
 type GLuint = number;
 type GLuint64 = number;
-type GPUBindingResource = GPUSampler | GPUTextureView | GPUBufferBinding;
+type GPUBindingResource =
+  | GPUSampler
+  | GPUTexture
+  | GPUTextureView
+  | GPUBuffer
+  | GPUBufferBinding
+  | GPUExternalTexture;
 type GPUBufferDynamicOffset = number;
 type GPUBufferUsageFlags = number;
 type GPUColor = number[] | GPUColorDict;
@@ -32114,7 +32899,10 @@ type GeometryNode = Text | Element | Document;
 type HTMLOrSVGImageElement = HTMLImageElement | SVGImageElement;
 type HeadersInit = string[][] | Record<string, string>;
 type ImageBitmapSource = CanvasImageSource | Blob | CanvasRenderingContext2D | ImageData;
-type ImageBufferSource = ArrayBufferView | ArrayBuffer | ReadableStream;
+type ImageBufferSource = AllowSharedBufferSource | ReadableStream;
+type InferenceSessionFeedsType = InferenceSessionTensorMapType;
+type InferenceSessionReturnType = InferenceSessionTensorMapType;
+type InferenceSessionTensorMapType = Record<string, Tensor>;
 type InputStream = nsIInputStream;
 type Int32List = Int32Array | GLint[];
 type KeyFormat = string;
@@ -32129,6 +32917,7 @@ type MLSBytesOrUint8Array = MLSBytes | Uint8Array;
 type MLSBytesOrUint8ArrayOrUTF8String = MLSBytes | Uint8Array | string;
 type MLSClientId = MLSBytes;
 type MLSCredential = MLSBytes;
+type MLSGroupEpoch = MLSBytes;
 type MLSGroupId = MLSBytes;
 type MLSKeyPackage = MLSBytes;
 type MLSProposal = MLSBytes;
@@ -32149,6 +32938,7 @@ type OnBeforeUnloadEventHandler = OnBeforeUnloadEventHandlerNonNull | null;
 type OnErrorEventHandler = OnErrorEventHandlerNonNull | null;
 type OutputStream = nsIOutputStream;
 type PerformanceEntryList = PerformanceEntry[];
+type PolicyContainer = nsIPolicyContainer;
 type Principal = nsIPrincipal;
 type PublicKeyCredentialClientCapabilities = Record<string, boolean>;
 type RTCRtpTransform = RTCRtpScriptTransform;
@@ -32166,6 +32956,7 @@ type StructuredClonable = any;
 type TimerHandler = Function | TrustedScript | string;
 type TrustedType = TrustedHTML | TrustedScript | TrustedScriptURL;
 type URI = nsIURI;
+type URLPatternInput = string | URLPatternInit;
 type Uint32List = Uint32Array | GLuint[];
 type UniFFICallbackInterfaceId = number;
 type UniFFICallbackObjectHandle = number;
@@ -32211,6 +33002,15 @@ type BiquadFilterType =
   | 'peaking';
 type BitrateMode = 'constant' | 'variable';
 type CSSBoxType = 'border' | 'content' | 'margin' | 'padding';
+type CSSMathOperator = 'clamp' | 'invert' | 'max' | 'min' | 'negate' | 'product' | 'sum';
+type CSSNumericBaseType =
+  | 'angle'
+  | 'flex'
+  | 'frequency'
+  | 'length'
+  | 'percent'
+  | 'resolution'
+  | 'time';
 type CSSStyleSheetParsingMode = 'agent' | 'author' | 'user';
 type CacheStorageNamespace = 'chrome' | 'content';
 type CallbackDebuggerNotificationPhase = 'post' | 'pre';
@@ -32283,6 +33083,10 @@ type ContentScriptExecutionWorld = 'ISOLATED' | 'MAIN' | 'USER_SCRIPT';
 type ContentScriptRunAt = 'document_end' | 'document_idle' | 'document_start';
 type CookieSameSite = 'lax' | 'none' | 'strict';
 type CredentialMediationRequirement = 'conditional' | 'optional' | 'required' | 'silent';
+type CredentialProtectionPolicy =
+  | 'userVerificationOptional'
+  | 'userVerificationOptionalWithCredentialIDList'
+  | 'userVerificationRequired';
 type DebuggerNotificationType =
   | 'cancelAnimationFrame'
   | 'clearInterval'
@@ -32294,6 +33098,14 @@ type DebuggerNotificationType =
   | 'setIntervalCallback'
   | 'setTimeout'
   | 'setTimeoutCallback';
+type DeclarationOrigin =
+  | 'animations'
+  | 'pres-hints'
+  | 'smil'
+  | 'style-attribute'
+  | 'transitions'
+  | 'user'
+  | 'user-agent';
 type DecoderDoctorReportType =
   | 'mediacannotinitializepulseaudio'
   | 'mediacannotplaynodecoders'
@@ -32310,7 +33122,13 @@ type DistanceModelType = 'exponential' | 'inverse' | 'linear';
 type EncodedAudioChunkType = 'delta' | 'key';
 type EncodedVideoChunkType = 'delta' | 'key';
 type EndingType = 'native' | 'transparent';
-type EventCallbackDebuggerNotificationType = 'global' | 'node' | 'websocket' | 'worker' | 'xhr';
+type EventCallbackDebuggerNotificationType =
+  | 'closewatcher'
+  | 'global'
+  | 'node'
+  | 'websocket'
+  | 'worker'
+  | 'xhr';
 type FetchState = 'aborted' | 'complete' | 'errored' | 'requesting' | 'responding';
 type FileSystemHandleKind = 'directory' | 'file';
 type FileType = 'directory' | 'other' | 'regular';
@@ -32352,10 +33170,12 @@ type GPUCompareFunction =
   | 'not-equal';
 type GPUCompilationMessageType = 'error' | 'info' | 'warning';
 type GPUCullMode = 'back' | 'front' | 'none';
+type GPUDeviceLostReason = 'destroyed' | 'unknown';
 type GPUErrorFilter = 'internal' | 'out-of-memory' | 'validation';
 type GPUFeatureName =
   | 'bgra8unorm-storage'
   | 'clip-distances'
+  | 'core-features-and-limits'
   | 'depth-clip-control'
   | 'depth32float-stencil8'
   | 'dual-source-blending'
@@ -32366,7 +33186,9 @@ type GPUFeatureName =
   | 'shader-f16'
   | 'subgroups'
   | 'texture-compression-astc'
+  | 'texture-compression-astc-sliced-3d'
   | 'texture-compression-bc'
+  | 'texture-compression-bc-sliced-3d'
   | 'texture-compression-etc2'
   | 'timestamp-query';
 type GPUFilterMode = 'linear' | 'nearest';
@@ -32374,6 +33196,7 @@ type GPUFrontFace = 'ccw' | 'cw';
 type GPUIndexFormat = 'uint16' | 'uint32';
 type GPULoadOp = 'clear' | 'load';
 type GPUMipmapFilterMode = 'linear' | 'nearest';
+type GPUPipelineErrorReason = 'internal' | 'validation';
 type GPUPowerPreference = 'high-performance' | 'low-power';
 type GPUPrimitiveTopology =
   | 'line-list'
@@ -32554,12 +33377,17 @@ type IDBCursorDirection = 'next' | 'nextunique' | 'prev' | 'prevunique';
 type IDBRequestReadyState = 'done' | 'pending';
 type IDBTransactionDurability = 'default' | 'relaxed' | 'strict';
 type IDBTransactionMode = 'cleanup' | 'readonly' | 'readwrite' | 'readwriteflush' | 'versionchange';
-type IdentityLoginTargetType = 'popup' | 'redirect';
+type IdentityCredentialRequestOptionsMode = 'active' | 'passive';
 type ImageOrientation = 'flipY' | 'from-image' | 'none';
 type ImportESModuleTargetGlobal = 'contextual' | 'current' | 'devtools' | 'shared';
 type InspectorPropertyType = 'color' | 'gradient' | 'timing-function';
 type IterationCompositeOperation = 'accumulate' | 'replace';
-type JSRFPTarget = 'CSSPrefersColorScheme' | 'RoundWindowSize' | 'SiteSpecificZoom';
+type JSRFPTarget =
+  | 'CSSPrefersColorScheme'
+  | 'HttpUserAgent'
+  | 'JSLocalePrompt'
+  | 'RoundWindowSize'
+  | 'SiteSpecificZoom';
 type L10nFileSourceHasFileStatus = 'missing' | 'present' | 'unknown';
 type LatencyMode = 'quality' | 'realtime';
 type LineAlignSetting = 'center' | 'end' | 'start';
@@ -32604,6 +33432,12 @@ type MediaKeyMessageType =
   | 'license-release'
   | 'license-renewal'
   | 'license-request';
+type MediaKeySessionClosedReason =
+  | 'closed-by-application'
+  | 'hardware-context-reset'
+  | 'internal-error'
+  | 'release-acknowledged'
+  | 'resource-evicted';
 type MediaKeySessionType = 'persistent-license' | 'temporary';
 type MediaKeyStatus =
   | 'expired'
@@ -32638,7 +33472,6 @@ type MozContentPolicyType =
   | 'main_frame'
   | 'media'
   | 'object'
-  | 'object_subrequest'
   | 'other'
   | 'ping'
   | 'script'
@@ -32651,6 +33484,7 @@ type MozContentPolicyType =
   | 'xmlhttprequest'
   | 'xslt';
 type MozUrlClassificationFlags =
+  | 'antifraud'
   | 'any_basic_tracking'
   | 'any_social_tracking'
   | 'any_strict_tracking'
@@ -32899,7 +33733,6 @@ type ScrollBehavior = 'auto' | 'instant' | 'smooth';
 type ScrollLogicalPosition = 'center' | 'end' | 'nearest' | 'start';
 type ScrollRestoration = 'auto' | 'manual';
 type ScrollSetting = '' | 'up';
-type ScrollState = 'started' | 'stopped';
 type SecurityPolicyViolationEventDisposition = 'enforce' | 'report';
 type SelectionMode = 'end' | 'preserve' | 'select' | 'start';
 type SelectorWarningKind = 'UnconstrainedHas';
@@ -32954,6 +33787,7 @@ type SupportedType =
 type TCPReadyState = 'closed' | 'closing' | 'connecting' | 'open';
 type TCPSocketBinaryType = 'arraybuffer' | 'string';
 type TaskPriority = 'background' | 'user-blocking' | 'user-visible';
+type TensorDataLocation = 'cpu' | 'cpu-pinned' | 'gpu-buffer' | 'ml-tensor' | 'none' | 'texture';
 type TextTrackKind = 'captions' | 'chapters' | 'descriptions' | 'metadata' | 'subtitles';
 type TextTrackMode = 'disabled' | 'hidden' | 'showing';
 type TouchEventsOverride = 'disabled' | 'enabled' | 'none';
@@ -33071,6 +33905,13 @@ interface CSSKeyframesRule {
   [Symbol.iterator](): IterableIterator<CSSKeyframeRule>;
 }
 
+interface CSSNumericArray {
+  [Symbol.iterator](): IterableIterator<CSSNumericValue>;
+  entries(): IterableIterator<[number, CSSNumericValue]>;
+  keys(): IterableIterator<number>;
+  values(): IterableIterator<CSSNumericValue>;
+}
+
 interface CSSRuleList {
   [Symbol.iterator](): IterableIterator<CSSRule>;
 }
@@ -33079,6 +33920,20 @@ interface CSSStyleDeclaration {
   [Symbol.iterator](): IterableIterator<string>;
 }
 
+interface CSSTransformValue {
+  [Symbol.iterator](): IterableIterator<CSSTransformComponent>;
+  entries(): IterableIterator<[number, CSSTransformComponent]>;
+  keys(): IterableIterator<number>;
+  values(): IterableIterator<CSSTransformComponent>;
+}
+
+interface CSSUnparsedValue {
+  [Symbol.iterator](): IterableIterator<CSSUnparsedSegment>;
+  entries(): IterableIterator<[number, CSSUnparsedSegment]>;
+  keys(): IterableIterator<number>;
+  values(): IterableIterator<CSSUnparsedSegment>;
+}
+
 interface Cache {
   addAll(requests: Iterable<RequestInfo>): Promise<void>;
 }
@@ -33148,6 +34003,10 @@ interface FormData {
   values(): IterableIterator<FormDataEntryValue>;
 }
 
+interface FragmentDirective {
+  createTextDirectiveForRanges(ranges: Iterable<Range>): Promise<string>;
+}
+
 interface GPUBindingCommandsMixin {
   setBindGroup(
     index: GPUIndex32,
@@ -33183,7 +34042,7 @@ interface GPUQueue {
   submit(buffers: Iterable<GPUCommandBuffer>): void;
   writeTexture(
     destination: GPUTexelCopyTextureInfo,
-    data: BufferSource,
+    data: AllowSharedBufferSource,
     dataLayout: GPUTexelCopyBufferLayout,
     size: Iterable<GPUIntegerCoordinate>
   ): void;
@@ -33293,10 +34152,10 @@ interface L10nRegistry {
 
 interface Localization {
   addResourceIds(aResourceIds: Iterable<L10nResourceId>): void;
-  formatMessages(aKeys: Iterable<L10nKey>): Promise<Iterable<L10nMessage | null>>;
-  formatMessagesSync(aKeys: Iterable<L10nKey>): Iterable<L10nMessage | null>;
-  formatValues(aKeys: Iterable<L10nKey>): Promise<Iterable<string | null>>;
-  formatValuesSync(aKeys: Iterable<L10nKey>): Iterable<string | null>;
+  formatMessages(aKeys: Iterable<L10nKey>): Promise<(L10nMessage | null)[]>;
+  formatMessagesSync(aKeys: Iterable<L10nKey>): (L10nMessage | null)[];
+  formatValues(aKeys: Iterable<L10nKey>): Promise<(string | null)[]>;
+  formatValuesSync(aKeys: Iterable<L10nKey>): (string | null)[];
   removeResourceIds(aResourceIds: Iterable<L10nResourceId>): number;
 }
 
@@ -33411,7 +34270,7 @@ interface SVGNumberList {
 }
 
 interface SVGPathData {
-  setPathData(pathData: Iterable<SVGPathSegment>): void;
+  setPathData(pathData: Iterable<SVGPathSegmentInit>): void;
 }
 
 interface SVGPointList {
@@ -33450,6 +34309,13 @@ interface SpeechRecognitionResultList {
   [Symbol.iterator](): IterableIterator<SpeechRecognitionResult>;
 }
 
+interface StylePropertyMapReadOnly {
+  [Symbol.iterator](): IterableIterator<[string, Iterable<CSSStyleValue>]>;
+  entries(): IterableIterator<[string, Iterable<CSSStyleValue>]>;
+  keys(): IterableIterator<string>;
+  values(): IterableIterator<Iterable<CSSStyleValue>>;
+}
+
 interface StyleSheetList {
   [Symbol.iterator](): IterableIterator<CSSStyleSheet>;
 }
@@ -33585,7 +34451,7 @@ interface WebGL2RenderingContextBase {
   ): void;
   drawBuffers(buffers: Iterable<GLenum>): void;
   getActiveUniforms(program: WebGLProgram, uniformIndices: Iterable<GLuint>, pname: GLenum): any;
-  getUniformIndices(program: WebGLProgram, uniformNames: Iterable<string>): Iterable<GLuint> | null;
+  getUniformIndices(program: WebGLProgram, uniformNames: Iterable<string>): GLuint[] | null;
   invalidateFramebuffer(target: GLenum, attachments: Iterable<GLenum>): void;
   invalidateSubFramebuffer(
     target: GLenum,
@@ -33833,3 +34699,7 @@ interface TestInterfaceAsyncIterableSingleWithArgs {
   ): AsyncIterableIterator<number>;
   values(options?: TestInterfaceAsyncIteratorOptions): AsyncIterableIterator<number>;
 }
+
+declare namespace CSS {
+  export { _in as in };
+}
diff --git a/src/zen/@types/lib.gecko.glean.d.ts b/src/zen/@types/lib.gecko.glean.d.ts
index d2e66a200..522b87c05 100644
--- a/src/zen/@types/lib.gecko.glean.d.ts
+++ b/src/zen/@types/lib.gecko.glean.d.ts
@@ -1,15 +1,13852 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
- * Content was generated from source metrics.yaml files.
+ * Content was generated from glean .yaml files.
  * If you're updating some of the sources, see README for instructions.
  */
 
-/// <reference types="./glean/browser_components_search.d.ts" />
-/// <reference types="./glean/browser_components_search_pings.d.ts" />
-/// <reference types="./glean/toolkit_components_extensions.d.ts" />
-/// <reference types="./glean/toolkit_components_places.d.ts" />
-/// <reference types="./glean/toolkit_components_search.d.ts" />
-/// <reference types="./glean/toolkit_mozapps_extensions.d.ts" />
+interface GleanImpl {
+  a11y: {
+    alwaysUnderlineLinks: GleanBoolean;
+    backplate: GleanBoolean;
+    consumers: GleanCustomDistribution;
+    hcmBackground: GleanQuantity;
+    hcmForeground: GleanQuantity;
+    instantiators: GleanString;
+    invertColors: GleanBoolean;
+    theme: Record<'always' | 'default' | 'never', GleanBoolean>;
+    treeUpdateTiming: GleanTimingDistribution;
+    useSystemColors: GleanBoolean;
+  };
+
+  fullscreen: {
+    change: GleanTimingDistribution;
+  };
+
+  browserEngagement: {
+    bookmarksToolbarBookmarkAdded: GleanCounter;
+    bookmarksToolbarBookmarkOpened: GleanCounter;
+    totalTopVisits: Record<'false' | 'true', GleanCounter>;
+    sessionrestoreInterstitial: Record<string, GleanCounter>;
+    tabExplicitUnload: GleanEventWithExtras<{
+      all_tabs_unloaded?: string;
+      memory_after?: string;
+      memory_before?: string;
+      tabs_unloaded?: string;
+      time_to_unload_in_ms?: string;
+      unload_selected_tab?: string;
+    }>;
+    tabReloadCount: GleanCounter;
+    tabUnloadCount: GleanCounter;
+    tabUnloadToReload: GleanTimingDistribution;
+    activeTicks: GleanCounter;
+    loadedTabCount: GleanCustomDistribution;
+    maxConcurrentTabCount: GleanQuantity;
+    maxConcurrentTabPinnedCount: GleanQuantity;
+    maxConcurrentVerticalTabCount: GleanQuantity;
+    maxConcurrentVerticalTabPinnedCount: GleanQuantity;
+    maxConcurrentWindowCount: GleanQuantity;
+    profileCount: GleanQuantity;
+    tabCount: GleanCustomDistribution;
+    tabOpenEventCount: GleanCounter;
+    tabPinnedEventCount: GleanCounter;
+    unfilteredUriCount: GleanCounter;
+    uniqueDomainsCount: GleanQuantity;
+    uriCount: GleanCounter;
+    uriCountNormalMode: GleanCounter;
+    verticalTabOpenEventCount: GleanCounter;
+    verticalTabPinnedEventCount: GleanCounter;
+    windowOpenEventCount: GleanCounter;
+    sessionTimeExcludingSuspend: GleanQuantity;
+    sessionTimeIncludingSuspend: GleanQuantity;
+  };
+
+  browserTimings: {
+    newWindow: GleanTimingDistribution;
+    pageLoad: GleanTimingDistribution;
+    pageReloadNormal: GleanTimingDistribution;
+    pageReloadSkipCache: GleanTimingDistribution;
+    startupTimeline: Record<
+      'blankWindowShown' | 'delayedStartupFinished' | 'delayedStartupStarted',
+      GleanQuantity
+    >;
+    tabClick: GleanTimingDistribution;
+    lastShutdown: GleanQuantity;
+  };
+
+  networking: {
+    captivePortalBannerDisplayTime: Record<'abort' | 'dismiss' | 'success', GleanCounter>;
+    captivePortalBannerDisplayed: GleanCounter;
+    cacheMetadataFirstReadTime: GleanTimingDistribution;
+    cacheMetadataSecondReadTime: GleanTimingDistribution;
+    cacheMetadataSize: GleanMemoryDistribution;
+    cachePurgeDueToMemoryLimit: Record<
+      'cache_memory_limit' | 'meta_data_file_size_limit',
+      GleanCounter
+    >;
+    cookieAccessFixupDiff: GleanCustomDistribution;
+    cookieChipsPartitionLimitOverflow: GleanCustomDistribution;
+    cookieCountInvalidFirstPartyPartitionedInDb: GleanCounter;
+    cookieCountPartByKey: GleanCustomDistribution;
+    cookieCountPartitioned: GleanCustomDistribution;
+    cookieCountTotal: GleanCustomDistribution;
+    cookieCountUnpartByKey: GleanCustomDistribution;
+    cookieCountUnpartitioned: GleanCustomDistribution;
+    cookieCreationFixupDiff: GleanCustomDistribution;
+    cookieDbValidation: Record<
+      | 'eOK'
+      | 'eRejectedAttributeDomainOversize'
+      | 'eRejectedAttributeExpiryOversize'
+      | 'eRejectedAttributePathOversize'
+      | 'eRejectedEmptyNameAndValue'
+      | 'eRejectedForNonSameSiteness'
+      | 'eRejectedHttpOnlyButFromScript'
+      | 'eRejectedInvalidCharName'
+      | 'eRejectedInvalidCharValue'
+      | 'eRejectedInvalidDomain'
+      | 'eRejectedInvalidPath'
+      | 'eRejectedInvalidPrefix'
+      | 'eRejectedNameValueOversize'
+      | 'eRejectedNoneRequiresSecure'
+      | 'eRejectedPartitionedRequiresSecure'
+      | 'eRejectedSecureButNonHttps',
+      GleanCounter
+    >;
+    cookiePurgeEntryMax: GleanCustomDistribution;
+    cookiePurgeMax: GleanCustomDistribution;
+    cookieTimestampFixedCount: Record<'creationTime' | 'lastAccessed', GleanCounter>;
+    dnsFailedLookupTime: GleanTimingDistribution;
+    dnsLookupTime: GleanTimingDistribution;
+    dnsNativeCount: Record<'https_private' | 'https_regular' | 'private' | 'regular', GleanCounter>;
+    dnsNativeHttpsCallTime: GleanTimingDistribution;
+    dnsRenewalTime: GleanTimingDistribution;
+    dnsRenewalTimeForTtl: GleanTimingDistribution;
+    fetchKeepaliveDiscardCount: Record<'per_origin_limit' | 'total_keepalive_limit', GleanCounter>;
+    fetchKeepaliveRequestCount: Record<'main' | 'worker', GleanCounter>;
+    http3ChannelOnstartSuccess: GleanDualLabeledCounter;
+    http1DownloadThroughput: GleanCustomDistribution;
+    http1DownloadThroughput100: GleanCustomDistribution;
+    http1DownloadThroughput1050: GleanCustomDistribution;
+    http1DownloadThroughput50100: GleanCustomDistribution;
+    http1UploadThroughput: GleanCustomDistribution;
+    http1UploadThroughput100: GleanCustomDistribution;
+    http1UploadThroughput1050: GleanCustomDistribution;
+    http1UploadThroughput50100: GleanCustomDistribution;
+    http2DownloadThroughput: GleanCustomDistribution;
+    http2DownloadThroughput100: GleanCustomDistribution;
+    http2DownloadThroughput1050: GleanCustomDistribution;
+    http2DownloadThroughput50100: GleanCustomDistribution;
+    http2UploadThroughput: GleanCustomDistribution;
+    http2UploadThroughput100: GleanCustomDistribution;
+    http2UploadThroughput1050: GleanCustomDistribution;
+    http2UploadThroughput50100: GleanCustomDistribution;
+    http3ConnectionCloseReason: Record<
+      | 'AckedUnsentPacket'
+      | 'Application'
+      | 'ApplicationError'
+      | 'ConnectionIdLimitExceeded'
+      | 'ConnectionIdsExhausted'
+      | 'ConnectionRefused'
+      | 'ConnectionState'
+      | 'CryptoAlert'
+      | 'CryptoBufferExceeded'
+      | 'CryptoError'
+      | 'DecodingFrame'
+      | 'DecryptError'
+      | 'DisabledVersion'
+      | 'EchRetry'
+      | 'FinalSizeError'
+      | 'FlowControlError'
+      | 'FrameEncodingError'
+      | 'IdleTimeout'
+      | 'IntegerOverflow'
+      | 'InternalError'
+      | 'InvalidInput'
+      | 'InvalidMigration'
+      | 'InvalidPacket'
+      | 'InvalidResumptionToken'
+      | 'InvalidRetry'
+      | 'InvalidStreamId'
+      | 'InvalidToken'
+      | 'KeyUpdateBlocked'
+      | 'KeysDiscarded'
+      | 'KeysExhausted'
+      | 'KeysPending'
+      | 'NoAvailablePath'
+      | 'NoError'
+      | 'NoMoreData'
+      | 'NotAvailable'
+      | 'NotConnected'
+      | 'PacketNumberOverlap'
+      | 'PeerApplicationError'
+      | 'PeerError'
+      | 'ProtocolViolation'
+      | 'QlogError'
+      | 'StatelessReset'
+      | 'StreamLimitError'
+      | 'StreamStateError'
+      | 'TooMuchData'
+      | 'TransportParameterError'
+      | 'UnexpectedMessage'
+      | 'UnknownConnectionId'
+      | 'UnknownFrameType'
+      | 'VersionNegotiation'
+      | 'WrongRole',
+      GleanCounter
+    >;
+    http3DownloadThroughput: GleanCustomDistribution;
+    http3DownloadThroughput100: GleanCustomDistribution;
+    http3DownloadThroughput1050: GleanCustomDistribution;
+    http3DownloadThroughput50100: GleanCustomDistribution;
+    http3EcnCeEct0RatioReceived: GleanCustomDistribution;
+    http3EcnCeEct0RatioSent: GleanCustomDistribution;
+    http3EcnPathCapability: Record<
+      'black-hole' | 'bleaching' | 'capable' | 'received-unsent-ect-1',
+      GleanCounter
+    >;
+    http3LossRatio: GleanCustomDistribution;
+    http3QuicFrameCount: Record<
+      | 'ack_frequency_rx'
+      | 'ack_frequency_tx'
+      | 'ack_rx'
+      | 'ack_tx'
+      | 'connection_close_rx'
+      | 'connection_close_tx'
+      | 'crypto_rx'
+      | 'crypto_tx'
+      | 'data_blocked_rx'
+      | 'data_blocked_tx'
+      | 'datagram_rx'
+      | 'datagram_tx'
+      | 'handshake_done_rx'
+      | 'handshake_done_tx'
+      | 'max_data_rx'
+      | 'max_data_tx'
+      | 'max_stream_data_rx'
+      | 'max_stream_data_tx'
+      | 'max_streams_rx'
+      | 'max_streams_tx'
+      | 'new_connection_id_rx'
+      | 'new_connection_id_tx'
+      | 'new_token_rx'
+      | 'new_token_tx'
+      | 'padding_rx'
+      | 'padding_tx'
+      | 'path_challenge_rx'
+      | 'path_challenge_tx'
+      | 'path_response_rx'
+      | 'path_response_tx'
+      | 'ping_rx'
+      | 'ping_tx'
+      | 'reset_stream_rx'
+      | 'reset_stream_tx'
+      | 'retire_connection_id_rx'
+      | 'retire_connection_id_tx'
+      | 'stop_sending_rx'
+      | 'stop_sending_tx'
+      | 'stream_data_blocked_rx'
+      | 'stream_data_blocked_tx'
+      | 'stream_rx'
+      | 'stream_tx'
+      | 'streams_blocked_rx'
+      | 'streams_blocked_tx',
+      GleanCounter
+    >;
+    http3UdpDatagramSegmentSizeReceived: GleanMemoryDistribution;
+    http3UdpDatagramSegmentSizeSent: GleanMemoryDistribution;
+    http3UdpDatagramSegmentsReceived: GleanCustomDistribution;
+    http3UdpDatagramSegmentsSent: GleanCustomDistribution;
+    http3UdpDatagramSizeReceived: GleanMemoryDistribution;
+    http3UdpDatagramSizeSent: GleanMemoryDistribution;
+    http3UploadThroughput: GleanCustomDistribution;
+    http3UploadThroughput100: GleanCustomDistribution;
+    http3UploadThroughput1050: GleanCustomDistribution;
+    http3UploadThroughput50100: GleanCustomDistribution;
+    httpChannelDisposition: Record<
+      | 'http_cancelled'
+      | 'http_disk'
+      | 'http_net_early_fail'
+      | 'http_net_late_fail'
+      | 'http_net_ok'
+      | 'https_cancelled'
+      | 'https_disk'
+      | 'https_net_early_fail'
+      | 'https_net_late_fail'
+      | 'https_net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionDisabledNoReason: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionDisabledUpgrade: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionDisabledWont: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionEnabledNoReason: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionEnabledUpgrade: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionEnabledWont: Record<
+      'cancel' | 'disk' | 'net_early_fail' | 'net_late_fail' | 'net_ok',
+      GleanCounter
+    >;
+    httpChannelDispositionUpgrade: GleanDualLabeledCounter;
+    httpChannelOnstartStatus: Record<'fail' | 'successful', GleanCounter>;
+    httpChannelOnstartSuccessHttpsRr: Record<
+      'failure' | 'failure_ech_used' | 'success' | 'success_ech_used',
+      GleanCounter
+    >;
+    httpChannelPageOpenToFirstSent: GleanTimingDistribution;
+    httpChannelPageOpenToFirstSentHttpsRr: GleanTimingDistribution;
+    httpChannelSubOpenToFirstSent: GleanTimingDistribution;
+    httpChannelSubOpenToFirstSentHttpsRr: GleanTimingDistribution;
+    httpContentCssloaderOndatafinishedToOnstopDelay: GleanTimingDistribution;
+    httpContentHtml5parserOndatafinishedToOnstopDelay: GleanTimingDistribution;
+    httpContentOndatafinishedDelay: GleanTimingDistribution;
+    httpContentOndatafinishedDelay2: GleanTimingDistribution;
+    httpContentOndatafinishedToOnstopDelay: GleanTimingDistribution;
+    httpContentOnstartDelay: GleanTimingDistribution;
+    httpContentOnstopDelay: GleanTimingDistribution;
+    httpIpAddrAnyCount: Record<'blocked_requests' | 'not_blocked_requests', GleanCounter>;
+    httpIpAddrAnyHostnames: Record<'failure' | 'success', GleanCounter>;
+    httpOnstartSuspendTotalTime: GleanTimingDistribution;
+    httpRedirectToSchemeSubresource: Record<string, GleanCounter>;
+    httpRedirectToSchemeTopLevel: Record<string, GleanCounter>;
+    httpResponseStatusCode: Record<
+      | '200_ok'
+      | '301_moved_permanently'
+      | '302_found'
+      | '304_not_modified'
+      | '307_temporary_redirect'
+      | '308_permanent_redirect'
+      | '400_bad_request'
+      | '401_unauthorized'
+      | '403_forbidden'
+      | '404_not_found'
+      | '421_misdirected_request'
+      | '425_too_early'
+      | '429_too_many_requests'
+      | 'other'
+      | 'other_4xx'
+      | 'other_5xx',
+      GleanCounter
+    >;
+    httpResponseVersion: Record<'http_1' | 'http_2' | 'http_3' | 'unknown', GleanCounter>;
+    httpToHttpsUpgradeReason: Record<
+      | 'already_https'
+      | 'csp_uir'
+      | 'hsts'
+      | 'https_first_schemeless_upgrade'
+      | 'https_first_schemeless_upgrade_downgrade'
+      | 'https_first_upgrade'
+      | 'https_first_upgrade_downgrade'
+      | 'https_only_upgrade'
+      | 'https_only_upgrade_downgrade'
+      | 'https_rr'
+      | 'no_upgrade'
+      | 'no_upgrade_https'
+      | 'not_initialized'
+      | 'not_initialized_https'
+      | 'skip_upgrade'
+      | 'upgrade_exception'
+      | 'web_extension_upgrade',
+      GleanCounter
+    >;
+    httpsHttpOrLocal: Record<
+      'load_is_http' | 'load_is_http_for_local_domain' | 'load_is_https',
+      GleanCounter
+    >;
+    httpsRrPresented: Record<'none' | 'presented' | 'presented_with_http3', GleanCounter>;
+    localNetworkAccess: Record<
+      | 'failure'
+      | 'private_to_local_http'
+      | 'private_to_local_https'
+      | 'public_to_local_http'
+      | 'public_to_local_https'
+      | 'public_to_private_http'
+      | 'public_to_private_https'
+      | 'success',
+      GleanCounter
+    >;
+    localNetworkAccessPort: GleanCustomDistribution;
+    localNetworkBlockedTracker: GleanCounter;
+    osSocketLimitReached: GleanCounter;
+    prcloseTcpBlockingTimeConnectivityChange: GleanTimingDistribution;
+    prcloseTcpBlockingTimeLinkChange: GleanTimingDistribution;
+    prcloseTcpBlockingTimeNormal: GleanTimingDistribution;
+    prcloseTcpBlockingTimeOffline: GleanTimingDistribution;
+    prcloseTcpBlockingTimeShutdown: GleanTimingDistribution;
+    prcloseUdpBlockingTimeConnectivityChange: GleanTimingDistribution;
+    prcloseUdpBlockingTimeLinkChange: GleanTimingDistribution;
+    prcloseUdpBlockingTimeNormal: GleanTimingDistribution;
+    prcloseUdpBlockingTimeOffline: GleanTimingDistribution;
+    prcloseUdpBlockingTimeShutdown: GleanTimingDistribution;
+    prconnectBlockingTimeConnectivityChange: GleanTimingDistribution;
+    prconnectBlockingTimeLinkChange: GleanTimingDistribution;
+    prconnectBlockingTimeNormal: GleanTimingDistribution;
+    prconnectBlockingTimeOffline: GleanTimingDistribution;
+    prconnectBlockingTimeShutdown: GleanTimingDistribution;
+    prconnectFailBlockingTimeConnectivityChange: GleanTimingDistribution;
+    prconnectFailBlockingTimeLinkChange: GleanTimingDistribution;
+    prconnectFailBlockingTimeNormal: GleanTimingDistribution;
+    prconnectFailBlockingTimeOffline: GleanTimingDistribution;
+    prconnectFailBlockingTimeShutdown: GleanTimingDistribution;
+    prconnectcontinueBlockingTimeConnectivityChange: GleanTimingDistribution;
+    prconnectcontinueBlockingTimeLinkChange: GleanTimingDistribution;
+    prconnectcontinueBlockingTimeNormal: GleanTimingDistribution;
+    prconnectcontinueBlockingTimeOffline: GleanTimingDistribution;
+    prconnectcontinueBlockingTimeShutdown: GleanTimingDistribution;
+    proxyInfoType: Record<
+      'direct' | 'http' | 'https' | 'socks4' | 'socks4a' | 'socks5' | 'socks5h' | 'unknown',
+      GleanCounter
+    >;
+    residualCacheFolderCount: GleanCounter;
+    residualCacheFolderRemoval: Record<'failure' | 'success', GleanCounter>;
+    setCookie: GleanDenominator;
+    setCookieForeign: GleanNumerator;
+    setCookieForeignPartitioned: GleanNumerator;
+    setCookiePartitioned: GleanNumerator;
+    setInvalidFirstPartyPartitionedCookie: GleanCounter;
+    speculativeConnectOutcome: Record<
+      'aborted_https_not_enabled' | 'aborted_socket_fail' | 'aborted_socket_limit' | 'successful',
+      GleanCounter
+    >;
+    sqliteCookiesBlockMainThread: GleanTimingDistribution;
+    sqliteCookiesTimeToBlockMainThread: GleanTimingDistribution;
+    transactionWaitTime: GleanTimingDistribution;
+    transactionWaitTimeHttpsRr: GleanTimingDistribution;
+    trrCompleteLoad: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrDnsEnd: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrDnsStart: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrFetchDuration: Record<
+      'h1' | 'h1_network_only' | 'h2' | 'h2_network_only' | 'h3' | 'h3_network_only',
+      GleanTimingDistribution
+    >;
+    trrFirstSentToLastReceived: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrOpenToFirstReceived: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrOpenToFirstSent: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrRequestCount: Record<'private' | 'regular', GleanCounter>;
+    trrRequestCountPerConn: Record<
+      | 'dns.shaw.ca_h1'
+      | 'dns.shaw.ca_h2'
+      | 'dns.shaw.ca_h3'
+      | 'doh.xfinity.com_h1'
+      | 'doh.xfinity.com_h2'
+      | 'doh.xfinity.com_h3'
+      | 'dooh.cloudflare-dns.com_h1'
+      | 'dooh.cloudflare-dns.com_h2'
+      | 'dooh.cloudflare-dns.com_h3'
+      | 'firefox.dns.nextdns.io_h1'
+      | 'firefox.dns.nextdns.io_h2'
+      | 'firefox.dns.nextdns.io_h3'
+      | 'mozilla.cloudflare-dns.com_h1'
+      | 'mozilla.cloudflare-dns.com_h2'
+      | 'mozilla.cloudflare-dns.com_h3'
+      | 'private.canadianshield.cira.ca_h1'
+      | 'private.canadianshield.cira.ca_h2'
+      | 'private.canadianshield.cira.ca_h3',
+      GleanCounter
+    >;
+    trrRequestSize: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanMemoryDistribution
+    >;
+    trrResponseSize: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanMemoryDistribution
+    >;
+    trrTcpConnection: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrTlsHandshake: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    connectionAddressType: Record<
+      'http_1_ipv4' | 'http_1_ipv6' | 'http_2_ipv4' | 'http_2_ipv6' | 'http_3_ipv4' | 'http_3_ipv6',
+      GleanCounter
+    >;
+    dataTransferredV3Kb: Record<string, GleanCounter>;
+    http3Enabled: GleanBoolean;
+    httpsRecordState: Record<
+      'all_excluded' | 'invalid' | 'no_default_alpn' | 'others' | 'succeeded' | 'unmatched_cname',
+      GleanCounter
+    >;
+    httpsRrPrefsUsage: GleanQuantity;
+    trrConnectionCycleCount: Record<string, GleanCounter>;
+    loadingCertsTask: GleanQuantity;
+    nssInitialization: GleanQuantity;
+    dohHeuristicEverTripped: Record<string, GleanBoolean>;
+    dohHeuristicsAttempts: GleanCounter;
+    dohHeuristicsPassCount: GleanCounter;
+    dohHeuristicsResult: GleanQuantity;
+  };
+
+  securityUiProtectionspopup: {
+    clickCookiebToggleOff: GleanEventNoExtras;
+    clickCookiebToggleOn: GleanEventNoExtras;
+    clickCookies: GleanEventNoExtras;
+    clickCryptominers: GleanEventNoExtras;
+    clickEtpToggleOff: GleanEventNoExtras;
+    clickEtpToggleOn: GleanEventNoExtras;
+    clickFingerprinters: GleanEventNoExtras;
+    clickFullReport: GleanEventNoExtras;
+    clickMilestoneMessage: GleanEventNoExtras;
+    clickProtectionspopupCfr: GleanEventWithExtras<{ message?: string; value?: string }>;
+    clickSettings: GleanEventNoExtras;
+    clickSmartblockembedsToggle: GleanEventWithExtras<{ isBlock?: string; openingReason?: string }>;
+    clickSocial: GleanEventNoExtras;
+    clickSubviewSettings: GleanEventWithExtras<{ value?: string }>;
+    clickTrackers: GleanEventNoExtras;
+    closeProtectionsPopup: GleanEventWithExtras<{
+      openingReason?: string;
+      smartblockToggleClicked?: string;
+    }>;
+    openProtectionsPopup: GleanEventWithExtras<{
+      openingReason?: string;
+      smartblockEmbedTogglesShown?: string;
+    }>;
+    openProtectionspopupCfr: GleanEventWithExtras<{ message?: string; value?: string }>;
+    smartblockembedsShown: GleanCounter;
+  };
+
+  messagingSystem: {
+    addonVersion: GleanString;
+    browserSessionId: GleanUuid;
+    bucketId: GleanString;
+    clientId: GleanUuid;
+    event: GleanString;
+    eventContext: GleanText;
+    eventContextParseError: GleanCounter;
+    eventPage: GleanString;
+    eventReason: GleanString;
+    eventScreenFamily: GleanText;
+    eventScreenId: GleanText;
+    eventScreenIndex: GleanQuantity;
+    eventScreenInitials: GleanText;
+    eventSource: GleanString;
+    gleanPingForPingFailures: GleanCounter;
+    impressionId: GleanUuid;
+    invalidNestedData: Record<string, GleanCounter>;
+    locale: GleanString;
+    messageId: GleanText;
+    messageRequestTime: GleanTimingDistribution;
+    pingType: GleanString;
+    source: GleanString;
+    unknownKeyCount: GleanCounter;
+    unknownKeys: Record<string, GleanCounter>;
+  };
+
+  messagingSystemAttribution: {
+    campaign: GleanString;
+    content: GleanString;
+    dlsource: GleanString;
+    dltoken: GleanString;
+    experiment: GleanString;
+    medium: GleanString;
+    msstoresignedin: GleanString;
+    source: GleanString;
+    ua: GleanString;
+    unknownKeys: Record<string, GleanCounter>;
+    variation: GleanString;
+  };
+
+  gleanAttribution: {
+    ext: GleanObject;
+  };
+
+  gleanDistribution: {
+    ext: GleanObject;
+  };
+
+  browserBackup: {
+    browserExtensionDataSize: GleanQuantity;
+    changeLocation: GleanEventNoExtras;
+    compressedArchiveSize: GleanMemoryDistribution;
+    cookiesSize: GleanQuantity;
+    created: GleanEventNoExtras;
+    credentialsDataSize: GleanQuantity;
+    enabled: GleanBoolean;
+    error: GleanEventWithExtras<{ backup_step?: string; error_code?: string }>;
+    extensionStorePermissionsDataSize: GleanQuantity;
+    extensionsJsonSize: GleanQuantity;
+    extensionsStorageSize: GleanQuantity;
+    extensionsXpiDirectorySize: GleanQuantity;
+    faviconsSize: GleanQuantity;
+    faviconsTime: GleanTimingDistribution;
+    formHistorySize: GleanQuantity;
+    locationOnDevice: GleanQuantity;
+    miscDataSize: GleanQuantity;
+    passwordAdded: GleanEventNoExtras;
+    passwordChanged: GleanEventNoExtras;
+    passwordRemoved: GleanEventNoExtras;
+    placesSize: GleanQuantity;
+    placesTime: GleanTimingDistribution;
+    preferencesSize: GleanQuantity;
+    profDDiskSpace: GleanQuantity;
+    pswdEncrypted: GleanBoolean;
+    schedulerEnabled: GleanBoolean;
+    securityDataSize: GleanQuantity;
+    sessionStoreBackupsDirectorySize: GleanQuantity;
+    sessionStoreSize: GleanQuantity;
+    storageSyncSize: GleanQuantity;
+    toggleOff: GleanEventNoExtras;
+    toggleOn: GleanEventNoExtras;
+    totalBackupSize: GleanMemoryDistribution;
+    totalBackupTime: GleanTimingDistribution;
+  };
+
+  containers: {
+    containerCreated: GleanEventWithExtras<{ container_id?: string }>;
+    containerDeleted: GleanEventWithExtras<{ container_id?: string }>;
+    containerModified: GleanEventWithExtras<{ container_id?: string }>;
+    containerProfileLoaded: GleanEventWithExtras<{ containers?: string }>;
+    containerTabClosed: GleanEventWithExtras<{ container_id?: string }>;
+    containerTabOpened: GleanEventWithExtras<{ container_id?: string }>;
+    containersEnabled: GleanEventWithExtras<{ enabled?: string }>;
+    tabAssignedContainer: GleanEventWithExtras<{
+      from_container_id?: string;
+      to_container_id?: string;
+    }>;
+  };
+
+  downloads: {
+    panelShown: GleanCounter;
+    addedFileExtension: GleanEventWithExtras<{ value?: string }>;
+    fileOpened: GleanCounter;
+    userActionOnBlockedDownload: Record<string, GleanCustomDistribution>;
+  };
+
+  glamExperiment: {
+    panelShown: GleanCounter;
+    activeTicks: GleanCounter;
+    largestContentfulPaint: GleanTimingDistribution;
+    protectTime: GleanTimingDistribution;
+    httpContentHtml5parserOndatafinishedToOnstopDelay: GleanTimingDistribution;
+    osSocketLimitReached: GleanCounter;
+    subCompleteLoadNet: GleanTimingDistribution;
+    used: GleanCounter;
+    cpuTimeBogusValues: GleanCounter;
+    totalCpuTimeMs: GleanCounter;
+  };
+
+  extensionsButton: {
+    openViaAppMenu: GleanEventWithExtras<{
+      is_extensions_button_visible?: string;
+      is_extensions_panel_empty?: string;
+    }>;
+    prefersHiddenButton: GleanBoolean;
+    temporarilyUnhidden: Record<
+      | 'addon_install_doorhanger'
+      | 'attention_blocklist'
+      | 'attention_permission_denied'
+      | 'customize'
+      | 'extension_browser_action_popup'
+      | 'extension_controlled_setting'
+      | 'extension_permission_prompt'
+      | 'extensions_panel_showing',
+      GleanCounter
+    >;
+    toggleVisibility: GleanEventWithExtras<{
+      is_customizing?: string;
+      is_extensions_panel_empty?: string;
+      is_temporarily_shown?: string;
+      should_hide?: string;
+    }>;
+  };
+
+  firefoxview: {
+    cumulativeSearches: Record<
+      'history' | 'opentabs' | 'recentbrowsing' | 'recentlyclosed' | 'syncedtabs',
+      GleanCustomDistribution
+    >;
+  };
+
+  firefoxviewNext: {
+    browserContextMenuTabs: GleanEventWithExtras<{ menu_action?: string; page?: string }>;
+    cardCollapsedCardContainer: GleanEventWithExtras<{ data_type?: string }>;
+    cardExpandedCardContainer: GleanEventWithExtras<{ data_type?: string }>;
+    changePageNavigation: GleanEventWithExtras<{ page?: string; source?: string }>;
+    closeOpenTabTabs: GleanEventNoExtras;
+    contextMenuTabs: GleanEventWithExtras<{ data_type?: string; menu_action?: string }>;
+    dismissClosedTabTabs: GleanEventWithExtras<{
+      delta?: string;
+      page?: string;
+      position?: string;
+    }>;
+    enteredFirefoxview: GleanEventWithExtras<{ page?: string }>;
+    fxaContinueSync: GleanEventNoExtras;
+    fxaMobileSync: GleanEventWithExtras<{ has_devices?: string }>;
+    historyVisits: GleanEventNoExtras;
+    openTabTabs: GleanEventWithExtras<{ page?: string; window?: string }>;
+    recentlyClosedTabs: GleanEventWithExtras<{ delta?: string; page?: string; position?: string }>;
+    searchInitiatedSearch: GleanEventWithExtras<{ page?: string }>;
+    searchShowAllShowallbutton: GleanEventWithExtras<{ section?: string }>;
+    showAllHistoryTabs: GleanEventNoExtras;
+    sortHistoryTabs: GleanEventWithExtras<{ search_start?: string; sort_type?: string }>;
+    syncedTabsTabs: GleanEventWithExtras<{ page?: string }>;
+    tabSelectedToolbarbutton: GleanEventNoExtras;
+  };
+
+  genaiChatbot: {
+    badges: GleanString;
+    contextmenuChoose: GleanEventWithExtras<{ provider?: string }>;
+    contextmenuPromptClick: GleanEventWithExtras<{
+      prompt?: string;
+      provider?: string;
+      selection?: string;
+    }>;
+    contextmenuRemove: GleanEventWithExtras<{ provider?: string }>;
+    enabled: GleanBoolean;
+    experimentCheckboxClick: GleanEventWithExtras<{ enabled?: string }>;
+    keyboardShortcut: GleanEventWithExtras<{ enabled?: string; sidebar?: string }>;
+    lengthDisclaimer: GleanEventWithExtras<{ length?: string; provider?: string; type?: string }>;
+    lengthDisclaimerDismissed: GleanEventWithExtras<{ provider?: string; type?: string }>;
+    menu: GleanBoolean;
+    onboardingClose: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingFinish: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingLearnMore: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingProviderChoiceDisplayed: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingProviderLearn: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingProviderSelection: GleanEventWithExtras<{ provider?: string; step?: string }>;
+    onboardingProviderTerms: GleanEventWithExtras<{
+      provider?: string;
+      step?: string;
+      text?: string;
+    }>;
+    page: GleanBoolean;
+    promptClick: GleanEventWithExtras<{
+      content_type?: string;
+      prompt?: string;
+      provider?: string;
+      reader_mode?: string;
+      selection?: string;
+      source?: string;
+    }>;
+    provider: GleanString;
+    providerChange: GleanEventWithExtras<{ current?: string; previous?: string; surface?: string }>;
+    shortcuts: GleanBoolean;
+    shortcutsCheckboxClick: GleanEventWithExtras<{ enabled?: string }>;
+    shortcutsCustom: GleanBoolean;
+    shortcutsDisplayed: GleanEventWithExtras<{
+      delay?: string;
+      inputType?: string;
+      selection?: string;
+    }>;
+    shortcutsExpanded: GleanEventWithExtras<{
+      provider?: string;
+      selection?: string;
+      warning?: string;
+    }>;
+    shortcutsHideClick: GleanEventWithExtras<{ selection?: string }>;
+    shortcutsPromptClick: GleanEventWithExtras<{
+      prompt?: string;
+      provider?: string;
+      selection?: string;
+    }>;
+    sidebar: GleanBoolean;
+    sidebarCloseClick: GleanEventWithExtras<{ provider?: string }>;
+    sidebarMoreMenuClick: GleanEventWithExtras<{ action?: string; provider?: string }>;
+    sidebarMoreMenuDisplay: GleanEventWithExtras<{ provider?: string }>;
+    sidebarProviderMenuClick: GleanEventWithExtras<{ action?: string; provider?: string }>;
+    sidebarToggle: GleanEventWithExtras<{
+      opened?: string;
+      provider?: string;
+      reason?: string;
+      version?: string;
+    }>;
+    summarizePage: GleanEventWithExtras<{
+      provider?: string;
+      reader_mode?: string;
+      selection?: string;
+      source?: string;
+    }>;
+  };
+
+  genaiLinkpreview: {
+    aiOptin: GleanBoolean;
+    cardAiConsent: GleanEventWithExtras<{ option?: string }>;
+    cardClose: GleanEventWithExtras<{ duration?: string; tab?: string }>;
+    cardLink: GleanEventWithExtras<{ key_points?: string; source?: string; tab?: string }>;
+    enabled: GleanBoolean;
+    fetch: GleanEventWithExtras<{
+      description?: string;
+      image?: string;
+      length?: string;
+      outcome?: string;
+      sitename?: string;
+      skipped?: string;
+      tab?: string;
+      time?: string;
+      title?: string;
+    }>;
+    generate: GleanEventWithExtras<{
+      delay?: string;
+      download?: string;
+      latency?: string;
+      outcome?: string;
+      sentences?: string;
+      time?: string;
+    }>;
+    keyPoints: GleanBoolean;
+    keyPointsToggle: GleanEventWithExtras<{ expand?: string }>;
+    onboardingCard: GleanEventWithExtras<{ action?: string; type?: string }>;
+    prefChanged: GleanEventWithExtras<{ enabled?: string; pref?: string }>;
+    shortcut: GleanString;
+    start: GleanEventWithExtras<{ cached?: string; source?: string; tab?: string }>;
+  };
+
+  ipprotection: {
+    clickUpgradeButton: GleanEventNoExtras;
+    enabled: GleanBoolean;
+    toggled: GleanEventWithExtras<{ duration?: string; enabled?: string; userAction?: string }>;
+    usageRx: GleanMemoryDistribution;
+    usageTx: GleanMemoryDistribution;
+  };
+
+  backgroundUpdate: {
+    reasonsToNotUpdate: GleanStringList;
+    timeLastUpdateScheduled: GleanDatetime;
+    automaticRestartAttempted: GleanBoolean;
+    automaticRestartSuccess: GleanBoolean;
+    clientId: GleanUuid;
+    daysSinceLastBrowsed: GleanQuantity;
+    debounced: GleanCounter;
+    exitCodeException: GleanBoolean;
+    exitCodeSuccess: GleanBoolean;
+    finalState: GleanString;
+    reasons: GleanStringList;
+    states: GleanStringList;
+    targetingEnvCurrentDate: GleanDatetime;
+    targetingEnvFirefoxVersion: GleanQuantity;
+    targetingEnvProfileAge: GleanDatetime;
+    targetingException: GleanBoolean;
+    targetingExists: GleanBoolean;
+    targetingVersion: GleanQuantity;
+    throttled: GleanBoolean;
+  };
+
+  browser: {
+    attributionErrors: Record<
+      | 'decode_error'
+      | 'empty_error'
+      | 'null_error'
+      | 'quarantine_error'
+      | 'read_error'
+      | 'write_error',
+      GleanCounter
+    >;
+    defaultAtLaunch: GleanBoolean;
+    isUserDefault: Record<'false' | 'true', GleanCounter>;
+    isUserDefaultError: Record<'false' | 'true', GleanCounter>;
+    setDefaultAlwaysCheck: Record<'false' | 'true', GleanCounter>;
+    setDefaultDialogPromptRawcount: GleanCustomDistribution;
+    setDefaultError: Record<'false' | 'true', GleanCounter>;
+    setDefaultPdfHandlerUserChoiceResult: Record<
+      | 'ErrBuild'
+      | 'ErrExeHash'
+      | 'ErrExeOther'
+      | 'ErrExeProgID'
+      | 'ErrExeRejected'
+      | 'ErrExeTimeout'
+      | 'ErrHash'
+      | 'ErrLaunchExe'
+      | 'ErrOther'
+      | 'ErrProgID'
+      | 'Success',
+      GleanCounter
+    >;
+    setDefaultResult: GleanCustomDistribution;
+    setDefaultUserChoiceResult: Record<
+      | 'ErrBuild'
+      | 'ErrExeHash'
+      | 'ErrExeOther'
+      | 'ErrExeProgID'
+      | 'ErrExeRejected'
+      | 'ErrExeTimeout'
+      | 'ErrHash'
+      | 'ErrLaunchExe'
+      | 'ErrOther'
+      | 'ErrProgID'
+      | 'Success',
+      GleanCounter
+    >;
+  };
+
+  browserLaunchedToHandle: {
+    systemNotification: GleanEventWithExtras<{ action?: string; name?: string }>;
+  };
+
+  browserStartup: {
+    abouthomeCacheResult: GleanQuantity;
+    abouthomeCacheShutdownwrite: GleanBoolean;
+    kioskMode: GleanBoolean;
+  };
+
+  datasanitization: {
+    privacyClearOnShutdownCache: GleanBoolean;
+    privacyClearOnShutdownCookies: GleanBoolean;
+    privacyClearOnShutdownDownloads: GleanBoolean;
+    privacyClearOnShutdownFormdata: GleanBoolean;
+    privacyClearOnShutdownHistory: GleanBoolean;
+    privacyClearOnShutdownOfflineApps: GleanBoolean;
+    privacyClearOnShutdownOpenWindows: GleanBoolean;
+    privacyClearOnShutdownSessions: GleanBoolean;
+    privacyClearOnShutdownSiteSettings: GleanBoolean;
+    privacySanitizeSanitizeOnShutdown: GleanBoolean;
+    sessionPermissionExceptions: GleanQuantity;
+  };
+
+  launchOnLogin: {
+    lastProfileDisableStartup: GleanEventNoExtras;
+  };
+
+  osEnvironment: {
+    invokedToHandle: Record<string, GleanCounter>;
+    isDefaultHandler: Record<string, GleanBoolean>;
+    isKeptInDock: GleanBoolean;
+    isTaskbarPinned: GleanBoolean;
+    isTaskbarPinnedPrivate: GleanBoolean;
+    launchMethod: GleanString;
+    launchedToHandle: Record<string, GleanCounter>;
+    allowedAppSources: GleanString;
+    isAdminWithoutUac: GleanBoolean;
+  };
+
+  primaryPassword: {
+    enabled: GleanBoolean;
+  };
+
+  security: {
+    globalPrivacyControlEnabled: GleanQuantity;
+    httpsOnlyModeEnabled: GleanQuantity;
+    httpsOnlyModeEnabledPbm: GleanQuantity;
+    fissionPrincipals: GleanEventWithExtras<{
+      principalType?: string;
+      scheme?: string;
+      value?: string;
+    }>;
+    shadowedHtmlDocumentPropertyAccess: GleanEventWithExtras<{ name?: string }>;
+    shadowedHtmlFormElementPropertyAccess: GleanEventWithExtras<{ name?: string }>;
+    cspViolationInternalPage: GleanEventWithExtras<{
+      blockeduridetails?: string;
+      blockeduritype?: string;
+      columnnumber?: string;
+      directive?: string;
+      linenumber?: string;
+      sample?: string;
+      selfdetails?: string;
+      selftype?: string;
+      sourcedetails?: string;
+      sourcetype?: string;
+    }>;
+    evalUsageParentProcess: GleanEventWithExtras<{ fileinfo?: string; value?: string }>;
+    evalUsageSystemContext: GleanEventWithExtras<{ fileinfo?: string; value?: string }>;
+    httpsOnlyModeUpgradeTime: Record<
+      | 'sub_f_aborted'
+      | 'sub_f_cxnrefused'
+      | 'sub_f_other'
+      | 'sub_f_redirectloop'
+      | 'sub_f_ssl_badcertdm'
+      | 'sub_f_ssl_other'
+      | 'sub_f_ssl_selfsignd'
+      | 'sub_f_ssl_unkwnissr'
+      | 'sub_f_timeout'
+      | 'sub_successful'
+      | 'top_f_aborted'
+      | 'top_f_cxnrefused'
+      | 'top_f_other'
+      | 'top_f_redirectloop'
+      | 'top_f_ssl_badcertdm'
+      | 'top_f_ssl_other'
+      | 'top_f_ssl_selfsignd'
+      | 'top_f_ssl_unkwnissr'
+      | 'top_f_timeout'
+      | 'top_successful',
+      GleanTimingDistribution
+    >;
+    httpsOnlyModeUpgradeType: GleanDualLabeledCounter;
+    javascriptLoadParentProcess: GleanEventWithExtras<{
+      blocked?: string;
+      fileinfo?: string;
+      value?: string;
+    }>;
+    referrerPolicyCount: GleanCustomDistribution;
+    unexpectedLoad: GleanEventWithExtras<{
+      contenttype?: string;
+      filedetails?: string;
+      redirects?: string;
+      remotetype?: string;
+      value?: string;
+    }>;
+    prefUsageContentProcess: GleanEventWithExtras<{ value?: string }>;
+    addonSignatureVerificationStatus: GleanCustomDistribution;
+    clientAuthCertUsage: Record<string, GleanCounter>;
+    contentSignatureVerificationErrors: GleanDualLabeledCounter;
+    contentSignatureVerificationStatus: GleanCustomDistribution;
+    ntlmModuleUsed: GleanCustomDistribution;
+  };
+
+  sslkeylogging: {
+    enabled: GleanBoolean;
+  };
+
+  startMenu: {
+    manuallyUnpinnedSinceLastLaunch: GleanEventNoExtras;
+  };
+
+  startup: {
+    isCold: GleanBoolean;
+    secondsSinceLastOsRestart: GleanQuantity;
+    profileCount: GleanQuantity;
+    profileDatabaseVersion: GleanString;
+    profileSelectionReason: GleanString;
+  };
+
+  upgradeDialog: {
+    triggerReason: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  browserMigration: {
+    bookmarksQuantity: Record<string, GleanCustomDistribution>;
+    browserSelectedWizard: GleanEventWithExtras<{ migrator_key?: string }>;
+    cardsQuantity: Record<string, GleanCustomDistribution>;
+    chromePasswordFileWizard: GleanEventNoExtras;
+    entryPointCategorical: Record<
+      | 'bookmarks_toolbar'
+      | 'file_menu'
+      | 'firstrun'
+      | 'fxrefresh'
+      | 'help_menu'
+      | 'newtab'
+      | 'passwords'
+      | 'places'
+      | 'preferences'
+      | 'unknown',
+      GleanCounter
+    >;
+    errors: Record<string, GleanCustomDistribution>;
+    extensionsQuantity: Record<string, GleanCustomDistribution>;
+    historyQuantity: Record<string, GleanCustomDistribution>;
+    linuxPermsWizard: GleanEventWithExtras<{ migrator_key?: string }>;
+    loginsQuantity: Record<string, GleanCustomDistribution>;
+    matchedExtensions: GleanStringList;
+    migrationFinishedWizard: GleanEventWithExtras<{
+      bookmarks?: string;
+      extensions?: string;
+      formdata?: string;
+      history?: string;
+      migrator_key?: string;
+      other?: string;
+      passwords?: string;
+      payment_methods?: string;
+    }>;
+    migrationStartedWizard: GleanEventWithExtras<{
+      bookmarks?: string;
+      extensions?: string;
+      formdata?: string;
+      history?: string;
+      migrator_key?: string;
+      other?: string;
+      passwords?: string;
+      payment_methods?: string;
+    }>;
+    noBrowsersFoundWizard: GleanEventNoExtras;
+    openedWizard: GleanEventNoExtras;
+    profileSelectedWizard: GleanEventWithExtras<{ migrator_key?: string }>;
+    resourcesSelectedWizard: GleanEventWithExtras<{
+      bookmarks?: string;
+      configured?: string;
+      extensions?: string;
+      formdata?: string;
+      history?: string;
+      migrator_key?: string;
+      other?: string;
+      passwords?: string;
+      payment_methods?: string;
+    }>;
+    safariPasswordFileWizard: GleanEventNoExtras;
+    safariPermsWizard: GleanEventNoExtras;
+    sourceBrowser: GleanCustomDistribution;
+    unmatchedExtensions: GleanStringList;
+    usage: Record<string, GleanCustomDistribution>;
+  };
+
+  migration: {
+    discoveredMigrators: Record<string, GleanCounter>;
+    timeToProduceMigratorList: GleanTimespan;
+    uninstallerProfileRefresh: GleanBoolean;
+  };
+
+  activityStream: {
+    endSession: GleanEventWithExtras<{
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventBlock: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventBookmarkAdd: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventBookmarkDelete: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventClick: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventClickPrivacyInfo: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventCloseNewtabPrefs: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDelete: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDeleteConfirm: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDialogCancel: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDialogOpen: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDisclaimerAcked: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDrag: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventDrop: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventFakespotCategory: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventFakespotClick: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventHidePersonalize: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventImpression: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuAddSearch: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuAddTopsite: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuCollapse: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuExpand: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuManage: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuMoveDown: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuMoveUp: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuPrivacyNotice: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMenuRemove: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMigrationCancel: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventMigrationStart: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventOpenNewWindow: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventOpenNewtabPrefs: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventOpenPrivateWindow: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventPin: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventPocketThumbsDown: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventPocketThumbsUp: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventPrefChanged: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventPreviewRequest: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSearch: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSearchEditAdd: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSearchEditClose: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSearchEditDelete: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSearchHandoff: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventShowPersonalize: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventShowPrivacyInfo: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSkippedSignin: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventSubmitEmail: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventTopSitesEdit: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventTopSitesEditClose: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventTopsiteSponsorInfo: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+    eventUnpin: GleanEventWithExtras<{
+      action_position?: string;
+      addon_version?: string;
+      page?: string;
+      session_id?: string;
+      user_prefs?: string;
+      value?: string;
+    }>;
+  };
+
+  contextualServicesTopsites: {
+    click: Record<string, GleanCounter>;
+    impression: Record<string, GleanCounter>;
+  };
+
+  deletionRequest: {
+    contextId: GleanString;
+    impressionId: GleanString;
+    syncDeviceId: GleanString;
+  };
+
+  newtab: {
+    abouthomeCacheConstruction: GleanTimingDistribution;
+    activityStreamCtorSuccess: GleanBoolean;
+    addonReadySuccess: GleanBoolean;
+    addonXpiUsed: GleanBoolean;
+    blockedSponsors: GleanStringList;
+    closed: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    fakespotAboutClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    fakespotCategory: GleanEventWithExtras<{ category?: string; newtab_visit_id?: string }>;
+    fakespotClick: GleanEventWithExtras<{
+      category?: string;
+      newtab_visit_id?: string;
+      product_id?: string;
+    }>;
+    fakespotCtaClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    fakespotDismiss: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    fakespotProductImpression: GleanEventWithExtras<{
+      category?: string;
+      newtab_visit_id?: string;
+      product_id?: string;
+      product_title?: string;
+    }>;
+    featureHighlightDismiss: GleanEventWithExtras<{ feature?: string; newtab_visit_id?: string }>;
+    featureHighlightImpression: GleanEventWithExtras<{
+      feature?: string;
+      newtab_visit_id?: string;
+    }>;
+    featureHighlightOpen: GleanEventWithExtras<{ feature?: string; newtab_visit_id?: string }>;
+    homepageCategory: GleanString;
+    inlineSelectionClick: GleanEventWithExtras<{
+      is_followed?: string;
+      newtab_visit_id?: string;
+      section_position?: string;
+      topic?: string;
+      topic_position?: string;
+    }>;
+    inlineSelectionImpression: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      section_position?: string;
+    }>;
+    locale: GleanString;
+    metricRegistered: Record<string, GleanBoolean>;
+    newtabCategory: GleanString;
+    opened: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      source?: string;
+      window_inner_height?: string;
+      window_inner_width?: string;
+    }>;
+    pingRegistered: Record<string, GleanBoolean>;
+    promoCardClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    promoCardDismiss: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    promoCardImpression: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    sectionsBlockSection: GleanEventWithExtras<{
+      content_redacted?: string;
+      event_source?: string;
+      newtab_visit_id?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsFollowSection: GleanEventWithExtras<{
+      content_redacted?: string;
+      event_source?: string;
+      newtab_visit_id?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsImpression: GleanEventWithExtras<{
+      content_redacted?: string;
+      is_section_followed?: string;
+      newtab_visit_id?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsUnblockSection: GleanEventWithExtras<{
+      content_redacted?: string;
+      event_source?: string;
+      newtab_visit_id?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsUnfollowSection: GleanEventWithExtras<{
+      content_redacted?: string;
+      event_source?: string;
+      newtab_visit_id?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    selectedTopics: GleanStringList;
+    sovAllocation: GleanStringList;
+    sponsNavTrafficRecvd: GleanMemoryDistribution;
+    sponsNavTrafficSent: GleanMemoryDistribution;
+    tooltipClick: GleanEventWithExtras<{ feature?: string; newtab_visit_id?: string }>;
+    topicSelectionDismiss: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    topicSelectionOpen: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    topicSelectionTopicsSaved: GleanEventWithExtras<{
+      first_save?: string;
+      newtab_visit_id?: string;
+      previous_topics?: string;
+      topics?: string;
+    }>;
+    trendingSearchDismiss: GleanEventWithExtras<{ newtab_visit_id?: string; variant?: string }>;
+    trendingSearchImpression: GleanEventWithExtras<{ newtab_visit_id?: string; variant?: string }>;
+    trendingSearchSuggestionOpen: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      variant?: string;
+    }>;
+    wallpaperCategoryClick: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      selected_category?: string;
+    }>;
+    wallpaperClick: GleanEventWithExtras<{
+      had_previous_wallpaper?: string;
+      had_uploaded_previously?: string;
+      newtab_visit_id?: string;
+      selected_wallpaper?: string;
+    }>;
+    wallpaperHighlightCtaClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    wallpaperHighlightDismissed: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    weatherChangeDisplay: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      weather_display_mode?: string;
+    }>;
+    weatherEnabled: GleanBoolean;
+    weatherImpression: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    weatherLoadError: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    weatherLocationSelected: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    weatherOpenProviderUrl: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    widgetsListsChangeDisplay: GleanEventWithExtras<{
+      display_status?: string;
+      newtab_visit_id?: string;
+    }>;
+    widgetsListsImpression: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    widgetsListsUserEvent: GleanEventWithExtras<{ newtab_visit_id?: string; user_action?: string }>;
+    widgetsTimerChangeDisplay: GleanEventWithExtras<{
+      display_status?: string;
+      newtab_visit_id?: string;
+    }>;
+    widgetsTimerImpression: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    widgetsTimerToggleNotification: GleanEventWithExtras<{
+      display_status?: string;
+      newtab_visit_id?: string;
+    }>;
+    widgetsTimerUserEvent: GleanEventWithExtras<{ newtab_visit_id?: string; user_action?: string }>;
+  };
+
+  newtabHandoffPreference: {
+    enabled: GleanBoolean;
+  };
+
+  newtabSearch: {
+    enabled: GleanBoolean;
+    issued: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      search_access_point?: string;
+      telemetry_id?: string;
+    }>;
+  };
+
+  newtabContent: {
+    click: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      matches_selected_topic?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      selected_topics?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    coarseOs: GleanString;
+    country: GleanString;
+    dismiss: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      tile_id?: string;
+    }>;
+    experimentBranch: GleanString;
+    experimentName: GleanString;
+    followedSections: GleanStringList;
+    impression: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      selected_topics?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    inferredInterests: GleanObject;
+    pingVersion: GleanQuantity;
+    reportContentOpen: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      scheduled_corpus_item_id?: string;
+    }>;
+    reportContentSubmit: GleanEventWithExtras<{
+      card_type?: string;
+      corpus_item_id?: string;
+      report_reason?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      title?: string;
+      topic?: string;
+      url?: string;
+    }>;
+    sectionsBlockSection: GleanEventWithExtras<{
+      event_source?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsFollowSection: GleanEventWithExtras<{
+      event_source?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsImpression: GleanEventWithExtras<{
+      is_section_followed?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsUnblockSection: GleanEventWithExtras<{
+      event_source?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    sectionsUnfollowSection: GleanEventWithExtras<{
+      event_source?: string;
+      section?: string;
+      section_position?: string;
+    }>;
+    surfaceId: GleanString;
+    thumbVotingInteraction: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      thumbs_down?: string;
+      thumbs_up?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    utcOffset: GleanQuantity;
+  };
+
+  pocket: {
+    click: GleanEventWithExtras<{
+      content_redacted?: string;
+      corpus_item_id?: string;
+      event_source?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      matches_selected_topic?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      selected_topics?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    dismiss: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      tile_id?: string;
+    }>;
+    enabled: GleanBoolean;
+    fetchTimestamp: GleanDatetime;
+    impression: GleanEventWithExtras<{
+      content_redacted?: string;
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      selected_topics?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    isSignedIn: GleanBoolean;
+    newtabCreationTimestamp: GleanDatetime;
+    save: GleanEventWithExtras<{
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      is_sponsored?: string;
+      matches_selected_topic?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      selected_topics?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    shim: GleanText;
+    sponsoredStoriesEnabled: GleanBoolean;
+    thumbVotingInteraction: GleanEventWithExtras<{
+      content_redacted?: string;
+      corpus_item_id?: string;
+      format?: string;
+      is_list_card?: string;
+      is_section_followed?: string;
+      newtab_visit_id?: string;
+      received_rank?: string;
+      recommendation_id?: string;
+      recommended_at?: string;
+      scheduled_corpus_item_id?: string;
+      section?: string;
+      section_position?: string;
+      thumbs_down?: string;
+      thumbs_up?: string;
+      tile_id?: string;
+      topic?: string;
+    }>;
+    topicClick: GleanEventWithExtras<{ newtab_visit_id?: string; topic?: string }>;
+  };
+
+  topSites: {
+    advertiser: GleanString;
+    contextId: GleanUuid;
+    pingType: GleanString;
+    position: GleanQuantity;
+    reportingUrl: GleanUrl;
+    source: GleanString;
+    tileId: GleanString;
+  };
+
+  topsites: {
+    add: GleanEventWithExtras<{
+      advertiser_name?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    click: GleanEventWithExtras<{
+      advertiser_name?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    dismiss: GleanEventWithExtras<{
+      advertiser_name?: string;
+      content_redacted?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    edit: GleanEventWithExtras<{
+      advertiser_name?: string;
+      has_title_changed?: string;
+      has_url_changed?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    enabled: GleanBoolean;
+    impression: GleanEventWithExtras<{
+      advertiser_name?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    pin: GleanEventWithExtras<{
+      advertiser_name?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    prefChanged: GleanEventWithExtras<{ new_value?: string; pref_name?: string }>;
+    rows: GleanQuantity;
+    showPrivacyClick: GleanEventWithExtras<{
+      advertiser_name?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+    sponsoredEnabled: GleanBoolean;
+    sponsoredTilesConfigured: GleanQuantity;
+    sponsoredTilesReceived: GleanText;
+    unpin: GleanEventWithExtras<{
+      advertiser_name?: string;
+      is_sponsored?: string;
+      newtab_visit_id?: string;
+      position?: string;
+      tile_id?: string;
+    }>;
+  };
+
+  bookmarksSidebar: {
+    cumulativeSearches: GleanCustomDistribution;
+  };
+
+  bookmarksToolbar: {
+    init: GleanTimingDistribution;
+  };
+
+  historySidebar: {
+    cumulativeFilterCount: GleanCustomDistribution;
+    cumulativeSearches: GleanCustomDistribution;
+    filterType: Record<'day' | 'dayandsite' | 'lastvisited' | 'site' | 'visited', GleanCounter>;
+    lastvisitedTreeQueryTime: GleanTimingDistribution;
+  };
+
+  library: {
+    cumulativeBookmarkSearches: GleanCustomDistribution;
+    cumulativeHistorySearches: GleanCustomDistribution;
+    historySearchTime: GleanTimingDistribution;
+    link: Record<string, GleanCounter>;
+    opened: Record<string, GleanCounter>;
+    search: Record<string, GleanCounter>;
+  };
+
+  aboutpreferences: {
+    showClick: GleanEventWithExtras<{ value?: string }>;
+    showHash: GleanEventWithExtras<{ value?: string }>;
+    showInitial: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  intlUiBrowserLanguage: {
+    acceptDialog: GleanEventWithExtras<{ value?: string }>;
+    addDialog: GleanEventWithExtras<{ installId?: string; value?: string }>;
+    applyMain: GleanEventNoExtras;
+    cancelDialog: GleanEventWithExtras<{ value?: string }>;
+    manageMain: GleanEventWithExtras<{ value?: string }>;
+    removeDialog: GleanEventWithExtras<{ value?: string }>;
+    reorderDialog: GleanEventWithExtras<{ value?: string }>;
+    reorderMain: GleanEventNoExtras;
+    searchDialog: GleanEventWithExtras<{ value?: string }>;
+    searchMain: GleanEventWithExtras<{ value?: string }>;
+    setFallbackDialog: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  networkProxySettings: {
+    proxyTypePreference: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  privacyUiFppClick: {
+    checkbox: GleanEventWithExtras<{ checked?: string }>;
+    menu: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  securityDohSettings: {
+    modeChangedButton: GleanEventWithExtras<{ value?: string }>;
+    providerChoiceValue: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  aboutprivatebrowsing: {
+    clickDismissButton: GleanEventNoExtras;
+    clickInfoLink: GleanEventNoExtras;
+    clickPromoLink: GleanEventNoExtras;
+  };
+
+  privateBrowsingResetPbm: {
+    confirmPanel: GleanEventWithExtras<{ action?: string; reason?: string }>;
+    resetAction: GleanEventWithExtras<{ did_confirm?: string }>;
+  };
+
+  profileLock: {
+    failedLockCount: GleanQuantity;
+  };
+
+  profilesDefault: {
+    updated: GleanEventNoExtras;
+  };
+
+  profilesDelete: {
+    cancel: GleanEventNoExtras;
+    confirm: GleanEventNoExtras;
+    displayed: GleanEventNoExtras;
+  };
+
+  profilesExisting: {
+    alert: GleanEventWithExtras<{ value?: string }>;
+    avatar: GleanEventWithExtras<{ value?: string }>;
+    closed: GleanEventWithExtras<{ value?: string }>;
+    deleted: GleanEventNoExtras;
+    displayed: GleanEventNoExtras;
+    learnMore: GleanEventNoExtras;
+    name: GleanEventNoExtras;
+    theme: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  profilesNew: {
+    alert: GleanEventWithExtras<{ value?: string }>;
+    avatar: GleanEventWithExtras<{ value?: string }>;
+    closed: GleanEventWithExtras<{ value?: string }>;
+    deleted: GleanEventNoExtras;
+    displayed: GleanEventNoExtras;
+    learnMore: GleanEventNoExtras;
+    name: GleanEventNoExtras;
+    theme: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  profilesSelectorWindow: {
+    launch: GleanEventNoExtras;
+    showAtStartup: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  securityUiProtections: {
+    clickLwAboutLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickLwOpenButton: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickLwSyncLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickMobileAppLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickMtrAboutLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickMtrReportLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickMtrSignupButton: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickSettingsLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickTrackersAboutLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickVpnAppLinkAndroid: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickVpnAppLinkIos: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickVpnBannerClose: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickVpnBannerLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    clickVpnCardLink: GleanEventWithExtras<{ category?: string; value?: string }>;
+    closeProtectionReport: GleanEventWithExtras<{ category?: string; value?: string }>;
+    showProtectionReport: GleanEventWithExtras<{ category?: string; value?: string }>;
+    showVpnBanner: GleanEventWithExtras<{ category?: string; value?: string }>;
+  };
+
+  protocolhandlerMailto: {
+    handlerPromptShown: Record<'fx_default' | 'os_default', GleanCounter>;
+    promptClicked: Record<
+      | 'dismiss_local_default'
+      | 'dismiss_os_default'
+      | 'set_local_default'
+      | 'set_os_default'
+      | 'set_os_default_error'
+      | 'set_os_default_impossible',
+      GleanCounter
+    >;
+    visit: GleanEventWithExtras<{ triggered_externally?: string }>;
+  };
+
+  screenshots: {
+    canceledContextMenu: GleanEventNoExtras;
+    canceledEscape: GleanEventNoExtras;
+    canceledNavigation: GleanEventNoExtras;
+    canceledOverlayCancel: GleanEventNoExtras;
+    canceledPreviewCancel: GleanEventNoExtras;
+    canceledQuickActions: GleanEventNoExtras;
+    canceledShortcut: GleanEventNoExtras;
+    canceledToolbarButton: GleanEventNoExtras;
+    copyOverlayCopy: GleanEventWithExtras<{
+      element?: string;
+      fullpage?: string;
+      move?: string;
+      region?: string;
+      resize?: string;
+      visible?: string;
+    }>;
+    copyPreviewCopy: GleanEventWithExtras<{
+      element?: string;
+      fullpage?: string;
+      move?: string;
+      region?: string;
+      resize?: string;
+      visible?: string;
+    }>;
+    downloadOverlayDownload: GleanEventWithExtras<{
+      element?: string;
+      fullpage?: string;
+      move?: string;
+      region?: string;
+      resize?: string;
+      visible?: string;
+    }>;
+    downloadPreviewDownload: GleanEventWithExtras<{
+      element?: string;
+      fullpage?: string;
+      move?: string;
+      region?: string;
+      resize?: string;
+      visible?: string;
+    }>;
+    failedScreenshotTooLarge: GleanEventNoExtras;
+    selectedElement: GleanEventNoExtras;
+    selectedFullPage: GleanEventNoExtras;
+    selectedRegionSelection: GleanEventNoExtras;
+    selectedVisible: GleanEventNoExtras;
+    startedContextMenu: GleanEventNoExtras;
+    startedOverlayRetry: GleanEventNoExtras;
+    startedPreviewRetry: GleanEventNoExtras;
+    startedQuickActions: GleanEventNoExtras;
+    startedShortcut: GleanEventNoExtras;
+    startedToolbarButton: GleanEventNoExtras;
+  };
+
+  browserEngagementNavigation: {
+    aboutHome: Record<string, GleanCounter>;
+    aboutNewtab: Record<string, GleanCounter>;
+    contextmenu: Record<string, GleanCounter>;
+    contextmenuVisual: Record<string, GleanCounter>;
+    searchbar: Record<string, GleanCounter>;
+    urlbar: Record<string, GleanCounter>;
+    urlbarHandoff: Record<string, GleanCounter>;
+    urlbarPersisted: Record<string, GleanCounter>;
+    urlbarSearchmode: Record<string, GleanCounter>;
+    webextension: Record<string, GleanCounter>;
+  };
+
+  browserSearchAdclicks: {
+    aboutHome: Record<string, GleanCounter>;
+    aboutNewtab: Record<string, GleanCounter>;
+    contextmenu: Record<string, GleanCounter>;
+    contextmenuVisual: Record<string, GleanCounter>;
+    reload: Record<string, GleanCounter>;
+    searchbar: Record<string, GleanCounter>;
+    system: Record<string, GleanCounter>;
+    tabhistory: Record<string, GleanCounter>;
+    unknown: Record<string, GleanCounter>;
+    urlbar: Record<string, GleanCounter>;
+    urlbarHandoff: Record<string, GleanCounter>;
+    urlbarPersisted: Record<string, GleanCounter>;
+    urlbarSearchmode: Record<string, GleanCounter>;
+    webextension: Record<string, GleanCounter>;
+  };
+
+  browserSearchContent: {
+    aboutHome: Record<string, GleanCounter>;
+    aboutNewtab: Record<string, GleanCounter>;
+    contextmenu: Record<string, GleanCounter>;
+    contextmenuVisual: Record<string, GleanCounter>;
+    reload: Record<string, GleanCounter>;
+    searchbar: Record<string, GleanCounter>;
+    system: Record<string, GleanCounter>;
+    tabhistory: Record<string, GleanCounter>;
+    unknown: Record<string, GleanCounter>;
+    urlbar: Record<string, GleanCounter>;
+    urlbarHandoff: Record<string, GleanCounter>;
+    urlbarPersisted: Record<string, GleanCounter>;
+    urlbarSearchmode: Record<string, GleanCounter>;
+    webextension: Record<string, GleanCounter>;
+  };
+
+  browserSearchWithads: {
+    aboutHome: Record<string, GleanCounter>;
+    aboutNewtab: Record<string, GleanCounter>;
+    contextmenu: Record<string, GleanCounter>;
+    contextmenuVisual: Record<string, GleanCounter>;
+    reload: Record<string, GleanCounter>;
+    searchbar: Record<string, GleanCounter>;
+    system: Record<string, GleanCounter>;
+    tabhistory: Record<string, GleanCounter>;
+    unknown: Record<string, GleanCounter>;
+    urlbar: Record<string, GleanCounter>;
+    urlbarHandoff: Record<string, GleanCounter>;
+    urlbarPersisted: Record<string, GleanCounter>;
+    urlbarSearchmode: Record<string, GleanCounter>;
+    webextension: Record<string, GleanCounter>;
+  };
+
+  newtabSearchAd: {
+    click: GleanEventWithExtras<{
+      is_follow_on?: string;
+      is_tagged?: string;
+      newtab_visit_id?: string;
+      search_access_point?: string;
+      telemetry_id?: string;
+    }>;
+    impression: GleanEventWithExtras<{
+      is_follow_on?: string;
+      is_tagged?: string;
+      newtab_visit_id?: string;
+      search_access_point?: string;
+      telemetry_id?: string;
+    }>;
+  };
+
+  sap: {
+    counts: GleanEventWithExtras<{
+      overridden_by_third_party?: string;
+      partner_code?: string;
+      provider_id?: string;
+      provider_name?: string;
+      source?: string;
+    }>;
+    deprecatedCounts: Record<string, GleanCounter>;
+    searchFormCounts: GleanEventWithExtras<{ provider_id?: string; source?: string }>;
+  };
+
+  sapImpressionCounts: {
+    contextmenuVisual: Record<string, GleanCounter>;
+  };
+
+  searchWith: {
+    contextId: GleanUuid;
+    reportingUrl: GleanUrl;
+  };
+
+  searchbar: {
+    selectedResultMethod: Record<'click' | 'enter' | 'enterSelection', GleanCounter>;
+  };
+
+  serp: {
+    abandonment: GleanEventWithExtras<{ impression_id?: string; reason?: string }>;
+    adImpression: GleanEventWithExtras<{
+      ads_hidden?: string;
+      ads_loaded?: string;
+      ads_visible?: string;
+      component?: string;
+      impression_id?: string;
+    }>;
+    adsBlockedCount: Record<'beyond_viewport' | 'hidden_child' | 'hidden_parent', GleanCounter>;
+    categorization: GleanEventWithExtras<{
+      app_version?: string;
+      channel?: string;
+      is_shopping_page?: string;
+      mappings_version?: string;
+      num_ads_clicked?: string;
+      num_ads_hidden?: string;
+      num_ads_loaded?: string;
+      num_ads_visible?: string;
+      organic_category?: string;
+      organic_num_domains?: string;
+      organic_num_inconclusive?: string;
+      organic_num_unknown?: string;
+      partner_code?: string;
+      provider?: string;
+      region?: string;
+      sponsored_category?: string;
+      sponsored_num_domains?: string;
+      sponsored_num_inconclusive?: string;
+      sponsored_num_unknown?: string;
+      tagged?: string;
+    }>;
+    categorizationDuration: GleanTimingDistribution;
+    categorizationNoMapFound: GleanCounter;
+    engagement: GleanEventWithExtras<{ action?: string; impression_id?: string; target?: string }>;
+    experimentInfo: GleanObject;
+    impression: GleanEventWithExtras<{
+      impression_id?: string;
+      is_private?: string;
+      is_shopping_page?: string;
+      is_signed_in?: string;
+      partner_code?: string;
+      provider?: string;
+      search_mode?: string;
+      shopping_tab_displayed?: string;
+      source?: string;
+      tagged?: string;
+    }>;
+  };
+
+  urlbarSearchmode: {
+    bookmarkmenu: Record<string, GleanCounter>;
+    handoff: Record<string, GleanCounter>;
+    historymenu: Record<string, GleanCounter>;
+    keywordoffer: Record<string, GleanCounter>;
+    oneoff: Record<string, GleanCounter>;
+    other: Record<string, GleanCounter>;
+    searchbutton: Record<string, GleanCounter>;
+    shortcut: Record<string, GleanCounter>;
+    tabmenu: Record<string, GleanCounter>;
+    tabtosearch: Record<string, GleanCounter>;
+    tabtosearchOnboard: Record<string, GleanCounter>;
+    topsitesNewtab: Record<string, GleanCounter>;
+    topsitesUrlbar: Record<string, GleanCounter>;
+    touchbar: Record<string, GleanCounter>;
+    typed: Record<string, GleanCounter>;
+  };
+
+  sessionRestore: {
+    allFilesCorrupt: Record<'false' | 'true', GleanCounter>;
+    autoRestoreDurationUntilEagerTabsRestored: GleanTimingDistribution;
+    backupCanBeLoadedSessionFile: GleanEventWithExtras<{
+      can_load?: string;
+      loadfail_reason?: string;
+      path_key?: string;
+    }>;
+    collectAllWindowsData: GleanTimingDistribution;
+    collectData: GleanTimingDistribution;
+    collectSessionHistory: GleanTimingDistribution;
+    corruptFile: Record<'false' | 'true', GleanCounter>;
+    fileSizeBytes: GleanMemoryDistribution;
+    manualRestoreDurationUntilEagerTabsRestored: GleanTimingDistribution;
+    numberOfEagerTabsRestored: GleanCustomDistribution;
+    numberOfTabsRestored: GleanCustomDistribution;
+    numberOfWindowsRestored: GleanCustomDistribution;
+    readFile: GleanTimingDistribution;
+    restoreWindow: GleanTimingDistribution;
+    shutdownFlushAllOutcomes: Record<
+      'abnormal_content_shutdown' | 'complete' | 'oop_frameloader_crashed' | 'timed_out',
+      GleanCounter
+    >;
+    shutdownOk: Record<'false' | 'true', GleanCounter>;
+    shutdownSuccessSessionStartup: GleanEventWithExtras<{
+      shutdown_ok?: string;
+      shutdown_reason?: string;
+    }>;
+    shutdownType: Record<'async' | 'sync', GleanCounter>;
+    startupInitSession: GleanTimingDistribution;
+    startupOnloadInitialWindow: GleanTimingDistribution;
+    startupTimeline: Record<'sessionRestoreInitialized' | 'sessionRestoreRestoring', GleanQuantity>;
+    writeFile: GleanTimingDistribution;
+  };
+
+  bookmarks: {
+    sidebarToggle: GleanEventWithExtras<{ opened?: string; version?: string }>;
+  };
+
+  contextualManager: {
+    passwordsEnabled: GleanEventWithExtras<{ checked?: string }>;
+    sidebarToggle: GleanEventWithExtras<{ opened?: string }>;
+    notificationInteraction: GleanEventWithExtras<{
+      action_type?: string;
+      notification_detail?: string;
+    }>;
+    notificationShown: GleanEventWithExtras<{ notification_detail?: string }>;
+    recordsInteraction: GleanEventWithExtras<{ interaction_type?: string }>;
+    recordsUpdate: GleanEventWithExtras<{ change_type?: string }>;
+    toolbarAction: GleanEventWithExtras<{ option_name?: string; trigger?: string }>;
+  };
+
+  extension: {
+    sidebarToggle: GleanEventWithExtras<{
+      addon_id?: string;
+      addon_name?: string;
+      opened?: string;
+      version?: string;
+    }>;
+  };
+
+  history: {
+    sidebarToggle: GleanEventWithExtras<{ opened?: string; version?: string }>;
+  };
+
+  pinnedTabs: {
+    activations: Record<'horizontal_bar' | 'sidebar', GleanCounter>;
+    close: GleanEventWithExtras<{ layout?: string }>;
+    count: Record<'horizontal_bar' | 'sidebar', GleanQuantity>;
+    pin: GleanEventWithExtras<{ layout?: string; source?: string }>;
+  };
+
+  sidebar: {
+    addonIconClick: GleanEventWithExtras<{ addon_id?: string; sidebar_open?: string }>;
+    bookmarksIconClick: GleanEventWithExtras<{ sidebar_open?: string }>;
+    chatbotIconClick: GleanEventWithExtras<{ sidebar_open?: string }>;
+    displaySettings: GleanString;
+    expand: GleanEventNoExtras;
+    historyIconClick: GleanEventWithExtras<{ sidebar_open?: string }>;
+    keyboardShortcut: GleanEventWithExtras<{ opened?: string; panel?: string }>;
+    link: Record<string, GleanCounter>;
+    positionSettings: GleanString;
+    resize: GleanEventWithExtras<{ current?: string; percentage?: string; previous?: string }>;
+    search: Record<string, GleanCounter>;
+    syncedTabsIconClick: GleanEventWithExtras<{ sidebar_open?: string }>;
+    tabsLayout: GleanString;
+    width: GleanQuantity;
+  };
+
+  sidebarCustomize: {
+    bookmarksEnabled: GleanEventWithExtras<{ checked?: string }>;
+    chatbotEnabled: GleanEventWithExtras<{ checked?: string }>;
+    expandOnHoverEnabled: GleanEventWithExtras<{ checked?: string }>;
+    extensionsClicked: GleanEventNoExtras;
+    firefoxSettingsClicked: GleanEventNoExtras;
+    historyEnabled: GleanEventWithExtras<{ checked?: string }>;
+    iconClick: GleanEventNoExtras;
+    panelToggle: GleanEventWithExtras<{ opened?: string }>;
+    sidebarDisplay: GleanEventWithExtras<{ preference?: string }>;
+    sidebarPosition: GleanEventWithExtras<{ position?: string }>;
+    syncedTabsEnabled: GleanEventWithExtras<{ checked?: string }>;
+    tabsDisplay: GleanEventWithExtras<{ checked?: string }>;
+    tabsLayout: GleanEventWithExtras<{ orientation?: string }>;
+  };
+
+  syncedTabs: {
+    sidebarToggle: GleanEventWithExtras<{
+      opened?: string;
+      synced_tabs_loaded?: string;
+      version?: string;
+    }>;
+    clickFxaAppMenu: GleanEventWithExtras<{ filter?: string; tab_pos?: string }>;
+    clickFxaAvatarMenu: GleanEventWithExtras<{ filter?: string; tab_pos?: string }>;
+    clickSyncedTabsSidebar: GleanEventWithExtras<{ filter?: string; tab_pos?: string }>;
+  };
+
+  browserTabclose: {
+    permitUnloadTime: GleanTimingDistribution;
+    timeAnim: GleanTimingDistribution;
+    timeNoAnim: GleanTimingDistribution;
+  };
+
+  browserTabswitch: {
+    spinnerVisible: GleanTimingDistribution;
+    spinnerVisibleTrigger: Record<
+      | 'none'
+      | 'onEndSwapDocShells'
+      | 'onLayersReady'
+      | 'onLoadTimeout'
+      | 'onSizeModeOrOcc'
+      | 'postActions'
+      | 'preActions',
+      GleanCounter
+    >;
+    total: GleanTimingDistribution;
+    update: GleanTimingDistribution;
+  };
+
+  browserUiInteraction: {
+    allTabsPanelDragstartTabEventCount: GleanCounter;
+    allTabsPanelEntrypoint: Record<string, GleanCounter>;
+    textrecognitionError: GleanCounter;
+    appMenu: Record<string, GleanCounter>;
+    bookmarksBar: Record<string, GleanCounter>;
+    contentContext: Record<string, GleanCounter>;
+    menuBar: Record<string, GleanCounter>;
+    navBar: Record<string, GleanCounter>;
+    overflowMenu: Record<string, GleanCounter>;
+    pageactionPanel: Record<string, GleanCounter>;
+    pageactionUrlbar: Record<string, GleanCounter>;
+    pinnedOverflowMenu: Record<string, GleanCounter>;
+    preferencesPaneContainers: Record<string, GleanCounter>;
+    preferencesPaneExperimental: Record<string, GleanCounter>;
+    preferencesPaneGeneral: Record<string, GleanCounter>;
+    preferencesPaneHome: Record<string, GleanCounter>;
+    preferencesPaneMoreFromMozilla: Record<string, GleanCounter>;
+    preferencesPanePrivacy: Record<string, GleanCounter>;
+    preferencesPaneSearch: Record<string, GleanCounter>;
+    preferencesPaneSearchResults: Record<string, GleanCounter>;
+    preferencesPaneSync: Record<string, GleanCounter>;
+    preferencesPaneUnknown: Record<string, GleanCounter>;
+    tabsBar: Record<string, GleanCounter>;
+    tabsContext: Record<string, GleanCounter>;
+    tabsContextEntrypoint: Record<string, GleanCounter>;
+    unifiedExtensionsArea: Record<string, GleanCounter>;
+    verticalTabsContainer: Record<string, GleanCounter>;
+    keyboard: Record<string, GleanCounter>;
+  };
+
+  tabgroup: {
+    activeGroups: Record<'collapsed' | 'expanded', GleanQuantity>;
+    addTab: GleanEventWithExtras<{ layout?: string; source?: string; tabs?: string }>;
+    createGroup: GleanEventWithExtras<{
+      id?: string;
+      layout?: string;
+      source?: string;
+      tabs?: string;
+    }>;
+    delete: GleanEventWithExtras<{ id?: string; source?: string }>;
+    groupInteractions: Record<
+      | 'change_color'
+      | 'collapse'
+      | 'delete'
+      | 'expand'
+      | 'move_window'
+      | 'open_recent'
+      | 'open_suggest'
+      | 'open_tabmenu'
+      | 'rename'
+      | 'reopen'
+      | 'save'
+      | 'ungroup',
+      GleanCounter
+    >;
+    reopen: GleanEventWithExtras<{ id?: string; layout?: string; source?: string; type?: string }>;
+    save: GleanEventWithExtras<{ id?: string; user_triggered?: string }>;
+    savedGroups: GleanQuantity;
+    smartTab: GleanEventWithExtras<{ enabled?: string }>;
+    smartTabEnabled: GleanBoolean;
+    smartTabOptin: GleanEventWithExtras<{ step?: string }>;
+    smartTabSuggest: GleanEventWithExtras<{
+      action?: string;
+      backend?: string;
+      id?: string;
+      model_revision?: string;
+      tabs_approved?: string;
+      tabs_in_group?: string;
+      tabs_in_window?: string;
+      tabs_removed?: string;
+      tabs_suggested?: string;
+    }>;
+    smartTabTopic: GleanEventWithExtras<{
+      action?: string;
+      backend?: string;
+      id?: string;
+      label_reason?: string;
+      levenshtein_distance?: string;
+      ml_label_length?: string;
+      model_revision?: string;
+      tabs_in_group?: string;
+      user_label_length?: string;
+    }>;
+    tabCountInGroups: Record<'inside' | 'outside', GleanQuantity>;
+    tabInteractions: Record<
+      | 'activate'
+      | 'add'
+      | 'close_tab_other'
+      | 'close_tabmenu'
+      | 'close_tabstrip'
+      | 'duplicate'
+      | 'new'
+      | 'remove_new_window'
+      | 'remove_other_window'
+      | 'remove_same_window'
+      | 'reorder',
+      GleanCounter
+    >;
+    tabsPerActiveGroup: Record<'average' | 'max' | 'median' | 'min', GleanQuantity>;
+    tabsPerSavedGroup: Record<'average' | 'max' | 'median' | 'min', GleanQuantity>;
+    ungroup: GleanEventWithExtras<{ source?: string }>;
+  };
+
+  webApp: {
+    activate: GleanEventNoExtras;
+    eject: GleanEventNoExtras;
+    install: GleanEventNoExtras;
+    moveToTaskbar: GleanEventNoExtras;
+    pin: GleanEventWithExtras<{ result?: string }>;
+    uninstall: GleanEventNoExtras;
+    unpin: GleanEventWithExtras<{ result?: string }>;
+    usageTime: GleanTimingDistribution;
+  };
+
+  textRecognition: {
+    apiPerformance: GleanTimingDistribution;
+    interactionTiming: GleanTimingDistribution;
+    textLength: GleanCustomDistribution;
+  };
+
+  quickSuggest: {
+    advertiser: GleanString;
+    blockId: GleanString;
+    contextId: GleanUuid;
+    country: GleanString;
+    iabCategory: GleanString;
+    improveSuggestExperience: GleanBoolean;
+    isClicked: GleanBoolean;
+    matchType: GleanString;
+    pingType: GleanString;
+    position: GleanQuantity;
+    reportingUrl: GleanUrl;
+    requestId: GleanString;
+    source: GleanString;
+    suggestedIndex: GleanString;
+    suggestedIndexRelativeToGroup: GleanBoolean;
+  };
+
+  suggest: {
+    ingestDownloadTime: Record<
+      | 'amo-suggestions'
+      | 'amp'
+      | 'configuration'
+      | 'icon'
+      | 'mdn-suggestions'
+      | 'weather'
+      | 'wikipedia'
+      | 'yelp-suggestions',
+      GleanTimingDistribution
+    >;
+    ingestTime: Record<
+      | 'amo-suggestions'
+      | 'amp'
+      | 'configuration'
+      | 'icon'
+      | 'mdn-suggestions'
+      | 'weather'
+      | 'wikipedia'
+      | 'yelp-suggestions',
+      GleanTimingDistribution
+    >;
+    queryTime: Record<
+      'amo' | 'amp' | 'mdn' | 'weather' | 'wikipedia' | 'yelp',
+      GleanTimingDistribution
+    >;
+  };
+
+  suggestRelevance: {
+    outcome: Record<'boosted' | 'decreased', GleanCounter>;
+    status: Record<'failure' | 'success', GleanCounter>;
+  };
+
+  urlbar: {
+    abandonment: GleanEventWithExtras<{
+      abandonment_type?: string;
+      actions?: string;
+      available_semantic_sources?: string;
+      groups?: string;
+      interaction?: string;
+      n_chars?: string;
+      n_results?: string;
+      n_words?: string;
+      results?: string;
+      sap?: string;
+      search_engine_default_id?: string;
+      search_mode?: string;
+    }>;
+    autocompleteFirstResultTime: GleanTimingDistribution;
+    autocompleteSixthResultTime: GleanTimingDistribution;
+    autofillDeletion: GleanCounter;
+    bounce: GleanEventWithExtras<{
+      engagement_type?: string;
+      interaction?: string;
+      n_chars?: string;
+      n_results?: string;
+      n_words?: string;
+      provider?: string;
+      results?: string;
+      sap?: string;
+      search_engine_default_id?: string;
+      search_mode?: string;
+      selected_position?: string;
+      selected_result?: string;
+      threshold?: string;
+      view_time?: string;
+    }>;
+    disable: GleanEventWithExtras<{
+      feature?: string;
+      interaction?: string;
+      n_chars?: string;
+      n_results?: string;
+      n_words?: string;
+      results?: string;
+      sap?: string;
+      search_engine_default_id?: string;
+      search_mode?: string;
+      selected_result?: string;
+    }>;
+    engagement: GleanEventWithExtras<{
+      actions?: string;
+      available_semantic_sources?: string;
+      engagement_type?: string;
+      groups?: string;
+      interaction?: string;
+      n_chars?: string;
+      n_results?: string;
+      n_words?: string;
+      provider?: string;
+      results?: string;
+      sap?: string;
+      search_engine_default_id?: string;
+      search_mode?: string;
+      selected_position?: string;
+      selected_result?: string;
+    }>;
+    exposure: GleanEventWithExtras<{ results?: string; terminal?: string }>;
+    heuristicResultMissing: GleanRate;
+    keywordExposure: GleanEventWithExtras<{ keyword?: string; result?: string; terminal?: string }>;
+    prefMaxResults: GleanQuantity;
+    prefSuggestDataCollection: GleanBoolean;
+    prefSuggestNonsponsored: GleanBoolean;
+    prefSuggestSponsored: GleanBoolean;
+    prefSuggestTopsites: GleanBoolean;
+    quickSuggestContextualOptIn: GleanEventWithExtras<{
+      interaction?: string;
+      say_hello?: string;
+      top_position?: string;
+    }>;
+  };
+
+  urlbarMerino: {
+    latencyByResponseStatus: Record<string, GleanTimingDistribution>;
+  };
+
+  urlbarPersistedsearchterms: {
+    revertByPopupCount: GleanCounter;
+    viewCount: GleanCounter;
+  };
+
+  urlbarQuickaction: {
+    picked: Record<string, GleanCounter>;
+  };
+
+  urlbarTrending: {
+    block: GleanCounter;
+  };
+
+  urlbarUnifiedsearchbutton: {
+    opened: GleanCounter;
+    picked: Record<string, GleanCounter>;
+  };
+
+  urlbarZeroprefix: {
+    abandonment: GleanCounter;
+    engagement: GleanCounter;
+    exposure: GleanCounter;
+  };
+
+  addonsSearchDetection: {
+    etldChangeOther: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      from?: string;
+      to?: string;
+      value?: string;
+    }>;
+    etldChangeWebrequest: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      from?: string;
+      to?: string;
+      value?: string;
+    }>;
+    sameSiteRedirect: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      paramChanged?: string;
+    }>;
+  };
+
+  browserContentCrash: {
+    dumpUnavailable: GleanCounter;
+    notSubmitted: GleanCounter;
+  };
+
+  browserSanitizer: {
+    cache: GleanTimingDistribution;
+    cookies: GleanTimingDistribution;
+    downloads: GleanTimingDistribution;
+    formdata: GleanTimingDistribution;
+    history: GleanTimingDistribution;
+    openwindows: GleanTimingDistribution;
+    sessions: GleanTimingDistribution;
+    sitesettings: GleanTimingDistribution;
+    total: GleanTimingDistribution;
+  };
+
+  browserUi: {
+    customizedWidgets: Record<string, GleanCounter>;
+    mirrorForToolbarWidgets: Record<string, GleanBoolean>;
+    toolbarWidgets: GleanObject;
+  };
+
+  browserUsage: {
+    interaction: GleanEventWithExtras<{ flow_id?: string; source?: string; widget_id?: string }>;
+  };
+
+  contextualServices: {
+    contextId: GleanUuid;
+  };
+
+  homepage: {
+    preferenceIgnore: GleanEventWithExtras<{ value?: string; webExtensionId?: string }>;
+  };
+
+  installation: {
+    firstSeenFull: GleanEventWithExtras<{
+      admin_user?: string;
+      build_id?: string;
+      default_path?: string;
+      from_msi?: string;
+      install_existed?: string;
+      other_inst?: string;
+      other_msix_inst?: string;
+      profdir_existed?: string;
+      silent?: string;
+      version?: string;
+    }>;
+    firstSeenMsix: GleanEventWithExtras<{
+      admin_user?: string;
+      build_id?: string;
+      default_path?: string;
+      from_msi?: string;
+      install_existed?: string;
+      other_inst?: string;
+      other_msix_inst?: string;
+      profdir_existed?: string;
+      silent?: string;
+      version?: string;
+    }>;
+    firstSeenStub: GleanEventWithExtras<{
+      admin_user?: string;
+      build_id?: string;
+      default_path?: string;
+      from_msi?: string;
+      install_existed?: string;
+      other_inst?: string;
+      other_msix_inst?: string;
+      profdir_existed?: string;
+      silent?: string;
+      version?: string;
+    }>;
+  };
+
+  installationFirstSeen: {
+    adminUser: GleanBoolean;
+    defaultPath: GleanBoolean;
+    failureReason: GleanString;
+    fromMsi: GleanBoolean;
+    installExisted: GleanBoolean;
+    installerType: GleanString;
+    otherInst: GleanBoolean;
+    otherMsixInst: GleanBoolean;
+    profdirExisted: GleanBoolean;
+    silent: GleanBoolean;
+    version: GleanString;
+  };
+
+  linkIconSizesAttr: {
+    dimension: GleanCustomDistribution;
+    usage: GleanCustomDistribution;
+  };
+
+  partnerLink: {
+    attributionAbort: GleanEventWithExtras<{ value?: string }>;
+    attributionFailure: GleanEventWithExtras<{ value?: string }>;
+    attributionSuccess: GleanEventWithExtras<{ value?: string }>;
+    clickNewtab: GleanEventWithExtras<{ value?: string }>;
+    clickUrlbar: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  performanceInteraction: {
+    tabSwitchComposite: GleanTimingDistribution;
+    keypressPresentLatency: GleanTimingDistribution;
+    mouseupClickPresentLatency: GleanTimingDistribution;
+  };
+
+  timestamps: {
+    aboutHomeTopsitesFirstPaint: GleanQuantity;
+    firstPaint: GleanQuantity;
+    firstPaintTwo: GleanQuantity;
+  };
+
+  devtoolsAccessibility: {
+    accessibleContextMenuItemActivated: Record<string, GleanCounter>;
+    accessibleContextMenuOpened: GleanCounter;
+    auditActivated: Record<string, GleanCounter>;
+    nodeInspectedCount: GleanCounter;
+    selectAccessibleForNode: Record<string, GleanCounter>;
+    simulationActivated: Record<string, GleanCounter>;
+    openedCount: GleanCounter;
+    pickerUsedCount: GleanCounter;
+  };
+
+  devtools: {
+    coldToolboxOpenDelay: Record<string, GleanTimingDistribution>;
+    currentTheme: Record<string, GleanCounter>;
+    toolboxHost: GleanCustomDistribution;
+    toolboxPageReloadDelay: Record<string, GleanTimingDistribution>;
+    warmToolboxOpenDelay: Record<string, GleanTimingDistribution>;
+    aboutdebuggingOpenedCount: GleanCounter;
+    aboutdebuggingTimeActive: GleanTimingDistribution;
+    accessibilityPickerTimeActive: GleanTimingDistribution;
+    accessibilityServiceTimeActive: GleanTimingDistribution;
+    accessibilityTimeActive: GleanTimingDistribution;
+    animationinspectorOpenedCount: GleanCounter;
+    animationinspectorTimeActive: GleanTimingDistribution;
+    browserconsoleOpenedCount: GleanCounter;
+    browserconsoleTimeActive: GleanTimingDistribution;
+    changesviewTimeActive: GleanTimingDistribution;
+    compatibilityviewOpenedCount: GleanCounter;
+    compatibilityviewTimeActive: GleanTimingDistribution;
+    computedviewOpenedCount: GleanCounter;
+    computedviewTimeActive: GleanTimingDistribution;
+    customOpenedCount: GleanCounter;
+    customTimeActive: GleanTimingDistribution;
+    domOpenedCount: GleanCounter;
+    domTimeActive: GleanTimingDistribution;
+    entryPoint: Record<
+      | 'CommandLine'
+      | 'ContextMenu'
+      | 'HamburgerMenu'
+      | 'KeyShortcut'
+      | 'SessionRestore'
+      | 'SlowScript'
+      | 'SystemMenu',
+      GleanCounter
+    >;
+    eyedropperOpenedCount: GleanCounter;
+    flexboxHighlighterTimeActive: GleanTimingDistribution;
+    fontinspectorOpenedCount: GleanCounter;
+    fontinspectorTimeActive: GleanTimingDistribution;
+    gridHighlighterTimeActive: GleanTimingDistribution;
+    inspectorOpenedCount: GleanCounter;
+    inspectorTimeActive: GleanTimingDistribution;
+    jsbrowserdebuggerOpenedCount: GleanCounter;
+    jsbrowserdebuggerTimeActive: GleanTimingDistribution;
+    jsdebuggerOpenedCount: GleanCounter;
+    jsdebuggerTimeActive: GleanTimingDistribution;
+    jsprofilerOpenedCount: GleanCounter;
+    jsprofilerTimeActive: GleanTimingDistribution;
+    layoutviewOpenedCount: GleanCounter;
+    layoutviewTimeActive: GleanTimingDistribution;
+    memoryOpenedCount: GleanCounter;
+    memoryTimeActive: GleanTimingDistribution;
+    menuEyedropperOpenedCount: GleanCounter;
+    netmonitorOpenedCount: GleanCounter;
+    netmonitorTimeActive: GleanTimingDistribution;
+    optionsOpenedCount: GleanCounter;
+    optionsTimeActive: GleanTimingDistribution;
+    pickerEyedropperOpenedCount: GleanCounter;
+    responsiveOpenedCount: GleanCounter;
+    responsiveTimeActive: GleanTimingDistribution;
+    ruleviewOpenedCount: GleanCounter;
+    ruleviewTimeActive: GleanTimingDistribution;
+    storageOpenedCount: GleanCounter;
+    storageTimeActive: GleanTimingDistribution;
+    styleeditorOpenedCount: GleanCounter;
+    styleeditorTimeActive: GleanTimingDistribution;
+    toolboxOpenedCount: GleanCounter;
+    toolboxTimeActive: GleanTimingDistribution;
+    webconsoleOpenedCount: GleanCounter;
+    webconsoleTimeActive: GleanTimingDistribution;
+    heapSnapshotEdgeCount: GleanCustomDistribution;
+    heapSnapshotNodeCount: GleanCustomDistribution;
+    readHeapSnapshot: GleanTimingDistribution;
+    saveHeapSnapshot: GleanTimingDistribution;
+  };
+
+  devtoolsTool: {
+    registered: Record<string, GleanBoolean>;
+  };
+
+  devtoolsToolbox: {
+    tabsReordered: Record<string, GleanCounter>;
+  };
+
+  devtoolsGridGridinspector: {
+    opened: GleanCounter;
+  };
+
+  devtoolsInspector: {
+    fonteditorFontTypeDisplayed: Record<'nonvariable' | 'variable', GleanCounter>;
+    newRootToReloadDelay: GleanTimingDistribution;
+    nodeSelectionCount: GleanCounter;
+    numberOfCssGridsInAPage: GleanCustomDistribution;
+    threePaneEnabled: Record<string, GleanCounter>;
+  };
+
+  devtoolsLayoutFlexboxhighlighter: {
+    opened: GleanCounter;
+  };
+
+  devtoolsMarkupFlexboxhighlighter: {
+    opened: GleanCounter;
+  };
+
+  devtoolsMarkupGridinspector: {
+    opened: GleanCounter;
+  };
+
+  devtoolsMarkupScrollableBadge: {
+    clicked: GleanCounter;
+  };
+
+  devtoolsRulesFlexboxhighlighter: {
+    opened: GleanCounter;
+  };
+
+  devtoolsRulesGridinspector: {
+    opened: GleanCounter;
+  };
+
+  devtoolsShadowdom: {
+    revealLinkClicked: GleanBoolean;
+    shadowRootDisplayed: GleanBoolean;
+    shadowRootExpanded: GleanBoolean;
+  };
+
+  devtoolsTooltip: {
+    shown: Record<string, GleanCounter>;
+  };
+
+  devtoolsResponsive: {
+    openTrigger: Record<string, GleanCounter>;
+    toolboxOpenedFirst: GleanCounter;
+  };
+
+  devtoolsChangesview: {
+    openedCount: GleanCounter;
+  };
+
+  devtoolsMain: {
+    activateResponsiveDesign: GleanEventWithExtras<{
+      host?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    activateSplitConsole: GleanEventWithExtras<{
+      host?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    addBreakpointDebugger: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    blackboxDebugger: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    closeAdbgAboutdebugging: GleanEventWithExtras<{
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    closeTools: GleanEventWithExtras<{
+      host?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    connectionAttemptAboutdebugging: GleanEventWithExtras<{
+      connection_id?: string;
+      connection_type?: string;
+      runtime_id?: string;
+      session_id?: string;
+      status?: string;
+      value?: string;
+    }>;
+    continueDebugger: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    deactivateResponsiveDesign: GleanEventWithExtras<{
+      host?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    deactivateSplitConsole: GleanEventWithExtras<{
+      host?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    deviceAddedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    deviceRemovedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    editHtmlInspector: GleanEventWithExtras<{
+      made_changes?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    editResendNetmonitor: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    editRuleRuleview: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    enterAccessibility: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterApplication: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterDom: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterFakeTool4242: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterInspector: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterJsdebugger: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterMemory: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterNetmonitor: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterOptions: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterOther: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterPerformance: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterStorage: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterStyleeditor: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterTestBlankPanel: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterTestTool: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterTestTool1072208: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterTesttool1: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterTesttool2: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterWebconsole: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    enterWhatsnew: GleanEventWithExtras<{
+      cold?: string;
+      host?: string;
+      message_count?: string;
+      panel_name?: string;
+      session_id?: string;
+      start_state?: string;
+      value?: string;
+      width?: string;
+    }>;
+    executeJsWebconsole: GleanEventWithExtras<{
+      input?: string;
+      lines?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    exitAccessibility: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitApplication: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitDom: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitFakeTool4242: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitInspector: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitJsdebugger: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitMemory: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitNetmonitor: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitOptions: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitOther: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitPerformance: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitStorage: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitStyleeditor: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitTestBlankPanel: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitTestTool: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitTestTool1072208: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitTesttool1: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitTesttool2: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitWebconsole: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    exitWhatsnew: GleanEventWithExtras<{
+      host?: string;
+      next_panel?: string;
+      panel_name?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    filtersChangedNetmonitor: GleanEventWithExtras<{
+      active?: string;
+      inactive?: string;
+      session_id?: string;
+      trigger?: string;
+      value?: string;
+    }>;
+    filtersChangedWebconsole: GleanEventWithExtras<{
+      active?: string;
+      inactive?: string;
+      session_id?: string;
+      trigger?: string;
+      value?: string;
+    }>;
+    inspectAboutdebugging: GleanEventWithExtras<{
+      runtime_type?: string;
+      session_id?: string;
+      target_type?: string;
+      value?: string;
+    }>;
+    jumpToDefinitionWebconsole: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    jumpToSourceWebconsole: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    objectExpandedWebconsole: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    openAdbgAboutdebugging: GleanEventWithExtras<{
+      session_id?: string;
+      value?: string;
+      width?: string;
+    }>;
+    openTools: GleanEventWithExtras<{
+      entrypoint?: string;
+      first_panel?: string;
+      host?: string;
+      session_id?: string;
+      shortcut?: string;
+      splitconsole?: string;
+      value?: string;
+      width?: string;
+    }>;
+    pauseDebugger: GleanEventWithExtras<{
+      lib_stacks?: string;
+      reason?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    pauseOnExceptionsDebugger: GleanEventWithExtras<{
+      caught_exceptio?: string;
+      exceptions?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    persistChangedNetmonitor: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    persistChangedWebconsole: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    prettyPrintDebugger: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    removeBreakpointDebugger: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    reverseSearchWebconsole: GleanEventWithExtras<{
+      functionality?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    runtimeAddedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      runtime_id?: string;
+      runtime_name?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    runtimeConnectedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      runtime_id?: string;
+      runtime_name?: string;
+      runtime_os?: string;
+      runtime_version?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    runtimeDisconnectedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      runtime_id?: string;
+      runtime_name?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    runtimeRemovedAboutdebugging: GleanEventWithExtras<{
+      connection_type?: string;
+      device_name?: string;
+      runtime_id?: string;
+      runtime_name?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    selectPageAboutdebugging: GleanEventWithExtras<{
+      page_type?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    selectPageApplication: GleanEventWithExtras<{
+      page_type?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    selectWsFrameNetmonitor: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    showProfilerAboutdebugging: GleanEventWithExtras<{
+      runtime_id?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    sidepanelChangedInspector: GleanEventWithExtras<{
+      newpanel?: string;
+      oldpanel?: string;
+      os?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    sidepanelChangedNetmonitor: GleanEventWithExtras<{
+      newpanel?: string;
+      oldpanel?: string;
+      os?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    startWorkerApplication: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    throttleChangedNetmonitor: GleanEventWithExtras<{
+      mode?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+    toolTimerAnimationinspector: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerChangesview: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerCompatibilityview: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerComputedview: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerFontinspector: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerLayoutview: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    toolTimerRuleview: GleanEventWithExtras<{
+      os?: string;
+      session_id?: string;
+      time_open?: string;
+      value?: string;
+    }>;
+    unregisterWorkerApplication: GleanEventWithExtras<{ session_id?: string; value?: string }>;
+    updateConnPromptAboutdebugging: GleanEventWithExtras<{
+      prompt_enabled?: string;
+      runtime_id?: string;
+      session_id?: string;
+      value?: string;
+    }>;
+  };
+
+  devtoolsConsole: {
+    javascriptErrorDisplayed: Record<string, GleanCounter>;
+  };
+
+  bfcache: {
+    combo: Record<
+      | 'BFCache_Success'
+      | 'Beforeunload'
+      | 'Other'
+      | 'Remote_Subframes'
+      | 'Req'
+      | 'SPD_Unload_Req_Peer'
+      | 'Success_Not_Toplevel'
+      | 'Unload'
+      | 'Unload_Req'
+      | 'Unload_Req_MSE'
+      | 'Unload_Req_Peer'
+      | 'Unload_Req_Peer_MSE',
+      GleanCounter
+    >;
+    pageRestored: Record<'false' | 'true', GleanCounter>;
+  };
+
+  page: {
+    loadError: GleanDualLabeledCounter;
+  };
+
+  performancePage: {
+    totalContentPageLoad: GleanTimingDistribution;
+    nonBlankPaint: GleanTimingDistribution;
+  };
+
+  useCounter: {
+    contentDocumentsDestroyed: GleanCounter;
+    dedicatedWorkersDestroyed: GleanCounter;
+    serviceWorkersDestroyed: GleanCounter;
+    sharedWorkersDestroyed: GleanCounter;
+    topLevelContentDocumentsDestroyed: GleanCounter;
+  };
+
+  useCounterCssDoc: {
+    alignmentBaseline: GleanCounter;
+    backgroundRepeatX: GleanCounter;
+    backgroundRepeatY: GleanCounter;
+    baselineShift: GleanCounter;
+    bufferedRendering: GleanCounter;
+    colorRendering: GleanCounter;
+    cssAccentColor: GleanCounter;
+    cssAlignContent: GleanCounter;
+    cssAlignItems: GleanCounter;
+    cssAlignSelf: GleanCounter;
+    cssAll: GleanCounter;
+    cssAnchorName: GleanCounter;
+    cssAnchorScope: GleanCounter;
+    cssAnimation: GleanCounter;
+    cssAnimationComposition: GleanCounter;
+    cssAnimationDelay: GleanCounter;
+    cssAnimationDirection: GleanCounter;
+    cssAnimationDuration: GleanCounter;
+    cssAnimationFillMode: GleanCounter;
+    cssAnimationIterationCount: GleanCounter;
+    cssAnimationName: GleanCounter;
+    cssAnimationPlayState: GleanCounter;
+    cssAnimationTimeline: GleanCounter;
+    cssAnimationTimingFunction: GleanCounter;
+    cssAppearance: GleanCounter;
+    cssAspectRatio: GleanCounter;
+    cssBackdropFilter: GleanCounter;
+    cssBackfaceVisibility: GleanCounter;
+    cssBackground: GleanCounter;
+    cssBackgroundAttachment: GleanCounter;
+    cssBackgroundBlendMode: GleanCounter;
+    cssBackgroundClip: GleanCounter;
+    cssBackgroundColor: GleanCounter;
+    cssBackgroundImage: GleanCounter;
+    cssBackgroundOrigin: GleanCounter;
+    cssBackgroundPosition: GleanCounter;
+    cssBackgroundPositionX: GleanCounter;
+    cssBackgroundPositionY: GleanCounter;
+    cssBackgroundRepeat: GleanCounter;
+    cssBackgroundSize: GleanCounter;
+    cssBaselineSource: GleanCounter;
+    cssBlockSize: GleanCounter;
+    cssBorder: GleanCounter;
+    cssBorderBlock: GleanCounter;
+    cssBorderBlockColor: GleanCounter;
+    cssBorderBlockEnd: GleanCounter;
+    cssBorderBlockEndColor: GleanCounter;
+    cssBorderBlockEndStyle: GleanCounter;
+    cssBorderBlockEndWidth: GleanCounter;
+    cssBorderBlockStart: GleanCounter;
+    cssBorderBlockStartColor: GleanCounter;
+    cssBorderBlockStartStyle: GleanCounter;
+    cssBorderBlockStartWidth: GleanCounter;
+    cssBorderBlockStyle: GleanCounter;
+    cssBorderBlockWidth: GleanCounter;
+    cssBorderBottom: GleanCounter;
+    cssBorderBottomColor: GleanCounter;
+    cssBorderBottomLeftRadius: GleanCounter;
+    cssBorderBottomRightRadius: GleanCounter;
+    cssBorderBottomStyle: GleanCounter;
+    cssBorderBottomWidth: GleanCounter;
+    cssBorderCollapse: GleanCounter;
+    cssBorderColor: GleanCounter;
+    cssBorderEndEndRadius: GleanCounter;
+    cssBorderEndStartRadius: GleanCounter;
+    cssBorderImage: GleanCounter;
+    cssBorderImageOutset: GleanCounter;
+    cssBorderImageRepeat: GleanCounter;
+    cssBorderImageSlice: GleanCounter;
+    cssBorderImageSource: GleanCounter;
+    cssBorderImageWidth: GleanCounter;
+    cssBorderInline: GleanCounter;
+    cssBorderInlineColor: GleanCounter;
+    cssBorderInlineEnd: GleanCounter;
+    cssBorderInlineEndColor: GleanCounter;
+    cssBorderInlineEndStyle: GleanCounter;
+    cssBorderInlineEndWidth: GleanCounter;
+    cssBorderInlineStart: GleanCounter;
+    cssBorderInlineStartColor: GleanCounter;
+    cssBorderInlineStartStyle: GleanCounter;
+    cssBorderInlineStartWidth: GleanCounter;
+    cssBorderInlineStyle: GleanCounter;
+    cssBorderInlineWidth: GleanCounter;
+    cssBorderLeft: GleanCounter;
+    cssBorderLeftColor: GleanCounter;
+    cssBorderLeftStyle: GleanCounter;
+    cssBorderLeftWidth: GleanCounter;
+    cssBorderRadius: GleanCounter;
+    cssBorderRight: GleanCounter;
+    cssBorderRightColor: GleanCounter;
+    cssBorderRightStyle: GleanCounter;
+    cssBorderRightWidth: GleanCounter;
+    cssBorderSpacing: GleanCounter;
+    cssBorderStartEndRadius: GleanCounter;
+    cssBorderStartStartRadius: GleanCounter;
+    cssBorderStyle: GleanCounter;
+    cssBorderTop: GleanCounter;
+    cssBorderTopColor: GleanCounter;
+    cssBorderTopLeftRadius: GleanCounter;
+    cssBorderTopRightRadius: GleanCounter;
+    cssBorderTopStyle: GleanCounter;
+    cssBorderTopWidth: GleanCounter;
+    cssBorderWidth: GleanCounter;
+    cssBottom: GleanCounter;
+    cssBoxDecorationBreak: GleanCounter;
+    cssBoxShadow: GleanCounter;
+    cssBoxSizing: GleanCounter;
+    cssBreakAfter: GleanCounter;
+    cssBreakBefore: GleanCounter;
+    cssBreakInside: GleanCounter;
+    cssCaptionSide: GleanCounter;
+    cssCaretColor: GleanCounter;
+    cssClear: GleanCounter;
+    cssClip: GleanCounter;
+    cssClipPath: GleanCounter;
+    cssClipRule: GleanCounter;
+    cssColor: GleanCounter;
+    cssColorAdjust: GleanCounter;
+    cssColorInterpolation: GleanCounter;
+    cssColorInterpolationFilters: GleanCounter;
+    cssColorScheme: GleanCounter;
+    cssColumnCount: GleanCounter;
+    cssColumnFill: GleanCounter;
+    cssColumnGap: GleanCounter;
+    cssColumnRule: GleanCounter;
+    cssColumnRuleColor: GleanCounter;
+    cssColumnRuleStyle: GleanCounter;
+    cssColumnRuleWidth: GleanCounter;
+    cssColumnSpan: GleanCounter;
+    cssColumnWidth: GleanCounter;
+    cssColumns: GleanCounter;
+    cssContain: GleanCounter;
+    cssContainIntrinsicBlockSize: GleanCounter;
+    cssContainIntrinsicHeight: GleanCounter;
+    cssContainIntrinsicInlineSize: GleanCounter;
+    cssContainIntrinsicSize: GleanCounter;
+    cssContainIntrinsicWidth: GleanCounter;
+    cssContainer: GleanCounter;
+    cssContainerName: GleanCounter;
+    cssContainerType: GleanCounter;
+    cssContent: GleanCounter;
+    cssContentVisibility: GleanCounter;
+    cssCounterIncrement: GleanCounter;
+    cssCounterReset: GleanCounter;
+    cssCounterSet: GleanCounter;
+    cssCursor: GleanCounter;
+    cssCx: GleanCounter;
+    cssCy: GleanCounter;
+    cssD: GleanCounter;
+    cssDirection: GleanCounter;
+    cssDisplay: GleanCounter;
+    cssDominantBaseline: GleanCounter;
+    cssEmptyCells: GleanCounter;
+    cssFieldSizing: GleanCounter;
+    cssFill: GleanCounter;
+    cssFillOpacity: GleanCounter;
+    cssFillRule: GleanCounter;
+    cssFilter: GleanCounter;
+    cssFlex: GleanCounter;
+    cssFlexBasis: GleanCounter;
+    cssFlexDirection: GleanCounter;
+    cssFlexFlow: GleanCounter;
+    cssFlexGrow: GleanCounter;
+    cssFlexShrink: GleanCounter;
+    cssFlexWrap: GleanCounter;
+    cssFloat: GleanCounter;
+    cssFloodColor: GleanCounter;
+    cssFloodOpacity: GleanCounter;
+    cssFont: GleanCounter;
+    cssFontFamily: GleanCounter;
+    cssFontFeatureSettings: GleanCounter;
+    cssFontKerning: GleanCounter;
+    cssFontLanguageOverride: GleanCounter;
+    cssFontOpticalSizing: GleanCounter;
+    cssFontPalette: GleanCounter;
+    cssFontSize: GleanCounter;
+    cssFontSizeAdjust: GleanCounter;
+    cssFontStretch: GleanCounter;
+    cssFontStyle: GleanCounter;
+    cssFontSynthesis: GleanCounter;
+    cssFontSynthesisPosition: GleanCounter;
+    cssFontSynthesisSmallCaps: GleanCounter;
+    cssFontSynthesisStyle: GleanCounter;
+    cssFontSynthesisWeight: GleanCounter;
+    cssFontVariant: GleanCounter;
+    cssFontVariantAlternates: GleanCounter;
+    cssFontVariantCaps: GleanCounter;
+    cssFontVariantEastAsian: GleanCounter;
+    cssFontVariantEmoji: GleanCounter;
+    cssFontVariantLigatures: GleanCounter;
+    cssFontVariantNumeric: GleanCounter;
+    cssFontVariantPosition: GleanCounter;
+    cssFontVariationSettings: GleanCounter;
+    cssFontWeight: GleanCounter;
+    cssForcedColorAdjust: GleanCounter;
+    cssGap: GleanCounter;
+    cssGrid: GleanCounter;
+    cssGridArea: GleanCounter;
+    cssGridAutoColumns: GleanCounter;
+    cssGridAutoFlow: GleanCounter;
+    cssGridAutoRows: GleanCounter;
+    cssGridColumn: GleanCounter;
+    cssGridColumnEnd: GleanCounter;
+    cssGridColumnGap: GleanCounter;
+    cssGridColumnStart: GleanCounter;
+    cssGridGap: GleanCounter;
+    cssGridRow: GleanCounter;
+    cssGridRowEnd: GleanCounter;
+    cssGridRowGap: GleanCounter;
+    cssGridRowStart: GleanCounter;
+    cssGridTemplate: GleanCounter;
+    cssGridTemplateAreas: GleanCounter;
+    cssGridTemplateColumns: GleanCounter;
+    cssGridTemplateRows: GleanCounter;
+    cssHeight: GleanCounter;
+    cssHyphenateCharacter: GleanCounter;
+    cssHyphenateLimitChars: GleanCounter;
+    cssHyphens: GleanCounter;
+    cssImageOrientation: GleanCounter;
+    cssImageRendering: GleanCounter;
+    cssImeMode: GleanCounter;
+    cssInitialLetter: GleanCounter;
+    cssInlineSize: GleanCounter;
+    cssInset: GleanCounter;
+    cssInsetBlock: GleanCounter;
+    cssInsetBlockEnd: GleanCounter;
+    cssInsetBlockStart: GleanCounter;
+    cssInsetInline: GleanCounter;
+    cssInsetInlineEnd: GleanCounter;
+    cssInsetInlineStart: GleanCounter;
+    cssIsolation: GleanCounter;
+    cssJustifyContent: GleanCounter;
+    cssJustifyItems: GleanCounter;
+    cssJustifySelf: GleanCounter;
+    cssLeft: GleanCounter;
+    cssLetterSpacing: GleanCounter;
+    cssLightingColor: GleanCounter;
+    cssLineBreak: GleanCounter;
+    cssLineHeight: GleanCounter;
+    cssListStyle: GleanCounter;
+    cssListStyleImage: GleanCounter;
+    cssListStylePosition: GleanCounter;
+    cssListStyleType: GleanCounter;
+    cssMargin: GleanCounter;
+    cssMarginBlock: GleanCounter;
+    cssMarginBlockEnd: GleanCounter;
+    cssMarginBlockStart: GleanCounter;
+    cssMarginBottom: GleanCounter;
+    cssMarginInline: GleanCounter;
+    cssMarginInlineEnd: GleanCounter;
+    cssMarginInlineStart: GleanCounter;
+    cssMarginLeft: GleanCounter;
+    cssMarginRight: GleanCounter;
+    cssMarginTop: GleanCounter;
+    cssMarker: GleanCounter;
+    cssMarkerEnd: GleanCounter;
+    cssMarkerMid: GleanCounter;
+    cssMarkerStart: GleanCounter;
+    cssMask: GleanCounter;
+    cssMaskClip: GleanCounter;
+    cssMaskComposite: GleanCounter;
+    cssMaskImage: GleanCounter;
+    cssMaskMode: GleanCounter;
+    cssMaskOrigin: GleanCounter;
+    cssMaskPosition: GleanCounter;
+    cssMaskPositionX: GleanCounter;
+    cssMaskPositionY: GleanCounter;
+    cssMaskRepeat: GleanCounter;
+    cssMaskSize: GleanCounter;
+    cssMaskType: GleanCounter;
+    cssMasonryAutoFlow: GleanCounter;
+    cssMathDepth: GleanCounter;
+    cssMathStyle: GleanCounter;
+    cssMaxBlockSize: GleanCounter;
+    cssMaxHeight: GleanCounter;
+    cssMaxInlineSize: GleanCounter;
+    cssMaxWidth: GleanCounter;
+    cssMinBlockSize: GleanCounter;
+    cssMinHeight: GleanCounter;
+    cssMinInlineSize: GleanCounter;
+    cssMinWidth: GleanCounter;
+    cssMixBlendMode: GleanCounter;
+    cssMozAnimation: GleanCounter;
+    cssMozAnimationDelay: GleanCounter;
+    cssMozAnimationDirection: GleanCounter;
+    cssMozAnimationDuration: GleanCounter;
+    cssMozAnimationFillMode: GleanCounter;
+    cssMozAnimationIterationCount: GleanCounter;
+    cssMozAnimationName: GleanCounter;
+    cssMozAnimationPlayState: GleanCounter;
+    cssMozAnimationTimingFunction: GleanCounter;
+    cssMozAppearance: GleanCounter;
+    cssMozBackfaceVisibility: GleanCounter;
+    cssMozBorderEnd: GleanCounter;
+    cssMozBorderEndColor: GleanCounter;
+    cssMozBorderEndStyle: GleanCounter;
+    cssMozBorderEndWidth: GleanCounter;
+    cssMozBorderImage: GleanCounter;
+    cssMozBorderStart: GleanCounter;
+    cssMozBorderStartColor: GleanCounter;
+    cssMozBorderStartStyle: GleanCounter;
+    cssMozBorderStartWidth: GleanCounter;
+    cssMozBoxAlign: GleanCounter;
+    cssMozBoxCollapse: GleanCounter;
+    cssMozBoxDirection: GleanCounter;
+    cssMozBoxFlex: GleanCounter;
+    cssMozBoxOrdinalGroup: GleanCounter;
+    cssMozBoxOrient: GleanCounter;
+    cssMozBoxPack: GleanCounter;
+    cssMozBoxSizing: GleanCounter;
+    cssMozContextProperties: GleanCounter;
+    cssMozControlCharacterVisibility: GleanCounter;
+    cssMozDefaultAppearance: GleanCounter;
+    cssMozFloatEdge: GleanCounter;
+    cssMozFontFeatureSettings: GleanCounter;
+    cssMozFontLanguageOverride: GleanCounter;
+    cssMozForceBrokenImageIcon: GleanCounter;
+    cssMozHyphens: GleanCounter;
+    cssMozInert: GleanCounter;
+    cssMozMarginEnd: GleanCounter;
+    cssMozMarginStart: GleanCounter;
+    cssMozMathVariant: GleanCounter;
+    cssMozMinFontSizeRatio: GleanCounter;
+    cssMozOrient: GleanCounter;
+    cssMozOsxFontSmoothing: GleanCounter;
+    cssMozPaddingEnd: GleanCounter;
+    cssMozPaddingStart: GleanCounter;
+    cssMozPerspective: GleanCounter;
+    cssMozPerspectiveOrigin: GleanCounter;
+    cssMozSubtreeHiddenOnlyVisually: GleanCounter;
+    cssMozTabSize: GleanCounter;
+    cssMozTextSizeAdjust: GleanCounter;
+    cssMozTheme: GleanCounter;
+    cssMozTopLayer: GleanCounter;
+    cssMozTransform: GleanCounter;
+    cssMozTransformOrigin: GleanCounter;
+    cssMozTransformStyle: GleanCounter;
+    cssMozTransition: GleanCounter;
+    cssMozTransitionDelay: GleanCounter;
+    cssMozTransitionDuration: GleanCounter;
+    cssMozTransitionProperty: GleanCounter;
+    cssMozTransitionTimingFunction: GleanCounter;
+    cssMozUserFocus: GleanCounter;
+    cssMozUserSelect: GleanCounter;
+    cssMozWindowDragging: GleanCounter;
+    cssMozWindowInputRegionMargin: GleanCounter;
+    cssMozWindowOpacity: GleanCounter;
+    cssMozWindowShadow: GleanCounter;
+    cssMozWindowTransform: GleanCounter;
+    cssObjectFit: GleanCounter;
+    cssObjectPosition: GleanCounter;
+    cssOffset: GleanCounter;
+    cssOffsetAnchor: GleanCounter;
+    cssOffsetDistance: GleanCounter;
+    cssOffsetPath: GleanCounter;
+    cssOffsetPosition: GleanCounter;
+    cssOffsetRotate: GleanCounter;
+    cssOpacity: GleanCounter;
+    cssOrder: GleanCounter;
+    cssOutline: GleanCounter;
+    cssOutlineColor: GleanCounter;
+    cssOutlineOffset: GleanCounter;
+    cssOutlineStyle: GleanCounter;
+    cssOutlineWidth: GleanCounter;
+    cssOverflow: GleanCounter;
+    cssOverflowAnchor: GleanCounter;
+    cssOverflowBlock: GleanCounter;
+    cssOverflowClipBox: GleanCounter;
+    cssOverflowClipBoxBlock: GleanCounter;
+    cssOverflowClipBoxInline: GleanCounter;
+    cssOverflowClipMargin: GleanCounter;
+    cssOverflowInline: GleanCounter;
+    cssOverflowWrap: GleanCounter;
+    cssOverflowX: GleanCounter;
+    cssOverflowY: GleanCounter;
+    cssOverscrollBehavior: GleanCounter;
+    cssOverscrollBehaviorBlock: GleanCounter;
+    cssOverscrollBehaviorInline: GleanCounter;
+    cssOverscrollBehaviorX: GleanCounter;
+    cssOverscrollBehaviorY: GleanCounter;
+    cssPadding: GleanCounter;
+    cssPaddingBlock: GleanCounter;
+    cssPaddingBlockEnd: GleanCounter;
+    cssPaddingBlockStart: GleanCounter;
+    cssPaddingBottom: GleanCounter;
+    cssPaddingInline: GleanCounter;
+    cssPaddingInlineEnd: GleanCounter;
+    cssPaddingInlineStart: GleanCounter;
+    cssPaddingLeft: GleanCounter;
+    cssPaddingRight: GleanCounter;
+    cssPaddingTop: GleanCounter;
+    cssPage: GleanCounter;
+    cssPageBreakAfter: GleanCounter;
+    cssPageBreakBefore: GleanCounter;
+    cssPageBreakInside: GleanCounter;
+    cssPageOrientation: GleanCounter;
+    cssPaintOrder: GleanCounter;
+    cssPerspective: GleanCounter;
+    cssPerspectiveOrigin: GleanCounter;
+    cssPlaceContent: GleanCounter;
+    cssPlaceItems: GleanCounter;
+    cssPlaceSelf: GleanCounter;
+    cssPointerEvents: GleanCounter;
+    cssPosition: GleanCounter;
+    cssPositionAnchor: GleanCounter;
+    cssPositionArea: GleanCounter;
+    cssPositionTry: GleanCounter;
+    cssPositionTryFallbacks: GleanCounter;
+    cssPositionTryOrder: GleanCounter;
+    cssPositionVisibility: GleanCounter;
+    cssPrintColorAdjust: GleanCounter;
+    cssQuotes: GleanCounter;
+    cssR: GleanCounter;
+    cssResize: GleanCounter;
+    cssRight: GleanCounter;
+    cssRotate: GleanCounter;
+    cssRowGap: GleanCounter;
+    cssRubyAlign: GleanCounter;
+    cssRubyPosition: GleanCounter;
+    cssRx: GleanCounter;
+    cssRy: GleanCounter;
+    cssScale: GleanCounter;
+    cssScrollBehavior: GleanCounter;
+    cssScrollMargin: GleanCounter;
+    cssScrollMarginBlock: GleanCounter;
+    cssScrollMarginBlockEnd: GleanCounter;
+    cssScrollMarginBlockStart: GleanCounter;
+    cssScrollMarginBottom: GleanCounter;
+    cssScrollMarginInline: GleanCounter;
+    cssScrollMarginInlineEnd: GleanCounter;
+    cssScrollMarginInlineStart: GleanCounter;
+    cssScrollMarginLeft: GleanCounter;
+    cssScrollMarginRight: GleanCounter;
+    cssScrollMarginTop: GleanCounter;
+    cssScrollPadding: GleanCounter;
+    cssScrollPaddingBlock: GleanCounter;
+    cssScrollPaddingBlockEnd: GleanCounter;
+    cssScrollPaddingBlockStart: GleanCounter;
+    cssScrollPaddingBottom: GleanCounter;
+    cssScrollPaddingInline: GleanCounter;
+    cssScrollPaddingInlineEnd: GleanCounter;
+    cssScrollPaddingInlineStart: GleanCounter;
+    cssScrollPaddingLeft: GleanCounter;
+    cssScrollPaddingRight: GleanCounter;
+    cssScrollPaddingTop: GleanCounter;
+    cssScrollSnapAlign: GleanCounter;
+    cssScrollSnapStop: GleanCounter;
+    cssScrollSnapType: GleanCounter;
+    cssScrollTimeline: GleanCounter;
+    cssScrollTimelineAxis: GleanCounter;
+    cssScrollTimelineName: GleanCounter;
+    cssScrollbarColor: GleanCounter;
+    cssScrollbarGutter: GleanCounter;
+    cssScrollbarWidth: GleanCounter;
+    cssShapeImageThreshold: GleanCounter;
+    cssShapeMargin: GleanCounter;
+    cssShapeOutside: GleanCounter;
+    cssShapeRendering: GleanCounter;
+    cssSize: GleanCounter;
+    cssStopColor: GleanCounter;
+    cssStopOpacity: GleanCounter;
+    cssStroke: GleanCounter;
+    cssStrokeDasharray: GleanCounter;
+    cssStrokeDashoffset: GleanCounter;
+    cssStrokeLinecap: GleanCounter;
+    cssStrokeLinejoin: GleanCounter;
+    cssStrokeMiterlimit: GleanCounter;
+    cssStrokeOpacity: GleanCounter;
+    cssStrokeWidth: GleanCounter;
+    cssTabSize: GleanCounter;
+    cssTableLayout: GleanCounter;
+    cssTextAlign: GleanCounter;
+    cssTextAlignLast: GleanCounter;
+    cssTextAnchor: GleanCounter;
+    cssTextAutospace: GleanCounter;
+    cssTextCombineUpright: GleanCounter;
+    cssTextDecoration: GleanCounter;
+    cssTextDecorationColor: GleanCounter;
+    cssTextDecorationLine: GleanCounter;
+    cssTextDecorationSkipInk: GleanCounter;
+    cssTextDecorationStyle: GleanCounter;
+    cssTextDecorationThickness: GleanCounter;
+    cssTextDecorationTrim: GleanCounter;
+    cssTextEmphasis: GleanCounter;
+    cssTextEmphasisColor: GleanCounter;
+    cssTextEmphasisPosition: GleanCounter;
+    cssTextEmphasisStyle: GleanCounter;
+    cssTextIndent: GleanCounter;
+    cssTextJustify: GleanCounter;
+    cssTextOrientation: GleanCounter;
+    cssTextOverflow: GleanCounter;
+    cssTextRendering: GleanCounter;
+    cssTextShadow: GleanCounter;
+    cssTextTransform: GleanCounter;
+    cssTextUnderlineOffset: GleanCounter;
+    cssTextUnderlinePosition: GleanCounter;
+    cssTextWrap: GleanCounter;
+    cssTextWrapMode: GleanCounter;
+    cssTextWrapStyle: GleanCounter;
+    cssTop: GleanCounter;
+    cssTouchAction: GleanCounter;
+    cssTransform: GleanCounter;
+    cssTransformBox: GleanCounter;
+    cssTransformOrigin: GleanCounter;
+    cssTransformStyle: GleanCounter;
+    cssTransition: GleanCounter;
+    cssTransitionBehavior: GleanCounter;
+    cssTransitionDelay: GleanCounter;
+    cssTransitionDuration: GleanCounter;
+    cssTransitionProperty: GleanCounter;
+    cssTransitionTimingFunction: GleanCounter;
+    cssTranslate: GleanCounter;
+    cssUnicodeBidi: GleanCounter;
+    cssUserSelect: GleanCounter;
+    cssVectorEffect: GleanCounter;
+    cssVerticalAlign: GleanCounter;
+    cssViewTimeline: GleanCounter;
+    cssViewTimelineAxis: GleanCounter;
+    cssViewTimelineInset: GleanCounter;
+    cssViewTimelineName: GleanCounter;
+    cssViewTransitionClass: GleanCounter;
+    cssViewTransitionName: GleanCounter;
+    cssVisibility: GleanCounter;
+    cssWebkitAlignContent: GleanCounter;
+    cssWebkitAlignItems: GleanCounter;
+    cssWebkitAlignSelf: GleanCounter;
+    cssWebkitAnimation: GleanCounter;
+    cssWebkitAnimationDelay: GleanCounter;
+    cssWebkitAnimationDirection: GleanCounter;
+    cssWebkitAnimationDuration: GleanCounter;
+    cssWebkitAnimationFillMode: GleanCounter;
+    cssWebkitAnimationIterationCount: GleanCounter;
+    cssWebkitAnimationName: GleanCounter;
+    cssWebkitAnimationPlayState: GleanCounter;
+    cssWebkitAnimationTimingFunction: GleanCounter;
+    cssWebkitAppearance: GleanCounter;
+    cssWebkitBackfaceVisibility: GleanCounter;
+    cssWebkitBackgroundClip: GleanCounter;
+    cssWebkitBackgroundOrigin: GleanCounter;
+    cssWebkitBackgroundSize: GleanCounter;
+    cssWebkitBorderBottomLeftRadius: GleanCounter;
+    cssWebkitBorderBottomRightRadius: GleanCounter;
+    cssWebkitBorderImage: GleanCounter;
+    cssWebkitBorderRadius: GleanCounter;
+    cssWebkitBorderTopLeftRadius: GleanCounter;
+    cssWebkitBorderTopRightRadius: GleanCounter;
+    cssWebkitBoxAlign: GleanCounter;
+    cssWebkitBoxDirection: GleanCounter;
+    cssWebkitBoxFlex: GleanCounter;
+    cssWebkitBoxOrdinalGroup: GleanCounter;
+    cssWebkitBoxOrient: GleanCounter;
+    cssWebkitBoxPack: GleanCounter;
+    cssWebkitBoxShadow: GleanCounter;
+    cssWebkitBoxSizing: GleanCounter;
+    cssWebkitClipPath: GleanCounter;
+    cssWebkitFilter: GleanCounter;
+    cssWebkitFlex: GleanCounter;
+    cssWebkitFlexBasis: GleanCounter;
+    cssWebkitFlexDirection: GleanCounter;
+    cssWebkitFlexFlow: GleanCounter;
+    cssWebkitFlexGrow: GleanCounter;
+    cssWebkitFlexShrink: GleanCounter;
+    cssWebkitFlexWrap: GleanCounter;
+    cssWebkitFontFeatureSettings: GleanCounter;
+    cssWebkitFontSmoothing: GleanCounter;
+    cssWebkitJustifyContent: GleanCounter;
+    cssWebkitLineClamp: GleanCounter;
+    cssWebkitMask: GleanCounter;
+    cssWebkitMaskClip: GleanCounter;
+    cssWebkitMaskComposite: GleanCounter;
+    cssWebkitMaskImage: GleanCounter;
+    cssWebkitMaskOrigin: GleanCounter;
+    cssWebkitMaskPosition: GleanCounter;
+    cssWebkitMaskPositionX: GleanCounter;
+    cssWebkitMaskPositionY: GleanCounter;
+    cssWebkitMaskRepeat: GleanCounter;
+    cssWebkitMaskSize: GleanCounter;
+    cssWebkitOrder: GleanCounter;
+    cssWebkitPerspective: GleanCounter;
+    cssWebkitPerspectiveOrigin: GleanCounter;
+    cssWebkitTextFillColor: GleanCounter;
+    cssWebkitTextSecurity: GleanCounter;
+    cssWebkitTextSizeAdjust: GleanCounter;
+    cssWebkitTextStroke: GleanCounter;
+    cssWebkitTextStrokeColor: GleanCounter;
+    cssWebkitTextStrokeWidth: GleanCounter;
+    cssWebkitTransform: GleanCounter;
+    cssWebkitTransformOrigin: GleanCounter;
+    cssWebkitTransformStyle: GleanCounter;
+    cssWebkitTransition: GleanCounter;
+    cssWebkitTransitionDelay: GleanCounter;
+    cssWebkitTransitionDuration: GleanCounter;
+    cssWebkitTransitionProperty: GleanCounter;
+    cssWebkitTransitionTimingFunction: GleanCounter;
+    cssWebkitUserSelect: GleanCounter;
+    cssWhiteSpace: GleanCounter;
+    cssWhiteSpaceCollapse: GleanCounter;
+    cssWidth: GleanCounter;
+    cssWillChange: GleanCounter;
+    cssWordBreak: GleanCounter;
+    cssWordSpacing: GleanCounter;
+    cssWordWrap: GleanCounter;
+    cssWritingMode: GleanCounter;
+    cssX: GleanCounter;
+    cssXLang: GleanCounter;
+    cssXSpan: GleanCounter;
+    cssXTextScale: GleanCounter;
+    cssY: GleanCounter;
+    cssZIndex: GleanCounter;
+    cssZenWindowTransformOrigin: GleanCounter;
+    cssZoom: GleanCounter;
+    maxZoom: GleanCounter;
+    minZoom: GleanCounter;
+    orientation: GleanCounter;
+    orphans: GleanCounter;
+    speak: GleanCounter;
+    textSizeAdjust: GleanCounter;
+    userZoom: GleanCounter;
+    webkitAppRegion: GleanCounter;
+    webkitBorderAfter: GleanCounter;
+    webkitBorderAfterColor: GleanCounter;
+    webkitBorderAfterStyle: GleanCounter;
+    webkitBorderAfterWidth: GleanCounter;
+    webkitBorderBefore: GleanCounter;
+    webkitBorderBeforeColor: GleanCounter;
+    webkitBorderBeforeStyle: GleanCounter;
+    webkitBorderBeforeWidth: GleanCounter;
+    webkitBorderEnd: GleanCounter;
+    webkitBorderEndColor: GleanCounter;
+    webkitBorderEndStyle: GleanCounter;
+    webkitBorderEndWidth: GleanCounter;
+    webkitBorderHorizontalSpacing: GleanCounter;
+    webkitBorderStart: GleanCounter;
+    webkitBorderStartColor: GleanCounter;
+    webkitBorderStartStyle: GleanCounter;
+    webkitBorderStartWidth: GleanCounter;
+    webkitBorderVerticalSpacing: GleanCounter;
+    webkitBoxDecorationBreak: GleanCounter;
+    webkitBoxReflect: GleanCounter;
+    webkitColumnBreakAfter: GleanCounter;
+    webkitColumnBreakBefore: GleanCounter;
+    webkitColumnBreakInside: GleanCounter;
+    webkitColumnCount: GleanCounter;
+    webkitColumnGap: GleanCounter;
+    webkitColumnRule: GleanCounter;
+    webkitColumnRuleColor: GleanCounter;
+    webkitColumnRuleStyle: GleanCounter;
+    webkitColumnRuleWidth: GleanCounter;
+    webkitColumnSpan: GleanCounter;
+    webkitColumnWidth: GleanCounter;
+    webkitColumns: GleanCounter;
+    webkitFontSizeDelta: GleanCounter;
+    webkitHighlight: GleanCounter;
+    webkitHyphenateCharacter: GleanCounter;
+    webkitLineBreak: GleanCounter;
+    webkitLocale: GleanCounter;
+    webkitLogicalHeight: GleanCounter;
+    webkitLogicalWidth: GleanCounter;
+    webkitMarginAfter: GleanCounter;
+    webkitMarginAfterCollapse: GleanCounter;
+    webkitMarginBefore: GleanCounter;
+    webkitMarginBeforeCollapse: GleanCounter;
+    webkitMarginBottomCollapse: GleanCounter;
+    webkitMarginCollapse: GleanCounter;
+    webkitMarginEnd: GleanCounter;
+    webkitMarginStart: GleanCounter;
+    webkitMarginTopCollapse: GleanCounter;
+    webkitMaskBoxImage: GleanCounter;
+    webkitMaskBoxImageOutset: GleanCounter;
+    webkitMaskBoxImageRepeat: GleanCounter;
+    webkitMaskBoxImageSlice: GleanCounter;
+    webkitMaskBoxImageSource: GleanCounter;
+    webkitMaskBoxImageWidth: GleanCounter;
+    webkitMaskRepeatX: GleanCounter;
+    webkitMaskRepeatY: GleanCounter;
+    webkitMaxLogicalHeight: GleanCounter;
+    webkitMaxLogicalWidth: GleanCounter;
+    webkitMinLogicalHeight: GleanCounter;
+    webkitMinLogicalWidth: GleanCounter;
+    webkitOpacity: GleanCounter;
+    webkitPaddingAfter: GleanCounter;
+    webkitPaddingBefore: GleanCounter;
+    webkitPaddingEnd: GleanCounter;
+    webkitPaddingStart: GleanCounter;
+    webkitPerspectiveOriginX: GleanCounter;
+    webkitPerspectiveOriginY: GleanCounter;
+    webkitPrintColorAdjust: GleanCounter;
+    webkitRtlOrdering: GleanCounter;
+    webkitRubyPosition: GleanCounter;
+    webkitShapeImageThreshold: GleanCounter;
+    webkitShapeMargin: GleanCounter;
+    webkitShapeOutside: GleanCounter;
+    webkitTapHighlightColor: GleanCounter;
+    webkitTextCombine: GleanCounter;
+    webkitTextDecorationsInEffect: GleanCounter;
+    webkitTextEmphasis: GleanCounter;
+    webkitTextEmphasisColor: GleanCounter;
+    webkitTextEmphasisPosition: GleanCounter;
+    webkitTextEmphasisStyle: GleanCounter;
+    webkitTextOrientation: GleanCounter;
+    webkitTransformOriginX: GleanCounter;
+    webkitTransformOriginY: GleanCounter;
+    webkitTransformOriginZ: GleanCounter;
+    webkitUserDrag: GleanCounter;
+    webkitUserModify: GleanCounter;
+    webkitWritingMode: GleanCounter;
+    widows: GleanCounter;
+  };
+
+  useCounterCssPage: {
+    alignmentBaseline: GleanCounter;
+    backgroundRepeatX: GleanCounter;
+    backgroundRepeatY: GleanCounter;
+    baselineShift: GleanCounter;
+    bufferedRendering: GleanCounter;
+    colorRendering: GleanCounter;
+    cssAccentColor: GleanCounter;
+    cssAlignContent: GleanCounter;
+    cssAlignItems: GleanCounter;
+    cssAlignSelf: GleanCounter;
+    cssAll: GleanCounter;
+    cssAnchorName: GleanCounter;
+    cssAnchorScope: GleanCounter;
+    cssAnimation: GleanCounter;
+    cssAnimationComposition: GleanCounter;
+    cssAnimationDelay: GleanCounter;
+    cssAnimationDirection: GleanCounter;
+    cssAnimationDuration: GleanCounter;
+    cssAnimationFillMode: GleanCounter;
+    cssAnimationIterationCount: GleanCounter;
+    cssAnimationName: GleanCounter;
+    cssAnimationPlayState: GleanCounter;
+    cssAnimationTimeline: GleanCounter;
+    cssAnimationTimingFunction: GleanCounter;
+    cssAppearance: GleanCounter;
+    cssAspectRatio: GleanCounter;
+    cssBackdropFilter: GleanCounter;
+    cssBackfaceVisibility: GleanCounter;
+    cssBackground: GleanCounter;
+    cssBackgroundAttachment: GleanCounter;
+    cssBackgroundBlendMode: GleanCounter;
+    cssBackgroundClip: GleanCounter;
+    cssBackgroundColor: GleanCounter;
+    cssBackgroundImage: GleanCounter;
+    cssBackgroundOrigin: GleanCounter;
+    cssBackgroundPosition: GleanCounter;
+    cssBackgroundPositionX: GleanCounter;
+    cssBackgroundPositionY: GleanCounter;
+    cssBackgroundRepeat: GleanCounter;
+    cssBackgroundSize: GleanCounter;
+    cssBaselineSource: GleanCounter;
+    cssBlockSize: GleanCounter;
+    cssBorder: GleanCounter;
+    cssBorderBlock: GleanCounter;
+    cssBorderBlockColor: GleanCounter;
+    cssBorderBlockEnd: GleanCounter;
+    cssBorderBlockEndColor: GleanCounter;
+    cssBorderBlockEndStyle: GleanCounter;
+    cssBorderBlockEndWidth: GleanCounter;
+    cssBorderBlockStart: GleanCounter;
+    cssBorderBlockStartColor: GleanCounter;
+    cssBorderBlockStartStyle: GleanCounter;
+    cssBorderBlockStartWidth: GleanCounter;
+    cssBorderBlockStyle: GleanCounter;
+    cssBorderBlockWidth: GleanCounter;
+    cssBorderBottom: GleanCounter;
+    cssBorderBottomColor: GleanCounter;
+    cssBorderBottomLeftRadius: GleanCounter;
+    cssBorderBottomRightRadius: GleanCounter;
+    cssBorderBottomStyle: GleanCounter;
+    cssBorderBottomWidth: GleanCounter;
+    cssBorderCollapse: GleanCounter;
+    cssBorderColor: GleanCounter;
+    cssBorderEndEndRadius: GleanCounter;
+    cssBorderEndStartRadius: GleanCounter;
+    cssBorderImage: GleanCounter;
+    cssBorderImageOutset: GleanCounter;
+    cssBorderImageRepeat: GleanCounter;
+    cssBorderImageSlice: GleanCounter;
+    cssBorderImageSource: GleanCounter;
+    cssBorderImageWidth: GleanCounter;
+    cssBorderInline: GleanCounter;
+    cssBorderInlineColor: GleanCounter;
+    cssBorderInlineEnd: GleanCounter;
+    cssBorderInlineEndColor: GleanCounter;
+    cssBorderInlineEndStyle: GleanCounter;
+    cssBorderInlineEndWidth: GleanCounter;
+    cssBorderInlineStart: GleanCounter;
+    cssBorderInlineStartColor: GleanCounter;
+    cssBorderInlineStartStyle: GleanCounter;
+    cssBorderInlineStartWidth: GleanCounter;
+    cssBorderInlineStyle: GleanCounter;
+    cssBorderInlineWidth: GleanCounter;
+    cssBorderLeft: GleanCounter;
+    cssBorderLeftColor: GleanCounter;
+    cssBorderLeftStyle: GleanCounter;
+    cssBorderLeftWidth: GleanCounter;
+    cssBorderRadius: GleanCounter;
+    cssBorderRight: GleanCounter;
+    cssBorderRightColor: GleanCounter;
+    cssBorderRightStyle: GleanCounter;
+    cssBorderRightWidth: GleanCounter;
+    cssBorderSpacing: GleanCounter;
+    cssBorderStartEndRadius: GleanCounter;
+    cssBorderStartStartRadius: GleanCounter;
+    cssBorderStyle: GleanCounter;
+    cssBorderTop: GleanCounter;
+    cssBorderTopColor: GleanCounter;
+    cssBorderTopLeftRadius: GleanCounter;
+    cssBorderTopRightRadius: GleanCounter;
+    cssBorderTopStyle: GleanCounter;
+    cssBorderTopWidth: GleanCounter;
+    cssBorderWidth: GleanCounter;
+    cssBottom: GleanCounter;
+    cssBoxDecorationBreak: GleanCounter;
+    cssBoxShadow: GleanCounter;
+    cssBoxSizing: GleanCounter;
+    cssBreakAfter: GleanCounter;
+    cssBreakBefore: GleanCounter;
+    cssBreakInside: GleanCounter;
+    cssCaptionSide: GleanCounter;
+    cssCaretColor: GleanCounter;
+    cssClear: GleanCounter;
+    cssClip: GleanCounter;
+    cssClipPath: GleanCounter;
+    cssClipRule: GleanCounter;
+    cssColor: GleanCounter;
+    cssColorAdjust: GleanCounter;
+    cssColorInterpolation: GleanCounter;
+    cssColorInterpolationFilters: GleanCounter;
+    cssColorScheme: GleanCounter;
+    cssColumnCount: GleanCounter;
+    cssColumnFill: GleanCounter;
+    cssColumnGap: GleanCounter;
+    cssColumnRule: GleanCounter;
+    cssColumnRuleColor: GleanCounter;
+    cssColumnRuleStyle: GleanCounter;
+    cssColumnRuleWidth: GleanCounter;
+    cssColumnSpan: GleanCounter;
+    cssColumnWidth: GleanCounter;
+    cssColumns: GleanCounter;
+    cssContain: GleanCounter;
+    cssContainIntrinsicBlockSize: GleanCounter;
+    cssContainIntrinsicHeight: GleanCounter;
+    cssContainIntrinsicInlineSize: GleanCounter;
+    cssContainIntrinsicSize: GleanCounter;
+    cssContainIntrinsicWidth: GleanCounter;
+    cssContainer: GleanCounter;
+    cssContainerName: GleanCounter;
+    cssContainerType: GleanCounter;
+    cssContent: GleanCounter;
+    cssContentVisibility: GleanCounter;
+    cssCounterIncrement: GleanCounter;
+    cssCounterReset: GleanCounter;
+    cssCounterSet: GleanCounter;
+    cssCursor: GleanCounter;
+    cssCx: GleanCounter;
+    cssCy: GleanCounter;
+    cssD: GleanCounter;
+    cssDirection: GleanCounter;
+    cssDisplay: GleanCounter;
+    cssDominantBaseline: GleanCounter;
+    cssEmptyCells: GleanCounter;
+    cssFieldSizing: GleanCounter;
+    cssFill: GleanCounter;
+    cssFillOpacity: GleanCounter;
+    cssFillRule: GleanCounter;
+    cssFilter: GleanCounter;
+    cssFlex: GleanCounter;
+    cssFlexBasis: GleanCounter;
+    cssFlexDirection: GleanCounter;
+    cssFlexFlow: GleanCounter;
+    cssFlexGrow: GleanCounter;
+    cssFlexShrink: GleanCounter;
+    cssFlexWrap: GleanCounter;
+    cssFloat: GleanCounter;
+    cssFloodColor: GleanCounter;
+    cssFloodOpacity: GleanCounter;
+    cssFont: GleanCounter;
+    cssFontFamily: GleanCounter;
+    cssFontFeatureSettings: GleanCounter;
+    cssFontKerning: GleanCounter;
+    cssFontLanguageOverride: GleanCounter;
+    cssFontOpticalSizing: GleanCounter;
+    cssFontPalette: GleanCounter;
+    cssFontSize: GleanCounter;
+    cssFontSizeAdjust: GleanCounter;
+    cssFontStretch: GleanCounter;
+    cssFontStyle: GleanCounter;
+    cssFontSynthesis: GleanCounter;
+    cssFontSynthesisPosition: GleanCounter;
+    cssFontSynthesisSmallCaps: GleanCounter;
+    cssFontSynthesisStyle: GleanCounter;
+    cssFontSynthesisWeight: GleanCounter;
+    cssFontVariant: GleanCounter;
+    cssFontVariantAlternates: GleanCounter;
+    cssFontVariantCaps: GleanCounter;
+    cssFontVariantEastAsian: GleanCounter;
+    cssFontVariantEmoji: GleanCounter;
+    cssFontVariantLigatures: GleanCounter;
+    cssFontVariantNumeric: GleanCounter;
+    cssFontVariantPosition: GleanCounter;
+    cssFontVariationSettings: GleanCounter;
+    cssFontWeight: GleanCounter;
+    cssForcedColorAdjust: GleanCounter;
+    cssGap: GleanCounter;
+    cssGrid: GleanCounter;
+    cssGridArea: GleanCounter;
+    cssGridAutoColumns: GleanCounter;
+    cssGridAutoFlow: GleanCounter;
+    cssGridAutoRows: GleanCounter;
+    cssGridColumn: GleanCounter;
+    cssGridColumnEnd: GleanCounter;
+    cssGridColumnGap: GleanCounter;
+    cssGridColumnStart: GleanCounter;
+    cssGridGap: GleanCounter;
+    cssGridRow: GleanCounter;
+    cssGridRowEnd: GleanCounter;
+    cssGridRowGap: GleanCounter;
+    cssGridRowStart: GleanCounter;
+    cssGridTemplate: GleanCounter;
+    cssGridTemplateAreas: GleanCounter;
+    cssGridTemplateColumns: GleanCounter;
+    cssGridTemplateRows: GleanCounter;
+    cssHeight: GleanCounter;
+    cssHyphenateCharacter: GleanCounter;
+    cssHyphenateLimitChars: GleanCounter;
+    cssHyphens: GleanCounter;
+    cssImageOrientation: GleanCounter;
+    cssImageRendering: GleanCounter;
+    cssImeMode: GleanCounter;
+    cssInitialLetter: GleanCounter;
+    cssInlineSize: GleanCounter;
+    cssInset: GleanCounter;
+    cssInsetBlock: GleanCounter;
+    cssInsetBlockEnd: GleanCounter;
+    cssInsetBlockStart: GleanCounter;
+    cssInsetInline: GleanCounter;
+    cssInsetInlineEnd: GleanCounter;
+    cssInsetInlineStart: GleanCounter;
+    cssIsolation: GleanCounter;
+    cssJustifyContent: GleanCounter;
+    cssJustifyItems: GleanCounter;
+    cssJustifySelf: GleanCounter;
+    cssLeft: GleanCounter;
+    cssLetterSpacing: GleanCounter;
+    cssLightingColor: GleanCounter;
+    cssLineBreak: GleanCounter;
+    cssLineHeight: GleanCounter;
+    cssListStyle: GleanCounter;
+    cssListStyleImage: GleanCounter;
+    cssListStylePosition: GleanCounter;
+    cssListStyleType: GleanCounter;
+    cssMargin: GleanCounter;
+    cssMarginBlock: GleanCounter;
+    cssMarginBlockEnd: GleanCounter;
+    cssMarginBlockStart: GleanCounter;
+    cssMarginBottom: GleanCounter;
+    cssMarginInline: GleanCounter;
+    cssMarginInlineEnd: GleanCounter;
+    cssMarginInlineStart: GleanCounter;
+    cssMarginLeft: GleanCounter;
+    cssMarginRight: GleanCounter;
+    cssMarginTop: GleanCounter;
+    cssMarker: GleanCounter;
+    cssMarkerEnd: GleanCounter;
+    cssMarkerMid: GleanCounter;
+    cssMarkerStart: GleanCounter;
+    cssMask: GleanCounter;
+    cssMaskClip: GleanCounter;
+    cssMaskComposite: GleanCounter;
+    cssMaskImage: GleanCounter;
+    cssMaskMode: GleanCounter;
+    cssMaskOrigin: GleanCounter;
+    cssMaskPosition: GleanCounter;
+    cssMaskPositionX: GleanCounter;
+    cssMaskPositionY: GleanCounter;
+    cssMaskRepeat: GleanCounter;
+    cssMaskSize: GleanCounter;
+    cssMaskType: GleanCounter;
+    cssMasonryAutoFlow: GleanCounter;
+    cssMathDepth: GleanCounter;
+    cssMathStyle: GleanCounter;
+    cssMaxBlockSize: GleanCounter;
+    cssMaxHeight: GleanCounter;
+    cssMaxInlineSize: GleanCounter;
+    cssMaxWidth: GleanCounter;
+    cssMinBlockSize: GleanCounter;
+    cssMinHeight: GleanCounter;
+    cssMinInlineSize: GleanCounter;
+    cssMinWidth: GleanCounter;
+    cssMixBlendMode: GleanCounter;
+    cssMozAnimation: GleanCounter;
+    cssMozAnimationDelay: GleanCounter;
+    cssMozAnimationDirection: GleanCounter;
+    cssMozAnimationDuration: GleanCounter;
+    cssMozAnimationFillMode: GleanCounter;
+    cssMozAnimationIterationCount: GleanCounter;
+    cssMozAnimationName: GleanCounter;
+    cssMozAnimationPlayState: GleanCounter;
+    cssMozAnimationTimingFunction: GleanCounter;
+    cssMozAppearance: GleanCounter;
+    cssMozBackfaceVisibility: GleanCounter;
+    cssMozBorderEnd: GleanCounter;
+    cssMozBorderEndColor: GleanCounter;
+    cssMozBorderEndStyle: GleanCounter;
+    cssMozBorderEndWidth: GleanCounter;
+    cssMozBorderImage: GleanCounter;
+    cssMozBorderStart: GleanCounter;
+    cssMozBorderStartColor: GleanCounter;
+    cssMozBorderStartStyle: GleanCounter;
+    cssMozBorderStartWidth: GleanCounter;
+    cssMozBoxAlign: GleanCounter;
+    cssMozBoxCollapse: GleanCounter;
+    cssMozBoxDirection: GleanCounter;
+    cssMozBoxFlex: GleanCounter;
+    cssMozBoxOrdinalGroup: GleanCounter;
+    cssMozBoxOrient: GleanCounter;
+    cssMozBoxPack: GleanCounter;
+    cssMozBoxSizing: GleanCounter;
+    cssMozContextProperties: GleanCounter;
+    cssMozControlCharacterVisibility: GleanCounter;
+    cssMozDefaultAppearance: GleanCounter;
+    cssMozFloatEdge: GleanCounter;
+    cssMozFontFeatureSettings: GleanCounter;
+    cssMozFontLanguageOverride: GleanCounter;
+    cssMozForceBrokenImageIcon: GleanCounter;
+    cssMozHyphens: GleanCounter;
+    cssMozInert: GleanCounter;
+    cssMozMarginEnd: GleanCounter;
+    cssMozMarginStart: GleanCounter;
+    cssMozMathVariant: GleanCounter;
+    cssMozMinFontSizeRatio: GleanCounter;
+    cssMozOrient: GleanCounter;
+    cssMozOsxFontSmoothing: GleanCounter;
+    cssMozPaddingEnd: GleanCounter;
+    cssMozPaddingStart: GleanCounter;
+    cssMozPerspective: GleanCounter;
+    cssMozPerspectiveOrigin: GleanCounter;
+    cssMozSubtreeHiddenOnlyVisually: GleanCounter;
+    cssMozTabSize: GleanCounter;
+    cssMozTextSizeAdjust: GleanCounter;
+    cssMozTheme: GleanCounter;
+    cssMozTopLayer: GleanCounter;
+    cssMozTransform: GleanCounter;
+    cssMozTransformOrigin: GleanCounter;
+    cssMozTransformStyle: GleanCounter;
+    cssMozTransition: GleanCounter;
+    cssMozTransitionDelay: GleanCounter;
+    cssMozTransitionDuration: GleanCounter;
+    cssMozTransitionProperty: GleanCounter;
+    cssMozTransitionTimingFunction: GleanCounter;
+    cssMozUserFocus: GleanCounter;
+    cssMozUserSelect: GleanCounter;
+    cssMozWindowDragging: GleanCounter;
+    cssMozWindowInputRegionMargin: GleanCounter;
+    cssMozWindowOpacity: GleanCounter;
+    cssMozWindowShadow: GleanCounter;
+    cssMozWindowTransform: GleanCounter;
+    cssObjectFit: GleanCounter;
+    cssObjectPosition: GleanCounter;
+    cssOffset: GleanCounter;
+    cssOffsetAnchor: GleanCounter;
+    cssOffsetDistance: GleanCounter;
+    cssOffsetPath: GleanCounter;
+    cssOffsetPosition: GleanCounter;
+    cssOffsetRotate: GleanCounter;
+    cssOpacity: GleanCounter;
+    cssOrder: GleanCounter;
+    cssOutline: GleanCounter;
+    cssOutlineColor: GleanCounter;
+    cssOutlineOffset: GleanCounter;
+    cssOutlineStyle: GleanCounter;
+    cssOutlineWidth: GleanCounter;
+    cssOverflow: GleanCounter;
+    cssOverflowAnchor: GleanCounter;
+    cssOverflowBlock: GleanCounter;
+    cssOverflowClipBox: GleanCounter;
+    cssOverflowClipBoxBlock: GleanCounter;
+    cssOverflowClipBoxInline: GleanCounter;
+    cssOverflowClipMargin: GleanCounter;
+    cssOverflowInline: GleanCounter;
+    cssOverflowWrap: GleanCounter;
+    cssOverflowX: GleanCounter;
+    cssOverflowY: GleanCounter;
+    cssOverscrollBehavior: GleanCounter;
+    cssOverscrollBehaviorBlock: GleanCounter;
+    cssOverscrollBehaviorInline: GleanCounter;
+    cssOverscrollBehaviorX: GleanCounter;
+    cssOverscrollBehaviorY: GleanCounter;
+    cssPadding: GleanCounter;
+    cssPaddingBlock: GleanCounter;
+    cssPaddingBlockEnd: GleanCounter;
+    cssPaddingBlockStart: GleanCounter;
+    cssPaddingBottom: GleanCounter;
+    cssPaddingInline: GleanCounter;
+    cssPaddingInlineEnd: GleanCounter;
+    cssPaddingInlineStart: GleanCounter;
+    cssPaddingLeft: GleanCounter;
+    cssPaddingRight: GleanCounter;
+    cssPaddingTop: GleanCounter;
+    cssPage: GleanCounter;
+    cssPageBreakAfter: GleanCounter;
+    cssPageBreakBefore: GleanCounter;
+    cssPageBreakInside: GleanCounter;
+    cssPageOrientation: GleanCounter;
+    cssPaintOrder: GleanCounter;
+    cssPerspective: GleanCounter;
+    cssPerspectiveOrigin: GleanCounter;
+    cssPlaceContent: GleanCounter;
+    cssPlaceItems: GleanCounter;
+    cssPlaceSelf: GleanCounter;
+    cssPointerEvents: GleanCounter;
+    cssPosition: GleanCounter;
+    cssPositionAnchor: GleanCounter;
+    cssPositionArea: GleanCounter;
+    cssPositionTry: GleanCounter;
+    cssPositionTryFallbacks: GleanCounter;
+    cssPositionTryOrder: GleanCounter;
+    cssPositionVisibility: GleanCounter;
+    cssPrintColorAdjust: GleanCounter;
+    cssQuotes: GleanCounter;
+    cssR: GleanCounter;
+    cssResize: GleanCounter;
+    cssRight: GleanCounter;
+    cssRotate: GleanCounter;
+    cssRowGap: GleanCounter;
+    cssRubyAlign: GleanCounter;
+    cssRubyPosition: GleanCounter;
+    cssRx: GleanCounter;
+    cssRy: GleanCounter;
+    cssScale: GleanCounter;
+    cssScrollBehavior: GleanCounter;
+    cssScrollMargin: GleanCounter;
+    cssScrollMarginBlock: GleanCounter;
+    cssScrollMarginBlockEnd: GleanCounter;
+    cssScrollMarginBlockStart: GleanCounter;
+    cssScrollMarginBottom: GleanCounter;
+    cssScrollMarginInline: GleanCounter;
+    cssScrollMarginInlineEnd: GleanCounter;
+    cssScrollMarginInlineStart: GleanCounter;
+    cssScrollMarginLeft: GleanCounter;
+    cssScrollMarginRight: GleanCounter;
+    cssScrollMarginTop: GleanCounter;
+    cssScrollPadding: GleanCounter;
+    cssScrollPaddingBlock: GleanCounter;
+    cssScrollPaddingBlockEnd: GleanCounter;
+    cssScrollPaddingBlockStart: GleanCounter;
+    cssScrollPaddingBottom: GleanCounter;
+    cssScrollPaddingInline: GleanCounter;
+    cssScrollPaddingInlineEnd: GleanCounter;
+    cssScrollPaddingInlineStart: GleanCounter;
+    cssScrollPaddingLeft: GleanCounter;
+    cssScrollPaddingRight: GleanCounter;
+    cssScrollPaddingTop: GleanCounter;
+    cssScrollSnapAlign: GleanCounter;
+    cssScrollSnapStop: GleanCounter;
+    cssScrollSnapType: GleanCounter;
+    cssScrollTimeline: GleanCounter;
+    cssScrollTimelineAxis: GleanCounter;
+    cssScrollTimelineName: GleanCounter;
+    cssScrollbarColor: GleanCounter;
+    cssScrollbarGutter: GleanCounter;
+    cssScrollbarWidth: GleanCounter;
+    cssShapeImageThreshold: GleanCounter;
+    cssShapeMargin: GleanCounter;
+    cssShapeOutside: GleanCounter;
+    cssShapeRendering: GleanCounter;
+    cssSize: GleanCounter;
+    cssStopColor: GleanCounter;
+    cssStopOpacity: GleanCounter;
+    cssStroke: GleanCounter;
+    cssStrokeDasharray: GleanCounter;
+    cssStrokeDashoffset: GleanCounter;
+    cssStrokeLinecap: GleanCounter;
+    cssStrokeLinejoin: GleanCounter;
+    cssStrokeMiterlimit: GleanCounter;
+    cssStrokeOpacity: GleanCounter;
+    cssStrokeWidth: GleanCounter;
+    cssTabSize: GleanCounter;
+    cssTableLayout: GleanCounter;
+    cssTextAlign: GleanCounter;
+    cssTextAlignLast: GleanCounter;
+    cssTextAnchor: GleanCounter;
+    cssTextAutospace: GleanCounter;
+    cssTextCombineUpright: GleanCounter;
+    cssTextDecoration: GleanCounter;
+    cssTextDecorationColor: GleanCounter;
+    cssTextDecorationLine: GleanCounter;
+    cssTextDecorationSkipInk: GleanCounter;
+    cssTextDecorationStyle: GleanCounter;
+    cssTextDecorationThickness: GleanCounter;
+    cssTextDecorationTrim: GleanCounter;
+    cssTextEmphasis: GleanCounter;
+    cssTextEmphasisColor: GleanCounter;
+    cssTextEmphasisPosition: GleanCounter;
+    cssTextEmphasisStyle: GleanCounter;
+    cssTextIndent: GleanCounter;
+    cssTextJustify: GleanCounter;
+    cssTextOrientation: GleanCounter;
+    cssTextOverflow: GleanCounter;
+    cssTextRendering: GleanCounter;
+    cssTextShadow: GleanCounter;
+    cssTextTransform: GleanCounter;
+    cssTextUnderlineOffset: GleanCounter;
+    cssTextUnderlinePosition: GleanCounter;
+    cssTextWrap: GleanCounter;
+    cssTextWrapMode: GleanCounter;
+    cssTextWrapStyle: GleanCounter;
+    cssTop: GleanCounter;
+    cssTouchAction: GleanCounter;
+    cssTransform: GleanCounter;
+    cssTransformBox: GleanCounter;
+    cssTransformOrigin: GleanCounter;
+    cssTransformStyle: GleanCounter;
+    cssTransition: GleanCounter;
+    cssTransitionBehavior: GleanCounter;
+    cssTransitionDelay: GleanCounter;
+    cssTransitionDuration: GleanCounter;
+    cssTransitionProperty: GleanCounter;
+    cssTransitionTimingFunction: GleanCounter;
+    cssTranslate: GleanCounter;
+    cssUnicodeBidi: GleanCounter;
+    cssUserSelect: GleanCounter;
+    cssVectorEffect: GleanCounter;
+    cssVerticalAlign: GleanCounter;
+    cssViewTimeline: GleanCounter;
+    cssViewTimelineAxis: GleanCounter;
+    cssViewTimelineInset: GleanCounter;
+    cssViewTimelineName: GleanCounter;
+    cssViewTransitionClass: GleanCounter;
+    cssViewTransitionName: GleanCounter;
+    cssVisibility: GleanCounter;
+    cssWebkitAlignContent: GleanCounter;
+    cssWebkitAlignItems: GleanCounter;
+    cssWebkitAlignSelf: GleanCounter;
+    cssWebkitAnimation: GleanCounter;
+    cssWebkitAnimationDelay: GleanCounter;
+    cssWebkitAnimationDirection: GleanCounter;
+    cssWebkitAnimationDuration: GleanCounter;
+    cssWebkitAnimationFillMode: GleanCounter;
+    cssWebkitAnimationIterationCount: GleanCounter;
+    cssWebkitAnimationName: GleanCounter;
+    cssWebkitAnimationPlayState: GleanCounter;
+    cssWebkitAnimationTimingFunction: GleanCounter;
+    cssWebkitAppearance: GleanCounter;
+    cssWebkitBackfaceVisibility: GleanCounter;
+    cssWebkitBackgroundClip: GleanCounter;
+    cssWebkitBackgroundOrigin: GleanCounter;
+    cssWebkitBackgroundSize: GleanCounter;
+    cssWebkitBorderBottomLeftRadius: GleanCounter;
+    cssWebkitBorderBottomRightRadius: GleanCounter;
+    cssWebkitBorderImage: GleanCounter;
+    cssWebkitBorderRadius: GleanCounter;
+    cssWebkitBorderTopLeftRadius: GleanCounter;
+    cssWebkitBorderTopRightRadius: GleanCounter;
+    cssWebkitBoxAlign: GleanCounter;
+    cssWebkitBoxDirection: GleanCounter;
+    cssWebkitBoxFlex: GleanCounter;
+    cssWebkitBoxOrdinalGroup: GleanCounter;
+    cssWebkitBoxOrient: GleanCounter;
+    cssWebkitBoxPack: GleanCounter;
+    cssWebkitBoxShadow: GleanCounter;
+    cssWebkitBoxSizing: GleanCounter;
+    cssWebkitClipPath: GleanCounter;
+    cssWebkitFilter: GleanCounter;
+    cssWebkitFlex: GleanCounter;
+    cssWebkitFlexBasis: GleanCounter;
+    cssWebkitFlexDirection: GleanCounter;
+    cssWebkitFlexFlow: GleanCounter;
+    cssWebkitFlexGrow: GleanCounter;
+    cssWebkitFlexShrink: GleanCounter;
+    cssWebkitFlexWrap: GleanCounter;
+    cssWebkitFontFeatureSettings: GleanCounter;
+    cssWebkitFontSmoothing: GleanCounter;
+    cssWebkitJustifyContent: GleanCounter;
+    cssWebkitLineClamp: GleanCounter;
+    cssWebkitMask: GleanCounter;
+    cssWebkitMaskClip: GleanCounter;
+    cssWebkitMaskComposite: GleanCounter;
+    cssWebkitMaskImage: GleanCounter;
+    cssWebkitMaskOrigin: GleanCounter;
+    cssWebkitMaskPosition: GleanCounter;
+    cssWebkitMaskPositionX: GleanCounter;
+    cssWebkitMaskPositionY: GleanCounter;
+    cssWebkitMaskRepeat: GleanCounter;
+    cssWebkitMaskSize: GleanCounter;
+    cssWebkitOrder: GleanCounter;
+    cssWebkitPerspective: GleanCounter;
+    cssWebkitPerspectiveOrigin: GleanCounter;
+    cssWebkitTextFillColor: GleanCounter;
+    cssWebkitTextSecurity: GleanCounter;
+    cssWebkitTextSizeAdjust: GleanCounter;
+    cssWebkitTextStroke: GleanCounter;
+    cssWebkitTextStrokeColor: GleanCounter;
+    cssWebkitTextStrokeWidth: GleanCounter;
+    cssWebkitTransform: GleanCounter;
+    cssWebkitTransformOrigin: GleanCounter;
+    cssWebkitTransformStyle: GleanCounter;
+    cssWebkitTransition: GleanCounter;
+    cssWebkitTransitionDelay: GleanCounter;
+    cssWebkitTransitionDuration: GleanCounter;
+    cssWebkitTransitionProperty: GleanCounter;
+    cssWebkitTransitionTimingFunction: GleanCounter;
+    cssWebkitUserSelect: GleanCounter;
+    cssWhiteSpace: GleanCounter;
+    cssWhiteSpaceCollapse: GleanCounter;
+    cssWidth: GleanCounter;
+    cssWillChange: GleanCounter;
+    cssWordBreak: GleanCounter;
+    cssWordSpacing: GleanCounter;
+    cssWordWrap: GleanCounter;
+    cssWritingMode: GleanCounter;
+    cssX: GleanCounter;
+    cssXLang: GleanCounter;
+    cssXSpan: GleanCounter;
+    cssXTextScale: GleanCounter;
+    cssY: GleanCounter;
+    cssZIndex: GleanCounter;
+    cssZenWindowTransformOrigin: GleanCounter;
+    cssZoom: GleanCounter;
+    maxZoom: GleanCounter;
+    minZoom: GleanCounter;
+    orientation: GleanCounter;
+    orphans: GleanCounter;
+    speak: GleanCounter;
+    textSizeAdjust: GleanCounter;
+    userZoom: GleanCounter;
+    webkitAppRegion: GleanCounter;
+    webkitBorderAfter: GleanCounter;
+    webkitBorderAfterColor: GleanCounter;
+    webkitBorderAfterStyle: GleanCounter;
+    webkitBorderAfterWidth: GleanCounter;
+    webkitBorderBefore: GleanCounter;
+    webkitBorderBeforeColor: GleanCounter;
+    webkitBorderBeforeStyle: GleanCounter;
+    webkitBorderBeforeWidth: GleanCounter;
+    webkitBorderEnd: GleanCounter;
+    webkitBorderEndColor: GleanCounter;
+    webkitBorderEndStyle: GleanCounter;
+    webkitBorderEndWidth: GleanCounter;
+    webkitBorderHorizontalSpacing: GleanCounter;
+    webkitBorderStart: GleanCounter;
+    webkitBorderStartColor: GleanCounter;
+    webkitBorderStartStyle: GleanCounter;
+    webkitBorderStartWidth: GleanCounter;
+    webkitBorderVerticalSpacing: GleanCounter;
+    webkitBoxDecorationBreak: GleanCounter;
+    webkitBoxReflect: GleanCounter;
+    webkitColumnBreakAfter: GleanCounter;
+    webkitColumnBreakBefore: GleanCounter;
+    webkitColumnBreakInside: GleanCounter;
+    webkitColumnCount: GleanCounter;
+    webkitColumnGap: GleanCounter;
+    webkitColumnRule: GleanCounter;
+    webkitColumnRuleColor: GleanCounter;
+    webkitColumnRuleStyle: GleanCounter;
+    webkitColumnRuleWidth: GleanCounter;
+    webkitColumnSpan: GleanCounter;
+    webkitColumnWidth: GleanCounter;
+    webkitColumns: GleanCounter;
+    webkitFontSizeDelta: GleanCounter;
+    webkitHighlight: GleanCounter;
+    webkitHyphenateCharacter: GleanCounter;
+    webkitLineBreak: GleanCounter;
+    webkitLocale: GleanCounter;
+    webkitLogicalHeight: GleanCounter;
+    webkitLogicalWidth: GleanCounter;
+    webkitMarginAfter: GleanCounter;
+    webkitMarginAfterCollapse: GleanCounter;
+    webkitMarginBefore: GleanCounter;
+    webkitMarginBeforeCollapse: GleanCounter;
+    webkitMarginBottomCollapse: GleanCounter;
+    webkitMarginCollapse: GleanCounter;
+    webkitMarginEnd: GleanCounter;
+    webkitMarginStart: GleanCounter;
+    webkitMarginTopCollapse: GleanCounter;
+    webkitMaskBoxImage: GleanCounter;
+    webkitMaskBoxImageOutset: GleanCounter;
+    webkitMaskBoxImageRepeat: GleanCounter;
+    webkitMaskBoxImageSlice: GleanCounter;
+    webkitMaskBoxImageSource: GleanCounter;
+    webkitMaskBoxImageWidth: GleanCounter;
+    webkitMaskRepeatX: GleanCounter;
+    webkitMaskRepeatY: GleanCounter;
+    webkitMaxLogicalHeight: GleanCounter;
+    webkitMaxLogicalWidth: GleanCounter;
+    webkitMinLogicalHeight: GleanCounter;
+    webkitMinLogicalWidth: GleanCounter;
+    webkitOpacity: GleanCounter;
+    webkitPaddingAfter: GleanCounter;
+    webkitPaddingBefore: GleanCounter;
+    webkitPaddingEnd: GleanCounter;
+    webkitPaddingStart: GleanCounter;
+    webkitPerspectiveOriginX: GleanCounter;
+    webkitPerspectiveOriginY: GleanCounter;
+    webkitPrintColorAdjust: GleanCounter;
+    webkitRtlOrdering: GleanCounter;
+    webkitRubyPosition: GleanCounter;
+    webkitShapeImageThreshold: GleanCounter;
+    webkitShapeMargin: GleanCounter;
+    webkitShapeOutside: GleanCounter;
+    webkitTapHighlightColor: GleanCounter;
+    webkitTextCombine: GleanCounter;
+    webkitTextDecorationsInEffect: GleanCounter;
+    webkitTextEmphasis: GleanCounter;
+    webkitTextEmphasisColor: GleanCounter;
+    webkitTextEmphasisPosition: GleanCounter;
+    webkitTextEmphasisStyle: GleanCounter;
+    webkitTextOrientation: GleanCounter;
+    webkitTransformOriginX: GleanCounter;
+    webkitTransformOriginY: GleanCounter;
+    webkitTransformOriginZ: GleanCounter;
+    webkitUserDrag: GleanCounter;
+    webkitUserModify: GleanCounter;
+    webkitWritingMode: GleanCounter;
+    widows: GleanCounter;
+  };
+
+  useCounterDeprecatedOpsDoc: {
+    afterScriptExecuteEvent: GleanCounter;
+    ambientLightEvent: GleanCounter;
+    appCache: GleanCounter;
+    beforeScriptExecuteEvent: GleanCounter;
+    components: GleanCounter;
+    createImageBitmapCanvasRenderingContext2D: GleanCounter;
+    deprecatedTestingAttribute: GleanCounter;
+    deprecatedTestingInterface: GleanCounter;
+    deprecatedTestingMethod: GleanCounter;
+    documentReleaseCapture: GleanCounter;
+    domattrModified: GleanCounter;
+    domcharacterDataModified: GleanCounter;
+    domnodeInserted: GleanCounter;
+    domnodeInsertedIntoDocument: GleanCounter;
+    domnodeRemoved: GleanCounter;
+    domnodeRemovedFromDocument: GleanCounter;
+    domquadBoundsAttr: GleanCounter;
+    domsubtreeModified: GleanCounter;
+    drawWindowCanvasRenderingContext2D: GleanCounter;
+    elementReleaseCapture: GleanCounter;
+    elementSetCapture: GleanCounter;
+    externalAddSearchProvider: GleanCounter;
+    formSubmissionUntrustedEvent: GleanCounter;
+    idbobjectStoreCreateIndexLocale: GleanCounter;
+    idbopenDboptionsStorageType: GleanCounter;
+    imageBitmapRenderingContextTransferImageBitmap: GleanCounter;
+    importXulintoContent: GleanCounter;
+    initMouseEvent: GleanCounter;
+    initNsmouseEvent: GleanCounter;
+    installTriggerDeprecated: GleanCounter;
+    installTriggerInstallDeprecated: GleanCounter;
+    lenientSetter: GleanCounter;
+    lenientThis: GleanCounter;
+    mathMlDeprecatedMathSpaceValue2: GleanCounter;
+    mathMlDeprecatedMathVariant: GleanCounter;
+    mathMlDeprecatedStixgeneralOperatorStretching: GleanCounter;
+    motionEvent: GleanCounter;
+    mouseEventMozPressure: GleanCounter;
+    mozInputSource: GleanCounter;
+    mozRequestFullScreenDeprecatedPrefix: GleanCounter;
+    mozfullscreenchangeDeprecatedPrefix: GleanCounter;
+    mozfullscreenerrorDeprecatedPrefix: GleanCounter;
+    navigatorGetUserMedia: GleanCounter;
+    nodeIteratorDetach: GleanCounter;
+    offscreenCanvasToBlob: GleanCounter;
+    orientationEvent: GleanCounter;
+    proximityEvent: GleanCounter;
+    rtcpeerConnectionGetStreams: GleanCounter;
+    svgdeselectAll: GleanCounter;
+    syncXmlhttpRequestDeprecated: GleanCounter;
+    useOfCaptureEvents: GleanCounter;
+    useOfReleaseEvents: GleanCounter;
+    webrtcDeprecatedPrefix: GleanCounter;
+    windowCcOntrollers: GleanCounter;
+    windowContentUntrusted: GleanCounter;
+  };
+
+  useCounterDeprecatedOpsPage: {
+    afterScriptExecuteEvent: GleanCounter;
+    ambientLightEvent: GleanCounter;
+    appCache: GleanCounter;
+    beforeScriptExecuteEvent: GleanCounter;
+    components: GleanCounter;
+    createImageBitmapCanvasRenderingContext2D: GleanCounter;
+    deprecatedTestingAttribute: GleanCounter;
+    deprecatedTestingInterface: GleanCounter;
+    deprecatedTestingMethod: GleanCounter;
+    documentReleaseCapture: GleanCounter;
+    domattrModified: GleanCounter;
+    domcharacterDataModified: GleanCounter;
+    domnodeInserted: GleanCounter;
+    domnodeInsertedIntoDocument: GleanCounter;
+    domnodeRemoved: GleanCounter;
+    domnodeRemovedFromDocument: GleanCounter;
+    domquadBoundsAttr: GleanCounter;
+    domsubtreeModified: GleanCounter;
+    drawWindowCanvasRenderingContext2D: GleanCounter;
+    elementReleaseCapture: GleanCounter;
+    elementSetCapture: GleanCounter;
+    externalAddSearchProvider: GleanCounter;
+    formSubmissionUntrustedEvent: GleanCounter;
+    idbobjectStoreCreateIndexLocale: GleanCounter;
+    idbopenDboptionsStorageType: GleanCounter;
+    imageBitmapRenderingContextTransferImageBitmap: GleanCounter;
+    importXulintoContent: GleanCounter;
+    initMouseEvent: GleanCounter;
+    initNsmouseEvent: GleanCounter;
+    installTriggerDeprecated: GleanCounter;
+    installTriggerInstallDeprecated: GleanCounter;
+    lenientSetter: GleanCounter;
+    lenientThis: GleanCounter;
+    mathMlDeprecatedMathSpaceValue2: GleanCounter;
+    mathMlDeprecatedMathVariant: GleanCounter;
+    mathMlDeprecatedStixgeneralOperatorStretching: GleanCounter;
+    motionEvent: GleanCounter;
+    mouseEventMozPressure: GleanCounter;
+    mozInputSource: GleanCounter;
+    mozRequestFullScreenDeprecatedPrefix: GleanCounter;
+    mozfullscreenchangeDeprecatedPrefix: GleanCounter;
+    mozfullscreenerrorDeprecatedPrefix: GleanCounter;
+    navigatorGetUserMedia: GleanCounter;
+    nodeIteratorDetach: GleanCounter;
+    offscreenCanvasToBlob: GleanCounter;
+    orientationEvent: GleanCounter;
+    proximityEvent: GleanCounter;
+    rtcpeerConnectionGetStreams: GleanCounter;
+    svgdeselectAll: GleanCounter;
+    syncXmlhttpRequestDeprecated: GleanCounter;
+    useOfCaptureEvents: GleanCounter;
+    useOfReleaseEvents: GleanCounter;
+    webrtcDeprecatedPrefix: GleanCounter;
+    windowCcOntrollers: GleanCounter;
+    windowContentUntrusted: GleanCounter;
+  };
+
+  useCounterDoc: {
+    componentsShimResolved: GleanCounter;
+    consoleAssert: GleanCounter;
+    consoleClear: GleanCounter;
+    consoleCount: GleanCounter;
+    consoleCountreset: GleanCounter;
+    consoleDebug: GleanCounter;
+    consoleDir: GleanCounter;
+    consoleDirxml: GleanCounter;
+    consoleError: GleanCounter;
+    consoleException: GleanCounter;
+    consoleGroup: GleanCounter;
+    consoleGroupcollapsed: GleanCounter;
+    consoleGroupend: GleanCounter;
+    consoleInfo: GleanCounter;
+    consoleLog: GleanCounter;
+    consoleProfile: GleanCounter;
+    consoleProfileend: GleanCounter;
+    consoleTable: GleanCounter;
+    consoleTime: GleanCounter;
+    consoleTimeend: GleanCounter;
+    consoleTimelog: GleanCounter;
+    consoleTimestamp: GleanCounter;
+    consoleTrace: GleanCounter;
+    consoleWarn: GleanCounter;
+    cookiestoreDelete: GleanCounter;
+    cookiestoreGet: GleanCounter;
+    cookiestoreGetall: GleanCounter;
+    cookiestoreSet: GleanCounter;
+    customelementregistryDefine: GleanCounter;
+    customizedBuiltin: GleanCounter;
+    datatransferAddelement: GleanCounter;
+    datatransferMozcleardataat: GleanCounter;
+    datatransferMozcursorGetter: GleanCounter;
+    datatransferMozcursorSetter: GleanCounter;
+    datatransferMozgetdataat: GleanCounter;
+    datatransferMozitemcountGetter: GleanCounter;
+    datatransferMozitemcountSetter: GleanCounter;
+    datatransferMozsetdataat: GleanCounter;
+    datatransferMozsourcenodeGetter: GleanCounter;
+    datatransferMozsourcenodeSetter: GleanCounter;
+    datatransferMoztypesat: GleanCounter;
+    datatransferMozusercancelledGetter: GleanCounter;
+    datatransferMozusercancelledSetter: GleanCounter;
+    documentExecCommandContentReadOnly: GleanCounter;
+    documentMozsetimageelement: GleanCounter;
+    documentOpen: GleanCounter;
+    documentQueryCommandStateOrValueContentReadOnly: GleanCounter;
+    documentQueryCommandStateOrValueInsertBrOnReturn: GleanCounter;
+    documentQueryCommandSupportedOrEnabledContentReadOnly: GleanCounter;
+    documentQueryCommandSupportedOrEnabledInsertBrOnReturn: GleanCounter;
+    domparserParsefromstring: GleanCounter;
+    elementAttachshadow: GleanCounter;
+    elementReleasecapture: GleanCounter;
+    elementReleasepointercapture: GleanCounter;
+    elementSetcapture: GleanCounter;
+    elementSethtml: GleanCounter;
+    elementSetpointercapture: GleanCounter;
+    enumerateDevicesInsec: GleanCounter;
+    enumerateDevicesUnfocused: GleanCounter;
+    feBlend: GleanCounter;
+    feColorMatrix: GleanCounter;
+    feComponentTransfer: GleanCounter;
+    feComposite: GleanCounter;
+    feConvolveMatrix: GleanCounter;
+    feDiffuseLighting: GleanCounter;
+    feDisplacementMap: GleanCounter;
+    feFlood: GleanCounter;
+    feGaussianBlur: GleanCounter;
+    feImage: GleanCounter;
+    feMerge: GleanCounter;
+    feMorphology: GleanCounter;
+    feOffset: GleanCounter;
+    feSpecularLighting: GleanCounter;
+    feTile: GleanCounter;
+    feTurbulence: GleanCounter;
+    filteredCrossOriginIframe: GleanCounter;
+    getUserMediaInsec: GleanCounter;
+    getUserMediaUnfocused: GleanCounter;
+    htmldialogelementShow: GleanCounter;
+    htmldocumentCaretrangefrompoint: GleanCounter;
+    htmldocumentExitpictureinpicture: GleanCounter;
+    htmldocumentFeaturepolicy: GleanCounter;
+    htmldocumentNamedGetterHit: GleanCounter;
+    htmldocumentOnbeforecopy: GleanCounter;
+    htmldocumentOnbeforecut: GleanCounter;
+    htmldocumentOnbeforepaste: GleanCounter;
+    htmldocumentOncancel: GleanCounter;
+    htmldocumentOnfreeze: GleanCounter;
+    htmldocumentOnmousewheel: GleanCounter;
+    htmldocumentOnresume: GleanCounter;
+    htmldocumentOnsearch: GleanCounter;
+    htmldocumentOnwebkitfullscreenchange: GleanCounter;
+    htmldocumentOnwebkitfullscreenerror: GleanCounter;
+    htmldocumentPictureinpictureelement: GleanCounter;
+    htmldocumentPictureinpictureenabled: GleanCounter;
+    htmldocumentRegisterelement: GleanCounter;
+    htmldocumentWasdiscarded: GleanCounter;
+    htmldocumentWebkitcancelfullscreen: GleanCounter;
+    htmldocumentWebkitcurrentfullscreenelement: GleanCounter;
+    htmldocumentWebkitexitfullscreen: GleanCounter;
+    htmldocumentWebkitfullscreenelement: GleanCounter;
+    htmldocumentWebkitfullscreenenabled: GleanCounter;
+    htmldocumentWebkithidden: GleanCounter;
+    htmldocumentWebkitisfullscreen: GleanCounter;
+    htmldocumentWebkitvisibilitystate: GleanCounter;
+    htmldocumentXmlencoding: GleanCounter;
+    htmldocumentXmlstandalone: GleanCounter;
+    htmldocumentXmlversion: GleanCounter;
+    invalidTextDirectives: GleanCounter;
+    jsAsmjs: GleanCounter;
+    jsDateparse: GleanCounter;
+    jsDateparseImplDef: GleanCounter;
+    jsErrorCapturestacktrace: GleanCounter;
+    jsErrorCapturestacktraceCtor: GleanCounter;
+    jsErrorCapturestacktraceUncallableCtor: GleanCounter;
+    jsIcStubOom: GleanCounter;
+    jsIcStubTooLarge: GleanCounter;
+    jsIsHtmlddaFuse: GleanCounter;
+    jsLargeOomRecovered: GleanCounter;
+    jsLargeOomReported: GleanCounter;
+    jsLegacyLangSubtag: GleanCounter;
+    jsOptimizeArraySpeciesFuse: GleanCounter;
+    jsOptimizeGetIteratorFuse: GleanCounter;
+    jsOptimizePromiseLookupFuse: GleanCounter;
+    jsRegexpSymbolProtocolOnPrimitive: GleanCounter;
+    jsSmallOomRecovered: GleanCounter;
+    jsSmallOomReported: GleanCounter;
+    jsThenable: GleanCounter;
+    jsThenableObjectProto: GleanCounter;
+    jsThenableProto: GleanCounter;
+    jsThenableStandardProto: GleanCounter;
+    jsUseAsm: GleanCounter;
+    jsWasm: GleanCounter;
+    jsWasmLegacyExceptions: GleanCounter;
+    locationAncestororigins: GleanCounter;
+    mathMlused: GleanCounter;
+    mediadevicesEnumeratedevices: GleanCounter;
+    mediadevicesGetdisplaymedia: GleanCounter;
+    mediadevicesGetusermedia: GleanCounter;
+    mixedContentNotUpgradedAudioFailure: GleanCounter;
+    mixedContentNotUpgradedAudioSuccess: GleanCounter;
+    mixedContentNotUpgradedImageFailure: GleanCounter;
+    mixedContentNotUpgradedImageSuccess: GleanCounter;
+    mixedContentNotUpgradedVideoFailure: GleanCounter;
+    mixedContentNotUpgradedVideoSuccess: GleanCounter;
+    mixedContentUpgradedAudioFailure: GleanCounter;
+    mixedContentUpgradedAudioSuccess: GleanCounter;
+    mixedContentUpgradedImageFailure: GleanCounter;
+    mixedContentUpgradedImageSuccess: GleanCounter;
+    mixedContentUpgradedVideoFailure: GleanCounter;
+    mixedContentUpgradedVideoSuccess: GleanCounter;
+    mlsDeriveexporter: GleanCounter;
+    mlsGeneratecredentialbasic: GleanCounter;
+    mlsGeneratekeypackage: GleanCounter;
+    mlsGeneratesignaturekeypair: GleanCounter;
+    mlsGroupadd: GleanCounter;
+    mlsGroupclose: GleanCounter;
+    mlsGroupcreate: GleanCounter;
+    mlsGroupjoin: GleanCounter;
+    mlsGroupmembers: GleanCounter;
+    mlsGroupproposeadd: GleanCounter;
+    mlsGroupproposeremove: GleanCounter;
+    mlsGroupremove: GleanCounter;
+    mlsReceive: GleanCounter;
+    mlsSend: GleanCounter;
+    mlsStatedelete: GleanCounter;
+    mlsStatedeletegroup: GleanCounter;
+    navigatorMozgetusermedia: GleanCounter;
+    ondommousescroll: GleanCounter;
+    onmozmousepixelscroll: GleanCounter;
+    percentageStrokeWidthInSvg: GleanCounter;
+    percentageStrokeWidthInSvgtext: GleanCounter;
+    privateBrowsingCachesDelete: GleanCounter;
+    privateBrowsingCachesHas: GleanCounter;
+    privateBrowsingCachesKeys: GleanCounter;
+    privateBrowsingCachesMatch: GleanCounter;
+    privateBrowsingCachesOpen: GleanCounter;
+    privateBrowsingIdbfactoryDeleteDatabase: GleanCounter;
+    privateBrowsingIdbfactoryOpen: GleanCounter;
+    privateBrowsingNavigatorServiceWorker: GleanCounter;
+    pushmanagerSubscribe: GleanCounter;
+    pushsubscriptionUnsubscribe: GleanCounter;
+    rangeCreatecontextualfragment: GleanCounter;
+    sanitizerConstructor: GleanCounter;
+    sanitizerSanitize: GleanCounter;
+    schedulerPosttask: GleanCounter;
+    svgsvgelementCurrentscaleGetter: GleanCounter;
+    svgsvgelementCurrentscaleSetter: GleanCounter;
+    svgsvgelementGetelementbyid: GleanCounter;
+    textDirectiveNotCreated: GleanCounter;
+    textDirectivePages: GleanCounter;
+    windowAbsoluteorientationsensor: GleanCounter;
+    windowAccelerometer: GleanCounter;
+    windowBackgroundfetchmanager: GleanCounter;
+    windowBackgroundfetchrecord: GleanCounter;
+    windowBackgroundfetchregistration: GleanCounter;
+    windowBeforeinstallpromptevent: GleanCounter;
+    windowBluetooth: GleanCounter;
+    windowBluetoothcharacteristicproperties: GleanCounter;
+    windowBluetoothdevice: GleanCounter;
+    windowBluetoothremotegattcharacteristic: GleanCounter;
+    windowBluetoothremotegattdescriptor: GleanCounter;
+    windowBluetoothremotegattserver: GleanCounter;
+    windowBluetoothremotegattservice: GleanCounter;
+    windowBluetoothuuid: GleanCounter;
+    windowCanvascapturemediastreamtrack: GleanCounter;
+    windowChrome: GleanCounter;
+    windowClipboarditem: GleanCounter;
+    windowCssimagevalue: GleanCounter;
+    windowCsskeywordvalue: GleanCounter;
+    windowCssmathclamp: GleanCounter;
+    windowCssmathinvert: GleanCounter;
+    windowCssmathmax: GleanCounter;
+    windowCssmathmin: GleanCounter;
+    windowCssmathnegate: GleanCounter;
+    windowCssmathproduct: GleanCounter;
+    windowCssmathsum: GleanCounter;
+    windowCssmathvalue: GleanCounter;
+    windowCssmatrixcomponent: GleanCounter;
+    windowCssnumericarray: GleanCounter;
+    windowCssnumericvalue: GleanCounter;
+    windowCssperspective: GleanCounter;
+    windowCsspositionvalue: GleanCounter;
+    windowCsspropertyrule: GleanCounter;
+    windowCssrotate: GleanCounter;
+    windowCssscale: GleanCounter;
+    windowCssskew: GleanCounter;
+    windowCssskewx: GleanCounter;
+    windowCssskewy: GleanCounter;
+    windowCssstylevalue: GleanCounter;
+    windowCsstransformcomponent: GleanCounter;
+    windowCsstransformvalue: GleanCounter;
+    windowCsstranslate: GleanCounter;
+    windowCssunitvalue: GleanCounter;
+    windowCssunparsedvalue: GleanCounter;
+    windowCssvariablereferencevalue: GleanCounter;
+    windowDefaultstatus: GleanCounter;
+    windowDevicemotioneventacceleration: GleanCounter;
+    windowDevicemotioneventrotationrate: GleanCounter;
+    windowDomerror: GleanCounter;
+    windowEncodedvideochunk: GleanCounter;
+    windowEnterpictureinpictureevent: GleanCounter;
+    windowExternal: GleanCounter;
+    windowFederatedcredential: GleanCounter;
+    windowGyroscope: GleanCounter;
+    windowHtmlcontentelement: GleanCounter;
+    windowHtmlshadowelement: GleanCounter;
+    windowImagecapture: GleanCounter;
+    windowInputdevicecapabilities: GleanCounter;
+    windowInputdeviceinfo: GleanCounter;
+    windowKeyboard: GleanCounter;
+    windowKeyboardlayoutmap: GleanCounter;
+    windowLinearaccelerationsensor: GleanCounter;
+    windowMediasettingsrange: GleanCounter;
+    windowMidiaccess: GleanCounter;
+    windowMidiconnectionevent: GleanCounter;
+    windowMidiinput: GleanCounter;
+    windowMidiinputmap: GleanCounter;
+    windowMidimessageevent: GleanCounter;
+    windowMidioutput: GleanCounter;
+    windowMidioutputmap: GleanCounter;
+    windowMidiport: GleanCounter;
+    windowNetworkinformation: GleanCounter;
+    windowOffscreenbuffering: GleanCounter;
+    windowOnbeforeinstallprompt: GleanCounter;
+    windowOncancel: GleanCounter;
+    windowOnmousewheel: GleanCounter;
+    windowOnorientationchange: GleanCounter;
+    windowOnsearch: GleanCounter;
+    windowOnselectionchange: GleanCounter;
+    windowOpenEmptyUrl: GleanCounter;
+    windowOpendatabase: GleanCounter;
+    windowOrientation: GleanCounter;
+    windowOrientationsensor: GleanCounter;
+    windowOverconstrainederror: GleanCounter;
+    windowPasswordcredential: GleanCounter;
+    windowPaymentaddress: GleanCounter;
+    windowPaymentinstruments: GleanCounter;
+    windowPaymentmanager: GleanCounter;
+    windowPaymentmethodchangeevent: GleanCounter;
+    windowPaymentrequest: GleanCounter;
+    windowPaymentrequestupdateevent: GleanCounter;
+    windowPaymentresponse: GleanCounter;
+    windowPerformancelongtasktiming: GleanCounter;
+    windowPhotocapabilities: GleanCounter;
+    windowPictureinpictureevent: GleanCounter;
+    windowPictureinpicturewindow: GleanCounter;
+    windowPresentation: GleanCounter;
+    windowPresentationavailability: GleanCounter;
+    windowPresentationconnection: GleanCounter;
+    windowPresentationconnectionavailableevent: GleanCounter;
+    windowPresentationconnectioncloseevent: GleanCounter;
+    windowPresentationconnectionlist: GleanCounter;
+    windowPresentationreceiver: GleanCounter;
+    windowPresentationrequest: GleanCounter;
+    windowRelativeorientationsensor: GleanCounter;
+    windowRemoteplayback: GleanCounter;
+    windowReport: GleanCounter;
+    windowReportbody: GleanCounter;
+    windowReportingobserver: GleanCounter;
+    windowRtcerror: GleanCounter;
+    windowRtcerrorevent: GleanCounter;
+    windowRtcicetransport: GleanCounter;
+    windowRtcpeerconnectioniceerrorevent: GleanCounter;
+    windowSensor: GleanCounter;
+    windowSensorerrorevent: GleanCounter;
+    windowSidebarGetter: GleanCounter;
+    windowSidebarSetter: GleanCounter;
+    windowSpeechrecognitionalternative: GleanCounter;
+    windowSpeechrecognitionresult: GleanCounter;
+    windowSpeechrecognitionresultlist: GleanCounter;
+    windowStylemedia: GleanCounter;
+    windowStylepropertymap: GleanCounter;
+    windowStylepropertymapreadonly: GleanCounter;
+    windowSvgdiscardelement: GleanCounter;
+    windowSyncmanager: GleanCounter;
+    windowTaskattributiontiming: GleanCounter;
+    windowTextevent: GleanCounter;
+    windowTouch: GleanCounter;
+    windowTouchevent: GleanCounter;
+    windowTouchlist: GleanCounter;
+    windowUsb: GleanCounter;
+    windowUsbalternateinterface: GleanCounter;
+    windowUsbconfiguration: GleanCounter;
+    windowUsbconnectionevent: GleanCounter;
+    windowUsbdevice: GleanCounter;
+    windowUsbendpoint: GleanCounter;
+    windowUsbinterface: GleanCounter;
+    windowUsbintransferresult: GleanCounter;
+    windowUsbisochronousintransferpacket: GleanCounter;
+    windowUsbisochronousintransferresult: GleanCounter;
+    windowUsbisochronousouttransferpacket: GleanCounter;
+    windowUsbisochronousouttransferresult: GleanCounter;
+    windowUsbouttransferresult: GleanCounter;
+    windowUseractivation: GleanCounter;
+    windowVideocolorspace: GleanCounter;
+    windowVideodecoder: GleanCounter;
+    windowVideoencoder: GleanCounter;
+    windowVideoframe: GleanCounter;
+    windowWakelock: GleanCounter;
+    windowWakelocksentinel: GleanCounter;
+    windowWebkitcancelanimationframe: GleanCounter;
+    windowWebkitmediastream: GleanCounter;
+    windowWebkitmutationobserver: GleanCounter;
+    windowWebkitrequestanimationframe: GleanCounter;
+    windowWebkitrequestfilesystem: GleanCounter;
+    windowWebkitresolvelocalfilesystemurl: GleanCounter;
+    windowWebkitrtcpeerconnection: GleanCounter;
+    windowWebkitspeechgrammar: GleanCounter;
+    windowWebkitspeechgrammarlist: GleanCounter;
+    windowWebkitspeechrecognition: GleanCounter;
+    windowWebkitspeechrecognitionerror: GleanCounter;
+    windowWebkitspeechrecognitionevent: GleanCounter;
+    windowWebkitstorageinfo: GleanCounter;
+    wrFilterFallback: GleanCounter;
+    xslstylesheet: GleanCounter;
+    xsltprocessorConstructor: GleanCounter;
+    youTubeFlashEmbed: GleanCounter;
+  };
+
+  useCounterPage: {
+    componentsShimResolved: GleanCounter;
+    consoleAssert: GleanCounter;
+    consoleClear: GleanCounter;
+    consoleCount: GleanCounter;
+    consoleCountreset: GleanCounter;
+    consoleDebug: GleanCounter;
+    consoleDir: GleanCounter;
+    consoleDirxml: GleanCounter;
+    consoleError: GleanCounter;
+    consoleException: GleanCounter;
+    consoleGroup: GleanCounter;
+    consoleGroupcollapsed: GleanCounter;
+    consoleGroupend: GleanCounter;
+    consoleInfo: GleanCounter;
+    consoleLog: GleanCounter;
+    consoleProfile: GleanCounter;
+    consoleProfileend: GleanCounter;
+    consoleTable: GleanCounter;
+    consoleTime: GleanCounter;
+    consoleTimeend: GleanCounter;
+    consoleTimelog: GleanCounter;
+    consoleTimestamp: GleanCounter;
+    consoleTrace: GleanCounter;
+    consoleWarn: GleanCounter;
+    cookiestoreDelete: GleanCounter;
+    cookiestoreGet: GleanCounter;
+    cookiestoreGetall: GleanCounter;
+    cookiestoreSet: GleanCounter;
+    customelementregistryDefine: GleanCounter;
+    customizedBuiltin: GleanCounter;
+    datatransferAddelement: GleanCounter;
+    datatransferMozcleardataat: GleanCounter;
+    datatransferMozcursorGetter: GleanCounter;
+    datatransferMozcursorSetter: GleanCounter;
+    datatransferMozgetdataat: GleanCounter;
+    datatransferMozitemcountGetter: GleanCounter;
+    datatransferMozitemcountSetter: GleanCounter;
+    datatransferMozsetdataat: GleanCounter;
+    datatransferMozsourcenodeGetter: GleanCounter;
+    datatransferMozsourcenodeSetter: GleanCounter;
+    datatransferMoztypesat: GleanCounter;
+    datatransferMozusercancelledGetter: GleanCounter;
+    datatransferMozusercancelledSetter: GleanCounter;
+    documentExecCommandContentReadOnly: GleanCounter;
+    documentMozsetimageelement: GleanCounter;
+    documentOpen: GleanCounter;
+    documentQueryCommandStateOrValueContentReadOnly: GleanCounter;
+    documentQueryCommandStateOrValueInsertBrOnReturn: GleanCounter;
+    documentQueryCommandSupportedOrEnabledContentReadOnly: GleanCounter;
+    documentQueryCommandSupportedOrEnabledInsertBrOnReturn: GleanCounter;
+    domparserParsefromstring: GleanCounter;
+    elementAttachshadow: GleanCounter;
+    elementReleasecapture: GleanCounter;
+    elementReleasepointercapture: GleanCounter;
+    elementSetcapture: GleanCounter;
+    elementSethtml: GleanCounter;
+    elementSetpointercapture: GleanCounter;
+    enumerateDevicesInsec: GleanCounter;
+    enumerateDevicesUnfocused: GleanCounter;
+    feBlend: GleanCounter;
+    feColorMatrix: GleanCounter;
+    feComponentTransfer: GleanCounter;
+    feComposite: GleanCounter;
+    feConvolveMatrix: GleanCounter;
+    feDiffuseLighting: GleanCounter;
+    feDisplacementMap: GleanCounter;
+    feFlood: GleanCounter;
+    feGaussianBlur: GleanCounter;
+    feImage: GleanCounter;
+    feMerge: GleanCounter;
+    feMorphology: GleanCounter;
+    feOffset: GleanCounter;
+    feSpecularLighting: GleanCounter;
+    feTile: GleanCounter;
+    feTurbulence: GleanCounter;
+    filteredCrossOriginIframe: GleanCounter;
+    getUserMediaInsec: GleanCounter;
+    getUserMediaUnfocused: GleanCounter;
+    htmldialogelementShow: GleanCounter;
+    htmldocumentCaretrangefrompoint: GleanCounter;
+    htmldocumentExitpictureinpicture: GleanCounter;
+    htmldocumentFeaturepolicy: GleanCounter;
+    htmldocumentNamedGetterHit: GleanCounter;
+    htmldocumentOnbeforecopy: GleanCounter;
+    htmldocumentOnbeforecut: GleanCounter;
+    htmldocumentOnbeforepaste: GleanCounter;
+    htmldocumentOncancel: GleanCounter;
+    htmldocumentOnfreeze: GleanCounter;
+    htmldocumentOnmousewheel: GleanCounter;
+    htmldocumentOnresume: GleanCounter;
+    htmldocumentOnsearch: GleanCounter;
+    htmldocumentOnwebkitfullscreenchange: GleanCounter;
+    htmldocumentOnwebkitfullscreenerror: GleanCounter;
+    htmldocumentPictureinpictureelement: GleanCounter;
+    htmldocumentPictureinpictureenabled: GleanCounter;
+    htmldocumentRegisterelement: GleanCounter;
+    htmldocumentWasdiscarded: GleanCounter;
+    htmldocumentWebkitcancelfullscreen: GleanCounter;
+    htmldocumentWebkitcurrentfullscreenelement: GleanCounter;
+    htmldocumentWebkitexitfullscreen: GleanCounter;
+    htmldocumentWebkitfullscreenelement: GleanCounter;
+    htmldocumentWebkitfullscreenenabled: GleanCounter;
+    htmldocumentWebkithidden: GleanCounter;
+    htmldocumentWebkitisfullscreen: GleanCounter;
+    htmldocumentWebkitvisibilitystate: GleanCounter;
+    htmldocumentXmlencoding: GleanCounter;
+    htmldocumentXmlstandalone: GleanCounter;
+    htmldocumentXmlversion: GleanCounter;
+    invalidTextDirectives: GleanCounter;
+    jsAsmjs: GleanCounter;
+    jsDateparse: GleanCounter;
+    jsDateparseImplDef: GleanCounter;
+    jsErrorCapturestacktrace: GleanCounter;
+    jsErrorCapturestacktraceCtor: GleanCounter;
+    jsErrorCapturestacktraceUncallableCtor: GleanCounter;
+    jsIcStubOom: GleanCounter;
+    jsIcStubTooLarge: GleanCounter;
+    jsIsHtmlddaFuse: GleanCounter;
+    jsLargeOomRecovered: GleanCounter;
+    jsLargeOomReported: GleanCounter;
+    jsLegacyLangSubtag: GleanCounter;
+    jsOptimizeArraySpeciesFuse: GleanCounter;
+    jsOptimizeGetIteratorFuse: GleanCounter;
+    jsOptimizePromiseLookupFuse: GleanCounter;
+    jsRegexpSymbolProtocolOnPrimitive: GleanCounter;
+    jsSmallOomRecovered: GleanCounter;
+    jsSmallOomReported: GleanCounter;
+    jsThenable: GleanCounter;
+    jsThenableObjectProto: GleanCounter;
+    jsThenableProto: GleanCounter;
+    jsThenableStandardProto: GleanCounter;
+    jsUseAsm: GleanCounter;
+    jsWasm: GleanCounter;
+    jsWasmLegacyExceptions: GleanCounter;
+    locationAncestororigins: GleanCounter;
+    mathMlused: GleanCounter;
+    mediadevicesEnumeratedevices: GleanCounter;
+    mediadevicesGetdisplaymedia: GleanCounter;
+    mediadevicesGetusermedia: GleanCounter;
+    mixedContentNotUpgradedAudioFailure: GleanCounter;
+    mixedContentNotUpgradedAudioSuccess: GleanCounter;
+    mixedContentNotUpgradedImageFailure: GleanCounter;
+    mixedContentNotUpgradedImageSuccess: GleanCounter;
+    mixedContentNotUpgradedVideoFailure: GleanCounter;
+    mixedContentNotUpgradedVideoSuccess: GleanCounter;
+    mixedContentUpgradedAudioFailure: GleanCounter;
+    mixedContentUpgradedAudioSuccess: GleanCounter;
+    mixedContentUpgradedImageFailure: GleanCounter;
+    mixedContentUpgradedImageSuccess: GleanCounter;
+    mixedContentUpgradedVideoFailure: GleanCounter;
+    mixedContentUpgradedVideoSuccess: GleanCounter;
+    mlsDeriveexporter: GleanCounter;
+    mlsGeneratecredentialbasic: GleanCounter;
+    mlsGeneratekeypackage: GleanCounter;
+    mlsGeneratesignaturekeypair: GleanCounter;
+    mlsGroupadd: GleanCounter;
+    mlsGroupclose: GleanCounter;
+    mlsGroupcreate: GleanCounter;
+    mlsGroupjoin: GleanCounter;
+    mlsGroupmembers: GleanCounter;
+    mlsGroupproposeadd: GleanCounter;
+    mlsGroupproposeremove: GleanCounter;
+    mlsGroupremove: GleanCounter;
+    mlsReceive: GleanCounter;
+    mlsSend: GleanCounter;
+    mlsStatedelete: GleanCounter;
+    mlsStatedeletegroup: GleanCounter;
+    navigatorMozgetusermedia: GleanCounter;
+    ondommousescroll: GleanCounter;
+    onmozmousepixelscroll: GleanCounter;
+    percentageStrokeWidthInSvg: GleanCounter;
+    percentageStrokeWidthInSvgtext: GleanCounter;
+    privateBrowsingCachesDelete: GleanCounter;
+    privateBrowsingCachesHas: GleanCounter;
+    privateBrowsingCachesKeys: GleanCounter;
+    privateBrowsingCachesMatch: GleanCounter;
+    privateBrowsingCachesOpen: GleanCounter;
+    privateBrowsingIdbfactoryDeleteDatabase: GleanCounter;
+    privateBrowsingIdbfactoryOpen: GleanCounter;
+    privateBrowsingNavigatorServiceWorker: GleanCounter;
+    pushmanagerSubscribe: GleanCounter;
+    pushsubscriptionUnsubscribe: GleanCounter;
+    rangeCreatecontextualfragment: GleanCounter;
+    sanitizerConstructor: GleanCounter;
+    sanitizerSanitize: GleanCounter;
+    schedulerPosttask: GleanCounter;
+    svgsvgelementCurrentscaleGetter: GleanCounter;
+    svgsvgelementCurrentscaleSetter: GleanCounter;
+    svgsvgelementGetelementbyid: GleanCounter;
+    textDirectiveNotCreated: GleanCounter;
+    textDirectivePages: GleanCounter;
+    windowAbsoluteorientationsensor: GleanCounter;
+    windowAccelerometer: GleanCounter;
+    windowBackgroundfetchmanager: GleanCounter;
+    windowBackgroundfetchrecord: GleanCounter;
+    windowBackgroundfetchregistration: GleanCounter;
+    windowBeforeinstallpromptevent: GleanCounter;
+    windowBluetooth: GleanCounter;
+    windowBluetoothcharacteristicproperties: GleanCounter;
+    windowBluetoothdevice: GleanCounter;
+    windowBluetoothremotegattcharacteristic: GleanCounter;
+    windowBluetoothremotegattdescriptor: GleanCounter;
+    windowBluetoothremotegattserver: GleanCounter;
+    windowBluetoothremotegattservice: GleanCounter;
+    windowBluetoothuuid: GleanCounter;
+    windowCanvascapturemediastreamtrack: GleanCounter;
+    windowChrome: GleanCounter;
+    windowClipboarditem: GleanCounter;
+    windowCssimagevalue: GleanCounter;
+    windowCsskeywordvalue: GleanCounter;
+    windowCssmathclamp: GleanCounter;
+    windowCssmathinvert: GleanCounter;
+    windowCssmathmax: GleanCounter;
+    windowCssmathmin: GleanCounter;
+    windowCssmathnegate: GleanCounter;
+    windowCssmathproduct: GleanCounter;
+    windowCssmathsum: GleanCounter;
+    windowCssmathvalue: GleanCounter;
+    windowCssmatrixcomponent: GleanCounter;
+    windowCssnumericarray: GleanCounter;
+    windowCssnumericvalue: GleanCounter;
+    windowCssperspective: GleanCounter;
+    windowCsspositionvalue: GleanCounter;
+    windowCsspropertyrule: GleanCounter;
+    windowCssrotate: GleanCounter;
+    windowCssscale: GleanCounter;
+    windowCssskew: GleanCounter;
+    windowCssskewx: GleanCounter;
+    windowCssskewy: GleanCounter;
+    windowCssstylevalue: GleanCounter;
+    windowCsstransformcomponent: GleanCounter;
+    windowCsstransformvalue: GleanCounter;
+    windowCsstranslate: GleanCounter;
+    windowCssunitvalue: GleanCounter;
+    windowCssunparsedvalue: GleanCounter;
+    windowCssvariablereferencevalue: GleanCounter;
+    windowDefaultstatus: GleanCounter;
+    windowDevicemotioneventacceleration: GleanCounter;
+    windowDevicemotioneventrotationrate: GleanCounter;
+    windowDomerror: GleanCounter;
+    windowEncodedvideochunk: GleanCounter;
+    windowEnterpictureinpictureevent: GleanCounter;
+    windowExternal: GleanCounter;
+    windowFederatedcredential: GleanCounter;
+    windowGyroscope: GleanCounter;
+    windowHtmlcontentelement: GleanCounter;
+    windowHtmlshadowelement: GleanCounter;
+    windowImagecapture: GleanCounter;
+    windowInputdevicecapabilities: GleanCounter;
+    windowInputdeviceinfo: GleanCounter;
+    windowKeyboard: GleanCounter;
+    windowKeyboardlayoutmap: GleanCounter;
+    windowLinearaccelerationsensor: GleanCounter;
+    windowMediasettingsrange: GleanCounter;
+    windowMidiaccess: GleanCounter;
+    windowMidiconnectionevent: GleanCounter;
+    windowMidiinput: GleanCounter;
+    windowMidiinputmap: GleanCounter;
+    windowMidimessageevent: GleanCounter;
+    windowMidioutput: GleanCounter;
+    windowMidioutputmap: GleanCounter;
+    windowMidiport: GleanCounter;
+    windowNetworkinformation: GleanCounter;
+    windowOffscreenbuffering: GleanCounter;
+    windowOnbeforeinstallprompt: GleanCounter;
+    windowOncancel: GleanCounter;
+    windowOnmousewheel: GleanCounter;
+    windowOnorientationchange: GleanCounter;
+    windowOnsearch: GleanCounter;
+    windowOnselectionchange: GleanCounter;
+    windowOpenEmptyUrl: GleanCounter;
+    windowOpendatabase: GleanCounter;
+    windowOrientation: GleanCounter;
+    windowOrientationsensor: GleanCounter;
+    windowOverconstrainederror: GleanCounter;
+    windowPasswordcredential: GleanCounter;
+    windowPaymentaddress: GleanCounter;
+    windowPaymentinstruments: GleanCounter;
+    windowPaymentmanager: GleanCounter;
+    windowPaymentmethodchangeevent: GleanCounter;
+    windowPaymentrequest: GleanCounter;
+    windowPaymentrequestupdateevent: GleanCounter;
+    windowPaymentresponse: GleanCounter;
+    windowPerformancelongtasktiming: GleanCounter;
+    windowPhotocapabilities: GleanCounter;
+    windowPictureinpictureevent: GleanCounter;
+    windowPictureinpicturewindow: GleanCounter;
+    windowPresentation: GleanCounter;
+    windowPresentationavailability: GleanCounter;
+    windowPresentationconnection: GleanCounter;
+    windowPresentationconnectionavailableevent: GleanCounter;
+    windowPresentationconnectioncloseevent: GleanCounter;
+    windowPresentationconnectionlist: GleanCounter;
+    windowPresentationreceiver: GleanCounter;
+    windowPresentationrequest: GleanCounter;
+    windowRelativeorientationsensor: GleanCounter;
+    windowRemoteplayback: GleanCounter;
+    windowReport: GleanCounter;
+    windowReportbody: GleanCounter;
+    windowReportingobserver: GleanCounter;
+    windowRtcerror: GleanCounter;
+    windowRtcerrorevent: GleanCounter;
+    windowRtcicetransport: GleanCounter;
+    windowRtcpeerconnectioniceerrorevent: GleanCounter;
+    windowSensor: GleanCounter;
+    windowSensorerrorevent: GleanCounter;
+    windowSidebarGetter: GleanCounter;
+    windowSidebarSetter: GleanCounter;
+    windowSpeechrecognitionalternative: GleanCounter;
+    windowSpeechrecognitionresult: GleanCounter;
+    windowSpeechrecognitionresultlist: GleanCounter;
+    windowStylemedia: GleanCounter;
+    windowStylepropertymap: GleanCounter;
+    windowStylepropertymapreadonly: GleanCounter;
+    windowSvgdiscardelement: GleanCounter;
+    windowSyncmanager: GleanCounter;
+    windowTaskattributiontiming: GleanCounter;
+    windowTextevent: GleanCounter;
+    windowTouch: GleanCounter;
+    windowTouchevent: GleanCounter;
+    windowTouchlist: GleanCounter;
+    windowUsb: GleanCounter;
+    windowUsbalternateinterface: GleanCounter;
+    windowUsbconfiguration: GleanCounter;
+    windowUsbconnectionevent: GleanCounter;
+    windowUsbdevice: GleanCounter;
+    windowUsbendpoint: GleanCounter;
+    windowUsbinterface: GleanCounter;
+    windowUsbintransferresult: GleanCounter;
+    windowUsbisochronousintransferpacket: GleanCounter;
+    windowUsbisochronousintransferresult: GleanCounter;
+    windowUsbisochronousouttransferpacket: GleanCounter;
+    windowUsbisochronousouttransferresult: GleanCounter;
+    windowUsbouttransferresult: GleanCounter;
+    windowUseractivation: GleanCounter;
+    windowVideocolorspace: GleanCounter;
+    windowVideodecoder: GleanCounter;
+    windowVideoencoder: GleanCounter;
+    windowVideoframe: GleanCounter;
+    windowWakelock: GleanCounter;
+    windowWakelocksentinel: GleanCounter;
+    windowWebkitcancelanimationframe: GleanCounter;
+    windowWebkitmediastream: GleanCounter;
+    windowWebkitmutationobserver: GleanCounter;
+    windowWebkitrequestanimationframe: GleanCounter;
+    windowWebkitrequestfilesystem: GleanCounter;
+    windowWebkitresolvelocalfilesystemurl: GleanCounter;
+    windowWebkitrtcpeerconnection: GleanCounter;
+    windowWebkitspeechgrammar: GleanCounter;
+    windowWebkitspeechgrammarlist: GleanCounter;
+    windowWebkitspeechrecognition: GleanCounter;
+    windowWebkitspeechrecognitionerror: GleanCounter;
+    windowWebkitspeechrecognitionevent: GleanCounter;
+    windowWebkitstorageinfo: GleanCounter;
+    wrFilterFallback: GleanCounter;
+    xslstylesheet: GleanCounter;
+    xsltprocessorConstructor: GleanCounter;
+    youTubeFlashEmbed: GleanCounter;
+  };
+
+  useCounterWorkerDedicated: {
+    consoleAssert: GleanCounter;
+    consoleClear: GleanCounter;
+    consoleCount: GleanCounter;
+    consoleCountreset: GleanCounter;
+    consoleDebug: GleanCounter;
+    consoleDir: GleanCounter;
+    consoleDirxml: GleanCounter;
+    consoleError: GleanCounter;
+    consoleException: GleanCounter;
+    consoleGroup: GleanCounter;
+    consoleGroupcollapsed: GleanCounter;
+    consoleGroupend: GleanCounter;
+    consoleInfo: GleanCounter;
+    consoleLog: GleanCounter;
+    consoleProfile: GleanCounter;
+    consoleProfileend: GleanCounter;
+    consoleTable: GleanCounter;
+    consoleTime: GleanCounter;
+    consoleTimeend: GleanCounter;
+    consoleTimelog: GleanCounter;
+    consoleTimestamp: GleanCounter;
+    consoleTrace: GleanCounter;
+    consoleWarn: GleanCounter;
+    cookiestoreDelete: GleanCounter;
+    cookiestoreGet: GleanCounter;
+    cookiestoreGetall: GleanCounter;
+    cookiestoreSet: GleanCounter;
+    mlsDeriveexporter: GleanCounter;
+    mlsGeneratecredentialbasic: GleanCounter;
+    mlsGeneratekeypackage: GleanCounter;
+    mlsGeneratesignaturekeypair: GleanCounter;
+    mlsGroupadd: GleanCounter;
+    mlsGroupclose: GleanCounter;
+    mlsGroupcreate: GleanCounter;
+    mlsGroupjoin: GleanCounter;
+    mlsGroupmembers: GleanCounter;
+    mlsGroupproposeadd: GleanCounter;
+    mlsGroupproposeremove: GleanCounter;
+    mlsGroupremove: GleanCounter;
+    mlsReceive: GleanCounter;
+    mlsSend: GleanCounter;
+    mlsStatedelete: GleanCounter;
+    mlsStatedeletegroup: GleanCounter;
+    privateBrowsingCachesDelete: GleanCounter;
+    privateBrowsingCachesHas: GleanCounter;
+    privateBrowsingCachesKeys: GleanCounter;
+    privateBrowsingCachesMatch: GleanCounter;
+    privateBrowsingCachesOpen: GleanCounter;
+    privateBrowsingIdbfactoryDeleteDatabase: GleanCounter;
+    privateBrowsingIdbfactoryOpen: GleanCounter;
+    pushmanagerSubscribe: GleanCounter;
+    pushsubscriptionUnsubscribe: GleanCounter;
+    schedulerPosttask: GleanCounter;
+  };
+
+  useCounterWorkerService: {
+    consoleAssert: GleanCounter;
+    consoleClear: GleanCounter;
+    consoleCount: GleanCounter;
+    consoleCountreset: GleanCounter;
+    consoleDebug: GleanCounter;
+    consoleDir: GleanCounter;
+    consoleDirxml: GleanCounter;
+    consoleError: GleanCounter;
+    consoleException: GleanCounter;
+    consoleGroup: GleanCounter;
+    consoleGroupcollapsed: GleanCounter;
+    consoleGroupend: GleanCounter;
+    consoleInfo: GleanCounter;
+    consoleLog: GleanCounter;
+    consoleProfile: GleanCounter;
+    consoleProfileend: GleanCounter;
+    consoleTable: GleanCounter;
+    consoleTime: GleanCounter;
+    consoleTimeend: GleanCounter;
+    consoleTimelog: GleanCounter;
+    consoleTimestamp: GleanCounter;
+    consoleTrace: GleanCounter;
+    consoleWarn: GleanCounter;
+    cookiestoreDelete: GleanCounter;
+    cookiestoreGet: GleanCounter;
+    cookiestoreGetall: GleanCounter;
+    cookiestoreSet: GleanCounter;
+    mlsDeriveexporter: GleanCounter;
+    mlsGeneratecredentialbasic: GleanCounter;
+    mlsGeneratekeypackage: GleanCounter;
+    mlsGeneratesignaturekeypair: GleanCounter;
+    mlsGroupadd: GleanCounter;
+    mlsGroupclose: GleanCounter;
+    mlsGroupcreate: GleanCounter;
+    mlsGroupjoin: GleanCounter;
+    mlsGroupmembers: GleanCounter;
+    mlsGroupproposeadd: GleanCounter;
+    mlsGroupproposeremove: GleanCounter;
+    mlsGroupremove: GleanCounter;
+    mlsReceive: GleanCounter;
+    mlsSend: GleanCounter;
+    mlsStatedelete: GleanCounter;
+    mlsStatedeletegroup: GleanCounter;
+    privateBrowsingCachesDelete: GleanCounter;
+    privateBrowsingCachesHas: GleanCounter;
+    privateBrowsingCachesKeys: GleanCounter;
+    privateBrowsingCachesMatch: GleanCounter;
+    privateBrowsingCachesOpen: GleanCounter;
+    privateBrowsingIdbfactoryDeleteDatabase: GleanCounter;
+    privateBrowsingIdbfactoryOpen: GleanCounter;
+    pushmanagerSubscribe: GleanCounter;
+    pushsubscriptionUnsubscribe: GleanCounter;
+    schedulerPosttask: GleanCounter;
+  };
+
+  useCounterWorkerShared: {
+    consoleAssert: GleanCounter;
+    consoleClear: GleanCounter;
+    consoleCount: GleanCounter;
+    consoleCountreset: GleanCounter;
+    consoleDebug: GleanCounter;
+    consoleDir: GleanCounter;
+    consoleDirxml: GleanCounter;
+    consoleError: GleanCounter;
+    consoleException: GleanCounter;
+    consoleGroup: GleanCounter;
+    consoleGroupcollapsed: GleanCounter;
+    consoleGroupend: GleanCounter;
+    consoleInfo: GleanCounter;
+    consoleLog: GleanCounter;
+    consoleProfile: GleanCounter;
+    consoleProfileend: GleanCounter;
+    consoleTable: GleanCounter;
+    consoleTime: GleanCounter;
+    consoleTimeend: GleanCounter;
+    consoleTimelog: GleanCounter;
+    consoleTimestamp: GleanCounter;
+    consoleTrace: GleanCounter;
+    consoleWarn: GleanCounter;
+    cookiestoreDelete: GleanCounter;
+    cookiestoreGet: GleanCounter;
+    cookiestoreGetall: GleanCounter;
+    cookiestoreSet: GleanCounter;
+    mlsDeriveexporter: GleanCounter;
+    mlsGeneratecredentialbasic: GleanCounter;
+    mlsGeneratekeypackage: GleanCounter;
+    mlsGeneratesignaturekeypair: GleanCounter;
+    mlsGroupadd: GleanCounter;
+    mlsGroupclose: GleanCounter;
+    mlsGroupcreate: GleanCounter;
+    mlsGroupjoin: GleanCounter;
+    mlsGroupmembers: GleanCounter;
+    mlsGroupproposeadd: GleanCounter;
+    mlsGroupproposeremove: GleanCounter;
+    mlsGroupremove: GleanCounter;
+    mlsReceive: GleanCounter;
+    mlsSend: GleanCounter;
+    mlsStatedelete: GleanCounter;
+    mlsStatedeletegroup: GleanCounter;
+    privateBrowsingCachesDelete: GleanCounter;
+    privateBrowsingCachesHas: GleanCounter;
+    privateBrowsingCachesKeys: GleanCounter;
+    privateBrowsingCachesMatch: GleanCounter;
+    privateBrowsingCachesOpen: GleanCounter;
+    privateBrowsingIdbfactoryDeleteDatabase: GleanCounter;
+    privateBrowsingIdbfactoryOpen: GleanCounter;
+    pushmanagerSubscribe: GleanCounter;
+    pushsubscriptionUnsubscribe: GleanCounter;
+    schedulerPosttask: GleanCounter;
+  };
+
+  canvas: {
+    used2d: Record<'false' | 'true', GleanCounter>;
+    webgl2Success: Record<'false' | 'true', GleanCounter>;
+    webglAcclFailureId: Record<string, GleanCounter>;
+    webglFailureId: Record<string, GleanCounter>;
+    webglSuccess: Record<'false' | 'true', GleanCounter>;
+    webglUsed: Record<'false' | 'true', GleanCounter>;
+  };
+
+  webcrypto: {
+    alg: GleanCustomDistribution;
+    extractableEnc: Record<'false' | 'true', GleanCounter>;
+    extractableGenerate: Record<'false' | 'true', GleanCounter>;
+    extractableImport: Record<'false' | 'true', GleanCounter>;
+    extractableSig: Record<'false' | 'true', GleanCounter>;
+    method: GleanCustomDistribution;
+    resolved: Record<'false' | 'true', GleanCounter>;
+  };
+
+  geolocation: {
+    accuracy: GleanCustomDistribution;
+    fallback: Record<'none' | 'on_error' | 'on_timeout', GleanCounter>;
+    linuxProvider: Record<'geoclue' | 'none' | 'portal', GleanBoolean>;
+    requestResult: Record<
+      'permission_denied' | 'position_unavailable' | 'success' | 'timeout',
+      GleanCounter
+    >;
+  };
+
+  idbMaintenance: {
+    fallbackFullrestoreMetadata: GleanCounter;
+    metadataRestored: GleanCounter;
+    unknownMetadata: GleanCounter;
+  };
+
+  localstorageDatabase: {
+    newObjectSetupTime: GleanTimingDistribution;
+    requestAllowToCloseResponseTime: GleanTimingDistribution;
+  };
+
+  localstorageRequest: {
+    prepareDatastoreProcessingTime: GleanTimingDistribution;
+    recvCancelCounter: GleanCounter;
+    sendCancelCounter: GleanCounter;
+  };
+
+  mediadrm: {
+    decryption: Record<
+      | 'has_hardware_clearlead'
+      | 'has_hardware_decryption'
+      | 'has_hdcp22_plus'
+      | 'has_software_clearlead'
+      | 'has_wmf',
+      GleanBoolean
+    >;
+    emePlayback: GleanEventWithExtras<{
+      key_system?: string;
+      played_time?: string;
+      resolution?: string;
+      video_codec?: string;
+    }>;
+  };
+
+  hls: {
+    canplayRequested: GleanCounter;
+    canplaySupported: GleanCounter;
+    mediaLoad: GleanEventWithExtras<{ media_extension?: string }>;
+  };
+
+  gmp: {
+    updateXmlFetchResult: Record<
+      | 'cert_pin_abort'
+      | 'cert_pin_failed'
+      | 'cert_pin_invalid'
+      | 'cert_pin_missing_data'
+      | 'cert_pin_net_request_error'
+      | 'cert_pin_net_timeout'
+      | 'cert_pin_success'
+      | 'cert_pin_unknown_error'
+      | 'cert_pin_xml_parse_error'
+      | 'content_sig_abort'
+      | 'content_sig_failed'
+      | 'content_sig_invalid'
+      | 'content_sig_missing_data'
+      | 'content_sig_net_request_error'
+      | 'content_sig_net_timeout'
+      | 'content_sig_success'
+      | 'content_sig_unknown_error'
+      | 'content_sig_xml_parse_error',
+      GleanCounter
+    >;
+  };
+
+  media: {
+    audiblePlayTimePercent: Record<string, GleanCustomDistribution>;
+    codecUsed: Record<string, GleanCounter>;
+    elementInPageCount: GleanCounter;
+    error: GleanEventWithExtras<{ error_name?: string; error_type?: string; key_system?: string }>;
+    mediaPlayTime: Record<string, GleanTimingDistribution>;
+    mseSourceBufferType: Record<
+      | 'AudioAac'
+      | 'AudioMp2t'
+      | 'AudioMp4'
+      | 'AudioMpeg'
+      | 'AudioWebm'
+      | 'VideoHevc'
+      | 'VideoMp2t'
+      | 'VideoMp4'
+      | 'VideoWebm',
+      GleanCounter
+    >;
+    mutedPlayTimePercent: Record<string, GleanCustomDistribution>;
+    videoClearkeyPlayTime: GleanTimingDistribution;
+    videoDroppedCompositorFramesProportionExponential: GleanCustomDistribution;
+    videoDroppedDecodedFramesProportionExponential: GleanCustomDistribution;
+    videoDroppedFramesProportion: GleanCustomDistribution;
+    videoDroppedFramesProportionExponential: GleanCustomDistribution;
+    videoDroppedSinkFramesProportionExponential: GleanCustomDistribution;
+    videoEncryptedPlayTime: GleanTimingDistribution;
+    videoHardwareDecodingSupport: Record<string, GleanBoolean>;
+    videoHdHardwareDecodingSupport: Record<string, GleanBoolean>;
+    videoHdrPlayTime: GleanTimingDistribution;
+    videoHiddenPlayTime: GleanTimingDistribution;
+    videoHiddenPlayTimePercentage: Record<string, GleanCustomDistribution>;
+    videoPlayTime: GleanTimingDistribution;
+    videoVisiblePlayTime: Record<string, GleanTimingDistribution>;
+    videoWidevinePlayTime: GleanTimingDistribution;
+    decoderBackendUsed: GleanCustomDistribution;
+  };
+
+  mediaAudio: {
+    backend: Record<
+      | 'aaudio'
+      | 'alsa'
+      | 'audiounit'
+      | 'audiounit-rust'
+      | 'jack'
+      | 'opensl'
+      | 'oss'
+      | 'pulse'
+      | 'pulse-rust'
+      | 'sndio'
+      | 'sunaudio'
+      | 'unknown'
+      | 'wasapi'
+      | 'winmm',
+      GleanCounter
+    >;
+    initFailure: Record<'first' | 'other', GleanCounter>;
+  };
+
+  mediaPlayback: {
+    decodeError: GleanEventWithExtras<{
+      decoder_name?: string;
+      error_name?: string;
+      is_hardware_accelerated?: string;
+      key_system?: string;
+      mime_type?: string;
+    }>;
+    deviceHardwareDecoderSupport: Record<'av1' | 'h264' | 'hevc' | 'vp8' | 'vp9', GleanBoolean>;
+    firstFrameLoaded: GleanEventWithExtras<{
+      buffering_time?: string;
+      decoder_name?: string;
+      first_frame_loaded_time?: string;
+      hls_decoder?: string;
+      is_hardware_decoding?: string;
+      is_hdr?: string;
+      key_system?: string;
+      metadata_loaded_time?: string;
+      playback_type?: string;
+      resolution?: string;
+      total_waiting_data_time?: string;
+      video_codec?: string;
+    }>;
+    notSupportedVideoPerMimeType: Record<string, GleanCounter>;
+  };
+
+  mediaMp4Parse: {
+    numSampleDescriptionEntries: GleanCustomDistribution;
+    sampleDescriptionEntriesHaveMultipleCodecs: Record<'false' | 'true', GleanCounter>;
+    sampleDescriptionEntriesHaveMultipleCrypto: Record<'false' | 'true', GleanCounter>;
+  };
+
+  mfcdm: {
+    emePlayback: GleanEventWithExtras<{
+      dropped_frames?: string;
+      key_system?: string;
+      played_time?: string;
+      rendered_frames?: string;
+      resolution?: string;
+      video_codec?: string;
+    }>;
+    error: GleanEventWithExtras<{
+      audio_codec?: string;
+      current_state?: string;
+      error_name?: string;
+      key_system?: string;
+      platform_error?: string;
+      resolution?: string;
+      video_codec?: string;
+    }>;
+  };
+
+  codecStats: {
+    audioPreferredCodec: Record<string, GleanCounter>;
+    otherFecSignaled: Record<string, GleanCounter>;
+    ulpfecNegotiated: Record<'negotiated' | 'not_negotiated', GleanCounter>;
+    videoPreferredCodec: Record<string, GleanCounter>;
+  };
+
+  rtcrtpsender: {
+    count: GleanDenominator;
+    countSetparametersCompat: GleanDenominator;
+    usedSendencodings: GleanNumerator;
+  };
+
+  rtcrtpsenderSetparameters: {
+    failLengthChanged: GleanNumerator;
+    failNoEncodings: GleanNumerator;
+    failNoGetparameters: GleanNumerator;
+    failNoTransactionid: GleanNumerator;
+    failOther: GleanNumerator;
+    failRidChanged: GleanNumerator;
+    failStaleTransactionid: GleanNumerator;
+    warnLengthChanged: GleanNumerator;
+    warnNoGetparameters: GleanNumerator;
+    warnNoTransactionid: GleanNumerator;
+  };
+
+  webrtc: {
+    audioQualityInboundBandwidthKbits: GleanCustomDistribution;
+    audioQualityInboundJitter: GleanTimingDistribution;
+    audioQualityInboundPacketlossRate: GleanCustomDistribution;
+    audioQualityOutboundJitter: GleanTimingDistribution;
+    audioQualityOutboundPacketlossRate: GleanCustomDistribution;
+    audioQualityOutboundRtt: GleanTimingDistribution;
+    avCallDuration: GleanTimingDistribution;
+    callCount3: GleanCounter;
+    callDuration: GleanTimingDistribution;
+    callType: GleanCustomDistribution;
+    datachannelNegotiated: Record<'false' | 'true', GleanCounter>;
+    getUserMediaType: GleanCustomDistribution;
+    gmpInitSuccess: Record<'false' | 'true', GleanCounter>;
+    h264Enabled: Record<'false' | 'true', GleanCounter>;
+    hardwareH264Enabled: Record<'false' | 'true', GleanCounter>;
+    hasH264Hardware: Record<'false' | 'true', GleanCounter>;
+    maxAudioReceiveTrack: GleanCustomDistribution;
+    maxAudioSendTrack: GleanCustomDistribution;
+    maxVideoReceiveTrack: GleanCustomDistribution;
+    maxVideoSendTrack: GleanCustomDistribution;
+    renegotiations: GleanCustomDistribution;
+    softwareH264Enabled: Record<'false' | 'true', GleanCounter>;
+    videoDecoderBitrateAvgPerCallKbps: GleanCustomDistribution;
+    videoDecoderBitrateStdDevPerCallKbps: GleanCustomDistribution;
+    videoDecoderDiscardedPacketsPerCallPpm: GleanCustomDistribution;
+    videoDecoderFramerate10xStdDevPerCall: GleanCustomDistribution;
+    videoDecoderFramerateAvgPerCall: GleanCustomDistribution;
+    videoEncoderBitrateAvgPerCallKbps: GleanCustomDistribution;
+    videoEncoderBitrateStdDevPerCallKbps: GleanCustomDistribution;
+    videoEncoderFramerate10xStdDevPerCall: GleanCustomDistribution;
+    videoEncoderFramerateAvgPerCall: GleanCustomDistribution;
+    videoQualityInboundBandwidthKbits: GleanCustomDistribution;
+    videoQualityInboundJitter: GleanTimingDistribution;
+    videoQualityInboundPacketlossRate: GleanCustomDistribution;
+    videoQualityOutboundJitter: GleanTimingDistribution;
+    videoQualityOutboundPacketlossRate: GleanCustomDistribution;
+    videoQualityOutboundRtt: GleanTimingDistribution;
+  };
+
+  webrtcSignaling: {
+    audioMsectionNegotiated: GleanEventWithExtras<{
+      codecs?: string;
+      direction?: string;
+      has_rtcp_mux?: string;
+      pc_id?: string;
+      pc_negotiation_count?: string;
+      preferred_recv_codec?: string;
+      preferred_send_codec?: string;
+    }>;
+    sdpNegotiated: GleanEventWithExtras<{
+      bundle_policy?: string;
+      ice_transport_policy?: string;
+      is_remote_ice_lite?: string;
+      negotiation_count?: string;
+      num_msections_audio_recvonly?: string;
+      num_msections_audio_sendonly?: string;
+      num_msections_audio_sendrecv?: string;
+      num_msections_data?: string;
+      num_msections_video_recvonly?: string;
+      num_msections_video_sendonly?: string;
+      num_msections_video_sendrecv?: string;
+      num_transports?: string;
+      pc_id?: string;
+    }>;
+    videoMsectionNegotiated: GleanEventWithExtras<{
+      codecs?: string;
+      direction?: string;
+      has_rtcp_mux?: string;
+      num_send_simulcast_layers?: string;
+      pc_id?: string;
+      pc_negotiation_count?: string;
+      preferred_recv_codec?: string;
+      preferred_send_codec?: string;
+    }>;
+  };
+
+  webrtcVideo: {
+    recvCodecUsed: Record<string, GleanCounter>;
+    sendCodecUsed: Record<string, GleanCounter>;
+  };
+
+  webrtcdtls: {
+    cipher: Record<string, GleanCounter>;
+    clientHandshakeResult: Record<string, GleanCounter>;
+    clientHandshakeStartedCounter: GleanCounter;
+    protocolVersion: Record<string, GleanCounter>;
+    serverHandshakeResult: Record<string, GleanCounter>;
+    serverHandshakeStartedCounter: GleanCounter;
+    srtpCipher: Record<string, GleanCounter>;
+  };
+
+  dom: {
+    blinkFilesystemUsed: Record<'false' | 'true', GleanCounter>;
+    forgetSkippableDuringIdle: GleanCustomDistribution;
+    forgetSkippableFrequency: GleanCustomDistribution;
+    fullscreenTransitionBlack: GleanTimingDistribution;
+    gcInProgress: GleanTimingDistribution;
+    gcSliceDuringIdle: GleanCustomDistribution;
+    innerwindowsWithMutationListeners: Record<'false' | 'true', GleanCounter>;
+    scriptLoadingSource: Record<'AltData' | 'Inline' | 'Source' | 'SourceFallback', GleanCounter>;
+    slowScriptNoticeCount: GleanCounter;
+    slowScriptPageCount: GleanCounter;
+    storageAccessApiUi: Record<
+      'Allow' | 'AllowAutomatically' | 'AllowOnAnySite' | 'Deny' | 'Request',
+      GleanCounter
+    >;
+    webkitDirectoryUsed: Record<'false' | 'true', GleanCounter>;
+    xmlhttprequestAsyncOrSync: Record<'false' | 'true', GleanCounter>;
+  };
+
+  domContentprocess: {
+    buildIdMismatch: GleanCounter;
+    buildIdMismatchFalsePositive: GleanCounter;
+    launchIsSync: Record<'false' | 'true', GleanCounter>;
+    launchMainthread: GleanTimingDistribution;
+    launchTotal: GleanTimingDistribution;
+    osPriorityChangeConsidered: GleanCounter;
+    osPriorityLowered: GleanCounter;
+    osPriorityRaised: GleanCounter;
+    syncLaunch: GleanTimingDistribution;
+  };
+
+  domParentprocess: {
+    privateWindowUsed: GleanBoolean;
+    processLaunchErrors: Record<string, GleanCounter>;
+  };
+
+  domTextfragment: {
+    createDirective: GleanTimingDistribution;
+    findDirectives: GleanTimingDistribution;
+  };
+
+  perf: {
+    dnsFirstByte: Record<string, GleanTimingDistribution>;
+    dnsFirstContentfulPaint: Record<string, GleanTimingDistribution>;
+    h3pFirstContentfulPaint: Record<string, GleanTimingDistribution>;
+    h3pPageLoadTime: Record<string, GleanTimingDistribution>;
+    http3FirstContentfulPaint: Record<string, GleanTimingDistribution>;
+    http3PageLoadTime: Record<string, GleanTimingDistribution>;
+    largestContentfulPaint: GleanTimingDistribution;
+    largestContentfulPaintFromResponseStart: GleanTimingDistribution;
+    pageLoad: GleanEventWithExtras<{
+      cache_disposition?: string;
+      delazify_time?: string;
+      dns_lookup_time?: string;
+      document_features?: string;
+      fcp_time?: string;
+      has_ssd?: string;
+      http_ver?: string;
+      js_exec_time?: string;
+      lcp_time?: string;
+      load_time?: string;
+      load_type?: string;
+      network_type?: string;
+      redirect_count?: string;
+      redirect_time?: string;
+      response_time?: string;
+      same_origin_nav?: string;
+      time_to_request_start?: string;
+      tls_handshake_time?: string;
+      trr_domain?: string;
+      user_features?: string;
+      using_webdriver?: string;
+    }>;
+    pageLoadDomain: GleanEventWithExtras<{
+      document_features?: string;
+      domain?: string;
+      http_ver?: string;
+      lcp_time?: string;
+      load_type?: string;
+      same_origin_nav?: string;
+    }>;
+  };
+
+  performancePageload: {
+    fcp: GleanTimingDistribution;
+    fcpResponsestart: GleanTimingDistribution;
+    h3pFcpWithPriority: GleanTimingDistribution;
+    http3FcpHttp3: GleanTimingDistribution;
+    http3FcpSupportsHttp3: GleanTimingDistribution;
+    http3FcpWithoutPriority: GleanTimingDistribution;
+    loadTime: GleanTimingDistribution;
+    loadTimeResponsestart: GleanTimingDistribution;
+  };
+
+  performanceTime: {
+    domComplete: GleanTimingDistribution;
+    domContentLoadedEnd: GleanTimingDistribution;
+    domContentLoadedStart: GleanTimingDistribution;
+    domInteractive: GleanTimingDistribution;
+    loadEventEnd: GleanTimingDistribution;
+    loadEventStart: GleanTimingDistribution;
+    toDomLoading: GleanTimingDistribution;
+    toFirstContentfulPaint: GleanTimingDistribution;
+    responseStart: GleanTimingDistribution;
+  };
+
+  webNotification: {
+    iconUrlEncoding: Record<
+      'document_charset' | 'either_way' | 'neither_way' | 'utf8',
+      GleanCounter
+    >;
+    insecureContextPermissionRequest: GleanCounter;
+    permissionOrigin: Record<'first_party' | 'nested_first_party' | 'third_party', GleanCounter>;
+    requestPermissionOrigin: Record<
+      'first_party' | 'nested_first_party' | 'third_party',
+      GleanCounter
+    >;
+    showOrigin: Record<'first_party' | 'nested_first_party' | 'third_party', GleanCounter>;
+  };
+
+  screenwakelock: {
+    heldDuration: GleanTimingDistribution;
+    releaseBatteryLevelDischarging: GleanCustomDistribution;
+  };
+
+  webPush: {
+    apiNotify: GleanCounter;
+    contentEncoding: Record<'aes128gcm' | 'aesgcm', GleanCounter>;
+    detectedDuplicatedMessageIds: GleanCounter;
+    errorCode: Record<
+      | 'decryption_error'
+      | 'internal_error'
+      | 'not_delivered'
+      | 'uncaught_exception'
+      | 'unhandled_rejection',
+      GleanCounter
+    >;
+    unsubscribedByClearingData: GleanCounter;
+  };
+
+  domQuota: {
+    firstInitializationAttempt: GleanDualLabeledCounter;
+    infoLoadTime: Record<string, GleanTimingDistribution>;
+    shutdownTime: Record<string, GleanTimingDistribution>;
+  };
+
+  domQuotaTry: {
+    errorStep: GleanEventWithExtras<{
+      context?: string;
+      frame_id?: string;
+      process_id?: string;
+      result?: string;
+      seq?: string;
+      severity?: string;
+      source_file?: string;
+      source_line?: string;
+      stack_id?: string;
+    }>;
+  };
+
+  quotamanager: {
+    restoreOriginDirectoryMetadataCounter: GleanCounter;
+  };
+
+  quotamanagerInitializeRepository: {
+    numberOfIterations: Record<
+      'default' | 'persistent' | 'private' | 'temporary',
+      GleanCustomDistribution
+    >;
+  };
+
+  quotamanagerInitializeTemporarystorage: {
+    totalTimeExcludingSuspend: GleanTimingDistribution;
+  };
+
+  quotamanagerShutdown: {
+    totalTimeExcludingSuspend: GleanTimingDistribution;
+  };
+
+  httpsfirst: {
+    downgradeTime: GleanTimingDistribution;
+    downgradeTimeSchemeless: GleanTimingDistribution;
+    downgraded: GleanDenominator;
+    downgradedOnTimer: GleanNumerator;
+    downgradedOnTimerSchemeless: GleanNumerator;
+    downgradedSchemeless: GleanDenominator;
+    upgraded: GleanCounter;
+    upgradedSchemeless: GleanCounter;
+  };
+
+  mixedContent: {
+    audio: Record<
+      'AudioNoUpFailure' | 'AudioNoUpSuccess' | 'AudioUpFailure' | 'AudioUpSuccess',
+      GleanCounter
+    >;
+    hsts: GleanCustomDistribution;
+    images: Record<
+      'ImgNoUpFailure' | 'ImgNoUpSuccess' | 'ImgUpFailure' | 'ImgUpSuccess',
+      GleanCounter
+    >;
+    pageLoad: GleanCustomDistribution;
+    unblockCounter: GleanCustomDistribution;
+    video: Record<
+      'VideoNoUpFailure' | 'VideoNoUpSuccess' | 'VideoUpFailure' | 'VideoUpSuccess',
+      GleanCounter
+    >;
+  };
+
+  securityUi: {
+    events: GleanCustomDistribution;
+  };
+
+  unexpectedScriptLoad: {
+    dialogDismissed: GleanEventNoExtras;
+    infobarDismissed: GleanEventNoExtras;
+    infobarShown: GleanEventNoExtras;
+    moreInfoOpened: GleanEventNoExtras;
+    scriptAllowed: GleanEventNoExtras;
+    scriptAllowedOpened: GleanEventNoExtras;
+    scriptBlocked: GleanEventNoExtras;
+    scriptBlockedOpened: GleanEventNoExtras;
+    scriptReported: GleanEventWithExtras<{ script_url?: string; user_email?: string }>;
+  };
+
+  serviceWorker: {
+    fetchEventChannelReset: Record<string, GleanTimingDistribution>;
+    fetchEventDispatch: Record<string, GleanTimingDistribution>;
+    fetchEventFinishSynthesizedResponse: Record<string, GleanTimingDistribution>;
+    fetchInterceptionDuration: Record<string, GleanTimingDistribution>;
+    isolatedLaunchTime: GleanTimingDistribution;
+    launchTime: GleanTimingDistribution;
+    registrationLoading: GleanTimingDistribution;
+    running: Record<'All' | 'Fetch', GleanCustomDistribution>;
+  };
+
+  localdomstorage: {
+    preloadPendingOnFirstAccess: Record<'false' | 'true', GleanCounter>;
+    shutdownDatabase: GleanTimingDistribution;
+  };
+
+  webauthnCreate: {
+    authenticatorAttachment: Record<'cross-platform' | 'platform' | 'unknown', GleanCounter>;
+    failure: GleanCounter;
+    passkey: GleanCounter;
+    success: GleanCounter;
+  };
+
+  webauthnGet: {
+    authenticatorAttachment: Record<'cross-platform' | 'platform' | 'unknown', GleanCounter>;
+    failure: GleanCounter;
+    success: GleanCounter;
+  };
+
+  workers: {
+    dedicatedWorkerSpawnGetsQueued: GleanCounter;
+    serviceWorkerSpawnGetsQueued: GleanCounter;
+    sharedWorkerSpawnGetsQueued: GleanCounter;
+    syncWorkerOperation: Record<string, GleanTimingDistribution>;
+  };
+
+  htmleditors: {
+    overriddenByBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
+    withBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
+    withMutationListenersWithoutBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
+    withMutationObserversWithoutBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
+  };
+
+  permissions: {
+    defectiveSqlRemoved: GleanCounter;
+    sqlCorrupted: GleanCounter;
+  };
+
+  apzZoom: {
+    activity: Record<'false' | 'true', GleanCounter>;
+    pinchsource: GleanCustomDistribution;
+  };
+
+  fontlist: {
+    badFallbackFont: Record<'false' | 'true', GleanCounter>;
+    bundledfontsActivate: GleanTimingDistribution;
+    dwritefontDelayedinitCollect: GleanTimingDistribution;
+    dwritefontDelayedinitCount: GleanCustomDistribution;
+    dwritefontDelayedinitTotal: GleanTimingDistribution;
+    dwritefontInitProblem: GleanCustomDistribution;
+    fontCacheHit: Record<'false' | 'true', GleanCounter>;
+    initfacenamelists: GleanTimingDistribution;
+    initotherfamilynames: GleanTimingDistribution;
+    initotherfamilynamesNoDeferring: GleanTimingDistribution;
+    macInitTotal: GleanTimingDistribution;
+    systemFontFallback: GleanTimingDistribution;
+    systemFontFallbackFirst: GleanTimingDistribution;
+  };
+
+  gfx: {
+    compositeFrameRoundtripTime: GleanTimingDistribution;
+    compositeSwapTime: GleanCustomDistribution;
+    compositeTime: GleanTimingDistribution;
+    contentFailedToAcquireDevice: GleanCustomDistribution;
+    crash: GleanCustomDistribution;
+    deviceResetReason: GleanCustomDistribution;
+    forcedDeviceResetReason: GleanCustomDistribution;
+    graphicsDriverStartupTest: GleanCustomDistribution;
+    linuxWindowProtocol: GleanString;
+    macosVideoLowPower: Record<
+      | 'FailBacking'
+      | 'FailEnqueue'
+      | 'FailMacOSVersion'
+      | 'FailMultipleVideo'
+      | 'FailOverlaid'
+      | 'FailPref'
+      | 'FailSurface'
+      | 'FailWindowed'
+      | 'LowPower'
+      | 'NotVideo',
+      GleanCounter
+    >;
+    osCompositor: GleanBoolean;
+    sanityTest: GleanCustomDistribution;
+    scrollPresentLatency: GleanTimingDistribution;
+    skippedComposites: GleanCounter;
+    supportsHdr: GleanBoolean;
+    adapters: GleanObject;
+    contentBackend: GleanString;
+    d2dEnabled: GleanBoolean;
+    dwriteEnabled: GleanBoolean;
+    headless: GleanBoolean;
+    monitors: GleanObject;
+    targetFrameRate: GleanQuantity;
+    textScaleFactor: GleanString;
+  };
+
+  gfxAdapterPrimary: {
+    description: GleanString;
+    deviceId: GleanString;
+    driverDate: GleanString;
+    driverFiles: GleanString;
+    driverVendor: GleanString;
+    driverVersion: GleanString;
+    ram: GleanQuantity;
+    subsystemId: GleanString;
+    vendorId: GleanString;
+  };
+
+  gfxCheckerboard: {
+    duration: GleanTimingDistribution;
+    peakPixelCount: GleanCustomDistribution;
+    potentialDuration: GleanTimingDistribution;
+    severity: GleanCustomDistribution;
+  };
+
+  gfxContent: {
+    fullPaintTime: GleanTimingDistribution;
+    largePaintPhaseWeightFull: Record<'dl' | 'fb' | 'sb' | 'wrdl', GleanCustomDistribution>;
+    largePaintPhaseWeightPartial: Record<'dl' | 'fb' | 'sb' | 'wrdl', GleanCustomDistribution>;
+    paintTime: GleanTimingDistribution;
+    smallPaintPhaseWeightFull: Record<'dl' | 'fb' | 'sb' | 'wrdl', GleanCustomDistribution>;
+    smallPaintPhaseWeightPartial: Record<'dl' | 'fb' | 'sb' | 'wrdl', GleanCustomDistribution>;
+  };
+
+  gfxContentFrameTime: {
+    fromPaint: GleanCustomDistribution;
+    fromVsync: GleanCustomDistribution;
+    reason: Record<
+      | 'missed_composite'
+      | 'missed_composite_long'
+      | 'missed_composite_low'
+      | 'missed_composite_mid'
+      | 'no_vsync'
+      | 'no_vsync_no_id'
+      | 'on_time'
+      | 'slow_composite',
+      GleanCounter
+    >;
+    withSvg: GleanCustomDistribution;
+    withoutResourceUpload: GleanCustomDistribution;
+    withoutUpload: GleanCustomDistribution;
+  };
+
+  gfxDisplay: {
+    count: GleanQuantity;
+    primaryHeight: GleanQuantity;
+    primaryWidth: GleanQuantity;
+    scaling: GleanCustomDistribution;
+  };
+
+  gfxFeature: {
+    webrender: GleanString;
+  };
+
+  gfxHdr: {
+    windowsDisplayColorspaceBitfield: GleanQuantity;
+  };
+
+  gfxStatus: {
+    compositor: GleanString;
+    headless: GleanBoolean;
+    lastCompositorGeckoVersion: GleanString;
+  };
+
+  gpuProcess: {
+    crashFallbacks: Record<'decoding_disabled' | 'disabled' | 'none', GleanCounter>;
+    featureStatus: GleanString;
+    initializationTime: GleanTimingDistribution;
+    launchTime: GleanTimingDistribution;
+    totalLaunchAttempts: GleanQuantity;
+    unstableLaunchAttempts: GleanQuantity;
+  };
+
+  paint: {
+    buildDisplaylistTime: GleanTimingDistribution;
+  };
+
+  webfont: {
+    compressionWoff: GleanCustomDistribution;
+    compressionWoff2: GleanCustomDistribution;
+    downloadTime: GleanTimingDistribution;
+    fonttype: GleanCustomDistribution;
+    perPage: GleanCounter;
+    size: GleanMemoryDistribution;
+    sizePerPage: GleanMemoryDistribution;
+    srctype: GleanCustomDistribution;
+  };
+
+  wr: {
+    framebuildTime: GleanTimingDistribution;
+    gpuWaitTime: GleanTimingDistribution;
+    rasterizeBlobsTime: GleanTimingDistribution;
+    rasterizeGlyphsTime: GleanTimingDistribution;
+    rendererTime: GleanTimingDistribution;
+    rendererTimeNoSc: GleanTimingDistribution;
+    scenebuildTime: GleanTimingDistribution;
+    sceneswapTime: GleanTimingDistribution;
+    shaderloadTime: GleanTimingDistribution;
+    textureCacheUpdateTime: GleanTimingDistribution;
+    timeToFrameBuild: GleanTimingDistribution;
+    timeToRenderStart: GleanTimingDistribution;
+  };
+
+  avif: {
+    a1lx: Record<'absent' | 'present', GleanCounter>;
+    a1op: Record<'absent' | 'present', GleanCounter>;
+    alpha: Record<'absent' | 'present', GleanCounter>;
+    aomDecodeError: Record<
+      | 'abi_mismatch'
+      | 'corrupt_frame'
+      | 'error'
+      | 'incapable'
+      | 'invalid_param'
+      | 'mem_error'
+      | 'unsup_bitstream'
+      | 'unsup_feature',
+      GleanCounter
+    >;
+    bitDepth: Record<'color_10' | 'color_12' | 'color_16' | 'color_8' | 'unknown', GleanCounter>;
+    cicpCp: Record<
+      | 'bt2020'
+      | 'bt470bg'
+      | 'bt470m'
+      | 'bt601'
+      | 'bt709'
+      | 'ebu3213'
+      | 'generic_film'
+      | 'reserved'
+      | 'reserved_13'
+      | 'reserved_14'
+      | 'reserved_15'
+      | 'reserved_16'
+      | 'reserved_17'
+      | 'reserved_18'
+      | 'reserved_19'
+      | 'reserved_20'
+      | 'reserved_21'
+      | 'reserved_3'
+      | 'reserved_rest'
+      | 'smpte240'
+      | 'smpte431'
+      | 'smpte432'
+      | 'unspecified'
+      | 'xyz',
+      GleanCounter
+    >;
+    cicpMc: Record<
+      | 'bt2020_cl'
+      | 'bt2020_ncl'
+      | 'bt470bg'
+      | 'bt601'
+      | 'bt709'
+      | 'chromat_cl'
+      | 'chromat_ncl'
+      | 'fcc'
+      | 'ictcp'
+      | 'identity'
+      | 'reserved'
+      | 'reserved_rest'
+      | 'smpte2085'
+      | 'smpte240'
+      | 'unspecified'
+      | 'ycgco',
+      GleanCounter
+    >;
+    cicpTc: Record<
+      | 'bt2020_10bit'
+      | 'bt2020_12bit'
+      | 'bt470bg'
+      | 'bt470m'
+      | 'bt601'
+      | 'bt709'
+      | 'bt_1361'
+      | 'hlg'
+      | 'iec61966'
+      | 'linear'
+      | 'log_100'
+      | 'log_100_sqrt10'
+      | 'reserved'
+      | 'reserved_3'
+      | 'reserved_rest'
+      | 'smpte2084'
+      | 'smpte240'
+      | 'smpte428'
+      | 'srgb'
+      | 'unspecified',
+      GleanCounter
+    >;
+    clap: Record<'absent' | 'present', GleanCounter>;
+    colr: Record<'absent' | 'both' | 'icc' | 'nclx', GleanCounter>;
+    dav1dGetPictureReturnValue: GleanEventWithExtras<{ value?: string }>;
+    decodeResult: Record<
+      | 'ConvertYCbCr_failure'
+      | 'a1lx_essential'
+      | 'a1op_no_essential'
+      | 'alpha_y_bpc_mismatch'
+      | 'alpha_y_sz_mismatch'
+      | 'construction_method'
+      | 'decode_error'
+      | 'frame_size_changed'
+      | 'ftyp_not_first'
+      | 'image_item_type'
+      | 'invalid_cicp'
+      | 'invalid_parse_status'
+      | 'ispe_mismatch'
+      | 'item_loc_not_found'
+      | 'item_type_missing'
+      | 'lsel_no_essential'
+      | 'missing_brand'
+      | 'multiple_moov'
+      | 'no_image'
+      | 'no_item_data_box'
+      | 'no_moov'
+      | 'no_primary_item'
+      | 'no_samples'
+      | 'out_of_memory'
+      | 'parse_error'
+      | 'pipe_init_error'
+      | 'render_size_mismatch'
+      | 'size_overflow'
+      | 'success'
+      | 'txform_no_essential'
+      | 'uncategorized'
+      | 'write_buffer_error',
+      GleanCounter
+    >;
+    decoder: Record<'aom' | 'dav1d', GleanCounter>;
+    grid: Record<'absent' | 'present', GleanCounter>;
+    ipro: Record<'absent' | 'present', GleanCounter>;
+    ispe: Record<'absent' | 'bitstream_mismatch' | 'valid', GleanCounter>;
+    lsel: Record<'absent' | 'present', GleanCounter>;
+    majorBrand: Record<'avif' | 'avis' | 'other', GleanCounter>;
+    pasp: Record<'absent' | 'invalid' | 'nonsquare' | 'square', GleanCounter>;
+    pixi: Record<'absent' | 'bitstream_mismatch' | 'valid', GleanCounter>;
+    sequence: Record<'absent' | 'present', GleanCounter>;
+    yuvColorSpace: Record<'bt2020' | 'bt601' | 'bt709' | 'identity' | 'unknown', GleanCounter>;
+  };
+
+  imageDecode: {
+    chunks: GleanCustomDistribution;
+    count: GleanCustomDistribution;
+    onDrawLatency: GleanTimingDistribution;
+    speedAvif: GleanMemoryDistribution;
+    speedGif: GleanMemoryDistribution;
+    speedJpeg: GleanMemoryDistribution;
+    speedPng: GleanMemoryDistribution;
+    speedWebp: GleanMemoryDistribution;
+    time: GleanTimingDistribution;
+  };
+
+  intl: {
+    acceptLanguages: GleanStringList;
+    appLocales: GleanStringList;
+    availableLocales: GleanStringList;
+    regionalPrefsLocales: GleanStringList;
+    requestedLocales: GleanStringList;
+    systemLocales: GleanStringList;
+  };
+
+  ipc: {
+    transactionCancel: Record<'false' | 'true', GleanCounter>;
+  };
+
+  process: {
+    childLaunch: GleanTimingDistribution;
+  };
+
+  subprocess: {
+    abnormalAbort: Record<string, GleanCounter>;
+    crashesWithDump: Record<string, GleanCounter>;
+    killHard: Record<string, GleanCounter>;
+    launchFailure: Record<string, GleanCounter>;
+  };
+
+  javascriptGc: {
+    animation: GleanTimingDistribution;
+    budget: GleanTimingDistribution;
+    budgetOverrun: GleanTimingDistribution;
+    budgetWasIncreased: Record<'false' | 'true', GleanCounter>;
+    compactTime: GleanTimingDistribution;
+    effectiveness: GleanCustomDistribution;
+    isZoneGc: Record<'false' | 'true', GleanCounter>;
+    markGray: GleanTimingDistribution;
+    markRate: GleanCustomDistribution;
+    markRootsTime: GleanTimingDistribution;
+    markTime: GleanTimingDistribution;
+    markWeak: GleanTimingDistribution;
+    maxPause: GleanTimingDistribution;
+    minorReason: Record<
+      | 'ABORT_GC'
+      | 'ALLOC_TRIGGER'
+      | 'API'
+      | 'BG_TASK_FINISHED'
+      | 'CC_FINISHED'
+      | 'CC_FORCED'
+      | 'COMPARTMENT_REVIVED'
+      | 'COMPONENT_UTILS'
+      | 'DEBUG_GC'
+      | 'DESTROY_RUNTIME'
+      | 'DISABLE_GENERATIONAL_GC'
+      | 'DOCSHELL'
+      | 'DOM_IPC'
+      | 'DOM_TESTUTILS'
+      | 'DOM_UTILS'
+      | 'DOM_WINDOW_UTILS'
+      | 'DOM_WORKER'
+      | 'EAGER_ALLOC_TRIGGER'
+      | 'EAGER_NURSERY_COLLECTION'
+      | 'EVICT_NURSERY'
+      | 'FINISH_GC'
+      | 'FULL_CELL_PTR_BIGINT_BUFFER'
+      | 'FULL_CELL_PTR_GETTER_SETTER_BUFFER'
+      | 'FULL_CELL_PTR_OBJ_BUFFER'
+      | 'FULL_CELL_PTR_STR_BUFFER'
+      | 'FULL_GC_TIMER'
+      | 'FULL_GENERIC_BUFFER'
+      | 'FULL_SHAPE_BUFFER'
+      | 'FULL_SLOT_BUFFER'
+      | 'FULL_VALUE_BUFFER'
+      | 'FULL_WASM_ANYREF_BUFFER'
+      | 'FULL_WHOLE_CELL_BUFFER'
+      | 'HTML_PARSER'
+      | 'INTER_SLICE_GC'
+      | 'LAST_DITCH'
+      | 'LOAD_END'
+      | 'MEM_PRESSURE'
+      | 'NSJSCONTEXT_DESTROY'
+      | 'NURSERY_MALLOC_BUFFERS'
+      | 'NURSERY_TRAILERS'
+      | 'OUT_OF_NURSERY'
+      | 'PAGE_HIDE'
+      | 'PREPARE_FOR_PAGELOAD'
+      | 'PREPARE_FOR_TRACING'
+      | 'RESET'
+      | 'ROOTS_REMOVED'
+      | 'SET_DOC_SHELL'
+      | 'SHARED_MEMORY_LIMIT'
+      | 'SHUTDOWN_CC'
+      | 'TOO_MUCH_JIT_CODE'
+      | 'TOO_MUCH_MALLOC'
+      | 'TOO_MUCH_WASM_MEMORY'
+      | 'UNUSED1'
+      | 'UNUSED2'
+      | 'UNUSED3'
+      | 'USER_INACTIVE'
+      | 'WORKER_SHUTDOWN'
+      | 'XPCONNECT_SHUTDOWN',
+      GleanCounter
+    >;
+    minorReasonLong: Record<
+      | 'ABORT_GC'
+      | 'ALLOC_TRIGGER'
+      | 'API'
+      | 'BG_TASK_FINISHED'
+      | 'CC_FINISHED'
+      | 'CC_FORCED'
+      | 'COMPARTMENT_REVIVED'
+      | 'COMPONENT_UTILS'
+      | 'DEBUG_GC'
+      | 'DESTROY_RUNTIME'
+      | 'DISABLE_GENERATIONAL_GC'
+      | 'DOCSHELL'
+      | 'DOM_IPC'
+      | 'DOM_TESTUTILS'
+      | 'DOM_UTILS'
+      | 'DOM_WINDOW_UTILS'
+      | 'DOM_WORKER'
+      | 'EAGER_ALLOC_TRIGGER'
+      | 'EAGER_NURSERY_COLLECTION'
+      | 'EVICT_NURSERY'
+      | 'FINISH_GC'
+      | 'FULL_CELL_PTR_BIGINT_BUFFER'
+      | 'FULL_CELL_PTR_GETTER_SETTER_BUFFER'
+      | 'FULL_CELL_PTR_OBJ_BUFFER'
+      | 'FULL_CELL_PTR_STR_BUFFER'
+      | 'FULL_GC_TIMER'
+      | 'FULL_GENERIC_BUFFER'
+      | 'FULL_SHAPE_BUFFER'
+      | 'FULL_SLOT_BUFFER'
+      | 'FULL_VALUE_BUFFER'
+      | 'FULL_WASM_ANYREF_BUFFER'
+      | 'FULL_WHOLE_CELL_BUFFER'
+      | 'HTML_PARSER'
+      | 'INTER_SLICE_GC'
+      | 'LAST_DITCH'
+      | 'LOAD_END'
+      | 'MEM_PRESSURE'
+      | 'NSJSCONTEXT_DESTROY'
+      | 'NURSERY_MALLOC_BUFFERS'
+      | 'NURSERY_TRAILERS'
+      | 'OUT_OF_NURSERY'
+      | 'PAGE_HIDE'
+      | 'PREPARE_FOR_PAGELOAD'
+      | 'PREPARE_FOR_TRACING'
+      | 'RESET'
+      | 'ROOTS_REMOVED'
+      | 'SET_DOC_SHELL'
+      | 'SHARED_MEMORY_LIMIT'
+      | 'SHUTDOWN_CC'
+      | 'TOO_MUCH_JIT_CODE'
+      | 'TOO_MUCH_MALLOC'
+      | 'TOO_MUCH_WASM_MEMORY'
+      | 'UNUSED1'
+      | 'UNUSED2'
+      | 'UNUSED3'
+      | 'USER_INACTIVE'
+      | 'WORKER_SHUTDOWN'
+      | 'XPCONNECT_SHUTDOWN',
+      GleanCounter
+    >;
+    minorTime: GleanTimingDistribution;
+    mmu50: GleanCustomDistribution;
+    nonIncremental: Record<'false' | 'true', GleanCounter>;
+    nonIncrementalReason: Record<
+      | 'AbortRequested'
+      | 'CompartmentRevived'
+      | 'GCBytesTrigger'
+      | 'GrayRootBufferingFailed'
+      | 'IncrementalDisabled'
+      | 'JitCodeBytesTrigger'
+      | 'MallocBytesTrigger'
+      | 'ModeChange'
+      | 'NonIncrementalRequested'
+      | 'None'
+      | 'Unused1'
+      | 'ZoneChange',
+      GleanCounter
+    >;
+    nurseryBytes: GleanMemoryDistribution;
+    nurseryPromotionRate: GleanCustomDistribution;
+    parallelMarkInterruptions: GleanCustomDistribution;
+    parallelMarkSpeedup: GleanCustomDistribution;
+    parallelMarkUsed: Record<'false' | 'true', GleanCounter>;
+    parallelMarkUtilization: GleanCustomDistribution;
+    prepareTime: GleanTimingDistribution;
+    pretenureCount: GleanCustomDistribution;
+    reason: Record<
+      | 'ABORT_GC'
+      | 'ALLOC_TRIGGER'
+      | 'API'
+      | 'BG_TASK_FINISHED'
+      | 'CC_FINISHED'
+      | 'CC_FORCED'
+      | 'COMPARTMENT_REVIVED'
+      | 'COMPONENT_UTILS'
+      | 'DEBUG_GC'
+      | 'DESTROY_RUNTIME'
+      | 'DISABLE_GENERATIONAL_GC'
+      | 'DOCSHELL'
+      | 'DOM_IPC'
+      | 'DOM_TESTUTILS'
+      | 'DOM_UTILS'
+      | 'DOM_WINDOW_UTILS'
+      | 'DOM_WORKER'
+      | 'EAGER_ALLOC_TRIGGER'
+      | 'EAGER_NURSERY_COLLECTION'
+      | 'EVICT_NURSERY'
+      | 'FINISH_GC'
+      | 'FULL_CELL_PTR_BIGINT_BUFFER'
+      | 'FULL_CELL_PTR_GETTER_SETTER_BUFFER'
+      | 'FULL_CELL_PTR_OBJ_BUFFER'
+      | 'FULL_CELL_PTR_STR_BUFFER'
+      | 'FULL_GC_TIMER'
+      | 'FULL_GENERIC_BUFFER'
+      | 'FULL_SHAPE_BUFFER'
+      | 'FULL_SLOT_BUFFER'
+      | 'FULL_VALUE_BUFFER'
+      | 'FULL_WASM_ANYREF_BUFFER'
+      | 'FULL_WHOLE_CELL_BUFFER'
+      | 'HTML_PARSER'
+      | 'INTER_SLICE_GC'
+      | 'LAST_DITCH'
+      | 'LOAD_END'
+      | 'MEM_PRESSURE'
+      | 'NSJSCONTEXT_DESTROY'
+      | 'NURSERY_MALLOC_BUFFERS'
+      | 'NURSERY_TRAILERS'
+      | 'OUT_OF_NURSERY'
+      | 'PAGE_HIDE'
+      | 'PREPARE_FOR_PAGELOAD'
+      | 'PREPARE_FOR_TRACING'
+      | 'RESET'
+      | 'ROOTS_REMOVED'
+      | 'SET_DOC_SHELL'
+      | 'SHARED_MEMORY_LIMIT'
+      | 'SHUTDOWN_CC'
+      | 'TOO_MUCH_JIT_CODE'
+      | 'TOO_MUCH_MALLOC'
+      | 'TOO_MUCH_WASM_MEMORY'
+      | 'UNUSED1'
+      | 'UNUSED2'
+      | 'UNUSED3'
+      | 'USER_INACTIVE'
+      | 'WORKER_SHUTDOWN'
+      | 'XPCONNECT_SHUTDOWN',
+      GleanCounter
+    >;
+    reset: Record<'false' | 'true', GleanCounter>;
+    resetReason: Record<
+      | 'AbortRequested'
+      | 'CompartmentRevived'
+      | 'GCBytesTrigger'
+      | 'GrayRootBufferingFailed'
+      | 'IncrementalDisabled'
+      | 'JitCodeBytesTrigger'
+      | 'MallocBytesTrigger'
+      | 'ModeChange'
+      | 'NonIncrementalRequested'
+      | 'None'
+      | 'Unused1'
+      | 'ZoneChange',
+      GleanCounter
+    >;
+    sliceCount: GleanCustomDistribution;
+    sliceTime: GleanTimingDistribution;
+    sliceWasLong: Record<'false' | 'true', GleanCounter>;
+    slowPhase: Record<
+      | 'COMPACT'
+      | 'COMPACT_MOVE'
+      | 'COMPACT_UPDATE'
+      | 'COMPACT_UPDATE_CELLS'
+      | 'DECOMMIT'
+      | 'DESTROY'
+      | 'EVICT_NURSERY'
+      | 'EVICT_NURSERY_FOR_MAJOR_GC'
+      | 'FINALIZE_END'
+      | 'FINALIZE_START'
+      | 'FIND_DEAD_COMPARTMENTS'
+      | 'GC_BEGIN'
+      | 'GC_END'
+      | 'JOIN_PARALLEL_TASKS'
+      | 'MARK'
+      | 'MARK_CCWS'
+      | 'MARK_DELAYED'
+      | 'MARK_DISCARD_CODE'
+      | 'MARK_EMBEDDING'
+      | 'MARK_GRAY'
+      | 'MARK_GRAY_WEAK'
+      | 'MARK_INCOMING_GRAY'
+      | 'MARK_ROOTS'
+      | 'MARK_RUNTIME_DATA'
+      | 'MARK_STACK'
+      | 'MARK_WEAK'
+      | 'MINOR_GC'
+      | 'MUTATOR'
+      | 'PARALLEL_MARK'
+      | 'PARALLEL_MARK_MARK'
+      | 'PARALLEL_MARK_OTHER'
+      | 'PARALLEL_MARK_WAIT'
+      | 'PREPARE'
+      | 'PURGE'
+      | 'PURGE_PROP_MAP_TABLES'
+      | 'PURGE_SOURCE_URLS'
+      | 'RELAZIFY_FUNCTIONS'
+      | 'SWEEP'
+      | 'SWEEP_ATOMS_TABLE'
+      | 'SWEEP_BASE_SHAPE'
+      | 'SWEEP_CC_WRAPPER'
+      | 'SWEEP_COMPARTMENTS'
+      | 'SWEEP_COMPRESSION'
+      | 'SWEEP_FINALIZATION_OBSERVERS'
+      | 'SWEEP_INITIAL_SHAPE'
+      | 'SWEEP_INNER_VIEWS'
+      | 'SWEEP_JIT_DATA'
+      | 'SWEEP_JIT_SCRIPTS'
+      | 'SWEEP_MISC'
+      | 'SWEEP_PROP_MAP'
+      | 'SWEEP_REGEXP'
+      | 'SWEEP_UNIQUEIDS'
+      | 'SWEEP_WEAKMAPS'
+      | 'SWEEP_WEAK_CACHES'
+      | 'SWEEP_WEAK_POINTERS'
+      | 'TRACE_HEAP'
+      | 'UNMARK'
+      | 'UNMARK_WEAKMAPS'
+      | 'UPDATE_ATOMS_BITMAP'
+      | 'WAIT_BACKGROUND_THREAD'
+      | 'WEAK_COMPARTMENT_CALLBACK'
+      | 'WEAK_ZONES_CALLBACK',
+      GleanCounter
+    >;
+    slowTask: Record<
+      | 'COMPACT'
+      | 'COMPACT_MOVE'
+      | 'COMPACT_UPDATE'
+      | 'COMPACT_UPDATE_CELLS'
+      | 'DECOMMIT'
+      | 'DESTROY'
+      | 'EVICT_NURSERY'
+      | 'EVICT_NURSERY_FOR_MAJOR_GC'
+      | 'FINALIZE_END'
+      | 'FINALIZE_START'
+      | 'FIND_DEAD_COMPARTMENTS'
+      | 'GC_BEGIN'
+      | 'GC_END'
+      | 'JOIN_PARALLEL_TASKS'
+      | 'MARK'
+      | 'MARK_CCWS'
+      | 'MARK_DELAYED'
+      | 'MARK_DISCARD_CODE'
+      | 'MARK_EMBEDDING'
+      | 'MARK_GRAY'
+      | 'MARK_GRAY_WEAK'
+      | 'MARK_INCOMING_GRAY'
+      | 'MARK_ROOTS'
+      | 'MARK_RUNTIME_DATA'
+      | 'MARK_STACK'
+      | 'MARK_WEAK'
+      | 'MINOR_GC'
+      | 'MUTATOR'
+      | 'PARALLEL_MARK'
+      | 'PARALLEL_MARK_MARK'
+      | 'PARALLEL_MARK_OTHER'
+      | 'PARALLEL_MARK_WAIT'
+      | 'PREPARE'
+      | 'PURGE'
+      | 'PURGE_PROP_MAP_TABLES'
+      | 'PURGE_SOURCE_URLS'
+      | 'RELAZIFY_FUNCTIONS'
+      | 'SWEEP'
+      | 'SWEEP_ATOMS_TABLE'
+      | 'SWEEP_BASE_SHAPE'
+      | 'SWEEP_CC_WRAPPER'
+      | 'SWEEP_COMPARTMENTS'
+      | 'SWEEP_COMPRESSION'
+      | 'SWEEP_FINALIZATION_OBSERVERS'
+      | 'SWEEP_INITIAL_SHAPE'
+      | 'SWEEP_INNER_VIEWS'
+      | 'SWEEP_JIT_DATA'
+      | 'SWEEP_JIT_SCRIPTS'
+      | 'SWEEP_MISC'
+      | 'SWEEP_PROP_MAP'
+      | 'SWEEP_REGEXP'
+      | 'SWEEP_UNIQUEIDS'
+      | 'SWEEP_WEAKMAPS'
+      | 'SWEEP_WEAK_CACHES'
+      | 'SWEEP_WEAK_POINTERS'
+      | 'TRACE_HEAP'
+      | 'UNMARK'
+      | 'UNMARK_WEAKMAPS'
+      | 'UPDATE_ATOMS_BITMAP'
+      | 'WAIT_BACKGROUND_THREAD'
+      | 'WEAK_COMPARTMENT_CALLBACK'
+      | 'WEAK_ZONES_CALLBACK',
+      GleanCounter
+    >;
+    sweepTime: GleanTimingDistribution;
+    taskStartDelay: GleanTimingDistribution;
+    tenuredSurvivalRate: GleanCustomDistribution;
+    timeBetween: GleanTimingDistribution;
+    timeBetweenMinor: GleanTimingDistribution;
+    timeBetweenSlices: GleanTimingDistribution;
+    totalTime: GleanTimingDistribution;
+    zoneCount: GleanCustomDistribution;
+    zonesCollected: GleanCustomDistribution;
+  };
+
+  javascriptIon: {
+    compileTime: GleanTimingDistribution;
+  };
+
+  scriptPreloader: {
+    mainthreadRecompile: GleanCounter;
+    requests: Record<'Hit' | 'HitChild' | 'Miss', GleanCounter>;
+    waitTime: GleanTimingDistribution;
+  };
+
+  slowScriptWarning: {
+    notifyDelay: GleanTimingDistribution;
+    shownBrowser: GleanEventWithExtras<{ hang_duration?: string; uri_type?: string }>;
+    shownContent: GleanEventWithExtras<{
+      end_reason?: string;
+      hang_duration?: string;
+      n_tab_deselect?: string;
+      uptime?: string;
+      uri_type?: string;
+      wait_count?: string;
+    }>;
+  };
+
+  layout: {
+    inputEventQueuedClick: GleanTimingDistribution;
+    inputEventQueuedKeyboard: GleanTimingDistribution;
+    inputEventResponse: GleanTimingDistribution;
+    inputEventResponseCoalesced: GleanTimingDistribution;
+    loadInputEventResponse: GleanTimingDistribution;
+    longReflowInterruptible: Record<'false' | 'true', GleanCounter>;
+    paintRasterizeTime: GleanTimingDistribution;
+    refreshDriverChromeFrameDelay: GleanTimingDistribution;
+    refreshDriverContentFrameDelay: GleanTimingDistribution;
+    refreshDriverTick: GleanTimingDistribution;
+    timeToFirstInteraction: GleanTimingDistribution;
+  };
+
+  geckoview: {
+    documentSiteOrigins: GleanCustomDistribution;
+    pageLoadProgressTime: GleanTimingDistribution;
+    pageLoadTime: GleanTimingDistribution;
+    pageReloadTime: GleanTimingDistribution;
+    perDocumentSiteOrigins: GleanCustomDistribution;
+  };
+
+  zeroByteLoad: {
+    loadCss: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadDtd: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadFtl: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadHtml: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadJs: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadJson: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadOthers: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadPng: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadProperties: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadSvg: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadXhtml: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+    loadXml: GleanEventWithExtras<{
+      cancel_reason?: string;
+      cancelled?: string;
+      file_name?: string;
+      status?: string;
+      sync?: string;
+    }>;
+  };
+
+  preferences: {
+    prefsFileWasInvalid: GleanBoolean;
+    userPrefs: GleanObject;
+  };
+
+  network: {
+    cacheEntryCount: Record<'SMARTSIZE' | 'USERDEFINEDSIZE', GleanCustomDistribution>;
+    cacheEntryCountShare: Record<
+      'IMAGE' | 'JAVASCRIPT' | 'MEDIA' | 'OTHER' | 'STYLESHEET' | 'UNKNOWN' | 'WASM',
+      GleanCustomDistribution
+    >;
+    cacheSize: Record<'SMARTSIZE' | 'USERDEFINEDSIZE', GleanMemoryDistribution>;
+    cacheSizeShare: Record<
+      'IMAGE' | 'JAVASCRIPT' | 'MEDIA' | 'OTHER' | 'STYLESHEET' | 'UNKNOWN' | 'WASM',
+      GleanCustomDistribution
+    >;
+    cacheV2InputStreamStatus: GleanCustomDistribution;
+    cacheV2OutputStreamStatus: GleanCustomDistribution;
+    diskCache2ShutdownClearPrivate: GleanTimingDistribution;
+    diskCacheShutdownV2: GleanTimingDistribution;
+    httpCacheEntryAliveTime: GleanTimingDistribution;
+    httpCacheEntryReloadTime: GleanTimingDistribution;
+    httpCacheEntryReuseCount: GleanCustomDistribution;
+    backgroundfilesaverThreadCount: GleanCustomDistribution;
+    id: GleanCustomDistribution;
+    idOnline: Record<'absent' | 'present', GleanCounter>;
+    ipv4AndIpv6AddressConnectivity: GleanCustomDistribution;
+    relPreloadMissRatio: Record<
+      | 'TYPE_FETCH_UNUSED'
+      | 'TYPE_FETCH_USED'
+      | 'TYPE_FONT_UNUSED'
+      | 'TYPE_FONT_USED'
+      | 'TYPE_IMAGE_UNUSED'
+      | 'TYPE_IMAGE_USED'
+      | 'TYPE_SCRIPT_UNUSED'
+      | 'TYPE_SCRIPT_USED'
+      | 'TYPE_STYLE_UNUSED'
+      | 'TYPE_STYLE_USED',
+      GleanCounter
+    >;
+    alpnMismatchCount: Record<string, GleanCounter>;
+    asyncOpenChildToTransactionPendingExp: Record<string, GleanTimingDistribution>;
+    backPressureSuspensionCpType: GleanCustomDistribution;
+    backPressureSuspensionDelayTime: GleanTimingDistribution;
+    backPressureSuspensionRate: Record<
+      'NotSuspended' | 'NotSuspendedLocal' | 'Suspended' | 'SuspendedLocal',
+      GleanCounter
+    >;
+    byteRangeRequest: Record<'cacheable' | 'not_cacheable', GleanCounter>;
+    cacheHitMissStatPerCacheSize: Record<string, GleanCounter>;
+    cacheHitRatePerCacheSize: Record<string, GleanCustomDistribution>;
+    cacheHitTime: GleanTimingDistribution;
+    cacheMissTime: GleanTimingDistribution;
+    cacheReadTime: GleanTimingDistribution;
+    completeLoad: GleanTimingDistribution;
+    completeLoadCached: GleanTimingDistribution;
+    completeLoadNet: GleanTimingDistribution;
+    corsAuthorizationHeader: Record<'allowed' | 'covered_by_wildcard' | 'disallowed', GleanCounter>;
+    dnsEnd: GleanTimingDistribution;
+    dnsEndToConnectStartExp: Record<string, GleanTimingDistribution>;
+    dnsStart: GleanTimingDistribution;
+    firstFromCache: GleanTimingDistribution;
+    firstSentToLastReceived: GleanTimingDistribution;
+    fontDownloadEnd: GleanTimingDistribution;
+    http3CompleteLoad: Record<
+      'supports_http3_page' | 'supports_http3_sub' | 'uses_http3_page' | 'uses_http3_sub',
+      GleanTimingDistribution
+    >;
+    http3FirstSentToLastReceived: Record<
+      'supports_http3_page' | 'supports_http3_sub' | 'uses_http3_page' | 'uses_http3_sub',
+      GleanTimingDistribution
+    >;
+    http3OpenToFirstReceived: Record<
+      'supports_http3_page' | 'supports_http3_sub' | 'uses_http3_page' | 'uses_http3_sub',
+      GleanTimingDistribution
+    >;
+    http3OpenToFirstSent: Record<
+      'supports_http3_page' | 'supports_http3_sub' | 'uses_http3_page' | 'uses_http3_sub',
+      GleanTimingDistribution
+    >;
+    http3TlsHandshake: Record<
+      'supports_http3_page' | 'supports_http3_sub' | 'uses_http3_page' | 'uses_http3_sub',
+      GleanTimingDistribution
+    >;
+    httpFetchDuration: Record<
+      'h1_cloudflare' | 'h1_others' | 'h2_cloudflare' | 'h2_others' | 'h3_cloudflare' | 'h3_others',
+      GleanTimingDistribution
+    >;
+    httpRevalidation: GleanTimingDistribution;
+    openToFirstReceived: GleanTimingDistribution;
+    openToFirstSent: GleanTimingDistribution;
+    pageLoadSize: Record<'page' | 'subresources', GleanMemoryDistribution>;
+    raceCacheBandwidthNotRace: GleanMemoryDistribution;
+    raceCacheBandwidthRaceCacheWin: GleanMemoryDistribution;
+    raceCacheBandwidthRaceNetworkWin: GleanMemoryDistribution;
+    raceCacheValidation: Record<
+      'CachedContentNotUsed' | 'CachedContentUsed' | 'NotSent',
+      GleanCounter
+    >;
+    raceCacheWithNetworkOcecOnStartDiff: GleanTimingDistribution;
+    raceCacheWithNetworkSavedTime: GleanTimingDistribution;
+    raceCacheWithNetworkUsage: Record<
+      | 'CacheDelayedRace'
+      | 'CacheNoRace'
+      | 'CacheRace'
+      | 'NetworkDelayedRace'
+      | 'NetworkNoRace'
+      | 'NetworkRace',
+      GleanCounter
+    >;
+    responseEndParentToContent: Record<string, GleanTimingDistribution>;
+    responseStartParentToContentExp: Record<string, GleanTimingDistribution>;
+    retriedSystemChannelAddonStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    retriedSystemChannelAddonversionStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    retriedSystemChannelOtherStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    retriedSystemChannelRemoteSettingsStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    retriedSystemChannelTelemetryStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    retriedSystemChannelUpdateStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    subCacheReadTime: GleanTimingDistribution;
+    subCompleteLoad: GleanTimingDistribution;
+    subCompleteLoadCached: GleanTimingDistribution;
+    subCompleteLoadNet: GleanTimingDistribution;
+    subDnsEnd: GleanTimingDistribution;
+    subDnsStart: GleanTimingDistribution;
+    subFirstFromCache: GleanTimingDistribution;
+    subFirstSentToLastReceived: GleanTimingDistribution;
+    subHttpRevalidation: GleanTimingDistribution;
+    subOpenToFirstReceived: GleanTimingDistribution;
+    subOpenToFirstSent: GleanTimingDistribution;
+    subTcpConnection: GleanTimingDistribution;
+    subTlsHandshake: GleanTimingDistribution;
+    supHttp3TcpConnection: Record<
+      'supports_http3_page' | 'supports_http3_sub',
+      GleanTimingDistribution
+    >;
+    systemChannelAddonStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelAddonversionStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelOtherStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelRemoteSettingsStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelSuccessOrFailure: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelTelemetryStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    systemChannelUpdateStatus: Record<
+      | 'cancel'
+      | 'connect_fail'
+      | 'connectivity'
+      | 'dns'
+      | 'http_status'
+      | 'offline'
+      | 'ok'
+      | 'other'
+      | 'partial'
+      | 'refused'
+      | 'reset'
+      | 'timeout'
+      | 'tls_fail',
+      GleanCounter
+    >;
+    tcpConnection: GleanTimingDistribution;
+    tlsEarlyDataAccepted: Record<'accepted' | 'rejected', GleanCounter>;
+    tlsEarlyDataBytesWritten: GleanCustomDistribution;
+    tlsEarlyDataNegotiated: Record<
+      'available_and_used' | 'available_but_not_used' | 'not_available',
+      GleanCounter
+    >;
+    tlsHandshake: GleanTimingDistribution;
+    trrIdleCloseTimeH1: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrIdleCloseTimeH2: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+    trrIdleCloseTimeH3: Record<
+      | 'dns.shaw.ca'
+      | 'dns.shaw.ca_2'
+      | 'dns.shaw.ca_3'
+      | 'doh.xfinity.com'
+      | 'doh.xfinity.com_2'
+      | 'doh.xfinity.com_3'
+      | 'dooh.cloudflare-dns.com'
+      | 'dooh.cloudflare-dns.com_2'
+      | 'dooh.cloudflare-dns.com_3'
+      | 'firefox.dns.nextdns.io'
+      | 'firefox.dns.nextdns.io_2'
+      | 'firefox.dns.nextdns.io_3'
+      | 'mozilla.cloudflare-dns.com'
+      | 'mozilla.cloudflare-dns.com_2'
+      | 'mozilla.cloudflare-dns.com_3'
+      | 'private.canadianshield.cira.ca'
+      | 'private.canadianshield.cira.ca_2'
+      | 'private.canadianshield.cira.ca_3',
+      GleanTimingDistribution
+    >;
+  };
+
+  dns: {
+    blocklistCount: GleanCustomDistribution;
+    byTypeCleanupAge: GleanTimingDistribution;
+    byTypeFailedLookupTime: GleanTimingDistribution;
+    byTypePrematureEviction: GleanTimingDistribution;
+    byTypeSucceededLookupTime: GleanTimingDistribution;
+    cleanupAge: GleanTimingDistribution;
+    gracePeriodRenewal: Record<'different_record' | 'same_record', GleanCounter>;
+    lookupAlgorithm: Record<
+      'nativeOnly' | 'trrFirst' | 'trrOnly' | 'trrRace' | 'trrShadow',
+      GleanCounter
+    >;
+    lookupDisposition: GleanDualLabeledCounter;
+    lookupMethod: GleanCustomDistribution;
+    nativeLookupTime: GleanTimingDistribution;
+    nativeQueuing: GleanTimingDistribution;
+    prematureEviction: GleanTimingDistribution;
+    trrAttemptCount: Record<string, GleanCustomDistribution>;
+    trrBlacklisted: GleanDualLabeledCounter;
+    trrDisabled: GleanDualLabeledCounter;
+    trrFirst: GleanDualLabeledCounter;
+    trrHttpVersion: GleanDualLabeledCounter;
+    trrLookupTime: Record<string, GleanTimingDistribution>;
+    trrNsVerfified: GleanDualLabeledCounter;
+    trrProcessingTime: GleanTimingDistribution;
+    trrRelevantSkipReasonNativeFailed: Record<string, GleanCustomDistribution>;
+    trrRelevantSkipReasonNativeSuccess: Record<string, GleanCustomDistribution>;
+    trrRelevantSkipReasonTrrFirst: Record<string, GleanCustomDistribution>;
+    trrRelevantSkipReasonTrrFirstTypeRec: Record<string, GleanCustomDistribution>;
+    trrSkipReasonNativeFailed: Record<string, GleanCustomDistribution>;
+    trrSkipReasonNativeSuccess: Record<string, GleanCustomDistribution>;
+    trrSkipReasonRetryFailed: Record<string, GleanCustomDistribution>;
+    trrSkipReasonRetrySuccess: Record<string, GleanCustomDistribution>;
+    trrSkipReasonStrictMode: Record<string, GleanCustomDistribution>;
+    trrSkipReasonTrrFirst: Record<string, GleanCustomDistribution>;
+    trrSuccess: GleanDualLabeledCounter;
+  };
+
+  networkCookies: {
+    sqliteOpenReadahead: GleanTimingDistribution;
+  };
+
+  networkDns: {
+    trrConfirmationContext: GleanEventWithExtras<{
+      attemptCount?: string;
+      captivePortal?: string;
+      contextReason?: string;
+      failedLookups?: string;
+      networkID?: string;
+      results?: string;
+      time?: string;
+      trigger?: string;
+      value?: string;
+    }>;
+  };
+
+  networkSso: {
+    entraSuccess: Record<
+      | 'both_headers_missing'
+      | 'broker_error'
+      | 'device_headers_missing'
+      | 'invalid_controller_setup'
+      | 'invalid_cookie'
+      | 'no_credential'
+      | 'prt_headers_missing'
+      | 'success',
+      GleanCounter
+    >;
+    totalEntraUses: GleanCounter;
+  };
+
+  predictor: {
+    baseConfidence: GleanCustomDistribution;
+    confidence: GleanCustomDistribution;
+    globalDegradation: GleanCustomDistribution;
+    learnAttempts: GleanCustomDistribution;
+    learnWorkTime: GleanTimingDistribution;
+    predictTimeToAction: GleanTimingDistribution;
+    predictTimeToInaction: GleanTimingDistribution;
+    predictWorkTime: GleanTimingDistribution;
+    predictionsCalculated: GleanCustomDistribution;
+    prefetchDecisionReason: GleanCustomDistribution;
+    prefetchIgnoreReason: GleanCustomDistribution;
+    prefetchTime: GleanTimingDistribution;
+    prefetchUseStatus: Record<
+      'Auth' | 'Etag' | 'Expired' | 'Not200' | 'Redirect' | 'Used' | 'WaitedTooLong' | 'WouldVary',
+      GleanCounter
+    >;
+    subresourceDegradation: GleanCustomDistribution;
+    totalPreconnects: GleanCustomDistribution;
+    totalPredictions: GleanCustomDistribution;
+    totalPrefetches: GleanCustomDistribution;
+    totalPreresolves: GleanCustomDistribution;
+    waitTime: GleanTimingDistribution;
+  };
+
+  hpack: {
+    bytesEvictedCompressor: GleanMemoryDistribution;
+    bytesEvictedDecompressor: GleanMemoryDistribution;
+    bytesEvictedRatioCompressor: GleanCustomDistribution;
+    bytesEvictedRatioDecompressor: GleanCustomDistribution;
+    elementsEvictedCompressor: GleanCustomDistribution;
+    elementsEvictedDecompressor: GleanCustomDistribution;
+    peakCountCompressor: GleanCustomDistribution;
+    peakCountDecompressor: GleanCustomDistribution;
+    peakSizeCompressor: GleanMemoryDistribution;
+    peakSizeDecompressor: GleanMemoryDistribution;
+  };
+
+  http: {
+    altsvcEntriesPerHeader: GleanCustomDistribution;
+    altsvcMappingChangedTarget: Record<'false' | 'true', GleanCounter>;
+    cacheDisposition: GleanDualLabeledCounter;
+    cacheLmInconsistent: Record<'false' | 'true', GleanCounter>;
+    channelDisposition: GleanCustomDistribution;
+    channelOnstartSuccess: Record<'false' | 'true', GleanCounter>;
+    channelPageOnstartSuccessTrr: Record<string, GleanCustomDistribution>;
+    channelSubOnstartSuccessTrr: Record<string, GleanCustomDistribution>;
+    connectionCloseReason: Record<string, GleanCustomDistribution>;
+    connectionEntryCacheHit: Record<'false' | 'true', GleanCounter>;
+    contentEncoding: GleanCustomDistribution;
+    dnsHttpssvcConnectionFailedReason: GleanCustomDistribution;
+    dnsHttpssvcRecordReceivingStage: GleanCustomDistribution;
+    dntUsage: GleanCustomDistribution;
+    echconfigSuccessRate: Record<
+      'EchConfigFailed' | 'EchConfigSucceeded' | 'NoEchConfigFailed' | 'NoEchConfigSucceeded',
+      GleanCounter
+    >;
+    http2FailBeforeSettings: Record<'false' | 'true', GleanCounter>;
+    kbreadPerConn2: GleanMemoryDistribution;
+    pageloadIsSsl: Record<'false' | 'true', GleanCounter>;
+    requestPerConn: GleanCustomDistribution;
+    requestPerPage: GleanCustomDistribution;
+    requestPerPageFromCache: GleanCustomDistribution;
+    responseVersion: GleanCustomDistribution;
+    sawQuicAltProtocol: GleanCustomDistribution;
+    scriptBlockIncorrectMime: Record<
+      | 'CORS_origin'
+      | 'app_json'
+      | 'app_octet_stream'
+      | 'app_xml'
+      | 'audio'
+      | 'cross_origin'
+      | 'empty'
+      | 'image'
+      | 'importScript_load'
+      | 'javaScript'
+      | 'same_origin'
+      | 'script_load'
+      | 'serviceworker_load'
+      | 'text_csv'
+      | 'text_html'
+      | 'text_json'
+      | 'text_plain'
+      | 'text_xml'
+      | 'unknown'
+      | 'video'
+      | 'worker_load'
+      | 'worklet_load',
+      GleanCounter
+    >;
+    subitemFirstByteLatencyTime: GleanTimingDistribution;
+    subitemOpenLatencyTime: GleanTimingDistribution;
+    tlsEarlyDataAccepted: Record<'false' | 'true', GleanCounter>;
+    tlsEarlyDataNegotiated: GleanCustomDistribution;
+    trafficAnalysis: GleanDualLabeledCounter;
+    transactionEchRetryEchFailedCount: GleanCustomDistribution;
+    transactionEchRetryOthersCount: GleanCustomDistribution;
+    transactionEchRetryWithEchCount: GleanCustomDistribution;
+    transactionEchRetryWithoutEchCount: GleanCustomDistribution;
+    transactionIsSsl: Record<'false' | 'true', GleanCounter>;
+    transactionRestartReason: GleanCustomDistribution;
+    transactionUseAltsvc: Record<'false' | 'true', GleanCounter>;
+    transactionWaitTimeHttp: GleanTimingDistribution;
+    transactionWaitTimeHttp2SupHttp3: GleanTimingDistribution;
+    transactionWaitTimeHttp3: GleanTimingDistribution;
+    transactionWaitTimeSpdy: GleanTimingDistribution;
+    uploadBandwidthMbps: Record<string, GleanCustomDistribution>;
+  };
+
+  http3: {
+    blockedByStreamLimitPerConn: GleanCustomDistribution;
+    connectionCloseCode: Record<string, GleanCustomDistribution>;
+    countsPto: Record<string, GleanCustomDistribution>;
+    dropDgrams: GleanCustomDistribution;
+    echOutcome: Record<'GREASE' | 'NONE' | 'REAL', GleanCustomDistribution>;
+    lateAck: Record<'ack' | 'pto', GleanCustomDistribution>;
+    lateAckRatio: Record<'ack' | 'pto', GleanCustomDistribution>;
+    lossRatio: GleanCustomDistribution;
+    receivedSentDgrams: Record<'received' | 'sent', GleanCustomDistribution>;
+    requestPerConn: GleanCustomDistribution;
+    savedDgrams: GleanCustomDistribution;
+    sendingBlockedByFlowControlPerTrans: GleanCustomDistribution;
+    timerDelayed: GleanTimingDistribution;
+    transBlockedByStreamLimitPerConn: GleanCustomDistribution;
+    transSendingBlockedByFlowControlPerConn: GleanCustomDistribution;
+  };
+
+  netwerk: {
+    http30rttState: Record<
+      'conn_closed_by_necko' | 'conn_error' | 'not_used' | 'rejected' | 'succeeded',
+      GleanCounter
+    >;
+    http30rttStateDuration: Record<
+      'conn_closed_by_necko' | 'conn_error' | 'not_used' | 'rejected' | 'succeeded',
+      GleanTimingDistribution
+    >;
+    http3TimeToReuseIdleConnection: Record<'failed' | 'succeeded', GleanTimingDistribution>;
+    parentConnectTimeout: GleanCounter;
+  };
+
+  opaqueResponseBlocking: {
+    crossOriginOpaqueResponseCount: GleanCounter;
+    javascriptValidationCount: GleanCounter;
+  };
+
+  orb: {
+    blockInitiator: Record<
+      | 'BEACON'
+      | 'BLOCKED_FETCH'
+      | 'CSP_REPORT'
+      | 'DTD'
+      | 'EXCLUDED'
+      | 'FILTERED_FETCH'
+      | 'FONT'
+      | 'IMAGE'
+      | 'IMAGESET'
+      | 'INVALID'
+      | 'JSON'
+      | 'MEDIA'
+      | 'OTHER'
+      | 'PING'
+      | 'PROXIED_WEBRTC_MEDIA'
+      | 'SCRIPT'
+      | 'SPECULATIVE'
+      | 'STYLESHEET'
+      | 'UA_FONT'
+      | 'WEB_MANIFEST'
+      | 'WEB_TRANSPORT'
+      | 'XMLHTTPREQUEST'
+      | 'XSLT',
+      GleanCounter
+    >;
+    blockReason: Record<
+      | 'AFTER_SNIFF_CT_FAIL'
+      | 'AFTER_SNIFF_MEDIA'
+      | 'AFTER_SNIFF_NOSNIFF'
+      | 'AFTER_SNIFF_STA_CODE'
+      | 'JS_VALIDATION_FAILED'
+      | 'MEDIA_INCORRECT_RESP'
+      | 'MEDIA_NOT_INITIAL'
+      | 'MIME_NEVER_SNIFFED'
+      | 'NOSNIFF_BLC_OR_TEXTP'
+      | 'RESP_206_BLCLISTED'
+      | 'RESP_206_NO_FIRST',
+      GleanCounter
+    >;
+    didEverBlockResponse: Record<'false' | 'true', GleanCounter>;
+    javascriptValidation: Record<
+      'failure' | 'javascript' | 'json' | 'other',
+      GleanTimingDistribution
+    >;
+    receiveDataForValidation: Record<
+      'failure' | 'javascript' | 'json' | 'other',
+      GleanTimingDistribution
+    >;
+  };
+
+  spdy: {
+    chunkRecvd: GleanMemoryDistribution;
+    continuedHeaders: GleanMemoryDistribution;
+    goawayLocal: GleanCustomDistribution;
+    goawayPeer: GleanCustomDistribution;
+    kbreadPerConn: GleanMemoryDistribution;
+    parallelStreams: GleanCustomDistribution;
+    requestPerConn: GleanCustomDistribution;
+    serverInitiatedStreams: GleanCustomDistribution;
+    settingsIw: GleanMemoryDistribution;
+    settingsMaxStreams: GleanCustomDistribution;
+    synRatio: GleanCustomDistribution;
+    synReplyRatio: GleanCustomDistribution;
+    synReplySize: GleanMemoryDistribution;
+    synSize: GleanMemoryDistribution;
+  };
+
+  websockets: {
+    handshakeType: GleanCustomDistribution;
+  };
+
+  parsing: {
+    svgUnusualPcdata: GleanRate;
+  };
+
+  ysod: {
+    shownYsod: GleanEventWithExtras<{
+      destroyed?: string;
+      error_code?: string;
+      hidden?: string;
+      last_line?: string;
+      last_line_len?: string;
+      location?: string;
+      value?: string;
+    }>;
+  };
+
+  certSignatureCache: {
+    hits: GleanNumerator;
+    total: GleanDenominator;
+  };
+
+  certTrustCache: {
+    hits: GleanNumerator;
+    total: GleanDenominator;
+  };
+
+  certVerifier: {
+    certRevocationMechanisms: Record<
+      'CRLite' | 'CachedOCSP' | 'OCSP' | 'OneCRL' | 'ShortValidity' | 'StapledOCSP',
+      GleanCounter
+    >;
+    crliteStatus: Record<
+      | 'no_filter'
+      | 'not_covered'
+      | 'not_enrolled'
+      | 'not_revoked'
+      | 'revoked_in_filter'
+      | 'revoked_in_stash',
+      GleanCounter
+    >;
+    crliteVsOcspResult: Record<
+      | 'CRLiteRevOCSPFail'
+      | 'CRLiteRevOCSPOk'
+      | 'CRLiteRevOCSPRev'
+      | 'CRLiteRevOCSPSoft'
+      | 'CRLiteRevOCSPUnk',
+      GleanCounter
+    >;
+  };
+
+  sctSignatureCache: {
+    hits: GleanNumerator;
+    total: GleanDenominator;
+  };
+
+  cert: {
+    chainKeySizeStatus: GleanCustomDistribution;
+    evStatus: GleanCustomDistribution;
+    validationHttpRequestResult: GleanCustomDistribution;
+    validationSuccessByCa2: GleanCustomDistribution;
+  };
+
+  certCompression: {
+    failures: Record<'brotli' | 'zlib' | 'zstd', GleanCounter>;
+  };
+
+  certPinning: {
+    failuresByCa2: GleanCustomDistribution;
+    mozResultsByHost: GleanCustomDistribution;
+    mozTestResultsByHost: GleanCustomDistribution;
+    results: Record<'false' | 'true', GleanCounter>;
+    testResults: Record<'false' | 'true', GleanCounter>;
+  };
+
+  certStorage: {
+    memory: GleanMemoryDistribution;
+  };
+
+  certVerificationTime: {
+    failure: GleanTimingDistribution;
+    success: GleanTimingDistribution;
+  };
+
+  dataStorage: {
+    alternateServices: GleanQuantity;
+    clientAuthRememberList: GleanQuantity;
+    siteSecurityServiceState: GleanQuantity;
+  };
+
+  ocspRequestTime: {
+    cancel: GleanTimingDistribution;
+    failure: GleanTimingDistribution;
+    success: GleanTimingDistribution;
+  };
+
+  oskeystore: {
+    returnCodes: GleanEventWithExtras<{ function?: string; result?: string }>;
+  };
+
+  pkcs11: {
+    externalTrustAnchorModuleLoaded: GleanBoolean;
+    thirdPartyModuleProfileEntries: GleanStringList;
+    thirdPartyModuleSignatureType: GleanEventWithExtras<{ filename?: string; signature?: string }>;
+    thirdPartyModulesLoaded: GleanQuantity;
+  };
+
+  ssl: {
+    authAlgorithmFull: GleanCustomDistribution;
+    authEcdsaCurveFull: GleanCustomDistribution;
+    authRsaKeySizeFull: GleanCustomDistribution;
+    bytesBeforeCertCallback: GleanMemoryDistribution;
+    certErrorOverrides: GleanCustomDistribution;
+    certVerificationErrors: GleanCustomDistribution;
+    ctPolicyNonCompliantConnectionsByCa2: GleanCustomDistribution;
+    keaDheKeySizeFull: GleanCustomDistribution;
+    keaEcdheCurveFull: GleanCustomDistribution;
+    keaRsaKeySizeFull: GleanCustomDistribution;
+    keyExchangeAlgorithmFull: GleanCustomDistribution;
+    keyExchangeAlgorithmResumed: GleanCustomDistribution;
+    npnType: GleanCustomDistribution;
+    ocspStapling: GleanCustomDistribution;
+    permanentCertErrorOverrides: GleanCustomDistribution;
+    reasonsForNotFalseStarting: GleanCustomDistribution;
+    resumedSession: Record<'false' | 'true', GleanCounter>;
+    sctsOrigin: GleanCustomDistribution;
+    sctsPerConnection: GleanCustomDistribution;
+    sctsVerificationStatus: GleanCustomDistribution;
+    timeUntilHandshakeFinishedKeyedByKa: Record<string, GleanTimingDistribution>;
+    timeUntilReady: GleanTimingDistribution;
+    timeUntilReadyConservative: GleanTimingDistribution;
+    timeUntilReadyEch: GleanTimingDistribution;
+    timeUntilReadyEchGrease: GleanTimingDistribution;
+    timeUntilReadyFirstTry: GleanTimingDistribution;
+    tls10IntoleranceReasonPost: GleanCustomDistribution;
+    tls10IntoleranceReasonPre: GleanCustomDistribution;
+    tls11IntoleranceReasonPost: GleanCustomDistribution;
+    tls11IntoleranceReasonPre: GleanCustomDistribution;
+    tls12IntoleranceReasonPost: GleanCustomDistribution;
+    tls12IntoleranceReasonPre: GleanCustomDistribution;
+    tls13IntoleranceReasonPost: GleanCustomDistribution;
+    tls13IntoleranceReasonPre: GleanCustomDistribution;
+    versionFallbackInappropriate: GleanCustomDistribution;
+  };
+
+  sslHandshake: {
+    completed: GleanCustomDistribution;
+    privacy: GleanCustomDistribution;
+    result: GleanCustomDistribution;
+    resultConservative: GleanCustomDistribution;
+    resultEch: GleanCustomDistribution;
+    resultEchGrease: GleanCustomDistribution;
+    resultFirstTry: GleanCustomDistribution;
+    version: GleanCustomDistribution;
+  };
+
+  tls: {
+    certificateVerifications: GleanDenominator;
+    cipherSuite: GleanCustomDistribution;
+    xyberIntoleranceReason: Record<
+      | 'PR_CONNECT_RESET_ERROR'
+      | 'PR_END_OF_FILE_ERROR'
+      | 'SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE'
+      | 'SSL_ERROR_BAD_MAC_ALERT'
+      | 'SSL_ERROR_BAD_MAC_READ'
+      | 'SSL_ERROR_DECODE_ERROR_ALERT'
+      | 'SSL_ERROR_HANDSHAKE_FAILED'
+      | 'SSL_ERROR_HANDSHAKE_FAILURE_ALERT'
+      | 'SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT'
+      | 'SSL_ERROR_ILLEGAL_PARAMETER_ALERT'
+      | 'SSL_ERROR_INTERNAL_ERROR_ALERT'
+      | 'SSL_ERROR_KEY_EXCHANGE_FAILURE'
+      | 'SSL_ERROR_NO_CYPHER_OVERLAP'
+      | 'SSL_ERROR_PROTOCOL_VERSION_ALERT'
+      | 'SSL_ERROR_RX_MALFORMED_HYBRID_KEY_SHARE'
+      | 'SSL_ERROR_RX_UNEXPECTED_RECORD_TYPE'
+      | 'SSL_ERROR_UNSUPPORTED_VERSION',
+      GleanCounter
+    >;
+  };
+
+  verificationUsedCertFrom: {
+    builtInRootsModule: GleanNumerator;
+    nssCertDb: GleanNumerator;
+    preloadedIntermediates: GleanNumerator;
+    thirdPartyCertificates: GleanNumerator;
+    tlsHandshake: GleanNumerator;
+  };
+
+  sandbox: {
+    contentWin32kLockdownState: GleanQuantity;
+    effectiveContentProcessLevel: GleanQuantity;
+    failedLaunchKeyed: Record<string, GleanCustomDistribution>;
+    hasUserNamespaces: Record<'false' | 'true', GleanCounter>;
+    rejectedSyscalls: Record<string, GleanCounter>;
+  };
+
+  uptakeRemotecontentResult: {
+    uptakeNormandy: GleanEventWithExtras<{
+      age?: string;
+      duration?: string;
+      errorName?: string;
+      source?: string;
+      timestamp?: string;
+      trigger?: string;
+      value?: string;
+    }>;
+    uptakeRemotesettings: GleanEventWithExtras<{
+      age?: string;
+      duration?: string;
+      errorName?: string;
+      source?: string;
+      timestamp?: string;
+      trigger?: string;
+      value?: string;
+    }>;
+  };
+
+  clientAssociation: {
+    legacyClientId: GleanUuid;
+    uid: GleanString;
+  };
+
+  fxa: {
+    accountEnabled: GleanBoolean;
+    closetabReceived: GleanEventWithExtras<{
+      flow_id?: string;
+      hashed_device_id?: string;
+      reason?: string;
+      server_time?: string;
+      stream_id?: string;
+    }>;
+    closetabSent: GleanEventWithExtras<{
+      flow_id?: string;
+      hashed_device_id?: string;
+      server_time?: string;
+      stream_id?: string;
+    }>;
+    connectAccount: GleanEventWithExtras<{ fxa?: string; sync?: string; value?: string }>;
+    disconnectAccount: GleanEventWithExtras<{ fxa?: string; sync?: string; value?: string }>;
+    sendtabReceived: GleanEventWithExtras<{
+      flow_id?: string;
+      hashed_device_id?: string;
+      reason?: string;
+      server_time?: string;
+      stream_id?: string;
+    }>;
+    sendtabSent: GleanEventWithExtras<{
+      flow_id?: string;
+      hashed_device_id?: string;
+      server_time?: string;
+      stream_id?: string;
+    }>;
+    syncEnabled: GleanBoolean;
+  };
+
+  syncSettings: {
+    openChooseWhatToSyncMenu: GleanEventWithExtras<{ why?: string }>;
+    save: GleanEventWithExtras<{ disabled_engines?: string; enabled_engines?: string }>;
+  };
+
+  fxaAppMenu: {
+    clickAccountSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickCad: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickLogin: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickMonitorCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickOpenMonitor: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickOpenSend: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickRelayCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSendTab: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncNow: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncTabs: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncTabsSidebar: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickToolbarIcon: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickUnverSyncSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickVpnCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+  };
+
+  fxaAvatarMenu: {
+    clickAccountSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickCad: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickLogin: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickMonitorCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickOpenMonitor: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickOpenSend: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickRelayCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSendTab: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncNow: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncTabs: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickSyncTabsSidebar: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickToolbarIcon: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickUnverSyncSettings: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+    clickVpnCta: GleanEventWithExtras<{
+      fxa_avatar?: string;
+      fxa_status?: string;
+      fxa_sync_on?: string;
+    }>;
+  };
+
+  sync: {
+    deviceCountDesktop: GleanCustomDistribution;
+    deviceCountMobile: GleanCustomDistribution;
+    maintenanceFixBookmarks: GleanEventNoExtras;
+    maintenanceRunBookmarks: GleanEventNoExtras;
+  };
+
+  syncClient: {
+    processcommand: GleanEventWithExtras<{
+      command?: string;
+      flow_id?: string;
+      server_time?: string;
+    }>;
+    sendcommand: GleanEventWithExtras<{
+      command?: string;
+      device_id?: string;
+      flow_id?: string;
+      reason?: string;
+      server_time?: string;
+    }>;
+  };
+
+  syncMergeDialog: {
+    clicked: GleanEventWithExtras<{ option_clicked?: string; variant_shown?: string }>;
+  };
+
+  syncs: {
+    discarded: GleanQuantity;
+    hashedDeviceId: GleanString;
+    hashedFxaUid: GleanString;
+    migrations: GleanObject;
+    sessionStartDate: GleanDatetime;
+    syncNodeType: GleanString;
+    syncs: GleanObject;
+  };
+
+  startupCache: {
+    requests: Record<'HitDisk' | 'HitMemory' | 'Miss', GleanCounter>;
+  };
+
+  sqliteStore: {
+    open: GleanDualLabeledCounter;
+    query: GleanDualLabeledCounter;
+  };
+
+  bounceTrackingProtection: {
+    mode: GleanQuantity;
+    numHostsPerPurgeRun: GleanCustomDistribution;
+    purgeAction: GleanEventWithExtras<{
+      bounce_time?: string;
+      is_dry_run?: string;
+      require_stateful_bounces?: string;
+      site_host?: string;
+      success?: string;
+    }>;
+    purgeCount: Record<'dry' | 'failure' | 'success', GleanCounter>;
+    purgeCountClassifiedTracker: GleanCounter;
+    purgeDuration: GleanTimingDistribution;
+  };
+
+  contentblocking: {
+    canvasFingerprintingPerTab: Record<
+      'known_text' | 'known_text_matched' | 'unknown' | 'unknown_matched',
+      GleanCustomDistribution
+    >;
+    category: GleanQuantity;
+    cookieBehavior: GleanCustomDistribution;
+    cryptominersBlockedCount: Record<'allowed' | 'blocked' | 'pageLoad', GleanCounter>;
+    cryptominingBlockingEnabled: GleanBoolean;
+    emailTrackerCount: Record<
+      'base_email_webapp' | 'base_normal' | 'content_email_webapp' | 'content_normal',
+      GleanCounter
+    >;
+    emailTrackerEmbeddedPerTab: Record<
+      | 'all_emailapp'
+      | 'all_normal'
+      | 'base_emailapp'
+      | 'base_normal'
+      | 'content_emailapp'
+      | 'content_normal',
+      GleanCustomDistribution
+    >;
+    fingerprintersBlockedCount: Record<'allowed' | 'blocked' | 'pageLoad', GleanCounter>;
+    fingerprintingBlockingEnabled: GleanBoolean;
+    fontFingerprintingPerTab: Record<'false' | 'true', GleanCounter>;
+    queryStrippingCount: Record<
+      'Navigation' | 'Redirect' | 'StripForNavigation' | 'StripForRedirect',
+      GleanCounter
+    >;
+    queryStrippingCountByParam: Record<
+      | 'param___hsfp'
+      | 'param___hssc'
+      | 'param___hstc'
+      | 'param___s'
+      | 'param__hsenc'
+      | 'param__openstat'
+      | 'param_dclid'
+      | 'param_fbclid'
+      | 'param_gbraid'
+      | 'param_gclid'
+      | 'param_hsctatracking'
+      | 'param_mc_eid'
+      | 'param_mkt_tok'
+      | 'param_msclkid'
+      | 'param_oly_anon_id'
+      | 'param_oly_enc_id'
+      | 'param_twclid'
+      | 'param_vero_id'
+      | 'param_wbraid'
+      | 'param_wickedid'
+      | 'param_yclid'
+      | 'param_ysclid',
+      GleanCounter
+    >;
+    queryStrippingParamCount: GleanCustomDistribution;
+    storageAccessGrantedCount: Record<
+      | 'Navigation'
+      | 'Navigation_CT'
+      | 'Opener'
+      | 'OpenerAfterUI'
+      | 'OpenerAfterUI_CT'
+      | 'Opener_CT'
+      | 'Redirect'
+      | 'RedirectTracker'
+      | 'RedirectTracker_CT'
+      | 'Redirect_CT'
+      | 'StorageAccessAPI'
+      | 'StorageAccessAPI_CT'
+      | 'StorageGranted'
+      | 'StorageGranted_CT',
+      GleanCounter
+    >;
+    storageAccessRemainingDays: GleanCustomDistribution;
+    stripOnShareLengthDecrease: GleanCustomDistribution;
+    stripOnShareParamsRemoved: GleanCustomDistribution;
+    tpAllowlistBaselineEnabled: GleanBoolean;
+    tpAllowlistConvenienceEnabled: GleanBoolean;
+    trackersBlockedCount: GleanCounter;
+    trackingProtectionEnabled: Record<'false' | 'true', GleanCounter>;
+    trackingProtectionPbmDisabled: Record<'false' | 'true', GleanCounter>;
+    trackingProtectionShield: GleanCustomDistribution;
+  };
+
+  cookiePurging: {
+    duration: GleanTimingDistribution;
+    intervalHours: GleanTimingDistribution;
+    originsPurged: GleanCustomDistribution;
+    trackersUserInteractionRemainingDays: GleanTimingDistribution;
+    trackersWithUserInteraction: GleanCustomDistribution;
+  };
+
+  hangs: {
+    modules: GleanObject;
+    reports: GleanObject;
+  };
+
+  backgroundTasksRmdirBase: {
+    elapsedMs: GleanQuantity;
+    metricBase: GleanEventNoExtras;
+    removalCount: GleanQuantity;
+    retryCount: GleanQuantity;
+    succeeded: GleanBoolean;
+    suffixEverFailed: GleanBoolean;
+    suffixRemovalCount: GleanQuantity;
+    wasFirst: GleanBoolean;
+  };
+
+  backgroundTasksRmdirHttpCache: {
+    elapsedMs: GleanQuantity;
+    metricBase: GleanEventNoExtras;
+    removalCount: GleanQuantity;
+    retryCount: GleanQuantity;
+    succeeded: GleanBoolean;
+    suffixEverFailed: GleanBoolean;
+    suffixRemovalCount: GleanQuantity;
+    wasFirst: GleanBoolean;
+  };
+
+  backgroundTasksRmdirQuota: {
+    elapsedMs: GleanQuantity;
+    metricBase: GleanEventNoExtras;
+    removalCount: GleanQuantity;
+    retryCount: GleanQuantity;
+    succeeded: GleanBoolean;
+    suffixEverFailed: GleanBoolean;
+    suffixRemovalCount: GleanQuantity;
+    wasFirst: GleanBoolean;
+  };
+
+  captchaDetection: {
+    arkoselabsOc: GleanCounter;
+    arkoselabsOcPbm: GleanCounter;
+    arkoselabsPc: GleanCounter;
+    arkoselabsPcPbm: GleanCounter;
+    arkoselabsPf: GleanCounter;
+    arkoselabsPfPbm: GleanCounter;
+    arkoselabsSolutionsRequired: GleanCustomDistribution;
+    arkoselabsSolutionsRequiredPbm: GleanCustomDistribution;
+    cloudflareTurnstileCc: GleanCounter;
+    cloudflareTurnstileCcPbm: GleanCounter;
+    cloudflareTurnstileCf: GleanCounter;
+    cloudflareTurnstileCfPbm: GleanCounter;
+    cloudflareTurnstileOc: GleanCounter;
+    cloudflareTurnstileOcPbm: GleanCounter;
+    datadomeBl: GleanCounter;
+    datadomeBlPbm: GleanCounter;
+    datadomeOc: GleanCounter;
+    datadomePc: GleanCounter;
+    datadomePcPbm: GleanCounter;
+    datadomePs: GleanCounter;
+    datadomePsPbm: GleanCounter;
+    googleRecaptchaV2Ac: GleanCounter;
+    googleRecaptchaV2AcPbm: GleanCounter;
+    googleRecaptchaV2Oc: GleanCounter;
+    googleRecaptchaV2OcPbm: GleanCounter;
+    googleRecaptchaV2Pc: GleanCounter;
+    googleRecaptchaV2PcPbm: GleanCounter;
+    googleRecaptchaV2Ps: GleanCounter;
+    googleRecaptchaV2PsPbm: GleanCounter;
+    hcaptchaAc: GleanCounter;
+    hcaptchaAcPbm: GleanCounter;
+    hcaptchaOc: GleanCounter;
+    hcaptchaOcPbm: GleanCounter;
+    hcaptchaPc: GleanCounter;
+    hcaptchaPcPbm: GleanCounter;
+    hcaptchaPs: GleanCounter;
+    hcaptchaPsPbm: GleanCounter;
+    networkCookieCookiebehavior: GleanString;
+    networkCookieCookiebehaviorOptinpartitioning: GleanBoolean;
+    networkCookieCookiebehaviorOptinpartitioningPbm: GleanBoolean;
+    pagesVisited: GleanCounter;
+    pagesVisitedPbm: GleanCounter;
+    privacyFingerprintingprotection: GleanBoolean;
+    privacyFingerprintingprotectionPbm: GleanBoolean;
+    privacyResistfingerprinting: GleanBoolean;
+    privacyResistfingerprintingPbmode: GleanBoolean;
+    privacyTrackingprotectionCryptominingEnabled: GleanBoolean;
+    privacyTrackingprotectionEnabled: GleanBoolean;
+    privacyTrackingprotectionFingerprintingEnabled: GleanBoolean;
+    privacyTrackingprotectionPbmEnabled: GleanBoolean;
+  };
+
+  contentAnalysis: {
+    agentName: GleanString;
+    allowUrlRegexListSet: GleanBoolean;
+    bypassForSameTabOperations: GleanBoolean;
+    clientSignature: GleanString;
+    connectionAttempt: GleanCounter;
+    connectionAttemptRetry: GleanCounter;
+    connectionFailure: Record<string, GleanCounter>;
+    defaultResult: GleanQuantity;
+    denyUrlRegexListSet: GleanBoolean;
+    interceptionPointsTurnedOff: GleanStringList;
+    requestAllowedByAllowUrl: GleanCounter;
+    requestBlockedByDenyUrl: GleanCounter;
+    requestSentByAnalysisType: Record<string, GleanCounter>;
+    requestSentByReason: Record<string, GleanCounter>;
+    responseAction: Record<string, GleanCounter>;
+    responseDurationByAnalysisType: Record<string, GleanTimingDistribution>;
+    showBlockedResult: GleanBoolean;
+    timeoutResult: GleanQuantity;
+  };
+
+  relevancyClassify: {
+    duration: GleanTimingDistribution;
+    fail: GleanEventWithExtras<{ reason?: string }>;
+    succeed: GleanEventWithExtras<{
+      input_classified_size?: string;
+      input_inconclusive_size?: string;
+      input_size?: string;
+      interest_top_1_hits?: string;
+      interest_top_2_hits?: string;
+      interest_top_3_hits?: string;
+      output_interest_size?: string;
+    }>;
+  };
+
+  cookieBanners: {
+    googleGdprChoiceCookie: Record<string, GleanString>;
+    googleGdprChoiceCookieEvent: GleanEventWithExtras<{
+      choice?: string;
+      region?: string;
+      search_domain?: string;
+    }>;
+    googleGdprChoiceCookieEventPbm: GleanEventWithExtras<{ choice?: string }>;
+    normalWindowServiceMode: Record<
+      'disabled' | 'invalid' | 'reject' | 'reject_or_accept',
+      GleanBoolean
+    >;
+    privateWindowServiceMode: Record<
+      'disabled' | 'invalid' | 'reject' | 'reject_or_accept',
+      GleanBoolean
+    >;
+    serviceDetectOnly: GleanBoolean;
+  };
+
+  crash: {
+    appBuild: GleanString;
+    appChannel: GleanString;
+    appDisplayVersion: GleanString;
+    asyncShutdownTimeout: GleanObject;
+    backgroundTaskName: GleanString;
+    compressedStoreSize: GleanMemoryDistribution;
+    eventLoopNestingLevel: GleanQuantity;
+    fontName: GleanString;
+    gpuProcessLaunch: GleanQuantity;
+    ipcChannelError: GleanString;
+    isGarbageCollecting: GleanBoolean;
+    mainThreadRunnableName: GleanString;
+    minidumpSha256Hash: GleanString;
+    mozCrashReason: GleanString;
+    processType: GleanString;
+    profilerChildShutdownPhase: GleanString;
+    quotaManagerShutdownTimeout: GleanObject;
+    remoteType: GleanString;
+    shutdownProgress: GleanString;
+    stackTraces: GleanObject;
+    startup: GleanBoolean;
+    submitAttempt: Record<
+      | 'content-crash'
+      | 'content-hang'
+      | 'forkserver-crash'
+      | 'forkserver-hang'
+      | 'gmplugin-crash'
+      | 'gmplugin-hang'
+      | 'gpu-crash'
+      | 'gpu-hang'
+      | 'main-crash'
+      | 'main-hang'
+      | 'plugin-crash'
+      | 'plugin-hang'
+      | 'rdd-crash'
+      | 'rdd-hang'
+      | 'sandboxbroker-crash'
+      | 'sandboxbroker-hang'
+      | 'socket-crash'
+      | 'socket-hang'
+      | 'utility-crash'
+      | 'utility-hang'
+      | 'vr-crash'
+      | 'vr-hang',
+      GleanCounter
+    >;
+    submitSuccess: GleanDualLabeledCounter;
+    time: GleanDatetime;
+    utilityActorsName: GleanStringList;
+  };
+
+  crashWindows: {
+    errorReporting: GleanBoolean;
+    fileDialogErrorCode: GleanString;
+  };
+
+  crashSubmission: {
+    channelStatus: Record<string, GleanCounter>;
+    collectorErrors: Record<string, GleanCounter>;
+    failure: GleanCounter;
+    failureEvent: GleanEventWithExtras<{ id?: string; reason?: string }>;
+    pending: GleanCounter;
+    success: GleanCounter;
+  };
+
+  dllBlocklist: {
+    initFailed: GleanBoolean;
+    list: GleanStringList;
+    user32LoadedBefore: GleanBoolean;
+  };
+
+  environment: {
+    headlessMode: GleanBoolean;
+    nimbusEnrollments: GleanStringList;
+    uptime: GleanTimespan;
+  };
+
+  memory: {
+    availableCommit: GleanQuantity;
+    availablePhysical: GleanQuantity;
+    availableSwap: GleanQuantity;
+    availableVirtual: GleanQuantity;
+    jsLargeAllocationFailure: GleanString;
+    jsOutOfMemory: GleanString;
+    lowPhysical: GleanQuantity;
+    oomAllocationSize: GleanQuantity;
+    purgeablePhysical: GleanQuantity;
+    systemUsePercentage: GleanQuantity;
+    texture: GleanQuantity;
+    totalPageFile: GleanQuantity;
+    totalPhysical: GleanQuantity;
+    totalVirtual: GleanQuantity;
+    collectionTime: GleanTimingDistribution;
+    distributionAmongContent: Record<string, GleanCustomDistribution>;
+    freePurgedPages: GleanTimingDistribution;
+    ghostWindows: GleanCustomDistribution;
+    heapAllocated: GleanMemoryDistribution;
+    heapOverheadFraction: GleanCustomDistribution;
+    imagesContentUsedUncompressed: GleanMemoryDistribution;
+    jsCompartmentsSystem: GleanCustomDistribution;
+    jsCompartmentsUser: GleanCustomDistribution;
+    jsGcHeap: GleanMemoryDistribution;
+    jsRealmsSystem: GleanCustomDistribution;
+    jsRealmsUser: GleanCustomDistribution;
+    lowMemoryEventsPhysical: GleanCustomDistribution;
+    pageFaultsHard: GleanCustomDistribution;
+    residentFast: GleanMemoryDistribution;
+    residentPeak: GleanMemoryDistribution;
+    storageSqlite: GleanMemoryDistribution;
+    total: GleanMemoryDistribution;
+    unique: GleanMemoryDistribution;
+    uniqueContentStartup: GleanMemoryDistribution;
+    vsize: GleanMemoryDistribution;
+    vsizeMaxContiguous: GleanMemoryDistribution;
+  };
+
+  windows: {
+    packageFamilyName: GleanString;
+  };
+
+  doh: {
+    evaluateV2Heuristics: GleanEventWithExtras<{
+      canaries?: string;
+      captiveState?: string;
+      enterprise?: string;
+      evaluateReason?: string;
+      filtering?: string;
+      networkID?: string;
+      platform?: string;
+      steeredProvider?: string;
+      value?: string;
+    }>;
+    stateDisabled: GleanEventWithExtras<{ value?: string }>;
+    stateEnabled: GleanEventWithExtras<{ value?: string }>;
+    stateManuallyDisabled: GleanEventWithExtras<{ value?: string }>;
+    statePolicyDisabled: GleanEventWithExtras<{ value?: string }>;
+    stateRollback: GleanEventWithExtras<{ value?: string }>;
+    stateShutdown: GleanEventWithExtras<{ value?: string }>;
+    stateUidisabled: GleanEventWithExtras<{ value?: string }>;
+    stateUiok: GleanEventWithExtras<{ value?: string }>;
+    stateUninstalled: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  securityDohTrrPerformance: {
+    resolvedRecord: GleanEventWithExtras<{
+      captivePortal?: string;
+      domain?: string;
+      networkUnstable?: string;
+      retryCount?: string;
+      status?: string;
+      time?: string;
+      trr?: string;
+      value?: string;
+    }>;
+    trrselectDryrunresult: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  policies: {
+    count: GleanQuantity;
+    isEnterprise: GleanBoolean;
+  };
+
+  extensions: {
+    processEvent: Record<
+      | 'crashed_bg'
+      | 'crashed_fg'
+      | 'crashed_over_threshold_bg'
+      | 'crashed_over_threshold_fg'
+      | 'created_bg'
+      | 'created_fg',
+      GleanCounter
+    >;
+    startupCacheLoadTime: GleanTimespan;
+    startupCacheReadErrors: Record<string, GleanCounter>;
+    startupCacheWriteBytelength: GleanQuantity;
+    useRemotePolicy: GleanBoolean;
+    useRemotePref: GleanBoolean;
+  };
+
+  extensionsApisDnr: {
+    evaluateRulesCountMax: GleanQuantity;
+    evaluateRulesTime: GleanTimingDistribution;
+    startupCacheEntries: Record<'hit' | 'miss', GleanCounter>;
+    startupCacheReadSize: GleanMemoryDistribution;
+    startupCacheReadTime: GleanTimingDistribution;
+    startupCacheWriteSize: GleanMemoryDistribution;
+    startupCacheWriteTime: GleanTimingDistribution;
+    validateRulesTime: GleanTimingDistribution;
+  };
+
+  extensionsCounters: {
+    browserActionPreloadResult: Record<
+      'clearAfterHover' | 'clearAfterMousedown' | 'popupShown',
+      GleanCounter
+    >;
+    browserActionPreloadResultByAddonid: GleanDualLabeledCounter;
+    eventPageIdleResult: Record<
+      | 'launchWebAuthFlow'
+      | 'permissions_request'
+      | 'reset_event'
+      | 'reset_listeners'
+      | 'reset_nativeapp'
+      | 'reset_other'
+      | 'reset_parentapicall'
+      | 'reset_streamfilter'
+      | 'suspend',
+      GleanCounter
+    >;
+    eventPageIdleResultByAddonid: GleanDualLabeledCounter;
+  };
+
+  extensionsData: {
+    migrateResult: GleanEventWithExtras<{
+      addon_id?: string;
+      backend?: string;
+      data_migrated?: string;
+      error_name?: string;
+      has_jsonfile?: string;
+      has_olddata?: string;
+    }>;
+    migrateResultCount: Record<'failure' | 'success', GleanCounter>;
+    storageLocalError: GleanEventWithExtras<{
+      addon_id?: string;
+      error_name?: string;
+      method?: string;
+    }>;
+    syncUsageQuotas: GleanEventWithExtras<{
+      addon_id?: string;
+      backend?: string;
+      items_count?: string;
+      items_over_quota?: string;
+      total_size_bytes?: string;
+    }>;
+  };
+
+  extensionsTiming: {
+    backgroundPageLoad: GleanTimingDistribution;
+    backgroundPageLoadByAddonid: Record<string, GleanTimingDistribution>;
+    browserActionPopupOpen: GleanTimingDistribution;
+    browserActionPopupOpenByAddonid: Record<string, GleanTimingDistribution>;
+    contentScriptInjection: GleanTimingDistribution;
+    contentScriptInjectionByAddonid: Record<string, GleanTimingDistribution>;
+    eventPageRunningTime: GleanCustomDistribution;
+    eventPageRunningTimeByAddonid: Record<string, GleanTimingDistribution>;
+    extensionStartup: GleanTimingDistribution;
+    extensionStartupByAddonid: Record<string, GleanTimingDistribution>;
+    pageActionPopupOpen: GleanTimingDistribution;
+    pageActionPopupOpenByAddonid: Record<string, GleanTimingDistribution>;
+    storageLocalGetIdb: GleanTimingDistribution;
+    storageLocalGetIdbByAddonid: Record<string, GleanTimingDistribution>;
+    storageLocalSetIdb: GleanTimingDistribution;
+    storageLocalSetIdbByAddonid: Record<string, GleanTimingDistribution>;
+  };
+
+  address: {
+    addManage: GleanEventWithExtras<{ value?: string }>;
+    cancelCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    cancelEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    cancelUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    clearedAddressForm: GleanEventWithExtras<{ field_name?: string; value?: string }>;
+    deleteManage: GleanEventWithExtras<{ value?: string }>;
+    detectedAddressForm: GleanEventWithExtras<{
+      address_level1?: string;
+      address_level2?: string;
+      address_line1?: string;
+      address_line2?: string;
+      address_line3?: string;
+      country?: string;
+      postal_code?: string;
+      street_address?: string;
+      value?: string;
+    }>;
+    detectedAddressFormExt: GleanEventWithExtras<{
+      additional_name?: string;
+      email?: string;
+      family_name?: string;
+      given_name?: string;
+      name?: string;
+      organization?: string;
+      tel?: string;
+      value?: string;
+    }>;
+    disableCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    disableEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    disableUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    editManage: GleanEventWithExtras<{ value?: string }>;
+    filledAddressForm: GleanEventWithExtras<{
+      address_level1?: string;
+      address_level2?: string;
+      address_line1?: string;
+      address_line2?: string;
+      address_line3?: string;
+      country?: string;
+      postal_code?: string;
+      street_address?: string;
+      value?: string;
+    }>;
+    filledAddressFormExt: GleanEventWithExtras<{
+      additional_name?: string;
+      email?: string;
+      family_name?: string;
+      given_name?: string;
+      name?: string;
+      organization?: string;
+      tel?: string;
+      value?: string;
+    }>;
+    filledModifiedAddressForm: GleanEventWithExtras<{
+      address_level1?: string;
+      address_level2?: string;
+      address_line1?: string;
+      address_line2?: string;
+      address_line3?: string;
+      country?: string;
+      field_name?: string;
+      postal_code?: string;
+      street_address?: string;
+      value?: string;
+    }>;
+    filledOnFieldsUpdateAddressForm: GleanEventWithExtras<{
+      additional_name?: string;
+      address_level1?: string;
+      address_level2?: string;
+      address_line1?: string;
+      address_line2?: string;
+      address_line3?: string;
+      country?: string;
+      email?: string;
+      family_name?: string;
+      given_name?: string;
+      name?: string;
+      organization?: string;
+      postal_code?: string;
+      street_address?: string;
+      tel?: string;
+      value?: string;
+    }>;
+    learnMoreCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    learnMoreEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    learnMoreUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    popupShownAddressForm: GleanEventWithExtras<{ field_name?: string; value?: string }>;
+    prefCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    prefEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    prefUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    saveCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    saveEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    saveUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    showCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    showEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    showEntryManage: GleanEventWithExtras<{ value?: string }>;
+    showManage: GleanEventWithExtras<{ value?: string }>;
+    showUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    submittedAddressForm: GleanEventWithExtras<{
+      address_level1?: string;
+      address_level2?: string;
+      address_line1?: string;
+      address_line2?: string;
+      address_line3?: string;
+      country?: string;
+      postal_code?: string;
+      street_address?: string;
+      value?: string;
+    }>;
+    submittedAddressFormExt: GleanEventWithExtras<{
+      additional_name?: string;
+      email?: string;
+      family_name?: string;
+      given_name?: string;
+      name?: string;
+      organization?: string;
+      tel?: string;
+      value?: string;
+    }>;
+    updateCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    updateEditDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    updateUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  creditcard: {
+    addManage: GleanEventWithExtras<{ value?: string }>;
+    cancelCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    cancelUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    clearedCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    deleteManage: GleanEventWithExtras<{ value?: string }>;
+    detectedCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    detectedCcNumberFieldsCount: Record<
+      | 'cc_number_fields_1'
+      | 'cc_number_fields_2'
+      | 'cc_number_fields_3'
+      | 'cc_number_fields_4'
+      | 'cc_number_fields_other',
+      GleanCounter
+    >;
+    disableCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    disableUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    editManage: GleanEventWithExtras<{ value?: string }>;
+    filledCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    filledModifiedCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    filledOnFieldsUpdateCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      value?: string;
+    }>;
+    osKeystoreDecrypt: GleanEventWithExtras<{
+      errorResult?: string;
+      isDecryptSuccess?: string;
+      trigger?: string;
+    }>;
+    popupShownCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    saveCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    saveUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    showCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    showEntryManage: GleanEventWithExtras<{ value?: string }>;
+    showManage: GleanEventWithExtras<{ value?: string }>;
+    showUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    submittedCcFormV2: GleanEventWithExtras<{
+      cc_exp?: string;
+      cc_exp_month?: string;
+      cc_exp_year?: string;
+      cc_name?: string;
+      cc_number?: string;
+      cc_type?: string;
+      field_name?: string;
+      value?: string;
+    }>;
+    updateCaptureDoorhanger: GleanEventWithExtras<{ value?: string }>;
+    updateUpdateDoorhanger: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  formautofill: {
+    availability: GleanBoolean;
+    formSubmissionHeuristic: Record<
+      'form-removal-after-fetch' | 'form-submit-event' | 'iframe-pagehide' | 'page-navigation',
+      GleanCounter
+    >;
+    iframeLayoutDetection: GleanEventWithExtras<{
+      category?: string;
+      cross_origin?: string;
+      flow_id?: string;
+      iframe?: string;
+      iframe_count?: string;
+      main_frame?: string;
+      sandboxed?: string;
+    }>;
+    osAuthEnabled: GleanBoolean;
+    promptShownOsReauth: GleanEventWithExtras<{ result?: string; trigger?: string }>;
+    requireOsReauthToggle: GleanEventWithExtras<{ toggle_state?: string }>;
+  };
+
+  formautofillAddresses: {
+    autofillProfilesCount: GleanQuantity;
+  };
+
+  formautofillCreditcards: {
+    autofillProfilesCount: GleanQuantity;
+  };
+
+  fog: {
+    dataDirectoryInfo: GleanObject;
+    failedIdleRegistration: GleanBoolean;
+    initializations: GleanTimingDistribution;
+    initsDuringShutdown: GleanCounter;
+    maxPingsPerMinute: GleanQuantity;
+  };
+
+  fogIpc: {
+    bufferSizes: GleanMemoryDistribution;
+    flushDurations: GleanTimingDistribution;
+    flushFailures: GleanCounter;
+    replayFailures: GleanCounter;
+    shutdownRegistrationFailures: GleanCounter;
+  };
+
+  testOnly: {
+    anEvent: GleanEventNoExtras;
+    badCode: GleanCounter;
+    balloons: GleanObject;
+    buttonJars: Record<string, GleanQuantity>;
+    canWeFlagIt: GleanBoolean;
+    canWeTimeIt: GleanTimespan;
+    cheesyString: GleanString;
+    cheesyStringList: GleanStringList;
+    collectionDisabledCounter: GleanCounter;
+    crashStack: GleanObject;
+    defaultProducts: GleanCounter;
+    desktopOnly: GleanCounter;
+    disabledCounter: GleanCounter;
+    doYouRemember: GleanMemoryDistribution;
+    expired: GleanCounter;
+    expiredHist: GleanCustomDistribution;
+    impressionIdOnly: GleanString;
+    keyedCategories: GleanDualLabeledCounter;
+    keyedExpired: Record<string, GleanCounter>;
+    keyedMobileOnly: Record<string, GleanCounter>;
+    keyedReleaseOptin: Record<string, GleanCounter>;
+    keyedReleaseOptout: Record<string, GleanCounter>;
+    mabelsBalloonLabels: Record<'celebratory' | 'celebratory_and_snarky', GleanString>;
+    mabelsBalloonStrings: Record<string, GleanString>;
+    mabelsBathroomCounters: Record<string, GleanCounter>;
+    mabelsCustomLabelLengths: Record<string, GleanCustomDistribution>;
+    mabelsKitchenCounters: Record<string, GleanCounter>;
+    mabelsLabelMaker: Record<string, GleanString>;
+    mabelsLabeledCounters: Record<'1st_counter' | 'clean' | 'next_to_the_fridge', GleanCounter>;
+    mabelsLikeBalloons: Record<string, GleanBoolean>;
+    mabelsLikeLabeledBalloons: Record<'birthday_party' | 'water', GleanBoolean>;
+    mainOnly: GleanQuantity;
+    meaningOfLife: GleanQuantity;
+    mirrorTime: GleanTimespan;
+    mirrorTimeNanos: GleanTimespan;
+    mirrorsForLabeledBools: Record<string, GleanBoolean>;
+    mobileOnly: GleanCounter;
+    multiproduct: GleanCounter;
+    onePingOneBool: GleanBoolean;
+    releaseOptin: GleanCounter;
+    releaseOptout: GleanCounter;
+    unexpired: GleanCounter;
+    whatADate: GleanDatetime;
+    whatDoYouRemember: Record<string, GleanMemoryDistribution>;
+    whatIdIt: GleanUuid;
+    whatTimeIsIt: GleanTimingDistribution;
+    whereHasTheTimeGone: Record<string, GleanTimingDistribution>;
+  };
+
+  testOnlyIpc: {
+    aBool: GleanBoolean;
+    aCounter: GleanCounter;
+    aCounterForHgram: GleanCounter;
+    aCustomDist: GleanCustomDistribution;
+    aDate: GleanDatetime;
+    aDualLabeledCounter: GleanDualLabeledCounter;
+    aLabeledCounter: Record<string, GleanCounter>;
+    aLabeledCounterForCategorical: Record<
+      'CommonLabel' | 'Label4' | 'Label5' | 'Label6',
+      GleanCounter
+    >;
+    aLabeledCounterForHgram: Record<'false' | 'true', GleanCounter>;
+    aLabeledCounterForKeyedCountHgram: Record<string, GleanCounter>;
+    aMemoryDist: GleanMemoryDistribution;
+    aQuantity: GleanQuantity;
+    aString: GleanString;
+    aStringList: GleanStringList;
+    aText: GleanText;
+    aTimingDist: GleanTimingDistribution;
+    aUrl: GleanUrl;
+    aUuid: GleanUuid;
+    anEvent: GleanEventWithExtras<{ extra1?: string; extra2?: string; value?: string }>;
+    anExternalDenominator: GleanDenominator;
+    anUnorderedBool: GleanBoolean;
+    anUnorderedLabeledBoolean: Record<string, GleanBoolean>;
+    anotherDualLabeledCounter: GleanDualLabeledCounter;
+    anotherLabeledCounter: Record<string, GleanCounter>;
+    eventWithExtra: GleanEventWithExtras<{
+      extra1?: string;
+      extra2?: string;
+      extra3_longer_name?: string;
+      extra4CamelCase?: string;
+    }>;
+    irate: GleanRate;
+    noExtraEvent: GleanEventNoExtras;
+    rateWithExternalDenominator: GleanNumerator;
+  };
+
+  testOnlyJog: {
+    aCounter: GleanCounter;
+    anEvent: GleanEventWithExtras<{ extra1?: string; extra2?: string }>;
+  };
+
+  mediaSniffer: {
+    mp4BrandPattern: Record<
+      | 'ftyp_3gp'
+      | 'ftyp_3gp4'
+      | 'ftyp_M4A'
+      | 'ftyp_M4P'
+      | 'ftyp_M4V'
+      | 'ftyp_avc'
+      | 'ftyp_avif'
+      | 'ftyp_crx'
+      | 'ftyp_iso'
+      | 'ftyp_mmp4'
+      | 'ftyp_mp4'
+      | 'ftyp_qt',
+      GleanCounter
+    >;
+  };
+
+  messagingExperiments: {
+    reachCfr: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFeatureCallout: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsBmbButton: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage1: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage10: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage11: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage12: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage13: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage14: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage15: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage2: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage3: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage4: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage5: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage6: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage7: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage8: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage9: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachInfobar: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachMomentsPage: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachSpotlight: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    targetingAttributeError: GleanEventWithExtras<{ source?: string; value?: string }>;
+    targetingAttributeTimeout: GleanEventWithExtras<{ source?: string; value?: string }>;
+  };
+
+  firefoxAiRuntime: {
+    engineCreationFailure: GleanEventWithExtras<{
+      engineId?: string;
+      error?: string;
+      featureId?: string;
+      modelId?: string;
+      taskName?: string;
+    }>;
+    engineCreationSuccess: Record<
+      | 'about-inference'
+      | 'autofill-ml'
+      | 'default-engine'
+      | 'ml-suggest-intent'
+      | 'ml-suggest-ner'
+      | 'pdfjs'
+      | 'smart-tab-embedding-engine'
+      | 'smart-tab-topic-engine'
+      | 'webextension'
+      | 'wllamapreview',
+      GleanTimingDistribution
+    >;
+    modelDeletion: GleanEventWithExtras<{
+      deletedBy?: string;
+      error?: string;
+      modelId?: string;
+      modelRevision?: string;
+    }>;
+    modelDownload: GleanEventWithExtras<{
+      duration?: string;
+      engineId?: string;
+      error?: string;
+      featureId?: string;
+      modelDownloadId?: string;
+      modelId?: string;
+      modelRevision?: string;
+      step?: string;
+      when?: string;
+    }>;
+    runInferenceFailure: GleanEventWithExtras<{
+      engineId?: string;
+      featureId?: string;
+      modelId?: string;
+    }>;
+    runInferenceSuccess: Record<
+      | 'about-inference'
+      | 'autofill-ml'
+      | 'default-engine'
+      | 'ml-suggest-intent'
+      | 'ml-suggest-ner'
+      | 'pdfjs'
+      | 'smart-tab-embedding-engine'
+      | 'smart-tab-topic-engine'
+      | 'webextension'
+      | 'wllamapreview',
+      GleanTimingDistribution
+    >;
+  };
+
+  modelManagement: {
+    detailsView: GleanEventWithExtras<{
+      extension_ids?: string;
+      feature_ids?: string;
+      model?: string;
+      version?: string;
+    }>;
+    listItemManage: GleanEventWithExtras<{
+      extension_ids?: string;
+      feature_ids?: string;
+      model?: string;
+      version?: string;
+    }>;
+    listView: GleanEventWithExtras<{ models?: string }>;
+    modelCardLink: GleanEventWithExtras<{
+      extension_ids?: string;
+      feature_ids?: string;
+      model?: string;
+      version?: string;
+    }>;
+    removeConfirmation: GleanEventWithExtras<{
+      action?: string;
+      extension_ids?: string;
+      feature_ids?: string;
+      model?: string;
+      version?: string;
+    }>;
+    removeInitiated: GleanEventWithExtras<{
+      extension_ids?: string;
+      feature_ids?: string;
+      last_install?: string;
+      last_used?: string;
+      model?: string;
+      size?: string;
+      source?: string;
+      version?: string;
+    }>;
+  };
+
+  heartbeat: {
+    closed: GleanDatetime;
+    engaged: GleanDatetime;
+    expired: GleanDatetime;
+    flowId: GleanUuid;
+    learnMore: GleanDatetime;
+    offered: GleanDatetime;
+    score: GleanQuantity;
+    surveyId: GleanString;
+    voted: GleanDatetime;
+    windowClosed: GleanDatetime;
+  };
+
+  nimbusEvents: {
+    databaseWrite: GleanEventWithExtras<{ success?: string }>;
+    enrollFailed: GleanEventWithExtras<{ branch?: string; experiment?: string; reason?: string }>;
+    enrollment: GleanEventWithExtras<{
+      branch?: string;
+      experiment?: string;
+      experiment_type?: string;
+    }>;
+    enrollmentStatus: GleanEventWithExtras<{
+      branch?: string;
+      conflict_slug?: string;
+      error_string?: string;
+      reason?: string;
+      slug?: string;
+      status?: string;
+    }>;
+    exposure: GleanEventWithExtras<{ branch?: string; experiment?: string; feature_id?: string }>;
+    isReady: GleanEventNoExtras;
+    migration: GleanEventWithExtras<{
+      enrollments?: string;
+      error_reason?: string;
+      migration_id?: string;
+      success?: string;
+    }>;
+    remoteSettingsSync: GleanEventWithExtras<{
+      experiments_empty?: string;
+      experiments_success?: string;
+      force_sync?: string;
+      secure_experiments_empty?: string;
+      secure_experiments_success?: string;
+      trigger?: string;
+    }>;
+    startupDatabaseConsistency: GleanEventWithExtras<{
+      db_active_count?: string;
+      primary?: string;
+      store_active_count?: string;
+      total_db_count?: string;
+      total_store_count?: string;
+      trigger?: string;
+    }>;
+    unenrollFailed: GleanEventWithExtras<{ experiment?: string; reason?: string }>;
+    unenrollment: GleanEventWithExtras<{
+      branch?: string;
+      changed_pref?: string;
+      conflicting_slug?: string;
+      experiment?: string;
+      locale?: string;
+      pref_name?: string;
+      pref_type?: string;
+      reason?: string;
+    }>;
+    validationFailed: GleanEventWithExtras<{
+      branch?: string;
+      experiment?: string;
+      l10n_ids?: string;
+      locale?: string;
+      reason?: string;
+    }>;
+  };
+
+  nimbusTargetingContext: {
+    activeExperiments: GleanObject;
+    activeRollouts: GleanObject;
+    addonsInfo: GleanObject;
+    addressesSaved: GleanQuantity;
+    archBits: GleanQuantity;
+    attributionData: GleanObject;
+    browserSettings: GleanObject;
+    buildId: GleanQuantity;
+    currentDate: GleanString;
+    defaultPdfHandler: GleanObject;
+    distributionId: GleanString;
+    doesAppNeedPin: GleanBoolean;
+    enrollmentsMap: GleanObject;
+    firefoxVersion: GleanQuantity;
+    hasActiveEnterprisePolicies: GleanBoolean;
+    hasPinnedTabs: GleanBoolean;
+    homePageSettings: GleanObject;
+    isDefaultBrowser: GleanBoolean;
+    isDefaultHandler: GleanObject;
+    isFirstStartup: GleanBoolean;
+    isFxAEnabled: GleanBoolean;
+    isFxASignedIn: GleanBoolean;
+    isMsix: GleanBoolean;
+    locale: GleanString;
+    memoryMb: GleanQuantity;
+    os: GleanObject;
+    primaryResolution: GleanObject;
+    profileAgeCreated: GleanQuantity;
+    region: GleanString;
+    totalBookmarksCount: GleanQuantity;
+    userMonthlyActivity: GleanObject;
+    userPrefersReducedMotion: GleanBoolean;
+    usesFirefoxSync: GleanBoolean;
+    version: GleanString;
+  };
+
+  nimbusTargetingEnvironment: {
+    attrEvalErrors: Record<
+      | 'activeExperiments'
+      | 'activeRollouts'
+      | 'addonsInfo'
+      | 'addressesSaved'
+      | 'archBits'
+      | 'attributionData'
+      | 'browserSettings'
+      | 'buildId'
+      | 'currentDate'
+      | 'defaultPDFHandler'
+      | 'distributionId'
+      | 'doesAppNeedPin'
+      | 'enrollmentsMap'
+      | 'firefoxVersion'
+      | 'hasActiveEnterprisePolicies'
+      | 'hasPinnedTabs'
+      | 'homePageSettings'
+      | 'isDefaultBrowser'
+      | 'isDefaultHandler'
+      | 'isFirstStartup'
+      | 'isFxAEnabled'
+      | 'isFxASignedIn'
+      | 'isMSIX'
+      | 'locale'
+      | 'memoryMB'
+      | 'os'
+      | 'primaryResolution'
+      | 'profileAgeCreated'
+      | 'region'
+      | 'totalBookmarksCount'
+      | 'userMonthlyActivity'
+      | 'userPrefersReducedMotion'
+      | 'usesFirefoxSync'
+      | 'version',
+      GleanCounter
+    >;
+    prefTypeErrors: Record<
+      | 'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons'
+      | 'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features'
+      | 'browser.newtabpage.activity-stream.feeds.section.highlights'
+      | 'browser.newtabpage.activity-stream.feeds.section.topstories'
+      | 'browser.newtabpage.activity-stream.feeds.topsites'
+      | 'browser.newtabpage.activity-stream.showSearch'
+      | 'browser.newtabpage.activity-stream.showSponsoredTopSites'
+      | 'browser.newtabpage.enabled'
+      | 'browser.startup.page'
+      | 'browser.toolbars.bookmarks.visibility'
+      | 'browser.urlbar.quicksuggest.dataCollection.enabled'
+      | 'browser.urlbar.showSearchSuggestionsFirst'
+      | 'browser.urlbar.suggest.quicksuggest.sponsored'
+      | 'media.videocontrols.picture-in-picture.enabled'
+      | 'media.videocontrols.picture-in-picture.video-toggle.enabled'
+      | 'media.videocontrols.picture-in-picture.video-toggle.has-used'
+      | 'messaging-system-action.testday'
+      | 'network.trr.mode'
+      | 'nimbus.qa.pref-1'
+      | 'nimbus.qa.pref-2'
+      | 'security.sandbox.content.level'
+      | 'trailhead.firstrun.didSeeAboutWelcome',
+      GleanCounter
+    >;
+    prefValues: GleanObject;
+    targetingContextValue: GleanText;
+    userSetPrefs: GleanObject;
+  };
+
+  normandy: {
+    exposeNimbusExperiment: GleanEventWithExtras<{
+      branchSlug?: string;
+      featureId?: string;
+      value?: string;
+    }>;
+    enrollAddonRollout: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      experimentType?: string;
+      value?: string;
+    }>;
+    enrollAddonStudy: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      experimentType?: string;
+      value?: string;
+    }>;
+    enrollFailedAddonRollout: GleanEventWithExtras<{
+      addonId?: string;
+      branch?: string;
+      conflictingSlug?: string;
+      detail?: string;
+      enrollmentId?: string;
+      prefBranch?: string;
+      preference?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    enrollFailedAddonStudy: GleanEventWithExtras<{
+      addonId?: string;
+      branch?: string;
+      conflictingSlug?: string;
+      detail?: string;
+      enrollmentId?: string;
+      prefBranch?: string;
+      preference?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    enrollFailedNimbusExperiment: GleanEventWithExtras<{
+      addonId?: string;
+      branch?: string;
+      conflictingSlug?: string;
+      detail?: string;
+      enrollmentId?: string;
+      prefBranch?: string;
+      preference?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    enrollFailedPreferenceRollout: GleanEventWithExtras<{
+      addonId?: string;
+      branch?: string;
+      conflictingSlug?: string;
+      detail?: string;
+      enrollmentId?: string;
+      prefBranch?: string;
+      preference?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    enrollFailedPreferenceStudy: GleanEventWithExtras<{
+      addonId?: string;
+      branch?: string;
+      conflictingSlug?: string;
+      detail?: string;
+      enrollmentId?: string;
+      prefBranch?: string;
+      preference?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    enrollNimbusExperiment: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      experimentType?: string;
+      value?: string;
+    }>;
+    enrollPreferenceRollout: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      experimentType?: string;
+      value?: string;
+    }>;
+    enrollPreferenceStudy: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      experimentType?: string;
+      value?: string;
+    }>;
+    expPrefChangedPreferenceStudy: GleanEventWithExtras<{
+      enrollmentId?: string;
+      preferenceName?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    graduatePreferenceRollout: GleanEventWithExtras<{
+      enrollmentId?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    recipeFreshness: Record<string, GleanQuantity>;
+    unenrollAddonRollback: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      changedPref?: string;
+      conflictingSlug?: string;
+      didResetValue?: string;
+      enrollmentId?: string;
+      prefName?: string;
+      prefType?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollAddonStudy: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      changedPref?: string;
+      conflictingSlug?: string;
+      didResetValue?: string;
+      enrollmentId?: string;
+      prefName?: string;
+      prefType?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollFailedAddonRollback: GleanEventWithExtras<{
+      caller?: string;
+      changedPref?: string;
+      enrollmentId?: string;
+      originalReason?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollFailedNimbusExperiment: GleanEventWithExtras<{
+      caller?: string;
+      changedPref?: string;
+      enrollmentId?: string;
+      originalReason?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollFailedPreferenceRollback: GleanEventWithExtras<{
+      caller?: string;
+      changedPref?: string;
+      enrollmentId?: string;
+      originalReason?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollFailedPreferenceStudy: GleanEventWithExtras<{
+      caller?: string;
+      changedPref?: string;
+      enrollmentId?: string;
+      originalReason?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollNimbusExperiment: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      changedPref?: string;
+      conflictingSlug?: string;
+      didResetValue?: string;
+      enrollmentId?: string;
+      prefName?: string;
+      prefType?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollPreferenceRollback: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      changedPref?: string;
+      conflictingSlug?: string;
+      didResetValue?: string;
+      enrollmentId?: string;
+      prefName?: string;
+      prefType?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    unenrollPreferenceStudy: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      changedPref?: string;
+      conflictingSlug?: string;
+      didResetValue?: string;
+      enrollmentId?: string;
+      prefName?: string;
+      prefType?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    updateAddonRollout: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      enrollmentId?: string;
+      previousState?: string;
+      value?: string;
+    }>;
+    updateAddonStudy: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      enrollmentId?: string;
+      previousState?: string;
+      value?: string;
+    }>;
+    updateFailedAddonRollout: GleanEventWithExtras<{
+      branch?: string;
+      detail?: string;
+      enrollmentId?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    updateFailedAddonStudy: GleanEventWithExtras<{
+      branch?: string;
+      detail?: string;
+      enrollmentId?: string;
+      reason?: string;
+      value?: string;
+    }>;
+    updateNimbusExperiment: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      enrollmentId?: string;
+      previousState?: string;
+      value?: string;
+    }>;
+    updatePreferenceRollout: GleanEventWithExtras<{
+      addonId?: string;
+      addonVersion?: string;
+      branch?: string;
+      enrollmentId?: string;
+      previousState?: string;
+      value?: string;
+    }>;
+    validationFailedNimbusExperiment: GleanEventWithExtras<{
+      branch?: string;
+      l10n_ids?: string;
+      locale?: string;
+      reason?: string;
+      value?: string;
+    }>;
+  };
+
+  formAutocomplete: {
+    showLogins: GleanEventWithExtras<{
+      acFieldName?: string;
+      fieldType?: string;
+      generatedPasswo?: string;
+      hadPrevious?: string;
+      importableLogin?: string;
+      insecureWarning?: string;
+      login?: string;
+      loginsFooter?: string;
+      stringLength?: string;
+      typeWasPassword?: string;
+      value?: string;
+    }>;
+  };
+
+  pwmgr: {
+    autocompleteFieldGeneratedpassword: GleanEventNoExtras;
+    autocompleteShownGeneratedpassword: GleanEventNoExtras;
+    cancelExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    cancelNewLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    copyPassword: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    copyUsername: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    deleteExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    deleteNewLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    doorhangerSubmittedSave: GleanEventWithExtras<{
+      did_edit_pw?: string;
+      did_edit_un?: string;
+      did_select_pw?: string;
+      did_select_un?: string;
+    }>;
+    doorhangerSubmittedUpdate: GleanEventWithExtras<{
+      did_edit_pw?: string;
+      did_edit_un?: string;
+      did_select_pw?: string;
+      did_select_un?: string;
+    }>;
+    editExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    filledFieldEditedGeneratedpassword: GleanEventNoExtras;
+    filterList: GleanEventNoExtras;
+    formAutofillResult: Record<
+      | 'autocomplete_off'
+      | 'existing_password'
+      | 'existing_username'
+      | 'filled'
+      | 'filled_username_only_form'
+      | 'form_in_crossorigin_subframe'
+      | 'insecure'
+      | 'multiple_logins'
+      | 'no_autofill_forms'
+      | 'no_logins_fit'
+      | 'no_password_field'
+      | 'no_saved_logins'
+      | 'password_autocomplete_new_password'
+      | 'password_disabled_readonly'
+      | 'type_no_longer_password',
+      GleanCounter
+    >;
+    hidePassword: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    importLoginsFromFileCategorical: Record<
+      'added' | 'error' | 'modified' | 'no_change',
+      GleanCounter
+    >;
+    isUsernameOnlyForm: Record<'false' | 'true', GleanCounter>;
+    learnMoreVulnExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    loginPageSafety: GleanCustomDistribution;
+    mgmtMenuItemUsedExport: GleanEventNoExtras;
+    mgmtMenuItemUsedExportComplete: GleanEventNoExtras;
+    mgmtMenuItemUsedImportCsvComplete: GleanEventNoExtras;
+    mgmtMenuItemUsedImportFromBrowser: GleanEventNoExtras;
+    mgmtMenuItemUsedImportFromCsv: GleanEventNoExtras;
+    mgmtMenuItemUsedPreferences: GleanEventNoExtras;
+    newNewLogin: GleanEventNoExtras;
+    numImprovedGeneratedPasswords: Record<'false' | 'true', GleanCounter>;
+    numSavedPasswords: GleanQuantity;
+    openManagementAboutprotections: GleanEventNoExtras;
+    openManagementAutocomplete: GleanEventNoExtras;
+    openManagementContextmenu: GleanEventNoExtras;
+    openManagementDirect: GleanEventNoExtras;
+    openManagementMainmenu: GleanEventNoExtras;
+    openManagementPageinfo: GleanEventNoExtras;
+    openManagementPreferences: GleanEventNoExtras;
+    openManagementSnippet: GleanEventNoExtras;
+    openSiteExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    osAuthEnabled: GleanBoolean;
+    potentiallyBreachedPasswords: GleanQuantity;
+    promptRememberAction: GleanCustomDistribution;
+    promptShownOsReauth: GleanEventWithExtras<{ result?: string; trigger?: string }>;
+    promptUpdateAction: GleanCustomDistribution;
+    reauthenticateMasterPassword: GleanEventWithExtras<{
+      auto_admin?: string;
+      require_signon?: string;
+      value?: string;
+    }>;
+    reauthenticateOsAuth: GleanEventWithExtras<{
+      auto_admin?: string;
+      require_signon?: string;
+      value?: string;
+    }>;
+    requireOsReauthToggle: GleanEventWithExtras<{ toggle_state?: string }>;
+    saveExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    saveNewLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    savedLoginUsedAuthLogin: GleanEventWithExtras<{ filled?: string }>;
+    savedLoginUsedFormLogin: GleanEventWithExtras<{ filled?: string }>;
+    savedLoginUsedFormPassword: GleanEventWithExtras<{ filled?: string }>;
+    savedLoginUsedPromptLogin: GleanEventWithExtras<{ filled?: string }>;
+    savingEnabled: GleanBoolean;
+    selectExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    showPassword: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
+    signupFormDetection: GleanTimingDistribution;
+    sortList: GleanEventWithExtras<{ sort_key?: string }>;
+  };
+
+  relayIntegration: {
+    clickedFillUsername: GleanEventWithExtras<{ error_code?: string; value?: string }>;
+    clickedOfferRelay: GleanEventWithExtras<{ scenario?: string; value?: string }>;
+    disabledOptInPanel: GleanEventWithExtras<{ value?: string }>;
+    disabledPrefChange: GleanEventNoExtras;
+    enabledOptInPanel: GleanEventWithExtras<{ value?: string }>;
+    enabledPrefChange: GleanEventNoExtras;
+    getUnlimitedMasksReusePanel: GleanEventWithExtras<{ value?: string }>;
+    postponedOptInPanel: GleanEventWithExtras<{ value?: string }>;
+    reuseMaskReusePanel: GleanEventWithExtras<{ value?: string }>;
+    shownFillUsername: GleanEventWithExtras<{ error_code?: string; value?: string }>;
+    shownOfferRelay: GleanEventWithExtras<{ scenario?: string; value?: string }>;
+    shownOptInPanel: GleanEventWithExtras<{ value?: string }>;
+    shownReusePanel: GleanEventWithExtras<{ error_code?: string; value?: string }>;
+  };
+
+  pdfjs: {
+    buttons: Record<
+      | 'cursor_hand_tool'
+      | 'cursor_select_tool'
+      | 'document_properties'
+      | 'first_page'
+      | 'last_page'
+      | 'page_rotate_ccw'
+      | 'page_rotate_cw'
+      | 'presentation_mode'
+      | 'presentation_mode_keyboard'
+      | 'scroll_horizontal'
+      | 'scroll_page'
+      | 'scroll_vertical'
+      | 'scroll_wrapped'
+      | 'spread_even'
+      | 'spread_none'
+      | 'spread_odd'
+      | 'view_bookmark',
+      GleanCounter
+    >;
+    editing: Record<'freetext' | 'ink' | 'print' | 'save' | 'signature' | 'stamp', GleanCounter>;
+    geckoview: Record<
+      | 'download_failed'
+      | 'download_succeeded'
+      | 'download_tapped'
+      | 'open_in_app_always'
+      | 'open_in_app_just_once'
+      | 'open_in_app_tapped'
+      | 'save_as_pdf_tapped',
+      GleanCounter
+    >;
+    stamp: Record<
+      | 'alt_text_cancel'
+      | 'alt_text_decorative'
+      | 'alt_text_description'
+      | 'alt_text_edit'
+      | 'alt_text_keyboard'
+      | 'alt_text_save'
+      | 'alt_text_tooltip'
+      | 'inserted_image',
+      GleanCounter
+    >;
+    timeToView: GleanCustomDistribution;
+    used: GleanCounter;
+  };
+
+  pdfjsDigitalSignature: {
+    certificate: Record<
+      | 'adbe_pkcs7_detached'
+      | 'adbe_pkcs7_sha1'
+      | 'adbe_x509_rsa_sha1'
+      | 'etsi_cades_detached'
+      | 'etsi_rfc3161'
+      | 'unsupported',
+      GleanCounter
+    >;
+  };
+
+  pdfjsEditingHighlight: {
+    color: Record<'blue' | 'green' | 'pink' | 'red' | 'yellow', GleanCounter>;
+    colorChanged: GleanCounter;
+    deleted: GleanCounter;
+    edited: GleanCounter;
+    kind: Record<'free_highlight' | 'highlight', GleanCounter>;
+    method: Record<'context_menu' | 'floating_button' | 'main_toolbar', GleanCounter>;
+    numberOfColors: Record<'five' | 'four' | 'one' | 'three' | 'two', GleanCounter>;
+    print: GleanCounter;
+    save: GleanCounter;
+    thickness: GleanCustomDistribution;
+    thicknessChanged: GleanCounter;
+    toggleVisibility: GleanCounter;
+  };
+
+  pdfjsImage: {
+    addImageClick: GleanEventNoExtras;
+    added: Record<'with_alt_text' | 'without_alt_text', GleanCounter>;
+    altTextEdit: Record<'ai_generation' | 'ask_to_edit', GleanBoolean>;
+    iconClick: GleanEventNoExtras;
+    imageAdded: GleanEventWithExtras<{ alt_text_modal?: string; alt_text_type?: string }>;
+    imageSelected: GleanEventWithExtras<{ alt_text_modal?: string }>;
+  };
+
+  pdfjsImageAltText: {
+    aiGenerationCheck: GleanEventWithExtras<{ status?: string }>;
+    calloutDismissed: GleanEventNoExtras;
+    calloutDisplayed: GleanEventNoExtras;
+    dismiss: GleanEventWithExtras<{ alt_text_type?: string; flow?: string }>;
+    imageStatusLabelClicked: GleanEventWithExtras<{ label?: string }>;
+    imageStatusLabelDisplayed: GleanEventWithExtras<{ label?: string }>;
+    info: GleanEventWithExtras<{ topic?: string }>;
+    modelDeleted: GleanEventNoExtras;
+    modelDownloadComplete: GleanEventNoExtras;
+    modelDownloadError: GleanEventWithExtras<{ error?: string }>;
+    modelDownloadStart: GleanEventNoExtras;
+    modelResult: GleanEventWithExtras<{ length?: string; time?: string }>;
+    save: GleanEventWithExtras<{ alt_text_type?: string; flow?: string }>;
+    settingsAiGenerationCheck: GleanEventWithExtras<{ status?: string }>;
+    settingsDisplayed: GleanEventNoExtras;
+    settingsEditAltTextCheck: GleanEventWithExtras<{ status?: string }>;
+    userEdit: GleanEventWithExtras<{
+      total_words?: string;
+      words_added?: string;
+      words_removed?: string;
+    }>;
+  };
+
+  pdfjsSignature: {
+    added: GleanEventWithExtras<{ has_alt_text?: string; has_no_alt_text?: string }>;
+    clear: Record<'draw' | 'text' | 'type', GleanCounter>;
+    created: GleanEventWithExtras<{
+      description_changed?: string;
+      saved?: string;
+      saved_count?: string;
+      type?: string;
+    }>;
+    deleteSaved: GleanEventWithExtras<{ saved_count?: string }>;
+    editDescription: Record<'saved' | 'unsaved', GleanCounter>;
+    inserted: GleanEventWithExtras<{ has_been_saved?: string; has_description?: string }>;
+  };
+
+  pictureinpicture: {
+    backgroundTabPlayingDuration: GleanTimingDistribution;
+    closedMethodBrowserCrash: GleanEventNoExtras;
+    closedMethodCloseButton: GleanEventNoExtras;
+    closedMethodClosePlayerShortcut: GleanEventNoExtras;
+    closedMethodContextMenu: GleanEventNoExtras;
+    closedMethodForegrounded: GleanEventNoExtras;
+    closedMethodFullscreen: GleanEventNoExtras;
+    closedMethodPagehide: GleanEventNoExtras;
+    closedMethodSetupFailure: GleanEventNoExtras;
+    closedMethodShortcut: GleanEventNoExtras;
+    closedMethodUnpip: GleanEventNoExtras;
+    closedMethodUrlBar: GleanEventNoExtras;
+    closedMethodVideoElEmptied: GleanEventNoExtras;
+    closedMethodVideoElRemove: GleanEventNoExtras;
+    createPlayer: GleanEventWithExtras<{
+      ccEnabled?: string;
+      height?: string;
+      screenX?: string;
+      screenY?: string;
+      value?: string;
+      webVTTSubtitles?: string;
+      width?: string;
+    }>;
+    disrespectDisableUrlBar: GleanEventNoExtras;
+    foregroundTabPlayingDuration: GleanTimingDistribution;
+    fullscreenPlayer: GleanEventWithExtras<{ enter?: string; value?: string }>;
+    mostConcurrentPlayers: GleanQuantity;
+    openedMethodAutoPip: GleanEventWithExtras<{
+      callout?: string;
+      disableDialog?: string;
+      firstTimeToggle?: string;
+    }>;
+    openedMethodContextMenu: GleanEventWithExtras<{
+      callout?: string;
+      disableDialog?: string;
+      firstTimeToggle?: string;
+    }>;
+    openedMethodShortcut: GleanEventWithExtras<{
+      callout?: string;
+      disableDialog?: string;
+      firstTimeToggle?: string;
+    }>;
+    openedMethodToggle: GleanEventWithExtras<{
+      callout?: string;
+      disableDialog?: string;
+      firstTimeToggle?: string;
+    }>;
+    openedMethodUrlBar: GleanEventWithExtras<{
+      callout?: string;
+      disableDialog?: string;
+      firstTimeToggle?: string;
+    }>;
+    resizePlayer: GleanEventWithExtras<{ height?: string; value?: string; width?: string }>;
+    sawToggleToggle: GleanEventWithExtras<{ firstTime?: string }>;
+    subtitlesShownSubtitles: GleanEventWithExtras<{ webVTTSubtitles?: string }>;
+    toggleEnabled: GleanBoolean;
+    windowOpenDuration: GleanTimingDistribution;
+  };
+
+  pictureinpictureSettings: {
+    disablePlayer: GleanEventNoExtras;
+    disableSettings: GleanEventNoExtras;
+    enableAutotriggerSettings: GleanEventNoExtras;
+    enableSettings: GleanEventNoExtras;
+  };
+
+  pageIcon: {
+    fitIconCount: GleanCounter;
+    smallIconCount: GleanCounter;
+  };
+
+  places: {
+    annosPagesCount: GleanCustomDistribution;
+    backupsBookmarkstree: GleanTimingDistribution;
+    backupsDaysfromlast: GleanTimingDistribution;
+    backupsTojson: GleanTimingDistribution;
+    bookmarksCount: GleanCustomDistribution;
+    databaseFaviconsFilesize: GleanMemoryDistribution;
+    databaseFilesize: GleanMemoryDistribution;
+    databaseSemanticHistoryFilesize: GleanMemoryDistribution;
+    expirationStepsToClean: GleanCustomDistribution;
+    exportTohtml: GleanTimingDistribution;
+    frecencyRecalcChunkTime: GleanTimingDistribution;
+    idleFrecencyDecayTime: GleanTimingDistribution;
+    idleMaintenanceTime: GleanTimingDistribution;
+    keywordsCount: GleanCustomDistribution;
+    maintenanceDaysfromlast: GleanTimingDistribution;
+    mostRecentExpiredVisit: GleanTimingDistribution;
+    pagesCount: GleanCustomDistribution;
+    pagesNeedFrecencyRecalculation: GleanQuantity;
+    placesDatabaseCorruptionHandlingStage: Record<string, GleanString>;
+    previousdayVisits: GleanQuantity;
+    semanticHistoryChunkCalculateTime: GleanTimingDistribution;
+    semanticHistoryFindChunksTime: GleanTimingDistribution;
+    semanticHistoryMaxChunksCount: GleanQuantity;
+    sortedBookmarksPerc: GleanCustomDistribution;
+    sponsoredVisitNoTriggeringUrl: GleanCounter;
+    taggedBookmarksPerc: GleanCustomDistribution;
+    tagsCount: GleanCustomDistribution;
+  };
+
+  printing: {
+    dialogOpenedViaPreviewTm: GleanCounter;
+    dialogViaPreviewCancelledTm: GleanCounter;
+    error: Record<
+      | 'ABORT'
+      | 'FAILURE'
+      | 'FALLBACK_PAPER_LIST'
+      | 'GFX_PRINTER_COULD_NOT_OPEN_FILE'
+      | 'GFX_PRINTER_DOC_IS_BUSY'
+      | 'GFX_PRINTER_ENDDOC'
+      | 'GFX_PRINTER_NAME_NOT_FOUND'
+      | 'GFX_PRINTER_NO_PRINTER_AVAILABLE'
+      | 'GFX_PRINTER_STARTDOC'
+      | 'GFX_PRINTER_STARTPAGE'
+      | 'LAST_USED_PRINTER'
+      | 'NOT_AVAILABLE'
+      | 'NOT_IMPLEMENTED'
+      | 'OUT_OF_MEMORY'
+      | 'PAPER_MARGINS'
+      | 'PRINTER_LIST'
+      | 'PRINTER_PROPERTIES'
+      | 'PRINTER_SETTINGS'
+      | 'PRINT_DESTINATIONS'
+      | 'PRINT_PREVIEW'
+      | 'UNEXPECTED'
+      | 'UNWRITEABLE_MARGIN',
+      GleanCounter
+    >;
+    previewCancelledTm: GleanCounter;
+    previewOpenedTm: GleanCounter;
+    settingsChanged: Record<string, GleanCounter>;
+    silentPrint: GleanCounter;
+    targetType: Record<'pdf_file' | 'pdf_unknown' | 'unknown' | 'xps_file', GleanCounter>;
+  };
+
+  power: {
+    cpuTimeBogusValues: GleanCounter;
+    cpuTimePerProcessTypeMs: Record<
+      | 'extension'
+      | 'gmplugin'
+      | 'gpu'
+      | 'parent.active'
+      | 'parent.active.playing-audio'
+      | 'parent.active.playing-video'
+      | 'parent.inactive'
+      | 'parent.inactive.playing-audio'
+      | 'parent.inactive.playing-video'
+      | 'prealloc'
+      | 'privilegedabout'
+      | 'rdd'
+      | 'socket'
+      | 'utility'
+      | 'web.background'
+      | 'web.background-perceivable'
+      | 'web.foreground',
+      GleanCounter
+    >;
+    cpuTimePerTrackerTypeMs: Record<
+      'ad' | 'analytics' | 'cryptomining' | 'fingerprinting' | 'social' | 'unknown',
+      GleanCounter
+    >;
+    energyPerProcessType: Record<
+      | 'extension'
+      | 'gmplugin'
+      | 'gpu'
+      | 'parent.active'
+      | 'parent.active.playing-audio'
+      | 'parent.active.playing-video'
+      | 'parent.inactive'
+      | 'parent.inactive.playing-audio'
+      | 'parent.inactive.playing-video'
+      | 'prealloc'
+      | 'privilegedabout'
+      | 'rdd'
+      | 'socket'
+      | 'utility'
+      | 'web.background'
+      | 'web.background-perceivable'
+      | 'web.foreground',
+      GleanCounter
+    >;
+    gpuTimeBogusValues: GleanCounter;
+    gpuTimePerProcessTypeMs: Record<
+      | 'extension'
+      | 'gmplugin'
+      | 'gpu'
+      | 'parent.active'
+      | 'parent.active.playing-audio'
+      | 'parent.active.playing-video'
+      | 'parent.inactive'
+      | 'parent.inactive.playing-audio'
+      | 'parent.inactive.playing-video'
+      | 'prealloc'
+      | 'privilegedabout'
+      | 'rdd'
+      | 'socket'
+      | 'utility'
+      | 'web.background'
+      | 'web.background-perceivable'
+      | 'web.foreground',
+      GleanCounter
+    >;
+    totalCpuTimeMs: GleanCounter;
+    totalGpuTimeMs: GleanCounter;
+    totalThreadWakeups: GleanCounter;
+    wakeupsPerProcessType: Record<
+      | 'extension'
+      | 'gmplugin'
+      | 'gpu'
+      | 'parent.active'
+      | 'parent.active.playing-audio'
+      | 'parent.active.playing-video'
+      | 'parent.inactive'
+      | 'parent.inactive.playing-audio'
+      | 'parent.inactive.playing-video'
+      | 'prealloc'
+      | 'privilegedabout'
+      | 'rdd'
+      | 'socket'
+      | 'utility'
+      | 'web.background'
+      | 'web.background-perceivable'
+      | 'web.foreground',
+      GleanCounter
+    >;
+  };
+
+  powerBattery: {
+    percentageWhenUserActive: GleanCustomDistribution;
+  };
+
+  powerCpuMsPerThread: {
+    contentBackground: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    contentForeground: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    gpuProcess: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    parentActive: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    parentInactive: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+  };
+
+  powerWakeupsPerThread: {
+    contentBackground: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    contentForeground: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    gpuProcess: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    parentActive: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    parentInactive: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+  };
+
+  readermode: {
+    buttonClick: GleanEventWithExtras<{ label?: string }>;
+    downloadResult: GleanCustomDistribution;
+    parseResult: GleanCustomDistribution;
+    viewOff: GleanEventWithExtras<{
+      reader_time?: string;
+      scroll_position?: string;
+      subcategory?: string;
+    }>;
+    viewOn: GleanEventWithExtras<{
+      reader_time?: string;
+      scroll_position?: string;
+      subcategory?: string;
+    }>;
+  };
+
+  brokenSiteReport: {
+    breakageCategory: GleanString;
+    description: GleanText;
+    url: GleanUrl;
+  };
+
+  brokenSiteReportBrowserInfo: {
+    addons: GleanObject;
+    experiments: GleanObject;
+  };
+
+  brokenSiteReportBrowserInfoApp: {
+    defaultLocales: GleanStringList;
+    defaultUseragentString: GleanText;
+    fissionEnabled: GleanBoolean;
+  };
+
+  brokenSiteReportBrowserInfoGraphics: {
+    devicePixelRatio: GleanString;
+    devicesJson: GleanText;
+    driversJson: GleanText;
+    featuresJson: GleanText;
+    hasTouchScreen: GleanBoolean;
+    monitorsJson: GleanText;
+  };
+
+  brokenSiteReportBrowserInfoPrefs: {
+    cookieBehavior: GleanQuantity;
+    forcedAcceleratedLayers: GleanBoolean;
+    globalPrivacyControlEnabled: GleanBoolean;
+    installtriggerEnabled: GleanBoolean;
+    opaqueResponseBlocking: GleanBoolean;
+    resistFingerprintingEnabled: GleanBoolean;
+    softwareWebrender: GleanBoolean;
+    thirdPartyCookieBlockingEnabled: GleanBoolean;
+    thirdPartyCookieBlockingEnabledInPbm: GleanBoolean;
+  };
+
+  brokenSiteReportBrowserInfoSecurity: {
+    antispyware: GleanStringList;
+    antivirus: GleanStringList;
+    firewall: GleanStringList;
+  };
+
+  brokenSiteReportBrowserInfoSystem: {
+    isTablet: GleanBoolean;
+    memory: GleanQuantity;
+  };
+
+  brokenSiteReportTabInfo: {
+    languages: GleanStringList;
+    useragentString: GleanText;
+  };
+
+  brokenSiteReportTabInfoAntitracking: {
+    blockList: GleanString;
+    btpHasPurgedSite: GleanBoolean;
+    etpCategory: GleanString;
+    hasMixedActiveContentBlocked: GleanBoolean;
+    hasMixedDisplayContentBlocked: GleanBoolean;
+    hasTrackingContentBlocked: GleanBoolean;
+    isPrivateBrowsing: GleanBoolean;
+  };
+
+  brokenSiteReportTabInfoFrameworks: {
+    fastclick: GleanBoolean;
+    marfeel: GleanBoolean;
+    mobify: GleanBoolean;
+  };
+
+  webcompatreporting: {
+    opened: GleanEventWithExtras<{ source?: string }>;
+    reasonDropdown: GleanEventWithExtras<{ setting?: string }>;
+    send: GleanEventNoExtras;
+    sendMoreInfo: GleanEventNoExtras;
+  };
+
+  applicationReputation: {
+    binaryArchive: Record<'DmgFile' | 'OtherBinaryFile' | 'RarFile' | 'ZipFile', GleanCounter>;
+    binaryType: Record<
+      'BinaryFile' | 'MissingFilename' | 'MozNonBinaryFile' | 'NonBinaryFile' | 'UnknownFile',
+      GleanCounter
+    >;
+    local: GleanCustomDistribution;
+    reason: Record<
+      | 'DPDisabled'
+      | 'DangerousHostPrefOff'
+      | 'DangerousPrefOff'
+      | 'InternalError'
+      | 'LocalBlocklist'
+      | 'LocalWhitelist'
+      | 'NetworkError'
+      | 'NonBinaryFile'
+      | 'NotSet'
+      | 'RemoteLookupDisabled'
+      | 'UncommonPrefOff'
+      | 'UnwantedPrefOff'
+      | 'VerdictDangerous'
+      | 'VerdictDangerousHost'
+      | 'VerdictSafe'
+      | 'VerdictUncommon'
+      | 'VerdictUnknown'
+      | 'VerdictUnrecognized'
+      | 'VerdictUnwanted',
+      GleanCounter
+    >;
+    remoteLookupResponseTime: GleanTimingDistribution;
+    remoteLookupTimeout: Record<'false' | 'true', GleanCounter>;
+    server: GleanCustomDistribution;
+    server2: Record<
+      | 'ErrAlreadyConnected'
+      | 'ErrConnectionRefused'
+      | 'ErrDNSLookupQueue'
+      | 'ErrNetInadequate'
+      | 'ErrNetInterrupt'
+      | 'ErrNetPartial'
+      | 'ErrNetReset'
+      | 'ErrNetTimeout'
+      | 'ErrNotConnected'
+      | 'ErrOffline'
+      | 'ErrOthers'
+      | 'ErrPortAccess'
+      | 'ErrProxyConnection'
+      | 'ErrUnknownHost'
+      | 'ErrUnknownProxyHost'
+      | 'FailGetChannel'
+      | 'FailGetResponse'
+      | 'HTTP1xx'
+      | 'HTTP204'
+      | 'HTTP2xx'
+      | 'HTTP3xx'
+      | 'HTTP400'
+      | 'HTTP403'
+      | 'HTTP404'
+      | 'HTTP408'
+      | 'HTTP413'
+      | 'HTTP4xx'
+      | 'HTTP502_504_511'
+      | 'HTTP503'
+      | 'HTTP505'
+      | 'HTTP5xx'
+      | 'HTTPOthers'
+      | 'ResponseValid',
+      GleanCounter
+    >;
+    serverVerdict: GleanCustomDistribution;
+    serverVerdict2: GleanDualLabeledCounter;
+    shouldBlock: Record<'false' | 'true', GleanCounter>;
+  };
+
+  characteristics: {
+    anyPointerType: GleanQuantity;
+    audioChannels: GleanQuantity;
+    audioFingerprint: GleanQuantity;
+    audioFrames: GleanQuantity;
+    audioRate: GleanQuantity;
+    availHeight: GleanQuantity;
+    availWidth: GleanQuantity;
+    buildDate: GleanQuantity;
+    cameraCount: GleanQuantity;
+    canvasDpr: GleanString;
+    canvasFeatureStatus: GleanString;
+    canvasdata1: GleanString;
+    canvasdata10: GleanString;
+    canvasdata10software: GleanString;
+    canvasdata11Webgl: GleanString;
+    canvasdata11Webglsoftware: GleanString;
+    canvasdata12Fingerprintjs1: GleanString;
+    canvasdata12Fingerprintjs1software: GleanString;
+    canvasdata13Fingerprintjs2: GleanString;
+    canvasdata13Fingerprintjs2software: GleanString;
+    canvasdata1software: GleanString;
+    canvasdata2: GleanString;
+    canvasdata2software: GleanString;
+    canvasdata3: GleanString;
+    canvasdata3software: GleanString;
+    canvasdata4: GleanString;
+    canvasdata4software: GleanString;
+    canvasdata5: GleanString;
+    canvasdata5software: GleanString;
+    canvasdata6: GleanString;
+    canvasdata6software: GleanString;
+    canvasdata7: GleanString;
+    canvasdata7software: GleanString;
+    canvasdata8: GleanString;
+    canvasdata8software: GleanString;
+    canvasdata9: GleanString;
+    canvasdata9software: GleanString;
+    changedMediaPrefs: GleanString;
+    channel: GleanString;
+    clientIdentifier: GleanUuid;
+    colorAccentcolor: GleanQuantity;
+    colorAccentcolortext: GleanQuantity;
+    colorCanvas: GleanQuantity;
+    colorCanvastext: GleanQuantity;
+    colorHighlight: GleanQuantity;
+    colorHighlighttext: GleanQuantity;
+    colorScheme: GleanQuantity;
+    colorSelecteditem: GleanQuantity;
+    colorSelecteditemtext: GleanQuantity;
+    cpuArch: GleanString;
+    cpuModel: GleanString;
+    errors: GleanText;
+    fontDefaultDefaultGroup: GleanString;
+    fontDefaultModified: GleanQuantity;
+    fontDefaultWestern: GleanString;
+    fontMinimumSizeDefaultGroup: GleanString;
+    fontMinimumSizeModified: GleanQuantity;
+    fontMinimumSizeWestern: GleanString;
+    fontNameListCursiveModified: GleanQuantity;
+    fontNameListEmojiModified: GleanBoolean;
+    fontNameListMonospaceModified: GleanQuantity;
+    fontNameListSansSerifModified: GleanQuantity;
+    fontNameListSerifModified: GleanQuantity;
+    fontNameMonospaceDefaultGroup: GleanString;
+    fontNameMonospaceModified: GleanQuantity;
+    fontNameMonospaceWestern: GleanString;
+    fontNameSansSerifDefaultGroup: GleanString;
+    fontNameSansSerifModified: GleanQuantity;
+    fontNameSansSerifWestern: GleanString;
+    fontNameSerifDefaultGroup: GleanString;
+    fontNameSerifModified: GleanQuantity;
+    fontNameSerifWestern: GleanString;
+    fontSizeMonospaceDefaultGroup: GleanString;
+    fontSizeMonospaceModified: GleanQuantity;
+    fontSizeMonospaceWestern: GleanString;
+    fontSizeVariableDefaultGroup: GleanString;
+    fontSizeVariableModified: GleanQuantity;
+    fontSizeVariableWestern: GleanString;
+    fontsFpjsAllowlisted: GleanString;
+    fontsFpjsNonallowlisted: GleanString;
+    fontsVariantAAllowlisted: GleanString;
+    fontsVariantANonallowlisted: GleanString;
+    fontsVariantBAllowlisted: GleanString;
+    fontsVariantBNonallowlisted: GleanString;
+    gamepads: GleanStringList;
+    gl2ContextType: GleanString;
+    gl2ContextTypeSoftware: GleanString;
+    gl2Extensions: GleanText;
+    gl2ExtensionsRaw: GleanText;
+    gl2ExtensionsRawSoftware: GleanText;
+    gl2ExtensionsSoftware: GleanText;
+    gl2FragmentShader: GleanString;
+    gl2FragmentShaderSoftware: GleanString;
+    gl2MinimalSource: GleanText;
+    gl2MinimalSourceSoftware: GleanText;
+    gl2Params: GleanText;
+    gl2ParamsExtensions: GleanText;
+    gl2ParamsExtensionsSoftware: GleanText;
+    gl2ParamsSoftware: GleanText;
+    gl2PrecisionFragment: GleanText;
+    gl2PrecisionFragmentSoftware: GleanText;
+    gl2PrecisionVertex: GleanText;
+    gl2PrecisionVertexSoftware: GleanText;
+    gl2Renderer: GleanString;
+    gl2RendererRaw: GleanString;
+    gl2RendererRawSoftware: GleanString;
+    gl2RendererSoftware: GleanString;
+    gl2Vendor: GleanString;
+    gl2VendorRaw: GleanString;
+    gl2VendorRawSoftware: GleanString;
+    gl2VendorSoftware: GleanString;
+    gl2VersionRaw: GleanString;
+    gl2VersionRawSoftware: GleanString;
+    gl2VertexShader: GleanString;
+    gl2VertexShaderSoftware: GleanString;
+    glContextType: GleanString;
+    glContextTypeSoftware: GleanString;
+    glExtensions: GleanText;
+    glExtensionsRaw: GleanText;
+    glExtensionsRawSoftware: GleanText;
+    glExtensionsSoftware: GleanText;
+    glFragmentShader: GleanString;
+    glFragmentShaderSoftware: GleanString;
+    glMinimalSource: GleanText;
+    glMinimalSourceSoftware: GleanText;
+    glParams: GleanText;
+    glParamsExtensions: GleanText;
+    glParamsExtensionsSoftware: GleanText;
+    glParamsSoftware: GleanText;
+    glPrecisionFragment: GleanText;
+    glPrecisionFragmentSoftware: GleanText;
+    glPrecisionVertex: GleanText;
+    glPrecisionVertexSoftware: GleanText;
+    glRenderer: GleanString;
+    glRendererRaw: GleanString;
+    glRendererRawSoftware: GleanString;
+    glRendererSoftware: GleanString;
+    glVendor: GleanString;
+    glVendorRaw: GleanString;
+    glVendorRawSoftware: GleanString;
+    glVendorSoftware: GleanString;
+    glVersionRaw: GleanString;
+    glVersionRawSoftware: GleanString;
+    glVertexShader: GleanString;
+    glVertexShaderSoftware: GleanString;
+    groupCount: GleanQuantity;
+    groupCountWoSpeakers: GleanQuantity;
+    iceOrder: GleanQuantity;
+    iceSd: GleanQuantity;
+    innerHeight: GleanQuantity;
+    innerWidth: GleanQuantity;
+    intlLocale: GleanString;
+    invertedColors: GleanBoolean;
+    jsErrors: GleanText;
+    keyboardLayout: GleanString;
+    languages: GleanString;
+    machineModelName: GleanString;
+    mathOps: GleanText;
+    mathOpsFdlibm: GleanText;
+    mathml1: GleanString;
+    mathml10: GleanString;
+    mathml2: GleanString;
+    mathml3: GleanString;
+    mathml4: GleanString;
+    mathml5: GleanString;
+    mathml6: GleanString;
+    mathml7: GleanString;
+    mathml8: GleanString;
+    mathml9: GleanString;
+    maxTouchPoints: GleanQuantity;
+    mediaCapabilitiesH264: GleanText;
+    mediaCapabilitiesNotEfficient: GleanText;
+    mediaCapabilitiesNotSmooth: GleanText;
+    mediaCapabilitiesUnsupported: GleanText;
+    microphoneCount: GleanQuantity;
+    missingFonts: GleanText;
+    monochrome: GleanBoolean;
+    motionDecimals: GleanQuantity;
+    motionFreq: GleanQuantity;
+    orientationDecimals: GleanQuantity;
+    orientationFreq: GleanQuantity;
+    orientationabsDecimals: GleanQuantity;
+    orientationabsFreq: GleanQuantity;
+    osName: GleanString;
+    osVersion: GleanString;
+    oscpu: GleanString;
+    outerHeight: GleanQuantity;
+    outerWidth: GleanQuantity;
+    pdfViewer: GleanBoolean;
+    pixelRatio: GleanString;
+    platform: GleanString;
+    pointerHeight: GleanQuantity;
+    pointerPressure: GleanString;
+    pointerTangentinalPressure: GleanString;
+    pointerTiltx: GleanQuantity;
+    pointerTilty: GleanQuantity;
+    pointerTwist: GleanQuantity;
+    pointerType: GleanQuantity;
+    pointerWidth: GleanQuantity;
+    prefersContrast: GleanQuantity;
+    prefersReducedMotion: GleanBoolean;
+    prefersReducedTransparency: GleanBoolean;
+    prefsBlockPopups: GleanBoolean;
+    prefsBrowserDisplayUseDocumentFonts: GleanBoolean;
+    prefsGeneralAutoscroll: GleanBoolean;
+    prefsGeneralSmoothscroll: GleanBoolean;
+    prefsIntlAcceptLanguages: GleanString;
+    prefsMediaEmeEnabled: GleanBoolean;
+    prefsNetworkCookieCookiebehavior: GleanQuantity;
+    prefsOverlayScrollbars: GleanBoolean;
+    prefsPrivacyDonottrackheaderEnabled: GleanBoolean;
+    prefsPrivacyGlobalprivacycontrolEnabled: GleanBoolean;
+    prefsZoomTextOnly: GleanBoolean;
+    processorCount: GleanQuantity;
+    screenHeight: GleanQuantity;
+    screenWidth: GleanQuantity;
+    screens: GleanText;
+    sizeMode: GleanQuantity;
+    speakerCount: GleanQuantity;
+    submissionSchema: GleanQuantity;
+    systemLocale: GleanString;
+    targetFrameRate: GleanQuantity;
+    textAntiAliasing: GleanString;
+    timezone: GleanString;
+    touchRotationAngle: GleanString;
+    useDocumentColors: GleanBoolean;
+    userAgent: GleanText;
+    usingAcceleratedCanvas: GleanBoolean;
+    version: GleanString;
+    voicesAllSsdeep: GleanString;
+    voicesCount: GleanQuantity;
+    voicesDefault: GleanString;
+    voicesLocalCount: GleanQuantity;
+    voicesLocalSsdeep: GleanString;
+    voicesNonlocalSsdeep: GleanString;
+    voicesSample: GleanText;
+    voicesSha1: GleanText;
+    wgpuMaxbindgroups: GleanQuantity;
+    wgpuMaxbindgroupsplusvertexbuffers: GleanQuantity;
+    wgpuMaxbindingsperbindgroup: GleanQuantity;
+    wgpuMaxbuffersize: GleanQuantity;
+    wgpuMaxcolorattachmentbytespersample: GleanQuantity;
+    wgpuMaxcolorattachments: GleanQuantity;
+    wgpuMaxcomputeinvocationsperworkgroup: GleanQuantity;
+    wgpuMaxcomputeworkgroupsizex: GleanQuantity;
+    wgpuMaxcomputeworkgroupsizey: GleanQuantity;
+    wgpuMaxcomputeworkgroupsizez: GleanQuantity;
+    wgpuMaxcomputeworkgroupsperdimension: GleanQuantity;
+    wgpuMaxcomputeworkgroupstoragesize: GleanQuantity;
+    wgpuMaxdynamicstoragebuffersperpipelinelayout: GleanQuantity;
+    wgpuMaxdynamicuniformbuffersperpipelinelayout: GleanQuantity;
+    wgpuMaxinterstageshadervariables: GleanQuantity;
+    wgpuMaxsampledtexturespershaderstage: GleanQuantity;
+    wgpuMaxsamplerspershaderstage: GleanQuantity;
+    wgpuMaxstoragebufferbindingsize: GleanQuantity;
+    wgpuMaxstoragebufferspershaderstage: GleanQuantity;
+    wgpuMaxstoragetexturespershaderstage: GleanQuantity;
+    wgpuMaxtexturearraylayers: GleanQuantity;
+    wgpuMaxtexturedimension1d: GleanQuantity;
+    wgpuMaxtexturedimension2d: GleanQuantity;
+    wgpuMaxtexturedimension3d: GleanQuantity;
+    wgpuMaxuniformbufferbindingsize: GleanQuantity;
+    wgpuMaxuniformbufferspershaderstage: GleanQuantity;
+    wgpuMaxvertexattributes: GleanQuantity;
+    wgpuMaxvertexbufferarraystride: GleanQuantity;
+    wgpuMaxvertexbuffers: GleanQuantity;
+    wgpuMinstoragebufferoffsetalignment: GleanQuantity;
+    wgpuMinuniformbufferoffsetalignment: GleanQuantity;
+    wgpuMissingFeatures: GleanString;
+    zoomCount: GleanQuantity;
+  };
+
+  fingerprintingProtection: {
+    canvasNoiseCalculateTime2: GleanTimingDistribution;
+  };
+
+  browserSearchinit: {
+    engineInvalidWebextension: Record<string, GleanQuantity>;
+    insecureOpensearchEngineCount: GleanQuantity;
+    insecureOpensearchUpdateCount: GleanQuantity;
+    secureOpensearchEngineCount: GleanQuantity;
+    secureOpensearchUpdateCount: GleanQuantity;
+  };
+
+  search: {
+    suggestionsLatency: Record<string, GleanTimingDistribution>;
+  };
+
+  searchEngineDefault: {
+    changed: GleanEventWithExtras<{
+      change_reason?: string;
+      new_display_name?: string;
+      new_engine_id?: string;
+      new_load_path?: string;
+      new_submission_url?: string;
+      previous_engine_id?: string;
+    }>;
+    displayName: GleanString;
+    engineId: GleanString;
+    loadPath: GleanString;
+    overriddenByThirdParty: GleanBoolean;
+    partnerCode: GleanString;
+    providerId: GleanString;
+    submissionUrl: GleanUrl;
+  };
+
+  searchEnginePrivate: {
+    changed: GleanEventWithExtras<{
+      change_reason?: string;
+      new_display_name?: string;
+      new_engine_id?: string;
+      new_load_path?: string;
+      new_submission_url?: string;
+      previous_engine_id?: string;
+    }>;
+    displayName: GleanString;
+    engineId: GleanString;
+    loadPath: GleanString;
+    overriddenByThirdParty: GleanBoolean;
+    partnerCode: GleanString;
+    providerId: GleanString;
+    submissionUrl: GleanUrl;
+  };
+
+  searchService: {
+    initializationStatus: Record<
+      | 'failedFetchEngines'
+      | 'failedLoadEngines'
+      | 'failedLoadSettingsAddonManager'
+      | 'failedSettings'
+      | 'settingsCorrupt'
+      | 'success',
+      GleanCounter
+    >;
+    startupTime: GleanTimingDistribution;
+  };
+
+  searchSuggestions: {
+    abortedRequests: Record<string, GleanCounter>;
+    failedRequests: Record<string, GleanCounter>;
+    successfulRequests: Record<string, GleanCounter>;
+  };
+
+  legacyTelemetry: {
+    clientId: GleanUuid;
+    profileGroupId: GleanUuid;
+    sessionId: GleanUuid;
+    sessionStartDate: GleanDatetime;
+  };
+
+  onboardingOptOut: {
+    activeExperiments: GleanObject;
+    activeRollouts: GleanObject;
+    enrollmentsMap: GleanObject;
+  };
+
+  startupIo: {
+    read: Record<'sessionRestore' | 'windowVisible', GleanQuantity>;
+    write: Record<'sessionRestore' | 'windowVisible', GleanQuantity>;
+  };
+
+  telemetry: {
+    archiveCheckingOverQuota: GleanTimingDistribution;
+    archiveDirectoriesCount: GleanCustomDistribution;
+    archiveEvictedOldDirs: GleanCustomDistribution;
+    archiveEvictedOverQuota: GleanCustomDistribution;
+    archiveEvictingDirs: GleanTimingDistribution;
+    archiveEvictingOverQuota: GleanTimingDistribution;
+    archiveOldestDirectoryAge: GleanCustomDistribution;
+    archiveScanPingCount: GleanCustomDistribution;
+    archiveSessionPingCount: GleanCounter;
+    archiveSize: GleanMemoryDistribution;
+    compress: GleanTimingDistribution;
+    dataUploadOptin: GleanBoolean;
+    discardedArchivedPingsSize: GleanMemoryDistribution;
+    discardedPendingPingsSize: GleanMemoryDistribution;
+    discardedSendPingsSize: GleanMemoryDistribution;
+    eventPingSent: Record<'max' | 'periodic' | 'shutdown', GleanCounter>;
+    eventRecordingError: Record<
+      'Expired' | 'Extra' | 'ExtraKey' | 'UnknownEvent' | 'Value',
+      GleanCounter
+    >;
+    eventRegistrationError: Record<
+      'Category' | 'ExtraKeys' | 'Method' | 'Name' | 'Object' | 'Other',
+      GleanCounter
+    >;
+    invalidPayloadSubmitted: GleanCounter;
+    invalidPingTypeSubmitted: Record<string, GleanCounter>;
+    pendingCheckingOverQuota: GleanTimingDistribution;
+    pendingEvictingOverQuota: GleanTimingDistribution;
+    pendingLoadFailureParse: GleanCounter;
+    pendingLoadFailureRead: GleanCounter;
+    pendingPingsAge: GleanTimingDistribution;
+    pendingPingsEvictedOverQuota: GleanCustomDistribution;
+    pendingPingsSize: GleanMemoryDistribution;
+    pingEvictedForServerErrors: GleanCounter;
+    pingSizeExceededArchived: GleanCounter;
+    pingSizeExceededPending: GleanCounter;
+    pingSizeExceededSend: GleanCounter;
+    pingSubmissionWaitingClientid: GleanCounter;
+    sendFailure: GleanTimingDistribution;
+    sendFailureType: Record<
+      | 'abort'
+      | 'eChannelOpen'
+      | 'eOK'
+      | 'eRedirect'
+      | 'eRequest'
+      | 'eTerminated'
+      | 'eTooLate'
+      | 'eUnreachable'
+      | 'timeout',
+      GleanCounter
+    >;
+    sendFailureTypePerPing: GleanDualLabeledCounter;
+    sendSuccess: GleanTimingDistribution;
+    stringify: GleanTimingDistribution;
+    success: Record<'false' | 'true', GleanCounter>;
+  };
+
+  termsofuse: {
+    date: GleanDatetime;
+    version: GleanQuantity;
+  };
+
+  thirdPartyModules: {
+    blockedModules: GleanStringList;
+    modules: GleanObject;
+    processes: GleanObject;
+  };
+
+  usage: {
+    appBuild: GleanString;
+    appChannel: GleanString;
+    appDisplayVersion: GleanString;
+    distributionId: GleanString;
+    firstRunDate: GleanDatetime;
+    isDefaultBrowser: GleanBoolean;
+    os: GleanString;
+    osVersion: GleanString;
+    profileGroupId: GleanUuid;
+    profileId: GleanUuid;
+    reason: GleanString;
+    windowsBackupEnabled: GleanBoolean;
+    windowsBuildNumber: GleanQuantity;
+    windowsUserProfileAgeInDays: GleanQuantity;
+  };
+
+  telemetryTest: {
+    test1Object1: GleanEventWithExtras<{ key1?: string; key2?: string; value?: string }>;
+    test2Object1: GleanEventWithExtras<{ key1?: string; key2?: string; value?: string }>;
+    test2Object2: GleanEventWithExtras<{ key1?: string; key2?: string; value?: string }>;
+  };
+
+  thumbnails: {
+    captureCanvasDrawTime: GleanTimingDistribution;
+    captureDoneReason2: GleanCustomDistribution;
+    capturePageLoadTime: GleanTimingDistribution;
+    captureQueueTime: GleanTimingDistribution;
+    captureTime: GleanTimingDistribution;
+    queueSizeOnCapture: GleanCustomDistribution;
+    storeTime: GleanTimingDistribution;
+  };
+
+  translations: {
+    enginePerformance: GleanEventWithExtras<{
+      average_words_per_request?: string;
+      average_words_per_second?: string;
+      flow_id?: string;
+      from_language?: string;
+      to_language?: string;
+      total_completed_requests?: string;
+      total_inference_seconds?: string;
+      total_translated_words?: string;
+    }>;
+    error: GleanEventWithExtras<{ flow_id?: string; reason?: string }>;
+    requestCount: Record<'full_page' | 'select', GleanCounter>;
+    restorePage: GleanEventWithExtras<{ flow_id?: string }>;
+    translationRequest: GleanEventWithExtras<{
+      auto_translate?: string;
+      document_language?: string;
+      flow_id?: string;
+      from_language?: string;
+      request_target?: string;
+      source_text_code_units?: string;
+      source_text_word_count?: string;
+      to_language?: string;
+      top_preferred_language?: string;
+    }>;
+  };
+
+  translationsAboutTranslationsPage: {
+    open: GleanEventWithExtras<{ flow_id?: string }>;
+  };
+
+  translationsPanel: {
+    aboutTranslations: GleanEventWithExtras<{ flow_id?: string }>;
+    alwaysOfferTranslations: GleanEventWithExtras<{ flow_id?: string; toggled_on?: string }>;
+    alwaysTranslateLanguage: GleanEventWithExtras<{
+      flow_id?: string;
+      language?: string;
+      toggled_on?: string;
+    }>;
+    cancelButton: GleanEventWithExtras<{ flow_id?: string }>;
+    changeFromLanguage: GleanEventWithExtras<{ flow_id?: string; language?: string }>;
+    changeSourceLanguageButton: GleanEventWithExtras<{ flow_id?: string }>;
+    changeToLanguage: GleanEventWithExtras<{ flow_id?: string; language?: string }>;
+    close: GleanEventWithExtras<{ flow_id?: string }>;
+    closeFromLanguageMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    closeSettingsMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    closeToLanguageMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    dismissErrorButton: GleanEventWithExtras<{ flow_id?: string }>;
+    learnMore: GleanEventWithExtras<{ flow_id?: string }>;
+    manageLanguages: GleanEventWithExtras<{ flow_id?: string }>;
+    neverTranslateLanguage: GleanEventWithExtras<{
+      flow_id?: string;
+      language?: string;
+      toggled_on?: string;
+    }>;
+    neverTranslateSite: GleanEventWithExtras<{ flow_id?: string; toggled_on?: string }>;
+    open: GleanEventWithExtras<{
+      auto_show?: string;
+      document_language?: string;
+      flow_id?: string;
+      opened_from?: string;
+      view_name?: string;
+    }>;
+    openFromLanguageMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    openSettingsMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    openToLanguageMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    restorePageButton: GleanEventWithExtras<{ flow_id?: string }>;
+    translateButton: GleanEventWithExtras<{ flow_id?: string }>;
+  };
+
+  translationsSelectTranslationsPanel: {
+    aboutTranslations: GleanEventWithExtras<{ flow_id?: string }>;
+    cancelButton: GleanEventWithExtras<{ flow_id?: string }>;
+    changeFromLanguage: GleanEventWithExtras<{
+      document_language?: string;
+      flow_id?: string;
+      language?: string;
+      previous_language?: string;
+    }>;
+    changeToLanguage: GleanEventWithExtras<{ flow_id?: string; language?: string }>;
+    close: GleanEventWithExtras<{ flow_id?: string }>;
+    copyButton: GleanEventWithExtras<{ flow_id?: string }>;
+    doneButton: GleanEventWithExtras<{ flow_id?: string }>;
+    initializationFailureMessage: GleanEventWithExtras<{ flow_id?: string }>;
+    open: GleanEventWithExtras<{
+      document_language?: string;
+      flow_id?: string;
+      from_language?: string;
+      text_source?: string;
+      to_language?: string;
+      top_preferred_language?: string;
+    }>;
+    openSettingsMenu: GleanEventWithExtras<{ flow_id?: string }>;
+    translateButton: GleanEventWithExtras<{
+      detected_language?: string;
+      flow_id?: string;
+      from_language?: string;
+      to_language?: string;
+    }>;
+    translateFullPageButton: GleanEventWithExtras<{ flow_id?: string }>;
+    translationFailureMessage: GleanEventWithExtras<{
+      flow_id?: string;
+      from_language?: string;
+      to_language?: string;
+    }>;
+    translationSettings: GleanEventWithExtras<{ flow_id?: string }>;
+    tryAgainButton: GleanEventWithExtras<{ flow_id?: string }>;
+    unsupportedLanguageMessage: GleanEventWithExtras<{
+      detected_language?: string;
+      document_language?: string;
+      flow_id?: string;
+    }>;
+  };
+
+  urlclassifier: {
+    asyncClassifylocalTime: GleanTimingDistribution;
+    clCheckTime: GleanTimingDistribution;
+    clKeyedUpdateTime: Record<string, GleanTimingDistribution>;
+    completeRemoteStatus2: Record<string, GleanCustomDistribution>;
+    completeServerResponseTime: Record<string, GleanTimingDistribution>;
+    completeTimeout: GleanDualLabeledCounter;
+    completionError: GleanCustomDistribution;
+    lookupTime2: GleanTimingDistribution;
+    shutdownTime: GleanTimingDistribution;
+    threathitNetworkError: GleanCustomDistribution;
+    threathitRemoteStatus: GleanCustomDistribution;
+    uiEvents: GleanCustomDistribution;
+    updateError: Record<string, GleanCustomDistribution>;
+    updateRemoteNetworkError: Record<string, GleanCustomDistribution>;
+    updateRemoteStatus2: Record<string, GleanCustomDistribution>;
+    updateServerResponseTime: Record<string, GleanTimingDistribution>;
+    updateTimeout: Record<string, GleanCustomDistribution>;
+    vlpsConstructTime: GleanTimingDistribution;
+    vlpsFallocateTime: GleanTimingDistribution;
+    vlpsFileloadTime: GleanTimingDistribution;
+    vlpsMetadataCorrupt: Record<'false' | 'true', GleanCounter>;
+  };
+
+  findbar: {
+    findNext: GleanCounter;
+    findPrev: GleanCounter;
+    highlightAll: GleanCounter;
+    matchCase: GleanCounter;
+    matchDiacritics: GleanCounter;
+    shown: GleanCounter;
+    wholeWords: GleanCounter;
+  };
+
+  securityDohNeterror: {
+    clickAddExceptionButton: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    clickContinueButton: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    clickDisableWarning: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    clickLearnMoreLink: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    clickSettingsButton: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    clickTryAgainButton: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+    loadDohwarning: GleanEventWithExtras<{
+      mode?: string;
+      provider_key?: string;
+      skip_reason?: string;
+      value?: string;
+    }>;
+  };
+
+  securityUiCerterror: {
+    clickAdvancedButton: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickAutoReportCb: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickClipboardButtonBot: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickClipboardButtonTop: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickErrorCodeLink: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickExceptionButton: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickLearnMoreLink: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickReturnButtonAdv: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    clickReturnButtonTop: GleanEventWithExtras<{
+      has_sts?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+    loadAboutcerterror: GleanEventWithExtras<{
+      channel_status?: string;
+      has_sts?: string;
+      is_frame?: string;
+      issued_by_cca?: string;
+      value?: string;
+    }>;
+  };
+
+  securityUiTlserror: {
+    loadAbouttlserror: GleanEventWithExtras<{
+      channel_status?: string;
+      is_frame?: string;
+      value?: string;
+    }>;
+  };
+
+  mozstorage: {
+    sqlitejsmTransactionTimeout: Record<string, GleanCounter>;
+  };
+
+  region: {
+    fetchResult: GleanCustomDistribution;
+    fetchTime: GleanTimingDistribution;
+    homeRegion: GleanString;
+    storeRegionResult: Record<
+      'ignoredUnitedStatesIncorrectTimezone' | 'setForRestOfWorld' | 'setForUnitedStates',
+      GleanCounter
+    >;
+  };
+
+  firstStartup: {
+    deleteTasksTime: GleanQuantity;
+    elapsed: GleanQuantity;
+    newProfile: GleanBoolean;
+    normandyInitTime: GleanQuantity;
+    statusCode: GleanQuantity;
+  };
+
+  jsonfile: {
+    loadAutofillprofiles: GleanEventWithExtras<{ value?: string }>;
+    loadLogins: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  newtabPage: {
+    blockedSitesCount: GleanCustomDistribution;
+    pinnedSitesCount: GleanCustomDistribution;
+  };
+
+  popupNotification: {
+    dismissal: Record<string, GleanTimingDistribution>;
+    mainAction: Record<string, GleanTimingDistribution>;
+    stats: Record<string, GleanCustomDistribution>;
+  };
+
+  serviceRequest: {
+    bypassProxyInfo: GleanEventWithExtras<{ source?: string; type?: string; value?: string }>;
+  };
+
+  defaultagent: {
+    daysSinceLastAppLaunch: GleanQuantity;
+  };
+
+  notification: {
+    action: GleanString;
+    showSuccess: GleanBoolean;
+  };
+
+  system: {
+    osVersion: GleanString;
+    previousOsVersion: GleanString;
+    appleModelId: GleanString;
+    hasWinPackageId: GleanBoolean;
+    isWow64: GleanBoolean;
+    isWowArm64: GleanBoolean;
+    memory: GleanQuantity;
+    specialDirectoryAppdataFallback: Record<'appdata' | 'localappdata', GleanBoolean>;
+    virtualMemory: GleanQuantity;
+    winPackageFamilyName: GleanString;
+  };
+
+  systemDefault: {
+    browser: GleanString;
+    pdfHandler: GleanString;
+    previousBrowser: GleanString;
+  };
+
+  addons: {
+    activeAddons: GleanObject;
+    activeGMPlugins: GleanObject;
+    theme: GleanObject;
+  };
+
+  addonsManager: {
+    compatibilityCheckEnabled: GleanBoolean;
+    exception: GleanObject;
+    install: GleanEventWithExtras<{
+      addon_id?: string;
+      addon_type?: string;
+      download_time?: string;
+      error?: string;
+      install_id?: string;
+      install_origins?: string;
+      num_strings?: string;
+      source?: string;
+      source_method?: string;
+      step?: string;
+      updated_from?: string;
+    }>;
+    installStats: GleanEventWithExtras<{
+      addon_id?: string;
+      addon_type?: string;
+      hashed_addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+    }>;
+    manage: GleanEventWithExtras<{
+      addon_id?: string;
+      addon_type?: string;
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      source_method?: string;
+    }>;
+    reportSuspiciousSite: GleanEventWithExtras<{ suspicious_site?: string }>;
+    startupTimeline: Record<
+      | 'AMI_startup_begin'
+      | 'AMI_startup_end'
+      | 'XPI_bootstrap_addons_begin'
+      | 'XPI_bootstrap_addons_end'
+      | 'XPI_finalUIStartup'
+      | 'XPI_startup_begin'
+      | 'XPI_startup_end',
+      GleanQuantity
+    >;
+    update: GleanEventWithExtras<{
+      addon_id?: string;
+      addon_type?: string;
+      download_time?: string;
+      error?: string;
+      install_id?: string;
+      install_origins?: string;
+      num_strings?: string;
+      source?: string;
+      source_method?: string;
+      step?: string;
+      updated_from?: string;
+    }>;
+    xpistatesWriteErrors: GleanEventWithExtras<{ error_type?: string; profile_state?: string }>;
+    disableDictionary: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableExtension: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableLocale: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableOther: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableSitepermDeprecated: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableSitepermission: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableTheme: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    disableUnknown: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableDictionary: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableExtension: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableLocale: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableOther: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableSitepermDeprecated: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableSitepermission: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableTheme: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    enableUnknown: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    installDictionary: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installExtension: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installLocale: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installOther: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installSitepermDeprecated: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installSitepermission: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installStatsDictionary: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsExtension: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsLocale: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsOther: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsSitepermDeprecated: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsSitepermission: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsTheme: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installStatsUnknown: GleanEventWithExtras<{
+      addon_id?: string;
+      taar_based?: string;
+      utm_campaign?: string;
+      utm_content?: string;
+      utm_medium?: string;
+      utm_source?: string;
+      value?: string;
+    }>;
+    installTheme: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    installUnknown: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    sideloadPromptDictionary: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptExtension: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptLocale: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptOther: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptSitepermDeprecated: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptSitepermission: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptTheme: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    sideloadPromptUnknown: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallDictionary: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallExtension: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallLocale: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallOther: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallSitepermDeprecated: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallSitepermission: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallTheme: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    uninstallUnknown: GleanEventWithExtras<{
+      blocklist_state?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      value?: string;
+    }>;
+    updateDictionary: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateExtension: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateLocale: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateOther: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateSitepermDeprecated: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateSitepermission: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateTheme: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+    updateUnknown: GleanEventWithExtras<{
+      addon_id?: string;
+      download_time?: string;
+      error?: string;
+      install_origins?: string;
+      method?: string;
+      num_strings?: string;
+      source?: string;
+      step?: string;
+      updated_from?: string;
+      value?: string;
+    }>;
+  };
+
+  blocklist: {
+    addonBlockChange: GleanEventWithExtras<{
+      addon_version?: string;
+      blocklist_state?: string;
+      hours_since?: string;
+      mlbf_generation?: string;
+      mlbf_last_time?: string;
+      mlbf_softblocks_generation?: string;
+      mlbf_softblocks_source?: string;
+      mlbf_source?: string;
+      object?: string;
+      signed_date?: string;
+      value?: string;
+    }>;
+    enabled: GleanBoolean;
+    lastModifiedRsAddonsMblf: GleanDatetime;
+    mlbfGenerationTime: GleanDatetime;
+    mlbfSoftblocksGenerationTime: GleanDatetime;
+    mlbfSoftblocksSource: GleanString;
+    mlbfSource: GleanString;
+    mlbfStashTimeNewest: GleanDatetime;
+    mlbfStashTimeOldest: GleanDatetime;
+  };
+
+  xpiDatabase: {
+    lateLoad: GleanText;
+    lateStack: GleanText;
+    parses: GleanTimingDistribution;
+    rebuilds: Record<
+      'XPIDB_rebuildBadJSON_MS' | 'XPIDB_rebuildReadFailed_MS' | 'XPIDB_rebuildUnreadableDB_MS',
+      GleanTimingDistribution
+    >;
+    startupError: GleanString;
+    startupLoadReasons: GleanStringList;
+    syncStack: GleanText;
+  };
+
+  update: {
+    autoDownload: GleanBoolean;
+    backgroundUpdate: GleanBoolean;
+    canUsuallyApplyUpdates: GleanBoolean;
+    canUsuallyCheckForUpdates: GleanBoolean;
+    canUsuallyStageUpdates: GleanBoolean;
+    canUsuallyUseBits: GleanBoolean;
+    channel: GleanString;
+    enabled: GleanBoolean;
+    serviceEnabled: GleanBoolean;
+    bitsResultComplete: GleanCustomDistribution;
+    bitsResultPartial: GleanCustomDistribution;
+    canUseBitsExternal: Record<
+      | 'CanUseBits'
+      | 'NoBits_FeatureOff'
+      | 'NoBits_NotWindows'
+      | 'NoBits_OtherUser'
+      | 'NoBits_Pref'
+      | 'NoBits_Proxy',
+      GleanCounter
+    >;
+    canUseBitsNotify: Record<
+      | 'CanUseBits'
+      | 'NoBits_FeatureOff'
+      | 'NoBits_NotWindows'
+      | 'NoBits_OtherUser'
+      | 'NoBits_Pref'
+      | 'NoBits_Proxy',
+      GleanCounter
+    >;
+    canUseBitsSubsequent: Record<
+      | 'CanUseBits'
+      | 'NoBits_FeatureOff'
+      | 'NoBits_NotWindows'
+      | 'NoBits_OtherUser'
+      | 'NoBits_Pref'
+      | 'NoBits_Proxy',
+      GleanCounter
+    >;
+    cannotStageExternal: GleanCounter;
+    cannotStageNotify: GleanCounter;
+    cannotStageSubsequent: GleanCounter;
+    checkCodeExternal: GleanCustomDistribution;
+    checkCodeNotify: GleanCustomDistribution;
+    checkCodeSubsequent: GleanCustomDistribution;
+    checkExtendedErrorExternal: Record<string, GleanCounter>;
+    checkExtendedErrorNotify: Record<string, GleanCounter>;
+    checkExtendedErrorSubsequent: Record<string, GleanCounter>;
+    checkNoUpdateExternal: GleanCounter;
+    checkNoUpdateNotify: GleanCounter;
+    checkNoUpdateSubsequent: GleanCounter;
+    downloadCodeComplete: GleanCustomDistribution;
+    downloadCodePartial: GleanCustomDistribution;
+    downloadCodeUnknown: GleanCustomDistribution;
+    invalidLastupdatetimeExternal: GleanCounter;
+    invalidLastupdatetimeNotify: GleanCounter;
+    invalidLastupdatetimeSubsequent: GleanCounter;
+    langpackOvertime: GleanTimingDistribution;
+    lastNotifyIntervalDaysExternal: GleanTimingDistribution;
+    lastNotifyIntervalDaysNotify: GleanTimingDistribution;
+    lastNotifyIntervalDaysSubsequent: GleanTimingDistribution;
+    notPrefUpdateAutoExternal: GleanCounter;
+    notPrefUpdateAutoNotify: GleanCounter;
+    notPrefUpdateAutoSubsequent: GleanCounter;
+    notPrefUpdateServiceEnabledExternal: GleanCounter;
+    notPrefUpdateServiceEnabledNotify: GleanCounter;
+    notPrefUpdateServiceEnabledSubsequent: GleanCounter;
+    notPrefUpdateStagingEnabledExternal: GleanCounter;
+    notPrefUpdateStagingEnabledNotify: GleanCounter;
+    notPrefUpdateStagingEnabledSubsequent: GleanCounter;
+    notificationBadgeShown: Record<
+      'available' | 'manual' | 'otherinstance' | 'restart' | 'unsupported',
+      GleanCounter
+    >;
+    notificationDismissed: Record<
+      'available' | 'manual' | 'otherinstance' | 'restart' | 'unsupported',
+      GleanCounter
+    >;
+    notificationMainActionDoorhanger: Record<
+      'available' | 'manual' | 'otherinstance' | 'restart' | 'unsupported',
+      GleanCounter
+    >;
+    notificationMainActionMenu: Record<
+      'available' | 'manual' | 'otherinstance' | 'restart' | 'unsupported',
+      GleanCounter
+    >;
+    notificationShown: Record<
+      'available' | 'manual' | 'otherinstance' | 'restart' | 'unsupported',
+      GleanCounter
+    >;
+    pingCountExternal: GleanCounter;
+    pingCountNotify: GleanCounter;
+    pingCountSubsequent: GleanCounter;
+    prefServiceErrorsExternal: GleanCustomDistribution;
+    prefServiceErrorsNotify: GleanCustomDistribution;
+    prefServiceErrorsSubsequent: GleanCustomDistribution;
+    prefUpdateCancelationsExternal: GleanCustomDistribution;
+    prefUpdateCancelationsNotify: GleanCustomDistribution;
+    prefUpdateCancelationsSubsequent: GleanCustomDistribution;
+    previousBuildId: GleanString;
+    previousChannel: GleanString;
+    previousVersion: GleanString;
+    serviceInstalledExternal: Record<'false' | 'true', GleanCounter>;
+    serviceInstalledNotify: Record<'false' | 'true', GleanCounter>;
+    serviceInstalledSubsequent: Record<'false' | 'true', GleanCounter>;
+    serviceManuallyUninstalledExternal: GleanCounter;
+    serviceManuallyUninstalledNotify: GleanCounter;
+    serviceManuallyUninstalledSubsequent: GleanCounter;
+    stateCodeCompleteStage: GleanCustomDistribution;
+    stateCodeCompleteStartup: GleanCustomDistribution;
+    stateCodePartialStage: GleanCustomDistribution;
+    stateCodePartialStartup: GleanCustomDistribution;
+    stateCodeUnknownStage: GleanCustomDistribution;
+    stateCodeUnknownStartup: GleanCustomDistribution;
+    statusErrorCodeCompleteStage: GleanCustomDistribution;
+    statusErrorCodeCompleteStartup: GleanCustomDistribution;
+    statusErrorCodePartialStage: GleanCustomDistribution;
+    statusErrorCodePartialStartup: GleanCustomDistribution;
+    statusErrorCodeUnknownStage: GleanCustomDistribution;
+    statusErrorCodeUnknownStartup: GleanCustomDistribution;
+    targetBuildId: GleanString;
+    targetChannel: GleanString;
+    targetDisplayVersion: GleanString;
+    targetVersion: GleanString;
+    unableToApplyExternal: GleanCounter;
+    unableToApplyNotify: GleanCounter;
+    unableToApplySubsequent: GleanCounter;
+    bitshresult: Record<string, GleanCounter>;
+    moveResult: Record<string, GleanCounter>;
+    noWindowAutoRestarts: GleanCounter;
+    suppressPrompts: GleanBoolean;
+    versionPin: GleanString;
+  };
+
+  updateSettings: {
+    autoDownload: GleanBoolean;
+    background: GleanBoolean;
+    channel: GleanString;
+    enabled: GleanBoolean;
+  };
+
+  updater: {
+    available: GleanBoolean;
+  };
+
+  profiles: {
+    creationDate: GleanQuantity;
+    firstUseDate: GleanQuantity;
+    recoveredFromBackup: GleanQuantity;
+    resetDate: GleanQuantity;
+  };
+
+  e10s: {
+    enabled: GleanBoolean;
+    multiProcesses: GleanQuantity;
+  };
+
+  fission: {
+    enabled: GleanBoolean;
+  };
+
+  gecko: {
+    buildId: GleanString;
+    safeModeUsage: GleanCustomDistribution;
+    version: GleanString;
+  };
+
+  launcherProcess: {
+    state: GleanQuantity;
+  };
+
+  widget: {
+    imeNameOnMac: Record<string, GleanBoolean>;
+    gtkVersion: GleanString;
+    imeNameOnLinux: Record<string, GleanBoolean>;
+    darkMode: GleanBoolean;
+    notifyIdle: GleanTimingDistribution;
+    pointingDevices: Record<'mouse' | 'pen' | 'touch', GleanBoolean>;
+    imeNameOnWindows: Record<string, GleanBoolean>;
+    imeNameOnWindowsInsertedCrlf: Record<string, GleanBoolean>;
+    touchEnabledDevice: Record<'false' | 'true', GleanCounter>;
+  };
+
+  gfxFeatures: {
+    compositor: GleanString;
+    d2d: GleanObject;
+    d3d11: GleanObject;
+    gpuProcess: GleanObject;
+    hwCompositing: GleanObject;
+    omtp: GleanObject;
+    openglCompositing: GleanObject;
+    webrender: GleanObject;
+    wrCompositor: GleanObject;
+  };
+
+  windowsSecurity: {
+    antispyware: GleanStringList;
+    antivirus: GleanStringList;
+    firewall: GleanStringList;
+  };
+
+  cycleCollector: {
+    asyncSnowWhiteFreeing: GleanTimingDistribution;
+    collected: GleanCustomDistribution;
+    deferredFinalizeAsync: GleanTimingDistribution;
+    finishIgc: Record<'false' | 'true', GleanCounter>;
+    forgetSkippableMax: GleanTimingDistribution;
+    full: GleanTimingDistribution;
+    maxPause: GleanTimingDistribution;
+    needGc: Record<'false' | 'true', GleanCounter>;
+    sliceDuringIdle: GleanCustomDistribution;
+    syncSkippable: Record<'false' | 'true', GleanCounter>;
+    time: GleanTimingDistribution;
+    timeBetween: GleanTimingDistribution;
+    visitedGced: GleanCustomDistribution;
+    visitedRefCounted: GleanCustomDistribution;
+    workerCollected: GleanCustomDistribution;
+    workerNeedGc: Record<'false' | 'true', GleanCounter>;
+    workerTime: GleanTimingDistribution;
+    workerVisitedGced: GleanCustomDistribution;
+    workerVisitedRefCounted: GleanCustomDistribution;
+  };
+
+  event: {
+    longtask: Record<string, GleanTimingDistribution>;
+  };
+
+  hdd: {
+    binary: GleanObject;
+    profile: GleanObject;
+    system: GleanObject;
+  };
+
+  memoryPhc: {
+    slop: GleanMemoryDistribution;
+    slotsAllocated: GleanCustomDistribution;
+    slotsFreed: GleanCustomDistribution;
+  };
+
+  memoryWatcher: {
+    onHighMemoryStats: GleanEventWithExtras<{ value?: string }>;
+  };
+
+  systemCpu: {
+    bigCores: GleanQuantity;
+    extensions: GleanStringList;
+    family: GleanQuantity;
+    l2Cache: GleanQuantity;
+    l3Cache: GleanQuantity;
+    littleCores: GleanQuantity;
+    logicalCores: GleanQuantity;
+    mediumCores: GleanQuantity;
+    model: GleanQuantity;
+    name: GleanString;
+    physicalCores: GleanQuantity;
+    speed: GleanQuantity;
+    stepping: GleanQuantity;
+    vendor: GleanString;
+  };
+
+  systemOs: {
+    distro: GleanString;
+    distroVersion: GleanString;
+    locale: GleanString;
+    name: GleanString;
+    servicePackMajor: GleanQuantity;
+    servicePackMinor: GleanQuantity;
+    version: GleanString;
+    windowsBuildNumber: GleanQuantity;
+    windowsUbr: GleanQuantity;
+  };
+
+  timerThread: {
+    timersFiredPerWakeup: GleanCustomDistribution;
+  };
+
+  xpcom: {
+    abi: GleanString;
+  };
+}
+
+interface GleanPingsImpl {
+  messagingSystem: GleanPingNoReason;
+  newtab: GleanPingWithReason<'component_init' | 'newtab_session_end'>;
+  newtabContent: GleanPingWithReason<'component_init' | 'newtab_session_end'>;
+  spoc: GleanPingWithReason<'click' | 'impression' | 'save'>;
+  topSites: GleanPingNoReason;
+  pocketButton: GleanPingNoReason;
+  profiles: GleanPingNoReason;
+  searchWith: GleanPingNoReason;
+  serpCategorization: GleanPingWithReason<'inactivity' | 'startup' | 'threshold_reached'>;
+  quickSuggest: GleanPingNoReason;
+  quickSuggestDeletionRequest: GleanPingNoReason;
+  urlbarKeywordExposure: GleanPingNoReason;
+  contextIdDeletionRequest: GleanPingNoReason;
+  prototypeNoCodeEvents: GleanPingNoReason;
+  pageload: GleanPingWithReason<'startup' | 'threshold'>;
+  pageloadBaseDomain: GleanPingWithReason<'pageload'>;
+  useCounters: GleanPingWithReason<'app_shutdown_confirmed' | 'idle_startup'>;
+  unexpectedScriptLoad: GleanPingNoReason;
+  fxAccounts: GleanPingWithReason<'active' | 'dirty_startup' | 'inactive'>;
+  sync: GleanPingWithReason<'idchanged' | 'schedule' | 'shutdown'>;
+  bounceTrackingProtection: GleanPingNoReason;
+  hangReport: GleanPingNoReason;
+  backgroundTasks: GleanPingNoReason;
+  captchaDetection: GleanPingNoReason;
+  crash: GleanPingWithReason<'crash' | 'event_found'>;
+  dauReporting: GleanPingWithReason<'active' | 'dirty_startup' | 'inactive'>;
+  tempFogInitialState: GleanPingWithReason<'startup'>;
+  collectionDisabledPing: GleanPingNoReason;
+  disabledPing: GleanPingNoReason;
+  onePingOnly: GleanPingNoReason;
+  rideAlongPing: GleanPingNoReason;
+  testOhttpPing: GleanPingNoReason;
+  testPing: GleanPingNoReason;
+  heartbeat: GleanPingNoReason;
+  nimbusTargetingContext: GleanPingNoReason;
+  brokenSiteReport: GleanPingNoReason;
+  userCharacteristics: GleanPingNoReason;
+  onboardingOptOut: GleanPingWithReason<'set_upload_enabled'>;
+  thirdPartyModules: GleanPingNoReason;
+  usageDeletionRequest: GleanPingWithReason<'set_upload_enabled'>;
+  usageReporting: GleanPingWithReason<'active' | 'dirty_startup' | 'inactive'>;
+  firstStartup: GleanPingNoReason;
+  defaultAgent: GleanPingWithReason<'daily_ping'>;
+  backgroundUpdate: GleanPingWithReason<'backgroundupdate_task'>;
+  update: GleanPingWithReason<'ready' | 'success'>;
+}
+
+type GleanEventNoExtras = Omit<GleanEvent, 'record'> & { record(_?: never) };
+type GleanEventWithExtras<T> = Omit<GleanEvent, 'record'> & { record(extras: T) };
+
+type GleanPingNoReason = Omit<nsIGleanPing, 'submit'> & { submit(_?: never) };
+type GleanPingWithReason<T> = Omit<nsIGleanPing, 'submit'> & { submit(reason: T) };
diff --git a/src/zen/@types/lib.gecko.linux.d.ts b/src/zen/@types/lib.gecko.linux.d.ts
index 7308bb544..78f933974 100644
--- a/src/zen/@types/lib.gecko.linux.d.ts
+++ b/src/zen/@types/lib.gecko.linux.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -13,6 +10,8 @@ declare global {
   interface nsIGNOMEShellService extends nsIShellService {
     readonly canSetDesktopBackground: boolean;
     isDefaultForScheme(aScheme: string): boolean;
+    getGSettingsString(aScheme: string, aKey: string): string;
+    setGSettingsString(aScheme: string, aKey: string, aValue: string): void;
   }
 
   // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIOpenTabsProvider.idl
diff --git a/src/zen/@types/lib.gecko.modules.d.ts b/src/zen/@types/lib.gecko.modules.d.ts
index cd013b8d7..dc9bafaab 100644
--- a/src/zen/@types/lib.gecko.modules.d.ts
+++ b/src/zen/@types/lib.gecko.modules.d.ts
@@ -1,82 +1,36 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated by running "mach ts paths".
  */
 
-export interface LazyModules {
+export interface Modules {
   'chrome://browser/content/backup/backup-constants.mjs': typeof import('chrome://browser/content/backup/backup-constants.mjs');
-  'chrome://browser/content/firefoxview/helpers.mjs': typeof import('chrome://browser/content/firefoxview/helpers.mjs');
   'chrome://browser/content/migration/migration-wizard-constants.mjs': typeof import('chrome://browser/content/migration/migration-wizard-constants.mjs');
   'chrome://browser/content/nsContextMenu.sys.mjs': typeof import('chrome://browser/content/nsContextMenu.sys.mjs');
   'chrome://devtools-startup/content/DevToolsShim.sys.mjs': typeof import('chrome://devtools-startup/content/DevToolsShim.sys.mjs');
+  'chrome://global/content/ml/BlockWords.sys.mjs': typeof import('chrome://global/content/ml/BlockWords.sys.mjs');
+  'chrome://global/content/ml/EmbeddingsGenerator.sys.mjs': typeof import('chrome://global/content/ml/EmbeddingsGenerator.sys.mjs');
   'chrome://global/content/ml/EngineProcess.sys.mjs': typeof import('chrome://global/content/ml/EngineProcess.sys.mjs');
   'chrome://global/content/ml/HttpInference.sys.mjs': typeof import('chrome://global/content/ml/HttpInference.sys.mjs');
   'chrome://global/content/ml/ModelHub.sys.mjs': typeof import('chrome://global/content/ml/ModelHub.sys.mjs');
+  'chrome://global/content/ml/OPFS.sys.mjs': typeof import('chrome://global/content/ml/OPFS.sys.mjs');
+  'chrome://global/content/ml/ThomSample.sys.mjs': typeof import('chrome://global/content/ml/ThomSample.sys.mjs');
   'chrome://global/content/ml/Utils.sys.mjs': typeof import('chrome://global/content/ml/Utils.sys.mjs');
   'chrome://global/content/ml/backends/LlamaPipeline.mjs': typeof import('chrome://global/content/ml/backends/LlamaPipeline.mjs');
   'chrome://global/content/ml/backends/ONNXPipeline.mjs': typeof import('chrome://global/content/ml/backends/ONNXPipeline.mjs');
   'chrome://global/content/ml/backends/Pipeline.mjs': typeof import('chrome://global/content/ml/backends/Pipeline.mjs');
-  'chrome://global/content/shopping/ProductValidator.sys.mjs': typeof import('chrome://global/content/shopping/ProductValidator.sys.mjs');
-  'chrome://global/content/shopping/ShoppingProduct.mjs': typeof import('chrome://global/content/shopping/ShoppingProduct.mjs');
   'chrome://global/content/translations/TranslationsTelemetry.sys.mjs': typeof import('chrome://global/content/translations/TranslationsTelemetry.sys.mjs');
   'chrome://global/content/translations/TranslationsUtils.mjs': typeof import('chrome://global/content/translations/TranslationsUtils.mjs');
   'chrome://global/content/translations/translations-document.sys.mjs': typeof import('chrome://global/content/translations/translations-document.sys.mjs');
   'chrome://global/content/translations/translations-engine.sys.mjs': typeof import('chrome://global/content/translations/translations-engine.sys.mjs');
   'chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs': typeof import('chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs');
-  'chrome://pocket/content/Pocket.sys.mjs': typeof import('chrome://pocket/content/Pocket.sys.mjs');
-  'chrome://pocket/content/SaveToPocket.sys.mjs': typeof import('chrome://pocket/content/SaveToPocket.sys.mjs');
   'chrome://pocket/content/pktApi.sys.mjs': typeof import('chrome://pocket/content/pktApi.sys.mjs');
-  'chrome://pocket/content/pktTelemetry.sys.mjs': typeof import('chrome://pocket/content/pktTelemetry.sys.mjs');
-  'chrome://remote/content/cdp/CDP.sys.mjs': typeof import('chrome://remote/content/cdp/CDP.sys.mjs');
-  'chrome://remote/content/cdp/CDPConnection.sys.mjs': typeof import('chrome://remote/content/cdp/CDPConnection.sys.mjs');
-  'chrome://remote/content/cdp/Error.sys.mjs': typeof import('chrome://remote/content/cdp/Error.sys.mjs');
-  'chrome://remote/content/cdp/JSONHandler.sys.mjs': typeof import('chrome://remote/content/cdp/JSONHandler.sys.mjs');
-  'chrome://remote/content/cdp/Protocol.sys.mjs': typeof import('chrome://remote/content/cdp/Protocol.sys.mjs');
-  'chrome://remote/content/cdp/StreamRegistry.sys.mjs': typeof import('chrome://remote/content/cdp/StreamRegistry.sys.mjs');
-  'chrome://remote/content/cdp/domains/ContentProcessDomains.sys.mjs': typeof import('chrome://remote/content/cdp/domains/ContentProcessDomains.sys.mjs');
-  'chrome://remote/content/cdp/domains/Domain.sys.mjs': typeof import('chrome://remote/content/cdp/domains/Domain.sys.mjs');
-  'chrome://remote/content/cdp/domains/DomainCache.sys.mjs': typeof import('chrome://remote/content/cdp/domains/DomainCache.sys.mjs');
-  'chrome://remote/content/cdp/domains/ParentProcessDomains.sys.mjs': typeof import('chrome://remote/content/cdp/domains/ParentProcessDomains.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/DOM.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/DOM.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Emulation.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Emulation.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Input.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Input.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Log.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Log.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Network.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Network.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Page.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Page.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Performance.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Performance.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Runtime.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Runtime.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/Security.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/Security.sys.mjs');
-  'chrome://remote/content/cdp/domains/content/runtime/ExecutionContext.sys.mjs': typeof import('chrome://remote/content/cdp/domains/content/runtime/ExecutionContext.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Browser.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Browser.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Emulation.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Emulation.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Fetch.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Fetch.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/IO.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/IO.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Input.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Input.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Network.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Network.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Page.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Page.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Security.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Security.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/SystemInfo.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/SystemInfo.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/Target.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/Target.sys.mjs');
-  'chrome://remote/content/cdp/domains/parent/page/DialogHandler.sys.mjs': typeof import('chrome://remote/content/cdp/domains/parent/page/DialogHandler.sys.mjs');
-  'chrome://remote/content/cdp/observers/ChannelEventSink.sys.mjs': typeof import('chrome://remote/content/cdp/observers/ChannelEventSink.sys.mjs');
-  'chrome://remote/content/cdp/observers/ContextObserver.sys.mjs': typeof import('chrome://remote/content/cdp/observers/ContextObserver.sys.mjs');
-  'chrome://remote/content/cdp/observers/NetworkObserver.sys.mjs': typeof import('chrome://remote/content/cdp/observers/NetworkObserver.sys.mjs');
-  'chrome://remote/content/cdp/observers/TargetObserver.sys.mjs': typeof import('chrome://remote/content/cdp/observers/TargetObserver.sys.mjs');
-  'chrome://remote/content/cdp/sessions/MainProcessSession.sys.mjs': typeof import('chrome://remote/content/cdp/sessions/MainProcessSession.sys.mjs');
-  'chrome://remote/content/cdp/sessions/TabSession.sys.mjs': typeof import('chrome://remote/content/cdp/sessions/TabSession.sys.mjs');
-  'chrome://remote/content/cdp/targets/MainProcessTarget.sys.mjs': typeof import('chrome://remote/content/cdp/targets/MainProcessTarget.sys.mjs');
-  'chrome://remote/content/cdp/targets/TabTarget.sys.mjs': typeof import('chrome://remote/content/cdp/targets/TabTarget.sys.mjs');
-  'chrome://remote/content/cdp/targets/TargetList.sys.mjs': typeof import('chrome://remote/content/cdp/targets/TargetList.sys.mjs');
   'chrome://remote/content/components/Marionette.sys.mjs': typeof import('chrome://remote/content/components/Marionette.sys.mjs');
   'chrome://remote/content/components/RemoteAgent.sys.mjs': typeof import('chrome://remote/content/components/RemoteAgent.sys.mjs');
   'chrome://remote/content/marionette/actors/MarionetteCommandsParent.sys.mjs': typeof import('chrome://remote/content/marionette/actors/MarionetteCommandsParent.sys.mjs');
   'chrome://remote/content/marionette/actors/MarionetteEventsParent.sys.mjs': typeof import('chrome://remote/content/marionette/actors/MarionetteEventsParent.sys.mjs');
   'chrome://remote/content/marionette/atom.sys.mjs': typeof import('chrome://remote/content/marionette/atom.sys.mjs');
   'chrome://remote/content/marionette/browser.sys.mjs': typeof import('chrome://remote/content/marionette/browser.sys.mjs');
-  'chrome://remote/content/marionette/cert.sys.mjs': typeof import('chrome://remote/content/marionette/cert.sys.mjs');
   'chrome://remote/content/marionette/cookie.sys.mjs': typeof import('chrome://remote/content/marionette/cookie.sys.mjs');
   'chrome://remote/content/marionette/driver.sys.mjs': typeof import('chrome://remote/content/marionette/driver.sys.mjs');
   'chrome://remote/content/marionette/evaluate.sys.mjs': typeof import('chrome://remote/content/marionette/evaluate.sys.mjs');
@@ -124,17 +78,20 @@ export interface LazyModules {
   'chrome://remote/content/shared/UUID.sys.mjs': typeof import('chrome://remote/content/shared/UUID.sys.mjs');
   'chrome://remote/content/shared/UserContextManager.sys.mjs': typeof import('chrome://remote/content/shared/UserContextManager.sys.mjs');
   'chrome://remote/content/shared/WindowManager.sys.mjs': typeof import('chrome://remote/content/shared/WindowManager.sys.mjs');
-  'chrome://remote/content/shared/js-window-actors/NavigationListenerActor.sys.mjs': typeof import('chrome://remote/content/shared/js-window-actors/NavigationListenerActor.sys.mjs');
+  'chrome://remote/content/shared/js-process-actors/WebDriverDocumentInsertedActor.sys.mjs': typeof import('chrome://remote/content/shared/js-process-actors/WebDriverDocumentInsertedActor.sys.mjs');
+  'chrome://remote/content/shared/js-window-actors/WebProgressListenerActor.sys.mjs': typeof import('chrome://remote/content/shared/js-window-actors/WebProgressListenerActor.sys.mjs');
   'chrome://remote/content/shared/listeners/BeforeStopRequestListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/BeforeStopRequestListener.sys.mjs');
   'chrome://remote/content/shared/listeners/BrowsingContextListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/BrowsingContextListener.sys.mjs');
   'chrome://remote/content/shared/listeners/CachedResourceListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/CachedResourceListener.sys.mjs');
   'chrome://remote/content/shared/listeners/ConsoleAPIListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ConsoleAPIListener.sys.mjs');
   'chrome://remote/content/shared/listeners/ConsoleListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ConsoleListener.sys.mjs');
   'chrome://remote/content/shared/listeners/ContextualIdentityListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ContextualIdentityListener.sys.mjs');
+  'chrome://remote/content/shared/listeners/DataChannelListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/DataChannelListener.sys.mjs');
   'chrome://remote/content/shared/listeners/LoadListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/LoadListener.sys.mjs');
   'chrome://remote/content/shared/listeners/NavigationListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/NavigationListener.sys.mjs');
   'chrome://remote/content/shared/listeners/NetworkEventRecord.sys.mjs': typeof import('chrome://remote/content/shared/listeners/NetworkEventRecord.sys.mjs');
   'chrome://remote/content/shared/listeners/NetworkListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/NetworkListener.sys.mjs');
+  'chrome://remote/content/shared/listeners/ParentWebProgressListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ParentWebProgressListener.sys.mjs');
   'chrome://remote/content/shared/listeners/PromptListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/PromptListener.sys.mjs');
   'chrome://remote/content/shared/messagehandler/Errors.sys.mjs': typeof import('chrome://remote/content/shared/messagehandler/Errors.sys.mjs');
   'chrome://remote/content/shared/messagehandler/EventsDispatcher.sys.mjs': typeof import('chrome://remote/content/shared/messagehandler/EventsDispatcher.sys.mjs');
@@ -154,6 +111,7 @@ export interface LazyModules {
   'chrome://remote/content/shared/webdriver/Actions.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Actions.sys.mjs');
   'chrome://remote/content/shared/webdriver/Assert.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Assert.sys.mjs');
   'chrome://remote/content/shared/webdriver/Capabilities.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Capabilities.sys.mjs');
+  'chrome://remote/content/shared/webdriver/Certificates.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Certificates.sys.mjs');
   'chrome://remote/content/shared/webdriver/Errors.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Errors.sys.mjs');
   'chrome://remote/content/shared/webdriver/Event.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/Event.sys.mjs');
   'chrome://remote/content/shared/webdriver/KeyData.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/KeyData.sys.mjs');
@@ -163,6 +121,7 @@ export interface LazyModules {
   'chrome://remote/content/shared/webdriver/UserPromptHandler.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/UserPromptHandler.sys.mjs');
   'chrome://remote/content/shared/webdriver/process-actors/WebDriverProcessDataParent.sys.mjs': typeof import('chrome://remote/content/shared/webdriver/process-actors/WebDriverProcessDataParent.sys.mjs');
   'chrome://remote/content/webdriver-bidi/NewSessionHandler.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/NewSessionHandler.sys.mjs');
+  'chrome://remote/content/webdriver-bidi/ProxyPerUserContextManager.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/ProxyPerUserContextManager.sys.mjs');
   'chrome://remote/content/webdriver-bidi/RemoteValue.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/RemoteValue.sys.mjs');
   'chrome://remote/content/webdriver-bidi/WebDriverBiDi.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/WebDriverBiDi.sys.mjs');
   'chrome://remote/content/webdriver-bidi/WebDriverBiDiConnection.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/WebDriverBiDiConnection.sys.mjs');
@@ -170,6 +129,7 @@ export interface LazyModules {
   'chrome://remote/content/webdriver-bidi/modules/ModuleRegistry.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/ModuleRegistry.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/root/browser.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/browser.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/root/browsingContext.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/browsingContext.sys.mjs');
+  'chrome://remote/content/webdriver-bidi/modules/root/emulation.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/emulation.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/root/input.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/input.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/root/log.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/log.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/root/network.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/root/network.sys.mjs');
@@ -184,25 +144,89 @@ export interface LazyModules {
   'chrome://remote/content/webdriver-bidi/modules/windowglobal-in-root/script.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal-in-root/script.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/_configuration.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/_configuration.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/browsingContext.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/browsingContext.sys.mjs');
+  'chrome://remote/content/webdriver-bidi/modules/windowglobal/emulation.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/emulation.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/input.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/input.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/log.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/log.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/network.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/network.sys.mjs');
   'chrome://remote/content/webdriver-bidi/modules/windowglobal/script.sys.mjs': typeof import('chrome://remote/content/webdriver-bidi/modules/windowglobal/script.sys.mjs');
+  'moz-src:///browser/components/DefaultBrowserCheck.sys.mjs': typeof import('moz-src:///browser/components/DefaultBrowserCheck.sys.mjs');
+  'moz-src:///browser/components/DesktopActorRegistry.sys.mjs': typeof import('moz-src:///browser/components/DesktopActorRegistry.sys.mjs');
+  'moz-src:///browser/components/ProfileDataUpgrader.sys.mjs': typeof import('moz-src:///browser/components/ProfileDataUpgrader.sys.mjs');
+  'moz-src:///browser/components/attribution/AttributionCode.sys.mjs': typeof import('moz-src:///browser/components/attribution/AttributionCode.sys.mjs');
+  'moz-src:///browser/components/attribution/MacAttribution.sys.mjs': typeof import('moz-src:///browser/components/attribution/MacAttribution.sys.mjs');
+  'moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs': typeof import('moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs');
+  'moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs': typeof import('moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs');
+  'moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs': typeof import('moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs');
+  'moz-src:///browser/components/customizableui/DragPositionManager.sys.mjs': typeof import('moz-src:///browser/components/customizableui/DragPositionManager.sys.mjs');
+  'moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs': typeof import('moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs');
+  'moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs': typeof import('moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs');
+  'moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs': typeof import('moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadsViewUI.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsViewUI.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadsViewableInternally.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsViewableInternally.sys.mjs');
+  'moz-src:///browser/components/genai/LinkPreview.sys.mjs': typeof import('moz-src:///browser/components/genai/LinkPreview.sys.mjs');
+  'moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs': typeof import('moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs');
+  'moz-src:///browser/components/pagedata/OpenGraphPageData.sys.mjs': typeof import('moz-src:///browser/components/pagedata/OpenGraphPageData.sys.mjs');
+  'moz-src:///browser/components/pagedata/PageDataSchema.sys.mjs': typeof import('moz-src:///browser/components/pagedata/PageDataSchema.sys.mjs');
+  'moz-src:///browser/components/pagedata/PageDataService.sys.mjs': typeof import('moz-src:///browser/components/pagedata/PageDataService.sys.mjs');
+  'moz-src:///browser/components/pagedata/SchemaOrgPageData.sys.mjs': typeof import('moz-src:///browser/components/pagedata/SchemaOrgPageData.sys.mjs');
+  'moz-src:///browser/components/pagedata/TwitterPageData.sys.mjs': typeof import('moz-src:///browser/components/pagedata/TwitterPageData.sys.mjs');
+  'moz-src:///browser/components/places/Interactions.sys.mjs': typeof import('moz-src:///browser/components/places/Interactions.sys.mjs');
+  'moz-src:///browser/components/places/InteractionsBlocklist.sys.mjs': typeof import('moz-src:///browser/components/places/InteractionsBlocklist.sys.mjs');
+  'moz-src:///browser/components/places/PlacesBrowserStartup.sys.mjs': typeof import('moz-src:///browser/components/places/PlacesBrowserStartup.sys.mjs');
+  'moz-src:///browser/components/places/PlacesUIUtils.sys.mjs': typeof import('moz-src:///browser/components/places/PlacesUIUtils.sys.mjs');
+  'moz-src:///browser/components/privatebrowsing/ResetPBMPanel.sys.mjs': typeof import('moz-src:///browser/components/privatebrowsing/ResetPBMPanel.sys.mjs');
+  'moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs': typeof import('moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs');
+  'moz-src:///browser/components/reportbrokensite/ReportBrokenSite.sys.mjs': typeof import('moz-src:///browser/components/reportbrokensite/ReportBrokenSite.sys.mjs');
   'moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs': typeof import('moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs');
   'moz-src:///browser/components/search/OpenSearchManager.sys.mjs': typeof import('moz-src:///browser/components/search/OpenSearchManager.sys.mjs');
   'moz-src:///browser/components/search/SERPCategorization.sys.mjs': typeof import('moz-src:///browser/components/search/SERPCategorization.sys.mjs');
   'moz-src:///browser/components/search/SearchOneOffs.sys.mjs': typeof import('moz-src:///browser/components/search/SearchOneOffs.sys.mjs');
   'moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs': typeof import('moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs');
   'moz-src:///browser/components/search/SearchUIUtils.sys.mjs': typeof import('moz-src:///browser/components/search/SearchUIUtils.sys.mjs');
+  'moz-src:///browser/components/shell/HeadlessShell.sys.mjs': typeof import('moz-src:///browser/components/shell/HeadlessShell.sys.mjs');
+  'moz-src:///browser/components/shell/ShellService.sys.mjs': typeof import('moz-src:///browser/components/shell/ShellService.sys.mjs');
+  'moz-src:///browser/components/shell/StartupOSIntegration.sys.mjs': typeof import('moz-src:///browser/components/shell/StartupOSIntegration.sys.mjs');
+  'moz-src:///browser/components/sidebar/SidebarManager.sys.mjs': typeof import('moz-src:///browser/components/sidebar/SidebarManager.sys.mjs');
+  'moz-src:///browser/components/sidebar/SidebarState.sys.mjs': typeof import('moz-src:///browser/components/sidebar/SidebarState.sys.mjs');
+  'moz-src:///browser/components/sidebar/SidebarTreeView.sys.mjs': typeof import('moz-src:///browser/components/sidebar/SidebarTreeView.sys.mjs');
   'moz-src:///browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs');
   'moz-src:///browser/components/tabbrowser/GroupsList.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/GroupsList.sys.mjs');
   'moz-src:///browser/components/tabbrowser/NewTabPagePreloading.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/NewTabPagePreloading.sys.mjs');
   'moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs');
   'moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs');
+  'moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs');
   'moz-src:///browser/components/tabbrowser/TabsList.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/TabsList.sys.mjs');
+  'moz-src:///browser/components/uitour/UITour.sys.mjs': typeof import('moz-src:///browser/components/uitour/UITour.sys.mjs');
+  'moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs': typeof import('moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs');
+  'moz-src:///browser/modules/ContextId.sys.mjs': typeof import('moz-src:///browser/modules/ContextId.sys.mjs');
+  'moz-src:///browser/themes/ToolbarIconColor.sys.mjs': typeof import('moz-src:///browser/themes/ToolbarIconColor.sys.mjs');
+  'moz-src:///toolkit/components/doh/DoHConfig.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHConfig.sys.mjs');
+  'moz-src:///toolkit/components/doh/DoHController.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHController.sys.mjs');
+  'moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs');
   'moz-src:///toolkit/components/reader/AboutReader.sys.mjs': typeof import('moz-src:///toolkit/components/reader/AboutReader.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderMode.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderMode.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs');
+  'moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/search/ConfigSearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/ConfigSearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs': typeof import('moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs');
+  'moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchSettings.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchSettings.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchStaticData.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchStaticData.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs');
+  'moz-src:///toolkit/components/search/SearchUtils.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchUtils.sys.mjs');
+  'moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs');
+  'moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs': typeof import('moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs');
   'resource:///actors/AboutNewTabParent.sys.mjs': typeof import('resource:///actors/AboutNewTabParent.sys.mjs');
   'resource:///actors/AboutReaderParent.sys.mjs': typeof import('resource:///actors/AboutReaderParent.sys.mjs');
   'resource:///actors/AboutWelcomeParent.sys.mjs': typeof import('resource:///actors/AboutWelcomeParent.sys.mjs');
@@ -212,15 +236,14 @@ export interface LazyModules {
   'resource:///actors/LinkHandlerParent.sys.mjs': typeof import('resource:///actors/LinkHandlerParent.sys.mjs');
   'resource:///actors/PluginParent.sys.mjs': typeof import('resource:///actors/PluginParent.sys.mjs');
   'resource:///actors/SearchSERPTelemetryChild.sys.mjs': typeof import('resource:///actors/SearchSERPTelemetryChild.sys.mjs');
-  'resource:///actors/ShoppingSidebarParent.sys.mjs': typeof import('resource:///actors/ShoppingSidebarParent.sys.mjs');
   'resource:///actors/WebRTCChild.sys.mjs': typeof import('resource:///actors/WebRTCChild.sys.mjs');
   'resource:///modules/360seMigrationUtils.sys.mjs': typeof import('resource:///modules/360seMigrationUtils.sys.mjs');
   'resource:///modules/AboutHomeStartupCache.sys.mjs': typeof import('resource:///modules/AboutHomeStartupCache.sys.mjs');
   'resource:///modules/AboutNewTab.sys.mjs': typeof import('resource:///modules/AboutNewTab.sys.mjs');
   'resource:///modules/AboutNewTabRedirector.sys.mjs': typeof import('resource:///modules/AboutNewTabRedirector.sys.mjs');
+  'resource:///modules/AboutNewTabResourceMapping.sys.mjs': typeof import('resource:///modules/AboutNewTabResourceMapping.sys.mjs');
   'resource:///modules/ActionsProviderContextualSearch.sys.mjs': typeof import('resource:///modules/ActionsProviderContextualSearch.sys.mjs');
   'resource:///modules/ActionsProviderQuickActions.sys.mjs': typeof import('resource:///modules/ActionsProviderQuickActions.sys.mjs');
-  'resource:///modules/AttributionCode.sys.mjs': typeof import('resource:///modules/AttributionCode.sys.mjs');
   'resource:///modules/BrowserGlue.sys.mjs': typeof import('resource:///modules/BrowserGlue.sys.mjs');
   'resource:///modules/BrowserUIUtils.sys.mjs': typeof import('resource:///modules/BrowserUIUtils.sys.mjs');
   'resource:///modules/BrowserUsageTelemetry.sys.mjs': typeof import('resource:///modules/BrowserUsageTelemetry.sys.mjs');
@@ -228,19 +251,8 @@ export interface LazyModules {
   'resource:///modules/BuiltInThemeConfig.sys.mjs': typeof import('resource:///modules/BuiltInThemeConfig.sys.mjs');
   'resource:///modules/BuiltInThemes.sys.mjs': typeof import('resource:///modules/BuiltInThemes.sys.mjs');
   'resource:///modules/ChromeMigrationUtils.sys.mjs': typeof import('resource:///modules/ChromeMigrationUtils.sys.mjs');
-  'resource:///modules/ContentAnalysis.sys.mjs': typeof import('resource:///modules/ContentAnalysis.sys.mjs');
   'resource:///modules/ContentCrashHandlers.sys.mjs': typeof import('resource:///modules/ContentCrashHandlers.sys.mjs');
-  'resource:///modules/CustomizableUI.sys.mjs': typeof import('resource:///modules/CustomizableUI.sys.mjs');
-  'resource:///modules/CustomizableWidgets.sys.mjs': typeof import('resource:///modules/CustomizableWidgets.sys.mjs');
   'resource:///modules/Discovery.sys.mjs': typeof import('resource:///modules/Discovery.sys.mjs');
-  'resource:///modules/DoHConfig.sys.mjs': typeof import('resource:///modules/DoHConfig.sys.mjs');
-  'resource:///modules/DoHController.sys.mjs': typeof import('resource:///modules/DoHController.sys.mjs');
-  'resource:///modules/DoHHeuristics.sys.mjs': typeof import('resource:///modules/DoHHeuristics.sys.mjs');
-  'resource:///modules/DownloadSpamProtection.sys.mjs': typeof import('resource:///modules/DownloadSpamProtection.sys.mjs');
-  'resource:///modules/DownloadsCommon.sys.mjs': typeof import('resource:///modules/DownloadsCommon.sys.mjs');
-  'resource:///modules/DownloadsViewUI.sys.mjs': typeof import('resource:///modules/DownloadsViewUI.sys.mjs');
-  'resource:///modules/DownloadsViewableInternally.sys.mjs': typeof import('resource:///modules/DownloadsViewableInternally.sys.mjs');
-  'resource:///modules/DragPositionManager.sys.mjs': typeof import('resource:///modules/DragPositionManager.sys.mjs');
   'resource:///modules/ESEDBReader.sys.mjs': typeof import('resource:///modules/ESEDBReader.sys.mjs');
   'resource:///modules/EveryWindow.sys.mjs': typeof import('resource:///modules/EveryWindow.sys.mjs');
   'resource:///modules/ExtensionBrowsingData.sys.mjs': typeof import('resource:///modules/ExtensionBrowsingData.sys.mjs');
@@ -254,50 +266,35 @@ export interface LazyModules {
   'resource:///modules/FirefoxBridgeExtensionUtils.sys.mjs': typeof import('resource:///modules/FirefoxBridgeExtensionUtils.sys.mjs');
   'resource:///modules/FirefoxProfileMigrator.sys.mjs': typeof import('resource:///modules/FirefoxProfileMigrator.sys.mjs');
   'resource:///modules/GenAI.sys.mjs': typeof import('resource:///modules/GenAI.sys.mjs');
-  'resource:///modules/HeadlessShell.sys.mjs': typeof import('resource:///modules/HeadlessShell.sys.mjs');
   'resource:///modules/HistoryController.sys.mjs': typeof import('resource:///modules/HistoryController.sys.mjs');
   'resource:///modules/HomePage.sys.mjs': typeof import('resource:///modules/HomePage.sys.mjs');
-  'resource:///modules/Interactions.sys.mjs': typeof import('resource:///modules/Interactions.sys.mjs');
-  'resource:///modules/InteractionsBlocklist.sys.mjs': typeof import('resource:///modules/InteractionsBlocklist.sys.mjs');
   'resource:///modules/InternalTestingProfileMigrator.sys.mjs': typeof import('resource:///modules/InternalTestingProfileMigrator.sys.mjs');
   'resource:///modules/LaterRun.sys.mjs': typeof import('resource:///modules/LaterRun.sys.mjs');
   'resource:///modules/LinksCache.sys.mjs': typeof import('resource:///modules/LinksCache.sys.mjs');
   'resource:///modules/LoginBreaches.sys.mjs': typeof import('resource:///modules/LoginBreaches.sys.mjs');
-  'resource:///modules/MacAttribution.sys.mjs': typeof import('resource:///modules/MacAttribution.sys.mjs');
   'resource:///modules/MerinoClient.sys.mjs': typeof import('resource:///modules/MerinoClient.sys.mjs');
   'resource:///modules/MigrationUtils.sys.mjs': typeof import('resource:///modules/MigrationUtils.sys.mjs');
   'resource:///modules/OpenTabs.sys.mjs': typeof import('resource:///modules/OpenTabs.sys.mjs');
   'resource:///modules/PageActions.sys.mjs': typeof import('resource:///modules/PageActions.sys.mjs');
-  'resource:///modules/PanelMultiView.sys.mjs': typeof import('resource:///modules/PanelMultiView.sys.mjs');
   'resource:///modules/PartnerLinkAttribution.sys.mjs': typeof import('resource:///modules/PartnerLinkAttribution.sys.mjs');
   'resource:///modules/PermissionUI.sys.mjs': typeof import('resource:///modules/PermissionUI.sys.mjs');
-  'resource:///modules/PlacesUIUtils.sys.mjs': typeof import('resource:///modules/PlacesUIUtils.sys.mjs');
   'resource:///modules/PopupBlockerObserver.sys.mjs': typeof import('resource:///modules/PopupBlockerObserver.sys.mjs');
   'resource:///modules/ProcessHangMonitor.sys.mjs': typeof import('resource:///modules/ProcessHangMonitor.sys.mjs');
   'resource:///modules/QuickActionsLoaderDefault.sys.mjs': typeof import('resource:///modules/QuickActionsLoaderDefault.sys.mjs');
   'resource:///modules/QuickSuggest.sys.mjs': typeof import('resource:///modules/QuickSuggest.sys.mjs');
-  'resource:///modules/ReportBrokenSite.sys.mjs': typeof import('resource:///modules/ReportBrokenSite.sys.mjs');
-  'resource:///modules/ResetPBMPanel.sys.mjs': typeof import('resource:///modules/ResetPBMPanel.sys.mjs');
-  'resource:///modules/ReviewCheckerManager.sys.mjs': typeof import('resource:///modules/ReviewCheckerManager.sys.mjs');
   'resource:///modules/SafariProfileMigrator.sys.mjs': typeof import('resource:///modules/SafariProfileMigrator.sys.mjs');
   'resource:///modules/Sanitizer.sys.mjs': typeof import('resource:///modules/Sanitizer.sys.mjs');
   'resource:///modules/ScreenshotsOverlayChild.sys.mjs': typeof import('resource:///modules/ScreenshotsOverlayChild.sys.mjs');
   'resource:///modules/ScreenshotsUtils.sys.mjs': typeof import('resource:///modules/ScreenshotsUtils.sys.mjs');
   'resource:///modules/SearchModeSwitcher.sys.mjs': typeof import('resource:///modules/SearchModeSwitcher.sys.mjs');
   'resource:///modules/SelectionChangedMenulist.sys.mjs': typeof import('resource:///modules/SelectionChangedMenulist.sys.mjs');
-  'resource:///modules/ShellService.sys.mjs': typeof import('resource:///modules/ShellService.sys.mjs');
-  'resource:///modules/ShoppingUtils.sys.mjs': typeof import('resource:///modules/ShoppingUtils.sys.mjs');
-  'resource:///modules/SidebarManager.sys.mjs': typeof import('resource:///modules/SidebarManager.sys.mjs');
-  'resource:///modules/SidebarState.sys.mjs': typeof import('resource:///modules/SidebarState.sys.mjs');
+  'resource:///modules/SharingUtils.sys.mjs': typeof import('resource:///modules/SharingUtils.sys.mjs');
   'resource:///modules/SiteDataManager.sys.mjs': typeof import('resource:///modules/SiteDataManager.sys.mjs');
   'resource:///modules/SitePermissions.sys.mjs': typeof import('resource:///modules/SitePermissions.sys.mjs');
   'resource:///modules/SyncedTabsController.sys.mjs': typeof import('resource:///modules/SyncedTabsController.sys.mjs');
   'resource:///modules/TRRPerformance.sys.mjs': typeof import('resource:///modules/TRRPerformance.sys.mjs');
-  'resource:///modules/TaskbarTabUI.sys.mjs': typeof import('resource:///modules/TaskbarTabUI.sys.mjs');
   'resource:///modules/ThemeVariableMap.sys.mjs': typeof import('resource:///modules/ThemeVariableMap.sys.mjs');
-  'resource:///modules/ToolbarContextMenu.sys.mjs': typeof import('resource:///modules/ToolbarContextMenu.sys.mjs');
   'resource:///modules/TransientPrefs.sys.mjs': typeof import('resource:///modules/TransientPrefs.sys.mjs');
-  'resource:///modules/UITour.sys.mjs': typeof import('resource:///modules/UITour.sys.mjs');
   'resource:///modules/URILoadingHelper.sys.mjs': typeof import('resource:///modules/URILoadingHelper.sys.mjs');
   'resource:///modules/UrlbarController.sys.mjs': typeof import('resource:///modules/UrlbarController.sys.mjs');
   'resource:///modules/UrlbarEventBufferer.sys.mjs': typeof import('resource:///modules/UrlbarEventBufferer.sys.mjs');
@@ -315,6 +312,7 @@ export interface LazyModules {
   'resource:///modules/UrlbarProviderRecentSearches.sys.mjs': typeof import('resource:///modules/UrlbarProviderRecentSearches.sys.mjs');
   'resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs': typeof import('resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs');
   'resource:///modules/UrlbarProviderSearchTips.sys.mjs': typeof import('resource:///modules/UrlbarProviderSearchTips.sys.mjs');
+  'resource:///modules/UrlbarProviderSemanticHistorySearch.sys.mjs': typeof import('resource:///modules/UrlbarProviderSemanticHistorySearch.sys.mjs');
   'resource:///modules/UrlbarProviderTabToSearch.sys.mjs': typeof import('resource:///modules/UrlbarProviderTabToSearch.sys.mjs');
   'resource:///modules/UrlbarProviderTopSites.sys.mjs': typeof import('resource:///modules/UrlbarProviderTopSites.sys.mjs');
   'resource:///modules/UrlbarProviderUnitConversion.sys.mjs': typeof import('resource:///modules/UrlbarProviderUnitConversion.sys.mjs');
@@ -328,6 +326,7 @@ export interface LazyModules {
   'resource:///modules/UrlbarValueFormatter.sys.mjs': typeof import('resource:///modules/UrlbarValueFormatter.sys.mjs');
   'resource:///modules/UrlbarView.sys.mjs': typeof import('resource:///modules/UrlbarView.sys.mjs');
   'resource:///modules/WebProtocolHandlerRegistrar.sys.mjs': typeof import('resource:///modules/WebProtocolHandlerRegistrar.sys.mjs');
+  'resource:///modules/WindowsJumpLists.sys.mjs': typeof import('resource:///modules/WindowsJumpLists.sys.mjs');
   'resource:///modules/ZoomUI.sys.mjs': typeof import('resource:///modules/ZoomUI.sys.mjs');
   'resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs': typeof import('resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs');
   'resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs': typeof import('resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs');
@@ -362,13 +361,12 @@ export interface LazyModules {
   'resource:///modules/backup/ArchiveUtils.sys.mjs': typeof import('resource:///modules/backup/ArchiveUtils.sys.mjs');
   'resource:///modules/backup/BackupError.mjs': typeof import('resource:///modules/backup/BackupError.mjs');
   'resource:///modules/backup/BackupService.sys.mjs': typeof import('resource:///modules/backup/BackupService.sys.mjs');
+  'resource:///modules/distribution.sys.mjs': typeof import('resource:///modules/distribution.sys.mjs');
   'resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs': typeof import('resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs');
   'resource:///modules/firefox-view-tabs-setup-manager.sys.mjs': typeof import('resource:///modules/firefox-view-tabs-setup-manager.sys.mjs');
-  'resource:///modules/pagedata/OpenGraphPageData.sys.mjs': typeof import('resource:///modules/pagedata/OpenGraphPageData.sys.mjs');
-  'resource:///modules/pagedata/PageDataSchema.sys.mjs': typeof import('resource:///modules/pagedata/PageDataSchema.sys.mjs');
-  'resource:///modules/pagedata/PageDataService.sys.mjs': typeof import('resource:///modules/pagedata/PageDataService.sys.mjs');
-  'resource:///modules/pagedata/SchemaOrgPageData.sys.mjs': typeof import('resource:///modules/pagedata/SchemaOrgPageData.sys.mjs');
-  'resource:///modules/pagedata/TwitterPageData.sys.mjs': typeof import('resource:///modules/pagedata/TwitterPageData.sys.mjs');
+  'resource:///modules/ipprotection/IPProtection.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtection.sys.mjs');
+  'resource:///modules/ipprotection/IPProtectionPanel.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionPanel.sys.mjs');
+  'resource:///modules/ipprotection/IPProtectionService.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionService.sys.mjs');
   'resource:///modules/policies/BookmarksPolicies.sys.mjs': typeof import('resource:///modules/policies/BookmarksPolicies.sys.mjs');
   'resource:///modules/policies/Policies.sys.mjs': typeof import('resource:///modules/policies/Policies.sys.mjs');
   'resource:///modules/policies/ProxyPolicies.sys.mjs': typeof import('resource:///modules/policies/ProxyPolicies.sys.mjs');
@@ -385,6 +383,7 @@ export interface LazyModules {
   'resource:///modules/sessionstore/SessionSaver.sys.mjs': typeof import('resource:///modules/sessionstore/SessionSaver.sys.mjs');
   'resource:///modules/sessionstore/SessionStartup.sys.mjs': typeof import('resource:///modules/sessionstore/SessionStartup.sys.mjs');
   'resource:///modules/sessionstore/SessionStore.sys.mjs': typeof import('resource:///modules/sessionstore/SessionStore.sys.mjs');
+  'resource:///modules/sessionstore/SessionWindowUI.sys.mjs': typeof import('resource:///modules/sessionstore/SessionWindowUI.sys.mjs');
   'resource:///modules/sessionstore/SessionWriter.sys.mjs': typeof import('resource:///modules/sessionstore/SessionWriter.sys.mjs');
   'resource:///modules/sessionstore/StartupPerformance.sys.mjs': typeof import('resource:///modules/sessionstore/StartupPerformance.sys.mjs');
   'resource:///modules/sessionstore/TabAttributes.sys.mjs': typeof import('resource:///modules/sessionstore/TabAttributes.sys.mjs');
@@ -392,6 +391,13 @@ export interface LazyModules {
   'resource:///modules/sessionstore/TabState.sys.mjs': typeof import('resource:///modules/sessionstore/TabState.sys.mjs');
   'resource:///modules/sessionstore/TabStateCache.sys.mjs': typeof import('resource:///modules/sessionstore/TabStateCache.sys.mjs');
   'resource:///modules/sessionstore/TabStateFlusher.sys.mjs': typeof import('resource:///modules/sessionstore/TabStateFlusher.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabs.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabs.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsChrome.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsChrome.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsPageAction.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsPageAction.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsPin.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsPin.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsRegistry.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsRegistry.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsUtils.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsUtils.sys.mjs');
+  'resource:///modules/taskbartabs/TaskbarTabsWindowManager.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsWindowManager.sys.mjs');
   'resource:///modules/topsites/TippyTopProvider.sys.mjs': typeof import('resource:///modules/topsites/TippyTopProvider.sys.mjs');
   'resource:///modules/topsites/TopSites.sys.mjs': typeof import('resource:///modules/topsites/TopSites.sys.mjs');
   'resource:///modules/topsites/constants.mjs': typeof import('resource:///modules/topsites/constants.mjs');
@@ -405,10 +411,10 @@ export interface LazyModules {
   'resource://autofill/FormAutofillPreferences.sys.mjs': typeof import('resource://autofill/FormAutofillPreferences.sys.mjs');
   'resource://autofill/FormAutofillPrompter.sys.mjs': typeof import('resource://autofill/FormAutofillPrompter.sys.mjs');
   'resource://autofill/FormAutofillStorage.sys.mjs': typeof import('resource://autofill/FormAutofillStorage.sys.mjs');
-  'resource://autofill/MLAutofill.sys.mjs': typeof import('resource://autofill/MLAutofill.sys.mjs');
   'resource://autofill/ProfileAutoCompleteResult.sys.mjs': typeof import('resource://autofill/ProfileAutoCompleteResult.sys.mjs');
   'resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs': typeof import('resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs');
   'resource://devtools/client/performance-new/popup/menu-button.sys.mjs': typeof import('resource://devtools/client/performance-new/popup/menu-button.sys.mjs');
+  'resource://devtools/client/shared/components/reps/reps/constants.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/constants.mjs');
   'resource://devtools/client/shared/components/reps/reps/rep-utils.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/rep-utils.mjs');
   'resource://devtools/client/shared/focus.mjs': typeof import('resource://devtools/client/shared/focus.mjs');
   'resource://devtools/client/storage/VariablesView.sys.mjs': typeof import('resource://devtools/client/storage/VariablesView.sys.mjs');
@@ -433,8 +439,11 @@ export interface LazyModules {
   'resource://devtools/shared/network-observer/NetworkOverride.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkOverride.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkResponseListener.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkResponseListener.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkThrottleManager.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkThrottleManager.sys.mjs');
+  'resource://devtools/shared/network-observer/NetworkTimings.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkTimings.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkUtils.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkUtils.sys.mjs');
   'resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs': typeof import('resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs');
+  'resource://devtools/shared/performance-new/recording-utils.sys.mjs': typeof import('resource://devtools/shared/performance-new/recording-utils.sys.mjs');
+  'resource://devtools/shared/performance-new/symbolication.sys.mjs': typeof import('resource://devtools/shared/performance-new/symbolication.sys.mjs');
   'resource://devtools/shared/platform/CacheEntry.sys.mjs': typeof import('resource://devtools/shared/platform/CacheEntry.sys.mjs');
   'resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs': typeof import('resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs');
   'resource://devtools/shared/validate-breakpoint.sys.mjs': typeof import('resource://devtools/shared/validate-breakpoint.sys.mjs');
@@ -450,11 +459,10 @@ export interface LazyModules {
   'resource://gre/modules/AbuseReporter.sys.mjs': typeof import('resource://gre/modules/AbuseReporter.sys.mjs');
   'resource://gre/modules/ActorManagerParent.sys.mjs': typeof import('resource://gre/modules/ActorManagerParent.sys.mjs');
   'resource://gre/modules/AddonManager.sys.mjs': typeof import('resource://gre/modules/AddonManager.sys.mjs');
-  'resource://gre/modules/AddonSearchEngine.sys.mjs': typeof import('resource://gre/modules/AddonSearchEngine.sys.mjs');
   'resource://gre/modules/AndroidLog.sys.mjs': typeof import('resource://gre/modules/AndroidLog.sys.mjs');
   'resource://gre/modules/AppConstants.sys.mjs': typeof import('resource://gre/modules/AppConstants.sys.mjs');
   'resource://gre/modules/AppMenuNotifications.sys.mjs': typeof import('resource://gre/modules/AppMenuNotifications.sys.mjs');
-  'resource://gre/modules/AppProvidedSearchEngine.sys.mjs': typeof import('resource://gre/modules/AppProvidedSearchEngine.sys.mjs');
+  'resource://gre/modules/AppServicesTracing.sys.mjs': typeof import('resource://gre/modules/AppServicesTracing.sys.mjs');
   'resource://gre/modules/AppUpdater.sys.mjs': typeof import('resource://gre/modules/AppUpdater.sys.mjs');
   'resource://gre/modules/AsyncPrefs.sys.mjs': typeof import('resource://gre/modules/AsyncPrefs.sys.mjs');
   'resource://gre/modules/AsyncShutdown.sys.mjs': typeof import('resource://gre/modules/AsyncShutdown.sys.mjs');
@@ -478,9 +486,11 @@ export interface LazyModules {
   'resource://gre/modules/ClientID.sys.mjs': typeof import('resource://gre/modules/ClientID.sys.mjs');
   'resource://gre/modules/ClipboardContextMenu.sys.mjs': typeof import('resource://gre/modules/ClipboardContextMenu.sys.mjs');
   'resource://gre/modules/Color.sys.mjs': typeof import('resource://gre/modules/Color.sys.mjs');
+  'resource://gre/modules/ColorwayThemeMigration.sys.mjs': typeof import('resource://gre/modules/ColorwayThemeMigration.sys.mjs');
   'resource://gre/modules/CommonDialog.sys.mjs': typeof import('resource://gre/modules/CommonDialog.sys.mjs');
   'resource://gre/modules/ConduitsParent.sys.mjs': typeof import('resource://gre/modules/ConduitsParent.sys.mjs');
   'resource://gre/modules/Console.sys.mjs': typeof import('resource://gre/modules/Console.sys.mjs');
+  'resource://gre/modules/ContentAnalysisUtils.sys.mjs': typeof import('resource://gre/modules/ContentAnalysisUtils.sys.mjs');
   'resource://gre/modules/ContentBlockingAllowList.sys.mjs': typeof import('resource://gre/modules/ContentBlockingAllowList.sys.mjs');
   'resource://gre/modules/ContentDOMReference.sys.mjs': typeof import('resource://gre/modules/ContentDOMReference.sys.mjs');
   'resource://gre/modules/ContentPrefUtils.sys.mjs': typeof import('resource://gre/modules/ContentPrefUtils.sys.mjs');
@@ -497,6 +507,7 @@ export interface LazyModules {
   'resource://gre/modules/DeferredTask.sys.mjs': typeof import('resource://gre/modules/DeferredTask.sys.mjs');
   'resource://gre/modules/DownloadCore.sys.mjs': typeof import('resource://gre/modules/DownloadCore.sys.mjs');
   'resource://gre/modules/DownloadHistory.sys.mjs': typeof import('resource://gre/modules/DownloadHistory.sys.mjs');
+  'resource://gre/modules/DownloadIntegration.sys.mjs': typeof import('resource://gre/modules/DownloadIntegration.sys.mjs');
   'resource://gre/modules/DownloadLastDir.sys.mjs': typeof import('resource://gre/modules/DownloadLastDir.sys.mjs');
   'resource://gre/modules/DownloadList.sys.mjs': typeof import('resource://gre/modules/DownloadList.sys.mjs');
   'resource://gre/modules/DownloadPaths.sys.mjs': typeof import('resource://gre/modules/DownloadPaths.sys.mjs');
@@ -609,7 +620,6 @@ export interface LazyModules {
   'resource://gre/modules/LoginManagerChild.sys.mjs': typeof import('resource://gre/modules/LoginManagerChild.sys.mjs');
   'resource://gre/modules/LoginManagerContextMenu.sys.mjs': typeof import('resource://gre/modules/LoginManagerContextMenu.sys.mjs');
   'resource://gre/modules/LoginManagerParent.sys.mjs': typeof import('resource://gre/modules/LoginManagerParent.sys.mjs');
-  'resource://gre/modules/LoginManagerTelemetry.sys.mjs': typeof import('resource://gre/modules/LoginManagerTelemetry.sys.mjs');
   'resource://gre/modules/LoginRecipes.sys.mjs': typeof import('resource://gre/modules/LoginRecipes.sys.mjs');
   'resource://gre/modules/LoginStore.sys.mjs': typeof import('resource://gre/modules/LoginStore.sys.mjs');
   'resource://gre/modules/ManifestFinder.sys.mjs': typeof import('resource://gre/modules/ManifestFinder.sys.mjs');
@@ -619,7 +629,6 @@ export interface LazyModules {
   'resource://gre/modules/MediaUtils.sys.mjs': typeof import('resource://gre/modules/MediaUtils.sys.mjs');
   'resource://gre/modules/MessageManagerProxy.sys.mjs': typeof import('resource://gre/modules/MessageManagerProxy.sys.mjs');
   'resource://gre/modules/Messaging.sys.mjs': typeof import('resource://gre/modules/Messaging.sys.mjs');
-  'resource://gre/modules/ModulesPing.sys.mjs': typeof import('resource://gre/modules/ModulesPing.sys.mjs');
   'resource://gre/modules/NLP.sys.mjs': typeof import('resource://gre/modules/NLP.sys.mjs');
   'resource://gre/modules/NativeManifests.sys.mjs': typeof import('resource://gre/modules/NativeManifests.sys.mjs');
   'resource://gre/modules/NativeMessaging.sys.mjs': typeof import('resource://gre/modules/NativeMessaging.sys.mjs');
@@ -629,8 +638,6 @@ export interface LazyModules {
   'resource://gre/modules/OSKeyStore.sys.mjs': typeof import('resource://gre/modules/OSKeyStore.sys.mjs');
   'resource://gre/modules/ObjectUtils.sys.mjs': typeof import('resource://gre/modules/ObjectUtils.sys.mjs');
   'resource://gre/modules/ObliviousHTTP.sys.mjs': typeof import('resource://gre/modules/ObliviousHTTP.sys.mjs');
-  'resource://gre/modules/OpenSearchEngine.sys.mjs': typeof import('resource://gre/modules/OpenSearchEngine.sys.mjs');
-  'resource://gre/modules/OpenSearchLoader.sys.mjs': typeof import('resource://gre/modules/OpenSearchLoader.sys.mjs');
   'resource://gre/modules/OsEnvironment.sys.mjs': typeof import('resource://gre/modules/OsEnvironment.sys.mjs');
   'resource://gre/modules/PageThumbUtils.sys.mjs': typeof import('resource://gre/modules/PageThumbUtils.sys.mjs');
   'resource://gre/modules/PageThumbs.sys.mjs': typeof import('resource://gre/modules/PageThumbs.sys.mjs');
@@ -641,10 +648,11 @@ export interface LazyModules {
   'resource://gre/modules/PlacesDBUtils.sys.mjs': typeof import('resource://gre/modules/PlacesDBUtils.sys.mjs');
   'resource://gre/modules/PlacesPreviews.sys.mjs': typeof import('resource://gre/modules/PlacesPreviews.sys.mjs');
   'resource://gre/modules/PlacesQuery.sys.mjs': typeof import('resource://gre/modules/PlacesQuery.sys.mjs');
+  'resource://gre/modules/PlacesSemanticHistoryDatabase.sys.mjs': typeof import('resource://gre/modules/PlacesSemanticHistoryDatabase.sys.mjs');
+  'resource://gre/modules/PlacesSemanticHistoryManager.sys.mjs': typeof import('resource://gre/modules/PlacesSemanticHistoryManager.sys.mjs');
   'resource://gre/modules/PlacesSyncUtils.sys.mjs': typeof import('resource://gre/modules/PlacesSyncUtils.sys.mjs');
   'resource://gre/modules/PlacesTransactions.sys.mjs': typeof import('resource://gre/modules/PlacesTransactions.sys.mjs');
   'resource://gre/modules/PlacesUtils.sys.mjs': typeof import('resource://gre/modules/PlacesUtils.sys.mjs');
-  'resource://gre/modules/PolicySearchEngine.sys.mjs': typeof import('resource://gre/modules/PolicySearchEngine.sys.mjs');
   'resource://gre/modules/Preferences.sys.mjs': typeof import('resource://gre/modules/Preferences.sys.mjs');
   'resource://gre/modules/PrincipalsCollector.sys.mjs': typeof import('resource://gre/modules/PrincipalsCollector.sys.mjs');
   'resource://gre/modules/PrivateBrowsingUtils.sys.mjs': typeof import('resource://gre/modules/PrivateBrowsingUtils.sys.mjs');
@@ -658,30 +666,16 @@ export interface LazyModules {
   'resource://gre/modules/PushCrypto.sys.mjs': typeof import('resource://gre/modules/PushCrypto.sys.mjs');
   'resource://gre/modules/PushService.sys.mjs': typeof import('resource://gre/modules/PushService.sys.mjs');
   'resource://gre/modules/PushServiceWebSocket.sys.mjs': typeof import('resource://gre/modules/PushServiceWebSocket.sys.mjs');
-  'resource://gre/modules/RFPHelper.sys.mjs': typeof import('resource://gre/modules/RFPHelper.sys.mjs');
   'resource://gre/modules/Readerable.sys.mjs': typeof import('resource://gre/modules/Readerable.sys.mjs');
   'resource://gre/modules/Region.sys.mjs': typeof import('resource://gre/modules/Region.sys.mjs');
   'resource://gre/modules/RemotePageAccessManager.sys.mjs': typeof import('resource://gre/modules/RemotePageAccessManager.sys.mjs');
   'resource://gre/modules/RemoteSettingsCrashPull.sys.mjs': typeof import('resource://gre/modules/RemoteSettingsCrashPull.sys.mjs');
   'resource://gre/modules/RemoteWebNavigation.sys.mjs': typeof import('resource://gre/modules/RemoteWebNavigation.sys.mjs');
   'resource://gre/modules/ResetProfile.sys.mjs': typeof import('resource://gre/modules/ResetProfile.sys.mjs');
-  'resource://gre/modules/ResponsivenessMonitor.sys.mjs': typeof import('resource://gre/modules/ResponsivenessMonitor.sys.mjs');
-  'resource://gre/modules/RustRelevancy.sys.mjs': typeof import('resource://gre/modules/RustRelevancy.sys.mjs');
-  'resource://gre/modules/RustSearch.sys.mjs': typeof import('resource://gre/modules/RustSearch.sys.mjs');
-  'resource://gre/modules/RustSuggest.sys.mjs': typeof import('resource://gre/modules/RustSuggest.sys.mjs');
-  'resource://gre/modules/RustTabs.sys.mjs': typeof import('resource://gre/modules/RustTabs.sys.mjs');
-  'resource://gre/modules/RustWebextstorage.sys.mjs': typeof import('resource://gre/modules/RustWebextstorage.sys.mjs');
+  'resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs': typeof import('resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs');
   'resource://gre/modules/SafeBrowsing.sys.mjs': typeof import('resource://gre/modules/SafeBrowsing.sys.mjs');
-  'resource://gre/modules/SandboxUtils.sys.mjs': typeof import('resource://gre/modules/SandboxUtils.sys.mjs');
   'resource://gre/modules/Schemas.sys.mjs': typeof import('resource://gre/modules/Schemas.sys.mjs');
-  'resource://gre/modules/SearchEngine.sys.mjs': typeof import('resource://gre/modules/SearchEngine.sys.mjs');
-  'resource://gre/modules/SearchEngineSelector.sys.mjs': typeof import('resource://gre/modules/SearchEngineSelector.sys.mjs');
   'resource://gre/modules/SearchService.sys.mjs': typeof import('resource://gre/modules/SearchService.sys.mjs');
-  'resource://gre/modules/SearchSettings.sys.mjs': typeof import('resource://gre/modules/SearchSettings.sys.mjs');
-  'resource://gre/modules/SearchShortcuts.sys.mjs': typeof import('resource://gre/modules/SearchShortcuts.sys.mjs');
-  'resource://gre/modules/SearchStaticData.sys.mjs': typeof import('resource://gre/modules/SearchStaticData.sys.mjs');
-  'resource://gre/modules/SearchSuggestionController.sys.mjs': typeof import('resource://gre/modules/SearchSuggestionController.sys.mjs');
-  'resource://gre/modules/SearchUtils.sys.mjs': typeof import('resource://gre/modules/SearchUtils.sys.mjs');
   'resource://gre/modules/SecurityInfo.sys.mjs': typeof import('resource://gre/modules/SecurityInfo.sys.mjs');
   'resource://gre/modules/SelectionUtils.sys.mjs': typeof import('resource://gre/modules/SelectionUtils.sys.mjs');
   'resource://gre/modules/ServiceRequest.sys.mjs': typeof import('resource://gre/modules/ServiceRequest.sys.mjs');
@@ -713,7 +707,6 @@ export interface LazyModules {
   'resource://gre/modules/UpdateService.sys.mjs': typeof import('resource://gre/modules/UpdateService.sys.mjs');
   'resource://gre/modules/UpdateUtils.sys.mjs': typeof import('resource://gre/modules/UpdateUtils.sys.mjs');
   'resource://gre/modules/UsageReporting.sys.mjs': typeof import('resource://gre/modules/UsageReporting.sys.mjs');
-  'resource://gre/modules/UserSearchEngine.sys.mjs': typeof import('resource://gre/modules/UserSearchEngine.sys.mjs');
   'resource://gre/modules/WebAuthnFeature.sys.mjs': typeof import('resource://gre/modules/WebAuthnFeature.sys.mjs');
   'resource://gre/modules/WebChannel.sys.mjs': typeof import('resource://gre/modules/WebChannel.sys.mjs');
   'resource://gre/modules/WebNavigation.sys.mjs': typeof import('resource://gre/modules/WebNavigation.sys.mjs');
@@ -728,6 +721,7 @@ export interface LazyModules {
   'resource://gre/modules/addons/XPIDatabase.sys.mjs': typeof import('resource://gre/modules/addons/XPIDatabase.sys.mjs');
   'resource://gre/modules/addons/XPIInstall.sys.mjs': typeof import('resource://gre/modules/addons/XPIInstall.sys.mjs');
   'resource://gre/modules/addons/XPIProvider.sys.mjs': typeof import('resource://gre/modules/addons/XPIProvider.sys.mjs');
+  'resource://gre/modules/addons/crypto-utils.sys.mjs': typeof import('resource://gre/modules/addons/crypto-utils.sys.mjs');
   'resource://gre/modules/addons/siteperms-addon-utils.sys.mjs': typeof import('resource://gre/modules/addons/siteperms-addon-utils.sys.mjs');
   'resource://gre/modules/components-utils/ClientEnvironment.sys.mjs': typeof import('resource://gre/modules/components-utils/ClientEnvironment.sys.mjs');
   'resource://gre/modules/components-utils/FilterExpressions.sys.mjs': typeof import('resource://gre/modules/components-utils/FilterExpressions.sys.mjs');
@@ -782,6 +776,7 @@ export interface LazyModules {
   'resource://messaging-system/targeting/Targeting.sys.mjs': typeof import('resource://messaging-system/targeting/Targeting.sys.mjs');
   'resource://mozscreenshots/Screenshot.sys.mjs': typeof import('resource://mozscreenshots/Screenshot.sys.mjs');
   'resource://newtab/common/Actions.mjs': typeof import('resource://newtab/common/Actions.mjs');
+  'resource://newtab/common/Reducers.sys.mjs': typeof import('resource://newtab/common/Reducers.sys.mjs');
   'resource://newtab/lib/AboutPreferences.sys.mjs': typeof import('resource://newtab/lib/AboutPreferences.sys.mjs');
   'resource://newtab/lib/ActivityStream.sys.mjs': typeof import('resource://newtab/lib/ActivityStream.sys.mjs');
   'resource://newtab/lib/ActivityStreamMessageChannel.sys.mjs': typeof import('resource://newtab/lib/ActivityStreamMessageChannel.sys.mjs');
@@ -792,7 +787,12 @@ export interface LazyModules {
   'resource://newtab/lib/DownloadsManager.sys.mjs': typeof import('resource://newtab/lib/DownloadsManager.sys.mjs');
   'resource://newtab/lib/FaviconFeed.sys.mjs': typeof import('resource://newtab/lib/FaviconFeed.sys.mjs');
   'resource://newtab/lib/HighlightsFeed.sys.mjs': typeof import('resource://newtab/lib/HighlightsFeed.sys.mjs');
+  'resource://newtab/lib/InferredModel/FeatureModel.sys.mjs': typeof import('resource://newtab/lib/InferredModel/FeatureModel.sys.mjs');
+  'resource://newtab/lib/InferredPersonalizationFeed.sys.mjs': typeof import('resource://newtab/lib/InferredPersonalizationFeed.sys.mjs');
+  'resource://newtab/lib/NewTabContentPing.sys.mjs': typeof import('resource://newtab/lib/NewTabContentPing.sys.mjs');
+  'resource://newtab/lib/NewTabGleanUtils.sys.mjs': typeof import('resource://newtab/lib/NewTabGleanUtils.sys.mjs');
   'resource://newtab/lib/NewTabInit.sys.mjs': typeof import('resource://newtab/lib/NewTabInit.sys.mjs');
+  'resource://newtab/lib/NewTabMessaging.sys.mjs': typeof import('resource://newtab/lib/NewTabMessaging.sys.mjs');
   'resource://newtab/lib/PersistentCache.sys.mjs': typeof import('resource://newtab/lib/PersistentCache.sys.mjs');
   'resource://newtab/lib/PersonalityProvider/PersonalityProvider.sys.mjs': typeof import('resource://newtab/lib/PersonalityProvider/PersonalityProvider.sys.mjs');
   'resource://newtab/lib/PlacesFeed.sys.mjs': typeof import('resource://newtab/lib/PlacesFeed.sys.mjs');
@@ -800,22 +800,29 @@ export interface LazyModules {
   'resource://newtab/lib/RecommendationProvider.sys.mjs': typeof import('resource://newtab/lib/RecommendationProvider.sys.mjs');
   'resource://newtab/lib/Screenshots.sys.mjs': typeof import('resource://newtab/lib/Screenshots.sys.mjs');
   'resource://newtab/lib/SectionsManager.sys.mjs': typeof import('resource://newtab/lib/SectionsManager.sys.mjs');
+  'resource://newtab/lib/SmartShortcutsFeed.sys.mjs': typeof import('resource://newtab/lib/SmartShortcutsFeed.sys.mjs');
+  'resource://newtab/lib/StartupCacheInit.sys.mjs': typeof import('resource://newtab/lib/StartupCacheInit.sys.mjs');
   'resource://newtab/lib/Store.sys.mjs': typeof import('resource://newtab/lib/Store.sys.mjs');
   'resource://newtab/lib/SystemTickFeed.sys.mjs': typeof import('resource://newtab/lib/SystemTickFeed.sys.mjs');
   'resource://newtab/lib/TelemetryFeed.sys.mjs': typeof import('resource://newtab/lib/TelemetryFeed.sys.mjs');
   'resource://newtab/lib/TopSitesFeed.sys.mjs': typeof import('resource://newtab/lib/TopSitesFeed.sys.mjs');
   'resource://newtab/lib/TopStoriesFeed.sys.mjs': typeof import('resource://newtab/lib/TopStoriesFeed.sys.mjs');
+  'resource://newtab/lib/TrendingSearchFeed.sys.mjs': typeof import('resource://newtab/lib/TrendingSearchFeed.sys.mjs');
   'resource://newtab/lib/UTEventReporting.sys.mjs': typeof import('resource://newtab/lib/UTEventReporting.sys.mjs');
   'resource://newtab/lib/WallpaperFeed.sys.mjs': typeof import('resource://newtab/lib/WallpaperFeed.sys.mjs');
   'resource://newtab/lib/WeatherFeed.sys.mjs': typeof import('resource://newtab/lib/WeatherFeed.sys.mjs');
+  'resource://newtab/lib/Widgets/ListsFeed.sys.mjs': typeof import('resource://newtab/lib/Widgets/ListsFeed.sys.mjs');
+  'resource://newtab/lib/Widgets/TimerFeed.sys.mjs': typeof import('resource://newtab/lib/Widgets/TimerFeed.sys.mjs');
   'resource://nimbus/ExperimentAPI.sys.mjs': typeof import('resource://nimbus/ExperimentAPI.sys.mjs');
   'resource://nimbus/FeatureManifest.sys.mjs': typeof import('resource://nimbus/FeatureManifest.sys.mjs');
   'resource://nimbus/FirefoxLabs.sys.mjs': typeof import('resource://nimbus/FirefoxLabs.sys.mjs');
+  'resource://nimbus/lib/Enrollments.sys.mjs': typeof import('resource://nimbus/lib/Enrollments.sys.mjs');
   'resource://nimbus/lib/ExperimentManager.sys.mjs': typeof import('resource://nimbus/lib/ExperimentManager.sys.mjs');
   'resource://nimbus/lib/ExperimentStore.sys.mjs': typeof import('resource://nimbus/lib/ExperimentStore.sys.mjs');
   'resource://nimbus/lib/Migrations.sys.mjs': typeof import('resource://nimbus/lib/Migrations.sys.mjs');
   'resource://nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs': typeof import('resource://nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs');
   'resource://nimbus/lib/TargetingContextRecorder.sys.mjs': typeof import('resource://nimbus/lib/TargetingContextRecorder.sys.mjs');
+  'resource://nimbus/lib/Telemetry.sys.mjs': typeof import('resource://nimbus/lib/Telemetry.sys.mjs');
   'resource://normandy-content/AboutPages.sys.mjs': typeof import('resource://normandy-content/AboutPages.sys.mjs');
   'resource://normandy/Normandy.sys.mjs': typeof import('resource://normandy/Normandy.sys.mjs');
   'resource://normandy/NormandyMigrations.sys.mjs': typeof import('resource://normandy/NormandyMigrations.sys.mjs');
@@ -824,7 +831,6 @@ export interface LazyModules {
   'resource://normandy/actions/BaseAction.sys.mjs': typeof import('resource://normandy/actions/BaseAction.sys.mjs');
   'resource://normandy/actions/BranchedAddonStudyAction.sys.mjs': typeof import('resource://normandy/actions/BranchedAddonStudyAction.sys.mjs');
   'resource://normandy/actions/ConsoleLogAction.sys.mjs': typeof import('resource://normandy/actions/ConsoleLogAction.sys.mjs');
-  'resource://normandy/actions/MessagingExperimentAction.sys.mjs': typeof import('resource://normandy/actions/MessagingExperimentAction.sys.mjs');
   'resource://normandy/actions/PreferenceExperimentAction.sys.mjs': typeof import('resource://normandy/actions/PreferenceExperimentAction.sys.mjs');
   'resource://normandy/actions/PreferenceRollbackAction.sys.mjs': typeof import('resource://normandy/actions/PreferenceRollbackAction.sys.mjs');
   'resource://normandy/actions/PreferenceRolloutAction.sys.mjs': typeof import('resource://normandy/actions/PreferenceRolloutAction.sys.mjs');
@@ -895,6 +901,7 @@ export interface LazyModules {
   'resource://test/esm_lazy-2.sys.mjs': typeof import('resource://test/esm_lazy-2.sys.mjs');
   'resource://test/esmified-1.sys.mjs': typeof import('resource://test/esmified-1.sys.mjs');
   'resource://testing-common/AddonTestUtils.sys.mjs': typeof import('resource://testing-common/AddonTestUtils.sys.mjs');
+  'resource://testing-common/AppData.sys.mjs': typeof import('resource://testing-common/AppData.sys.mjs');
   'resource://testing-common/AppInfo.sys.mjs': typeof import('resource://testing-common/AppInfo.sys.mjs');
   'resource://testing-common/AppUiTestDelegate.sys.mjs': typeof import('resource://testing-common/AppUiTestDelegate.sys.mjs');
   'resource://testing-common/Assert.sys.mjs': typeof import('resource://testing-common/Assert.sys.mjs');
@@ -925,15 +932,20 @@ export interface LazyModules {
   'resource://testing-common/PlacesTestUtils.sys.mjs': typeof import('resource://testing-common/PlacesTestUtils.sys.mjs');
   'resource://testing-common/PromiseTestUtils.sys.mjs': typeof import('resource://testing-common/PromiseTestUtils.sys.mjs');
   'resource://testing-common/PromptTestUtils.sys.mjs': typeof import('resource://testing-common/PromptTestUtils.sys.mjs');
+  'resource://testing-common/QuickSuggestTestUtils.sys.mjs': typeof import('resource://testing-common/QuickSuggestTestUtils.sys.mjs');
   'resource://testing-common/RegionTestUtils.sys.mjs': typeof import('resource://testing-common/RegionTestUtils.sys.mjs');
   'resource://testing-common/RemoteSettingsServer.sys.mjs': typeof import('resource://testing-common/RemoteSettingsServer.sys.mjs');
   'resource://testing-common/SearchTestUtils.sys.mjs': typeof import('resource://testing-common/SearchTestUtils.sys.mjs');
+  'resource://testing-common/SearchUITestUtils.sys.mjs': typeof import('resource://testing-common/SearchUITestUtils.sys.mjs');
   'resource://testing-common/Sinon.sys.mjs': typeof import('resource://testing-common/Sinon.sys.mjs');
   'resource://testing-common/SiteDataTestUtils.sys.mjs': typeof import('resource://testing-common/SiteDataTestUtils.sys.mjs');
   'resource://testing-common/SpecialPowersParent.sys.mjs': typeof import('resource://testing-common/SpecialPowersParent.sys.mjs');
+  'resource://testing-common/SpecialPowersProcessActor.sys.mjs': typeof import('resource://testing-common/SpecialPowersProcessActor.sys.mjs');
   'resource://testing-common/SpecialPowersSandbox.sys.mjs': typeof import('resource://testing-common/SpecialPowersSandbox.sys.mjs');
+  'resource://testing-common/TabGroupTestUtils.sys.mjs': typeof import('resource://testing-common/TabGroupTestUtils.sys.mjs');
   'resource://testing-common/TelemetryArchiveTesting.sys.mjs': typeof import('resource://testing-common/TelemetryArchiveTesting.sys.mjs');
   'resource://testing-common/TelemetryTestUtils.sys.mjs': typeof import('resource://testing-common/TelemetryTestUtils.sys.mjs');
+  'resource://testing-common/TestIntegration.sys.mjs': typeof import('resource://testing-common/TestIntegration.sys.mjs');
   'resource://testing-common/TestUtils.sys.mjs': typeof import('resource://testing-common/TestUtils.sys.mjs');
   'resource://testing-common/UrlbarTestUtils.sys.mjs': typeof import('resource://testing-common/UrlbarTestUtils.sys.mjs');
   'resource://testing-common/WrapPrivileged.sys.mjs': typeof import('resource://testing-common/WrapPrivileged.sys.mjs');
diff --git a/src/zen/@types/lib.gecko.nsresult.d.ts b/src/zen/@types/lib.gecko.nsresult.d.ts
index a8341af62..7c810658d 100644
--- a/src/zen/@types/lib.gecko.nsresult.d.ts
+++ b/src/zen/@types/lib.gecko.nsresult.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from xpc.msg and error_list.json.
@@ -374,6 +371,9 @@ interface nsIXPCComponents_Results {
   /** User attempted basic HTTP authentication when it is disabled */
   NS_ERROR_BASIC_HTTP_AUTH_DISABLED: 0x804b005c;
 
+  /** The access to local network is denied */
+  NS_ERROR_LOCAL_NETWORK_ACCESS_DENIED: 0x804b005d;
+
   // Error codes return from the proxy
 
   /** The connection to the proxy server was refused */
@@ -508,6 +508,12 @@ interface nsIXPCComponents_Results {
   /** Can't access a wrapped JS object from a different thread */
   NS_ERROR_NOT_SAME_THREAD: 0x80460004;
 
+  /** Access to restricted URI denied */
+  NS_ERROR_DOM_BAD_URI: 0x805303f4;
+
+  /** Opening the Websocket failed */
+  NS_ERROR_WEBSOCKET_CONNECTION_REFUSED: 0x804b0057;
+
   // storage related codes (from mozStorage.h)
 
   /** SQLite database connection is busy */
@@ -675,6 +681,11 @@ interface nsIXPCComponents_Results {
 
   /** The existing UserChoice Hash was verified, but we're on an older, unsupported Windows build, so do not attempt to update the UserChoice hash. */
   NS_ERROR_WDBA_BUILD: 0x80720004;
+
+  // Codes related to QuotaManager
+
+  /** Client initialization attempted before origin has been initialized. */
+  NS_ERROR_DOM_QM_CLIENT_INIT_ORIGIN_UNINITIALIZED: 0x80730001;
 }
 
 type nsIXPCComponents_Values = nsIXPCComponents_Results[keyof nsIXPCComponents_Results];
diff --git a/src/zen/@types/lib.gecko.services.d.ts b/src/zen/@types/lib.gecko.services.d.ts
index 8fd3907d1..149327c68 100644
--- a/src/zen/@types/lib.gecko.services.d.ts
+++ b/src/zen/@types/lib.gecko.services.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from services.json.
@@ -62,4 +59,5 @@ interface JSServices {
   wm: nsIWindowMediator;
   ww: nsIWindowWatcher;
   xulStore: nsIXULStore;
+  zen: nsIZenCommonUtils;
 }
diff --git a/src/zen/@types/lib.gecko.tweaks.d.ts b/src/zen/@types/lib.gecko.tweaks.d.ts
index 0518558ab..d2474244d 100644
--- a/src/zen/@types/lib.gecko.tweaks.d.ts
+++ b/src/zen/@types/lib.gecko.tweaks.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * Gecko generic/specialized adjustments for xpcom and webidl types.
  */
@@ -15,6 +12,15 @@ interface CanonicalBrowsingContext extends LoadContextMixin {
   topWindowContext: WindowGlobalParent;
 }
 
+declare namespace ChromeUtils {
+  type Modules = import('./generated/lib.gecko.modules').Modules;
+
+  function importESModule<T extends keyof Modules>(
+    aResourceURI: T,
+    aOptions?: ImportESModuleOptionsDictionary
+  ): Modules[T];
+}
+
 interface ChromeWindow extends Window {
   isChromeWindow: true;
 }
@@ -114,9 +120,14 @@ interface nsXPCComponents_Utils {
 
 type Sandbox = typeof globalThis & nsISupports;
 
+interface WindowGlobalParent extends WindowContext {
+  readonly browsingContext: CanonicalBrowsingContext;
+}
+
 // Hand-crafted artisanal types.
 interface XULBrowserElement extends XULFrameElement, FrameLoader {
   currentURI: nsIURI;
+  documentURI: nsIURI | null;
   docShellIsActive: boolean;
   isRemoteBrowser: boolean;
   remoteType: string;
@@ -126,3 +137,27 @@ interface XULBrowserElement extends XULFrameElement, FrameLoader {
 interface Localization {
   formatValuesSync(aKeys: L10nKey[]): (string | null)[];
 }
+
+/**
+ * Redefine the DOMStringMap interface to match its implementation.
+ * xref Bug 1965336.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DOMStringMap)
+ */
+interface DOMStringMap {
+  [name: string]: string | undefined;
+}
+
+/**
+ * Define base64/hex methods for Uint8Array
+ * https://github.com/microsoft/TypeScript/issues/61695
+ */
+interface Uint8Array<TArrayBuffer extends ArrayBufferLike> {
+  setFromBase64(
+    string: string,
+    options?: { alphabet?: string; lastChunkHandling: string }
+  ): { read: number; written: number };
+  setFromHex(string: string): { read: number; written: number };
+  toBase64(options?: { alphabet?: string; omitPadding: boolean }): string;
+  toHex(): string;
+}
diff --git a/src/zen/@types/lib.gecko.win32.d.ts b/src/zen/@types/lib.gecko.win32.d.ts
index b1ace85a8..a9f74a6a9 100644
--- a/src/zen/@types/lib.gecko.win32.d.ts
+++ b/src/zen/@types/lib.gecko.win32.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -159,6 +156,7 @@ declare global {
     canSetDefaultBrowserUserChoice(): boolean;
     checkAllProgIDsExist(): boolean;
     checkBrowserUserChoiceHashes(): boolean;
+    checkCurrentProcessAUMIDForTesting(): string;
     isDefaultHandlerFor(aFileExtensionOrProtocol: string): boolean;
     queryCurrentDefaultHandlerFor(aFileExtensionOrProtocol: string): string;
   }
@@ -307,7 +305,7 @@ declare global {
     setWindowIconNoData(aWindow: mozIDOMWindowProxy): void;
     readonly inWin10TabletMode: boolean;
     readonly inWin11TabletMode: boolean;
-    shareUrl(shareTitle: string, urlToShare: string): void;
+    shareUrl(urlToShare: string, shareTitle: string): void;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/system/windowsPackageManager/nsIWindowsPackageManager.idl
diff --git a/src/zen/@types/lib.gecko.xpcom.d.ts b/src/zen/@types/lib.gecko.xpcom.d.ts
index 0fc32d58f..723b6ea97 100644
--- a/src/zen/@types/lib.gecko.xpcom.d.ts
+++ b/src/zen/@types/lib.gecko.xpcom.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -361,7 +358,8 @@ declare global {
     readonly EVENT_LIVE_REGION_REMOVED?: 39;
     readonly EVENT_INNER_REORDER?: 40;
     readonly EVENT_LIVE_REGION_CHANGED?: 41;
-    readonly EVENT_LAST_ENTRY?: 42;
+    readonly EVENT_ERRORMESSAGE_CHANGED?: 42;
+    readonly EVENT_LAST_ENTRY?: 43;
 
     readonly eventType: u32;
     readonly accessible: nsIAccessible;
@@ -980,6 +978,7 @@ declare global {
     actions: nsIAlertAction[];
     readonly actionable: boolean;
     readonly source: string;
+    readonly origin: string;
     opaqueRelaunchData: string;
     loadImage(
       aTimeout: u32,
@@ -1007,6 +1006,7 @@ declare global {
       aRequireInteraction?: boolean
     ): void;
     closeAlert(aName?: string, aContextClosed?: boolean): void;
+    getHistory(): string[];
     teardown(): void;
     pbmTeardown(): void;
   }
@@ -1069,6 +1069,7 @@ declare global {
     getMostRecentWindow(aWindowType: string): mozIDOMWindowProxy;
     getMostRecentBrowserWindow(): mozIDOMWindowProxy;
     getMostRecentNonPBWindow(aWindowType: string): mozIDOMWindowProxy;
+    getMostRecentWindowBy(aWindowType: string, aFilter: u8): mozIDOMWindowProxy;
     getOuterWindowWithId(aOuterWindowID: u64): mozIDOMWindowProxy;
     getCurrentInnerWindowWithId(aInnerWindowID: u64): mozIDOMWindow;
     addListener(aListener: nsIWindowMediatorListener): void;
@@ -1137,6 +1138,7 @@ declare global {
     advanceShutdownPhase(aPhase: nsIAppStartup.IDLShutdownPhase): void;
     isInOrBeyondShutdownPhase(aPhase: nsIAppStartup.IDLShutdownPhase): boolean;
     readonly shuttingDown: boolean;
+    readonly attemptingQuit: boolean;
     readonly startingUp: boolean;
     readonly restarting: boolean;
     readonly wasRestarted: boolean;
@@ -1518,6 +1520,7 @@ declare global {
     activateDomainPolicy(): nsIDomainPolicy;
     readonly domainPolicyActive: boolean;
     policyAllowsScript(aDomain: nsIURI): boolean;
+    readonly firstUnexpectedJavaScriptLoad: string;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/captivedetect/nsICaptivePortalDetector.idl
@@ -1875,7 +1878,7 @@ declare global {
     createAboutBlankDocumentViewer(
       aPrincipal: nsIPrincipal,
       aPartitionedPrincipal: nsIPrincipal,
-      aCSP?: nsIContentSecurityPolicy
+      aPolicyContainer?: nsIPolicyContainer
     ): void;
     readonly charset: string;
     forceEncodingDetection(): void;
@@ -2232,7 +2235,6 @@ declare enum nsIContentPolicy_nsContentPolicyType {
   TYPE_SUBDOCUMENT = 7,
   TYPE_PING = 10,
   TYPE_XMLHTTPREQUEST = 11,
-  TYPE_OBJECT_SUBREQUEST = 12,
   TYPE_DTD = 13,
   TYPE_FONT = 14,
   TYPE_MEDIA = 15,
@@ -2320,7 +2322,7 @@ declare global {
     validateURIsForDrop(aEvent: DragEvent, aURIs: string[], aDisallowInherit?: boolean): void;
     queryLinks(aDataTransfer: DataTransfer): nsIDroppedLinkItem[];
     getTriggeringPrincipal(aEvent: DragEvent): nsIPrincipal;
-    getCsp(aEvent: DragEvent): nsIContentSecurityPolicy;
+    getPolicyContainer(aEvent: DragEvent): nsIPolicyContainer;
   }
 
   // https://searchfox.org/mozilla-central/source/dom/base/nsIEventSourceEventService.idl
@@ -2626,7 +2628,7 @@ declare global {
     readonly permanentKey: any;
     readonly contentPrincipal: nsIPrincipal;
     readonly contentPartitionedPrincipal: nsIPrincipal;
-    readonly csp: nsIContentSecurityPolicy;
+    readonly policyContainer: nsIPolicyContainer;
     readonly referrerInfo: nsIReferrerInfo;
     isNavigating: boolean;
     mayEnableCharacterEncodingMenu: boolean;
@@ -2644,7 +2646,7 @@ declare global {
       aTitle: string,
       aContentPrincipal: nsIPrincipal,
       aContentPartitionedPrincipal: nsIPrincipal,
-      aCSP: nsIContentSecurityPolicy,
+      aPolicyContainer: nsIPolicyContainer,
       aReferrerInfo: nsIReferrerInfo,
       aIsSynthetic: boolean,
       aHasRequestContextID: boolean,
@@ -2674,7 +2676,7 @@ declare global {
     referrerInfo: nsIReferrerInfo;
     readonly isPrivate: boolean;
     triggeringPrincipal: nsIPrincipal;
-    csp: nsIContentSecurityPolicy;
+    policyContainer: nsIPolicyContainer;
     readonly openerBrowser: Element;
     readonly openerOriginAttributes: any;
   }
@@ -2698,7 +2700,7 @@ declare global {
       aWhere: i16,
       aFlags: i32,
       aTriggeringPrincipal: nsIPrincipal,
-      aCsp?: nsIContentSecurityPolicy
+      aPolicyContainer?: nsIPolicyContainer
     ): BrowsingContext;
     createContentWindowInFrame(
       aURI: nsIURI,
@@ -2713,7 +2715,7 @@ declare global {
       aWhere: i16,
       aFlags: i32,
       aTriggeringPrincipal: nsIPrincipal,
-      aCsp?: nsIContentSecurityPolicy
+      aPolicyContainer?: nsIPolicyContainer
     ): BrowsingContext;
     openURIInFrame(
       aURI: nsIURI,
@@ -2863,7 +2865,24 @@ declare global {
 
   // https://searchfox.org/mozilla-central/source/dom/interfaces/base/nsIDOMWindowUtils.idl
 
-  interface nsIDOMWindowUtils extends nsISupports {
+  type nsISynthesizedEventCallback = Callable<{
+    onCompleteDispatch(): void;
+  }>;
+} // global
+
+declare enum nsIDOMWindowUtils_AsyncEnabledOption {
+  ASYNC_DISABLED = 0,
+  ASYNC_ENABLED = 1,
+}
+
+declare global {
+  namespace nsIDOMWindowUtils {
+    type AsyncEnabledOption = nsIDOMWindowUtils_AsyncEnabledOption;
+  }
+
+  interface nsIDOMWindowUtils
+    extends nsISupports,
+      Enums<typeof nsIDOMWindowUtils_AsyncEnabledOption> {
     readonly MODIFIER_ALT?: 1;
     readonly MODIFIER_CONTROL?: 2;
     readonly MODIFIER_SHIFT?: 4;
@@ -2879,6 +2898,7 @@ declare global {
     readonly WHEEL_EVENT_CAUSED_BY_NO_LINE_OR_PAGE_DELTA_DEVICE?: 1;
     readonly WHEEL_EVENT_CAUSED_BY_MOMENTUM?: 2;
     readonly WHEEL_EVENT_CUSTOMIZED_BY_USER_PREFS?: 4;
+    readonly WHEEL_EVENT_ASYNC_ENABLED?: 8;
     readonly WHEEL_EVENT_EXPECTED_OVERFLOW_DELTA_X_ZERO?: 16;
     readonly WHEEL_EVENT_EXPECTED_OVERFLOW_DELTA_X_POSITIVE?: 32;
     readonly WHEEL_EVENT_EXPECTED_OVERFLOW_DELTA_X_NEGATIVE?: 64;
@@ -3066,7 +3086,7 @@ declare global {
       aTiltYs: i32[],
       aTwists: i32[],
       aModifiers: i32,
-      aIgnoreRootScrollFrame?: boolean
+      aAsyncEnabled?: nsIDOMWindowUtils.AsyncEnabledOption
     ): boolean;
     sendTouchEventAsPen(
       aType: string,
@@ -3081,7 +3101,7 @@ declare global {
       aTiltY: i32,
       aTwist: i32,
       aModifier: i32,
-      aIgnoreRootScrollFrame?: boolean
+      aAsyncEnabled?: nsIDOMWindowUtils.AsyncEnabledOption
     ): boolean;
     sendMouseEventToWindow(
       aType: string,
@@ -3110,8 +3130,7 @@ declare global {
       aTiltXs: i32[],
       aTiltYs: i32[],
       aTwists: i32[],
-      aModifiers: i32,
-      aIgnoreRootScrollFrame?: boolean
+      aModifiers: i32
     ): boolean;
     sendWheelEvent(
       aX: float,
@@ -3123,7 +3142,8 @@ declare global {
       aModifiers: i32,
       aLineOrPageDeltaX: i32,
       aLineOrPageDeltaY: i32,
-      aOptions: u32
+      aOptions: u32,
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     sendNativeKeyEvent(
       aNativeKeyboardLayout: i32,
@@ -3131,7 +3151,7 @@ declare global {
       aModifierFlags: u32,
       aCharacters: string,
       aUnmodifiedCharacters: string,
-      aObserver?: nsIObserver
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     sendNativeMouseEvent(
       aScreenX: i32,
@@ -3140,7 +3160,7 @@ declare global {
       aButton: i16,
       aModifierFlags: u32,
       aElementOnWidget: Element,
-      aObserver?: nsIObserver
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     suppressAnimation(aSuppress: boolean): void;
     sendNativeMouseScrollEvent(
@@ -3153,7 +3173,7 @@ declare global {
       aModifierFlags: u32,
       aAdditionalFlags: u32,
       aElement: Element,
-      aObserver?: nsIObserver
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     sendNativeTouchPoint(
       aPointerId: u32,
@@ -3162,7 +3182,7 @@ declare global {
       aScreenY: i32,
       aPressure: double,
       aOrientation: u32,
-      aObserver?: nsIObserver,
+      aCallback?: nsISynthesizedEventCallback,
       aElement?: Element
     ): void;
     sendNativeTouchpadPinch(
@@ -3176,7 +3196,7 @@ declare global {
       aScreenX: i32,
       aScreenY: i32,
       aLongTap: boolean,
-      aObserver?: nsIObserver
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     sendNativePenInput(
       aPointerId: u32,
@@ -3188,10 +3208,9 @@ declare global {
       aTiltX: i32,
       aTiltY: i32,
       aButton: i32,
-      aObserver?: nsIObserver,
+      aCallback?: nsISynthesizedEventCallback,
       aElement?: Element
     ): void;
-    clearNativeTouchSequence(aObserver?: nsIObserver): void;
     sendNativeTouchpadDoubleTap(aScreenX: i32, aScreenY: i32, aModifierFlags: i32): void;
     sendNativeTouchpadPan(
       aEventPhase: u32,
@@ -3200,7 +3219,7 @@ declare global {
       aDeltaX: double,
       aDeltaY: double,
       aModifierFlags: i32,
-      aObserver?: nsIObserver
+      aCallback?: nsISynthesizedEventCallback
     ): void;
     readonly parsedStyleSheets: u32;
     activateNativeMenuItemAt(indexString: string): void;
@@ -3441,6 +3460,7 @@ declare global {
     readonly orientationLock: u32;
     getWheelScrollTarget(): Element;
     readonly dragSession: nsIDragSession;
+    microTaskLevel: u32;
   }
 
   interface nsITranslationNodeList extends nsISupports {
@@ -3884,12 +3904,6 @@ declare global {
   // https://searchfox.org/mozilla-central/source/toolkit/components/credentialmanagement/nsICredentialChooserService.idl
 
   interface nsICredentialChooserService extends nsISupports {
-    showCredentialChooser(
-      browsingContext: BrowsingContext,
-      credentials: any[],
-      callback: nsICredentialChosenCallback
-    ): void;
-    cancelCredentialChooser(browsingContext: BrowsingContext): void;
     fetchImageToDataURI(window: mozIDOMWindow, uri: nsIURI): Promise<any>;
     fetchWellKnown(uri: nsIURI, triggeringPrincipal: nsIPrincipal): Promise<any>;
     fetchConfig(uri: nsIURI, triggeringPrincipal: nsIPrincipal): Promise<any>;
@@ -3912,12 +3926,6 @@ declare global {
       identityProviders: any,
       identityManifests: any
     ): Promise<any>;
-    showPolicyPrompt(
-      browsingContext: BrowsingContext,
-      identityProvider: any,
-      identityManifest: any,
-      identityClientMetadata: any
-    ): Promise<any>;
     showAccountListPrompt(
       browsingContext: BrowsingContext,
       accountList: any,
@@ -4089,6 +4097,7 @@ declare global {
     readonly silent: boolean;
     readonly dataSerialized: string;
     readonly actions: nsINotificationActionStorageEntry[];
+    readonly serviceWorkerRegistrationScope: string;
   }
 
   type nsINotificationStorageCallback = Callable<{
@@ -4103,7 +4112,20 @@ declare global {
       tag: string,
       aCallback: nsINotificationStorageCallback
     ): void;
+    getById(origin: string, id: string): Promise<any>;
     delete(origin: string, id: string): void;
+    deleteAllExcept(ids: string[]): void;
+  }
+
+  // https://searchfox.org/mozilla-central/source/dom/notification/nsINotificationHandler.idl
+
+  interface nsINotificationHandler extends nsISupports {
+    respondOnClick(
+      aPrincipal: nsIPrincipal,
+      aNotificationId: string,
+      aActionName: string,
+      aAutoClosed: boolean
+    ): Promise<any>;
   }
 
   // https://searchfox.org/mozilla-central/source/dom/interfaces/payments/nsIPaymentActionResponse.idl
@@ -4511,7 +4533,8 @@ declare global {
     initializeTemporaryClient(
       aPersistenceType: string,
       aPrincipal: nsIPrincipal,
-      aClientType: string
+      aClientType: string,
+      aCreateIfNonExistent?: boolean
     ): nsIQuotaRequest;
     getFullOriginMetadata(aPersistenceType: string, aPrincipal: nsIPrincipal): nsIQuotaRequest;
     getUsage(aCallback: nsIQuotaUsageCallback, aGetAll?: boolean): nsIQuotaUsageRequest;
@@ -4579,9 +4602,15 @@ declare global {
     readonly group: string;
     readonly origin: string;
     readonly storageOrigin: string;
+    readonly private: boolean;
     readonly persistenceType: string;
-    readonly persisted: boolean;
     readonly lastAccessTime: i64;
+    readonly lastMaintenanceDate: i32;
+    readonly accessed: boolean;
+    readonly persisted: boolean;
+    readonly clientUsages: string;
+    readonly originUsage: u64;
+    readonly quotaVersion: u32;
   }
 
   interface nsIQuotaUsageResult extends nsISupports {
@@ -4739,6 +4768,17 @@ declare global {
     onCSPViolationEvent(aJSON: string): void;
   }>;
 
+  // https://searchfox.org/mozilla-central/source/dom/interfaces/security/nsIIntegrityPolicy.idl
+
+  interface nsIIntegrityPolicy extends nsISerializable {}
+
+  // https://searchfox.org/mozilla-central/source/dom/interfaces/security/nsIPolicyContainer.idl
+
+  interface nsIPolicyContainer extends nsISerializable {
+    readonly csp: nsIContentSecurityPolicy;
+    initFromCSP(aCSP: nsIContentSecurityPolicy): void;
+  }
+
   // https://searchfox.org/mozilla-central/source/dom/interfaces/security/nsIReferrerInfo.idl
 } // global
 
@@ -4991,10 +5031,10 @@ declare global {
       hasUserVerification: boolean,
       isUserConsenting: boolean,
       isUserVerified: boolean
-    ): u64;
-    removeVirtualAuthenticator(authenticatorId: u64): void;
+    ): string;
+    removeVirtualAuthenticator(authenticatorId: string): void;
     addCredential(
-      authenticatorId: u64,
+      authenticatorId: string,
       credentialId: string,
       isResidentCredential: boolean,
       rpId: string,
@@ -5002,10 +5042,10 @@ declare global {
       userHandle: string,
       signCount: u32
     ): void;
-    getCredentials(authenticatorId: u64): nsICredentialParameters[];
-    removeCredential(authenticatorId: u64, credentialId: string): void;
-    removeAllCredentials(authenticatorId: u64): void;
-    setUserVerified(authenticatorId: u64, isUserVerified: boolean): void;
+    getCredentials(authenticatorId: string): nsICredentialParameters[];
+    removeCredential(authenticatorId: string, credentialId: string): void;
+    removeAllCredentials(authenticatorId: string): void;
+    setUserVerified(authenticatorId: string, isUserVerified: boolean): void;
     listen(): void;
     runCommand(aCommand: string): void;
   }
@@ -5093,6 +5133,7 @@ declare global {
 
     readonly isClosed: boolean;
     readonly isChrome: boolean;
+    readonly isRemote: boolean;
     readonly isInitialized: boolean;
     readonly parent: nsIWorkerDebugger;
     readonly type: u32;
@@ -5443,7 +5484,6 @@ declare global {
     removeInlineProperty(aProperty: string, aAttribute: string): void;
     nodeIsBlock(aNode: Node): boolean;
     insertHTML(aInputString: string): void;
-    rebuildDocumentFromSource(aSourceString: string): void;
     insertElementAtSelection(aElement: Element, aDeleteSelection: boolean): void;
     updateBaseURL(): void;
     selectElement(aElement: Element): void;
@@ -5631,6 +5671,7 @@ declare global {
   interface nsPIExternalAppLauncher extends nsISupports {
     deleteTemporaryFileOnExit(aTemporaryFile: nsIFile): void;
     deleteTemporaryPrivateFileWhenPossible(aTemporaryFile: nsIFile): void;
+    deletePrivateFileWhenPossible(aPrivateFile: nsIFile): void;
   }
 
   interface nsIHelperAppLauncher extends nsICancelable {
@@ -5782,8 +5823,40 @@ declare global {
       aEnabled: boolean,
       aSchedulesPings: string[],
       aReasonCodes: string[],
-      aFollowsCollectionEnabled: boolean
+      aFollowsCollectionEnabled: boolean,
+      aUploaderCapabilities: string[]
     ): u32;
+    updateAttribution(
+      aSource: string,
+      aMedium: string,
+      aCampaign: string,
+      aTerm: string,
+      aContent: string
+    ): void;
+    testGetAttribution(): any;
+    updateDistribution(aName: string): void;
+    testGetDistribution(): any;
+    registerRuntimeMetric(
+      aType: string,
+      aCategory: string,
+      aName: string,
+      aPings: string[],
+      aLifetime: string,
+      aDisabled: boolean,
+      aExtraArgs?: string
+    ): void;
+    registerRuntimePing(
+      aName: string,
+      aIncludeClientId: boolean,
+      aSendIfEmpty: boolean,
+      aPreciseTimestamps: boolean,
+      aIncludeInfoSections: boolean,
+      aEnabled: boolean,
+      aSchedulesPings: string[],
+      aReasonCodes: string[],
+      aFollowsCollectionEnabled: boolean,
+      aUploaderCapabilities: string[]
+    ): void;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/glean/xpcom/nsIGleanPing.idl
@@ -5792,10 +5865,19 @@ declare global {
     call(aReason: string): void;
   }>;
 
+  type nsIGleanPingSubmitCallback = Callable<{
+    call(): Promise<any>;
+  }>;
+
   interface nsIGleanPing extends nsISupports {
     submit(aReason?: string): void;
     testBeforeNextSubmit(aCallback: nsIGleanPingTestCallback): void;
     setEnabled(aValue: boolean): void;
+    testSubmission(
+      aTestCallback: nsIGleanPingTestCallback,
+      aSubmitCallback: nsIGleanPingSubmitCallback,
+      aSubmitTimeoutMs?: u32
+    ): Promise<any>;
   }
 
   // https://searchfox.org/mozilla-central/source/gfx/src/nsIFontEnumerator.idl
@@ -6133,6 +6215,7 @@ declare global {
     getStaticRequest(): imgIRequest;
     incrementAnimationConsumers(): void;
     decrementAnimationConsumers(): void;
+    readonly hasAnimationConsumers: boolean;
     boostPriority(aCategory: u32): void;
   }
 
@@ -6201,9 +6284,9 @@ declare global {
   interface nsIMozIconURI extends nsIURI {
     readonly iconURL: nsIURL;
     readonly imageSize: u32;
+    readonly imageScale: u32;
+    readonly imageDark: boolean;
     readonly stockIcon: string;
-    readonly iconSize: string;
-    readonly iconState: string;
     readonly contentType: string;
     readonly fileExtension: string;
   }
@@ -6231,7 +6314,6 @@ declare global {
   interface nsIStringBundle extends nsISupports {
     GetStringFromID(aID: i32): string;
     GetStringFromName(aName: string): string;
-    formatStringFromID(aID: i32, params: string[]): string;
     formatStringFromName(aName: string, params: string[]): string;
     getSimpleEnumeration(): nsISimpleEnumerator;
     asyncPreload(): void;
@@ -6239,7 +6321,6 @@ declare global {
 
   interface nsIStringBundleService extends nsISupports {
     createBundle(aURLSpec: string): nsIStringBundle;
-    formatStatusMessage(aStatus: nsresult, aStatusArg: string): string;
     flushBundles(): void;
   }
 
@@ -6446,10 +6527,6 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/layout/base/nsIPreloadedStyleSheet.idl
-
-  interface nsIPreloadedStyleSheet extends nsISupports {}
-
   // https://searchfox.org/mozilla-central/source/layout/base/nsISVGPaintContext.idl
 
   interface nsISVGPaintContext extends nsISupports {
@@ -6459,7 +6536,11 @@ declare global {
     readonly strokeOpacity: float;
   }
 
-  // https://searchfox.org/mozilla-central/source/layout/base/nsIStyleSheetService.idl
+  // https://searchfox.org/mozilla-central/source/layout/style/nsIPreloadedStyleSheet.idl
+
+  interface nsIPreloadedStyleSheet extends nsISupports {}
+
+  // https://searchfox.org/mozilla-central/source/layout/style/nsIStyleSheetService.idl
 
   interface nsIStyleSheetService extends nsISupports {
     readonly AGENT_SHEET?: 0;
@@ -6612,7 +6693,6 @@ declare global {
 
   interface nsILoginManager extends nsISupports {
     readonly initializationPromise: Promise<any>;
-    addLogin(aLogin: nsILoginInfo): nsILoginInfo;
     addLoginAsync(aLogin: nsILoginInfo): Promise<any>;
     addLogins(aLogins: any): Promise<any>;
     removeLogin(aLogin: nsILoginInfo): void;
@@ -7130,15 +7210,29 @@ declare enum nsICacheInfoChannel_PreferredAlternativeDataDeliveryType {
   SERIALIZE = 2,
 }
 
+declare enum nsICacheInfoChannel_CacheDisposition {
+  kCacheUnresolved = 0,
+  kCacheHit = 1,
+  kCacheHitViaReval = 2,
+  kCacheMissedViaReval = 3,
+  kCacheMissed = 4,
+  kCacheUnknown = 5,
+  kCacheDispositionEnd = 6,
+}
+
 declare global {
   namespace nsICacheInfoChannel {
     type PreferredAlternativeDataDeliveryType =
       nsICacheInfoChannel_PreferredAlternativeDataDeliveryType;
+    type CacheDisposition = nsICacheInfoChannel_CacheDisposition;
   }
 
   interface nsICacheInfoChannel
     extends nsISupports,
-      Enums<typeof nsICacheInfoChannel_PreferredAlternativeDataDeliveryType> {
+      Enums<
+        typeof nsICacheInfoChannel_PreferredAlternativeDataDeliveryType &
+          typeof nsICacheInfoChannel_CacheDisposition
+      > {
     readonly cacheTokenFetchCount: u32;
     readonly cacheTokenExpirationTime: u32;
     isFromCache(): boolean;
@@ -7157,6 +7251,7 @@ declare global {
     readonly alternativeDataInputStream: nsIInputStream;
     getOriginalInputStream(aReceiver: nsIInputStreamReceiver): void;
     openAlternativeOutputStream(type: string, predictedSize: i64): nsIAsyncOutputStream;
+    getCacheDisposition(): nsICacheInfoChannel.CacheDisposition;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsICachingChannel.idl
@@ -7301,14 +7396,14 @@ declare global {
 
 declare enum nsIClassifiedChannel_ClassificationFlags {
   CLASSIFIED_FINGERPRINTING = 1,
-  CLASSIFIED_FINGERPRINTING_CONTENT = 128,
-  CLASSIFIED_CRYPTOMINING = 2,
-  CLASSIFIED_CRYPTOMINING_CONTENT = 256,
-  CLASSIFIED_TRACKING = 4,
-  CLASSIFIED_TRACKING_AD = 8,
-  CLASSIFIED_TRACKING_ANALYTICS = 16,
-  CLASSIFIED_TRACKING_SOCIAL = 32,
-  CLASSIFIED_TRACKING_CONTENT = 64,
+  CLASSIFIED_FINGERPRINTING_CONTENT = 2,
+  CLASSIFIED_CRYPTOMINING = 4,
+  CLASSIFIED_CRYPTOMINING_CONTENT = 8,
+  CLASSIFIED_TRACKING = 16,
+  CLASSIFIED_TRACKING_AD = 32,
+  CLASSIFIED_TRACKING_ANALYTICS = 64,
+  CLASSIFIED_TRACKING_SOCIAL = 128,
+  CLASSIFIED_TRACKING_CONTENT = 256,
   CLASSIFIED_SOCIALTRACKING = 512,
   CLASSIFIED_SOCIALTRACKING_FACEBOOK = 1024,
   CLASSIFIED_SOCIALTRACKING_LINKEDIN = 2048,
@@ -7316,8 +7411,9 @@ declare enum nsIClassifiedChannel_ClassificationFlags {
   CLASSIFIED_EMAILTRACKING = 8192,
   CLASSIFIED_EMAILTRACKING_CONTENT = 16384,
   CLASSIFIED_CONSENTMANAGER = 32768,
-  CLASSIFIED_ANY_BASIC_TRACKING = 61,
-  CLASSIFIED_ANY_STRICT_TRACKING = 253,
+  CLASSIFIED_ANTIFRAUD = 65536,
+  CLASSIFIED_ANY_BASIC_TRACKING = 241,
+  CLASSIFIED_ANY_STRICT_TRACKING = 499,
   CLASSIFIED_ANY_SOCIAL_TRACKING = 7680,
 }
 
@@ -7378,6 +7474,7 @@ declare global {
     requestDNSHTTPSRRLookup(aHost: string, cb: nsINetDashboardCallback): void;
     requestRcwnStats(cb: nsINetDashboardCallback): void;
     getLogPath(): string;
+    requestHttp3ConnectionStats(cb: nsINetDashboardCallback): void;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIDashboardEventNotifier.idl
@@ -7468,12 +7565,6 @@ declare global {
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIHttpAuthenticatorCallback.idl
 
-  // https://searchfox.org/mozilla-central/source/netwerk/base/nsIHttpPushListener.idl
-
-  interface nsIHttpPushListener extends nsISupports {
-    onPush(associatedChannel: nsIHttpChannel, pushChannel: nsIHttpChannel): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIIOService.idl
 
   interface nsIIOService extends nsISupports {
@@ -7508,6 +7599,7 @@ declare global {
     originAttributesForNetworkState(aChannel: nsIChannel): any;
     offline: boolean;
     readonly connectivity: boolean;
+    setConnectivityForTesting(connectivity: boolean): void;
     allowPort(aPort: i32, aScheme: string): boolean;
     extractScheme(urlString: string): string;
     hostnameIsLocalIPAddress(aURI: nsIURI): boolean;
@@ -7537,6 +7629,7 @@ declare global {
     setSimpleURIUnknownRemoteSchemes(aRemoteSchemes: string[]): void;
     addEssentialDomainMapping(aFrom: string, aTo: string): void;
     clearEssentialDomainMapping(): void;
+    parseCacheControlHeader(aCacheControlHeader: string): any;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIIncrementalDownload.idl
@@ -7603,6 +7696,7 @@ declare global {
       aCloseWhenDone: boolean,
       aMainThreadTarget?: nsISerialEventTarget
     ): void;
+    reset(): void;
     asyncRead(aListener: nsIStreamListener): void;
   }
 
@@ -7660,6 +7754,14 @@ declare enum nsILoadInfo_StoragePermissionState {
   StoragePermissionAllowListed = 2,
 }
 
+declare enum nsILoadInfo_IPAddressSpace {
+  Unknown = 0,
+  Local = 1,
+  Private = 2,
+  Public = 3,
+  Invalid = 4,
+}
+
 declare enum nsILoadInfo_CrossOriginOpenerPolicy {
   OPENER_POLICY_UNSAFE_NONE = 0,
   OPENER_POLICY_SAME_ORIGIN = 1,
@@ -7701,6 +7803,7 @@ declare enum nsILoadInfo_HTTPSUpgradeTelemetryType {
 declare global {
   namespace nsILoadInfo {
     type StoragePermissionState = nsILoadInfo_StoragePermissionState;
+    type IPAddressSpace = nsILoadInfo_IPAddressSpace;
     type CrossOriginOpenerPolicy = nsILoadInfo_CrossOriginOpenerPolicy;
     type CrossOriginEmbedderPolicy = nsILoadInfo_CrossOriginEmbedderPolicy;
     type SchemelessInputType = nsILoadInfo_SchemelessInputType;
@@ -7711,6 +7814,7 @@ declare global {
     extends nsISupports,
       Enums<
         typeof nsILoadInfo_StoragePermissionState &
+          typeof nsILoadInfo_IPAddressSpace &
           typeof nsILoadInfo_CrossOriginOpenerPolicy &
           typeof nsILoadInfo_CrossOriginEmbedderPolicy &
           typeof nsILoadInfo_SchemelessInputType &
@@ -7784,6 +7888,7 @@ declare global {
 
     readonly loadingPrincipal: nsIPrincipal;
     readonly triggeringPrincipal: nsIPrincipal;
+    setTriggeringPrincipalForTesting(aPrincipal: nsIPrincipal): void;
     triggeringRemoteType: string;
     principalToInherit: nsIPrincipal;
     readonly loadingDocument: Document;
@@ -7793,6 +7898,8 @@ declare global {
     triggeringSandboxFlags: u32;
     triggeringWindowId: u64;
     triggeringStorageAccess: boolean;
+    triggeringFirstPartyClassificationFlags: u32;
+    triggeringThirdPartyClassificationFlags: u32;
     readonly securityMode: u32;
     skipContentSniffing: boolean;
     httpsOnlyStatus: u32;
@@ -7809,6 +7916,8 @@ declare global {
     isOn3PCBExceptionList: boolean;
     readonly cookiePolicy: u32;
     cookieJarSettings: nsICookieJarSettings;
+    ipAddressSpace: nsILoadInfo.IPAddressSpace;
+    parentIpAddressSpace: nsILoadInfo.IPAddressSpace;
     storagePermission: nsILoadInfo.StoragePermissionState;
     isMetaRefresh: boolean;
     readonly forceInheritPrincipal: boolean;
@@ -8410,6 +8519,7 @@ declare global {
     registerChannelFilter(aFilter: nsIProtocolProxyChannelFilter, aPosition: u32): void;
     unregisterFilter(aFilter: nsIProtocolProxyFilter): void;
     unregisterChannelFilter(aFilter: nsIProtocolProxyChannelFilter): void;
+    readonly hasProxyFilterRegistered: boolean;
     addProxyConfigCallback(aCallback: nsIProxyConfigChangedCallback): void;
     removeProxyConfigCallback(aCallback: nsIProxyConfigChangedCallback): void;
     notifyProxyConfigChangedInternal(): void;
@@ -8827,6 +8937,7 @@ declare global {
     readonly PACURI: string;
     getProxyForURI(testSpec: string, testScheme: string, testHost: string, testPort: i32): string;
     readonly systemWPADSetting: boolean;
+    setSystemProxyInfo(host: string, port: i32, pacFileUrl: string, exclusionList: string[]): void;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsITLSServerSocket.idl
@@ -9331,9 +9442,9 @@ declare global {
     memoryCacheStorage(aLoadContextInfo: nsILoadContextInfo): nsICacheStorage;
     diskCacheStorage(aLoadContextInfo: nsILoadContextInfo): nsICacheStorage;
     pinningCacheStorage(aLoadContextInfo: nsILoadContextInfo): nsICacheStorage;
-    clearOrigin(aPrincipal: nsIPrincipal): void;
+    clearOriginsByPrincipal(aPrincipal: nsIPrincipal): void;
     clearBaseDomain(aBaseDomain: string): void;
-    clearOriginAttributes(aOriginAttributes: string): void;
+    clearOriginsByOriginAttributes(aOriginAttributes: string): void;
     clear(): void;
     purgeFromMemory(aWhat: u32): void;
     readonly ioTarget: nsIEventTarget;
@@ -9395,6 +9506,7 @@ declare global {
     readonly SAMESITE_NONE?: 0;
     readonly SAMESITE_LAX?: 1;
     readonly SAMESITE_STRICT?: 2;
+    readonly SAMESITE_UNSET?: 256;
 
     readonly name: string;
     readonly value: string;
@@ -9454,7 +9566,21 @@ declare global {
       aSameSite: i32,
       aSchemeMap: nsICookie.schemeType,
       aIsPartitioned?: boolean
-    ): void;
+    ): nsICookieValidation;
+    addForAddOn(
+      aHost: string,
+      aPath: string,
+      aName: string,
+      aValue: string,
+      aIsSecure: boolean,
+      aIsHttpOnly: boolean,
+      aIsSession: boolean,
+      aExpiry: i64,
+      aOriginAttributes: any,
+      aSameSite: i32,
+      aSchemeMap: nsICookie.schemeType,
+      aIsPartitioned?: boolean
+    ): nsICookieValidation;
     cookieExists(aHost: string, aPath: string, aName: string, aOriginAttributes: any): boolean;
     countCookiesFromHost(aHost: string): u32;
     getCookiesFromHost(aHost: string, aOriginAttributes: any, aSorted?: boolean): nsICookie[];
@@ -9472,6 +9598,7 @@ declare global {
       aExceptions: nsIThirdPartyCookieExceptionEntry[]
     ): void;
     testGet3PCBExceptions(): string[];
+    maybeCapExpiry(aExpiryInMSec: i64): i64;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/cookie/nsICookieNotification.idl
@@ -9530,6 +9657,40 @@ declare global {
     runInTransaction(aCallback: nsICookieTransactionCallback): void;
   }
 
+  // https://searchfox.org/mozilla-central/source/netwerk/cookie/nsICookieValidation.idl
+} // global
+
+declare enum nsICookieValidation_ValidationError {
+  eOK = 0,
+  eRejectedEmptyNameAndValue = 1,
+  eRejectedNameValueOversize = 2,
+  eRejectedInvalidCharName = 3,
+  eRejectedInvalidCharValue = 4,
+  eRejectedInvalidPath = 5,
+  eRejectedInvalidDomain = 6,
+  eRejectedInvalidPrefix = 7,
+  eRejectedNoneRequiresSecure = 8,
+  eRejectedPartitionedRequiresSecure = 9,
+  eRejectedHttpOnlyButFromScript = 10,
+  eRejectedSecureButNonHttps = 11,
+  eRejectedForNonSameSiteness = 12,
+  eRejectedAttributePathOversize = 13,
+  eRejectedAttributeDomainOversize = 14,
+  eRejectedAttributeExpiryOversize = 15,
+}
+
+declare global {
+  namespace nsICookieValidation {
+    type ValidationError = nsICookieValidation_ValidationError;
+  }
+
+  interface nsICookieValidation
+    extends nsISupports,
+      Enums<typeof nsICookieValidation_ValidationError> {
+    readonly result: nsICookieValidation.ValidationError;
+    readonly errorString: string;
+  }
+
   // https://searchfox.org/mozilla-central/source/netwerk/cookie/nsIThirdPartyCookieBlockingExceptionListService.idl
 
   interface nsIThirdPartyCookieBlockingExceptionListService extends nsISupports {
@@ -10137,7 +10298,6 @@ declare global {
     setTopWindowURIIfUnknown(topWindowURI: nsIURI): void;
     readonly proxyURI: nsIURI;
     blockAuthPrompt: boolean;
-    integrityMetadata: string;
     readonly connectionInfoHashKey: string;
     setIPv4Disabled(): void;
     setIPv6Disabled(): void;
@@ -10765,6 +10925,13 @@ declare global {
     clearAllOverrides(): void;
     getOverrides(): nsICertOverride[];
     setDisableAllSecurityChecksAndLetAttackersInterceptMyData(aDisable: boolean): void;
+    setDisableAllSecurityChecksAndLetAttackersInterceptMyDataForUserContext(
+      aUserContextId: u32,
+      aDisable: boolean
+    ): void;
+    resetDisableAllSecurityChecksAndLetAttackersInterceptMyDataForUserContext(
+      aUserContextId: u32
+    ): void;
     readonly securityCheckDisabled: boolean;
   }
 
@@ -10815,8 +10982,11 @@ declare global {
     addCRLiteDelta(delta: u8[], filename: string, callback: nsICertStorageCallback): void;
     testNoteCRLiteUpdateTime(callback: nsICertStorageCallback): void;
     addCerts(certs: nsICertInfo[], callback: nsICertStorageCallback): void;
+    TestHelperAddCert(cert: string, subject: string, trust: i16): void;
     removeCertsByHashes(hashes: string[], callback: nsICertStorageCallback): void;
     findCertsBySubject(subject: u8[]): u8[][];
+    hasAllCertsByHash(hashes: u8[][]): boolean;
+    findCertByHash(cert_hash: u8[]): u8[];
     GetRemainingOperationCount(): i32;
   }
 
@@ -10859,6 +11029,7 @@ declare global {
       hostname: string,
       certArray: nsIX509Cert[],
       loadContext: nsILoadContext,
+      caNames: u8[][],
       callback: nsIClientAuthDialogCallback
     ): void;
   }
@@ -11363,10 +11534,6 @@ declare global {
     ): void;
   }>;
 
-  type nsIAsyncBoolCallback = Callable<{
-    onResult(result: boolean): void;
-  }>;
-
   type nsICertVerificationCallback = Callable<{
     verifyCertFinished(
       aPRErrorCode: i32,
@@ -11441,8 +11608,6 @@ declare global {
     addCertFromBase64(base64: string, trust: string): nsIX509Cert;
     getCerts(): nsIX509Cert[];
     asPKCS7Blob(certList: nsIX509Cert[]): string;
-    asyncHasThirdPartyRoots(callback: nsIAsyncBoolCallback): void;
-    countTrustObjects(): u32;
     getAndroidCertificateFromAlias(alias: string): nsIX509Cert;
   }
 
@@ -11529,20 +11694,6 @@ declare global {
     handleSuccess(result: boolean): void;
     handleError(code: nsresult, message: string): void;
   }
-
-  interface mozISyncedBookmarksMirrorLogger extends nsISupports {
-    readonly LEVEL_OFF?: 0;
-    readonly LEVEL_ERROR?: 1;
-    readonly LEVEL_WARN?: 2;
-    readonly LEVEL_DEBUG?: 3;
-    readonly LEVEL_TRACE?: 4;
-
-    maxLevel: i16;
-    error(message: string): void;
-    warn(message: string): void;
-    debug(message: string): void;
-    trace(message: string): void;
-  }
 } // global
 
 declare enum mozISyncedBookmarksMerger_SyncedItemKinds {
@@ -11572,7 +11723,6 @@ declare global {
           typeof mozISyncedBookmarksMerger_SyncedItemValidity
       > {
     db: mozIStorageConnection;
-    logger: mozIServicesLogSink;
     merge(
       localTimeSeconds: i64,
       remoteTimeSeconds: i64,
@@ -11602,48 +11752,43 @@ declare global {
       aExpiration?: PRTime,
       isRichIcon?: boolean
     ): Promise<any>;
-    getFaviconURLForPage(
-      aPageURI: nsIURI,
-      aCallback: nsIFaviconDataCallback,
-      aPreferredWidth?: u16
-    ): void;
-    getFaviconDataForPage(
-      aPageURI: nsIURI,
-      aCallback: nsIFaviconDataCallback,
-      aPreferredWidth?: u16
-    ): void;
-    copyFavicons(
-      aFromPageURI: nsIURI,
-      aToPageURI: nsIURI,
-      aFaviconLoadType: u32,
-      aCallback?: nsIFaviconDataCallback
-    ): void;
+    getFaviconForPage(aPageURI: nsIURI, aPreferredWidth?: u16): Promise<any>;
+    tryCopyFavicons(aFromPageURI: nsIURI, aToPageURI: nsIURI, aFaviconLoadType: u32): Promise<any>;
   }
 
-  type nsIFaviconDataCallback = Callable<{
-    onComplete(
-      aFaviconURI: nsIURI,
-      aDataLen: u32,
-      aData: u8[],
-      aMimeType: string,
-      aWidth: u16
-    ): void;
-  }>;
+  interface nsIFavicon extends nsISupports {
+    readonly uri: nsIURI;
+    readonly dataURI: nsIURI;
+    readonly rawData: u8[];
+    readonly mimeType: string;
+    readonly width: u16;
+  }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/places/nsINavBookmarksService.idl
+} // global
 
-  interface nsINavBookmarksService extends nsISupports {
+declare enum nsINavBookmarksService_ChangeSource {
+  SOURCE_DEFAULT = 0,
+  SOURCE_SYNC = 1,
+  SOURCE_IMPORT = 2,
+  SOURCE_SYNC_REPARENT_REMOVED_FOLDER_CHILDREN = 4,
+  SOURCE_RESTORE = 5,
+  SOURCE_RESTORE_ON_STARTUP = 6,
+}
+
+declare global {
+  namespace nsINavBookmarksService {
+    type ChangeSource = nsINavBookmarksService_ChangeSource;
+  }
+
+  interface nsINavBookmarksService
+    extends nsISupports,
+      Enums<typeof nsINavBookmarksService_ChangeSource> {
     readonly DEFAULT_INDEX?: -1;
     readonly TYPE_BOOKMARK?: 1;
     readonly TYPE_FOLDER?: 2;
     readonly TYPE_SEPARATOR?: 3;
     readonly TYPE_DYNAMIC_CONTAINER?: 4;
-    readonly SOURCE_DEFAULT?: 0;
-    readonly SOURCE_SYNC?: 1;
-    readonly SOURCE_IMPORT?: 2;
-    readonly SOURCE_SYNC_REPARENT_REMOVED_FOLDER_CHILDREN?: 4;
-    readonly SOURCE_RESTORE?: 5;
-    readonly SOURCE_RESTORE_ON_STARTUP?: 6;
     readonly SYNC_STATUS_UNKNOWN?: 0;
     readonly SYNC_STATUS_NEW?: 1;
     readonly SYNC_STATUS_NORMAL?: 2;
@@ -11666,14 +11811,24 @@ declare global {
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/places/nsINavHistoryService.idl
+} // global
 
-  interface nsINavHistoryResultNode extends nsISupports {
-    readonly RESULT_TYPE_URI?: 0;
-    readonly RESULT_TYPE_QUERY?: 5;
-    readonly RESULT_TYPE_FOLDER?: 6;
-    readonly RESULT_TYPE_SEPARATOR?: 7;
-    readonly RESULT_TYPE_FOLDER_SHORTCUT?: 9;
+declare enum nsINavHistoryResultNode_ResultType {
+  RESULT_TYPE_URI = 0,
+  RESULT_TYPE_QUERY = 5,
+  RESULT_TYPE_FOLDER = 6,
+  RESULT_TYPE_SEPARATOR = 7,
+  RESULT_TYPE_FOLDER_SHORTCUT = 9,
+}
 
+declare global {
+  namespace nsINavHistoryResultNode {
+    type ResultType = nsINavHistoryResultNode_ResultType;
+  }
+
+  interface nsINavHistoryResultNode
+    extends nsISupports,
+      Enums<typeof nsINavHistoryResultNode_ResultType> {
     readonly parent: nsINavHistoryContainerResultNode;
     readonly parentResult: nsINavHistoryResult;
     readonly uri: string;
@@ -11840,18 +11995,29 @@ declare global {
     asyncEnabled: boolean;
     clone(): nsINavHistoryQueryOptions;
   }
+} // global
 
-  interface nsINavHistoryService extends nsISupports {
-    readonly DATABASE_SCHEMA_VERSION?: 78;
-    readonly TRANSITION_LINK?: 1;
-    readonly TRANSITION_TYPED?: 2;
-    readonly TRANSITION_BOOKMARK?: 3;
-    readonly TRANSITION_EMBED?: 4;
-    readonly TRANSITION_REDIRECT_PERMANENT?: 5;
-    readonly TRANSITION_REDIRECT_TEMPORARY?: 6;
-    readonly TRANSITION_DOWNLOAD?: 7;
-    readonly TRANSITION_FRAMED_LINK?: 8;
-    readonly TRANSITION_RELOAD?: 9;
+declare enum nsINavHistoryService_TransitionType {
+  TRANSITION_LINK = 1,
+  TRANSITION_TYPED = 2,
+  TRANSITION_BOOKMARK = 3,
+  TRANSITION_EMBED = 4,
+  TRANSITION_REDIRECT_PERMANENT = 5,
+  TRANSITION_REDIRECT_TEMPORARY = 6,
+  TRANSITION_DOWNLOAD = 7,
+  TRANSITION_FRAMED_LINK = 8,
+  TRANSITION_RELOAD = 9,
+}
+
+declare global {
+  namespace nsINavHistoryService {
+    type TransitionType = nsINavHistoryService_TransitionType;
+  }
+
+  interface nsINavHistoryService
+    extends nsISupports,
+      Enums<typeof nsINavHistoryService_TransitionType> {
+    readonly DATABASE_SCHEMA_VERSION?: 82;
     readonly DATABASE_STATUS_OK?: 0;
     readonly DATABASE_STATUS_CREATE?: 1;
     readonly DATABASE_STATUS_CORRUPT?: 2;
@@ -11883,6 +12049,7 @@ declare global {
     makeGuid(): string;
     hashURL(aSpec: string, aMode?: string): u64;
     isFrecencyDecaying: boolean;
+    readonly isAlternativeFrecencyEnabled: boolean;
     shouldStartFrecencyRecalculation: boolean;
     readonly DBConnection: mozIStorageConnection;
     asyncExecuteLegacyQuery(
@@ -12002,12 +12169,6 @@ declare global {
       aSource: Node,
       aExplicit: boolean
     ): void;
-    preloadURI(
-      aURI: nsIURI,
-      aReferrerInfo: nsIReferrerInfo,
-      aSource: Node,
-      aPolicyType: nsContentPolicyType
-    ): void;
     hasMoreElements(): boolean;
     cancelPrefetchPreloadURI(aURI: nsIURI, aSource: Node): void;
   }
@@ -12098,7 +12259,6 @@ declare global {
   // https://searchfox.org/mozilla-central/source/remote/components/nsIRemoteAgent.idl
 
   interface nsIRemoteAgent extends nsISupports {
-    readonly debuggerAddress: string;
     readonly running: boolean;
   }
 
@@ -12176,12 +12336,6 @@ declare global {
     onSearchCompletion(result: nsIAutoCompleteResult): void;
   }>;
 
-  // https://searchfox.org/mozilla-central/source/services/interfaces/mozIAppServicesLogger.idl
-
-  interface mozIAppServicesLogger extends nsISupports {
-    register(target: string, logger: mozIServicesLogSink): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/services/interfaces/mozIBridgedSyncEngine.idl
 
   interface mozIBridgedSyncEngineCallback extends nsISupports {
@@ -12197,7 +12351,6 @@ declare global {
   interface mozIBridgedSyncEngine extends nsISupports {
     readonly storageVersion: i32;
     readonly allowSkippedRecord: boolean;
-    logger: mozIServicesLogSink;
     getLastSync(callback: mozIBridgedSyncEngineCallback): void;
     setLastSync(lastSyncMillis: i64, callback: mozIBridgedSyncEngineCallback): void;
     getSyncId(callback: mozIBridgedSyncEngineCallback): void;
@@ -12222,24 +12375,6 @@ declare global {
     interrupt(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/services/interfaces/mozIServicesLogSink.idl
-
-  interface mozIServicesLogSink extends nsISupports {
-    readonly LEVEL_OFF?: 0;
-    readonly LEVEL_ERROR?: 1;
-    readonly LEVEL_WARN?: 2;
-    readonly LEVEL_INFO?: 3;
-    readonly LEVEL_DEBUG?: 4;
-    readonly LEVEL_TRACE?: 5;
-
-    maxLevel: i16;
-    error(message: string): void;
-    warn(message: string): void;
-    debug(message: string): void;
-    trace(message: string): void;
-    info(message: string): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/toolkit/components/sessionstore/nsISessionStoreFunctions.idl
 
   interface nsISessionStoreFunctions extends nsISupports {
@@ -12335,7 +12470,7 @@ declare global {
     triggeringPrincipal: nsIPrincipal;
     principalToInherit: nsIPrincipal;
     partitionedPrincipalToInherit: nsIPrincipal;
-    csp: nsIContentSecurityPolicy;
+    policyContainer: nsIPolicyContainer;
     stateData: nsIStructuredCloneContainer;
     docshellID: nsID;
     readonly isSrcdocEntry: boolean;
@@ -12344,7 +12479,8 @@ declare global {
     scrollRestorationIsManual: boolean;
     readonly loadedInThisProcess: boolean;
     readonly childCount: i32;
-    persist: boolean;
+    isTransient(): boolean;
+    setTransient(): void;
     setScrollPosition(x: i32, y: i32): void;
     getScrollPosition(x: OutParam<i32>, y: OutParam<i32>): void;
     initLayoutHistoryState(): nsILayoutHistoryState;
@@ -12371,7 +12507,7 @@ declare global {
     addSHistoryListener(aListener: nsISHistoryListener): void;
     removeSHistoryListener(aListener: nsISHistoryListener): void;
     reloadCurrentEntry(): void;
-    addEntry(aEntry: nsISHEntry, aPersist: boolean): void;
+    addEntry(aEntry: nsISHEntry): void;
     updateIndex(): void;
     replaceEntry(aIndex: i32, aReplaceEntry: nsISHEntry): void;
     notifyOnHistoryReload(): boolean;
@@ -12769,10 +12905,9 @@ declare global {
     readonly failedProfileLockCount: u32;
     readonly slowSQL: any;
     readonly debugSlowSQL: any;
+    submitAndGetUntrustedModulePayload(): Promise<any>;
     getUntrustedModuleLoadEvents(aFlags?: u32): Promise<any>;
     readonly areUntrustedModuleLoadEventsReady: boolean;
-    getLoadedModules(): Promise<any>;
-    readonly lateWrites: any;
     getHistogramById(id: string): any;
     getKeyedHistogramById(id: string): any;
     canRecordBase: boolean;
@@ -12802,27 +12937,30 @@ declare global {
   // https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/dap/nsIDAPTelemetry.idl
 
   interface nsIDAPTelemetry extends nsISupports {
-    GetReportU8(
+    GetReportPrioSum(
       leaderHpkeConfig: u8[],
       helperHpkeConfig: u8[],
-      measurement: u8,
+      measurement: u32,
       task_id: u8[],
+      bits: u32,
       time_precision: u64,
       report: OutParam<u8[]>
     ): void;
-    GetReportVecU8(
+    GetReportPrioSumVec(
       leaderHpkeConfig: u8[],
       helperHpkeConfig: u8[],
-      measurement: u8[],
+      measurement: u32[],
       task_id: u8[],
+      bits: u32,
       time_precision: u64,
       report: OutParam<u8[]>
     ): void;
-    GetReportVecU16(
+    GetReportPrioHistogram(
       leaderHpkeConfig: u8[],
       helperHpkeConfig: u8[],
-      measurement: u16[],
+      measurement: u32,
       task_id: u8[],
+      length: u32,
       time_precision: u64,
       report: OutParam<u8[]>
     ): void;
@@ -13080,7 +13218,6 @@ declare global {
     readonly profileBeforeChange: nsIAsyncShutdownClient;
     readonly profileChangeTeardown: nsIAsyncShutdownClient;
     readonly appShutdownConfirmed: nsIAsyncShutdownClient;
-    readonly quitApplicationGranted: nsIAsyncShutdownClient;
     readonly sendTelemetry: nsIAsyncShutdownClient;
     readonly webWorkersShutdown: nsIAsyncShutdownClient;
     readonly xpcomWillShutdown: nsIAsyncShutdownClient;
@@ -13125,6 +13262,7 @@ declare global {
   interface nsIClearDataService extends nsISupports {
     readonly CLEAR_COOKIES?: 1;
     readonly CLEAR_NETWORK_CACHE?: 2;
+    readonly CLEAR_BFCACHE?: 2;
     readonly CLEAR_IMAGE_CACHE?: 4;
     readonly CLEAR_JS_CACHE?: 8;
     readonly CLEAR_DOWNLOADS?: 16;
@@ -13296,7 +13434,7 @@ declare global {
     readonly requestToken: string;
     readonly userActionId: string;
     readonly isCachedResponse: boolean;
-    readonly isAgentResponse: boolean;
+    readonly isSyntheticResponse: boolean;
     acknowledge(aCaa: nsIContentAnalysisAcknowledgement): void;
   }
 
@@ -13334,10 +13472,11 @@ declare enum nsIContentAnalysisRequest_Reason {
 }
 
 declare enum nsIContentAnalysisRequest_OperationType {
-  eCustomDisplayString = 0,
-  eClipboard = 1,
-  eDroppedText = 2,
-  eOperationPrint = 3,
+  eClipboard = 0,
+  eDroppedText = 1,
+  eOperationPrint = 2,
+  eUpload = 3,
+  eDownload = 4,
 }
 
 declare global {
@@ -13357,8 +13496,8 @@ declare global {
     readonly analysisType: nsIContentAnalysisRequest.AnalysisType;
     readonly reason: nsIContentAnalysisRequest.Reason;
     readonly operationTypeForDisplay: nsIContentAnalysisRequest.OperationType;
-    readonly operationDisplayString: string;
-    readonly dataTransfer: DataTransfer;
+    readonly fileNameForDisplay: string;
+    dataTransfer: DataTransfer;
     readonly transferable: nsITransferable;
     readonly textContent: string;
     readonly filePath: string;
@@ -13375,6 +13514,7 @@ declare global {
     userActionRequestsCount: i64;
     readonly sourceWindowGlobal: WindowGlobalParent;
     timeoutMultiplier: u32;
+    testOnlyIgnoreCanceledAndAlwaysSubmitToAgent: boolean;
   }
 
   interface nsIContentAnalysisCallback extends nsISupports {
@@ -13402,13 +13542,17 @@ declare global {
       aAutoAcknowledge: boolean,
       callback: nsIContentAnalysisCallback
     ): void;
+    analyzeBatchContentRequest(
+      aCar: nsIContentAnalysisRequest,
+      aAutoAcknowledge: boolean
+    ): Promise<any>;
     analyzeContentRequestPrivate(
       aRequest: nsIContentAnalysisRequest,
       aAutoAcknowledge: boolean,
       aCallback: nsIContentAnalysisCallback
     ): void;
     cancelRequestsByUserAction(aUserActionId: string): void;
-    cancelRequestsByRequestToken(aRequestToken: string): void;
+    cancelAllRequestsAssociatedWithUserAction(aUserActionId: string): void;
     respondToWarnDialog(aRequestToken: string, aAllowContent: boolean): void;
     cancelAllRequests(aForbidFutureRequests?: boolean): void;
     testOnlySetCACmdLineArg(aVal: boolean): void;
@@ -13433,6 +13577,7 @@ declare global {
       aUserActionId: string
     ): nsIContentAnalysisResponse;
     sendCancelToAgent(aUserActionId: string): void;
+    forceRecreateClientForTest(): void;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/cookiebanners/nsIClickRule.idl
@@ -13574,6 +13719,25 @@ declare global {
     make(aTopic: string, aString: string): any;
   }
 
+  // https://searchfox.org/mozilla-central/source/toolkit/components/media/nsIWindowsMediaFoundationCDMOriginsListService.idl
+
+  interface nsIOriginStatusEntry extends nsISupports {
+    readonly origin: string;
+    readonly status: i32;
+  }
+
+  interface nsIOriginsListLoadCallback extends nsISupports {
+    onOriginsListLoaded(aEntries: nsIArray): void;
+  }
+
+  interface nsIWindowsMediaFoundationCDMOriginsListService extends nsISupports {
+    readonly ORIGIN_BLOCKED?: 0;
+    readonly ORIGIN_ALLOWED?: 1;
+
+    setCallback(aCallback: nsIOriginsListLoadCallback): void;
+    removeCallback(aCallback: nsIOriginsListLoadCallback): void;
+  }
+
   // https://searchfox.org/mozilla-central/source/toolkit/modules/nsIBrowserWindowTracker.idl
 
   interface nsIVisibleTab extends nsISupports {
@@ -13607,6 +13771,7 @@ declare global {
     readonly firstPartyDomain: string;
     readonly thirdPartyDomain: string;
     readonly overrides: string;
+    readonly isBaseline: boolean;
   }
 
   interface nsIFingerprintingWebCompatService extends nsISupports {
@@ -13620,20 +13785,21 @@ declare global {
     setFingerprintingOverrides(aOverrides: nsIFingerprintingOverride[]): void;
     getFingerprintingOverrides(aDomainKey: string): nsIRFPTargetSetIDL;
     cleanAllOverrides(): void;
+    readonly enabledFingerprintingProtectionsBaseline: nsIRFPTargetSetIDL;
     readonly enabledFingerprintingProtections: nsIRFPTargetSetIDL;
     cleanAllRandomKeys(): void;
     cleanRandomKeyByPrincipal(aPrincipal: nsIPrincipal): void;
     cleanRandomKeyBySite(aSchemelessSite: string, originAttributes: any): void;
     cleanRandomKeyByHost(aHost: string, aPattern: string): void;
     cleanRandomKeyByOriginAttributesPattern(aPattern: string): void;
+    getSpoofedUserAgent(aDesktopMode: boolean): string;
     testGenerateRandomKey(aChannel: nsIChannel): u8[];
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/nsIRFPTargetSetIDL.idl
 
   interface nsIRFPTargetSetIDL extends nsISupports {
-    low: u64;
-    high: u64;
+    getNth32BitSet(aPart: u32): u32;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/nsIUserCharacteristicsPageService.idl
@@ -13652,6 +13818,7 @@ declare global {
 
   interface nsISearchEngine extends nsISupports {
     getSubmission(searchTerms: string, responseType?: string): nsISearchSubmission;
+    readonly searchURLWithNoTerms: nsIURI;
     searchTermFromResult(uri: nsIURI): string;
     readonly searchUrlQueryParamName: string;
     readonly searchUrlPublicSuffix: string;
@@ -13666,7 +13833,9 @@ declare global {
     readonly id: string;
     readonly telemetryId: string;
     readonly identifier: string;
+    readonly loadPath: string;
     readonly isAppProvided: boolean;
+    readonly isConfigEngine: boolean;
     readonly inMemory: boolean;
     readonly overriddenById: string;
     readonly isGeneralPurposeEngine: boolean;
@@ -13705,6 +13874,8 @@ declare enum nsISearchService_DefaultEngineChangeReason {
   CHANGE_REASON_UITOUR = 12,
   CHANGE_REASON_ENGINE_UPDATE = 13,
   CHANGE_REASON_USER_PRIVATE_PREF_ENABLED = 14,
+  CHANGE_REASON_ENGINE_IGNORE_LIST_UPDATED = 15,
+  CHANGE_REASON_NO_EXISTING_DEFAULT_ENGINE = 16,
 }
 
 declare global {
@@ -13744,12 +13915,12 @@ declare global {
     removeWebExtensionEngine(id: string): Promise<any>;
     readonly appDefaultEngine: nsISearchEngine;
     readonly appPrivateDefaultEngine: nsISearchEngine;
-    defaultEngine: nsISearchEngine;
+    readonly defaultEngine: nsISearchEngine;
     getDefault(): Promise<any>;
-    setDefault(engine: nsISearchEngine, changeSource: u16): Promise<any>;
-    defaultPrivateEngine: nsISearchEngine;
+    setDefault(engine: nsISearchEngine, changeReason: u16): Promise<any>;
+    readonly defaultPrivateEngine: nsISearchEngine;
     getDefaultPrivate(): Promise<any>;
-    setDefaultPrivate(engine: nsISearchEngine, changeSource: u16): Promise<any>;
+    setDefaultPrivate(engine: nsISearchEngine, changeReason: u16): Promise<any>;
     readonly separatePrivateDefaultUrlbarResultEnabled: boolean;
     maybeSetAndOverrideDefault(extension: any): Promise<any>;
     getDefaultEngineInfo(): any;
@@ -13858,7 +14029,6 @@ declare global {
     startWithLastProfile: boolean;
     readonly profiles: nsISimpleEnumerator;
     readonly currentProfile: nsIToolkitProfile;
-    readonly groupProfile: nsIToolkitProfile;
     defaultProfile: nsIToolkitProfile;
     selectStartupProfile(
       aArgv: string[],
@@ -13876,7 +14046,7 @@ declare global {
     readonly profileCount: u32;
     flush(): void;
     asyncFlush(): Promise<any>;
-    asyncFlushGroupProfile(): Promise<any>;
+    asyncFlushCurrentProfile(): Promise<any>;
     removeProfileFilesByPath(aRootDir: nsIFile, aLocalDir: nsIFile, aTimeout: u32): Promise<any>;
   }
 
@@ -14209,6 +14379,7 @@ declare global {
   interface nsIURILoader extends nsISupports {
     readonly IS_CONTENT_PREFERRED?: 1;
     readonly DONT_RETARGET?: 2;
+    readonly IS_OBJECT_EMBED?: 4;
 
     registerContentListener(aContentListener: nsIURIContentListener): void;
     unRegisterContentListener(aContentListener: nsIURIContentListener): void;
@@ -14378,6 +14549,7 @@ declare global {
     readonly channelId: u64;
     readonly isPrivateBrowsing: boolean;
     readonly topLevelUrl: string;
+    readonly browserId: u64;
     replace(): void;
     allow(): void;
   }
@@ -14428,10 +14600,53 @@ declare global {
     ): void;
   }
 
+  // https://searchfox.org/mozilla-central/source/netwerk/url-classifier/nsIUrlClassifierExceptionList.idl
+
+  interface nsIUrlClassifierExceptionList extends nsISupports {
+    init(aFeature: string): void;
+    addEntry(aEntry: nsIUrlClassifierExceptionListEntry): void;
+    matches(aURI: nsIURI, aTopLevelURI: nsIURI, aIsPrivateBrowsing: boolean): boolean;
+    testGetEntries(): nsIUrlClassifierExceptionListEntry[];
+  }
+
+  // https://searchfox.org/mozilla-central/source/netwerk/url-classifier/nsIUrlClassifierExceptionListEntry.idl
+} // global
+
+declare enum nsIUrlClassifierExceptionListEntry_Category {
+  CATEGORY_INTERNAL_PREF = 0,
+  CATEGORY_BASELINE = 1,
+  CATEGORY_CONVENIENCE = 2,
+}
+
+declare global {
+  namespace nsIUrlClassifierExceptionListEntry {
+    type Category = nsIUrlClassifierExceptionListEntry_Category;
+  }
+
+  interface nsIUrlClassifierExceptionListEntry
+    extends nsISupports,
+      Enums<typeof nsIUrlClassifierExceptionListEntry_Category> {
+    init(
+      aCategory: nsIUrlClassifierExceptionListEntry.Category,
+      aUrlPattern: string,
+      aTopLevelUrlPattern: string,
+      aIsPrivateBrowsingOnly: boolean,
+      aFilterContentBlockingCategories: string[],
+      aClassifierFeatures: string[]
+    ): void;
+    matches(aURI: nsIURI, aTopLevelURI: nsIURI, aIsPrivateBrowsing: boolean): boolean;
+    readonly category: nsIUrlClassifierExceptionListEntry.Category;
+    readonly urlPattern: string;
+    readonly topLevelUrlPattern: string;
+    readonly isPrivateBrowsingOnly: boolean;
+    readonly filterContentBlockingCategories: string[];
+    readonly classifierFeatures: string[];
+  }
+
   // https://searchfox.org/mozilla-central/source/netwerk/url-classifier/nsIUrlClassifierExceptionListService.idl
 
   type nsIUrlClassifierExceptionListObserver = Callable<{
-    onExceptionListUpdate(aList: string): void;
+    onExceptionListUpdate(aList: nsIUrlClassifierExceptionList): void;
   }>;
 
   interface nsIUrlClassifierExceptionListService extends nsISupports {
@@ -14445,6 +14660,7 @@ declare global {
       aObserver: nsIUrlClassifierExceptionListObserver
     ): void;
     clear(): void;
+    maybeMigrateCategoryPrefs(): void;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/url-classifier/nsIUrlClassifierFeature.idl
@@ -14471,7 +14687,7 @@ declare global {
     extends nsISupports,
       Enums<typeof nsIUrlClassifierFeature_listType & typeof nsIUrlClassifierFeature_URIType> {
     readonly name: string;
-    readonly exceptionHostList: string;
+    readonly exceptionList: nsIUrlClassifierExceptionList;
   }
 
   interface nsIUrlClassifierFeatureResult extends nsISupports {
@@ -14653,7 +14869,10 @@ declare global {
     getProtocolVersion(provider: string): string;
     convertThreatTypeToListNames(threatType: u32): string;
     convertListNameToThreatType(listName: string): u32;
+    convertServerListNameToLocalListNameV5(serverListName: string): string;
+    convertLocalListNameToServerListNameV5(localListName: string): string;
     makeUpdateRequestV4(aListNames: string[], aStatesBase64: string[]): string;
+    makeUpdateRequestV5(aListNames: string[], aStatesBase64: string[]): string;
     makeFindFullHashRequestV4(
       aListNames: string[],
       aListStatesBase64: string[],
@@ -14791,6 +15010,7 @@ declare global {
     readonly PERSIST_FLAGS_CLEANUP_ON_FAILURE?: 8192;
     readonly PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION?: 16384;
     readonly PERSIST_FLAGS_APPEND_TO_FILE?: 32768;
+    readonly PERSIST_FLAGS_DISABLE_HTTPS_ONLY?: 65536;
     readonly PERSIST_STATE_READY?: 1;
     readonly PERSIST_STATE_SAVING?: 2;
     readonly PERSIST_STATE_FINISHED?: 3;
@@ -15261,7 +15481,7 @@ declare global {
     sourceTopWindowContext: WindowContext;
     readonly sourceNode: Node;
     triggeringPrincipal: nsIPrincipal;
-    csp: nsIContentSecurityPolicy;
+    policyContainer: nsIPolicyContainer;
     dataTransfer: DataTransfer;
     getData(aTransferable: nsITransferable, aItemIndex: u32): void;
     isDataFlavorSupported(aDataFlavor: string): boolean;
@@ -15270,10 +15490,13 @@ declare global {
     updateDragEffect(): void;
     updateDragImage(aImage: Node, aImageX: i32, aImageY: i32): void;
     setDragEndPoint(aScreenX: i32, aScreenY: i32): void;
-    setDragEndPointForTests(aScreenX: i32, aScreenY: i32): void;
+    setDragEndPointForTests(aScreenX: float, aScreenY: float): void;
     endDragSession(aDoneDrag: boolean, aKeyModifiers?: u32): void;
     sendStoreDropTargetAndDelayEndDragSession(aEvent: DragEvent): void;
-    sendDispatchToDropTargetAndResumeEndDragSession(aShouldDrop: boolean): void;
+    sendDispatchToDropTargetAndResumeEndDragSession(
+      aShouldDrop: boolean,
+      aAllowedFiles: nsIFile[]
+    ): void;
   }
 
   // https://searchfox.org/mozilla-central/source/widget/nsIFilePicker.idl
@@ -15464,6 +15687,8 @@ declare global {
     spoofDeviceID(aDeviceID: string): void;
     spoofDriverVersion(aDriverVersion: string): void;
     spoofOSVersion(aVersion: u32): void;
+    spoofOSVersionEx(aMajor: u32, aMinor: u32, aBuild: u32, aRevision: u32): void;
+    spoofMonitorInfo(aScreenCount: u32, aMinRefreshRate: i32, aMaxRefreshRate: i32): void;
   }
 
   // https://searchfox.org/mozilla-central/source/widget/nsIMockDragServiceController.idl
@@ -16178,7 +16403,6 @@ declare global {
 
   interface nsIConsoleService extends nsISupports, Enums<typeof nsIConsoleService_OutputMode> {
     logMessage(message: nsIConsoleMessage): void;
-    callFunctionAndLogException(targetGlobal: any, func: any): any;
     logMessageWithMode(message: nsIConsoleMessage, mode: nsIConsoleService.OutputMode): void;
     logStringMessage(message: string): void;
     getMessageArray(): nsIConsoleMessage[];
@@ -16465,8 +16689,6 @@ declare global {
   interface nsIComponentManager extends nsISupports {
     getClassObject<T extends nsIID>(aClass: nsID, aIID: T): nsQIResult<T>;
     getClassObjectByContractID<T extends nsIID>(aContractID: string, aIID: T): nsQIResult<T>;
-    addBootstrappedManifestLocation(aLocation: nsIFile): void;
-    removeBootstrappedManifestLocation(aLocation: nsIFile): void;
     getManifestLocations(): nsIArray;
     getComponentESModules(): nsIUTF8StringEnumerator;
   }
@@ -16530,6 +16752,7 @@ declare global {
 
   interface nsIINIParserWriter extends nsISupports {
     setString(aSection: string, aKey: string, aValue: string): void;
+    deleteString(aSection: string, aKey: string): void;
     writeFile(aINIFile: nsIFile): void;
     writeToString(): string;
   }
@@ -17330,22 +17553,6 @@ declare global {
     readonly isRunningUnderSnap: boolean;
   }
 
-  // https://searchfox.org/mozilla-central/source/xpcom/system/nsIGSettingsService.idl
-
-  interface nsIGSettingsCollection extends nsISupports {
-    setString(key: string, value: string): void;
-    setBoolean(key: string, value: boolean): void;
-    setInt(key: string, value: i32): void;
-    getString(key: string): string;
-    getBoolean(key: string): boolean;
-    getInt(key: string): i32;
-    getStringList(key: string): nsIArray;
-  }
-
-  interface nsIGSettingsService extends nsISupports {
-    getCollectionForSchema(schema: string): nsIGSettingsCollection;
-  }
-
   // https://searchfox.org/mozilla-central/source/xpcom/system/nsIGeolocationProvider.idl
 
   interface nsIGeolocationUpdate extends nsISupports {
@@ -17418,7 +17625,6 @@ declare enum nsIXULRuntime_ContentWin32kLockdownState {
   MissingRemoteWebGL = 5,
   MissingNonNativeTheming = 6,
   DisabledByEnvVar = 7,
-  DisabledBySafeMode = 8,
   DisabledByE10S = 9,
   DisabledByUserPref = 10,
   EnabledByUserPref = 11,
@@ -17497,6 +17703,7 @@ declare global {
     readonly distributionID: string;
     readonly windowsDLLBlocklistStatus: boolean;
     readonly restartedByOS: boolean;
+    readonly nativeMenubar: boolean;
     readonly chromeColorSchemeIsDark: boolean;
     readonly contentThemeDerivedColorSchemeIsDark: boolean;
     readonly prefersReducedMotion: boolean;
@@ -18081,6 +18288,20 @@ declare global {
     getInstallHash(): string;
   }
 
+  // https://searchfox.org/mozilla-central/source/zen/toolkit/common/nsIZenCommonUtils.idl
+
+  interface nsIZenCommonUtils extends nsISupports {
+    share(url: nsIURI, title: string, text: string, x: u32, y: u32, width: u32, height: u32): void;
+    canShare(): boolean;
+    playHapticFeedback(): void;
+  }
+
+  // https://searchfox.org/mozilla-central/source/zen/mods/nsIZenModsBackend.idl
+
+  interface nsIZenModsBackend extends nsISupports {
+    rebuildModsStyles(aContents: string): void;
+  }
+
   // https://searchfox.org/mozilla-central/source/modules/libjar/zipwriter/nsIZipWriter.idl
 
   interface nsIZipWriter extends nsISupports {
@@ -18278,7 +18499,8 @@ declare global {
     nsIContentPref: nsJSIID<nsIContentPref>;
     nsIDOMGlobalPropertyInitializer: nsJSIID<nsIDOMGlobalPropertyInitializer>;
     nsIDOMWindow: nsJSIID<nsIDOMWindow>;
-    nsIDOMWindowUtils: nsJSIID<nsIDOMWindowUtils>;
+    nsISynthesizedEventCallback: nsJSIID<nsISynthesizedEventCallback>;
+    nsIDOMWindowUtils: nsJSIID<nsIDOMWindowUtils, typeof nsIDOMWindowUtils_AsyncEnabledOption>;
     nsITranslationNodeList: nsJSIID<nsITranslationNodeList>;
     nsIJSRAIIHelper: nsJSIID<nsIJSRAIIHelper>;
     nsIFocusManager: nsJSIID<nsIFocusManager>;
@@ -18318,6 +18540,7 @@ declare global {
     nsINotificationStorageEntry: nsJSIID<nsINotificationStorageEntry>;
     nsINotificationStorageCallback: nsJSIID<nsINotificationStorageCallback>;
     nsINotificationStorage: nsJSIID<nsINotificationStorage>;
+    nsINotificationHandler: nsJSIID<nsINotificationHandler>;
     nsIPaymentResponseData: nsJSIID<nsIPaymentResponseData>;
     nsIGeneralResponseData: nsJSIID<nsIGeneralResponseData>;
     nsIBasicCardResponseData: nsJSIID<nsIBasicCardResponseData>;
@@ -18376,6 +18599,8 @@ declare global {
         typeof nsIContentSecurityPolicy_RequireTrustedTypesForDirectiveState
     >;
     nsICSPEventListener: nsJSIID<nsICSPEventListener>;
+    nsIIntegrityPolicy: nsJSIID<nsIIntegrityPolicy>;
+    nsIPolicyContainer: nsJSIID<nsIPolicyContainer>;
     nsIReferrerInfo: nsJSIID<nsIReferrerInfo, typeof nsIReferrerInfo_ReferrerPolicyIDL>;
     nsIHttpsOnlyModePermission: nsJSIID<nsIHttpsOnlyModePermission>;
     nsIDocumentEncoderNodeFixup: nsJSIID<nsIDocumentEncoderNodeFixup>;
@@ -18441,6 +18666,7 @@ declare global {
     nsITypeAheadFind: nsJSIID<nsITypeAheadFind>;
     nsIFOG: nsJSIID<nsIFOG>;
     nsIGleanPingTestCallback: nsJSIID<nsIGleanPingTestCallback>;
+    nsIGleanPingSubmitCallback: nsJSIID<nsIGleanPingSubmitCallback>;
     nsIGleanPing: nsJSIID<nsIGleanPing>;
     nsIFontEnumerator: nsJSIID<nsIFontEnumerator>;
     nsIParserUtils: nsJSIID<nsIParserUtils>;
@@ -18498,8 +18724,8 @@ declare global {
     nsIKeyValueVariantCallback: nsJSIID<nsIKeyValueVariantCallback>;
     nsIKeyValueVoidCallback: nsJSIID<nsIKeyValueVoidCallback>;
     nsILayoutHistoryState: nsJSIID<nsILayoutHistoryState>;
-    nsIPreloadedStyleSheet: nsJSIID<nsIPreloadedStyleSheet>;
     nsISVGPaintContext: nsJSIID<nsISVGPaintContext>;
+    nsIPreloadedStyleSheet: nsJSIID<nsIPreloadedStyleSheet>;
     nsIStyleSheetService: nsJSIID<nsIStyleSheetService>;
     nsITreeSelection: nsJSIID<nsITreeSelection>;
     nsITreeView: nsJSIID<nsITreeView>;
@@ -18549,7 +18775,8 @@ declare global {
     nsIInputStreamReceiver: nsJSIID<nsIInputStreamReceiver>;
     nsICacheInfoChannel: nsJSIID<
       nsICacheInfoChannel,
-      typeof nsICacheInfoChannel_PreferredAlternativeDataDeliveryType
+      typeof nsICacheInfoChannel_PreferredAlternativeDataDeliveryType &
+        typeof nsICacheInfoChannel_CacheDisposition
     >;
     nsICachingChannel: nsJSIID<nsICachingChannel>;
     nsICancelable: nsJSIID<nsICancelable>;
@@ -18581,7 +18808,6 @@ declare global {
     nsIFileURL: nsJSIID<nsIFileURL>;
     nsIFileURLMutator: nsJSIID<nsIFileURLMutator>;
     nsIFormPOSTActionChannel: nsJSIID<nsIFormPOSTActionChannel>;
-    nsIHttpPushListener: nsJSIID<nsIHttpPushListener>;
     nsIIOService: nsJSIID<nsIIOService>;
     nsIIncrementalDownload: nsJSIID<nsIIncrementalDownload>;
     nsIIncrementalStreamLoaderObserver: nsJSIID<nsIIncrementalStreamLoaderObserver>;
@@ -18596,6 +18822,7 @@ declare global {
     nsILoadInfo: nsJSIID<
       nsILoadInfo,
       typeof nsILoadInfo_StoragePermissionState &
+        typeof nsILoadInfo_IPAddressSpace &
         typeof nsILoadInfo_CrossOriginOpenerPolicy &
         typeof nsILoadInfo_CrossOriginEmbedderPolicy &
         typeof nsILoadInfo_SchemelessInputType &
@@ -18718,6 +18945,7 @@ declare global {
     nsICookiePermission: nsJSIID<nsICookiePermission>;
     nsICookieTransactionCallback: nsJSIID<nsICookieTransactionCallback>;
     nsICookieService: nsJSIID<nsICookieService>;
+    nsICookieValidation: nsJSIID<nsICookieValidation, typeof nsICookieValidation_ValidationError>;
     nsIThirdPartyCookieBlockingExceptionListService: nsJSIID<nsIThirdPartyCookieBlockingExceptionListService>;
     nsIThirdPartyCookieExceptionEntry: nsJSIID<nsIThirdPartyCookieExceptionEntry>;
     nsIDNSAdditionalInfo: nsJSIID<nsIDNSAdditionalInfo>;
@@ -18870,7 +19098,6 @@ declare global {
       typeof nsIAppSignatureInfo_SignatureAlgorithm
     >;
     nsIOpenSignedAppFileCallback: nsJSIID<nsIOpenSignedAppFileCallback>;
-    nsIAsyncBoolCallback: nsJSIID<nsIAsyncBoolCallback>;
     nsICertVerificationCallback: nsJSIID<nsICertVerificationCallback>;
     nsIX509CertDB: nsJSIID<nsIX509CertDB, typeof nsIX509CertDB_VerifyUsage>;
     nsIX509CertValidity: nsJSIID<nsIX509CertValidity>;
@@ -18883,23 +19110,28 @@ declare global {
     mozIPlacesPendingOperation: nsJSIID<mozIPlacesPendingOperation>;
     mozISyncedBookmarksMirrorProgressListener: nsJSIID<mozISyncedBookmarksMirrorProgressListener>;
     mozISyncedBookmarksMirrorCallback: nsJSIID<mozISyncedBookmarksMirrorCallback>;
-    mozISyncedBookmarksMirrorLogger: nsJSIID<mozISyncedBookmarksMirrorLogger>;
     mozISyncedBookmarksMerger: nsJSIID<
       mozISyncedBookmarksMerger,
       typeof mozISyncedBookmarksMerger_SyncedItemKinds &
         typeof mozISyncedBookmarksMerger_SyncedItemValidity
     >;
     nsIFaviconService: nsJSIID<nsIFaviconService>;
-    nsIFaviconDataCallback: nsJSIID<nsIFaviconDataCallback>;
-    nsINavBookmarksService: nsJSIID<nsINavBookmarksService>;
-    nsINavHistoryResultNode: nsJSIID<nsINavHistoryResultNode>;
+    nsIFavicon: nsJSIID<nsIFavicon>;
+    nsINavBookmarksService: nsJSIID<
+      nsINavBookmarksService,
+      typeof nsINavBookmarksService_ChangeSource
+    >;
+    nsINavHistoryResultNode: nsJSIID<
+      nsINavHistoryResultNode,
+      typeof nsINavHistoryResultNode_ResultType
+    >;
     nsINavHistoryContainerResultNode: nsJSIID<nsINavHistoryContainerResultNode>;
     nsINavHistoryQueryResultNode: nsJSIID<nsINavHistoryQueryResultNode>;
     nsINavHistoryResultObserver: nsJSIID<nsINavHistoryResultObserver>;
     nsINavHistoryResult: nsJSIID<nsINavHistoryResult>;
     nsINavHistoryQuery: nsJSIID<nsINavHistoryQuery>;
     nsINavHistoryQueryOptions: nsJSIID<nsINavHistoryQueryOptions>;
-    nsINavHistoryService: nsJSIID<nsINavHistoryService>;
+    nsINavHistoryService: nsJSIID<nsINavHistoryService, typeof nsINavHistoryService_TransitionType>;
     nsIPlacesPreviewsHelperService: nsJSIID<nsIPlacesPreviewsHelperService>;
     nsITaggingService: nsJSIID<nsITaggingService>;
     nsIPrefBranch: nsJSIID<nsIPrefBranch>;
@@ -18924,12 +19156,10 @@ declare global {
     mozISandboxReporter: nsJSIID<mozISandboxReporter>;
     nsIFormFillController: nsJSIID<nsIFormFillController>;
     nsIFormFillCompleteObserver: nsJSIID<nsIFormFillCompleteObserver>;
-    mozIAppServicesLogger: nsJSIID<mozIAppServicesLogger>;
     mozIBridgedSyncEngineCallback: nsJSIID<mozIBridgedSyncEngineCallback>;
     mozIBridgedSyncEngineApplyCallback: nsJSIID<mozIBridgedSyncEngineApplyCallback>;
     mozIBridgedSyncEngine: nsJSIID<mozIBridgedSyncEngine>;
     mozIInterruptible: nsJSIID<mozIInterruptible>;
-    mozIServicesLogSink: nsJSIID<mozIServicesLogSink>;
     nsISessionStoreFunctions: nsJSIID<nsISessionStoreFunctions>;
     nsISessionStoreRestoreData: nsJSIID<nsISessionStoreRestoreData>;
     nsIShellService: nsJSIID<nsIShellService>;
@@ -19023,6 +19253,9 @@ declare global {
     nsICookieRule: nsJSIID<nsICookieRule>;
     nsICrashService: nsJSIID<nsICrashService>;
     nsIFinalizationWitnessService: nsJSIID<nsIFinalizationWitnessService>;
+    nsIOriginStatusEntry: nsJSIID<nsIOriginStatusEntry>;
+    nsIOriginsListLoadCallback: nsJSIID<nsIOriginsListLoadCallback>;
+    nsIWindowsMediaFoundationCDMOriginsListService: nsJSIID<nsIWindowsMediaFoundationCDMOriginsListService>;
     nsIVisibleTab: nsJSIID<nsIVisibleTab>;
     nsIBrowserWindowTracker: nsJSIID<nsIBrowserWindowTracker>;
     nsIRegion: nsJSIID<nsIRegion>;
@@ -19087,6 +19320,11 @@ declare global {
     nsIChannelClassifierService: nsJSIID<nsIChannelClassifierService>;
     nsIURIClassifierCallback: nsJSIID<nsIURIClassifierCallback>;
     nsIURIClassifier: nsJSIID<nsIURIClassifier>;
+    nsIUrlClassifierExceptionList: nsJSIID<nsIUrlClassifierExceptionList>;
+    nsIUrlClassifierExceptionListEntry: nsJSIID<
+      nsIUrlClassifierExceptionListEntry,
+      typeof nsIUrlClassifierExceptionListEntry_Category
+    >;
     nsIUrlClassifierExceptionListObserver: nsJSIID<nsIUrlClassifierExceptionListObserver>;
     nsIUrlClassifierExceptionListService: nsJSIID<nsIUrlClassifierExceptionListService>;
     nsIUrlClassifierFeature: nsJSIID<
@@ -19323,8 +19561,6 @@ declare global {
     nsIGIOHandlerApp: nsJSIID<nsIGIOHandlerApp>;
     nsIGIOMimeApp: nsJSIID<nsIGIOMimeApp>;
     nsIGIOService: nsJSIID<nsIGIOService>;
-    nsIGSettingsCollection: nsJSIID<nsIGSettingsCollection>;
-    nsIGSettingsService: nsJSIID<nsIGSettingsService>;
     nsIGeolocationUpdate: nsJSIID<nsIGeolocationUpdate>;
     nsIGeolocationProvider: nsJSIID<nsIGeolocationProvider>;
     nsIHapticFeedback: nsJSIID<nsIHapticFeedback>;
@@ -19387,6 +19623,8 @@ declare global {
     nsIControllers: nsJSIID<nsIControllers>;
     nsINativeAppSupport: nsJSIID<nsINativeAppSupport>;
     nsIXREDirProvider: nsJSIID<nsIXREDirProvider>;
+    nsIZenCommonUtils: nsJSIID<nsIZenCommonUtils>;
+    nsIZenModsBackend: nsJSIID<nsIZenModsBackend>;
     nsIZipWriter: nsJSIID<nsIZipWriter>;
   }
 } // global
diff --git a/src/zen/@types/lib.gecko.xpidl.d.ts b/src/zen/@types/lib.gecko.xpidl.d.ts
index 7ab726f19..97e0a04c9 100644
--- a/src/zen/@types/lib.gecko.xpidl.d.ts
+++ b/src/zen/@types/lib.gecko.xpidl.d.ts
@@ -1,6 +1,3 @@
-// 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/.
 /**
  * Gecko XPIDL base types.
  */
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index d3382a289..6cc2dd5e6 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -169,7 +169,10 @@
 
     async #createUpdateAnimation() {
       const appID = Services.appinfo.appBuildID;
-      if (Services.prefs.getStringPref('zen.updates.last-build-id', '') === appID) {
+      if (
+        Services.prefs.getStringPref('zen.updates.last-build-id', '') === appID ||
+        gZenUIManager.testingEnabled
+      ) {
         return;
       }
       Services.prefs.setStringPref('zen.updates.last-build-id', appID);
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 80ce77d29..b61f74794 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -624,7 +624,8 @@ var gZenVerticalTabsManager = {
       !gZenUIManager._hasLoadedDOM ||
       !aItem.isConnected ||
       gZenUIManager.testingEnabled ||
-      !gZenStartup.isReady
+      !gZenStartup.isReady ||
+      !gZenPinnedTabManager.hasInitializedPins
     ) {
       return;
     }
@@ -684,12 +685,7 @@ var gZenVerticalTabsManager = {
     }
   },
 
-  animateTabClose(aTab, animate) {
-    if (!animate) {
-      return new Promise((resolve) => {
-        resolve();
-      });
-    }
+  animateTabClose(aTab) {
     const height = aTab.getBoundingClientRect().height;
     return gZenUIManager.motion.animate(
       aTab,
diff --git a/src/zen/common/moz.build b/src/zen/common/moz.build
new file mode 100644
index 000000000..86c57726c
--- /dev/null
+++ b/src/zen/common/moz.build
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXTRA_JS_MODULES += [
+  "ZenCustomizableUI.sys.mjs",
+]
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index f461f02cb..28c53e965 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -67,6 +67,7 @@
   );
 
   --zen-secondary-btn-color: var(--zen-colors-primary-foreground);
+  --panel-separator-zap-gradient: none !important;
 
   --in-content-primary-button-background: color-mix(
     in srgb,
diff --git a/src/zen/common/styles/zen-urlbar.css b/src/zen/common/styles/zen-urlbar.css
index e7e63a18a..7b71af908 100644
--- a/src/zen/common/styles/zen-urlbar.css
+++ b/src/zen/common/styles/zen-urlbar.css
@@ -42,7 +42,7 @@
   border-color: transparent !important;
 }
 
-#urlbar-background {
+.urlbar-background {
   background: var(--zen-toolbar-element-bg) !important;
   border-radius: var(--border-radius-medium);
   outline: none !important;
@@ -53,7 +53,7 @@
   box-shadow: none !important;
 }
 
-#urlbar[focused='true']:not([suppress-focus-border]) > #urlbar-background,
+#urlbar[focused='true']:not([suppress-focus-border]) > .urlbar-background,
 #searchbar:focus-within {
   outline: none !important;
   outline-offset: none !important;
@@ -61,11 +61,11 @@
 }
 
 #urlbar:not([breakout-extend='true']) {
-  :root:not([supress-primary-adjustment]) & #urlbar-background {
+  :root:not([supress-primary-adjustment]) & .urlbar-background {
     transition: background-color 0.15s ease;
   }
 
-  &:hover #urlbar-background {
+  &:hover .urlbar-background {
     background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.2)) !important;
   }
 }
@@ -161,7 +161,7 @@
     margin-right: calc(var(--urlbar-margin-inline) - 1px);
   }
 
-  & #urlbar-background {
+  & .urlbar-background {
     --zen-urlbar-background-base: color-mix(
       in srgb,
       light-dark(hsl(0, 0%, 100%), hsl(0, 0%, 5%)) 80%,
diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css
index 3d0a0a1af..cabddf820 100644
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -180,6 +180,8 @@ tab-group[split-view-group] .tab-group-line {
 zen-folder {
   display: flex;
   flex-direction: column;
+  visibility: visible;
+
   --zen-folder-behind-bgcolor: light-dark(
     color-mix(in srgb, var(--zen-primary-color) 85%, white),
     color-mix(in srgb, var(--zen-primary-color) 60%, #c1c1c1)
@@ -201,7 +203,7 @@ zen-folder {
   }
 
   &[selected] > .tab-group-label-container::before {
-    background-color: color-mix(in srgb, var(--zen-colors-border) 60%, transparent);
+    background-color: var(--zen-toolbar-element-bg-hover);
   }
 
   &[collapsed][has-active] {
diff --git a/src/zen/moz.build b/src/zen/moz.build
index b17cc7915..1840323d7 100644
--- a/src/zen/moz.build
+++ b/src/zen/moz.build
@@ -4,6 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    "common",
     "glance",
     "mods",
     "tests",
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index a6c3ff4b2..52ef1456c 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -68,7 +68,7 @@
   class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
     MAX_ESSENTIALS_TABS = 12;
 
-    #hasInitializedPins = false;
+    hasInitializedPins = false;
     promiseInitializedPinned = new Promise((resolve) => {
       this._resolvePinnedInitializedInternal = resolve;
     });
@@ -191,9 +191,12 @@
     }
 
     #finishedInitializingPins() {
+      if (this.hasInitializedPins) {
+        return;
+      }
       this._resolvePinnedInitializedInternal();
       delete this._resolvePinnedInitializedInternal;
-      this.#hasInitializedPins = true;
+      this.hasInitializedPins = true;
     }
 
     async #initializePinnedTabs(init = false) {
@@ -461,7 +464,7 @@
           tab.pinned &&
           tab.hasAttribute('zen-pin-id') &&
           tab.group === group &&
-          this.#hasInitializedPins
+          this.hasInitializedPins
         ) {
           const tabPinId = tab.getAttribute('zen-pin-id');
           await ZenPinnedTabsStorage.addTabToGroup(tabPinId, id, /* position */ tab._pPos);
@@ -750,7 +753,7 @@
     }
 
     async savePin(pin, notifyObservers = true) {
-      if (!this.#hasInitializedPins && !gZenUIManager.testingEnabled) {
+      if (!this.hasInitializedPins && !gZenUIManager.testingEnabled) {
         return;
       }
       const existingPin = this._pinsCache.find((p) => p.uuid === pin.uuid);
@@ -773,80 +776,84 @@
         closeIfPending = false,
       } = {}
     ) {
-      if (!selectedTab?.pinned) {
-        return;
-      }
-
-      event.stopPropagation();
-      event.preventDefault();
-
-      if (noClose && behavior === 'close') {
-        behavior = 'unload-switch';
-      }
-
-      switch (behavior) {
-        case 'close':
-          this._removePinnedAttributes(selectedTab, true);
-          gBrowser.removeTab(selectedTab, { animate: true });
-          break;
-        case 'reset-unload-switch':
-        case 'unload-switch':
-        case 'reset-switch':
-        case 'switch':
-          if (behavior.includes('unload')) {
-            if (selectedTab.hasAttribute('glance-id')) {
-              // We have a glance tab inside the tab we are trying to unload,
-              // before we used to just ignore it but now we need to fully close
-              // it as well.
-              gZenGlanceManager.manageTabClose(selectedTab.glanceTab);
-              await new Promise((resolve) => {
-                let hasRan = false;
-                const onGlanceClose = () => {
-                  hasRan = true;
-                  resolve();
-                };
-                window.addEventListener('GlanceClose', onGlanceClose, { once: true });
-                // Set a timeout to resolve the promise if the event doesn't fire.
-                // We do this to prevent any future issues where glance woudnt close such as
-                // glance requering to ask for permit unload.
-                setTimeout(() => {
-                  if (!hasRan) {
-                    console.warn('GlanceClose event did not fire within 3 seconds');
-                    resolve();
-                  }
-                }, 3000);
-              });
-            }
-            await gZenFolders.collapseVisibleTab(
-              selectedTab.group,
-              /* only if active */ true,
-              selectedTab
-            );
-            let tabsToUnload = [selectedTab];
-            if (selectedTab.group?.hasAttribute('split-view-group')) {
-              tabsToUnload = selectedTab.group.tabs;
-            }
-            const allAreUnloaded = tabsToUnload.every(
-              (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
-            );
-            if (allAreUnloaded && closeIfPending) {
-              return await this._onCloseTabShortcut(event, selectedTab, { behavior: 'close' });
-            }
-            await gBrowser.explicitUnloadTabs(tabsToUnload);
-            selectedTab.removeAttribute('discarded');
-          }
-          if (selectedTab.selected) {
-            this._handleTabSwitch(selectedTab);
-          }
-          if (behavior.includes('reset')) {
-            this._resetTabToStoredState(selectedTab);
-          }
-          break;
-        case 'reset':
-          this._resetTabToStoredState(selectedTab);
-          break;
-        default:
+      try {
+        if (!selectedTab?.pinned) {
           return;
+        }
+
+        event.stopPropagation();
+        event.preventDefault();
+
+        if (noClose && behavior === 'close') {
+          behavior = 'unload-switch';
+        }
+
+        switch (behavior) {
+          case 'close':
+            this._removePinnedAttributes(selectedTab, true);
+            gBrowser.removeTab(selectedTab, { animate: true });
+            break;
+          case 'reset-unload-switch':
+          case 'unload-switch':
+          case 'reset-switch':
+          case 'switch':
+            if (behavior.includes('unload')) {
+              if (selectedTab.hasAttribute('glance-id')) {
+                // We have a glance tab inside the tab we are trying to unload,
+                // before we used to just ignore it but now we need to fully close
+                // it as well.
+                gZenGlanceManager.manageTabClose(selectedTab.glanceTab);
+                await new Promise((resolve) => {
+                  let hasRan = false;
+                  const onGlanceClose = () => {
+                    hasRan = true;
+                    resolve();
+                  };
+                  window.addEventListener('GlanceClose', onGlanceClose, { once: true });
+                  // Set a timeout to resolve the promise if the event doesn't fire.
+                  // We do this to prevent any future issues where glance woudnt close such as
+                  // glance requering to ask for permit unload.
+                  setTimeout(() => {
+                    if (!hasRan) {
+                      console.warn('GlanceClose event did not fire within 3 seconds');
+                      resolve();
+                    }
+                  }, 3000);
+                });
+              }
+              await gZenFolders.collapseVisibleTab(
+                selectedTab.group,
+                /* only if active */ true,
+                selectedTab
+              );
+              let tabsToUnload = [selectedTab];
+              if (selectedTab.group?.hasAttribute('split-view-group')) {
+                tabsToUnload = selectedTab.group.tabs;
+              }
+              const allAreUnloaded = tabsToUnload.every(
+                (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
+              );
+              if (allAreUnloaded && closeIfPending) {
+                return await this._onCloseTabShortcut(event, selectedTab, { behavior: 'close' });
+              }
+              await gBrowser.explicitUnloadTabs(tabsToUnload);
+              selectedTab.removeAttribute('discarded');
+            }
+            if (selectedTab.selected) {
+              this._handleTabSwitch(selectedTab);
+            }
+            if (behavior.includes('reset')) {
+              this._resetTabToStoredState(selectedTab);
+            }
+            break;
+          case 'reset':
+            this._resetTabToStoredState(selectedTab);
+            break;
+          default:
+            return;
+        }
+      } catch (ex) {
+        console.error('Error handling close tab shortcut for pinned tab:', ex);
       }
     }
 
diff --git a/src/zen/tests/folders/browser_folder_multiselected.js b/src/zen/tests/folders/browser_folder_multiselected.js
index 39a0659c2..577c85a4c 100644
--- a/src/zen/tests/folders/browser_folder_multiselected.js
+++ b/src/zen/tests/folders/browser_folder_multiselected.js
@@ -19,7 +19,7 @@ add_task(async function test_Folder_Multiselected_Tabs() {
   await collapseEvent;
 
   ok(tab2.multiselected, 'Tab 2 should not be multiselected');
-  Assert.equal(gBrowser.multiSelectedTabsCount, 3, 'There should be 3 multiselected tabs');
+  Assert.equal(gBrowser.multiSelectedTabsCount, 2, 'There should be 2 multiselected tabs');
 
   for (const t of [tab1, tab2]) {
     BrowserTestUtils.removeTab(t);
diff --git a/src/zen/tests/tabs/browser_drag_drop_vertical.js b/src/zen/tests/tabs/browser_drag_drop_vertical.js
index 2afddb81f..d5f36fa90 100644
--- a/src/zen/tests/tabs/browser_drag_drop_vertical.js
+++ b/src/zen/tests/tabs/browser_drag_drop_vertical.js
@@ -124,7 +124,7 @@ add_setup(async () => {
 
   registerCleanupFunction(async () => {
     // replace the default new tab in the test window
-    await addTab('about:blank');
+    addTabTo(gBrowser, 'about:blank');
 
     BrowserTestUtils.removeTab(tab1);
     BrowserTestUtils.removeTab(tab2);
diff --git a/src/zen/tests/workspaces/browser_double_click_newtab.js b/src/zen/tests/workspaces/browser_double_click_newtab.js
index 73256a8da..972b8eab5 100644
--- a/src/zen/tests/workspaces/browser_double_click_newtab.js
+++ b/src/zen/tests/workspaces/browser_double_click_newtab.js
@@ -3,12 +3,22 @@
 
 'use strict';
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [['zen.urlbar.replace-newtab', false]],
+  });
+
+  registerCleanupFunction(async () => {
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
 add_task(async function test_Check_Creation() {
   const placeToDoubleClick = gZenWorkspaces.activeWorkspaceStrip;
   EventUtils.sendMouseEvent({ type: 'dblclick' }, placeToDoubleClick, window);
   await TestUtils.waitForCondition(() => gBrowser.tabs.length === 3, 'New tab should be opened.');
 
   ok(true, 'New tab should be opened.');
-  await BrowserTestUtils.removeTab(gBrowser.tabs[2]);
+  await BrowserTestUtils.removeTab(gBrowser.tabs[1]);
   ok(gBrowser.tabs.length === 2, 'There should be one tab.');
 });
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 61468944a..ac462be29 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2521,7 +2521,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     if (!activeWorkspace) {
       return;
     }
-    tab.setAttribute('zen-workspace-id', activeWorkspace.uuid);
+    if (tab.hasAttribute('zen-workspace-id')) {
+      const tabWorkspaceId = tab.getAttribute('zen-workspace-id');
+      this.moveTabToWorkspace(tab, tabWorkspaceId);
+      await this.changeWorkspaceWithID(tabWorkspaceId);
+    } else {
+      tab.setAttribute('zen-workspace-id', activeWorkspace.uuid);
+    }
   }
 
   async onLocationChange(event) {
diff --git a/surfer.json b/surfer.json
index 217138ff1..3318a43a9 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "142.0.1",
-    "candidate": "142.0.1"
+    "candidate": "143.0"
   },
   "buildOptions": {
     "generateBranding": true