diff --git a/scss/components.scss b/scss/components.scss
index b8b7984c9..f3dcaa4fd 100644
--- a/scss/components.scss
+++ b/scss/components.scss
@@ -1,20 +1,20 @@
 // Component-specific styles - Material Design 3
 // Application-specific components using M3 tokens
 
-@import './components/page.scss';
-@import './components/typography.scss';
-@import './components/buttons.scss';
-@import './components/form-inputs.scss';
-@import './components/form-structure.scss';
-@import './components/badges.scss';
-@import './components/cards.scss';
-@import './components/data-display.scss';
-@import './components/feedback.scss';
-@import './components/media.scss';
-@import './components/dialogs.scss';
-@import './components/app-layout.scss';
-@import './components/conflict-features.scss';
-@import './components/feature-pages.scss';
+@use './components/page.scss';
+@use './components/typography.scss';
+@use './components/buttons.scss';
+@use './components/form-inputs.scss';
+@use './components/form-structure.scss';
+@use './components/badges.scss';
+@use './components/cards.scss';
+@use './components/data-display.scss';
+@use './components/feedback.scss';
+@use './components/media.scss';
+@use './components/dialogs.scss';
+@use './components/app-layout.scss';
+@use './components/conflict-features.scss';
+@use './components/feature-pages.scss';
 
 // Loading container
 .loading-container {
diff --git a/scss/index.scss b/scss/index.scss
index 68846eabb..1ac7a5c57 100644
--- a/scss/index.scss
+++ b/scss/index.scss
@@ -2,12 +2,12 @@
 /* Note: Atom styles are now CSS Modules - import directly in components */
 
 /* Material Symbols (variable icon font) */
-@import '../icons/material-symbols/index.scss';
+@use '../icons/material-symbols/index.scss';
 
 /* Material Icons (legacy icon font) */
-@import '../icons/material-icons/css/material-icons.scss';
+@use '../icons/material-icons/css/material-icons.scss';
 
-@import './globals.scss';
-@import './theme.scss';
-@import './base.scss';
-@import './components.scss';
+@use './globals.scss';
+@use './theme.scss';
+@use './base.scss';
+@use './components.scss';
diff --git a/storybook/src/styles/globals.scss b/storybook/src/styles/globals.scss
index 317b895aa..8ea59030c 100644
--- a/storybook/src/styles/globals.scss
+++ b/storybook/src/styles/globals.scss
@@ -1,3 +1,3 @@
 /* Import FakeMUI base styles */
-@import '../../../scss/base.scss';
-@import '../../../scss/components.scss';
+@use '../../../scss/base.scss';
+@use '../../../scss/components.scss';