Small fixes and cleanups.

src/stages/license/mod.rs

@@ -62,12 +62,7 @@ impl LicenseStage {
         match message {
             Message::Accept => stage::StageAction::Next(Self::accepted()),
             Message::Back => stage::StageAction::Back,
-            Message::Decline => stage::StageAction::Abort(StageResult {
-                name: "license".into(),
-                config: None,
-                resuts: None,
-                error: Some("Declined.".to_string()),
-            }),
+            Message::Decline => stage::StageAction::Abort,
         }
     }
 

src/stages/network/mod.rs

@@ -111,7 +111,7 @@ impl NetworkStage {
         }
 
         let spinner_frames =
-            apng::Frames::from_bytes(crate::theme::get_spiner_bytes()).unwrap();
+            apng::Frames::from_bytes(crate::kira_theming::get_spiner_bytes()).unwrap();
 
         Self {
             internet_active: false,

src/stages/timezone/scroll_list.rs

@@ -22,7 +22,7 @@ fn unselected_button_style(theme: &Theme, status: button::Status) -> button::Sty
             ..button::primary(theme, status)
         },
         button::Status::Active => button::Style {
-            background: Some(iced::Background::Color(crate::theme::change_lightnes(
+            background: Some(iced::Background::Color(crate::kira_theming::change_lightnes(
                 &theme.palette().primary,
                 -0.1,
             ))),

src/stages/welcome/mod.rs

@@ -20,7 +20,7 @@
  */
 
 
-use crate::{stage::{ConfigValue, StageAction, StageResult}, theme};
+use crate::{stage::{ConfigValue, StageAction, StageResult}, kira_theming};
 use iced::{Alignment, widget};
 use rust_i18n::t;
 use std::collections::HashMap;
@@ -111,12 +111,7 @@ impl WelcomeStage {
                 self.locale = Some(loc);
                 StageAction::None
             }
-            Message::Exit => StageAction::Abort(StageResult {
-                name: "welcome".to_string(),
-                config: None,
-                resuts: None,
-                error: None,
-            }),
+            Message::Exit => StageAction::Abort,
             Message::Next => StageAction::Next(self.gen_result()),
         }
     }
@@ -127,7 +122,7 @@ impl WelcomeStage {
 
         // Embed the image bytes into the executable
         let welcom_logo_handle =
-            widget::image::Handle::from_bytes(theme::get_logo_bytes());
+            widget::image::Handle::from_bytes(kira_theming::get_logo_bytes());
 
         widget::column![
             widget::container(