diff --git a/src/catppuccin-frappe.theme.scss b/src/catppuccin-frappe.theme.scss
index 2ccc67ca3..ac8fc4f9f 100644
--- a/src/catppuccin-frappe.theme.scss
+++ b/src/catppuccin-frappe.theme.scss
@@ -10,10 +10,11 @@
 
 @use "sass:math";
 @use "@catppuccin/palette/scss/frappe" as *;
+@use "@catppuccin/highlightjs/sass/theme";
 
 $brand: $blue;
 
 @import "theme";
 .theme-dark {
-  @import "@catppuccin/highlightjs/sass/catppuccin-frappe";
+  @include theme.highlights("frappe", "hex");
 }
diff --git a/src/catppuccin-latte.theme.scss b/src/catppuccin-latte.theme.scss
index 3e595314f..3304ac4c2 100644
--- a/src/catppuccin-latte.theme.scss
+++ b/src/catppuccin-latte.theme.scss
@@ -10,6 +10,7 @@
 
 @use "sass:math";
 @use "@catppuccin/palette/scss/latte" as *;
+@use "@catppuccin/highlightjs/sass/theme";
 
 $brand: $blue;
 
@@ -349,6 +350,6 @@ nav[class*="guilds-"].theme-dark {
 }
 
 @import "theme";
-.theme-light {
-  @import "@catppuccin/highlightjs/sass/catppuccin-latte";
+.theme-dark {
+  @include theme.highlights("latte", "hex");
 }
diff --git a/src/catppuccin-macchiato.theme.scss b/src/catppuccin-macchiato.theme.scss
index e0ae0072d..5ff9bed68 100644
--- a/src/catppuccin-macchiato.theme.scss
+++ b/src/catppuccin-macchiato.theme.scss
@@ -10,10 +10,11 @@
 
 @use "sass:math";
 @use "@catppuccin/palette/scss/macchiato" as *;
+@use "@catppuccin/highlightjs/sass/theme";
 
 $brand: $blue;
 
 @import "theme";
 .theme-dark {
-  @import "@catppuccin/highlightjs/sass/catppuccin-macchiato";
+  @include theme.highlights("macchiato", "hex");
 }
diff --git a/src/catppuccin-mocha.theme.scss b/src/catppuccin-mocha.theme.scss
index d96c40fe9..4ea1b2ec7 100644
--- a/src/catppuccin-mocha.theme.scss
+++ b/src/catppuccin-mocha.theme.scss
@@ -10,10 +10,11 @@
 
 @use "sass:math";
 @use "@catppuccin/palette/scss/mocha" as *;
+@use "@catppuccin/highlightjs/sass/theme";
 
 $brand: $blue;
 
 @import "theme";
 .theme-dark {
-  @import "@catppuccin/highlightjs/sass/catppuccin-mocha";
+  @include theme.highlights("mocha", "hex");
 }