diff --git a/containers/libreportal/frontend/core/css/style.css b/containers/libreportal/frontend/core/css/base/style.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/style.css
rename to containers/libreportal/frontend/core/css/base/style.css
diff --git a/containers/libreportal/frontend/core/css/themes.css b/containers/libreportal/frontend/core/css/base/themes.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/themes.css
rename to containers/libreportal/frontend/core/css/base/themes.css
diff --git a/containers/libreportal/frontend/core/css/tokens.css b/containers/libreportal/frontend/core/css/base/tokens.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/tokens.css
rename to containers/libreportal/frontend/core/css/base/tokens.css
diff --git a/containers/libreportal/frontend/core/css/aurora-background.css b/containers/libreportal/frontend/core/css/components/aurora-background.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/aurora-background.css
rename to containers/libreportal/frontend/core/css/components/aurora-background.css
diff --git a/containers/libreportal/frontend/core/css/config.css b/containers/libreportal/frontend/core/css/components/config.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/config.css
rename to containers/libreportal/frontend/core/css/components/config.css
diff --git a/containers/libreportal/frontend/core/css/forms.css b/containers/libreportal/frontend/core/css/components/forms.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/forms.css
rename to containers/libreportal/frontend/core/css/components/forms.css
diff --git a/containers/libreportal/frontend/core/css/modal.css b/containers/libreportal/frontend/core/css/components/modal.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/modal.css
rename to containers/libreportal/frontend/core/css/components/modal.css
diff --git a/containers/libreportal/frontend/core/css/sidebar.css b/containers/libreportal/frontend/core/css/components/sidebar.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/sidebar.css
rename to containers/libreportal/frontend/core/css/components/sidebar.css
diff --git a/containers/libreportal/frontend/core/css/topbar.css b/containers/libreportal/frontend/core/css/components/topbar.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/topbar.css
rename to containers/libreportal/frontend/core/css/components/topbar.css
diff --git a/containers/libreportal/frontend/core/css/update-notifier.css b/containers/libreportal/frontend/core/css/components/update-notifier.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/update-notifier.css
rename to containers/libreportal/frontend/core/css/components/update-notifier.css
diff --git a/containers/libreportal/frontend/core/css/loading-screen.css b/containers/libreportal/frontend/core/css/screens/loading-screen.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/loading-screen.css
rename to containers/libreportal/frontend/core/css/screens/loading-screen.css
diff --git a/containers/libreportal/frontend/core/css/login.css b/containers/libreportal/frontend/core/css/screens/login.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/login.css
rename to containers/libreportal/frontend/core/css/screens/login.css
diff --git a/containers/libreportal/frontend/core/css/setup-wizard.css b/containers/libreportal/frontend/core/css/screens/setup-wizard.css
similarity index 100%
rename from containers/libreportal/frontend/core/css/setup-wizard.css
rename to containers/libreportal/frontend/core/css/screens/setup-wizard.css
diff --git a/containers/libreportal/frontend/index.html b/containers/libreportal/frontend/index.html
index a3d0cfd..c9d8418 100755
--- a/containers/libreportal/frontend/index.html
+++ b/containers/libreportal/frontend/index.html
@@ -11,33 +11,33 @@
 
   <!-- Styles -->
   <!-- Base token layer (theme-agnostic): --font-mono, --page-* identity hues -->
-  <link rel="stylesheet" href="/core/css/tokens.css">
-  <link rel="stylesheet" href="/core/css/themes.css">
-  <link rel="stylesheet" href="/core/css/loading-screen.css">
-  <link rel="stylesheet" href="/core/css/setup-wizard.css">
-  <link rel="stylesheet" href="/core/css/style.css">
+  <link rel="stylesheet" href="/core/css/base/tokens.css">
+  <link rel="stylesheet" href="/core/css/base/themes.css">
+  <link rel="stylesheet" href="/core/css/screens/loading-screen.css">
+  <link rel="stylesheet" href="/core/css/screens/setup-wizard.css">
+  <link rel="stylesheet" href="/core/css/base/style.css">
   <link rel="stylesheet" href="/components/admin/config/css/ip-whitelist.css">
   <link rel="stylesheet" href="/components/apps/port-manager/css/port-manager.css">
   <link rel="stylesheet" href="/components/backup/core/css/backup.css">
   <link rel="stylesheet" href="/components/admin/ssh/css/ssh.css">
   <link rel="stylesheet" href="/components/admin/core/css/admin.css">
   <link rel="stylesheet" href="/components/apps/services/css/services.css">
-  <link rel="stylesheet" href="/core/css/modal.css">
+  <link rel="stylesheet" href="/core/css/components/modal.css">
   <link rel="stylesheet" href="/components/apps/tools/css/tools.css">
   <link rel="stylesheet" href="/components/apps/routing/css/routing.css">
-  <link rel="stylesheet" href="/core/css/login.css">
-  <link rel="stylesheet" href="/core/css/aurora-background.css">
-  <link rel="stylesheet" href="/core/css/topbar.css">
-  <link rel="stylesheet" href="/core/css/sidebar.css">
+  <link rel="stylesheet" href="/core/css/screens/login.css">
+  <link rel="stylesheet" href="/core/css/components/aurora-background.css">
+  <link rel="stylesheet" href="/core/css/components/topbar.css">
+  <link rel="stylesheet" href="/core/css/components/sidebar.css">
   <link rel="stylesheet" href="/components/apps/core/css/apps-layout.css">
   <link rel="stylesheet" href="/components/apps/core/css/apps.css">
-  <link rel="stylesheet" href="/core/css/forms.css">
-  <link rel="stylesheet" href="/core/css/config.css">
+  <link rel="stylesheet" href="/core/css/components/forms.css">
+  <link rel="stylesheet" href="/core/css/components/config.css">
   <link rel="stylesheet" href="/components/apps/core/css/service-buttons.css">
   <link rel="stylesheet" href="/components/dashboard/css/dashboard.css">
   <link rel="stylesheet" href="/components/tasks/css/tasks.css">
   <link rel="stylesheet" href="/components/updater/css/updater.css">
-  <link rel="stylesheet" href="/core/css/update-notifier.css">
+  <link rel="stylesheet" href="/core/css/components/update-notifier.css">
   <script>
     // Inline data-theme bootstrap — runs before any rendering so the right
     // palette tokens resolve on first paint. Synchronously injects a