diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs
index c50961cb72..766de3faac 100644
--- a/crates/theme2/src/themes/andromeda.rs
+++ b/crates/theme2/src/themes/andromeda.rs
@@ -95,13 +95,19 @@ pub fn andromeda() -> UserThemeFamily {
                     ..Default::default()
                 },
                 status: StatusColorsRefinement {
+                    conflict: Some(rgba(0xfee56dff).into()),
                     created: Some(rgba(0x96df72ff).into()),
-                    deleted: Some(rgba(0xcd1d5aff).into()),
+                    deleted: Some(rgba(0xf82872ff).into()),
                     error: Some(rgba(0xf82872ff).into()),
-                    hint: Some(rgba(0x618399ff).into()),
+                    hidden: Some(rgba(0x6b6b73ff).into()),
+                    hint: Some(rgba(0x11a793ff).into()),
+                    ignored: Some(rgba(0xaca8aeff).into()),
+                    info: Some(rgba(0x11a793ff).into()),
                     modified: Some(rgba(0xfee56dff).into()),
-                    predictive: Some(rgba(0x315f70ff).into()),
-                    success: Some(rgba(0xf7f7f8ff).into()),
+                    predictive: Some(rgba(0x96df72ff).into()),
+                    renamed: Some(rgba(0x11a793ff).into()),
+                    success: Some(rgba(0x96df72ff).into()),
+                    unreachable: Some(rgba(0xaca8aeff).into()),
                     warning: Some(rgba(0xfee56dff).into()),
                     ..Default::default()
                 },
diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs
index 460af35963..ff4c212bc4 100644
--- a/crates/theme2/src/themes/atelier.rs
+++ b/crates/theme2/src/themes/atelier.rs
@@ -96,13 +96,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x98ab54ff).into()),
+                        conflict: Some(rgba(0xa59810ff).into()),
+                        created: Some(rgba(0x7d9728ff).into()),
                         deleted: Some(rgba(0xba6337ff).into()),
                         error: Some(rgba(0xba6337ff).into()),
-                        hint: Some(rgba(0x768962ff).into()),
+                        hidden: Some(rgba(0x767463ff).into()),
+                        hint: Some(rgba(0x38a166ff).into()),
+                        ignored: Some(rgba(0x61604fff).into()),
+                        info: Some(rgba(0x38a166ff).into()),
                         modified: Some(rgba(0xa59810ff).into()),
-                        predictive: Some(rgba(0x879a72ff).into()),
-                        success: Some(rgba(0x22221bff).into()),
+                        predictive: Some(rgba(0x7d9728ff).into()),
+                        renamed: Some(rgba(0x38a166ff).into()),
+                        success: Some(rgba(0x7d9728ff).into()),
+                        unreachable: Some(rgba(0x61604fff).into()),
                         warning: Some(rgba(0xa59810ff).into()),
                         ..Default::default()
                     },
@@ -527,13 +533,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xc38419ff).into()),
                         created: Some(rgba(0x7b9727ff).into()),
-                        deleted: Some(rgba(0xc82234ff).into()),
+                        deleted: Some(rgba(0xf22d40ff).into()),
                         error: Some(rgba(0xf22d40ff).into()),
-                        hint: Some(rgba(0xa87187ff).into()),
+                        hidden: Some(rgba(0x8e8683ff).into()),
+                        hint: Some(rgba(0x417ee6ff).into()),
+                        ignored: Some(rgba(0xa79f9dff).into()),
+                        info: Some(rgba(0x417ee6ff).into()),
                         modified: Some(rgba(0xc38419ff).into()),
-                        predictive: Some(rgba(0x8f5b71ff).into()),
-                        success: Some(rgba(0xf1efeeff).into()),
+                        predictive: Some(rgba(0x7b9727ff).into()),
+                        renamed: Some(rgba(0x417ee6ff).into()),
+                        success: Some(rgba(0x7b9727ff).into()),
+                        unreachable: Some(rgba(0xa79f9dff).into()),
                         warning: Some(rgba(0xc38419ff).into()),
                         ..Default::default()
                     },
@@ -958,13 +970,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x6fae80ff).into()),
+                        conflict: Some(rgba(0xa07e3cff).into()),
+                        created: Some(rgba(0x499963ff).into()),
                         deleted: Some(rgba(0xb1623aff).into()),
                         error: Some(rgba(0xb1623aff).into()),
-                        hint: Some(rgba(0x66847cff).into()),
+                        hidden: Some(rgba(0x68766dff).into()),
+                        hint: Some(rgba(0x488c90ff).into()),
+                        ignored: Some(rgba(0x546259ff).into()),
+                        info: Some(rgba(0x488c90ff).into()),
                         modified: Some(rgba(0xa07e3cff).into()),
-                        predictive: Some(rgba(0x76958cff).into()),
-                        success: Some(rgba(0x171c19ff).into()),
+                        predictive: Some(rgba(0x499963ff).into()),
+                        renamed: Some(rgba(0x488c90ff).into()),
+                        success: Some(rgba(0x499963ff).into()),
+                        unreachable: Some(rgba(0x546259ff).into()),
                         warning: Some(rgba(0xa07e3cff).into()),
                         ..Default::default()
                     },
@@ -1389,13 +1407,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xa06e3bff).into()),
                         created: Some(rgba(0x2c9292ff).into()),
-                        deleted: Some(rgba(0x953a5fff).into()),
+                        deleted: Some(rgba(0xbe4678ff).into()),
                         error: Some(rgba(0xbe4678ff).into()),
-                        hint: Some(rgba(0x716998ff).into()),
+                        hidden: Some(rgba(0x756f7eff).into()),
+                        hint: Some(rgba(0x576ddaff).into()),
+                        ignored: Some(rgba(0x898591ff).into()),
+                        info: Some(rgba(0x576ddaff).into()),
                         modified: Some(rgba(0xa06e3bff).into()),
-                        predictive: Some(rgba(0x625887ff).into()),
-                        success: Some(rgba(0xefecf4ff).into()),
+                        predictive: Some(rgba(0x2c9292ff).into()),
+                        renamed: Some(rgba(0x576ddaff).into()),
+                        success: Some(rgba(0x2c9292ff).into()),
+                        unreachable: Some(rgba(0x898591ff).into()),
                         warning: Some(rgba(0xa06e3bff).into()),
                         ..Default::default()
                     },
@@ -1820,13 +1844,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xa59810ff).into()),
                         created: Some(rgba(0x7d9727ff).into()),
-                        deleted: Some(rgba(0x934e2dff).into()),
+                        deleted: Some(rgba(0xba6237ff).into()),
                         error: Some(rgba(0xba6237ff).into()),
-                        hint: Some(rgba(0x70825bff).into()),
+                        hidden: Some(rgba(0x7d7c6aff).into()),
+                        hint: Some(rgba(0x37a166ff).into()),
+                        ignored: Some(rgba(0x91907fff).into()),
+                        info: Some(rgba(0x37a166ff).into()),
                         modified: Some(rgba(0xa59810ff).into()),
-                        predictive: Some(rgba(0x5f724cff).into()),
-                        success: Some(rgba(0xf4f3ecff).into()),
+                        predictive: Some(rgba(0x7d9727ff).into()),
+                        renamed: Some(rgba(0x37a166ff).into()),
+                        success: Some(rgba(0x7d9727ff).into()),
+                        unreachable: Some(rgba(0x91907fff).into()),
                         warning: Some(rgba(0xa59810ff).into()),
                         ..Default::default()
                     },
@@ -2251,13 +2281,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xc08b31ff).into()),
                         created: Some(rgba(0xac973aff).into()),
-                        deleted: Some(rgba(0xa33a1eff).into()),
+                        deleted: Some(rgba(0xc94923ff).into()),
                         error: Some(rgba(0xc94923ff).into()),
-                        hint: Some(rgba(0x6d82a6ff).into()),
+                        hidden: Some(rgba(0x7e849eff).into()),
+                        hint: Some(rgba(0x3e8fd0ff).into()),
+                        ignored: Some(rgba(0x959bb2ff).into()),
+                        info: Some(rgba(0x3e8fd0ff).into()),
                         modified: Some(rgba(0xc08b31ff).into()),
-                        predictive: Some(rgba(0x58709aff).into()),
-                        success: Some(rgba(0xf5f7ffff).into()),
+                        predictive: Some(rgba(0xac973aff).into()),
+                        renamed: Some(rgba(0x3e8fd0ff).into()),
+                        success: Some(rgba(0xac973aff).into()),
+                        unreachable: Some(rgba(0x959bb2ff).into()),
                         warning: Some(rgba(0xc08b31ff).into()),
                         ..Default::default()
                     },
@@ -2682,13 +2718,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0xbfab61ff).into()),
+                        conflict: Some(rgba(0xc08b31ff).into()),
+                        created: Some(rgba(0xac973aff).into()),
                         deleted: Some(rgba(0xc94a23ff).into()),
                         error: Some(rgba(0xc94a23ff).into()),
-                        hint: Some(rgba(0x7087b2ff).into()),
+                        hidden: Some(rgba(0x767d9aff).into()),
+                        hint: Some(rgba(0x3f8fd0ff).into()),
+                        ignored: Some(rgba(0x606889ff).into()),
+                        info: Some(rgba(0x3f8fd0ff).into()),
                         modified: Some(rgba(0xc08b31ff).into()),
-                        predictive: Some(rgba(0x8599beff).into()),
-                        success: Some(rgba(0x202746ff).into()),
+                        predictive: Some(rgba(0xac973aff).into()),
+                        renamed: Some(rgba(0x3f8fd0ff).into()),
+                        success: Some(rgba(0xac973aff).into()),
+                        unreachable: Some(rgba(0x606889ff).into()),
                         warning: Some(rgba(0xc08b31ff).into()),
                         ..Default::default()
                     },
@@ -3113,13 +3155,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xae9515ff).into()),
                         created: Some(rgba(0x60ac3aff).into()),
-                        deleted: Some(rgba(0xaf2c2eff).into()),
+                        deleted: Some(rgba(0xd73837ff).into()),
                         error: Some(rgba(0xd73837ff).into()),
-                        hint: Some(rgba(0xb17272ff).into()),
+                        hidden: Some(rgba(0x8f8b77ff).into()),
+                        hint: Some(rgba(0x6684e0ff).into()),
+                        ignored: Some(rgba(0xa4a08bff).into()),
+                        info: Some(rgba(0x6684e0ff).into()),
                         modified: Some(rgba(0xae9515ff).into()),
-                        predictive: Some(rgba(0x9c6262ff).into()),
-                        success: Some(rgba(0xfefbecff).into()),
+                        predictive: Some(rgba(0x60ac3aff).into()),
+                        renamed: Some(rgba(0x6684e0ff).into()),
+                        success: Some(rgba(0x60ac3aff).into()),
+                        unreachable: Some(rgba(0xa4a08bff).into()),
                         warning: Some(rgba(0xae9515ff).into()),
                         ..Default::default()
                     },
@@ -3544,13 +3592,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0x98981cff).into()),
                         created: Some(rgba(0x2ba32aff).into()),
-                        deleted: Some(rgba(0xbd1331ff).into()),
+                        deleted: Some(rgba(0xe61c3cff).into()),
                         error: Some(rgba(0xe61c3cff).into()),
-                        hint: Some(rgba(0x008b9fff).into()),
+                        hidden: Some(rgba(0x778f77ff).into()),
+                        hint: Some(rgba(0x3e62f4ff).into()),
+                        ignored: Some(rgba(0x8ba48bff).into()),
+                        info: Some(rgba(0x3e62f4ff).into()),
                         modified: Some(rgba(0x98981cff).into()),
-                        predictive: Some(rgba(0x00788bff).into()),
-                        success: Some(rgba(0xf4fbf4ff).into()),
+                        predictive: Some(rgba(0x2ba32aff).into()),
+                        renamed: Some(rgba(0x3e62f4ff).into()),
+                        success: Some(rgba(0x2ba32aff).into()),
+                        unreachable: Some(rgba(0x8ba48bff).into()),
                         warning: Some(rgba(0x98981cff).into()),
                         ..Default::default()
                     },
@@ -3975,13 +4029,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x5fa8a7ff).into()),
+                        conflict: Some(rgba(0xa06e3cff).into()),
+                        created: Some(rgba(0x2c9292ff).into()),
                         deleted: Some(rgba(0xbe4778ff).into()),
                         error: Some(rgba(0xbe4778ff).into()),
-                        hint: Some(rgba(0x786e9dff).into()),
+                        hidden: Some(rgba(0x6e6876ff).into()),
+                        hint: Some(rgba(0x586ddaff).into()),
+                        ignored: Some(rgba(0x5a5462ff).into()),
+                        info: Some(rgba(0x586ddaff).into()),
                         modified: Some(rgba(0xa06e3cff).into()),
-                        predictive: Some(rgba(0x887fafff).into()),
-                        success: Some(rgba(0x19171cff).into()),
+                        predictive: Some(rgba(0x2c9292ff).into()),
+                        renamed: Some(rgba(0x586ddaff).into()),
+                        success: Some(rgba(0x2c9292ff).into()),
+                        unreachable: Some(rgba(0x5a5462ff).into()),
                         warning: Some(rgba(0xa06e3cff).into()),
                         ..Default::default()
                     },
@@ -4406,13 +4466,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xa06e3bff).into()),
                         created: Some(rgba(0x4b8b8bff).into()),
-                        deleted: Some(rgba(0xa23b3bff).into()),
+                        deleted: Some(rgba(0xca4949ff).into()),
                         error: Some(rgba(0xca4949ff).into()),
-                        hint: Some(rgba(0x8a647aff).into()),
+                        hidden: Some(rgba(0x756e6eff).into()),
+                        hint: Some(rgba(0x7272caff).into()),
+                        ignored: Some(rgba(0x898383ff).into()),
+                        info: Some(rgba(0x7272caff).into()),
                         modified: Some(rgba(0xa06e3bff).into()),
-                        predictive: Some(rgba(0x795369ff).into()),
-                        success: Some(rgba(0xf4ececff).into()),
+                        predictive: Some(rgba(0x4b8b8bff).into()),
+                        renamed: Some(rgba(0x7272caff).into()),
+                        success: Some(rgba(0x4b8b8bff).into()),
+                        unreachable: Some(rgba(0x898383ff).into()),
                         warning: Some(rgba(0xa06e3bff).into()),
                         ..Default::default()
                     },
@@ -4837,13 +4903,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xbb8a36ff).into()),
                         created: Some(rgba(0x918b3bff).into()),
-                        deleted: Some(rgba(0xa43424ff).into()),
+                        deleted: Some(rgba(0xca402cff).into()),
                         error: Some(rgba(0xca402cff).into()),
-                        hint: Some(rgba(0x8d70a8ff).into()),
+                        hidden: Some(rgba(0x908190ff).into()),
+                        hint: Some(rgba(0x526aebff).into()),
+                        ignored: Some(rgba(0xa99aa9ff).into()),
+                        info: Some(rgba(0x526aebff).into()),
                         modified: Some(rgba(0xbb8a36ff).into()),
-                        predictive: Some(rgba(0x765990ff).into()),
-                        success: Some(rgba(0xf7f3f7ff).into()),
+                        predictive: Some(rgba(0x918b3bff).into()),
+                        renamed: Some(rgba(0x526aebff).into()),
+                        success: Some(rgba(0x918b3bff).into()),
+                        unreachable: Some(rgba(0xa99aa9ff).into()),
                         warning: Some(rgba(0xbb8a36ff).into()),
                         ..Default::default()
                     },
@@ -5268,13 +5340,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0x8a8a11ff).into()),
                         created: Some(rgba(0x568c3bff).into()),
-                        deleted: Some(rgba(0xa9275aff).into()),
+                        deleted: Some(rgba(0xd22e72ff).into()),
                         error: Some(rgba(0xd22e72ff).into()),
-                        hint: Some(rgba(0x52809aff).into()),
+                        hidden: Some(rgba(0x698c9eff).into()),
+                        hint: Some(rgba(0x277fadff).into()),
+                        ignored: Some(rgba(0x7ca0b3ff).into()),
+                        info: Some(rgba(0x277fadff).into()),
                         modified: Some(rgba(0x8a8a11ff).into()),
-                        predictive: Some(rgba(0x427088ff).into()),
-                        success: Some(rgba(0xebf8ffff).into()),
+                        predictive: Some(rgba(0x568c3bff).into()),
+                        renamed: Some(rgba(0x277fadff).into()),
+                        success: Some(rgba(0x568c3bff).into()),
+                        unreachable: Some(rgba(0x7ca0b3ff).into()),
                         warning: Some(rgba(0x8a8a11ff).into()),
                         ..Default::default()
                     },
@@ -5699,13 +5777,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x97ab54ff).into()),
+                        conflict: Some(rgba(0xc3841aff).into()),
+                        created: Some(rgba(0x7b9728ff).into()),
                         deleted: Some(rgba(0xf22e41ff).into()),
                         error: Some(rgba(0xf22e41ff).into()),
-                        hint: Some(rgba(0xa67287ff).into()),
+                        hidden: Some(rgba(0x847c79ff).into()),
+                        hint: Some(rgba(0x417ee6ff).into()),
+                        ignored: Some(rgba(0x6a6360ff).into()),
+                        info: Some(rgba(0x417ee6ff).into()),
                         modified: Some(rgba(0xc3841aff).into()),
-                        predictive: Some(rgba(0xbe899eff).into()),
-                        success: Some(rgba(0x1b1918ff).into()),
+                        predictive: Some(rgba(0x7b9728ff).into()),
+                        renamed: Some(rgba(0x417ee6ff).into()),
+                        success: Some(rgba(0x7b9728ff).into()),
+                        unreachable: Some(rgba(0x6a6360ff).into()),
                         warning: Some(rgba(0xc3841aff).into()),
                         ..Default::default()
                     },
@@ -6130,13 +6214,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x83bd62ff).into()),
+                        conflict: Some(rgba(0xae9515ff).into()),
+                        created: Some(rgba(0x61ac3aff).into()),
                         deleted: Some(rgba(0xd73838ff).into()),
                         error: Some(rgba(0xd73838ff).into()),
-                        hint: Some(rgba(0xb37979ff).into()),
+                        hidden: Some(rgba(0x878471ff).into()),
+                        hint: Some(rgba(0x6784e0ff).into()),
+                        ignored: Some(rgba(0x706d5fff).into()),
+                        info: Some(rgba(0x6784e0ff).into()),
                         modified: Some(rgba(0xae9515ff).into()),
-                        predictive: Some(rgba(0xc88a8aff).into()),
-                        success: Some(rgba(0x20201dff).into()),
+                        predictive: Some(rgba(0x61ac3aff).into()),
+                        renamed: Some(rgba(0x6784e0ff).into()),
+                        success: Some(rgba(0x61ac3aff).into()),
+                        unreachable: Some(rgba(0x706d5fff).into()),
                         warning: Some(rgba(0xae9515ff).into()),
                         ..Default::default()
                     },
@@ -6561,13 +6651,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x70a2a1ff).into()),
+                        conflict: Some(rgba(0xa06e3cff).into()),
+                        created: Some(rgba(0x4c8b8bff).into()),
                         deleted: Some(rgba(0xca4a4aff).into()),
                         error: Some(rgba(0xca4a4aff).into()),
-                        hint: Some(rgba(0x916a80ff).into()),
+                        hidden: Some(rgba(0x6e6666ff).into()),
+                        hint: Some(rgba(0x7372caff).into()),
+                        ignored: Some(rgba(0x5a5252ff).into()),
+                        info: Some(rgba(0x7372caff).into()),
                         modified: Some(rgba(0xa06e3cff).into()),
-                        predictive: Some(rgba(0xa27a91ff).into()),
-                        success: Some(rgba(0x1b1818ff).into()),
+                        predictive: Some(rgba(0x4c8b8bff).into()),
+                        renamed: Some(rgba(0x7372caff).into()),
+                        success: Some(rgba(0x4c8b8bff).into()),
+                        unreachable: Some(rgba(0x5a5252ff).into()),
                         warning: Some(rgba(0xa06e3cff).into()),
                         ..Default::default()
                     },
@@ -6992,13 +7088,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x61b656ff).into()),
+                        conflict: Some(rgba(0x98981dff).into()),
+                        created: Some(rgba(0x2ba32bff).into()),
                         deleted: Some(rgba(0xe61c3dff).into()),
                         error: Some(rgba(0xe61c3dff).into()),
-                        hint: Some(rgba(0x008fa1ff).into()),
+                        hidden: Some(rgba(0x718771ff).into()),
+                        hint: Some(rgba(0x3f62f4ff).into()),
+                        ignored: Some(rgba(0x5f705fff).into()),
+                        info: Some(rgba(0x3f62f4ff).into()),
                         modified: Some(rgba(0x98981dff).into()),
-                        predictive: Some(rgba(0x00a2b5ff).into()),
-                        success: Some(rgba(0x131513ff).into()),
+                        predictive: Some(rgba(0x2ba32bff).into()),
+                        renamed: Some(rgba(0x3f62f4ff).into()),
+                        success: Some(rgba(0x2ba32bff).into()),
+                        unreachable: Some(rgba(0x5f705fff).into()),
                         warning: Some(rgba(0x98981dff).into()),
                         ..Default::default()
                     },
@@ -7423,13 +7525,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xa07e3bff).into()),
                         created: Some(rgba(0x489963ff).into()),
-                        deleted: Some(rgba(0x8b4d2fff).into()),
+                        deleted: Some(rgba(0xb16139ff).into()),
                         error: Some(rgba(0xb16139ff).into()),
-                        hint: Some(rgba(0x607e76ff).into()),
+                        hidden: Some(rgba(0x6f7e74ff).into()),
+                        hint: Some(rgba(0x478c90ff).into()),
+                        ignored: Some(rgba(0x859188ff).into()),
+                        info: Some(rgba(0x478c90ff).into()),
                         modified: Some(rgba(0xa07e3bff).into()),
-                        predictive: Some(rgba(0x506d66ff).into()),
-                        success: Some(rgba(0xecf4eeff).into()),
+                        predictive: Some(rgba(0x489963ff).into()),
+                        renamed: Some(rgba(0x478c90ff).into()),
+                        success: Some(rgba(0x489963ff).into()),
+                        unreachable: Some(rgba(0x859188ff).into()),
                         warning: Some(rgba(0xa07e3bff).into()),
                         ..Default::default()
                     },
@@ -7854,13 +7962,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0xa8a161ff).into()),
+                        conflict: Some(rgba(0xbb8a36ff).into()),
+                        created: Some(rgba(0x918b3cff).into()),
                         deleted: Some(rgba(0xca412cff).into()),
                         error: Some(rgba(0xca412cff).into()),
-                        hint: Some(rgba(0x8c70a6ff).into()),
+                        hidden: Some(rgba(0x857785ff).into()),
+                        hint: Some(rgba(0x526aebff).into()),
+                        ignored: Some(rgba(0x6b5e6bff).into()),
+                        info: Some(rgba(0x526aebff).into()),
                         modified: Some(rgba(0xbb8a36ff).into()),
-                        predictive: Some(rgba(0xa587bfff).into()),
-                        success: Some(rgba(0x1b181bff).into()),
+                        predictive: Some(rgba(0x918b3cff).into()),
+                        renamed: Some(rgba(0x526aebff).into()),
+                        success: Some(rgba(0x918b3cff).into()),
+                        unreachable: Some(rgba(0x6b5e6bff).into()),
                         warning: Some(rgba(0xbb8a36ff).into()),
                         ..Default::default()
                     },
@@ -8285,13 +8399,19 @@ pub fn atelier() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x78a361ff).into()),
+                        conflict: Some(rgba(0x8a8a11ff).into()),
+                        created: Some(rgba(0x578c3cff).into()),
                         deleted: Some(rgba(0xd22f72ff).into()),
                         error: Some(rgba(0xd22f72ff).into()),
-                        hint: Some(rgba(0x5a87a0ff).into()),
+                        hidden: Some(rgba(0x628496ff).into()),
+                        hint: Some(rgba(0x277fadff).into()),
+                        ignored: Some(rgba(0x526f7dff).into()),
+                        info: Some(rgba(0x277fadff).into()),
                         modified: Some(rgba(0x8a8a11ff).into()),
-                        predictive: Some(rgba(0x6a97b2ff).into()),
-                        success: Some(rgba(0x161b1dff).into()),
+                        predictive: Some(rgba(0x578c3cff).into()),
+                        renamed: Some(rgba(0x277fadff).into()),
+                        success: Some(rgba(0x578c3cff).into()),
+                        unreachable: Some(rgba(0x526f7dff).into()),
                         warning: Some(rgba(0x8a8a11ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs
index cf23d5c8de..0a47c22fbd 100644
--- a/crates/theme2/src/themes/ayu.rs
+++ b/crates/theme2/src/themes/ayu.rs
@@ -96,13 +96,19 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xfeb454ff).into()),
                         created: Some(rgba(0xaad84cff).into()),
-                        deleted: Some(rgba(0xc3595fff).into()),
+                        deleted: Some(rgba(0xef7178ff).into()),
                         error: Some(rgba(0xef7178ff).into()),
-                        hint: Some(rgba(0x638c81ff).into()),
+                        hidden: Some(rgba(0x696a6aff).into()),
+                        hint: Some(rgba(0x5ac2feff).into()),
+                        ignored: Some(rgba(0x8a8986ff).into()),
+                        info: Some(rgba(0x5ac2feff).into()),
                         modified: Some(rgba(0xfeb454ff).into()),
-                        predictive: Some(rgba(0x5b728cff).into()),
-                        success: Some(rgba(0xbfbdb6ff).into()),
+                        predictive: Some(rgba(0xaad84cff).into()),
+                        renamed: Some(rgba(0x5ac2feff).into()),
+                        success: Some(rgba(0xaad84cff).into()),
+                        unreachable: Some(rgba(0x8a8986ff).into()),
                         warning: Some(rgba(0xfeb454ff).into()),
                         ..Default::default()
                     },
@@ -506,13 +512,19 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0xa1c24bff).into()),
+                        conflict: Some(rgba(0xf1ae4aff).into()),
+                        created: Some(rgba(0x86b305ff).into()),
                         deleted: Some(rgba(0xef7271ff).into()),
                         error: Some(rgba(0xef7271ff).into()),
-                        hint: Some(rgba(0x8ca7c2ff).into()),
+                        hidden: Some(rgba(0xa9acaeff).into()),
+                        hint: Some(rgba(0x3b9ee5ff).into()),
+                        ignored: Some(rgba(0x8c8f93ff).into()),
+                        info: Some(rgba(0x3b9ee5ff).into()),
                         modified: Some(rgba(0xf1ae4aff).into()),
-                        predictive: Some(rgba(0x9eb9d3ff).into()),
-                        success: Some(rgba(0x5c6166ff).into()),
+                        predictive: Some(rgba(0x86b305ff).into()),
+                        renamed: Some(rgba(0x3b9ee5ff).into()),
+                        success: Some(rgba(0x86b305ff).into()),
+                        unreachable: Some(rgba(0x8c8f93ff).into()),
                         warning: Some(rgba(0xf1ae4aff).into()),
                         ..Default::default()
                     },
@@ -916,13 +928,19 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xfed073ff).into()),
                         created: Some(rgba(0xd5fe80ff).into()),
-                        deleted: Some(rgba(0xc46a60ff).into()),
+                        deleted: Some(rgba(0xf18779ff).into()),
                         error: Some(rgba(0xf18779ff).into()),
-                        hint: Some(rgba(0x7399a3ff).into()),
+                        hidden: Some(rgba(0x7b7d7fff).into()),
+                        hint: Some(rgba(0x73cffeff).into()),
+                        ignored: Some(rgba(0x9a9a98ff).into()),
+                        info: Some(rgba(0x73cffeff).into()),
                         modified: Some(rgba(0xfed073ff).into()),
-                        predictive: Some(rgba(0x6d839bff).into()),
-                        success: Some(rgba(0xcccac2ff).into()),
+                        predictive: Some(rgba(0xd5fe80ff).into()),
+                        renamed: Some(rgba(0x73cffeff).into()),
+                        success: Some(rgba(0xd5fe80ff).into()),
+                        unreachable: Some(rgba(0x9a9a98ff).into()),
                         warning: Some(rgba(0xfed073ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs
index 7d23075c6a..5ac9438ad8 100644
--- a/crates/theme2/src/themes/gruvbox.rs
+++ b/crates/theme2/src/themes/gruvbox.rs
@@ -96,13 +96,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x958e43ff).into()),
+                        conflict: Some(rgba(0xb57616ff).into()),
+                        created: Some(rgba(0x797410ff).into()),
                         deleted: Some(rgba(0x9d0408ff).into()),
                         error: Some(rgba(0x9d0408ff).into()),
-                        hint: Some(rgba(0x677562ff).into()),
+                        hidden: Some(rgba(0x8a7c6fff).into()),
+                        hint: Some(rgba(0x0b6678ff).into()),
+                        ignored: Some(rgba(0x5f5650ff).into()),
+                        info: Some(rgba(0x0b6678ff).into()),
                         modified: Some(rgba(0xb57616ff).into()),
-                        predictive: Some(rgba(0x7d9881ff).into()),
-                        success: Some(rgba(0x282828ff).into()),
+                        predictive: Some(rgba(0x797410ff).into()),
+                        renamed: Some(rgba(0x0b6678ff).into()),
+                        success: Some(rgba(0x797410ff).into()),
+                        unreachable: Some(rgba(0x5f5650ff).into()),
                         warning: Some(rgba(0xb57616ff).into()),
                         ..Default::default()
                     },
@@ -513,13 +519,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xf9bd30ff).into()),
                         created: Some(rgba(0xb8bb27ff).into()),
-                        deleted: Some(rgba(0xd0382bff).into()),
+                        deleted: Some(rgba(0xfb4a35ff).into()),
                         error: Some(rgba(0xfb4a35ff).into()),
-                        hint: Some(rgba(0x8d957eff).into()),
+                        hidden: Some(rgba(0x9a8c79ff).into()),
+                        hint: Some(rgba(0x83a598ff).into()),
+                        ignored: Some(rgba(0xc5b597ff).into()),
+                        info: Some(rgba(0x83a598ff).into()),
                         modified: Some(rgba(0xf9bd30ff).into()),
-                        predictive: Some(rgba(0x717363ff).into()),
-                        success: Some(rgba(0xfbf1c7ff).into()),
+                        predictive: Some(rgba(0xb8bb27ff).into()),
+                        renamed: Some(rgba(0x83a598ff).into()),
+                        success: Some(rgba(0xb8bb27ff).into()),
+                        unreachable: Some(rgba(0xc5b597ff).into()),
                         warning: Some(rgba(0xf9bd30ff).into()),
                         ..Default::default()
                     },
@@ -930,13 +942,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x958e43ff).into()),
+                        conflict: Some(rgba(0xb57616ff).into()),
+                        created: Some(rgba(0x797410ff).into()),
                         deleted: Some(rgba(0x9d0408ff).into()),
                         error: Some(rgba(0x9d0408ff).into()),
-                        hint: Some(rgba(0x677562ff).into()),
+                        hidden: Some(rgba(0x8a7c6fff).into()),
+                        hint: Some(rgba(0x0b6678ff).into()),
+                        ignored: Some(rgba(0x5f5650ff).into()),
+                        info: Some(rgba(0x0b6678ff).into()),
                         modified: Some(rgba(0xb57616ff).into()),
-                        predictive: Some(rgba(0x7d9881ff).into()),
-                        success: Some(rgba(0x282828ff).into()),
+                        predictive: Some(rgba(0x797410ff).into()),
+                        renamed: Some(rgba(0x0b6678ff).into()),
+                        success: Some(rgba(0x797410ff).into()),
+                        unreachable: Some(rgba(0x5f5650ff).into()),
                         warning: Some(rgba(0xb57616ff).into()),
                         ..Default::default()
                     },
@@ -1347,13 +1365,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xf9bd30ff).into()),
                         created: Some(rgba(0xb8bb27ff).into()),
-                        deleted: Some(rgba(0xd0382bff).into()),
+                        deleted: Some(rgba(0xfb4a35ff).into()),
                         error: Some(rgba(0xfb4a35ff).into()),
-                        hint: Some(rgba(0x8d957eff).into()),
+                        hidden: Some(rgba(0x9a8c79ff).into()),
+                        hint: Some(rgba(0x83a598ff).into()),
+                        ignored: Some(rgba(0xc5b597ff).into()),
+                        info: Some(rgba(0x83a598ff).into()),
                         modified: Some(rgba(0xf9bd30ff).into()),
-                        predictive: Some(rgba(0x717363ff).into()),
-                        success: Some(rgba(0xfbf1c7ff).into()),
+                        predictive: Some(rgba(0xb8bb27ff).into()),
+                        renamed: Some(rgba(0x83a598ff).into()),
+                        success: Some(rgba(0xb8bb27ff).into()),
+                        unreachable: Some(rgba(0xc5b597ff).into()),
                         warning: Some(rgba(0xf9bd30ff).into()),
                         ..Default::default()
                     },
@@ -1764,13 +1788,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x958e43ff).into()),
+                        conflict: Some(rgba(0xb57616ff).into()),
+                        created: Some(rgba(0x797410ff).into()),
                         deleted: Some(rgba(0x9d0408ff).into()),
                         error: Some(rgba(0x9d0408ff).into()),
-                        hint: Some(rgba(0x677562ff).into()),
+                        hidden: Some(rgba(0x8a7c6fff).into()),
+                        hint: Some(rgba(0x0b6678ff).into()),
+                        ignored: Some(rgba(0x5f5650ff).into()),
+                        info: Some(rgba(0x0b6678ff).into()),
                         modified: Some(rgba(0xb57616ff).into()),
-                        predictive: Some(rgba(0x7d9881ff).into()),
-                        success: Some(rgba(0x282828ff).into()),
+                        predictive: Some(rgba(0x797410ff).into()),
+                        renamed: Some(rgba(0x0b6678ff).into()),
+                        success: Some(rgba(0x797410ff).into()),
+                        unreachable: Some(rgba(0x5f5650ff).into()),
                         warning: Some(rgba(0xb57616ff).into()),
                         ..Default::default()
                     },
@@ -2181,13 +2211,19 @@ pub fn gruvbox() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xf9bd30ff).into()),
                         created: Some(rgba(0xb8bb27ff).into()),
-                        deleted: Some(rgba(0xd0382bff).into()),
+                        deleted: Some(rgba(0xfb4a35ff).into()),
                         error: Some(rgba(0xfb4a35ff).into()),
-                        hint: Some(rgba(0x8d957eff).into()),
+                        hidden: Some(rgba(0x9a8c79ff).into()),
+                        hint: Some(rgba(0x83a598ff).into()),
+                        ignored: Some(rgba(0xc5b597ff).into()),
+                        info: Some(rgba(0x83a598ff).into()),
                         modified: Some(rgba(0xf9bd30ff).into()),
-                        predictive: Some(rgba(0x717363ff).into()),
-                        success: Some(rgba(0xfbf1c7ff).into()),
+                        predictive: Some(rgba(0xb8bb27ff).into()),
+                        renamed: Some(rgba(0x83a598ff).into()),
+                        success: Some(rgba(0xb8bb27ff).into()),
+                        unreachable: Some(rgba(0xc5b597ff).into()),
                         warning: Some(rgba(0xf9bd30ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs
index 39dc20e517..6bf05bda0f 100644
--- a/crates/theme2/src/themes/one.rs
+++ b/crates/theme2/src/themes/one.rs
@@ -96,13 +96,19 @@ pub fn one() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x84b278ff).into()),
+                        conflict: Some(rgba(0xdec184ff).into()),
+                        created: Some(rgba(0x669f59ff).into()),
                         deleted: Some(rgba(0xd36151ff).into()),
                         error: Some(rgba(0xd36151ff).into()),
-                        hint: Some(rgba(0x9295beff).into()),
+                        hidden: Some(rgba(0xa1a1a3ff).into()),
+                        hint: Some(rgba(0x5c79e2ff).into()),
+                        ignored: Some(rgba(0x7f8188ff).into()),
+                        info: Some(rgba(0x5c79e2ff).into()),
                         modified: Some(rgba(0xdec184ff).into()),
-                        predictive: Some(rgba(0x9c9fc7ff).into()),
-                        success: Some(rgba(0x383a41ff).into()),
+                        predictive: Some(rgba(0x669f59ff).into()),
+                        renamed: Some(rgba(0x5c79e2ff).into()),
+                        success: Some(rgba(0x669f59ff).into()),
+                        unreachable: Some(rgba(0x7f8188ff).into()),
                         warning: Some(rgba(0xdec184ff).into()),
                         ..Default::default()
                     },
@@ -513,13 +519,19 @@ pub fn one() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xdec184ff).into()),
                         created: Some(rgba(0xa1c181ff).into()),
-                        deleted: Some(rgba(0xa45a5eff).into()),
+                        deleted: Some(rgba(0xd07277ff).into()),
                         error: Some(rgba(0xd07277ff).into()),
-                        hint: Some(rgba(0x5b708aff).into()),
+                        hidden: Some(rgba(0x555a63ff).into()),
+                        hint: Some(rgba(0x74ade8ff).into()),
+                        ignored: Some(rgba(0x838994ff).into()),
+                        info: Some(rgba(0x74ade8ff).into()),
                         modified: Some(rgba(0xdec184ff).into()),
-                        predictive: Some(rgba(0x5b6b88ff).into()),
-                        success: Some(rgba(0xc8ccd4ff).into()),
+                        predictive: Some(rgba(0xa1c181ff).into()),
+                        renamed: Some(rgba(0x74ade8ff).into()),
+                        success: Some(rgba(0xa1c181ff).into()),
+                        unreachable: Some(rgba(0x838994ff).into()),
                         warning: Some(rgba(0xdec184ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs
index 0eb5bafa19..0a8fbdec0f 100644
--- a/crates/theme2/src/themes/rose_pine.rs
+++ b/crates/theme2/src/themes/rose_pine.rs
@@ -96,13 +96,19 @@ pub fn rose_pine() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x6bbca3ff).into()),
+                        conflict: Some(rgba(0xe99d35ff).into()),
+                        created: Some(rgba(0x3eaa8eff).into()),
                         deleted: Some(rgba(0xb4647aff).into()),
                         error: Some(rgba(0xb4647aff).into()),
-                        hint: Some(rgba(0x7a92aaff).into()),
+                        hidden: Some(rgba(0x938fa3ff).into()),
+                        hint: Some(rgba(0x57949fff).into()),
+                        ignored: Some(rgba(0x706c8cff).into()),
+                        info: Some(rgba(0x57949fff).into()),
                         modified: Some(rgba(0xe99d35ff).into()),
-                        predictive: Some(rgba(0xa2acbeff).into()),
-                        success: Some(rgba(0x575279ff).into()),
+                        predictive: Some(rgba(0x3eaa8eff).into()),
+                        renamed: Some(rgba(0x57949fff).into()),
+                        success: Some(rgba(0x3eaa8eff).into()),
+                        unreachable: Some(rgba(0x706c8cff).into()),
                         warning: Some(rgba(0xe99d35ff).into()),
                         ..Default::default()
                     },
@@ -520,13 +526,19 @@ pub fn rose_pine() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xf5c177ff).into()),
                         created: Some(rgba(0x5dc2a3ff).into()),
-                        deleted: Some(rgba(0xbe5773ff).into()),
+                        deleted: Some(rgba(0xea6f92ff).into()),
                         error: Some(rgba(0xea6f92ff).into()),
-                        hint: Some(rgba(0x728aa2ff).into()),
+                        hidden: Some(rgba(0x615d7aff).into()),
+                        hint: Some(rgba(0x9cced7ff).into()),
+                        ignored: Some(rgba(0x85819eff).into()),
+                        info: Some(rgba(0x9cced7ff).into()),
                         modified: Some(rgba(0xf5c177ff).into()),
-                        predictive: Some(rgba(0x516b83ff).into()),
-                        success: Some(rgba(0xe0def4ff).into()),
+                        predictive: Some(rgba(0x5dc2a3ff).into()),
+                        renamed: Some(rgba(0x9cced7ff).into()),
+                        success: Some(rgba(0x5dc2a3ff).into()),
+                        unreachable: Some(rgba(0x85819eff).into()),
                         warning: Some(rgba(0xf5c177ff).into()),
                         ..Default::default()
                     },
@@ -944,13 +956,19 @@ pub fn rose_pine() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xf5c177ff).into()),
                         created: Some(rgba(0x5dc2a3ff).into()),
-                        deleted: Some(rgba(0xbe5773ff).into()),
+                        deleted: Some(rgba(0xea6f92ff).into()),
                         error: Some(rgba(0xea6f92ff).into()),
-                        hint: Some(rgba(0x5e768cff).into()),
+                        hidden: Some(rgba(0x2f2b43ff).into()),
+                        hint: Some(rgba(0x9cced7ff).into()),
+                        ignored: Some(rgba(0x75718eff).into()),
+                        info: Some(rgba(0x9cced7ff).into()),
                         modified: Some(rgba(0xf5c177ff).into()),
-                        predictive: Some(rgba(0x556b81ff).into()),
-                        success: Some(rgba(0xe0def4ff).into()),
+                        predictive: Some(rgba(0x5dc2a3ff).into()),
+                        renamed: Some(rgba(0x9cced7ff).into()),
+                        success: Some(rgba(0x5dc2a3ff).into()),
+                        unreachable: Some(rgba(0x75718eff).into()),
                         warning: Some(rgba(0xf5c177ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs
index 3b71f5e4f8..df1f7496ce 100644
--- a/crates/theme2/src/themes/sandcastle.rs
+++ b/crates/theme2/src/themes/sandcastle.rs
@@ -95,13 +95,19 @@ pub fn sandcastle() -> UserThemeFamily {
                     ..Default::default()
                 },
                 status: StatusColorsRefinement {
+                    conflict: Some(rgba(0xa07e3bff).into()),
                     created: Some(rgba(0x83a598ff).into()),
-                    deleted: Some(rgba(0x8d4f61ff).into()),
+                    deleted: Some(rgba(0xb4637aff).into()),
                     error: Some(rgba(0xb4637aff).into()),
-                    hint: Some(rgba(0x727d68ff).into()),
+                    hidden: Some(rgba(0x827568ff).into()),
+                    hint: Some(rgba(0x528b8bff).into()),
+                    ignored: Some(rgba(0xa69782ff).into()),
+                    info: Some(rgba(0x528b8bff).into()),
                     modified: Some(rgba(0xa07e3bff).into()),
-                    predictive: Some(rgba(0x5c6152ff).into()),
-                    success: Some(rgba(0xfdf4c1ff).into()),
+                    predictive: Some(rgba(0x83a598ff).into()),
+                    renamed: Some(rgba(0x528b8bff).into()),
+                    success: Some(rgba(0x83a598ff).into()),
+                    unreachable: Some(rgba(0xa69782ff).into()),
                     warning: Some(rgba(0xa07e3bff).into()),
                     ..Default::default()
                 },
diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs
index 4c839f0101..b52fe34467 100644
--- a/crates/theme2/src/themes/solarized.rs
+++ b/crates/theme2/src/themes/solarized.rs
@@ -96,13 +96,19 @@ pub fn solarized() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0xa0ad46ff).into()),
+                        conflict: Some(rgba(0xb58904ff).into()),
+                        created: Some(rgba(0x859904ff).into()),
                         deleted: Some(rgba(0xdc3330ff).into()),
                         error: Some(rgba(0xdc3330ff).into()),
-                        hint: Some(rgba(0x5889a3ff).into()),
+                        hidden: Some(rgba(0x6a7f86ff).into()),
+                        hint: Some(rgba(0x298bd1ff).into()),
+                        ignored: Some(rgba(0x34555eff).into()),
+                        info: Some(rgba(0x298bd1ff).into()),
                         modified: Some(rgba(0xb58904ff).into()),
-                        predictive: Some(rgba(0x679aafff).into()),
-                        success: Some(rgba(0x002b36ff).into()),
+                        predictive: Some(rgba(0x859904ff).into()),
+                        renamed: Some(rgba(0x298bd1ff).into()),
+                        success: Some(rgba(0x859904ff).into()),
+                        unreachable: Some(rgba(0x34555eff).into()),
                         warning: Some(rgba(0xb58904ff).into()),
                         ..Default::default()
                     },
@@ -506,13 +512,19 @@ pub fn solarized() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
+                        conflict: Some(rgba(0xb58903ff).into()),
                         created: Some(rgba(0x859904ff).into()),
-                        deleted: Some(rgba(0xb52727ff).into()),
+                        deleted: Some(rgba(0xdc3330ff).into()),
                         error: Some(rgba(0xdc3330ff).into()),
-                        hint: Some(rgba(0x4f8297ff).into()),
+                        hidden: Some(rgba(0x6f8389ff).into()),
+                        hint: Some(rgba(0x288bd1ff).into()),
+                        ignored: Some(rgba(0x93a1a1ff).into()),
+                        info: Some(rgba(0x288bd1ff).into()),
                         modified: Some(rgba(0xb58903ff).into()),
-                        predictive: Some(rgba(0x40728bff).into()),
-                        success: Some(rgba(0xfdf6e3ff).into()),
+                        predictive: Some(rgba(0x859904ff).into()),
+                        renamed: Some(rgba(0x288bd1ff).into()),
+                        success: Some(rgba(0x859904ff).into()),
+                        unreachable: Some(rgba(0x93a1a1ff).into()),
                         warning: Some(rgba(0xb58903ff).into()),
                         ..Default::default()
                     },
diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs
index d46aa776fa..cd27fc1db8 100644
--- a/crates/theme2/src/themes/summercamp.rs
+++ b/crates/theme2/src/themes/summercamp.rs
@@ -95,13 +95,19 @@ pub fn summercamp() -> UserThemeFamily {
                     ..Default::default()
                 },
                 status: StatusColorsRefinement {
+                    conflict: Some(rgba(0xf1fe29ff).into()),
                     created: Some(rgba(0x5dea5aff).into()),
-                    deleted: Some(rgba(0xb93f36ff).into()),
+                    deleted: Some(rgba(0xe35142ff).into()),
                     error: Some(rgba(0xe35142ff).into()),
-                    hint: Some(rgba(0x246e61ff).into()),
+                    hidden: Some(rgba(0x4c4735ff).into()),
+                    hint: Some(rgba(0x499befff).into()),
+                    ignored: Some(rgba(0x736e55ff).into()),
+                    info: Some(rgba(0x499befff).into()),
                     modified: Some(rgba(0xf1fe29ff).into()),
-                    predictive: Some(rgba(0x79434bff).into()),
-                    success: Some(rgba(0xf8f5deff).into()),
+                    predictive: Some(rgba(0x5dea5aff).into()),
+                    renamed: Some(rgba(0x499befff).into()),
+                    success: Some(rgba(0x5dea5aff).into()),
+                    unreachable: Some(rgba(0x736e55ff).into()),
                     warning: Some(rgba(0xf1fe29ff).into()),
                     ..Default::default()
                 },
diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs
index 1b1c5795a0..c89b88493a 100644
--- a/crates/theme_importer/src/zed1/converter.rs
+++ b/crates/theme_importer/src/zed1/converter.rs
@@ -71,20 +71,26 @@ impl Zed1ThemeConverter {
             Some(zed1_color_to_hsla(color))
         }
 
-        let editor = &self.theme.editor;
-        let diff_style = &self.theme.editor.diff;
-        let diagnostic_summary = &self.theme.workspace.status_bar.diagnostic_summary;
+        let base_theme: ColorScheme = serde_json::from_value(self.theme.base_theme.clone())
+            .with_context(|| "failed to parse `theme.base_theme`")?;
+
+        let lowest = &base_theme.lowest;
 
         Ok(StatusColorsRefinement {
-            created: convert(diff_style.inserted),
-            modified: convert(diff_style.modified),
-            deleted: convert(diff_style.deleted),
-            success: convert(diagnostic_summary.icon_color_ok),
-            warning: convert(diagnostic_summary.icon_color_warning),
-            error: convert(diagnostic_summary.icon_color_error),
-            hint: editor.hint.color.map(zed1_color_to_hsla),
-            predictive: editor.suggestion.color.map(zed1_color_to_hsla),
-            ..Default::default()
+            created: convert(lowest.positive.default.foreground),
+            modified: convert(lowest.warning.default.foreground),
+            deleted: convert(lowest.negative.default.foreground),
+            success: convert(lowest.positive.default.foreground),
+            warning: convert(lowest.warning.default.foreground),
+            error: convert(lowest.negative.default.foreground),
+            hint: convert(lowest.accent.default.foreground),
+            predictive: convert(lowest.positive.default.foreground),
+            conflict: convert(lowest.warning.default.foreground),
+            hidden: convert(lowest.base.disabled.foreground),
+            ignored: convert(lowest.variant.default.foreground),
+            info: convert(lowest.accent.default.foreground),
+            renamed: convert(lowest.accent.default.foreground),
+            unreachable: convert(lowest.variant.default.foreground), // TODO: Should this be transparent?
         })
     }