diff --git a/pagetop/src/core/module/all.rs b/pagetop/src/core/module/all.rs
index 6575b3a9..a98a1088 100644
--- a/pagetop/src/core/module/all.rs
+++ b/pagetop/src/core/module/all.rs
@@ -28,7 +28,7 @@ pub fn register_modules(app: ModuleStaticRef) {
     let mut list: Vec<ModuleStaticRef> = Vec::new();
 
     // Enable basic theme.
-    add_to_enabled(&mut list, &crate::core::theme::Basic);
+    add_to_enabled(&mut list, &crate::core::theme::basic::Basic);
 
     // Enable application modules.
     add_to_enabled(&mut list, app);
diff --git a/pagetop/src/core/theme.rs b/pagetop/src/core/theme.rs
index 97430df2..608fe573 100644
--- a/pagetop/src/core/theme.rs
+++ b/pagetop/src/core/theme.rs
@@ -7,5 +7,4 @@ pub(crate) use regions::ComponentsRegions;
 
 pub(crate) mod all;
 
-mod basic;
-pub(crate) use basic::Basic;
+pub(crate) mod basic;
diff --git a/pagetop/src/core/theme/all.rs b/pagetop/src/core/theme/all.rs
index fcc09467..d46d08c6 100644
--- a/pagetop/src/core/theme/all.rs
+++ b/pagetop/src/core/theme/all.rs
@@ -14,7 +14,7 @@ pub static THEMES: LazyStatic<RwLock<Vec<ThemeStaticRef>>> =
 pub static THEME: LazyStatic<ThemeStaticRef> =
     LazyStatic::new(|| match theme_by_single_name(&config::SETTINGS.app.theme) {
         Some(theme) => theme,
-        None => &crate::core::theme::Basic,
+        None => &crate::core::theme::basic::Basic,
     });
 
 // THEME BY NAME ***********************************************************************************
diff --git a/pagetop/src/html/assets/headscript.rs b/pagetop/src/html/assets/headscript.rs
index ed7eccd5..ac384fbb 100644
--- a/pagetop/src/html/assets/headscript.rs
+++ b/pagetop/src/html/assets/headscript.rs
@@ -1,4 +1,4 @@
-use super::AssetsTrait;
+use crate::html::assets::AssetsTrait;
 use crate::html::{html, Markup};
 
 #[rustfmt::skip]
diff --git a/pagetop/src/html/assets/headstyles.rs b/pagetop/src/html/assets/headstyles.rs
index 888ef21e..5996eb05 100644
--- a/pagetop/src/html/assets/headstyles.rs
+++ b/pagetop/src/html/assets/headstyles.rs
@@ -1,4 +1,4 @@
-use super::AssetsTrait;
+use crate::html::assets::AssetsTrait;
 use crate::html::{html, Markup};
 
 #[rustfmt::skip]
diff --git a/pagetop/src/html/assets/javascript.rs b/pagetop/src/html/assets/javascript.rs
index 44af052a..67816f87 100644
--- a/pagetop/src/html/assets/javascript.rs
+++ b/pagetop/src/html/assets/javascript.rs
@@ -1,4 +1,4 @@
-use super::AssetsTrait;
+use crate::html::assets::AssetsTrait;
 use crate::html::{html, Markup};
 
 #[derive(Default, Eq, PartialEq)]
diff --git a/pagetop/src/html/assets/stylesheet.rs b/pagetop/src/html/assets/stylesheet.rs
index c8347591..efad3fef 100644
--- a/pagetop/src/html/assets/stylesheet.rs
+++ b/pagetop/src/html/assets/stylesheet.rs
@@ -1,4 +1,4 @@
-use super::AssetsTrait;
+use crate::html::assets::AssetsTrait;
 use crate::html::{html, Markup};
 
 pub enum TargetMedia {
diff --git a/pagetop/src/response/page/action.rs b/pagetop/src/response/page/action.rs
index 9a53300d..eb8791e3 100644
--- a/pagetop/src/response/page/action.rs
+++ b/pagetop/src/response/page/action.rs
@@ -1,4 +1,4 @@
-use super::Page;
+use crate::response::page::Page;
 
 pub type ActionPage = fn(page: &mut Page);
 
diff --git a/pagetop/src/response/page/action/before_prepare_page.rs b/pagetop/src/response/page/action/before_prepare_page.rs
index 64290ef8..2de82813 100644
--- a/pagetop/src/response/page/action/before_prepare_page.rs
+++ b/pagetop/src/response/page/action/before_prepare_page.rs
@@ -1,5 +1,5 @@
-use super::ActionPage;
 use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::response::page::action::ActionPage;
 use crate::response::page::Page;
 use crate::{use_handle, Handle};
 
diff --git a/pagetop/src/response/page/action/before_render_page.rs b/pagetop/src/response/page/action/before_render_page.rs
index c949e217..79a04e46 100644
--- a/pagetop/src/response/page/action/before_render_page.rs
+++ b/pagetop/src/response/page/action/before_render_page.rs
@@ -1,5 +1,5 @@
-use super::ActionPage;
 use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::response::page::action::ActionPage;
 use crate::response::page::Page;
 use crate::{use_handle, Handle};