diff --git a/package.json b/package.json
index 30659780db..9c5e59fb70 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "lint:fix": "eslint --ext .js,.vue src --fix",
     "test": "TZ=UTC jest --verbose --color",
     "test:coverage": "TZ=UTC jest --verbose --coverage --no-cache",
-    "stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css",
-    "stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css --fix",
+    "stylelint": "stylelint \"src/**/*.vue\" \"src/**/*.scss\" \"src/**/*.css\"",
+    "stylelint:fix": "stylelint \"src/**/*.vue\" \"src/**/*.scss\" \"src/**/*.css\" --fix",
     "styleguide": "vue-styleguidist server",
     "styleguide:build": "vue-styleguidist build",
     "cypress": "TZ=UTC cypress run --component",
diff --git a/src/components/NcRichText/richtext.scss b/src/components/NcRichText/richtext.scss
index 08cde0dcf2..28d09d60b1 100644
--- a/src/components/NcRichText/richtext.scss
+++ b/src/components/NcRichText/richtext.scss
@@ -7,7 +7,7 @@
  * Styles are extracted to extract scss to dist folder, too.
  */
 
-@import './highlight.scss';
+@use './highlight.scss';
 
 li.task-list-item > ul,
 li.task-list-item > ol,
@@ -220,26 +220,28 @@ li.task-list-item > pre {
 }
 
 /**
-* Highlight code syntax in code blocks
-*/
+ * Highlight code syntax in code blocks
+ */
+
+/* stylelint-disable-next-line no-duplicate-selectors */
 .rich-text--wrapper-markdown {
-	@include highlight-rules;
+	@include highlight.highlight-rules;
 }
 
 @media (prefers-color-scheme: light) {
 	.rich-text--wrapper-markdown {
-		@include highlight-light-colors;
+		@include highlight.highlight-light-colors;
 	}
 	[data-theme-dark] .rich-text--wrapper-markdown {
-		@include highlight-dark-colors;
+		@include highlight.highlight-dark-colors;
 	}
 }
 
 @media (prefers-color-scheme: dark) {
 	.rich-text--wrapper-markdown {
-		@include highlight-dark-colors;
+		@include highlight.highlight-dark-colors;
 	}
 	[data-theme-light] .rich-text--wrapper-markdown {
-		@include highlight-light-colors;
+		@include highlight.highlight-light-colors;
 	}
 }