diff --git a/webextensions/api/contextualIdentities.json b/webextensions/api/contextualIdentities.json
index 187e0dcc781b84..5b65286810dacd 100644
--- a/webextensions/api/contextualIdentities.json
+++ b/webextensions/api/contextualIdentities.json
@@ -47,7 +47,7 @@
               "safari_ios": "mirror"
             }
           },
-          "cookieStoreId": {
+          "color": {
             "__compat": {
               "support": {
                 "chrome": {
@@ -66,7 +66,7 @@
               }
             }
           },
-          "color": {
+          "colorCode": {
             "__compat": {
               "support": {
                 "chrome": {
@@ -74,7 +74,7 @@
                 },
                 "edge": "mirror",
                 "firefox": {
-                  "version_added": "53"
+                  "version_added": "57"
                 },
                 "firefox_android": "mirror",
                 "opera": "mirror",
@@ -85,7 +85,7 @@
               }
             }
           },
-          "colorCode": {
+          "cookieStoreId": {
             "__compat": {
               "support": {
                 "chrome": {
@@ -93,7 +93,7 @@
                 },
                 "edge": "mirror",
                 "firefox": {
-                  "version_added": "57"
+                  "version_added": "53"
                 },
                 "firefox_android": "mirror",
                 "opera": "mirror",
@@ -207,16 +207,16 @@
             }
           }
         },
-        "onCreated": {
+        "move": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onCreated",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/move",
             "support": {
               "chrome": {
                 "version_added": false
               },
               "edge": "mirror",
               "firefox": {
-                "version_added": "57"
+                "version_added": "123"
               },
               "firefox_android": "mirror",
               "opera": "mirror",
@@ -227,9 +227,9 @@
             }
           }
         },
-        "onRemoved": {
+        "onCreated": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onRemoved",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onCreated",
             "support": {
               "chrome": {
                 "version_added": false
@@ -247,9 +247,9 @@
             }
           }
         },
-        "onUpdated": {
+        "onRemoved": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onUpdated",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onRemoved",
             "support": {
               "chrome": {
                 "version_added": false
@@ -267,16 +267,16 @@
             }
           }
         },
-        "move": {
+        "onUpdated": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/move",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contextualIdentities/onUpdated",
             "support": {
               "chrome": {
                 "version_added": false
               },
               "edge": "mirror",
               "firefox": {
-                "version_added": "123"
+                "version_added": "57"
               },
               "firefox_android": "mirror",
               "opera": "mirror",
diff --git a/webextensions/api/declarativeNetRequest.json b/webextensions/api/declarativeNetRequest.json
index 1c3210bac8361d..05ec4eededf7a0 100644
--- a/webextensions/api/declarativeNetRequest.json
+++ b/webextensions/api/declarativeNetRequest.json
@@ -80,6 +80,45 @@
             }
           }
         },
+        "MatchedRule": {
+          "__compat": {
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest/MatchedRule",
+            "support": {
+              "chrome": {
+                "version_added": "84"
+              },
+              "edge": "mirror",
+              "firefox": {
+                "version_added": "113"
+              },
+              "firefox_android": "mirror",
+              "opera": "mirror",
+              "safari": {
+                "version_added": false
+              },
+              "safari_ios": "mirror"
+            }
+          },
+          "extensionId": {
+            "__compat": {
+              "support": {
+                "chrome": {
+                  "version_added": false
+                },
+                "edge": "mirror",
+                "firefox": {
+                  "version_added": "113"
+                },
+                "firefox_android": "mirror",
+                "opera": "mirror",
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": "mirror"
+              }
+            }
+          }
+        },
         "MAX_GETMATCHEDRULES_CALLS_PER_INTERVAL": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest/MAX_GETMATCHEDRULES_CALLS_PER_INTERVAL",
@@ -180,45 +219,6 @@
             }
           }
         },
-        "MatchedRule": {
-          "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest/MatchedRule",
-            "support": {
-              "chrome": {
-                "version_added": "84"
-              },
-              "edge": "mirror",
-              "firefox": {
-                "version_added": "113"
-              },
-              "firefox_android": "mirror",
-              "opera": "mirror",
-              "safari": {
-                "version_added": false
-              },
-              "safari_ios": "mirror"
-            }
-          },
-          "extensionId": {
-            "__compat": {
-              "support": {
-                "chrome": {
-                  "version_added": false
-                },
-                "edge": "mirror",
-                "firefox": {
-                  "version_added": "113"
-                },
-                "firefox_android": "mirror",
-                "opera": "mirror",
-                "safari": {
-                  "version_added": false
-                },
-                "safari_ios": "mirror"
-              }
-            }
-          }
-        },
         "Redirect": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest/Redirect",
diff --git a/webextensions/api/extensionTypes.json b/webextensions/api/extensionTypes.json
index be39bdf8b1a39e..7a5f35e17674f7 100644
--- a/webextensions/api/extensionTypes.json
+++ b/webextensions/api/extensionTypes.json
@@ -26,6 +26,25 @@
             }
           }
         },
+        "CSSOrigin": {
+          "__compat": {
+            "support": {
+              "chrome": {
+                "version_added": false
+              },
+              "edge": "mirror",
+              "firefox": {
+                "version_added": "53"
+              },
+              "firefox_android": "mirror",
+              "opera": "mirror",
+              "safari": {
+                "version_added": false
+              },
+              "safari_ios": "mirror"
+            }
+          }
+        },
         "ImageDetails": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/extensionTypes/ImageDetails",
@@ -159,25 +178,6 @@
               }
             }
           }
-        },
-        "CSSOrigin": {
-          "__compat": {
-            "support": {
-              "chrome": {
-                "version_added": false
-              },
-              "edge": "mirror",
-              "firefox": {
-                "version_added": "53"
-              },
-              "firefox_android": "mirror",
-              "opera": "mirror",
-              "safari": {
-                "version_added": false
-              },
-              "safari_ios": "mirror"
-            }
-          }
         }
       }
     }
diff --git a/webextensions/api/history.json b/webextensions/api/history.json
index 3b8436498d2a48..d99ed0b21a35db 100644
--- a/webextensions/api/history.json
+++ b/webextensions/api/history.json
@@ -344,9 +344,9 @@
             }
           }
         },
-        "onVisitRemoved": {
+        "onVisited": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/history/onVisitRemoved",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/history/onVisited",
             "support": {
               "chrome": {
                 "version_added": true
@@ -355,7 +355,8 @@
                 "version_added": "79"
               },
               "firefox": {
-                "version_added": "50"
+                "version_added": "50",
+                "notes": "Before version 56, the result object's 'title' was always an empty string. From version 56 onwards, it is set to the last known title, if that is available, or an empty string otherwise."
               },
               "firefox_android": {
                 "version_added": false
@@ -368,9 +369,9 @@
             }
           }
         },
-        "onVisited": {
+        "onVisitRemoved": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/history/onVisited",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/history/onVisitRemoved",
             "support": {
               "chrome": {
                 "version_added": true
@@ -379,8 +380,7 @@
                 "version_added": "79"
               },
               "firefox": {
-                "version_added": "50",
-                "notes": "Before version 56, the result object's 'title' was always an empty string. From version 56 onwards, it is set to the last known title, if that is available, or an empty string otherwise."
+                "version_added": "50"
               },
               "firefox_android": {
                 "version_added": false
diff --git a/webextensions/api/menus.json b/webextensions/api/menus.json
index fc34eb788175c3..19bd8c9465707e 100644
--- a/webextensions/api/menus.json
+++ b/webextensions/api/menus.json
@@ -616,28 +616,6 @@
             }
           }
         },
-        "overrideContext": {
-          "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/menus/overrideContext",
-            "support": {
-              "chrome": {
-                "version_added": false
-              },
-              "edge": "mirror",
-              "firefox": {
-                "version_added": "64"
-              },
-              "firefox_android": {
-                "version_added": false
-              },
-              "opera": "mirror",
-              "safari": {
-                "version_added": false
-              },
-              "safari_ios": "mirror"
-            }
-          }
-        },
         "getTargetElement": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/menus/getTargetElement",
@@ -748,6 +726,28 @@
             }
           }
         },
+        "overrideContext": {
+          "__compat": {
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/menus/overrideContext",
+            "support": {
+              "chrome": {
+                "version_added": false
+              },
+              "edge": "mirror",
+              "firefox": {
+                "version_added": "64"
+              },
+              "firefox_android": {
+                "version_added": false
+              },
+              "opera": "mirror",
+              "safari": {
+                "version_added": false
+              },
+              "safari_ios": "mirror"
+            }
+          }
+        },
         "refresh": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/menus/refresh",
diff --git a/webextensions/api/permissions.json b/webextensions/api/permissions.json
index 97b20d9bd81a19..d81f2b0c05c65e 100644
--- a/webextensions/api/permissions.json
+++ b/webextensions/api/permissions.json
@@ -26,9 +26,9 @@
             }
           }
         },
-        "contains": {
+        "Permissions": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/contains",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/Permissions",
             "support": {
               "chrome": {
                 "version_added": true
@@ -52,9 +52,9 @@
             }
           }
         },
-        "getAll": {
+        "contains": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/getAll",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/contains",
             "support": {
               "chrome": {
                 "version_added": true
@@ -78,9 +78,9 @@
             }
           }
         },
-        "onAdded": {
+        "getAll": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/onAdded",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/getAll",
             "support": {
               "chrome": {
                 "version_added": true
@@ -89,9 +89,11 @@
                 "version_added": "79"
               },
               "firefox": {
-                "version_added": "77"
+                "version_added": "55"
+              },
+              "firefox_android": {
+                "version_added": "79"
               },
-              "firefox_android": "mirror",
               "opera": "mirror",
               "safari": {
                 "version_added": "14"
@@ -102,9 +104,9 @@
             }
           }
         },
-        "onRemoved": {
+        "onAdded": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/onRemoved",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/onAdded",
             "support": {
               "chrome": {
                 "version_added": true
@@ -126,9 +128,9 @@
             }
           }
         },
-        "Permissions": {
+        "onRemoved": {
           "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/Permissions",
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/permissions/onRemoved",
             "support": {
               "chrome": {
                 "version_added": true
@@ -137,11 +139,9 @@
                 "version_added": "79"
               },
               "firefox": {
-                "version_added": "55"
-              },
-              "firefox_android": {
-                "version_added": "79"
+                "version_added": "77"
               },
+              "firefox_android": "mirror",
               "opera": "mirror",
               "safari": {
                 "version_added": "14"
diff --git a/webextensions/api/privacy.json b/webextensions/api/privacy.json
index 199bdfe220976b..c3cb98e43834d7 100644
--- a/webextensions/api/privacy.json
+++ b/webextensions/api/privacy.json
@@ -58,6 +58,25 @@
               }
             }
           },
+          "httpsOnlyMode": {
+            "__compat": {
+              "support": {
+                "chrome": {
+                  "version_added": true
+                },
+                "edge": "mirror",
+                "firefox": {
+                  "version_added": "84"
+                },
+                "firefox_android": "mirror",
+                "opera": "mirror",
+                "safari": {
+                  "version_added": false
+                },
+                "safari_ios": "mirror"
+              }
+            }
+          },
           "networkPredictionEnabled": {
             "__compat": {
               "support": {
@@ -121,25 +140,6 @@
                 "safari_ios": "mirror"
               }
             }
-          },
-          "httpsOnlyMode": {
-            "__compat": {
-              "support": {
-                "chrome": {
-                  "version_added": true
-                },
-                "edge": "mirror",
-                "firefox": {
-                  "version_added": "84"
-                },
-                "firefox_android": "mirror",
-                "opera": "mirror",
-                "safari": {
-                  "version_added": false
-                },
-                "safari_ios": "mirror"
-              }
-            }
           }
         },
         "services": {
@@ -161,20 +161,20 @@
               "safari_ios": "mirror"
             }
           },
-          "autofillAddressEnabled": {
+          "alternateErrorPagesEnabled": {
             "__compat": {
               "support": {
                 "chrome": {
-                  "version_added": "70"
+                  "version_added": true
+                },
+                "edge": {
+                  "version_added": "79"
                 },
-                "edge": "mirror",
                 "firefox": {
                   "version_added": false
                 },
                 "firefox_android": "mirror",
-                "opera": {
-                  "version_added": true
-                },
+                "opera": "mirror",
                 "safari": {
                   "version_added": false
                 },
@@ -182,7 +182,7 @@
               }
             }
           },
-          "autofillCreditCardEnabled": {
+          "autofillAddressEnabled": {
             "__compat": {
               "support": {
                 "chrome": {
@@ -203,20 +203,20 @@
               }
             }
           },
-          "autofillEnabled": {
+          "autofillCreditCardEnabled": {
             "__compat": {
               "support": {
                 "chrome": {
-                  "version_added": true
-                },
-                "edge": {
-                  "version_added": "79"
+                  "version_added": "70"
                 },
+                "edge": "mirror",
                 "firefox": {
                   "version_added": false
                 },
                 "firefox_android": "mirror",
-                "opera": "mirror",
+                "opera": {
+                  "version_added": true
+                },
                 "safari": {
                   "version_added": false
                 },
@@ -224,7 +224,7 @@
               }
             }
           },
-          "alternateErrorPagesEnabled": {
+          "autofillEnabled": {
             "__compat": {
               "support": {
                 "chrome": {
diff --git a/webextensions/api/tabs.json b/webextensions/api/tabs.json
index c230d168eeea4e..fd748808b5a2ec 100644
--- a/webextensions/api/tabs.json
+++ b/webextensions/api/tabs.json
@@ -579,32 +579,6 @@
             }
           }
         },
-        "TAB_ID_NONE": {
-          "__compat": {
-            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/tabs/TAB_ID_NONE",
-            "support": {
-              "chrome": {
-                "version_added": "46"
-              },
-              "edge": {
-                "version_added": "14"
-              },
-              "firefox": {
-                "version_added": "45"
-              },
-              "firefox_android": {
-                "version_added": "54"
-              },
-              "opera": "mirror",
-              "safari": {
-                "version_added": "14"
-              },
-              "safari_ios": {
-                "version_added": "15"
-              }
-            }
-          }
-        },
         "Tab": {
           "active": {
             "__compat": {
@@ -1206,6 +1180,32 @@
             }
           }
         },
+        "TAB_ID_NONE": {
+          "__compat": {
+            "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/tabs/TAB_ID_NONE",
+            "support": {
+              "chrome": {
+                "version_added": "46"
+              },
+              "edge": {
+                "version_added": "14"
+              },
+              "firefox": {
+                "version_added": "45"
+              },
+              "firefox_android": {
+                "version_added": "54"
+              },
+              "opera": "mirror",
+              "safari": {
+                "version_added": "14"
+              },
+              "safari_ios": {
+                "version_added": "15"
+              }
+            }
+          }
+        },
         "TabStatus": {
           "__compat": {
             "mdn_url": "https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/tabs/TabStatus",