diff --git a/src/lib/assets/css/navbar.css b/src/lib/assets/css/navbar.css
index 09e3bb2..f1cb5b5 100644
--- a/src/lib/assets/css/navbar.css
+++ b/src/lib/assets/css/navbar.css
@@ -52,12 +52,13 @@
 }
 
 .cursor {
-	width: 8px;
-	height: 1em;
+	width: 0.5em;
+	height: 1.1em;
 	background: var(--nav-primary);
 	animation: blink 1s step-end infinite;
 	margin-left: 0.25rem;
-	vertical-align: text-bottom;
+	vertical-align: baseline;
+	transform: translateY(0.15em);
 }
 
 @keyframes blink {
diff --git a/src/lib/assets/css/terminal-page.css b/src/lib/assets/css/terminal-page.css
index badfba1..81b253e 100644
--- a/src/lib/assets/css/terminal-page.css
+++ b/src/lib/assets/css/terminal-page.css
@@ -191,12 +191,13 @@
 
 .cursor {
 	display: inline-block;
-	width: 8px;
-	height: 1em;
+	width: 0.5em;
+	height: 1.1em;
 	background: var(--terminal-primary);
 	animation: cursorBlink 1s step-end infinite;
 	margin-left: 2px;
-	vertical-align: text-bottom;
+	vertical-align: baseline;
+	transform: translateY(0.15em);
 }
 
 @keyframes cursorBlink {
diff --git a/src/lib/assets/css/terminal.css b/src/lib/assets/css/terminal.css
index 4417fd9..54c78e6 100644
--- a/src/lib/assets/css/terminal.css
+++ b/src/lib/assets/css/terminal.css
@@ -151,12 +151,13 @@
 
 .cursor {
 	display: inline-block;
-	width: 8px;
-	height: 1em;
+	width: 0.5em;
+	height: 1.1em;
 	background: var(--terminal-primary);
 	animation: cursorBlink 1s step-end infinite;
 	margin-left: 2px;
-	vertical-align: text-bottom;
+	vertical-align: baseline;
+	transform: translateY(0.15em);
 }
 
 @keyframes cursorBlink {
diff --git a/src/lib/assets/css/tui-body.css b/src/lib/assets/css/tui-body.css
index 21523a3..4ad4e24 100644
--- a/src/lib/assets/css/tui-body.css
+++ b/src/lib/assets/css/tui-body.css
@@ -195,12 +195,13 @@
 /* Cursor */
 .cursor {
 	display: inline-block;
-	width: 8px;
-	height: 1em;
+	width: 0.5em;
+	height: 1.1em;
 	background: var(--terminal-primary);
 	animation: cursorBlink 1s step-end infinite;
 	margin-left: 2px;
-	vertical-align: text-bottom;
+	vertical-align: baseline;
+	transform: translateY(0.15em);
 }
 
 @keyframes cursorBlink {
diff --git a/src/lib/assets/themes/arch.theme.json b/src/lib/assets/themes/arch.theme.json
index db1347f..a8db146 100644
--- a/src/lib/assets/themes/arch.theme.json
+++ b/src/lib/assets/themes/arch.theme.json
@@ -38,9 +38,6 @@
 			"mauve": "#cea5fb",
 			"flamingo": "#e06c75",
 			"rosewater": "#e8b4b8",
-			"primary": "var(--terminal-primary)",
-			"accent": "var(--terminal-accent)",
-			"muted": "var(--terminal-muted)",
 			"error": "#fa7970",
 			"success": "#23d18b",
 			"warning": "#faa356",
@@ -84,9 +81,6 @@
 			"mauve": "#602090",
 			"flamingo": "#901040",
 			"rosewater": "#a05040",
-			"primary": "var(--terminal-primary)",
-			"accent": "var(--terminal-accent)",
-			"muted": "var(--terminal-muted)",
 			"error": "#a6101d",
 			"success": "#005a2b",
 			"warning": "#945b00",
diff --git a/src/lib/assets/themes/catppuccin.theme.json b/src/lib/assets/themes/catppuccin.theme.json
index e799121..68b59ad 100644
--- a/src/lib/assets/themes/catppuccin.theme.json
+++ b/src/lib/assets/themes/catppuccin.theme.json
@@ -38,9 +38,6 @@
 			"mauve": "#cba6f7",
 			"flamingo": "#f2cdcd",
 			"rosewater": "#f5e0dc",
-			"primary": "var(--terminal-primary)",
-			"accent": "var(--terminal-accent)",
-			"muted": "var(--terminal-muted)",
 			"error": "#f38ba8",
 			"success": "#a6e3a1",
 			"warning": "#f9e2af",
@@ -84,9 +81,6 @@
 			"mauve": "#8839ef",
 			"flamingo": "#dd7878",
 			"rosewater": "#dc8a78",
-			"primary": "var(--terminal-primary)",
-			"accent": "var(--terminal-accent)",
-			"muted": "var(--terminal-muted)",
 			"error": "#d20f39",
 			"success": "#40a02b",
 			"warning": "#df8e1d",
diff --git a/src/lib/components/NavbarWaybar.svelte b/src/lib/components/NavbarWaybar.svelte
index 2366966..71a160b 100644
--- a/src/lib/components/NavbarWaybar.svelte
+++ b/src/lib/components/NavbarWaybar.svelte
@@ -2,7 +2,7 @@
 	import { mode, colorTheme, toggleMode, setColorTheme, themeOptions, themeColors, type ColorTheme } from '$lib/stores/theme';
 	import { page } from '$app/stores';
 	import { fly, fade, slide } from 'svelte/transition';
-	import { user, navigation, colorPalette } from '$lib/config';
+	import { user, navigation } from '$lib/config';
 	import Icon from '@iconify/svelte';
 	import { onMount, onDestroy } from 'svelte';
 	import '$lib/assets/css/navbar-waybar.css';
@@ -100,9 +100,9 @@
 		--bar-primary: {$themeColors.primary};
 		--bar-accent: {$themeColors.accent};
 		--bar-muted: {$themeColors.textMuted};
-		--bar-success: {colorPalette.success};
-		--bar-warning: {colorPalette.warning};
-		--bar-error: {colorPalette.error};
+		--bar-success: {$themeColors.colorMap.success};
+		--bar-warning: {$themeColors.colorMap.warning};
+		--bar-error: {$themeColors.colorMap.error};
 	"
 >
 	<!-- Left modules -->
diff --git a/src/lib/components/Terminal.svelte b/src/lib/components/Terminal.svelte
index edbc153..76168e3 100644
--- a/src/lib/components/Terminal.svelte
+++ b/src/lib/components/Terminal.svelte
@@ -117,7 +117,9 @@
 		--terminal-user: {$themeColors.terminalUser};
 		--terminal-path: {$themeColors.terminalPath};
 		--terminal-primary: {$themeColors.primary};
+		--terminal-secondary: {$themeColors.secondary};
 		--terminal-accent: {$themeColors.accent};
+		--terminal-bg-light: {$themeColors.backgroundLight};
 	"
 	bind:this={terminalElement}
 >
diff --git a/src/lib/components/TerminalPage.svelte b/src/lib/components/TerminalPage.svelte
index 6721847..d2ea9f1 100644
--- a/src/lib/components/TerminalPage.svelte
+++ b/src/lib/components/TerminalPage.svelte
@@ -152,6 +152,7 @@
 		--terminal-user: {$themeColors.terminalUser};
 		--terminal-path: {$themeColors.terminalPath};
 		--terminal-primary: {$themeColors.primary};
+		--terminal-secondary: {$themeColors.secondary};
 		--terminal-accent: {$themeColors.accent};
 		--terminal-bg-light: {$themeColors.backgroundLight};
 	"
diff --git a/src/lib/components/TerminalTUI.svelte b/src/lib/components/TerminalTUI.svelte
index 4912c4b..7dcbf4a 100644
--- a/src/lib/components/TerminalTUI.svelte
+++ b/src/lib/components/TerminalTUI.svelte
@@ -38,10 +38,13 @@
 		typeof speed === 'number' ? speed : (speedPresets[speed] ?? 1)
 	);
 
+	// Get colorMap from current theme
+	const colorMap = $derived($themeColors.colorMap);
+
 	// Pre-parse all lines upfront (segments + plain text)
 	const parsedLines = $derived<ParsedLine[]>(
 		lines.map(line => {
-			const segments = parseColorText(line.content);
+			const segments = parseColorText(line.content, colorMap);
 			return {
 				line,
 				segments,
@@ -337,6 +340,7 @@
 		--terminal-user: {$themeColors.terminalUser};
 		--terminal-path: {$themeColors.terminalPath};
 		--terminal-primary: {$themeColors.primary};
+		--terminal-secondary: {$themeColors.secondary};
 		--terminal-accent: {$themeColors.accent};
 		--terminal-bg-light: {$themeColors.backgroundLight};
 	"
diff --git a/src/lib/components/tui/TuiAccordion.svelte b/src/lib/components/tui/TuiAccordion.svelte
index 1d463ff..6d1f3a4 100644
--- a/src/lib/components/tui/TuiAccordion.svelte
+++ b/src/lib/components/tui/TuiAccordion.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import '$lib/assets/css/tui-accordion.css';
 
@@ -22,7 +23,7 @@
 
 <div class="tui-accordion" style="--accordion-accent: {getButtonStyle(line.style)}">
 	{#each items as item, i}
-		{@const contentSegments = parseColorText(item.content)}
+		{@const contentSegments = parseColorText(item.content, $themeColors.colorMap)}
 		<div class="accordion-item" class:open={openItems.has(i)}>
 			<button class="accordion-header" on:click={() => toggleItem(i)}>
 				<Icon 
diff --git a/src/lib/components/tui/TuiButton.svelte b/src/lib/components/tui/TuiButton.svelte
index 72b14d7..f706e0d 100644
--- a/src/lib/components/tui/TuiButton.svelte
+++ b/src/lib/components/tui/TuiButton.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import '$lib/assets/css/tui-button.css';
 
@@ -14,8 +15,8 @@
 	// Determine if this is an external link
 	$: isExternal = line.external || (line.href && (line.href.startsWith('http://') || line.href.startsWith('https://')));
 	
-	// Parse color formatting in content
-	$: segments = parseColorText(line.content);
+	// Parse color formatting in content using theme colorMap
+	$: segments = parseColorText(line.content, $themeColors.colorMap);
 </script>
 
 <button
diff --git a/src/lib/components/tui/TuiCheckbox.svelte b/src/lib/components/tui/TuiCheckbox.svelte
index eb97edd..fe0d004 100644
--- a/src/lib/components/tui/TuiCheckbox.svelte
+++ b/src/lib/components/tui/TuiCheckbox.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-checkbox.css';
@@ -13,7 +14,7 @@
 		change: boolean;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: isDisabled = line.inputDisabled || false;
 	$: indeterminate = line.checkboxIndeterminate || false;
 
diff --git a/src/lib/components/tui/TuiInput.svelte b/src/lib/components/tui/TuiInput.svelte
index 5df0324..6b09521 100644
--- a/src/lib/components/tui/TuiInput.svelte
+++ b/src/lib/components/tui/TuiInput.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-input.css';
@@ -16,7 +17,7 @@
 		blur: void;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: placeholder = line.inputPlaceholder || '';
 	$: inputType = line.inputType || 'text';
 	$: isDisabled = line.inputDisabled || false;
diff --git a/src/lib/components/tui/TuiLink.svelte b/src/lib/components/tui/TuiLink.svelte
index 3632ad1..72741b7 100644
--- a/src/lib/components/tui/TuiLink.svelte
+++ b/src/lib/components/tui/TuiLink.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import '$lib/assets/css/tui-link.css';
 
@@ -10,8 +11,8 @@
 	// Determine if this is an external link
 	$: isExternal = line.external || (line.href && (line.href.startsWith('http://') || line.href.startsWith('https://')));
 	
-	// Parse color formatting in content
-	$: segments = parseColorText(line.content);
+	// Parse color formatting in content using theme colorMap
+	$: segments = parseColorText(line.content, $themeColors.colorMap);
 </script>
 
 <span class="tui-link" style="--link-color: {getButtonStyle(line.style)}">
diff --git a/src/lib/components/tui/TuiProgress.svelte b/src/lib/components/tui/TuiProgress.svelte
index 4ad70f2..f4230c3 100644
--- a/src/lib/components/tui/TuiProgress.svelte
+++ b/src/lib/components/tui/TuiProgress.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import '$lib/assets/css/tui-progress.css';
 
@@ -9,8 +10,8 @@
 
 	$: progress = Math.min(100, Math.max(0, line.progress ?? 0));
 	$: label = line.progressLabel || `${progress}%`;
-	$: contentSegments = parseColorText(line.content);
-	$: labelSegments = parseColorText(label);
+	$: contentSegments = parseColorText(line.content, $themeColors.colorMap);
+	$: labelSegments = parseColorText(label, $themeColors.colorMap);
 </script>
 
 <div class="tui-progress" class:inline={inline} style="--progress-color: {getButtonStyle(line.style)}">
diff --git a/src/lib/components/tui/TuiRadio.svelte b/src/lib/components/tui/TuiRadio.svelte
index 6d72afa..c94d67f 100644
--- a/src/lib/components/tui/TuiRadio.svelte
+++ b/src/lib/components/tui/TuiRadio.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine, FormOption } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-radio.css';
@@ -13,7 +14,7 @@
 		change: string;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: options = line.radioOptions || [];
 	$: isDisabled = line.inputDisabled || false;
 	$: isHorizontal = line.radioHorizontal || false;
@@ -63,7 +64,7 @@
 	<div class="radio-options" class:horizontal={isHorizontal}>
 		{#each options as option}
 			{@const isSelected = value === option.value}
-			{@const optionSegments = parseColorText(option.label)}
+			{@const optionSegments = parseColorText(option.label, $themeColors.colorMap)}
 			<div 
 				class="radio-option"
 				class:selected={isSelected}
diff --git a/src/lib/components/tui/TuiSelect.svelte b/src/lib/components/tui/TuiSelect.svelte
index 150c8ab..c3b1b82 100644
--- a/src/lib/components/tui/TuiSelect.svelte
+++ b/src/lib/components/tui/TuiSelect.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine, FormOption } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-select.css';
@@ -15,7 +16,7 @@
 		blur: void;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: options = line.selectOptions || [];
 	$: placeholder = line.inputPlaceholder || 'Select an option...';
 	$: isDisabled = line.inputDisabled || false;
diff --git a/src/lib/components/tui/TuiTable.svelte b/src/lib/components/tui/TuiTable.svelte
index 9327ab9..8780869 100644
--- a/src/lib/components/tui/TuiTable.svelte
+++ b/src/lib/components/tui/TuiTable.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import '$lib/assets/css/tui-table.css';
 
@@ -27,7 +28,7 @@
 			{#each rows as row, i}
 				<tr class:alt={i % 2 === 1}>
 					{#each row as cell}
-						{@const cellSegments = parseColorText(cell)}
+						{@const cellSegments = parseColorText(cell, $themeColors.colorMap)}
 						<td>
 							{#each cellSegments as segment}
 								{#if getSegmentStyle(segment)}
diff --git a/src/lib/components/tui/TuiTextarea.svelte b/src/lib/components/tui/TuiTextarea.svelte
index e8464eb..019ec2e 100644
--- a/src/lib/components/tui/TuiTextarea.svelte
+++ b/src/lib/components/tui/TuiTextarea.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-textarea.css';
@@ -16,7 +17,7 @@
 		blur: void;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: placeholder = line.inputPlaceholder || '';
 	$: isDisabled = line.inputDisabled || false;
 	$: hasError = line.inputError;
diff --git a/src/lib/components/tui/TuiToggle.svelte b/src/lib/components/tui/TuiToggle.svelte
index a15b711..f7c934c 100644
--- a/src/lib/components/tui/TuiToggle.svelte
+++ b/src/lib/components/tui/TuiToggle.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import Icon from '@iconify/svelte';
 	import { getButtonStyle, parseColorText, getSegmentStyle } from './utils';
+	import { themeColors } from '$lib/stores/theme';
 	import type { TerminalLine } from './types';
 	import { createEventDispatcher } from 'svelte';
 	import '$lib/assets/css/tui-toggle.css';
@@ -13,7 +14,7 @@
 		change: boolean;
 	}>();
 
-	$: labelSegments = line.content ? parseColorText(line.content) : [];
+	$: labelSegments = line.content ? parseColorText(line.content, $themeColors.colorMap) : [];
 	$: isDisabled = line.inputDisabled || false;
 	$: onLabel = line.toggleOnLabel || 'ON';
 	$: offLabel = line.toggleOffLabel || 'OFF';
diff --git a/src/lib/components/tui/utils.ts b/src/lib/components/tui/utils.ts
index bbfdcba..1793b1a 100644
--- a/src/lib/components/tui/utils.ts
+++ b/src/lib/components/tui/utils.ts
@@ -21,8 +21,9 @@ export interface TextSegment {
 // Color maps for each theme
 export type ThemeColorMap = Record<string, string>;
 
-// Default color map (fallback)
+// Default color map (fallback) - includes theme colors for backwards compatibility
 export const defaultColorMap: ThemeColorMap = {
+	// Basic colors
 	'red': '#f38ba8',
 	'green': '#a6e3a1',
 	'yellow': '#f9e2af',
@@ -35,6 +36,17 @@ export const defaultColorMap: ThemeColorMap = {
 	'pink': '#f5c2e7',
 	'black': '#1e1e2e',
 	'surface': '#313244',
+	// Catppuccin extended colors
+	'teal': '#94e2d5',
+	'sky': '#89dceb',
+	'sapphire': '#74c7ec',
+	'lavender': '#b4befe',
+	'peach': '#fab387',
+	'maroon': '#eba0ac',
+	'mauve': '#cba6f7',
+	'flamingo': '#f2cdcd',
+	'rosewater': '#f5e0dc',
+	// Semantic colors
 	'primary': 'var(--terminal-primary)',
 	'accent': 'var(--terminal-accent)',
 	'muted': 'var(--terminal-muted)',
@@ -42,6 +54,16 @@ export const defaultColorMap: ThemeColorMap = {
 	'success': '#a6e3a1',
 	'warning': '#f9e2af',
 	'info': '#89b4fa',
+	// Theme colors (for using text, textMuted, etc. in formatter)
+	'text': '#cdd6f4',
+	'textMuted': '#a6adc8',
+	'background': '#1e1e2e',
+	'backgroundLight': '#313244',
+	'border': '#45475a',
+	'terminal': '#1e1e2e',
+	'terminalPrompt': '#cba6f7',
+	'terminalUser': '#a6e3a1',
+	'terminalPath': '#89b4fa',
 };
 
 // Legacy alias for backwards compatibility
diff --git a/src/lib/config/content.ts b/src/lib/config/content.ts
index f4c24da..07fef45 100644
--- a/src/lib/config/content.ts
+++ b/src/lib/config/content.ts
@@ -15,7 +15,7 @@ export interface Project {
 export const projects: Project[] = [
 	{
 		name: 'PokemonTCGAPI',
-		description: 'Official NPM package wrapper for the PokemonTCG API — utilities and helpers for working with Pokemon TCG data.',
+		description: 'UnOfficial NPM package wrapper for the PokemonTCG API.',
 		tech: ['TypeScript', 'Node.js'],
 		live: 'https://www.npmjs.com/package/@bosstop/pokemontcgapi',
 		image: 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/db/Npm-logo.svg/1200px-Npm-logo.svg.png',
@@ -23,7 +23,7 @@ export const projects: Project[] = [
 	},
 	{
 		name: 'MCSS TS API',
-		description: 'TypeScript API for MCServersSoft services, published to NPM.',
+		description: 'TypeScript API for MC Server Soft services, published to NPM.',
 		tech: ['TypeScript', 'Node.js'],
 		live: 'https://www.npmjs.com/package/@mcserversoft/mcss-api',
 		image: 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/db/Npm-logo.svg/1200px-Npm-logo.svg.png',
@@ -35,7 +35,7 @@ export const projects: Project[] = [
 		tech: ['TypeScript', 'Selenium'],
 		live: 'https://www.npmjs.com/package/@sirblob/mcp-selenium',
 		image: 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/db/Npm-logo.svg/1200px-Npm-logo.svg.png',
-		featured: false
+		featured: true
 	},
 	{
 		name: 'Pkit',
diff --git a/src/lib/config/theme.ts b/src/lib/config/theme.ts
index 75cc4f5..150b40f 100644
--- a/src/lib/config/theme.ts
+++ b/src/lib/config/theme.ts
@@ -1,8 +1,9 @@
 // ============================================================================
-// COLOR PALETTE
+// COLOR PALETTE (DEPRECATED)
 // ============================================================================
-// These colors are used for terminal text formatting and UI elements
-// Colors follow Catppuccin Mocha theme by default
+// NOTE: This is deprecated. Use themeColors.colorMap from $lib/stores/theme instead.
+// The colorMap in theme JSON files is the source of truth and supports dynamic themes.
+// This is kept for backward compatibility only.
 
 export const colorPalette = {
 	// Basic colors
diff --git a/src/lib/pages/home.ts b/src/lib/pages/home.ts
index f752e7b..41e2a5d 100644
--- a/src/lib/pages/home.ts
+++ b/src/lib/pages/home.ts
@@ -30,4 +30,12 @@ export const lines: TerminalLine[] = [
         inline: true
     })),
     { type: 'blank', content: '' },
+    { type: 'divider', content: 'Website Keybinds' },
+    { type: 'blank', content: '' },
+    { type: 'output', content: '(&orange)Toggle Light/Dark Mode(&) (&text, bold)(T)(&)' , inline: true },
+    { type: 'output', content: '(&muted)•(&)' , inline: true },
+    { type: 'output', content: '(&orange)Skip typing animation(&) (&text, bold)(Y)(&)' , inline: true },
+    { type: 'output', content: '(&muted)•(&)' , inline: true },
+    { type: 'output', content: '(&orange)Open/Close Navbar(&) (&text, bold)(N)(&)' , inline: true },
+    { type: 'blank', content: '' },
 ];
\ No newline at end of file
diff --git a/src/lib/stores/theme.ts b/src/lib/stores/theme.ts
index 9b387d5..a6c7372 100644
--- a/src/lib/stores/theme.ts
+++ b/src/lib/stores/theme.ts
@@ -48,9 +48,31 @@ const themes: Record<ColorTheme, ThemeJson> = {
 // Export themes for external access
 export { themes };
 
-// Build theme colors from JSON
+// CSS variable mappings for theme colors - these update dynamically with mode changes
+const themeColorVars: Record<string, string> = {
+	'primary': 'var(--terminal-primary)',
+	'secondary': 'var(--terminal-secondary)',
+	'accent': 'var(--terminal-accent)',
+	'background': 'var(--terminal-bg)',
+	'backgroundLight': 'var(--terminal-bg-light)',
+	'text': 'var(--terminal-text)',
+	'textMuted': 'var(--terminal-muted)',
+	'border': 'var(--terminal-border)',
+	'terminal': 'var(--terminal-bg)',
+	'terminalPrompt': 'var(--terminal-prompt)',
+	'terminalUser': 'var(--terminal-user)',
+	'terminalPath': 'var(--terminal-path)',
+};
+
+// Build theme colors from JSON - merges colors into colorMap so formatter can use both
 function buildThemeColors(theme: ThemeJson, mode: Mode): ThemeColors {
 	const modeData = theme[mode];
+	// Merge colors and colorMap - use CSS variables for theme colors so they update dynamically
+	const mergedColorMap: ThemeColorMap = {
+		...defaultColorMap,           // Fallback defaults
+		...(modeData.colorMap ?? {}), // Theme's color palette
+		...themeColorVars             // Theme colors as CSS variables - update with mode changes
+	};
 	return {
 		primary: modeData.colors.primary,
 		secondary: modeData.colors.secondary,
@@ -64,7 +86,7 @@ function buildThemeColors(theme: ThemeJson, mode: Mode): ThemeColors {
 		terminalPrompt: modeData.colors.terminalPrompt,
 		terminalUser: modeData.colors.terminalUser,
 		terminalPath: modeData.colors.terminalPath,
-		colorMap: modeData.colorMap ?? defaultColorMap
+		colorMap: mergedColorMap
 	};
 }