first pass of merging in warp (doesn't build)

crates/ui_components/src/button/params.rs

@@ -2,11 +2,12 @@ use std::borrow::Cow;
 
 use galaxy_core::ui::Icon;
 use galaxy_core::ui::appearance::Appearance;
-use galaxyui::{fonts, keymap::Keystroke, prelude::stack};
-
-use crate::{keyboard_shortcut, tooltip};
+use galaxyui_core::fonts;
+use galaxyui_core::keymap::Keystroke;
+use galaxyui_core::prelude::stack;
 
 use super::Theme;
+use crate::{keyboard_shortcut, tooltip};
 
 /// The parameters for rendering a button.
 pub struct Params<'a> {

crates/ui_components/src/button/themes.rs

@@ -1,7 +1,8 @@
-use galaxy_core::ui::{
-    appearance::Appearance, color::coloru_with_opacity, theme::Fill, theme::color::internal_colors,
-};
 use pathfinder_color::ColorU;
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::color::coloru_with_opacity;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::theme::color::internal_colors;
 
 /// Theming delegate for a button.
 pub trait Theme {