diff --git a/_config.yml b/_config.yml
index 555d96368c3c..4417e7582ed4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -114,8 +114,8 @@ news_limit: 5
 # Markdown and syntax highlight
 markdown: kramdown
 highlighter: rouge
-highlight_theme_light: native  # https://github.com/jwarby/jekyll-pygments-themes
-highlight_theme_dark: github  # https://github.com/jwarby/jekyll-pygments-themes
+highlight_theme_light: github  # https://github.com/jwarby/jekyll-pygments-themes
+highlight_theme_dark: native  # https://github.com/jwarby/jekyll-pygments-themes
 kramdown:
   input: GFM
   syntax_highlighter_opts:
diff --git a/assets/js/theme.js b/assets/js/theme.js
index 86089e0c424a..169ea21d41bd 100644
--- a/assets/js/theme.js
+++ b/assets/js/theme.js
@@ -3,18 +3,16 @@
 let toggleTheme = (theme) => {
   if (theme == "dark") {
     setTheme("light");
-    document.getElementById("highlight_theme_light").media = "none";
-    document.getElementById("highlight_theme_dark").media = "";
   } else {
     setTheme("dark");
-    document.getElementById("highlight_theme_dark").media = "none";
-    document.getElementById("highlight_theme_light").media = "";
   }
 }
 
 
 let setTheme = (theme) =>  {
   transTheme();
+  setHighlight(theme);
+
   if (theme) {
     document.documentElement.setAttribute("data-theme", theme);
   }
@@ -32,6 +30,16 @@ let setTheme = (theme) =>  {
   }
 };
 
+let setHighlight = (theme) => {
+  if (theme == "dark") {
+    document.getElementById("highlight_theme_light").media = "none";
+    document.getElementById("highlight_theme_dark").media = "";
+  } else {
+    document.getElementById("highlight_theme_dark").media = "none";
+    document.getElementById("highlight_theme_light").media = "";
+  }
+}
+
 
 let transTheme = () => {
   document.documentElement.classList.add("transition");