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

app/src/settings_view/about_page.rs

@@ -1,24 +1,20 @@
-use super::{
-    settings_page::{
-        MatchData, PageType, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
-        SettingsWidget,
-    },
-    SettingsSection,
+use warpui::assets::asset_cache::AssetSource;
+use warpui::elements::{
+    Align, CacheOption, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Image,
+    MainAxisAlignment, MouseStateHandle, ParentElement, Wrap,
 };
-use crate::{
-    appearance::Appearance, channel::ChannelState, settings::app_icon::AppIconSettings,
-    workspace::WorkspaceAction,
-};
-use galaxyui::SingletonEntity;
-use galaxyui::{
-    assets::asset_cache::AssetSource,
-    elements::{
-        Align, CacheOption, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Image,
-        MainAxisAlignment, MouseStateHandle, ParentElement, Wrap,
-    },
-    ui_components::components::UiComponent,
-    AppContext, Entity, View, ViewContext, ViewHandle,
+use galaxyui::ui_components::components::UiComponent;
+use galaxyui::{AppContext, Entity, View, ViewContext, ViewHandle};
+
+use super::settings_page::{
+    MatchData, PageType, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
+    SettingsWidget,
 };
+use super::SettingsSection;
+use crate::appearance::Appearance;
+use crate::channel::ChannelState;
+use crate::themes::theme::ColorScheme;
+use crate::workspace::WorkspaceAction;
 
 pub struct AboutPageView {
     page: PageType<Self>,