diff --git a/src/__tests__/renderer/constants/themes.test.ts b/src/__tests__/renderer/constants/themes.test.ts
index 5c29884db..6772ee37a 100644
--- a/src/__tests__/renderer/constants/themes.test.ts
+++ b/src/__tests__/renderer/constants/themes.test.ts
@@ -51,12 +51,12 @@ describe('THEMES constant', () => {
 			}
 		});
 
-		it('should have exactly 17 themes (sync check with ThemeId type)', () => {
+		it('should have exactly 18 themes (sync check with ThemeId type)', () => {
 			// This count should match the number of IDs in ThemeId union type.
 			// If a new theme is added to THEMES without updating ThemeId, TypeScript errors.
 			// If ThemeId is updated without adding to isValidThemeId array, other tests fail.
 			// This test serves as an explicit reminder when themes are added/removed.
-			expect(themeIds.length).toBe(17);
+			expect(themeIds.length).toBe(18);
 		});
 
 		it('should have theme.id matching its key', () => {
diff --git a/src/renderer/components/SessionListItem.tsx b/src/renderer/components/SessionListItem.tsx
index e9084ecc1..ca5f96ec7 100644
--- a/src/renderer/components/SessionListItem.tsx
+++ b/src/renderer/components/SessionListItem.tsx
@@ -217,7 +217,7 @@ export function SessionListItem({
 					{session.origin === 'user' && (
 						<span
 							className="text-[10px] font-bold px-1.5 py-0.5 rounded"
-							style={{ backgroundColor: theme.colors.accent + '30', color: theme.colors.accent }}
+							style={{ backgroundColor: theme.colors.accent + '40', color: theme.colors.accentText }}
 							title="User-initiated through Maestro"
 						>
 							MAESTRO
@@ -226,7 +226,7 @@ export function SessionListItem({
 					{session.origin === 'auto' && (
 						<span
 							className="text-[10px] font-bold px-1.5 py-0.5 rounded"
-							style={{ backgroundColor: theme.colors.warning + '30', color: theme.colors.warning }}
+							style={{ backgroundColor: theme.colors.warning + '40', color: theme.colors.warning }}
 							title="Auto-run session"
 						>
 							AUTO
@@ -235,7 +235,7 @@ export function SessionListItem({
 					{!session.origin && (
 						<span
 							className="text-[10px] font-bold px-1.5 py-0.5 rounded"
-							style={{ backgroundColor: theme.colors.border, color: theme.colors.textDim }}
+							style={{ backgroundColor: theme.colors.border, color: theme.colors.textMain }}
 							title="Claude Code CLI session"
 						>
 							CLI
@@ -245,7 +245,7 @@ export function SessionListItem({
 					{/* Session ID pill */}
 					<span
 						className="text-[10px] font-mono px-1.5 py-0.5 rounded"
-						style={{ backgroundColor: theme.colors.border + '60', color: theme.colors.textDim }}
+						style={{ backgroundColor: theme.colors.border, color: theme.colors.textMain }}
 					>
 						{session.sessionId.startsWith('agent-')
 							? `AGENT-${session.sessionId.split('-')[1]?.toUpperCase() || ''}`
diff --git a/src/renderer/utils/markdownConfig.ts b/src/renderer/utils/markdownConfig.ts
index 8823a109e..2fb1ce780 100644
--- a/src/renderer/utils/markdownConfig.ts
+++ b/src/renderer/utils/markdownConfig.ts
@@ -375,9 +375,23 @@ export function createMarkdownComponents(options: MarkdownComponentsOptions): Pa
 				}
 
 				// Standard syntax-highlighted code block
+				// Merge theme's text color into vscDarkPlus base so plain-text
+				// code blocks match inline code across all themes.
+				const themedStyle = {
+					...vscDarkPlus,
+					'pre[class*="language-"]': {
+						...(vscDarkPlus as any)['pre[class*="language-"]'],
+						color: theme.colors.textMain,
+						background: theme.colors.bgActivity,
+					},
+					'code[class*="language-"]': {
+						...(vscDarkPlus as any)['code[class*="language-"]'],
+						color: theme.colors.textMain,
+					},
+				};
 				return React.createElement(SyntaxHighlighter, {
 					language,
-					style: vscDarkPlus,
+					style: themedStyle,
 					customStyle: {
 						margin: '0.5em 0',
 						padding: '1em',
diff --git a/src/shared/theme-types.ts b/src/shared/theme-types.ts
index 027e09e48..aad204b1a 100644
--- a/src/shared/theme-types.ts
+++ b/src/shared/theme-types.ts
@@ -17,6 +17,7 @@ export type ThemeId =
 	| 'monokai'
 	| 'github-light'
 	| 'solarized-light'
+	| 'solarized-dark'
 	| 'nord'
 	| 'tokyo-night'
 	| 'one-light'
@@ -92,6 +93,7 @@ export function isValidThemeId(id: string): id is ThemeId {
 		'monokai',
 		'github-light',
 		'solarized-light',
+		'solarized-dark',
 		'nord',
 		'tokyo-night',
 		'one-light',
diff --git a/src/shared/themes.ts b/src/shared/themes.ts
index 8bd1455a0..6ee408a5f 100644
--- a/src/shared/themes.ts
+++ b/src/shared/themes.ts
@@ -134,6 +134,26 @@ export const THEMES: Record<ThemeId, Theme> = {
 			error: '#fb4934',
 		},
 	},
+	'solarized-dark': {
+		id: 'solarized-dark',
+		name: 'Solarized Dark',
+		mode: 'dark',
+		colors: {
+			bgMain: '#002b36',
+			bgSidebar: '#073642',
+			bgActivity: '#0a4050',
+			border: '#2f4f56',
+			textMain: '#93a1a1',
+			textDim: '#657b83',
+			accent: '#268bd2',
+			accentDim: 'rgba(38, 139, 210, 0.2)',
+			accentText: '#5fddd5',
+			accentForeground: '#002b36',
+			success: '#859900',
+			warning: '#b58900',
+			error: '#dc322f',
+		},
+	},
 	// Light themes
 	'github-light': {
 		id: 'github-light',