diff --git a/css/at-rules.json b/css/at-rules.json
index 1cd7298d..24b8357a 100644
--- a/css/at-rules.json
+++ b/css/at-rules.json
@@ -123,8 +123,7 @@
   "@document": {
     "syntax": "@document [ <url> | url-prefix(<string>) | domain(<string>) | media-document(<string>) | regexp(<string>) ]# {\n  <group-rule-body>\n}",
     "interfaces": [
-      "CSSGroupingRule",
-      "CSSConditionRule"
+      "CSSDocumentRule"
     ],
     "groups": [
       "CSS Conditional Rules"
@@ -288,6 +287,9 @@
   },
   "@font-palette-values": {
     "syntax": "@font-palette-values <dashed-ident> {\n  <declaration-list>\n}",
+    "interfaces": [
+      "CSSFontPaletteValuesRule"
+    ],
     "groups": [
       "CSS Fonts"
     ],
@@ -328,6 +330,9 @@
   },
   "@import": {
     "syntax": "@import [ <string> | <url> ]\n        [ layer | layer(<layer-name>) ]?\n        [ supports( [ <supports-condition> | <declaration> ] ) ]?\n        <media-query-list>? ;",
+    "interfaces": [
+      "CSSImportRule"
+    ],
     "groups": [
       "CSS Conditional Rules",
       "Media Queries"
@@ -362,10 +367,7 @@
   "@media": {
     "syntax": "@media <media-query-list> {\n  <group-rule-body>\n}",
     "interfaces": [
-      "CSSGroupingRule",
-      "CSSConditionRule",
-      "CSSMediaRule",
-      "CSSCustomMediaRule"
+      "CSSMediaRule"
     ],
     "groups": [
       "CSS Conditional Rules",
@@ -376,6 +378,9 @@
   },
   "@namespace": {
     "syntax": "@namespace <namespace-prefix>? [ <string> | <url> ];",
+    "interfaces": [
+      "CSSNamespaceRule"
+    ],
     "groups": [
       "CSS Namespaces"
     ],
@@ -459,7 +464,6 @@
   "@property": {
     "syntax": "@property <custom-property-name> {\n  <declaration-list>\n}",
     "interfaces": [
-      "CSS",
       "CSSPropertyRule"
     ],
     "groups": [
@@ -502,6 +506,9 @@
   },
   "@scope": {
     "syntax": "@scope [(<scope-start>)]? [to (<scope-end>)]? {\n  <rule-list>\n}",
+    "interfaces": [
+      "CSSScopeRule"
+    ],
     "groups": [
       "CSS Conditional Rules"
     ],
@@ -522,8 +529,6 @@
   "@supports": {
     "syntax": "@supports <supports-condition> {\n  <group-rule-body>\n}",
     "interfaces": [
-      "CSSGroupingRule",
-      "CSSConditionRule",
       "CSSSupportsRule"
     ],
     "groups": [