diff --git a/docs/guide/using-vue.md b/docs/guide/using-vue.md
index 8ed6b0aa..998d3aa8 100644
--- a/docs/guide/using-vue.md
+++ b/docs/guide/using-vue.md
@@ -26,8 +26,8 @@ Directives also work:
 
 **Input**
 
-```md
-<span v-for="i in 3">{{ i }} </span>
+```html
+<span v-for="i in 3">{{ i }}</span>
 ```
 
 **Output**
@@ -40,7 +40,7 @@ You can use the [`useData` helper](./api#usedata) in a `<script>` block and expo
 
 **Input**
 
-```md
+```html
 <script setup>
 import { useData } from 'vitepress'
 
diff --git a/src/client/theme-default/index.ts b/src/client/theme-default/index.ts
index 66f2708c..563b56d3 100644
--- a/src/client/theme-default/index.ts
+++ b/src/client/theme-default/index.ts
@@ -2,6 +2,7 @@ import './styles/fonts.css'
 import './styles/vars.css'
 import './styles/base.css'
 import './styles/utils.css'
+import './styles/components/code.css'
 import './styles/components/custom-block.css'
 import './styles/components/vp-doc.css'
 import './styles/components/vp-sponsor.css'
diff --git a/src/client/theme-default/styles/components/code.css b/src/client/theme-default/styles/components/code.css
new file mode 100644
index 00000000..ee74e5b2
--- /dev/null
+++ b/src/client/theme-default/styles/components/code.css
@@ -0,0 +1,7 @@
+.dark .vp-code-light {
+  display: none;
+}
+
+html:not(.dark) .vp-code-dark {
+  display: none;
+}
diff --git a/src/client/theme-default/styles/components/vp-doc.css b/src/client/theme-default/styles/components/vp-doc.css
index 99ce571d..f2f03ba3 100644
--- a/src/client/theme-default/styles/components/vp-doc.css
+++ b/src/client/theme-default/styles/components/vp-doc.css
@@ -376,7 +376,7 @@
   background-color: var(--vp-code-block-bg);
   opacity: 0;
   cursor: pointer;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' height='20' width='20' stroke='rgba(235,235,235,0.38)' stroke-width='2' class='h-6 w-6' viewBox='0 0 24 24'%3E%3Cpath stroke-linecap='round' stroke-linejoin='round' d='M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2'/%3E%3C/svg%3E");
+  background-image: var(--vp-icon-copy);
   background-position: 50%;
   background-size: 20px;
   background-repeat: no-repeat;
@@ -395,7 +395,7 @@
 .vp-doc [class*='language-'] > span.copy:hover.copied {
   border-radius: 0 4px 4px 0;
   background-color: var(--vp-code-copy-code-hover-bg);
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' height='20' width='20' stroke='rgba(235,235,235,0.5)' stroke-width='2' class='h-6 w-6' viewBox='0 0 24 24'%3E%3Cpath stroke-linecap='round' stroke-linejoin='round' d='M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2m-6 9 2 2 4-4'/%3E%3C/svg%3E");
+  background-image: var(--vp-icon-coied);
 }
 
 .vp-doc [class*='language-'] > span.copy.copied::before,
@@ -410,7 +410,7 @@
   text-align: center;
   font-size: 12px;
   font-weight: 500;
-  color: var(--vp-c-text-dark-2);
+  color: var(--vp-c-text-code);
   background-color: var(--vp-code-copy-code-hover-bg);
   white-space: nowrap;
   content: "Copied";
diff --git a/src/client/theme-default/styles/vars.css b/src/client/theme-default/styles/vars.css
index 00939405..d5f59bc3 100644
--- a/src/client/theme-default/styles/vars.css
+++ b/src/client/theme-default/styles/vars.css
@@ -183,6 +183,15 @@
   --vp-layout-max-width: 1440px;
 }
 
+/**
+ * Icons
+ * -------------------------------------------------------------------------- */
+
+:root {
+  --vp-icon-copy: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' height='20' width='20' stroke='rgba(128,128,128,1)' stroke-width='2' class='h-6 w-6' viewBox='0 0 24 24'%3E%3Cpath stroke-linecap='round' stroke-linejoin='round' d='M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2'/%3E%3C/svg%3E");
+  --vp-icon-coied: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' height='20' width='20' stroke='rgba(128,128,128,1)' stroke-width='2' class='h-6 w-6' viewBox='0 0 24 24'%3E%3Cpath stroke-linecap='round' stroke-linejoin='round' d='M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2m-6 9 2 2 4-4'/%3E%3C/svg%3E");
+}
+
 /**
  * Component: Code
  * -------------------------------------------------------------------------- */
@@ -192,18 +201,16 @@
   --vp-code-font-size: 0.875em;
 
   --vp-code-block-color: var(--vp-c-text-dark-1);
-  --vp-code-block-bg: #292d3e;
+  --vp-code-block-bg: var(--vp-c-bg-alt);
 
   --vp-code-line-highlight-color: rgba(0, 0, 0, 0.5);
 
   --vp-code-line-number-color: var(--vp-c-text-dark-3);
 
-  --vp-code-copy-code-hover-bg: rgba(255, 255, 255, 0.05);
+  --vp-code-copy-code-hover-bg: rgba(125, 125, 125, 0.1);
 }
 
 .dark {
-  --vp-code-block-bg: var(--vp-c-bg-alt);
-
   --vp-code-line-number-color: var(--vp-c-text-dark-3);
 }
 
diff --git a/src/node/markdown/markdown.ts b/src/node/markdown/markdown.ts
index 2a2d3287..1ed38025 100644
--- a/src/node/markdown/markdown.ts
+++ b/src/node/markdown/markdown.ts
@@ -19,6 +19,8 @@ import attrs from 'markdown-it-attrs'
 import emoji from 'markdown-it-emoji'
 import toc from 'markdown-it-toc-done-right'
 
+export type ThemeOptions = Theme | { light: Theme; dark: Theme }
+
 export interface MarkdownOptions extends MarkdownIt.Options {
   lineNumbers?: boolean
   config?: (md: MarkdownIt) => void
@@ -31,7 +33,7 @@ export interface MarkdownOptions extends MarkdownIt.Options {
     allowedAttributes?: string[]
     disable?: boolean
   }
-  theme?: Theme
+  theme?: ThemeOptions
   // https://github.com/nagaozen/markdown-it-toc-done-right
   toc?: any
   externalLinks?: Record<string, string>
diff --git a/src/node/markdown/plugins/highlight.ts b/src/node/markdown/plugins/highlight.ts
index 291267c3..a70b4fdb 100644
--- a/src/node/markdown/plugins/highlight.ts
+++ b/src/node/markdown/plugins/highlight.ts
@@ -1,14 +1,28 @@
-import escapeHtml from 'escape-html'
 import { getHighlighter } from 'shiki'
+import type { ThemeOptions } from '../markdown'
 
-export const highlight = async (theme = 'material-palenight') => {
-  const highlighter = await getHighlighter({ theme })
+export async function highlight(
+  theme: ThemeOptions = { light: 'vitesse-light', dark: 'vitesse-dark' }
+) {
+  const themes = typeof theme === 'string' ? [theme] : [theme.dark, theme.light]
+  const highlighter = await getHighlighter({ themes })
+  const preRE = /^<pre.*?>/
 
   return (str: string, lang: string) => {
-    if (!lang || lang === 'text') {
-      return `<pre v-pre><code>${escapeHtml(str)}</code></pre>`
-    }
+    lang = lang || 'text'
 
-    return highlighter.codeToHtml(str, lang).replace(/^<pre.*?>/, '<pre v-pre>')
+    if (typeof theme === 'string') {
+      return highlighter
+        .codeToHtml(str, { lang, theme })
+        .replace(preRE, '<pre v-pre>')
+    } else {
+      const dark = highlighter
+        .codeToHtml(str, { lang, theme: theme.dark })
+        .replace(preRE, '<pre v-pre class="vp-code-dark">')
+      const light = highlighter
+        .codeToHtml(str, { lang, theme: theme.light })
+        .replace(preRE, '<pre v-pre class="vp-code-light">')
+      return dark + light
+    }
   }
 }