diff --git a/local/rollup/src/pipeline.common.plugins.js b/local/rollup/src/pipeline.common.plugins.js
index bda83f6..61f4659 100644
--- a/local/rollup/src/pipeline.common.plugins.js
+++ b/local/rollup/src/pipeline.common.plugins.js
@@ -88,6 +88,7 @@ module.exports = {
         include: [`${srcPath}/**/*`],
         exclude: ['node_modules', '**/node_modules/*', '*.d.ts', '**/*.d.ts'],
       },
+      clean: true,
       // files to include / exclude from the plugin
       include: ['*.ts+(|x)', '**/*.ts+(|x)'],
       exclude: ['node_modules', '**/node_modules/*', '*.d.ts', '**/*.d.ts'],
diff --git a/packages/overlayscrollbars/src/styles/structure.scss b/packages/overlayscrollbars/src/styles/structure.scss
index 72c39e1..7fda6c5 100644
--- a/packages/overlayscrollbars/src/styles/structure.scss
+++ b/packages/overlayscrollbars/src/styles/structure.scss
@@ -53,12 +53,15 @@
 .os-viewport {
   -ms-overflow-style: scrollbar !important;
 }
+[data-overlayscrollbars=''],
 [data-overlayscrollbars~='scrollbarHidden'],
 html.os-viewport-scrollbar-hidden,
 .os-viewport-scrollbar-hidden.os-environment,
 .os-viewport-scrollbar-hidden.os-viewport {
   scrollbar-width: none !important;
 }
+[data-overlayscrollbars='']::-webkit-scrollbar,
+[data-overlayscrollbars='']::-webkit-scrollbar-corner,
 [data-overlayscrollbars~='scrollbarHidden']::-webkit-scrollbar,
 [data-overlayscrollbars~='scrollbarHidden']::-webkit-scrollbar-corner,
 html.os-viewport-scrollbar-hidden::-webkit-scrollbar,
@@ -122,7 +125,7 @@ html.os-viewport-scrollbar-hidden > body[data-overlayscrollbars] {
   }
 }
 
-[data-overlayscrollbars] {
+[data-overlayscrollbars~='viewport'] {
   overflow: hidden !important;
 }
 [data-overlayscrollbars~='overflowVisible'] {
diff --git a/packages/overlayscrollbars/styles/overlayscrollbars.css b/packages/overlayscrollbars/styles/overlayscrollbars.css
index bfde711..84220b0 100644
--- a/packages/overlayscrollbars/styles/overlayscrollbars.css
+++ b/packages/overlayscrollbars/styles/overlayscrollbars.css
@@ -340,12 +340,15 @@ THEMES:
 .os-viewport {
   -ms-overflow-style: scrollbar !important; }
 
+[data-overlayscrollbars=''],
 [data-overlayscrollbars~='scrollbarHidden'],
 html.os-viewport-scrollbar-hidden,
 .os-viewport-scrollbar-hidden.os-environment,
 .os-viewport-scrollbar-hidden.os-viewport {
   scrollbar-width: none !important; }
 
+[data-overlayscrollbars='']::-webkit-scrollbar,
+[data-overlayscrollbars='']::-webkit-scrollbar-corner,
 [data-overlayscrollbars~='scrollbarHidden']::-webkit-scrollbar,
 [data-overlayscrollbars~='scrollbarHidden']::-webkit-scrollbar-corner,
 html.os-viewport-scrollbar-hidden::-webkit-scrollbar,
@@ -401,7 +404,7 @@ html.os-viewport-scrollbar-hidden > body[data-overlayscrollbars] {
     width: var(--os-vaw);
     height: var(--os-vah); }
 
-[data-overlayscrollbars] {
+[data-overlayscrollbars~='viewport'] {
   overflow: hidden !important; }
 
 [data-overlayscrollbars~='overflowVisible'] {