diff --git a/features/text-wrap-balance.yml b/features/text-wrap-balance.yml
index 91dc1115463..9ecd3d6a3be 100644
--- a/features/text-wrap-balance.yml
+++ b/features/text-wrap-balance.yml
@@ -2,3 +2,8 @@ name: "text-wrap: balance"
 description: "The `text-wrap: balance` CSS declaration balances the length of each line when text is broken into multiple lines. Also known as headline balancing."
 spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-balance
 group: text-wrap
+status:
+  compute_from: css.properties.text-wrap.balance
+compat_features:
+  - css.properties.text-wrap.balance
+  - css.properties.text-wrap-style.balance
diff --git a/features/text-wrap-balance.yml.dist b/features/text-wrap-balance.yml.dist
index c92bb219faf..bf7527fa22e 100644
--- a/features/text-wrap-balance.yml.dist
+++ b/features/text-wrap-balance.yml.dist
@@ -13,4 +13,27 @@ status:
     safari: "17.5"
     safari_ios: "17.5"
 compat_features:
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: low
+  # baseline_low_date: 2024-05-13
+  # support:
+  #   chrome: "114"
+  #   chrome_android: "114"
+  #   edge: "114"
+  #   firefox: "121"
+  #   firefox_android: "121"
+  #   safari: "17.5"
+  #   safari_ios: "17.5"
   - css.properties.text-wrap.balance
+
+  # baseline: low
+  # baseline_low_date: 2024-10-17
+  # support:
+  #   chrome: "130"
+  #   chrome_android: "130"
+  #   edge: "130"
+  #   firefox: "124"
+  #   firefox_android: "124"
+  #   safari: "17.5"
+  #   safari_ios: "17.5"
+  - css.properties.text-wrap-style.balance
diff --git a/features/text-wrap-mode.yml b/features/text-wrap-mode.yml
deleted file mode 100644
index c1b967dcd95..00000000000
--- a/features/text-wrap-mode.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: text-wrap-mode
-description: The `text-wrap-mode` CSS property sets whether lines may wrap with the values `wrap` and `nowrap`. It is a longhand property for both `white-space` and `text-wrap`.
-spec: https://drafts.csswg.org/css-text-4/#text-wrap-mode
-group:
-  - white-space
-  - text-wrap
-compat_features:
-  - css.properties.text-wrap-mode
-  - css.properties.text-wrap-mode.nowrap
-  - css.properties.text-wrap-mode.wrap
diff --git a/features/text-wrap-mode.yml.dist b/features/text-wrap-mode.yml.dist
deleted file mode 100644
index c81a2d43bfc..00000000000
--- a/features/text-wrap-mode.yml.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated from: text-wrap-mode.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: low
-  baseline_low_date: 2024-10-17
-  support:
-    chrome: "130"
-    chrome_android: "130"
-    edge: "130"
-    firefox: "124"
-    firefox_android: "124"
-    safari: "17.4"
-    safari_ios: "17.4"
-compat_features:
-  - css.properties.text-wrap-mode
-  - css.properties.text-wrap-mode.nowrap
-  - css.properties.text-wrap-mode.wrap
diff --git a/features/text-wrap-nowrap.yml b/features/text-wrap-nowrap.yml
deleted file mode 100644
index 85f77546e9c..00000000000
--- a/features/text-wrap-nowrap.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: "text-wrap: nowrap"
-description: "The `text-wrap: nowrap` CSS declaration prevents text breaking into multiple lines. Text that doesn't fit overflows instead."
-spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-mode-nowrap
-group: text-wrap
-compat_features:
-  - css.properties.text-wrap.nowrap
diff --git a/features/text-wrap-nowrap.yml.dist b/features/text-wrap-nowrap.yml.dist
deleted file mode 100644
index 9e0e7396a1f..00000000000
--- a/features/text-wrap-nowrap.yml.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from: text-wrap-nowrap.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: low
-  baseline_low_date: 2024-03-19
-  support:
-    chrome: "114"
-    chrome_android: "114"
-    edge: "114"
-    firefox: "124"
-    firefox_android: "124"
-    safari: "17.4"
-    safari_ios: "17.4"
-compat_features:
-  - css.properties.text-wrap.nowrap
diff --git a/features/text-wrap-pretty.yml b/features/text-wrap-pretty.yml
index 69e68d0f19d..8451afc723c 100644
--- a/features/text-wrap-pretty.yml
+++ b/features/text-wrap-pretty.yml
@@ -2,3 +2,8 @@ name: "text-wrap: pretty"
 description: "The `text-wrap: pretty` CSS declaration prioritizes better layout over speed when text is broken into multiple lines."
 spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-pretty
 group: text-wrap
+status:
+  compute_from: css.properties.text-wrap.pretty
+compat_features:
+  - css.properties.text-wrap.pretty
+  - css.properties.text-wrap-style.pretty
diff --git a/features/text-wrap-pretty.yml.dist b/features/text-wrap-pretty.yml.dist
index 887837c8b8f..b74bfb6f91d 100644
--- a/features/text-wrap-pretty.yml.dist
+++ b/features/text-wrap-pretty.yml.dist
@@ -8,4 +8,17 @@ status:
     chrome_android: "117"
     edge: "117"
 compat_features:
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: false
+  # support:
+  #   chrome: "117"
+  #   chrome_android: "117"
+  #   edge: "117"
   - css.properties.text-wrap.pretty
+
+  # baseline: false
+  # support:
+  #   chrome: "130"
+  #   chrome_android: "130"
+  #   edge: "130"
+  - css.properties.text-wrap-style.pretty
diff --git a/features/text-wrap-stable.yml b/features/text-wrap-stable.yml
deleted file mode 100644
index ac17d387364..00000000000
--- a/features/text-wrap-stable.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: "text-wrap: stable"
-description: "The `text-wrap: stable` CSS declaration wraps text using the default algorithm, but does not change wrapping on earlier lines while the text is being edited."
-spec: https://drafts.csswg.org/css-text-4/#valdef-text-wrap-style-stable
-group: text-wrap
-compat_features:
-  - css.properties.text-wrap.stable
diff --git a/features/text-wrap-stable.yml.dist b/features/text-wrap-stable.yml.dist
deleted file mode 100644
index ffe36518b0b..00000000000
--- a/features/text-wrap-stable.yml.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from: text-wrap-stable.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: low
-  baseline_low_date: 2024-10-17
-  support:
-    chrome: "130"
-    chrome_android: "130"
-    edge: "130"
-    firefox: "121"
-    firefox_android: "121"
-    safari: "17.5"
-    safari_ios: "17.5"
-compat_features:
-  - css.properties.text-wrap.stable
diff --git a/features/text-wrap-style.yml b/features/text-wrap-style.yml
deleted file mode 100644
index 93b93a8e640..00000000000
--- a/features/text-wrap-style.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: text-wrap-style
-description: The `text-wrap-style` CSS property sets how lines break in text that overflows the container. It can also be set with the `text-wrap` shorthand.
-spec: https://drafts.csswg.org/css-text-4/#text-wrap-style
-group: text-wrap
-compat_features:
-  - css.properties.text-wrap-style
-  - css.properties.text-wrap-style.auto
-  - css.properties.text-wrap-style.balance
-  - css.properties.text-wrap-style.pretty
-  - css.properties.text-wrap-style.stable
diff --git a/features/text-wrap-style.yml.dist b/features/text-wrap-style.yml.dist
deleted file mode 100644
index 279c7362d7c..00000000000
--- a/features/text-wrap-style.yml.dist
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated from: text-wrap-style.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: false
-  support:
-    chrome: "130"
-    chrome_android: "130"
-    edge: "130"
-compat_features:
-  # baseline: low
-  # baseline_low_date: 2024-10-17
-  # support:
-  #   chrome: "130"
-  #   chrome_android: "130"
-  #   edge: "130"
-  #   firefox: "124"
-  #   firefox_android: "124"
-  #   safari: "17.5"
-  #   safari_ios: "17.5"
-  - css.properties.text-wrap-style
-  - css.properties.text-wrap-style.auto
-  - css.properties.text-wrap-style.balance
-  - css.properties.text-wrap-style.stable
-
-  # ⬇️ Same status as overall feature ⬇️
-  # baseline: false
-  # support:
-  #   chrome: "130"
-  #   chrome_android: "130"
-  #   edge: "130"
-  - css.properties.text-wrap-style.pretty
diff --git a/features/text-wrap.yml b/features/text-wrap.yml
index e065c89e869..83ab285ab46 100644
--- a/features/text-wrap.yml
+++ b/features/text-wrap.yml
@@ -2,6 +2,19 @@ name: text-wrap
 description: The `text-wrap` CSS property sets how lines break in text that overflows the container. It is a shorthand for `text-wrap-style` and `text-wrap-mode`.
 spec: https://drafts.csswg.org/css-text-4/#text-wrap-shorthand
 group: text-wrap
+status:
+  compute_from:
+  - css.properties.text-wrap
+  - css.properties.text-wrap-mode
+  - css.properties.text-wrap-style
 compat_features:
   - css.properties.text-wrap
   - css.properties.text-wrap.wrap
+  - css.properties.text-wrap-mode
+  - css.properties.text-wrap-mode.nowrap
+  - css.properties.text-wrap-mode.wrap
+  - css.properties.text-wrap.nowrap
+  - css.properties.text-wrap.stable
+  - css.properties.text-wrap-style
+  - css.properties.text-wrap-style.auto
+  - css.properties.text-wrap-style.stable
diff --git a/features/text-wrap.yml.dist b/features/text-wrap.yml.dist
index f7c59d5b374..697f2d26c49 100644
--- a/features/text-wrap.yml.dist
+++ b/features/text-wrap.yml.dist
@@ -3,15 +3,15 @@
 
 status:
   baseline: low
-  baseline_low_date: 2024-03-19
+  baseline_low_date: 2024-10-17
   support:
-    chrome: "114"
-    chrome_android: "114"
-    edge: "114"
+    chrome: "130"
+    chrome_android: "130"
+    edge: "130"
     firefox: "124"
     firefox_android: "124"
-    safari: "17.4"
-    safari_ios: "17.4"
+    safari: "17.5"
+    safari_ios: "17.5"
 compat_features:
   # baseline: low
   # baseline_low_date: 2024-03-05
@@ -25,7 +25,6 @@ compat_features:
   #   safari_ios: "17.4"
   - css.properties.text-wrap
 
-  # ⬇️ Same status as overall feature ⬇️
   # baseline: low
   # baseline_low_date: 2024-03-19
   # support:
@@ -36,4 +35,46 @@ compat_features:
   #   firefox_android: "124"
   #   safari: "17.4"
   #   safari_ios: "17.4"
+  - css.properties.text-wrap.nowrap
   - css.properties.text-wrap.wrap
+
+  # baseline: low
+  # baseline_low_date: 2024-10-17
+  # support:
+  #   chrome: "130"
+  #   chrome_android: "130"
+  #   edge: "130"
+  #   firefox: "121"
+  #   firefox_android: "121"
+  #   safari: "17.5"
+  #   safari_ios: "17.5"
+  - css.properties.text-wrap.stable
+
+  # baseline: low
+  # baseline_low_date: 2024-10-17
+  # support:
+  #   chrome: "130"
+  #   chrome_android: "130"
+  #   edge: "130"
+  #   firefox: "124"
+  #   firefox_android: "124"
+  #   safari: "17.4"
+  #   safari_ios: "17.4"
+  - css.properties.text-wrap-mode
+  - css.properties.text-wrap-mode.nowrap
+  - css.properties.text-wrap-mode.wrap
+
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: low
+  # baseline_low_date: 2024-10-17
+  # support:
+  #   chrome: "130"
+  #   chrome_android: "130"
+  #   edge: "130"
+  #   firefox: "124"
+  #   firefox_android: "124"
+  #   safari: "17.5"
+  #   safari_ios: "17.5"
+  - css.properties.text-wrap-style
+  - css.properties.text-wrap-style.auto
+  - css.properties.text-wrap-style.stable