diff --git a/assets/scripts/features/index.js b/assets/scripts/features/index.js
index 80565c9..1657c5f 100644
--- a/assets/scripts/features/index.js
+++ b/assets/scripts/features/index.js
@@ -13,3 +13,7 @@ if (process.env.FEATURE_DARKMODE) {
 if (process.env.FEATURE_FLOWCHART) {
   import('./flowchart');
 }
+
+if (process.env.FEATURE_SYNTAXHIGHLIGHT) {
+  import('./syntaxhighlight');
+}
diff --git a/assets/scripts/features/syntaxhighlight/hljs.js b/assets/scripts/features/syntaxhighlight/hljs.js
new file mode 100644
index 0000000..59516cf
--- /dev/null
+++ b/assets/scripts/features/syntaxhighlight/hljs.js
@@ -0,0 +1,3 @@
+import hljs from 'highlight.js';
+
+hljs.highlightAll();
diff --git a/assets/scripts/features/syntaxhighlight/index.js b/assets/scripts/features/syntaxhighlight/index.js
new file mode 100644
index 0000000..689e67a
--- /dev/null
+++ b/assets/scripts/features/syntaxhighlight/index.js
@@ -0,0 +1,3 @@
+if (process.env.FEATURE_SYNTAXHIGHLIGHT_HLJS) {
+  import('./hljs');
+}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d782105..976b1ac 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -192,11 +192,6 @@
 {{ end }}
 
 {{ define "scripts" }}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/highlight.min.js"></script>
-<script>
-  hljs.initHighlightingOnLoad();
-</script>
-
 <!-------------- Enable Math support for this page  ---------------->
 {{ if .Params.math }}
     {{ partial "math.html" . }}
diff --git a/layouts/notes/list.html b/layouts/notes/list.html
index b2d9897..d60d239 100644
--- a/layouts/notes/list.html
+++ b/layouts/notes/list.html
@@ -57,10 +57,6 @@
 {{ end }}
 
 {{ define "scripts" }}
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/highlight.min.js"></script>
-  <script>
-    hljs.initHighlightingOnLoad();
-  </script>
   {{ if .Params.math }}
       {{ partial "math.html" . }}
   {{ end }}
diff --git a/layouts/notes/single.html b/layouts/notes/single.html
index 60544a1..7f8ebec 100644
--- a/layouts/notes/single.html
+++ b/layouts/notes/single.html
@@ -47,10 +47,6 @@
 {{ end }}
 
 {{ define "scripts" }}
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/highlight.min.js"></script>
-  <script>
-    hljs.initHighlightingOnLoad();
-  </script>
   {{ if .Params.math }}
       {{ partial "math.html" . }}
   {{ end }}