diff --git a/packages/cli/src/ui/themes/ansi-light.ts b/packages/cli/src/ui/themes/ansi-light.ts
index fc35e434..31af6aca 100644
--- a/packages/cli/src/ui/themes/ansi-light.ts
+++ b/packages/cli/src/ui/themes/ansi-light.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const ansiLightColors: ColorsTheme = {
   type: 'light',
@@ -19,7 +19,7 @@ const ansiLightColors: ColorsTheme = {
   AccentRed: 'red',
   Comment: 'gray',
   Gray: 'gray',
-  GradientColors: lightTheme.GradientColors,
+  GradientColors: ['blue', 'green'],
 };
 
 export const ANSILight: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/ansi.ts b/packages/cli/src/ui/themes/ansi.ts
index 9a8feb33..fa8196d0 100644
--- a/packages/cli/src/ui/themes/ansi.ts
+++ b/packages/cli/src/ui/themes/ansi.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const ansiColors: ColorsTheme = {
   type: 'dark',
@@ -19,7 +19,7 @@ const ansiColors: ColorsTheme = {
   AccentRed: 'red',
   Comment: 'gray',
   Gray: 'gray',
-  GradientColors: darkTheme.GradientColors, // Fallback
+  GradientColors: ['cyan', 'green'],
 };
 
 export const ANSI: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/atom-one-dark.ts b/packages/cli/src/ui/themes/atom-one-dark.ts
index 84849a54..951b8898 100644
--- a/packages/cli/src/ui/themes/atom-one-dark.ts
+++ b/packages/cli/src/ui/themes/atom-one-dark.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const atomOneDarkColors: ColorsTheme = {
   type: 'dark',
@@ -19,7 +19,7 @@ const atomOneDarkColors: ColorsTheme = {
   AccentRed: '#e06c75',
   Comment: '#5c6370',
   Gray: '#5c6370',
-  GradientColors: darkTheme.GradientColors,
+  GradientColors: ['#61aeee', '#98c379'],
 };
 
 export const AtomOneDark: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/ayu-light.ts b/packages/cli/src/ui/themes/ayu-light.ts
index 9d91e509..45004107 100644
--- a/packages/cli/src/ui/themes/ayu-light.ts
+++ b/packages/cli/src/ui/themes/ayu-light.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const ayuLightColors: ColorsTheme = {
   type: 'light',
@@ -19,7 +19,7 @@ const ayuLightColors: ColorsTheme = {
   AccentRed: '#f07171',
   Comment: '#ABADB1',
   Gray: '#CCCFD3',
-  GradientColors: lightTheme.GradientColors,
+  GradientColors: ['#399ee6', '#86b300'],
 };
 
 export const AyuLight: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/ayu.ts b/packages/cli/src/ui/themes/ayu.ts
index 738d4dae..a5cfc7db 100644
--- a/packages/cli/src/ui/themes/ayu.ts
+++ b/packages/cli/src/ui/themes/ayu.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const ayuDarkColors: ColorsTheme = {
   type: 'dark',
@@ -19,7 +19,7 @@ const ayuDarkColors: ColorsTheme = {
   AccentRed: '#F26D78',
   Comment: '#646A71',
   Gray: '##3D4149',
-  GradientColors: darkTheme.GradientColors,
+  GradientColors: ['#FFB454', '#F26D78'],
 };
 
 export const AyuDark: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/dracula.ts b/packages/cli/src/ui/themes/dracula.ts
index 101f1942..d754deed 100644
--- a/packages/cli/src/ui/themes/dracula.ts
+++ b/packages/cli/src/ui/themes/dracula.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const draculaColors: ColorsTheme = {
   type: 'dark',
@@ -19,7 +19,7 @@ const draculaColors: ColorsTheme = {
   AccentRed: '#ff5555',
   Comment: '#6272a4',
   Gray: '#6272a4',
-  GradientColors: darkTheme.GradientColors,
+  GradientColors: ['#ff79c6', '#8be9fd'],
 };
 
 export const Dracula: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/github-dark.ts b/packages/cli/src/ui/themes/github-dark.ts
index 1333f945..f6912821 100644
--- a/packages/cli/src/ui/themes/github-dark.ts
+++ b/packages/cli/src/ui/themes/github-dark.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const githubDarkColors: ColorsTheme = {
   type: 'dark',
@@ -19,7 +19,7 @@ const githubDarkColors: ColorsTheme = {
   AccentRed: '#F97583',
   Comment: '#6A737D',
   Gray: '#6A737D',
-  GradientColors: darkTheme.GradientColors,
+  GradientColors: ['#79B8FF', '#85E89D'],
 };
 
 export const GitHubDark: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/github-light.ts b/packages/cli/src/ui/themes/github-light.ts
index 15a9249d..f1393e70 100644
--- a/packages/cli/src/ui/themes/github-light.ts
+++ b/packages/cli/src/ui/themes/github-light.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const githubLightColors: ColorsTheme = {
   type: 'light',
@@ -19,7 +19,7 @@ const githubLightColors: ColorsTheme = {
   AccentRed: '#d14',
   Comment: '#998',
   Gray: '#999',
-  GradientColors: lightTheme.GradientColors,
+  GradientColors: ['#458', '#008080'],
 };
 
 export const GitHubLight: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/googlecode.ts b/packages/cli/src/ui/themes/googlecode.ts
index a7895bb8..5e4f02fb 100644
--- a/packages/cli/src/ui/themes/googlecode.ts
+++ b/packages/cli/src/ui/themes/googlecode.ts
@@ -19,7 +19,7 @@ const googleCodeColors: ColorsTheme = {
   AccentRed: '#800',
   Comment: '#5f6368',
   Gray: lightTheme.Gray,
-  GradientColors: lightTheme.GradientColors,
+  GradientColors: ['#066', '#606'],
 };
 
 export const GoogleCode: Theme = new Theme(
diff --git a/packages/cli/src/ui/themes/xcode.ts b/packages/cli/src/ui/themes/xcode.ts
index d73c664a..15012288 100644
--- a/packages/cli/src/ui/themes/xcode.ts
+++ b/packages/cli/src/ui/themes/xcode.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme, type ColorsTheme } from './theme.js';
+import { type ColorsTheme, Theme } from './theme.js';
 
 const xcodeColors: ColorsTheme = {
   type: 'light',
@@ -19,7 +19,7 @@ const xcodeColors: ColorsTheme = {
   AccentRed: '#c41a16',
   Comment: '#007400',
   Gray: '#c0c0c0',
-  GradientColors: darkTheme.GradientColors,
+  GradientColors: ['#1c00cf', '#007400'],
 };
 
 export const XCode: Theme = new Theme(