diff --git a/crates/ui2/Cargo.toml b/crates/ui2/Cargo.toml
index 9f98b92296ca40cfd2bd8fdf3eff524937ce7104..6c2b750006253ee7ac13aae6ceac4d4919717078 100644
--- a/crates/ui2/Cargo.toml
+++ b/crates/ui2/Cargo.toml
@@ -15,11 +15,11 @@ gpui = { package = "gpui2", path = "../gpui2" }
 itertools = { version = "0.11.0", optional = true }
 menu = { package = "menu2", path = "../menu2"}
 serde.workspace = true
-settings2 = { path = "../settings2" }
+settings = { package = "settings2", path = "../settings2" }
 smallvec.workspace = true
 story = { path = "../story", optional = true }
 strum = { version = "0.25.0", features = ["derive"] }
-theme2 = { path = "../theme2" }
+theme = { package = "theme2", path = "../theme2" }
 rand = "0.8"
 
 [features]
diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs
index 8ee8e4e30686084bc6f33b4c19554fb7541154a4..51e38a38f4fbceca10ceec6af0ed475dd5b6eb86 100644
--- a/crates/ui2/src/components/checkbox.rs
+++ b/crates/ui2/src/components/checkbox.rs
@@ -1,7 +1,6 @@
 use gpui::{div, prelude::*, Div, Element, ElementId, IntoElement, Styled, WindowContext};
 
-use theme2::ActiveTheme;
-
+use crate::prelude::*;
 use crate::{Color, Icon, IconElement, Selection};
 
 pub type CheckHandler = Box<dyn Fn(&Selection, &mut WindowContext) + 'static>;
diff --git a/crates/ui2/src/components/popover.rs b/crates/ui2/src/components/popover.rs
index d9269b0ac414774e9dae618d082b4e27aeff92d3..91713bc3072ad76fd1344fe1eebc32b23171163f 100644
--- a/crates/ui2/src/components/popover.rs
+++ b/crates/ui2/src/components/popover.rs
@@ -3,9 +3,9 @@ use gpui::{
     WindowContext,
 };
 use smallvec::SmallVec;
-use theme2::ActiveTheme;
 
-use crate::{v_stack, StyledExt};
+use crate::prelude::*;
+use crate::v_stack;
 
 /// A popover is used to display a menu or show some options.
 ///
diff --git a/crates/ui2/src/components/tooltip.rs b/crates/ui2/src/components/tooltip.rs
index fc222758d197904332e34782d5cfe9811af4268a..cc17a610f4bd532cfc25669352643e1b0dc6a648 100644
--- a/crates/ui2/src/components/tooltip.rs
+++ b/crates/ui2/src/components/tooltip.rs
@@ -1,6 +1,6 @@
 use gpui::{overlay, Action, AnyView, IntoElement, Overlay, Render, VisualContext};
-use settings2::Settings;
-use theme2::{ActiveTheme, ThemeSettings};
+use settings::Settings;
+use theme::ThemeSettings;
 
 use crate::prelude::*;
 use crate::{h_stack, v_stack, Color, KeyBinding, Label, LabelSize, StyledExt};
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index 66ffe63112b5cd40f9128527712f0031c22f7e1f..6d7b4ad5ebe043400d95fa27b44852f5b5f34555 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -5,7 +5,7 @@ pub use gpui::{
 
 pub use crate::StyledExt;
 pub use crate::{ButtonVariant, Color};
-pub use theme2::ActiveTheme;
+pub use theme::ActiveTheme;
 
 use strum::EnumIter;
 
diff --git a/crates/ui2/src/styled_ext.rs b/crates/ui2/src/styled_ext.rs
index d064312c327bc5cddfc7784b3ef0793690e0da79..cb224fd0fe64099c472a1ca930b8c2789a9c5cd3 100644
--- a/crates/ui2/src/styled_ext.rs
+++ b/crates/ui2/src/styled_ext.rs
@@ -1,6 +1,6 @@
 use gpui::{px, Styled, WindowContext};
-use theme2::ActiveTheme;
 
+use crate::prelude::*;
 use crate::{ElevationIndex, UITextSize};
 
 fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E {
diff --git a/crates/ui2/src/styles/color.rs b/crates/ui2/src/styles/color.rs
index 7d6e329003487c9842be28272d32aee03ff7b466..00ec64767e57b47f6511bd9de2ab08b3a6d659c5 100644
--- a/crates/ui2/src/styles/color.rs
+++ b/crates/ui2/src/styles/color.rs
@@ -1,5 +1,5 @@
 use gpui::{Hsla, WindowContext};
-use theme2::ActiveTheme;
+use theme::ActiveTheme;
 
 #[derive(Default, PartialEq, Copy, Clone)]
 pub enum Color {