diff --git a/examples/spin-button/src/main.rs b/examples/spin-button/src/main.rs
index 602f3f4..310c510 100644
--- a/examples/spin-button/src/main.rs
+++ b/examples/spin-button/src/main.rs
@@ -131,7 +131,7 @@ impl Application for SpinButtonExamplApp {
     }
 
     fn view(&self) -> Element<Self::Message> {
-        let space_xs = cosmic::theme::active().cosmic().spacing.space_xs;
+        let space_xs = cosmic::theme::spacing().space_xs;
 
         let vert_spinner_row = iced::widget::row![
             spin_button::vertical(&self.i8_str, self.i8_num, 1, -5, 5, Message::UpdateI8),
diff --git a/src/widget/context_drawer/widget.rs b/src/widget/context_drawer/widget.rs
index f36578e..fd752ec 100644
--- a/src/widget/context_drawer/widget.rs
+++ b/src/widget/context_drawer/widget.rs
@@ -53,7 +53,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
                 space_m,
                 space_l,
                 ..
-            } = crate::theme::active().cosmic().spacing;
+            } = crate::theme::spacing();
 
             let horizontal_padding = if max_width < 392.0 { space_s } else { space_l };
 
diff --git a/src/widget/header_bar.rs b/src/widget/header_bar.rs
index 638bff5..80a2cbd 100644
--- a/src/widget/header_bar.rs
+++ b/src/widget/header_bar.rs
@@ -292,7 +292,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
             space_xxxs,
             space_xxs,
             ..
-        } = theme::active().cosmic().spacing;
+        } = theme::spacing();
 
         // Take ownership of the regions to be packed.
         let start = std::mem::take(&mut self.start);
@@ -434,7 +434,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
                     .take()
                     .map(|m| icon!("window-close-symbolic", 16, m)),
             )
-            .spacing(theme::active().cosmic().space_xxs())
+            .spacing(theme::spacing().space_xxs)
             .apply(widget::container)
             .center_y(Length::Fill)
             .into()
diff --git a/src/widget/list/column.rs b/src/widget/list/column.rs
index d79d520..a3dedd9 100644
--- a/src/widget/list/column.rs
+++ b/src/widget/list/column.rs
@@ -28,7 +28,7 @@ impl<Message: 'static> Default for ListColumn<'_, Message> {
     fn default() -> Self {
         let cosmic_theme::Spacing {
             space_xxs, space_m, ..
-        } = theme::active().cosmic().spacing;
+        } = theme::spacing();
 
         Self {
             spacing: 0,
diff --git a/src/widget/menu/menu_tree.rs b/src/widget/menu/menu_tree.rs
index d3ff8f1..921b4db 100644
--- a/src/widget/menu/menu_tree.rs
+++ b/src/widget/menu/menu_tree.rs
@@ -240,7 +240,7 @@ where
         .enumerate()
         .flat_map(|(i, item)| {
             let mut trees = vec![];
-            let spacing = crate::theme::active().cosmic().spacing;
+            let spacing = crate::theme::spacing();
 
             match item {
                 MenuItem::Button(label, icon, action) => {
diff --git a/src/widget/mod.rs b/src/widget/mod.rs
index ac8cf7f..70fc175 100644
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -18,7 +18,7 @@
 //!
 //! const REPOSITORY: &str = "https://github.com/pop-os/libcosmic";
 //!
-//! let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
+//! let cosmic_theme::Spacing { space_xxs, .. } = theme::spacing();
 //!
 //! let link = widget::button::link(REPOSITORY)
 //!     .on_press(Message::LaunchUrl(REPOSITORY))
@@ -364,7 +364,7 @@ pub mod tooltip {
         tooltip: impl Into<Element<'a, Message>>,
         position: Position,
     ) -> Tooltip<'a, Message> {
-        let xxs = crate::theme::active().cosmic().space_xxs();
+        let xxs = crate::theme::spacing().space_xxs;
 
         Tooltip::new(content, tooltip, position)
             .class(crate::theme::Container::Tooltip)
diff --git a/src/widget/segmented_control.rs b/src/widget/segmented_control.rs
index 6466f8b..9dbcfc5 100644
--- a/src/widget/segmented_control.rs
+++ b/src/widget/segmented_control.rs
@@ -20,9 +20,8 @@ pub fn horizontal<SelectionMode: Default, Message>(
 where
     Model<SelectionMode>: Selectable,
 {
-    let theme = crate::theme::active();
-    let space_s = theme.cosmic().space_s();
-    let space_xxs = theme.cosmic().space_xxs();
+    let space_s = crate::theme::spacing().space_s;
+    let space_xxs = crate::theme::spacing().space_xxs;
 
     segmented_button::horizontal(model)
         .button_alignment(iced::Alignment::Center)
@@ -46,9 +45,8 @@ where
     Model<SelectionMode>: Selectable,
     SelectionMode: Default,
 {
-    let theme = crate::theme::active();
-    let space_s = theme.cosmic().space_s();
-    let space_xxs = theme.cosmic().space_xxs();
+    let space_s = crate::theme::spacing().space_s;
+    let space_xxs = crate::theme::spacing().space_xxs;
 
     segmented_button::vertical(model)
         .button_alignment(iced::Alignment::Center)
diff --git a/src/widget/settings/item.rs b/src/widget/settings/item.rs
index 6aa4e76..a8c38a0 100644
--- a/src/widget/settings/item.rs
+++ b/src/widget/settings/item.rs
@@ -38,7 +38,7 @@ pub fn item<'a, Message: 'static>(
 #[allow(clippy::module_name_repetitions)]
 pub fn item_row<Message>(children: Vec<Element<Message>>) -> Row<Message> {
     row::with_children(children)
-        .spacing(theme::active().cosmic().space_xs())
+        .spacing(theme::spacing().space_xs)
         .align_y(iced::Alignment::Center)
 }
 
@@ -69,7 +69,7 @@ pub fn flex_item<'a, Message: 'static>(
 #[allow(clippy::module_name_repetitions)]
 pub fn flex_item_row<Message>(children: Vec<Element<Message>>) -> FlexRow<Message> {
     flex_row(children)
-        .spacing(theme::active().cosmic().space_xs())
+        .spacing(theme::spacing().space_xs)
         .min_item_width(200.0)
         .justify_items(iced::Alignment::Center)
         .justify_content(AlignContent::SpaceBetween)
diff --git a/src/widget/settings/mod.rs b/src/widget/settings/mod.rs
index 984dd08..597d9bd 100644
--- a/src/widget/settings/mod.rs
+++ b/src/widget/settings/mod.rs
@@ -13,5 +13,5 @@ use crate::{Element, theme};
 /// A column with a predefined style for creating a settings panel
 #[must_use]
 pub fn view_column<Message: 'static>(children: Vec<Element<Message>>) -> Column<Message> {
-    column::with_children(children).spacing(theme::active().cosmic().space_m())
+    column::with_children(children).spacing(theme::spacing().space_m)
 }
diff --git a/src/widget/tab_bar.rs b/src/widget/tab_bar.rs
index 0f17be9..b3def5c 100644
--- a/src/widget/tab_bar.rs
+++ b/src/widget/tab_bar.rs
@@ -20,9 +20,8 @@ pub fn horizontal<SelectionMode: Default, Message>(
 where
     Model<SelectionMode>: Selectable,
 {
-    let theme = crate::theme::active();
-    let space_s = theme.cosmic().space_s();
-    let space_xs = theme.cosmic().space_xs();
+    let space_s = crate::theme::spacing().space_s;
+    let space_xs = crate::theme::spacing().space_xs;
 
     segmented_button::horizontal(model)
         .minimum_button_width(76)
@@ -44,9 +43,8 @@ where
     Model<SelectionMode>: Selectable,
     SelectionMode: Default,
 {
-    let theme = crate::theme::active();
-    let space_s = theme.cosmic().space_s();
-    let space_xs = theme.cosmic().space_xs();
+    let space_s = crate::theme::spacing().space_s;
+    let space_xs = crate::theme::spacing().space_xs;
 
     SegmentedButton::new(model)
         .minimum_button_width(76)
diff --git a/src/widget/table/widget/compact.rs b/src/widget/table/widget/compact.rs
index cc3bff1..43a32de 100644
--- a/src/widget/table/widget/compact.rs
+++ b/src/widget/table/widget/compact.rs
@@ -57,7 +57,7 @@ where
     Message: Clone + 'static,
 {
     fn from(val: CompactTableView<'a, SelectionMode, Item, Category, Message>) -> Self {
-        let cosmic_theme::Spacing { space_xxxs, .. } = theme::active().cosmic().spacing;
+        let cosmic_theme::Spacing { space_xxxs, .. } = theme::spacing();
         val.model
             .iter()
             .map(|entity| {
@@ -193,7 +193,7 @@ where
             space_xxxs,
             space_xxs,
             ..
-        } = theme::active().cosmic().spacing;
+        } = theme::spacing();
 
         Self {
             model,
diff --git a/src/widget/table/widget/standard.rs b/src/widget/table/widget/standard.rs
index 620d33f..01d0ea5 100644
--- a/src/widget/table/widget/standard.rs
+++ b/src/widget/table/widget/standard.rs
@@ -264,7 +264,7 @@ where
             space_xxxs,
             space_xxs,
             ..
-        } = theme::active().cosmic().spacing;
+        } = theme::spacing();
 
         Self {
             model,