Adjust which status colors we import from the VS Code theme (#3570)

Marshall Bowers created 2 years ago

This PR adjusts the status colors we import from the VS Code theme to be
the right ones.

Instead of looking at the Git status colors, we use the
`editorGutter.addedBackground`, `editorGutter.modifiedBackground`, and
`editorGutter.deletedBackground` colors for added, modified, and deleted
status colors, respectively.

Release Notes:

- N/A

Change summary

crates/theme2/src/themes/andromeda.rs         |  8 ++
crates/theme2/src/themes/ayu.rs               | 18 ++++----
crates/theme2/src/themes/dracula.rs           |  6 +-
crates/theme2/src/themes/gruvbox.rs           | 24 +++++-----
crates/theme2/src/themes/night_owl.rs         |  8 ++-
crates/theme2/src/themes/noctis.rs            | 44 ++++++++++----------
crates/theme2/src/themes/palenight.rs         | 12 ++--
crates/theme2/src/themes/rose_pine.rs         |  6 +-
crates/theme2/src/themes/solarized.rs         |  1 
crates/theme2/src/themes/synthwave_84.rs      |  6 +-
crates/theme_importer/src/vscode/converter.rs | 18 ++++----
11 files changed, 78 insertions(+), 73 deletions(-)

Detailed changes

crates/theme2/src/themes/andromeda.rs

@@ -60,11 +60,13 @@ pub fn andromeda() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        deleted: Some(rgba(0xfc644dff).into()),
+                        created: Some(rgba(0x9bc53dbb).into()),
+                        deleted: Some(rgba(0xfc644dbb).into()),
                         error: Some(rgba(0xfc644dff).into()),
                         hidden: Some(rgba(0x746f77ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x555555ff).into()),
+                        modified: Some(rgba(0x5bc0ebbb).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -266,11 +268,13 @@ pub fn andromeda() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        deleted: Some(rgba(0xfc644dff).into()),
+                        created: Some(rgba(0x9bc53dbb).into()),
+                        deleted: Some(rgba(0xfc644dbb).into()),
                         error: Some(rgba(0xfc644dff).into()),
                         hidden: Some(rgba(0x746f77ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x555555ff).into()),
+                        modified: Some(rgba(0x5bc0ebbb).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {

crates/theme2/src/themes/ayu.rs

@@ -64,13 +64,13 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x6cbf43b3).into()),
-                        deleted: Some(rgba(0xe65050ff).into()),
+                        created: Some(rgba(0x6cbf43cc).into()),
+                        deleted: Some(rgba(0xff7383cc).into()),
                         error: Some(rgba(0xe65050ff).into()),
                         hidden: Some(rgba(0x8a9199ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x8a919980).into()),
-                        modified: Some(rgba(0x478accb3).into()),
+                        modified: Some(rgba(0x478acccc).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -364,13 +364,13 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x87d96cb3).into()),
-                        deleted: Some(rgba(0xff6666ff).into()),
+                        created: Some(rgba(0x87d96ccc).into()),
+                        deleted: Some(rgba(0xf27983cc).into()),
                         error: Some(rgba(0xff6666ff).into()),
                         hidden: Some(rgba(0x707a8cff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x707a8c80).into()),
-                        modified: Some(rgba(0x80bfffb3).into()),
+                        modified: Some(rgba(0x80bfffcc).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -664,13 +664,13 @@ pub fn ayu() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x7fd962b3).into()),
-                        deleted: Some(rgba(0xd95757ff).into()),
+                        created: Some(rgba(0x7fd962cc).into()),
+                        deleted: Some(rgba(0xf26d78cc).into()),
                         error: Some(rgba(0xd95757ff).into()),
                         hidden: Some(rgba(0x565b66ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x565b6680).into()),
-                        modified: Some(rgba(0x73b8ffb3).into()),
+                        modified: Some(rgba(0x73b8ffcc).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {

crates/theme2/src/themes/dracula.rs

@@ -65,13 +65,13 @@ pub fn dracula() -> UserThemeFamily {
                 },
                 status: StatusColorsRefinement {
                     conflict: Some(rgba(0xffb86cff).into()),
-                    created: Some(rgba(0x50fa7bff).into()),
-                    deleted: Some(rgba(0xff5555ff).into()),
+                    created: Some(rgba(0x50fa7b80).into()),
+                    deleted: Some(rgba(0xff555580).into()),
                     error: Some(rgba(0xff5555ff).into()),
                     hidden: Some(rgba(0x6272a4ff).into()),
                     hint: Some(rgba(0x969696ff).into()),
                     ignored: Some(rgba(0x6272a4ff).into()),
-                    modified: Some(rgba(0x8be9fdff).into()),
+                    modified: Some(rgba(0x8be9fd80).into()),
                     warning: Some(rgba(0xffb86cff).into()),
                     ..Default::default()
                 },

crates/theme2/src/themes/gruvbox.rs

@@ -65,13 +65,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0xb8bb26ff).into()),
                         deleted: Some(rgba(0xfb4934ff).into()),
                         error: Some(rgba(0xfb4934ff).into()),
                         hidden: Some(rgba(0xa89984ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x83a598ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -351,13 +351,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0xb8bb26ff).into()),
                         deleted: Some(rgba(0xfb4934ff).into()),
                         error: Some(rgba(0xfb4934ff).into()),
                         hidden: Some(rgba(0xa89984ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x83a598ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -637,13 +637,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0xb8bb26ff).into()),
                         deleted: Some(rgba(0xfb4934ff).into()),
                         error: Some(rgba(0xfb4934ff).into()),
                         hidden: Some(rgba(0xa89984ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x83a598ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -923,13 +923,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0x79740eff).into()),
                         deleted: Some(rgba(0x9d0006ff).into()),
                         error: Some(rgba(0x9d0006ff).into()),
                         hidden: Some(rgba(0x7c6f64ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa89984ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x076678ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -1209,13 +1209,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0x79740eff).into()),
                         deleted: Some(rgba(0x9d0006ff).into()),
                         error: Some(rgba(0x9d0006ff).into()),
                         hidden: Some(rgba(0x7c6f64ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa89984ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x076678ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -1495,13 +1495,13 @@ pub fn gruvbox() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0x98971aff).into()),
+                        created: Some(rgba(0x79740eff).into()),
                         deleted: Some(rgba(0x9d0006ff).into()),
                         error: Some(rgba(0x9d0006ff).into()),
                         hidden: Some(rgba(0x7c6f64ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa89984ff).into()),
-                        modified: Some(rgba(0xd79921ff).into()),
+                        modified: Some(rgba(0x076678ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {

crates/theme2/src/themes/night_owl.rs

@@ -65,13 +65,13 @@ pub fn night_owl() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0xc5e478ff).into()),
+                        created: Some(rgba(0x9ccc65ff).into()),
                         deleted: Some(rgba(0xef5350ff).into()),
                         error: Some(rgba(0xef5350ff).into()),
                         hidden: Some(rgba(0x5f7e97ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x395a75ff).into()),
-                        modified: Some(rgba(0xa2bffcff).into()),
+                        modified: Some(rgba(0xe2b93dff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -322,10 +322,12 @@ pub fn night_owl() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        deleted: Some(rgba(0x403f53ff).into()),
+                        created: Some(rgba(0x49d0c5ff).into()),
+                        deleted: Some(rgba(0xf76e6eff).into()),
                         error: Some(rgba(0x403f53ff).into()),
                         hidden: Some(rgba(0x403f53ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
+                        modified: Some(rgba(0x6fbef6ff).into()),
                         warning: Some(rgba(0xdaaa01ff).into()),
                         ..Default::default()
                     },

crates/theme2/src/themes/noctis.rs

@@ -66,13 +66,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0x9fb6c6ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xffc180ff).into()),
                         warning: Some(rgba(0xffa857ff).into()),
                         ..Default::default()
                     },
@@ -337,13 +337,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0xbbaab0ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xffc180ff).into()),
                         warning: Some(rgba(0xffa857ff).into()),
                         ..Default::default()
                     },
@@ -608,13 +608,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x00c6e0ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xff4000ff).into()),
                         error: Some(rgba(0xff4000ff).into()),
                         hidden: Some(rgba(0x71838eff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0x14b832ff).into()),
+                        modified: Some(rgba(0xe9a149ff).into()),
                         warning: Some(rgba(0xe07a52ff).into()),
                         ..Default::default()
                     },
@@ -879,13 +879,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x00c6e0ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xff4000ff).into()),
                         error: Some(rgba(0xff4000ff).into()),
                         hidden: Some(rgba(0x75718eff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0x14b832ff).into()),
+                        modified: Some(rgba(0xe9a149ff).into()),
                         warning: Some(rgba(0xe07a52ff).into()),
                         ..Default::default()
                     },
@@ -1150,13 +1150,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x00c6e0ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xff4000ff).into()),
                         error: Some(rgba(0xff4000ff).into()),
                         hidden: Some(rgba(0x888477ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0x14b832ff).into()),
+                        modified: Some(rgba(0xe9a149ff).into()),
                         warning: Some(rgba(0xe07a52ff).into()),
                         ..Default::default()
                     },
@@ -1421,13 +1421,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xdfc09fff).into()),
-                        created: Some(rgba(0x6fb0b8ff).into()),
+                        created: Some(rgba(0xa0d4a8ff).into()),
                         deleted: Some(rgba(0xb96346ff).into()),
                         error: Some(rgba(0xb96346ff).into()),
                         hidden: Some(rgba(0x96a8b6ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0x72c09fff).into()),
+                        modified: Some(rgba(0xdfc09fff).into()),
                         warning: Some(rgba(0xffa857ff).into()),
                         ..Default::default()
                     },
@@ -1692,13 +1692,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0x87a7abff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b858bff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xe0c184ff).into()),
                         warning: Some(rgba(0xffa487ff).into()),
                         ..Default::default()
                     },
@@ -1963,13 +1963,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0x87a7abff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x647e82ff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xe4b781ff).into()),
                         warning: Some(rgba(0xffa487ff).into()),
                         ..Default::default()
                     },
@@ -2234,13 +2234,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0x87a7abff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x647e82ff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xe4b781ff).into()),
                         warning: Some(rgba(0xffa487ff).into()),
                         ..Default::default()
                     },
@@ -2505,13 +2505,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0xa9a5c0ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xffc180ff).into()),
                         warning: Some(rgba(0xffa857ff).into()),
                         ..Default::default()
                     },
@@ -2776,13 +2776,13 @@ pub fn noctis() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x40d4e7ff).into()),
+                        created: Some(rgba(0x8ce99aff).into()),
                         deleted: Some(rgba(0xe34e1cff).into()),
                         error: Some(rgba(0xe34e1cff).into()),
                         hidden: Some(rgba(0xb3a5c0ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0x49e9a6ff).into()),
+                        modified: Some(rgba(0xffc180ff).into()),
                         warning: Some(rgba(0xffa857ff).into()),
                         ..Default::default()
                     },

crates/theme2/src/themes/palenight.rs

@@ -65,13 +65,13 @@ pub fn palenight() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0xa9c77dff).into()),
+                        created: Some(rgba(0x9ccc65ff).into()),
                         deleted: Some(rgba(0xef5350ff).into()),
                         error: Some(rgba(0xef5350ff).into()),
                         hidden: Some(rgba(0x929ac9ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2c08de6).into()),
+                        modified: Some(rgba(0xe2b93dff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -345,13 +345,13 @@ pub fn palenight() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0xa9c77dff).into()),
+                        created: Some(rgba(0x9ccc65ff).into()),
                         deleted: Some(rgba(0xef5350ff).into()),
                         error: Some(rgba(0xef5350ff).into()),
                         hidden: Some(rgba(0x929ac9ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2c08de6).into()),
+                        modified: Some(rgba(0xe2b93dff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -625,13 +625,13 @@ pub fn palenight() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0xa9c77dff).into()),
+                        created: Some(rgba(0x9ccc65ff).into()),
                         deleted: Some(rgba(0xef5350ff).into()),
                         error: Some(rgba(0xef5350ff).into()),
                         hidden: Some(rgba(0x929ac9ff).into()),
                         hint: Some(rgba(0x969696ff).into()),
                         ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2c08de6).into()),
+                        modified: Some(rgba(0xe2b93dff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {

crates/theme2/src/themes/rose_pine.rs

@@ -65,7 +65,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xeb6f92ff).into()),
-                        created: Some(rgba(0xf6c177ff).into()),
+                        created: Some(rgba(0x9ccfd8ff).into()),
                         deleted: Some(rgba(0xeb6f92ff).into()),
                         error: Some(rgba(0xeb6f92ff).into()),
                         hidden: Some(rgba(0x908caaff).into()),
@@ -318,7 +318,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xeb6f92ff).into()),
-                        created: Some(rgba(0xf6c177ff).into()),
+                        created: Some(rgba(0x9ccfd8ff).into()),
                         deleted: Some(rgba(0xeb6f92ff).into()),
                         error: Some(rgba(0xeb6f92ff).into()),
                         hidden: Some(rgba(0x908caaff).into()),
@@ -571,7 +571,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     },
                     status: StatusColorsRefinement {
                         conflict: Some(rgba(0xb4637aff).into()),
-                        created: Some(rgba(0xea9d34ff).into()),
+                        created: Some(rgba(0x56949fff).into()),
                         deleted: Some(rgba(0xb4637aff).into()),
                         error: Some(rgba(0xb4637aff).into()),
                         hidden: Some(rgba(0x797593ff).into()),

crates/theme2/src/themes/solarized.rs

@@ -62,7 +62,6 @@ pub fn solarized() -> UserThemeFamily {
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        deleted: Some(rgba(0xffeaeaff).into()),
                         error: Some(rgba(0xffeaeaff).into()),
                         hidden: Some(rgba(0x93a1a1ff).into()),
                         hint: Some(rgba(0x969696ff).into()),

crates/theme2/src/themes/synthwave_84.rs

@@ -51,12 +51,12 @@ pub fn synthwave_84() -> UserThemeFamily {
                     ..Default::default()
                 },
                 status: StatusColorsRefinement {
-                    created: Some(rgba(0x72f1b8ff).into()),
-                    deleted: Some(rgba(0xfe4450ff).into()),
+                    created: Some(rgba(0x206d4bd6).into()),
+                    deleted: Some(rgba(0xfa2e46a4).into()),
                     error: Some(rgba(0xfe4450ff).into()),
                     hint: Some(rgba(0x969696ff).into()),
                     ignored: Some(rgba(0xffffff59).into()),
-                    modified: Some(rgba(0xb893ceee).into()),
+                    modified: Some(rgba(0xb893ce8f).into()),
                     warning: Some(rgba(0x72f1b8bb).into()),
                     ..Default::default()
                 },

crates/theme_importer/src/vscode/converter.rs

@@ -75,16 +75,20 @@ impl VsCodeThemeConverter {
         };
 
         Ok(StatusColorsRefinement {
-            conflict: vscode_colors
-                .git_decoration_conflicting_resource_foreground
+            created: vscode_colors
+                .editor_gutter_added_background
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
-            created: vscode_colors
-                .git_decoration_untracked_resource_foreground
+            modified: vscode_colors
+                .editor_gutter_modified_background
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
             deleted: vscode_colors
-                .error_foreground
+                .editor_gutter_deleted_background
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
+            conflict: vscode_colors
+                .git_decoration_conflicting_resource_foreground
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
             error: vscode_colors
@@ -105,10 +109,6 @@ impl VsCodeThemeConverter {
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
             // info: None,
-            modified: vscode_colors
-                .git_decoration_modified_resource_foreground
-                .as_ref()
-                .traverse(|color| try_parse_color(&color))?,
             // renamed: None,
             // success: None,
             warning: vscode_colors