diff --git a/crates/theme2/src/default_colors.rs b/crates/theme2/src/default_colors.rs
index 15f4d6548e0e55811adff61255cbe31aae9d92db..8b7137683c4a5b7f916049078517e14f30b7e4b2 100644
--- a/crates/theme2/src/default_colors.rs
+++ b/crates/theme2/src/default_colors.rs
@@ -27,17 +27,17 @@ impl Default for SystemColors {
 impl Default for StatusColors {
     fn default() -> Self {
         Self {
-            conflict: red().dark().step_11().into(),
-            created: grass().dark().step_11().into(),
-            deleted: red().dark().step_11().into(),
-            error: red().dark().step_11().into(),
-            hidden: neutral().dark().step_11().into(),
-            ignored: neutral().dark().step_11().into(),
-            info: blue().dark().step_11().into(),
-            modified: yellow().dark().step_11().into(),
-            renamed: blue().dark().step_11().into(),
-            success: grass().dark().step_11().into(),
-            warning: yellow().dark().step_11().into(),
+            conflict: red().dark().step_11(),
+            created: grass().dark().step_11(),
+            deleted: red().dark().step_11(),
+            error: red().dark().step_11(),
+            hidden: neutral().dark().step_11(),
+            ignored: neutral().dark().step_11(),
+            info: blue().dark().step_11(),
+            modified: yellow().dark().step_11(),
+            renamed: blue().dark().step_11(),
+            success: grass().dark().step_11(),
+            warning: yellow().dark().step_11(),
         }
     }
 }
@@ -202,44 +202,44 @@ impl ThemeColors {
         let system = SystemColors::default();
 
         Self {
-            border: neutral().light().step_6().into(),
-            border_variant: neutral().light().step_5().into(),
-            border_focused: blue().light().step_5().into(),
+            border: neutral().light().step_6(),
+            border_variant: neutral().light().step_5(),
+            border_focused: blue().light().step_5(),
             border_transparent: system.transparent,
-            elevated_surface: neutral().light().step_2().into(),
-            surface: neutral().light().step_2().into(),
-            background: neutral().light().step_1().into(),
-            element: neutral().light().step_3().into(),
-            element_hover: neutral().light().step_4().into(),
-            element_active: neutral().light().step_5().into(),
-            element_selected: neutral().light().step_5().into(),
-            element_disabled: neutral().light_alpha().step_3().into(),
-            element_placeholder: neutral().light().step_11().into(),
-            element_drop_target: blue().light_alpha().step_2().into(),
+            elevated_surface: neutral().light().step_2(),
+            surface: neutral().light().step_2(),
+            background: neutral().light().step_1(),
+            element: neutral().light().step_3(),
+            element_hover: neutral().light().step_4(),
+            element_active: neutral().light().step_5(),
+            element_selected: neutral().light().step_5(),
+            element_disabled: neutral().light_alpha().step_3(),
+            element_placeholder: neutral().light().step_11(),
+            element_drop_target: blue().light_alpha().step_2(),
             ghost_element: system.transparent,
-            ghost_element_hover: neutral().light().step_4().into(),
-            ghost_element_active: neutral().light().step_5().into(),
-            ghost_element_selected: neutral().light().step_5().into(),
-            ghost_element_disabled: neutral().light_alpha().step_3().into(),
-            text: neutral().light().step_12().into(),
-            text_muted: neutral().light().step_11().into(),
-            text_placeholder: neutral().light().step_10().into(),
-            text_disabled: neutral().light().step_9().into(),
-            text_accent: blue().light().step_11().into(),
-            icon: neutral().light().step_11().into(),
-            icon_muted: neutral().light().step_10().into(),
-            icon_disabled: neutral().light().step_9().into(),
-            icon_placeholder: neutral().light().step_10().into(),
-            icon_accent: blue().light().step_11().into(),
-            status_bar: neutral().light().step_2().into(),
-            title_bar: neutral().light().step_2().into(),
-            toolbar: neutral().light().step_1().into(),
-            tab_bar: neutral().light().step_2().into(),
-            tab_active: neutral().light().step_1().into(),
-            tab_inactive: neutral().light().step_2().into(),
-            editor: neutral().light().step_1().into(),
-            editor_subheader: neutral().light().step_2().into(),
-            editor_active_line: neutral().light_alpha().step_3().into(),
+            ghost_element_hover: neutral().light().step_4(),
+            ghost_element_active: neutral().light().step_5(),
+            ghost_element_selected: neutral().light().step_5(),
+            ghost_element_disabled: neutral().light_alpha().step_3(),
+            text: neutral().light().step_12(),
+            text_muted: neutral().light().step_11(),
+            text_placeholder: neutral().light().step_10(),
+            text_disabled: neutral().light().step_9(),
+            text_accent: blue().light().step_11(),
+            icon: neutral().light().step_11(),
+            icon_muted: neutral().light().step_10(),
+            icon_disabled: neutral().light().step_9(),
+            icon_placeholder: neutral().light().step_10(),
+            icon_accent: blue().light().step_11(),
+            status_bar: neutral().light().step_2(),
+            title_bar: neutral().light().step_2(),
+            toolbar: neutral().light().step_1(),
+            tab_bar: neutral().light().step_2(),
+            tab_active: neutral().light().step_1(),
+            tab_inactive: neutral().light().step_2(),
+            editor: neutral().light().step_1(),
+            editor_subheader: neutral().light().step_2(),
+            editor_active_line: neutral().light_alpha().step_3(),
         }
     }
 
@@ -247,44 +247,44 @@ impl ThemeColors {
         let system = SystemColors::default();
 
         Self {
-            border: neutral().dark().step_6().into(),
-            border_variant: neutral().dark().step_5().into(),
-            border_focused: blue().dark().step_5().into(),
+            border: neutral().dark().step_6(),
+            border_variant: neutral().dark().step_5(),
+            border_focused: blue().dark().step_5(),
             border_transparent: system.transparent,
-            elevated_surface: neutral().dark().step_2().into(),
-            surface: neutral().dark().step_2().into(),
-            background: neutral().dark().step_1().into(),
-            element: neutral().dark().step_3().into(),
-            element_hover: neutral().dark().step_4().into(),
-            element_active: neutral().dark().step_5().into(),
-            element_selected: neutral().dark().step_5().into(),
-            element_disabled: neutral().dark_alpha().step_3().into(),
-            element_placeholder: neutral().dark().step_11().into(),
-            element_drop_target: blue().dark_alpha().step_2().into(),
+            elevated_surface: neutral().dark().step_2(),
+            surface: neutral().dark().step_2(),
+            background: neutral().dark().step_1(),
+            element: neutral().dark().step_3(),
+            element_hover: neutral().dark().step_4(),
+            element_active: neutral().dark().step_5(),
+            element_selected: neutral().dark().step_5(),
+            element_disabled: neutral().dark_alpha().step_3(),
+            element_placeholder: neutral().dark().step_11(),
+            element_drop_target: blue().dark_alpha().step_2(),
             ghost_element: system.transparent,
-            ghost_element_hover: neutral().dark().step_4().into(),
-            ghost_element_active: neutral().dark().step_5().into(),
-            ghost_element_selected: neutral().dark().step_5().into(),
-            ghost_element_disabled: neutral().dark_alpha().step_3().into(),
-            text: neutral().dark().step_12().into(),
-            text_muted: neutral().dark().step_11().into(),
-            text_placeholder: neutral().dark().step_10().into(),
-            text_disabled: neutral().dark().step_9().into(),
-            text_accent: blue().dark().step_11().into(),
-            icon: neutral().dark().step_11().into(),
-            icon_muted: neutral().dark().step_10().into(),
-            icon_disabled: neutral().dark().step_9().into(),
-            icon_placeholder: neutral().dark().step_10().into(),
-            icon_accent: blue().dark().step_11().into(),
-            status_bar: neutral().dark().step_2().into(),
-            title_bar: neutral().dark().step_2().into(),
-            toolbar: neutral().dark().step_1().into(),
-            tab_bar: neutral().dark().step_2().into(),
-            tab_active: neutral().dark().step_1().into(),
-            tab_inactive: neutral().dark().step_2().into(),
-            editor: neutral().dark().step_1().into(),
-            editor_subheader: neutral().dark().step_2().into(),
-            editor_active_line: neutral().dark_alpha().step_3().into(),
+            ghost_element_hover: neutral().dark().step_4(),
+            ghost_element_active: neutral().dark().step_5(),
+            ghost_element_selected: neutral().dark().step_5(),
+            ghost_element_disabled: neutral().dark_alpha().step_3(),
+            text: neutral().dark().step_12(),
+            text_muted: neutral().dark().step_11(),
+            text_placeholder: neutral().dark().step_10(),
+            text_disabled: neutral().dark().step_9(),
+            text_accent: blue().dark().step_11(),
+            icon: neutral().dark().step_11(),
+            icon_muted: neutral().dark().step_10(),
+            icon_disabled: neutral().dark().step_9(),
+            icon_placeholder: neutral().dark().step_10(),
+            icon_accent: blue().dark().step_11(),
+            status_bar: neutral().dark().step_2(),
+            title_bar: neutral().dark().step_2(),
+            toolbar: neutral().dark().step_1(),
+            tab_bar: neutral().dark().step_2(),
+            tab_active: neutral().dark().step_1(),
+            tab_inactive: neutral().dark().step_2(),
+            editor: neutral().dark().step_1(),
+            editor_subheader: neutral().dark().step_2(),
+            editor_active_line: neutral().dark_alpha().step_3(),
         }
     }
 }