diff --git a/theme/src/client/styles/code.scss b/theme/src/client/styles/code.scss
index 5b068535..c021d0ab 100644
--- a/theme/src/client/styles/code.scss
+++ b/theme/src/client/styles/code.scss
@@ -1,6 +1,14 @@
 // ===============================
 // Forked and modified from prismjs/themes/prism-tomorrow.css
 
+.dark .vp-code span {
+  color: var(--shiki-dark, rgba(235, 235, 245, 0.6));
+}
+
+html:not(.dark) .vp-code span {
+  color: var(--shiki-light, rgba(60, 60, 67, 0.92));
+}
+
 code[class*='language-'],
 pre[class*='language-'] {
   color: var(--vp-code-block-color);
@@ -43,80 +51,6 @@ pre[class*='language-'] {
 //   white-space: normal;
 // }
 
-.token.comment,
-.token.block-comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: #999;
-}
-
-.token.punctuation {
-  color: #ccc;
-}
-
-.token.tag,
-.token.attr-name,
-.token.namespace,
-.token.deleted {
-  color: #ec5975;
-}
-
-.token.function-name {
-  color: #6196cc;
-}
-
-.token.boolean,
-.token.number,
-.token.function {
-  color: #f08d49;
-}
-
-.token.property,
-.token.class-name,
-.token.constant,
-.token.symbol {
-  color: #f8c555;
-}
-
-.token.selector,
-.token.important,
-.token.atrule,
-.token.keyword,
-.token.builtin {
-  color: #cc99cd;
-}
-
-.token.string,
-.token.char,
-.token.attr-value,
-.token.regex,
-.token.variable {
-  color: #7ec699;
-}
-
-.token.operator,
-.token.entity,
-.token.url {
-  color: #67cdcc;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}
-
-.token.inserted {
-  color: #3eaf7c;
-}
-
 // ===============================
 
 .plume-content {
@@ -202,10 +136,10 @@ div[class*='language-'] {
     top: 0;
     left: 0;
     width: 100%;
-    line-height: 1.4;
+    line-height: 1.5;
 
     .highlight-line {
-      background-color: var(--vp-code-block-bg);
+      background-color: rgba(142, 150, 170, 0.14);
     }
   }
 
@@ -267,6 +201,80 @@ div[class*='language-'] {
   }
 }
 
+.plume-content [class*='language-'] code .highlighted {
+  background-color: var(--vp-code-line-highlight-color);
+  transition: background-color 0.5s;
+  margin: 0 -24px;
+  padding: 0 24px;
+  width: calc(100% + 2 * 24px);
+  display: inline-block;
+}
+
+.plume-content [class*='language-'] code .highlighted.error {
+  background-color: var(--vp-code-line-error-color);
+}
+
+.plume-content [class*='language-'] code .highlighted.warning {
+  background-color: var(--vp-code-line-warning-color);
+}
+
+.plume-content [class*='language-'] code .diff {
+  transition: background-color 0.5s;
+  margin: 0 -24px;
+  padding: 0 24px;
+  width: calc(100% + 2 * 24px);
+  display: inline-block;
+}
+
+.plume-content [class*='language-'] code .diff::before {
+  position: absolute;
+  left: 10px;
+}
+
+.plume-content [class*='language-'] .has-focused-lines .line:not(.has-focus) {
+  filter: blur(0.095rem);
+  opacity: 0.4;
+  transition:
+    filter 0.35s,
+    opacity 0.35s;
+}
+
+.plume-content [class*='language-'] .has-focused-lines .line:not(.has-focus) {
+  opacity: 0.7;
+  transition:
+    filter 0.35s,
+    opacity 0.35s;
+}
+
+.plume-content
+  [class*='language-']:hover
+  .has-focused-lines
+  .line:not(.has-focus) {
+  filter: blur(0);
+  opacity: 1;
+}
+
+.plume-content [class*='language-'] code .diff.remove {
+  background-color: var(--vp-code-line-diff-remove-color);
+  opacity: 0.7;
+}
+
+.plume-content [class*='language-'] code .diff.remove::before {
+  content: '-';
+  color: var(--vp-code-line-diff-remove-symbol-color);
+  transform: translateX(-6px);
+}
+
+.plume-content [class*='language-'] code .diff.add {
+  background-color: var(--vp-code-line-diff-add-color);
+}
+
+.plume-content [class*='language-'] code .diff.add::before {
+  content: '+';
+  color: var(--vp-code-line-diff-add-symbol-color);
+  transform: translateX(-6px);
+}
+
 // narrow mobile
 @media (max-width: 419px) {
   .plume-content {
diff --git a/theme/src/client/styles/vars.scss b/theme/src/client/styles/vars.scss
index 51714e57..5c05d544 100644
--- a/theme/src/client/styles/vars.scss
+++ b/theme/src/client/styles/vars.scss
@@ -216,11 +216,16 @@ html.dark {
   --vp-code-font-size: 0.875em;
 
   --vp-code-block-color: var(--vp-c-text-dark-1);
-  --vp-code-block-bg: #292b30;
-  --vp-code-block-divider-color: #000000;
+  // --vp-code-block-bg: #292b30;
+  --vp-code-block-bg: #f6f6f7;
+  --vp-code-block-divider-color: #e2e2e3;
 
-  --vp-code-line-highlight-color: rgba(0, 0, 0, 0.5);
-  --vp-code-line-number-color: var(--vp-c-text-dark-3);
+  --code-tabs-nav-text-color: var(--vp-c-text-light-2);
+  --code-tabs-nav-bg-color: #e6e6e7;
+  --code-tabs-nav-hover-color: var(--vp-code-block-bg);
+
+  --vp-code-line-highlight-color: rgba(142, 150, 170, 0.14);
+  --vp-code-line-number-color: var(--vp-c-text-light-3);
 
   --vp-code-line-diff-add-color: var(--vp-c-green-dimm-2);
   --vp-code-line-diff-add-symbol-color: var(--vp-c-green);
@@ -244,6 +249,11 @@ html.dark {
 
 html.dark {
   --vp-code-block-bg: #161618;
+  --vp-code-block-divider-color: #000000;
+  --vp-code-line-number-color: var(--vp-c-text-dark-3);
+  --code-tabs-nav-text-color: var(--vp-c-text-dark-2);
+  --code-tabs-nav-bg-color: #3a404c;
+  --code-tabs-nav-hover-color: #434a57;
 }
 
 /**
@@ -416,7 +426,6 @@ html.dark {
 
 :root {
   --t-color: 250ms ease;
-  --code-tabs-nav-bg-color: var(--vp-code-tab-b);
   --code-bg-color: var(--vp-code-block-bg);
   --medium-zoom-bg-color: var(--vp-c-bg);
 }