diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index 661feabb5f6ecf..4790b72fb92aa6 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1354,7 +1354,7 @@ impl InlineAssistant {
             for row_range in inserted_row_ranges {
                 editor.highlight_rows::<InlineAssist>(
                     row_range,
-                    cx.theme().status().info_background,
+                    |cx| cx.theme().status().info_background,
                     Default::default(),
                     cx,
                 );
@@ -1423,7 +1423,7 @@ impl InlineAssistant {
                     editor.set_show_edit_predictions(Some(false), window, cx);
                     editor.highlight_rows::<DeletedLines>(
                         Anchor::Min..Anchor::Max,
-                        cx.theme().status().deleted_background,
+                        |cx| cx.theme().status().deleted_background,
                         Default::default(),
                         cx,
                     );
diff --git a/crates/debugger_ui/src/tests/debugger_panel.rs b/crates/debugger_ui/src/tests/debugger_panel.rs
index 6978b7850ac54b..90b36074ccc95d 100644
--- a/crates/debugger_ui/src/tests/debugger_panel.rs
+++ b/crates/debugger_ui/src/tests/debugger_panel.rs
@@ -1600,7 +1600,7 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
     cx.run_until_parked();
 
     main_editor.update_in(cx, |editor, window, cx| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert_eq!(
             active_debug_lines.len(),
@@ -1616,8 +1616,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
         assert_eq!(point.row, 1);
     });
 
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    second_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -1675,7 +1675,7 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
     cx.run_until_parked();
 
     second_editor.update_in(cx, |editor, window, cx| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert_eq!(
             active_debug_lines.len(),
@@ -1691,8 +1691,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
         assert_eq!(point.row, 2);
     });
 
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    main_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -1714,8 +1714,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
 
     cx.run_until_parked();
 
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    second_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -1723,8 +1723,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
         );
     });
 
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    main_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -1741,8 +1741,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
 
     shutdown_session.await.unwrap();
 
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    main_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -1750,8 +1750,8 @@ async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut T
         );
     });
 
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
+    second_editor.update(cx, |editor, cx| {
+        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>(cx).collect();
 
         assert!(
             active_debug_lines.is_empty(),
@@ -2076,7 +2076,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
                     if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
                         total_active_debug_lines += editor
                             .read(cx)
-                            .highlighted_rows::<ActiveDebugLine>()
+                            .highlighted_rows::<ActiveDebugLine>(cx)
                             .count();
                     }
                 }
@@ -2096,7 +2096,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
 
             let active_debug_lines: Vec<_> = pane_b_editor
                 .read(cx)
-                .highlighted_rows::<ActiveDebugLine>()
+                .highlighted_rows::<ActiveDebugLine>(cx)
                 .collect();
 
             assert_eq!(
@@ -2170,7 +2170,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
 
             let active_debug_lines: Vec<_> = pane_b_editor
                 .read(cx)
-                .highlighted_rows::<ActiveDebugLine>()
+                .highlighted_rows::<ActiveDebugLine>(cx)
                 .collect();
 
             assert_eq!(
@@ -2190,7 +2190,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
                     if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
                         total_active_debug_lines += editor
                             .read(cx)
-                            .highlighted_rows::<ActiveDebugLine>()
+                            .highlighted_rows::<ActiveDebugLine>(cx)
                             .count();
                     }
                 }
@@ -2304,7 +2304,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
 
             let active_debug_lines: Vec<_> = pane_c_editor
                 .read(cx)
-                .highlighted_rows::<ActiveDebugLine>()
+                .highlighted_rows::<ActiveDebugLine>(cx)
                 .collect();
 
             assert_eq!(
@@ -2324,7 +2324,7 @@ async fn test_breakpoint_jumps_only_in_proper_split_view(
                     if let Some(editor) = item.to_any_view().downcast::<Editor>().ok() {
                         total_active_debug_lines += editor
                             .read(cx)
-                            .highlighted_rows::<ActiveDebugLine>()
+                            .highlighted_rows::<ActiveDebugLine>(cx)
                             .count();
                     }
                 }
diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs
index c7977efeced54f..1c83a11440eb8a 100644
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ b/crates/debugger_ui/src/tests/stack_frame_list.rs
@@ -345,7 +345,7 @@ async fn test_select_stack_frame(executor: BackgroundExecutor, cx: &mut TestAppC
                     let snapshot = editor.snapshot(window, cx);
 
                     editor
-                        .highlighted_rows::<editor::ActiveDebugLine>()
+                        .highlighted_rows::<editor::ActiveDebugLine>(cx)
                         .map(|(range, _)| {
                             let start = range.start.to_point(&snapshot.buffer_snapshot());
                             let end = range.end.to_point(&snapshot.buffer_snapshot());
@@ -408,7 +408,7 @@ async fn test_select_stack_frame(executor: BackgroundExecutor, cx: &mut TestAppC
                 let snapshot = editor.snapshot(window, cx);
 
                 editor
-                    .highlighted_rows::<editor::ActiveDebugLine>()
+                    .highlighted_rows::<editor::ActiveDebugLine>(cx)
                     .map(|(range, _)| {
                         let start = range.start.to_point(&snapshot.buffer_snapshot());
                         let end = range.end.to_point(&snapshot.buffer_snapshot());
diff --git a/crates/editor/src/edit_prediction.rs b/crates/editor/src/edit_prediction.rs
index c5d3bb1f16566d..43e9b2ff375a37 100644
--- a/crates/editor/src/edit_prediction.rs
+++ b/crates/editor/src/edit_prediction.rs
@@ -399,7 +399,7 @@ impl Editor {
                                 ));
                             self.highlight_rows::<EditPredictionPreview>(
                                 target..target,
-                                cx.theme().colors().editor_highlighted_line_background,
+                                |cx| cx.theme().colors().editor_highlighted_line_background,
                                 RowHighlightOptions {
                                     autoscroll: true,
                                     ..Default::default()
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c91f92f5637a6e..1c9c330f4a1ef8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -613,9 +613,6 @@ impl EditorActionId {
     }
 }
 
-// type GetFieldEditorTheme = dyn Fn(&theme::Theme) -> theme::FieldEditor;
-// type OverrideTextStyle = dyn Fn(&EditorStyle) -> Option<HighlightStyle>;
-
 type BackgroundHighlight = (
     Arc<dyn Fn(&usize, &Theme) -> Hsla + Send + Sync>,
     Arc<[Range<Anchor>]>,
@@ -1493,7 +1490,7 @@ impl Default for RowHighlightOptions {
 struct RowHighlight {
     index: usize,
     range: Range<Anchor>,
-    color: Hsla,
+    color: fn(&App) -> Hsla,
     options: RowHighlightOptions,
     type_id: TypeId,
 }
@@ -6217,7 +6214,7 @@ impl Editor {
 
             self.go_to_line::<ActiveDebugLine>(
                 multibuffer_anchor,
-                Some(cx.theme().colors().editor_debugger_active_line_background),
+                |cx| cx.theme().colors().editor_debugger_active_line_background,
                 window,
                 cx,
             );
@@ -8624,7 +8621,7 @@ impl Editor {
     pub fn highlight_rows<T: 'static>(
         &mut self,
         range: Range<Anchor>,
-        color: Hsla,
+        color: fn(&App) -> Hsla,
         options: RowHighlightOptions,
         cx: &mut Context<Self>,
     ) {
@@ -8736,12 +8733,15 @@ impl Editor {
     }
 
     /// For a highlight given context type, gets all anchor ranges that will be used for row highlighting.
-    pub fn highlighted_rows<T: 'static>(&self) -> impl '_ + Iterator<Item = (Range<Anchor>, Hsla)> {
+    pub fn highlighted_rows<'a, T: 'static>(
+        &'a self,
+        cx: &'a App,
+    ) -> impl 'a + Iterator<Item = (Range<Anchor>, Hsla)> {
         self.highlighted_rows
             .get(&TypeId::of::<T>())
             .map_or(&[] as &[_], |vec| vec.as_slice())
             .iter()
-            .map(|highlight| (highlight.range.clone(), highlight.color))
+            .map(|highlight| (highlight.range.clone(), (highlight.color)(cx)))
     }
 
     /// Merges all anchor ranges for all context types ever set, picking the last highlight added in case of a row conflict.
@@ -8778,7 +8778,7 @@ impl Editor {
                                 LineHighlight {
                                     include_gutter: highlight.options.include_gutter,
                                     border: None,
-                                    background: highlight.color.into(),
+                                    background: (highlight.color)(cx).into(),
                                     type_id: Some(highlight.type_id),
                                 },
                             );
diff --git a/crates/editor/src/navigation.rs b/crates/editor/src/navigation.rs
index 051b7f0ab4232d..4f9880c438bdf6 100644
--- a/crates/editor/src/navigation.rs
+++ b/crates/editor/src/navigation.rs
@@ -1553,7 +1553,7 @@ impl Editor {
     pub(super) fn go_to_line<T: 'static>(
         &mut self,
         position: Anchor,
-        highlight_color: Option<Hsla>,
+        highlight_color: fn(&App) -> Hsla,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1566,13 +1566,7 @@ impl Editor {
         let start = snapshot.buffer_snapshot().anchor_before(start);
         let end = snapshot.buffer_snapshot().anchor_before(end);
 
-        self.highlight_rows::<T>(
-            start..end,
-            highlight_color
-                .unwrap_or_else(|| cx.theme().colors().editor_highlighted_line_background),
-            Default::default(),
-            cx,
-        );
+        self.highlight_rows::<T>(start..end, highlight_color, Default::default(), cx);
 
         if self.buffer.read(cx).is_singleton() {
             self.request_autoscroll(Autoscroll::center().for_anchor(start), cx);
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
index 5be215a166cc0b..309a118078128a 100644
--- a/crates/git_ui/src/conflict_view.rs
+++ b/crates/git_ui/src/conflict_view.rs
@@ -283,8 +283,8 @@ fn update_conflict_highlighting(
     let ours = buffer.buffer_anchor_range_to_anchor_range(conflict.ours.clone())?;
     let theirs = buffer.buffer_anchor_range_to_anchor_range(conflict.theirs.clone())?;
 
-    let ours_background = cx.theme().colors().version_control_conflict_marker_ours;
-    let theirs_background = cx.theme().colors().version_control_conflict_marker_theirs;
+    let ours_background = |cx: &App| cx.theme().colors().version_control_conflict_marker_ours;
+    let theirs_background = |cx: &App| cx.theme().colors().version_control_conflict_marker_theirs;
 
     let options = RowHighlightOptions {
         include_gutter: true,
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
index 65abed6998d4f4..de80a5af01d759 100644
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -197,7 +197,7 @@ impl GoToLine {
             let end = snapshot.anchor_after(end_point);
             editor.highlight_rows::<GoToLineRowHighlights>(
                 start..end,
-                cx.theme().colors().editor_highlighted_line_background,
+                |cx| cx.theme().colors().editor_highlighted_line_background,
                 RowHighlightOptions {
                     autoscroll: true,
                     ..Default::default()
diff --git a/crates/gpui/src/color.rs b/crates/gpui/src/color.rs
index 8ec816f49d7b69..3914c0a3b9fe00 100644
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -956,6 +956,7 @@ impl From<Hsla> for Background {
         }
     }
 }
+
 impl From<Rgba> for Background {
     fn from(value: Rgba) -> Self {
         Background {
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index c3a5cc480498a4..5b90627b896f83 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -244,7 +244,7 @@ impl OutlineViewDelegate {
                 active_editor.clear_row_highlights::<OutlineRowHighlights>();
                 active_editor.highlight_rows::<OutlineRowHighlights>(
                     outline_item.range.start..outline_item.range.end,
-                    cx.theme().colors().editor_highlighted_line_background,
+                    |cx| cx.theme().colors().editor_highlighted_line_background,
                     RowHighlightOptions {
                         autoscroll: true,
                         ..Default::default()
@@ -375,7 +375,7 @@ impl PickerDelegate for OutlineViewDelegate {
 
         self.active_editor.update(cx, |active_editor, cx| {
             let highlight = active_editor
-                .highlighted_rows::<OutlineRowHighlights>()
+                .highlighted_rows::<OutlineRowHighlights>(cx)
                 .next();
             if let Some((rows, _)) = highlight {
                 active_editor.change_selections(
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index da7092db6996c6..e7d68caa79ccf2 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -2549,7 +2549,7 @@ impl ShellExec {
             }
             editor.highlight_rows::<ShellExec>(
                 input_range.clone().unwrap(),
-                cx.theme().status().unreachable_background,
+                |cx| cx.theme().status().unreachable_background,
                 Default::default(),
                 cx,
             );