diff --git a/src/theme/layout.scss b/src/style/layout.scss
similarity index 100%
rename from src/theme/layout.scss
rename to src/style/layout.scss
diff --git a/src/styles.scss b/src/styles.scss
index bc5a034c..41c47650 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,5 +1,6 @@
 @use '@igo2/core/all-style';
-@use '@igo2/core/layout';
+@use '@igo2/core/layout' as igo-layout;
+@use 'style/layout';
 
 @use 'theme/theme.scss';
 @use 'variables';
diff --git a/src/theme/igo-override.scss b/src/theme/igo-override.scss
index 12e200f8..644d26e3 100644
--- a/src/theme/igo-override.scss
+++ b/src/theme/igo-override.scss
@@ -3,6 +3,31 @@
 @use 'variables';
 @use './palette';
 
+@mixin themes($theme) {
+  @include search-bar-density($theme);
+}
+
+@mixin search-bar-density($theme) {
+  $density: mat.get-density-config($theme);
+
+  $theme4: map.merge(
+    $theme,
+    (
+      density: $density - 4
+    )
+  );
+
+  $theme2: map.merge(
+    $theme,
+    (
+      density: $density - 2
+    )
+  );
+  igo-search-bar {
+    @include mat.form-field-density($theme4);
+    @include mat.icon-button-density($theme2);
+  }
+}
 
 $color-500: map.get(palette.$palette, 500);
 $color-500-contrast: map.get(palette.$palette, contrast, 500);
diff --git a/src/theme/igo-theme-override.scss b/src/theme/igo-theme-override.scss
deleted file mode 100644
index a7ab5af4..00000000
--- a/src/theme/igo-theme-override.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use 'variables';
-@use './palette';
-
-@mixin themes($theme) {
-  @include search-bar-density($theme);
-}
-
-@mixin search-bar-density($theme) {
-  $density: mat.get-density-config($theme);
-
-  $theme4: map.merge(
-    $theme,
-    (
-      density: $density - 4
-    )
-  );
-
-  $theme2: map.merge(
-    $theme,
-    (
-      density: $density - 2
-    )
-  );
-  igo-search-bar {
-    @include mat.form-field-density($theme4);
-    @include mat.icon-button-density($theme2);
-  }
-}
diff --git a/src/theme/theme.scss b/src/theme/theme.scss
index 902867ef..a9634fc1 100644
--- a/src/theme/theme.scss
+++ b/src/theme/theme.scss
@@ -3,9 +3,7 @@
 @use '@igo2/core' as igo;
 @use './palette';
 @use './typography';
-@use './layout';
 @use './igo-override';
-@use './igo-theme-override';
 @use './material-override/index';
 @use '../app/app.theming' as app;
 
@@ -43,7 +41,7 @@ $theme: map.merge(
 @include mat.all-component-themes($theme);
 
 @include igo.all-component-themes($theme);
-@include igo-theme-override.themes($theme);
+@include igo-override.themes($theme);
 
 @include app.themes($theme);