diff --git a/crates/terminal_view2/src/terminal_element.rs b/crates/terminal_view2/src/terminal_element.rs
index dcadc04e211c89aff672ee29b83f22a79898b5a6..cb46f742f66135c2148fd6073ef010889bc1d8cd 100644
--- a/crates/terminal_view2/src/terminal_element.rs
+++ b/crates/terminal_view2/src/terminal_element.rs
@@ -34,7 +34,7 @@ pub struct LayoutState {
     relative_highlighted_ranges: Vec<(RangeInclusive<AlacPoint>, Hsla)>,
     cursor: Option<Cursor>,
     background_color: Hsla,
-    size: TerminalSize,
+    dimensions: TerminalSize,
     mode: TermMode,
     display_offset: usize,
     hyperlink_tooltip: Option<AnyElement>,
@@ -86,12 +86,12 @@ impl LayoutCell {
             let point = self.point;
 
             Point::new(
-                (origin.x + point.column as f32 * layout.size.cell_width).floor(),
-                origin.y + point.line as f32 * layout.size.line_height,
+                (origin.x + point.column as f32 * layout.dimensions.cell_width).floor(),
+                origin.y + point.line as f32 * layout.dimensions.line_height,
             )
         };
 
-        self.text.paint(pos, layout.size.line_height, cx).ok();
+        self.text.paint(pos, layout.dimensions.line_height, cx).ok();
     }
 }
 
@@ -123,13 +123,13 @@ impl LayoutRect {
         let position = {
             let alac_point = self.point;
             point(
-                (origin.x + alac_point.column as f32 * layout.size.cell_width).floor(),
-                origin.y + alac_point.line as f32 * layout.size.line_height,
+                (origin.x + alac_point.column as f32 * layout.dimensions.cell_width).floor(),
+                origin.y + alac_point.line as f32 * layout.dimensions.line_height,
             )
         };
         let size = point(
-            (layout.size.cell_width * self.num_of_cells as f32).ceil(),
-            layout.size.line_height,
+            (layout.dimensions.cell_width * self.num_of_cells as f32).ceil(),
+            layout.dimensions.line_height,
         )
         .into();
 
@@ -287,8 +287,8 @@ impl TerminalElement {
                 text_fragment.width
             };
 
-            //Cursor should always surround as much of the text as possible,
-            //hence when on pixel boundaries round the origin down and the width up
+            // Cursor should always surround as much of the text as possible,
+            // hence when on pixel boundaries round the origin down and the width up
             Some((
                 point(
                     (cursor_point.col() as f32 * size.cell_width()).floor(),
@@ -301,7 +301,7 @@ impl TerminalElement {
         }
     }
 
-    ///Convert the Alacritty cell styles to GPUI text styles and background color
+    /// Convert the Alacritty cell styles to GPUI text styles and background color
     fn cell_style(
         indexed: &IndexedCell,
         fg: terminal::alacritty_terminal::ansi::Color,
@@ -438,7 +438,7 @@ impl TerminalElement {
 
         let search_matches = self.terminal.read(cx).matches.clone();
 
-        let background_color = theme.colors().background;
+        let background_color = theme.colors().terminal_background;
 
         let last_hovered_word = self.terminal.update(cx, |terminal, cx| {
             terminal.set_size(dimensions);
@@ -498,13 +498,6 @@ impl TerminalElement {
             let cursor_point = DisplayCursor::from(cursor.point, *display_offset);
             let cursor_text = {
                 let str_trxt = cursor_char.to_string();
-
-                let color = if self.focused {
-                    theme.players().local().background
-                } else {
-                    theme.players().local().cursor
-                };
-
                 let len = str_trxt.len();
                 cx.text_system()
                     .shape_line(
@@ -513,7 +506,7 @@ impl TerminalElement {
                         &[TextRun {
                             len,
                             font: text_style.font(),
-                            color,
+                            color: theme.colors().terminal_background,
                             background_color: None,
                             underline: Default::default(),
                         }],
@@ -552,7 +545,7 @@ impl TerminalElement {
             cells,
             cursor,
             background_color,
-            size: dimensions,
+            dimensions,
             rects,
             relative_highlighted_ranges,
             mode: *mode,
@@ -815,11 +808,11 @@ impl Element for TerminalElement {
                     {
                         let hr = HighlightedRange {
                             start_y, //Need to change this
-                            line_height: layout.size.line_height,
+                            line_height: layout.dimensions.line_height,
                             lines: highlighted_range_lines,
                             color: color.clone(),
                             //Copied from editor. TODO: move to theme or something
-                            corner_radius: 0.15 * layout.size.line_height,
+                            corner_radius: 0.15 * layout.dimensions.line_height,
                         };
                         hr.paint(bounds, cx);
                     }
@@ -976,21 +969,24 @@ fn to_highlighted_range_lines(
         AlacPoint::new(range.end().line + layout.display_offset, range.end().column);
 
     // Step 2. Clamp range to viewport, and return None if it doesn't overlap
-    if unclamped_end.line.0 < 0 || unclamped_start.line.0 > layout.size.num_lines() as i32 {
+    if unclamped_end.line.0 < 0 || unclamped_start.line.0 > layout.dimensions.num_lines() as i32 {
         return None;
     }
 
     let clamped_start_line = unclamped_start.line.0.max(0) as usize;
-    let clamped_end_line = unclamped_end.line.0.min(layout.size.num_lines() as i32) as usize;
+    let clamped_end_line = unclamped_end
+        .line
+        .0
+        .min(layout.dimensions.num_lines() as i32) as usize;
     //Convert the start of the range to pixels
-    let start_y = origin.y + clamped_start_line as f32 * layout.size.line_height;
+    let start_y = origin.y + clamped_start_line as f32 * layout.dimensions.line_height;
 
     // Step 3. Expand ranges that cross lines into a collection of single-line ranges.
     //  (also convert to pixels)
     let mut highlighted_range_lines = Vec::new();
     for line in clamped_start_line..=clamped_end_line {
         let mut line_start = 0;
-        let mut line_end = layout.size.columns();
+        let mut line_end = layout.dimensions.columns();
 
         if line == clamped_start_line {
             line_start = unclamped_start.column.0 as usize;
@@ -1000,8 +996,8 @@ fn to_highlighted_range_lines(
         }
 
         highlighted_range_lines.push(HighlightedRangeLine {
-            start_x: origin.x + line_start as f32 * layout.size.cell_width,
-            end_x: origin.x + line_end as f32 * layout.size.cell_width,
+            start_x: origin.x + line_start as f32 * layout.dimensions.cell_width,
+            end_x: origin.x + line_end as f32 * layout.dimensions.cell_width,
         });
     }
 
diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs
index 0a9b977d21eacd782f7461b11c5bca654d775093..2e5b2578a0c758442c57f455c4c92b5aa7ef4840 100644
--- a/crates/theme2/src/themes/andromeda.rs
+++ b/crates/theme2/src/themes/andromeda.rs
@@ -21,7 +21,7 @@ pub fn andromeda() -> UserThemeFamily {
                 colors: ThemeColorsRefinement {
                     border: Some(rgba(0x252931ff).into()),
                     border_variant: Some(rgba(0x21232aff).into()),
-                    elevated_surface_background: Some(rgba(0x262a33ff).into()),
+                    elevated_surface_background: Some(rgba(0x21242bff).into()),
                     background: Some(rgba(0x262a33ff).into()),
                     panel_background: Some(rgba(0x21242bff).into()),
                     element_hover: Some(rgba(0x2b2f3980).into()),
diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs
index e5c2e49d5bda7e7781eb0abc9901e6e40a968a2f..1d069dd2be839ce867ad2bc133f531c48e30e010 100644
--- a/crates/theme2/src/themes/atelier.rs
+++ b/crates/theme2/src/themes/atelier.rs
@@ -22,7 +22,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xd1d0c6ff).into()),
                         border_variant: Some(rgba(0xedece5ff).into()),
-                        elevated_surface_background: Some(rgba(0xc5c4b9ff).into()),
+                        elevated_surface_background: Some(rgba(0xebeae3ff).into()),
                         background: Some(rgba(0xc5c4b9ff).into()),
                         panel_background: Some(rgba(0xebeae3ff).into()),
                         element_hover: Some(rgba(0x96958580).into()),
@@ -425,7 +425,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x3b3431ff).into()),
                         border_variant: Some(rgba(0x251f1dff).into()),
-                        elevated_surface_background: Some(rgba(0x443c39ff).into()),
+                        elevated_surface_background: Some(rgba(0x27211eff).into()),
                         background: Some(rgba(0x443c39ff).into()),
                         panel_background: Some(rgba(0x27211eff).into()),
                         element_hover: Some(rgba(0x665f5c80).into()),
@@ -828,7 +828,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xc8d1cbff).into()),
                         border_variant: Some(rgba(0xe5ede7ff).into()),
-                        elevated_surface_background: Some(rgba(0xbcc5bfff).into()),
+                        elevated_surface_background: Some(rgba(0xe3ebe6ff).into()),
                         background: Some(rgba(0xbcc5bfff).into()),
                         panel_background: Some(rgba(0xe3ebe6ff).into()),
                         element_hover: Some(rgba(0x8b968e80).into()),
@@ -1231,7 +1231,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x332f38ff).into()),
                         border_variant: Some(rgba(0x201e24ff).into()),
-                        elevated_surface_background: Some(rgba(0x3a353fff).into()),
+                        elevated_surface_background: Some(rgba(0x221f26ff).into()),
                         background: Some(rgba(0x3a353fff).into()),
                         panel_background: Some(rgba(0x221f26ff).into()),
                         element_hover: Some(rgba(0x56505e80).into()),
@@ -1634,7 +1634,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x3c3b31ff).into()),
                         border_variant: Some(rgba(0x2a2922ff).into()),
-                        elevated_surface_background: Some(rgba(0x424136ff).into()),
+                        elevated_surface_background: Some(rgba(0x2c2b23ff).into()),
                         background: Some(rgba(0x424136ff).into()),
                         panel_background: Some(rgba(0x2c2b23ff).into()),
                         element_hover: Some(rgba(0x5d5c4c80).into()),
@@ -2037,7 +2037,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x363f62ff).into()),
                         border_variant: Some(rgba(0x252d4fff).into()),
-                        elevated_surface_background: Some(rgba(0x3e4769ff).into()),
+                        elevated_surface_background: Some(rgba(0x262f51ff).into()),
                         background: Some(rgba(0x3e4769ff).into()),
                         panel_background: Some(rgba(0x262f51ff).into()),
                         element_hover: Some(rgba(0x5c648580).into()),
@@ -2440,7 +2440,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xccd0e1ff).into()),
                         border_variant: Some(rgba(0xe9ebf7ff).into()),
-                        elevated_surface_background: Some(rgba(0xc2c6d9ff).into()),
+                        elevated_surface_background: Some(rgba(0xe5e8f5ff).into()),
                         background: Some(rgba(0xc2c6d9ff).into()),
                         panel_background: Some(rgba(0xe5e8f5ff).into()),
                         element_hover: Some(rgba(0x9a9fb680).into()),
@@ -2843,7 +2843,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x3b3933ff).into()),
                         border_variant: Some(rgba(0x252521ff).into()),
-                        elevated_surface_background: Some(rgba(0x45433bff).into()),
+                        elevated_surface_background: Some(rgba(0x262622ff).into()),
                         background: Some(rgba(0x45433bff).into()),
                         panel_background: Some(rgba(0x262622ff).into()),
                         element_hover: Some(rgba(0x6c695c80).into()),
@@ -3246,7 +3246,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x333b33ff).into()),
                         border_variant: Some(rgba(0x1d201dff).into()),
-                        elevated_surface_background: Some(rgba(0x3b453bff).into()),
+                        elevated_surface_background: Some(rgba(0x1f231fff).into()),
                         background: Some(rgba(0x3b453bff).into()),
                         panel_background: Some(rgba(0x1f231fff).into()),
                         element_hover: Some(rgba(0x5c6c5c80).into()),
@@ -3649,7 +3649,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xcbc8d1ff).into()),
                         border_variant: Some(rgba(0xe8e5edff).into()),
-                        elevated_surface_background: Some(rgba(0xbfbcc5ff).into()),
+                        elevated_surface_background: Some(rgba(0xe6e3ebff).into()),
                         background: Some(rgba(0xbfbcc5ff).into()),
                         panel_background: Some(rgba(0xe6e3ebff).into()),
                         element_hover: Some(rgba(0x8f8b9680).into()),
@@ -4052,7 +4052,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x352f2fff).into()),
                         border_variant: Some(rgba(0x231f1fff).into()),
-                        elevated_surface_background: Some(rgba(0x3b3535ff).into()),
+                        elevated_surface_background: Some(rgba(0x252020ff).into()),
                         background: Some(rgba(0x3b3535ff).into()),
                         panel_background: Some(rgba(0x252020ff).into()),
                         element_hover: Some(rgba(0x564e4e80).into()),
@@ -4455,7 +4455,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x393239ff).into()),
                         border_variant: Some(rgba(0x231e23ff).into()),
-                        elevated_surface_background: Some(rgba(0x433a43ff).into()),
+                        elevated_surface_background: Some(rgba(0x252025ff).into()),
                         background: Some(rgba(0x433a43ff).into()),
                         panel_background: Some(rgba(0x252025ff).into()),
                         element_hover: Some(rgba(0x675b6780).into()),
@@ -4858,7 +4858,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x2c3b42ff).into()),
                         border_variant: Some(rgba(0x1b2327ff).into()),
-                        elevated_surface_background: Some(rgba(0x33444dff).into()),
+                        elevated_surface_background: Some(rgba(0x1c2529ff).into()),
                         background: Some(rgba(0x33444dff).into()),
                         panel_background: Some(rgba(0x1c2529ff).into()),
                         element_hover: Some(rgba(0x4f6b7880).into()),
@@ -5261,7 +5261,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xd6d1cfff).into()),
                         border_variant: Some(rgba(0xebe8e6ff).into()),
-                        elevated_surface_background: Some(rgba(0xcdc8c6ff).into()),
+                        elevated_surface_background: Some(rgba(0xe9e6e4ff).into()),
                         background: Some(rgba(0xcdc8c6ff).into()),
                         panel_background: Some(rgba(0xe9e6e4ff).into()),
                         element_hover: Some(rgba(0xaaa3a180).into()),
@@ -5664,7 +5664,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xd7d3beff).into()),
                         border_variant: Some(rgba(0xf2eedcff).into()),
-                        elevated_surface_background: Some(rgba(0xcecab4ff).into()),
+                        elevated_surface_background: Some(rgba(0xeeebd7ff).into()),
                         background: Some(rgba(0xcecab4ff).into()),
                         panel_background: Some(rgba(0xeeebd7ff).into()),
                         element_hover: Some(rgba(0xa8a48e80).into()),
@@ -6067,7 +6067,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xcfc7c7ff).into()),
                         border_variant: Some(rgba(0xede5e5ff).into()),
-                        elevated_surface_background: Some(rgba(0xc1bbbbff).into()),
+                        elevated_surface_background: Some(rgba(0xebe3e3ff).into()),
                         background: Some(rgba(0xc1bbbbff).into()),
                         panel_background: Some(rgba(0xebe3e3ff).into()),
                         element_hover: Some(rgba(0x8e898980).into()),
@@ -6470,7 +6470,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xbed7beff).into()),
                         border_variant: Some(rgba(0xdff0dfff).into()),
-                        elevated_surface_background: Some(rgba(0xb4ceb4ff).into()),
+                        elevated_surface_background: Some(rgba(0xdaeedaff).into()),
                         background: Some(rgba(0xb4ceb4ff).into()),
                         panel_background: Some(rgba(0xdaeedaff).into()),
                         element_hover: Some(rgba(0x8ea88e80).into()),
@@ -6873,7 +6873,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x2f3832ff).into()),
                         border_variant: Some(rgba(0x1e2420ff).into()),
-                        elevated_surface_background: Some(rgba(0x353f39ff).into()),
+                        elevated_surface_background: Some(rgba(0x1f2621ff).into()),
                         background: Some(rgba(0x353f39ff).into()),
                         panel_background: Some(rgba(0x1f2621ff).into()),
                         element_hover: Some(rgba(0x505e5580).into()),
@@ -7276,7 +7276,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xcdbecdff).into()),
                         border_variant: Some(rgba(0xe5dce5ff).into()),
-                        elevated_surface_background: Some(rgba(0xc6b8c6ff).into()),
+                        elevated_surface_background: Some(rgba(0xe1d6e1ff).into()),
                         background: Some(rgba(0xc6b8c6ff).into()),
                         panel_background: Some(rgba(0xe1d6e1ff).into()),
                         element_hover: Some(rgba(0xad9dad80).into()),
@@ -7679,7 +7679,7 @@ pub fn atelier() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xb0d3e5ff).into()),
                         border_variant: Some(rgba(0xd3edfaff).into()),
-                        elevated_surface_background: Some(rgba(0xa6cadcff).into()),
+                        elevated_surface_background: Some(rgba(0xcdeaf9ff).into()),
                         background: Some(rgba(0xa6cadcff).into()),
                         panel_background: Some(rgba(0xcdeaf9ff).into()),
                         element_hover: Some(rgba(0x80a4b680).into()),
diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs
index 7c0eb701081f002ec5c1bd54ed11fc45e08bee2a..d4c1d0fbe5fd1c8849e2e261d5c89cb02bc5afde 100644
--- a/crates/theme2/src/themes/ayu.rs
+++ b/crates/theme2/src/themes/ayu.rs
@@ -22,7 +22,7 @@ pub fn ayu() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x2d2f34ff).into()),
                         border_variant: Some(rgba(0x1b1e24ff).into()),
-                        elevated_surface_background: Some(rgba(0x313337ff).into()),
+                        elevated_surface_background: Some(rgba(0x1f2127ff).into()),
                         background: Some(rgba(0x313337ff).into()),
                         panel_background: Some(rgba(0x1f2127ff).into()),
                         element_hover: Some(rgba(0x3f404380).into()),
@@ -404,7 +404,7 @@ pub fn ayu() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xdfe0e1ff).into()),
                         border_variant: Some(rgba(0xefeff0ff).into()),
-                        elevated_surface_background: Some(rgba(0xdcdddeff).into()),
+                        elevated_surface_background: Some(rgba(0xececedff).into()),
                         background: Some(rgba(0xdcdddeff).into()),
                         panel_background: Some(rgba(0xececedff).into()),
                         element_hover: Some(rgba(0xcfd1d280).into()),
@@ -786,7 +786,7 @@ pub fn ayu() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x43464fff).into()),
                         border_variant: Some(rgba(0x323641ff).into()),
-                        elevated_surface_background: Some(rgba(0x464a52ff).into()),
+                        elevated_surface_background: Some(rgba(0x353944ff).into()),
                         background: Some(rgba(0x464a52ff).into()),
                         panel_background: Some(rgba(0x353944ff).into()),
                         element_hover: Some(rgba(0x53565d80).into()),
diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs
index 8cc13fb1771a080a8addcf67ef0cbf0b74530948..148264933f9cb585512d879fa52ba2771cc4c07b 100644
--- a/crates/theme2/src/themes/gruvbox.rs
+++ b/crates/theme2/src/themes/gruvbox.rs
@@ -22,7 +22,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xddcca7ff).into()),
                         border_variant: Some(rgba(0xefe2bcff).into()),
-                        elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
+                        elevated_surface_background: Some(rgba(0xecddb5ff).into()),
                         background: Some(rgba(0xd9c8a4ff).into()),
                         panel_background: Some(rgba(0xecddb5ff).into()),
                         element_hover: Some(rgba(0xc9b99a80).into()),
@@ -411,7 +411,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x494340ff).into()),
                         border_variant: Some(rgba(0x393634ff).into()),
-                        elevated_surface_background: Some(rgba(0x4c4642ff).into()),
+                        elevated_surface_background: Some(rgba(0x3b3735ff).into()),
                         background: Some(rgba(0x4c4642ff).into()),
                         panel_background: Some(rgba(0x3b3735ff).into()),
                         element_hover: Some(rgba(0x5b534d80).into()),
@@ -800,7 +800,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xddcca7ff).into()),
                         border_variant: Some(rgba(0xefe1b8ff).into()),
-                        elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
+                        elevated_surface_background: Some(rgba(0xecddb4ff).into()),
                         background: Some(rgba(0xd9c8a4ff).into()),
                         panel_background: Some(rgba(0xecddb4ff).into()),
                         element_hover: Some(rgba(0xc9b99a80).into()),
@@ -1189,7 +1189,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x494340ff).into()),
                         border_variant: Some(rgba(0x373432ff).into()),
-                        elevated_surface_background: Some(rgba(0x4c4642ff).into()),
+                        elevated_surface_background: Some(rgba(0x3a3735ff).into()),
                         background: Some(rgba(0x4c4642ff).into()),
                         panel_background: Some(rgba(0x3a3735ff).into()),
                         element_hover: Some(rgba(0x5b534d80).into()),
@@ -1578,7 +1578,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xddcca7ff).into()),
                         border_variant: Some(rgba(0xeddeb5ff).into()),
-                        elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
+                        elevated_surface_background: Some(rgba(0xecdcb3ff).into()),
                         background: Some(rgba(0xd9c8a4ff).into()),
                         panel_background: Some(rgba(0xecdcb3ff).into()),
                         element_hover: Some(rgba(0xc9b99a80).into()),
@@ -1967,7 +1967,7 @@ pub fn gruvbox() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x494340ff).into()),
                         border_variant: Some(rgba(0x343130ff).into()),
-                        elevated_surface_background: Some(rgba(0x4c4642ff).into()),
+                        elevated_surface_background: Some(rgba(0x393634ff).into()),
                         background: Some(rgba(0x4c4642ff).into()),
                         panel_background: Some(rgba(0x393634ff).into()),
                         element_hover: Some(rgba(0x5b534d80).into()),
diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs
index e62ccbefdd61e212984bdea40a166967cae026e6..4a0d54648a4eae72ded59f2691b4cdc128c1f524 100644
--- a/crates/theme2/src/themes/one.rs
+++ b/crates/theme2/src/themes/one.rs
@@ -22,7 +22,7 @@ pub fn one() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xdfdfe0ff).into()),
                         border_variant: Some(rgba(0xeeeeeeff).into()),
-                        elevated_surface_background: Some(rgba(0xdcdcddff).into()),
+                        elevated_surface_background: Some(rgba(0xebebecff).into()),
                         background: Some(rgba(0xdcdcddff).into()),
                         panel_background: Some(rgba(0xebebecff).into()),
                         element_hover: Some(rgba(0xc9c9ca80).into()),
@@ -411,7 +411,7 @@ pub fn one() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x363c46ff).into()),
                         border_variant: Some(rgba(0x2e333cff).into()),
-                        elevated_surface_background: Some(rgba(0x3b414dff).into()),
+                        elevated_surface_background: Some(rgba(0x2f343eff).into()),
                         background: Some(rgba(0x3b414dff).into()),
                         panel_background: Some(rgba(0x2f343eff).into()),
                         element_hover: Some(rgba(0x464b5780).into()),
diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs
index 318767cb2bc943f5db0524254e98d48402675576..48e315ae8014afe765ce0f3dfc608876a3236a26 100644
--- a/crates/theme2/src/themes/rose_pine.rs
+++ b/crates/theme2/src/themes/rose_pine.rs
@@ -22,7 +22,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xe5e0dfff).into()),
                         border_variant: Some(rgba(0xfdf8f1ff).into()),
-                        elevated_surface_background: Some(rgba(0xdcd8d8ff).into()),
+                        elevated_surface_background: Some(rgba(0xfef9f2ff).into()),
                         background: Some(rgba(0xdcd8d8ff).into()),
                         panel_background: Some(rgba(0xfef9f2ff).into()),
                         element_hover: Some(rgba(0xdcd6d580).into()),
@@ -418,7 +418,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x322f48ff).into()),
                         border_variant: Some(rgba(0x27243bff).into()),
-                        elevated_surface_background: Some(rgba(0x38354eff).into()),
+                        elevated_surface_background: Some(rgba(0x28253cff).into()),
                         background: Some(rgba(0x38354eff).into()),
                         panel_background: Some(rgba(0x28253cff).into()),
                         element_hover: Some(rgba(0x504c6880).into()),
@@ -814,7 +814,7 @@ pub fn rose_pine() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x232132ff).into()),
                         border_variant: Some(rgba(0x1c1a29ff).into()),
-                        elevated_surface_background: Some(rgba(0x292739ff).into()),
+                        elevated_surface_background: Some(rgba(0x1d1b2aff).into()),
                         background: Some(rgba(0x292739ff).into()),
                         panel_background: Some(rgba(0x1d1b2aff).into()),
                         element_hover: Some(rgba(0x423f5580).into()),
diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs
index 5aa03988746c8e710657ea89352168ea49f9428b..184a6751de0b94e0ca1f132c230e3aa1b052f897 100644
--- a/crates/theme2/src/themes/sandcastle.rs
+++ b/crates/theme2/src/themes/sandcastle.rs
@@ -21,7 +21,7 @@ pub fn sandcastle() -> UserThemeFamily {
                 colors: ThemeColorsRefinement {
                     border: Some(rgba(0x313741ff).into()),
                     border_variant: Some(rgba(0x2a2f38ff).into()),
-                    elevated_surface_background: Some(rgba(0x333944ff).into()),
+                    elevated_surface_background: Some(rgba(0x2b3039ff).into()),
                     background: Some(rgba(0x333944ff).into()),
                     panel_background: Some(rgba(0x2b3039ff).into()),
                     element_hover: Some(rgba(0x3d435080).into()),
diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs
index c71ce54a2f027a32e1bf2424ea4422e893c4265d..0fd20760c2238da0ccb6b134661317ed8a051f5f 100644
--- a/crates/theme2/src/themes/solarized.rs
+++ b/crates/theme2/src/themes/solarized.rs
@@ -22,7 +22,7 @@ pub fn solarized() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0xdcdacbff).into()),
                         border_variant: Some(rgba(0xf5eedbff).into()),
-                        elevated_surface_background: Some(rgba(0xcfd0c4ff).into()),
+                        elevated_surface_background: Some(rgba(0xf3eddaff).into()),
                         background: Some(rgba(0xcfd0c4ff).into()),
                         panel_background: Some(rgba(0xf3eddaff).into()),
                         element_hover: Some(rgba(0x9faaa880).into()),
@@ -404,7 +404,7 @@ pub fn solarized() -> UserThemeFamily {
                     colors: ThemeColorsRefinement {
                         border: Some(rgba(0x063541ff).into()),
                         border_variant: Some(rgba(0x032f3bff).into()),
-                        elevated_surface_background: Some(rgba(0x083743ff).into()),
+                        elevated_surface_background: Some(rgba(0x04313cff).into()),
                         background: Some(rgba(0x083743ff).into()),
                         panel_background: Some(rgba(0x04313cff).into()),
                         element_hover: Some(rgba(0x2b4f5880).into()),
diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs
index a849988f7b2ca4855c0b0e5b38fc91707f7763b2..987c64e9f2146f727170ffd5c94796df95b56bd7 100644
--- a/crates/theme2/src/themes/summercamp.rs
+++ b/crates/theme2/src/themes/summercamp.rs
@@ -21,7 +21,7 @@ pub fn summercamp() -> UserThemeFamily {
                 colors: ThemeColorsRefinement {
                     border: Some(rgba(0x29251bff).into()),
                     border_variant: Some(rgba(0x221e15ff).into()),
-                    elevated_surface_background: Some(rgba(0x2a261cff).into()),
+                    elevated_surface_background: Some(rgba(0x231f16ff).into()),
                     background: Some(rgba(0x2a261cff).into()),
                     panel_background: Some(rgba(0x231f16ff).into()),
                     element_hover: Some(rgba(0x312d2180).into()),
diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs
index a12d96054ca83738069540c5883d8bea069ad667..01381b225757c5da70c5cda5475f6d72ccda4795 100644
--- a/crates/theme_importer/src/zed1/converter.rs
+++ b/crates/theme_importer/src/zed1/converter.rs
@@ -133,7 +133,11 @@ impl Zed1ThemeConverter {
             border: convert(active_tab.container.border.color),
             border_variant: convert(toolbar.container.border.color),
             background: convert(self.theme.workspace.background),
-            elevated_surface_background: picker.container.background_color.map(zed1_color_to_hsla),
+            elevated_surface_background: editor
+                .hover_popover
+                .container
+                .background_color
+                .map(zed1_color_to_hsla),
             title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla),
             status_bar_background: status_bar
                 .container