diff --git a/src/framework/theme/styles/core/theming/_install.scss b/src/framework/theme/styles/core/theming/_install.scss
index 1c0e5691f3..b4c144035a 100644
--- a/src/framework/theme/styles/core/theming/_install.scss
+++ b/src/framework/theme/styles/core/theming/_install.scss
@@ -11,8 +11,18 @@
 @use 'register';
 
 @mixin nb-for-theme($name) {
-  @if (theming-variables.$nb-theme-name == $name) {
-    @content;
+  @if (theming-variables.$nb-enable-css-custom-properties) {
+    @each $theme-name in register.nb-get-enabled-themes() {
+      @if ($theme-name == $name) {
+        .nb-theme-#{$theme-name} {
+          @content;
+        }
+      }
+    }
+  } @else {
+    @if (theming-variables.$nb-theme-name == $name) {
+      @content;
+    }
   }
 }