diff --git a/.changeset/quick-ads-exercise.md b/.changeset/quick-ads-exercise.md
new file mode 100644
index 000000000000..dd4285a4cb3b
--- /dev/null
+++ b/.changeset/quick-ads-exercise.md
@@ -0,0 +1,10 @@
+---
+'@astrojs/markdown-remark': major
+---
+
+Renames the following CSS variables theme color token names to better align with the Shiki v1 defaults:
+
+- `--astro-code-color-text` => `--astro-code-foreground`
+- `--astro-code-color-background` => `--astro-code-background`
+
+You can perform a global find and replace in your project to migrate to the new token names.
diff --git a/packages/astro/test/astro-component-code.test.js b/packages/astro/test/astro-component-code.test.js
index 3e5bf5d9e3a6..80707f52dea8 100644
--- a/packages/astro/test/astro-component-code.test.js
+++ b/packages/astro/test/astro-component-code.test.js
@@ -88,12 +88,12 @@ describe('<Code>', () => {
 				.map((i, f) => (f.attribs ? f.attribs.style : 'no style found'))
 				.toArray(),
 			[
-				'background-color:var(--astro-code-color-background);color:var(--astro-code-color-text); overflow-x: auto;',
+				'background-color:var(--astro-code-background);color:var(--astro-code-foreground); overflow-x: auto;',
 				'color:var(--astro-code-token-constant)',
 				'color:var(--astro-code-token-function)',
-				'color:var(--astro-code-color-text)',
+				'color:var(--astro-code-foreground)',
 				'color:var(--astro-code-token-string-expression)',
-				'color:var(--astro-code-color-text)',
+				'color:var(--astro-code-foreground)',
 			]
 		);
 	});
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts
index fa29c9c06a1f..27b54f7bd68d 100644
--- a/packages/markdown/remark/src/shiki.ts
+++ b/packages/markdown/remark/src/shiki.ts
@@ -5,7 +5,6 @@ import {
 	getHighlighter,
 	isSpecialLang,
 } from 'shiki';
-import { visit } from 'unist-util-visit';
 import type { ShikiConfig } from './types.js';
 
 export interface ShikiHighlighter {
@@ -23,16 +22,6 @@ export interface ShikiHighlighter {
 	): Promise<string>;
 }
 
-// TODO: Remove this special replacement in Astro 5
-const ASTRO_COLOR_REPLACEMENTS: Record<string, string> = {
-	'--astro-code-foreground': '--astro-code-color-text',
-	'--astro-code-background': '--astro-code-color-background',
-};
-const COLOR_REPLACEMENT_REGEX = new RegExp(
-	`${Object.keys(ASTRO_COLOR_REPLACEMENTS).join('|')}`,
-	'g'
-);
-
 let _cssVariablesTheme: ReturnType<typeof createCssVariablesTheme>;
 const cssVariablesTheme = () =>
 	_cssVariablesTheme ??
@@ -145,21 +134,6 @@ export async function createShikiHighlighter({
 								return node.children[0] as typeof node;
 							}
 						},
-						root(node) {
-							if (Object.values(themes).length) {
-								return;
-							}
-
-							const themeName = typeof theme === 'string' ? theme : theme.name;
-							if (themeName === 'css-variables') {
-								// Replace special color tokens to CSS variables
-								visit(node as any, 'element', (child) => {
-									if (child.properties?.style) {
-										child.properties.style = replaceCssVariables(child.properties.style);
-									}
-								});
-							}
-						},
 					},
 					...transformers,
 				],
@@ -171,7 +145,3 @@ export async function createShikiHighlighter({
 function normalizePropAsString(value: Properties[string]): string | null {
 	return Array.isArray(value) ? value.join(' ') : (value as string | null);
 }
-
-function replaceCssVariables(str: string) {
-	return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
-}