diff --git a/after/syntax/css/box-4.vim b/after/syntax/css/box-4.vim
index f354c0a..3978302 100644
--- a/after/syntax/css/box-4.vim
+++ b/after/syntax/css/box-4.vim
@@ -1,2 +1,2 @@
-syn keyword cssBoxProp contained margin-trim
-syn keyword cssBoxAttr contained in-flow
+syn keyword cssFontProp contained margin-trim
+syn keyword cssFontAttr contained in-flow
diff --git a/after/syntax/css/break-4.vim b/after/syntax/css/break-4.vim
index 105ded4..737f3d1 100644
--- a/after/syntax/css/break-4.vim
+++ b/after/syntax/css/break-4.vim
@@ -1,2 +1,2 @@
-syn keyword cssBoxProp contained margin-break
+syn keyword cssFontProp contained margin-break
 syn keyword cssFontAttr contained keep
diff --git a/after/syntax/css/cascade-4.vim b/after/syntax/css/cascade-4.vim
index 094a570..d9e2d20 100644
--- a/after/syntax/css/cascade-4.vim
+++ b/after/syntax/css/cascade-4.vim
@@ -1,2 +1,2 @@
-syn keyword cssCommonAttr contained revert
+syn keyword cssFontAttr contained revert
 syn region cssURL contained matchgroup=cssFunctionName start="\<supports\s*(" end=")" oneline keepend
diff --git a/after/syntax/css/color-adjust-1.vim b/after/syntax/css/color-adjust-1.vim
index 41988a6..a730631 100644
--- a/after/syntax/css/color-adjust-1.vim
+++ b/after/syntax/css/color-adjust-1.vim
@@ -1,2 +1,2 @@
-syn keyword cssColorProp contained forced-color-adjust print-color-adjust color-adjust color-scheme
+syn keyword cssFontProp contained forced-color-adjust print-color-adjust color-adjust color-scheme
 syn keyword cssFontAttr contained economy exact
diff --git a/after/syntax/css/content-3.vim b/after/syntax/css/content-3.vim
index 5afec3a..bd16efe 100644
--- a/after/syntax/css/content-3.vim
+++ b/after/syntax/css/content-3.vim
@@ -1,3 +1,3 @@
-syn keyword cssGeneratedContentProp contained string-set bookmark-label bookmark-level bookmark-state
-syn keyword cssGeneratedContentAttr contained open closed
+syn keyword cssFontProp contained string-set bookmark-label bookmark-level bookmark-state
+syn keyword cssFontAttr contained open closed
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(leader\|string\|target-\(counter\|counters\|text\)\)\s*(" end=")" oneline keepend
diff --git a/after/syntax/css/counter-styles-3.vim b/after/syntax/css/counter-styles-3.vim
index 0edcbf4..d83468a 100644
--- a/after/syntax/css/counter-styles-3.vim
+++ b/after/syntax/css/counter-styles-3.vim
@@ -1,4 +1,4 @@
-syn keyword cssGeneratedContentProp contained system negative prefix suffix range pad fallback additive-symbols symbols speak-as
-syn keyword cssGeneratedContentAttr contained cyclic symbolic additive extends bullets numbers words bengali cambodian khmer devanagari gujarati gurmukhi kannada lao malayalam mongolian myanmar oriya persian tamil telugu thai tibetan ethiopic-numeric numeric arabic-indic upper-armenian lower-armenian cjk-decimal cjk-earthly-branch cjk-heavenly-stem disclosure-open disclosure-closed japanese-formal korean-hanja-formal simp-chinese-formal trad-chinese-formal japanese-informal korean-hanja-informal simp-chinese-informal trad-chinese-informal korean-hangul-formal
+syn keyword cssFontProp contained system negative prefix suffix range pad fallback additive-symbols symbols speak-as
+syn keyword cssFontAttr contained cyclic symbolic additive extends bullets numbers words bengali cambodian khmer devanagari gujarati gurmukhi kannada lao malayalam mongolian myanmar oriya persian tamil telugu thai tibetan ethiopic-numeric numeric arabic-indic upper-armenian lower-armenian cjk-decimal cjk-earthly-branch cjk-heavenly-stem disclosure-open disclosure-closed japanese-formal korean-hanja-formal simp-chinese-formal trad-chinese-formal japanese-informal korean-hanja-informal simp-chinese-informal trad-chinese-informal korean-hangul-formal
 syn region cssFunction contained matchgroup=cssFunctionName start="\<symbols\s*(" end=")" oneline keepend
 syn match cssFontDescriptor "@counter-style\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl
diff --git a/after/syntax/css/display-3.vim b/after/syntax/css/display-3.vim
index 7a6c2af..4e37dd1 100644
--- a/after/syntax/css/display-3.vim
+++ b/after/syntax/css/display-3.vim
@@ -1,2 +1 @@
-syn keyword cssFontAttr contained contents
-syn keyword cssBoxAttr contained run-in
+syn keyword cssFontAttr contained contents run-in
diff --git a/after/syntax/css/gcpm-3.vim b/after/syntax/css/gcpm-3.vim
index a5d295f..4bad3c6 100644
--- a/after/syntax/css/gcpm-3.vim
+++ b/after/syntax/css/gcpm-3.vim
@@ -1,4 +1,4 @@
-syn keyword cssGeneratedContentProp contained running footnote-display footnote-policy
-syn keyword cssGeneratedContentAttr contained footnote line
+syn keyword cssFontProp contained running footnote-display footnote-policy
+syn keyword cssFontAttr contained footnote line
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(element\|running\)\s*(" end=")" oneline keepend
 syn keyword cssPseudoClassId contained footnote-call footnote-marker
diff --git a/after/syntax/css/lists-3.vim b/after/syntax/css/lists-3.vim
index 4380aa5..3065968 100644
--- a/after/syntax/css/lists-3.vim
+++ b/after/syntax/css/lists-3.vim
@@ -1,3 +1,3 @@
-syn keyword cssGeneratedContentProp contained marker-side counter-set
-syn keyword cssGeneratedContentAttr contained marker contained match-self contained list-container
+syn keyword cssFontProp contained marker-side counter-set
+syn keyword cssFontAttr contained marker contained match-self contained list-container
 syn region cssFunction contained matchgroup=cssFunctionName start="\<counters\s*(" end=")" oneline keepend
diff --git a/after/syntax/css/page-floats-3.vim b/after/syntax/css/page-floats-3.vim
index d5d360c..9d675fa 100644
--- a/after/syntax/css/page-floats-3.vim
+++ b/after/syntax/css/page-floats-3.vim
@@ -1,3 +1,3 @@
-syn keyword cssPositioningProp contained float-reference float-defer float-offset
-syn keyword cssPositioningAttr contained inline-start inline-end snap-block snap-inline
+syn keyword cssFontProp contained float-reference float-defer float-offset
+syn keyword cssFontAttr contained inline-start inline-end snap-block snap-inline
 syn region cssURL contained matchgroup=cssFunctionName start="\<snap-\(block\|inline\)\s*(" end=")" oneline keepend
diff --git a/after/syntax/css/round-display-1.vim b/after/syntax/css/round-display-1.vim
index f62b109..8cd2eaa 100644
--- a/after/syntax/css/round-display-1.vim
+++ b/after/syntax/css/round-display-1.vim
@@ -1,3 +1,2 @@
-syn keyword cssFontProp contained shape-inside border-boundary polar-angle polar-distance
+syn keyword cssFontProp contained shape-inside border-boundary polar-angle polar-distance device-radius
 syn keyword cssFontAttr contained parent polar contained outside-shape contained shape-box
-syn keyword cssMediaProp contained device-radius
diff --git a/after/syntax/css/speech-1.vim b/after/syntax/css/speech-1.vim
index 27473fe..7097c5b 100644
--- a/after/syntax/css/speech-1.vim
+++ b/after/syntax/css/speech-1.vim
@@ -1,3 +1,3 @@
-syn keyword cssAuralProp contained voice-volume voice-balance voice-rate voice-pitch voice-range voice-stress voice-duration rest rest-before rest-after
-syn keyword cssAuralAttr contained young old neutral preserve moderate reduced literal-punctuation no-punctuation weak x-weak strong x-strong
+syn keyword cssFontProp contained voice-volume voice-balance voice-rate voice-pitch voice-range voice-stress voice-duration rest rest-before rest-after
+syn keyword cssFontAttr contained young old neutral preserve moderate reduced literal-punctuation no-punctuation weak x-weak strong x-strong
 syn match cssValueNumber contained "[-+]\=\d\+\(dB\|st\)"
diff --git a/after/syntax/css/text-3.vim b/after/syntax/css/text-3.vim
index f303d03..848119b 100644
--- a/after/syntax/css/text-3.vim
+++ b/after/syntax/css/text-3.vim
@@ -1,2 +1,2 @@
-syn keyword cssTextProp contained tab-size text-align-all
-syn keyword cssTextAttr contained loose strict hanging anywhere match-parent each-line full-width justify-all break-spaces
+syn keyword cssFontProp contained tab-size text-align-all
+syn keyword cssFontAttr contained loose strict hanging anywhere match-parent each-line full-width justify-all break-spaces
diff --git a/after/syntax/css/text-4.vim b/after/syntax/css/text-4.vim
index 798b344..59449f4 100644
--- a/after/syntax/css/text-4.vim
+++ b/after/syntax/css/text-4.vim
@@ -1,2 +1,2 @@
-syn keyword cssTextProp contained text-space-collapse text-space-trim text-wrap text-spacing text-group-align wrap-before wrap-after wrap-inside hyphenate-character hyphenate-limit-zone hyphenate-limit-chars hyphenate-limit-lines hyphenate-limit-last line-padding word-boundary-detection word-boundary-expansion
-syn keyword cssTextAttr contained spread punctuation preserve-breaks preserve-spaces trim-inner discard-before discard-after avoid-line avoid-flex pre-wrap-auto no-limit trim-start trim-end trim-adjacent space-start space-end space-adjacent space-first no-compress ideograph-alpha ideograph-numeric ideographic-space
+syn keyword cssFontProp contained text-space-collapse text-space-trim text-wrap text-spacing text-group-align wrap-before wrap-after wrap-inside hyphenate-character hyphenate-limit-zone hyphenate-limit-chars hyphenate-limit-lines hyphenate-limit-last line-padding word-boundary-detection word-boundary-expansion
+syn keyword cssFontAttr contained spread punctuation preserve-breaks preserve-spaces trim-inner discard-before discard-after avoid-line avoid-flex pre-wrap-auto no-limit trim-start trim-end trim-adjacent space-start space-end space-adjacent space-first no-compress ideograph-alpha ideograph-numeric ideographic-space
diff --git a/after/syntax/css/text-decor-3.vim b/after/syntax/css/text-decor-3.vim
index bd966a2..c0487c1 100644
--- a/after/syntax/css/text-decor-3.vim
+++ b/after/syntax/css/text-decor-3.vim
@@ -1,2 +1,2 @@
-syn keyword cssTextProp contained text-decoration-color text-decoration-line text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style
-syn keyword cssTextAttr contained wavy alphabetic ink under filled dot triangle sesame over
+syn keyword cssFontProp contained text-decoration-color text-decoration-line text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style
+syn keyword cssFontAttr contained wavy alphabetic ink under filled dot triangle sesame over
diff --git a/after/syntax/css/text-decor-4.vim b/after/syntax/css/text-decor-4.vim
index c506a82..b2369d5 100644
--- a/after/syntax/css/text-decor-4.vim
+++ b/after/syntax/css/text-decor-4.vim
@@ -1,2 +1,2 @@
-syn keyword cssTextProp contained text-decoration-thickness text-underline-offset text-decoration-skip text-decoration-skip-ink text-emphasis-skip
-syn keyword cssTextAttr contained objects edges symbols narrow spelling-error grammer-error from-font spaces leading-spaces trailing-spaces box-decoration
+syn keyword cssFontProp contained text-decoration-thickness text-underline-offset text-decoration-skip text-decoration-skip-ink text-emphasis-skip
+syn keyword cssFontAttr contained objects edges symbols narrow spelling-error grammer-error from-font spaces leading-spaces trailing-spaces box-decoration
diff --git a/after/syntax/css/ui-3.vim b/after/syntax/css/ui-3.vim
index 3f12565..8184cdb 100644
--- a/after/syntax/css/ui-3.vim
+++ b/after/syntax/css/ui-3.vim
@@ -1,2 +1,2 @@
-syn keyword cssUIProp contained caret-color
-syn keyword cssUIAttr contained grab grabbing
+syn keyword cssFontProp contained caret-color
+syn keyword cssFontAttr contained grab grabbing
diff --git a/after/syntax/css/ui-4.vim b/after/syntax/css/ui-4.vim
index cebc219..647fbf8 100644
--- a/after/syntax/css/ui-4.vim
+++ b/after/syntax/css/ui-4.vim
@@ -1,3 +1,3 @@
-syn keyword cssUIProp contained caret caret-shape
-syn keyword cssUIAttr contained fade underscore
+syn keyword cssFontProp contained caret caret-shape
+syn keyword cssFontAttr contained fade underscore
 syn region cssFunction contained matchgroup=cssFunctionName start="\<fade\s*(" end=")" oneline keepend