diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/AmazonQTheme.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/AmazonQTheme.kt
index 1c78cbc2cae..33a6e534927 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/AmazonQTheme.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/AmazonQTheme.kt
@@ -37,8 +37,6 @@ data class AmazonQTheme(
     val warning: Color,
     val error: Color,
 
-    val cardBackground: Color,
-
     val editorFont: Font,
     val editorBackground: Color,
     val editorForeground: Color,
@@ -49,5 +47,5 @@ data class AmazonQTheme(
     val editorKeyword: Color,
     val editorString: Color,
     val editorProperty: Color,
-
+    val editorClassName: Color,
 )
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt
index 7fa543bf1d8..96cf8bf2063 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt
@@ -13,6 +13,7 @@ enum class CssVariable(
     FontFamily("--mynah-font-family"),
 
     TextColorDefault("--mynah-color-text-default"),
+    TextColorAlt("--mynah-color-text-alternate"),
     TextColorStrong("--mynah-color-text-strong"),
     TextColorWeak("--mynah-color-text-weak"),
     TextColorLink("--mynah-color-text-link"),
@@ -25,7 +26,7 @@ enum class CssVariable(
     ColorDeep("--mynah-color-deep"),
     ColorDeepReverse("--mynah-color-deep-reverse"),
     BorderDefault("--mynah-color-border-default"),
-    InputBackground("--mynah-color-input-bg"),
+    InputBackground("--mynah-input-bg"),
 
     SyntaxBackground("--mynah-color-syntax-bg"),
     SyntaxVariable("--mynah-color-syntax-variable"),
@@ -36,6 +37,9 @@ enum class CssVariable(
     SyntaxProperty("--mynah-color-syntax-property"),
     SyntaxComment("--mynah-color-syntax-comment"),
     SyntaxCode("--mynah-color-syntax-code"),
+    SyntaxKeyword("--mynah-color-syntax-keyword"),
+    SyntaxString("--mynah-color-syntax-string"),
+    SyntaxClassName("--mynah-color-syntax-class-name"),
     SyntaxCodeFontFamily("--mynah-syntax-code-font-family"),
     SyntaxCodeFontSize("--mynah-syntax-code-font-size"),
 
@@ -50,10 +54,9 @@ enum class CssVariable(
     SecondaryButtonBackground("--mynah-color-alternate"),
     SecondaryButtonForeground("--mynah-color-alternate-reverse"),
 
-    CodeText("--mynah-color-code-text"),
-
     MainBackground("--mynah-color-main"),
     MainForeground("--mynah-color-main-reverse"),
 
     CardBackground("--mynah-card-bg"),
+    CardBackgroundAlt("--mynah-card-bg-alternate"),
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/EditorThemeAdapter.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/EditorThemeAdapter.kt
index 4f56b127994..2ca89145e6e 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/EditorThemeAdapter.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/EditorThemeAdapter.kt
@@ -113,11 +113,9 @@ class EditorThemeAdapter {
                 warning = themeColor("Component.warningFocusColor", default = 0xE2A53A),
                 error = themeColor("ProgressBar.failedColor", default = 0xD64F4F, darkDefault = 0xE74848),
 
-                cardBackground = cardBackground,
-
                 editorFont = currentScheme.getFont(EditorFontType.PLAIN),
-                editorBackground = chatBackground,
-                editorForeground = text,
+                editorBackground = currentScheme.defaultBackground,
+                editorForeground = currentScheme.defaultForeground,
                 editorVariable = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.LOCAL_VARIABLE),
                 editorOperator = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.OPERATION_SIGN),
                 editorFunction = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.FUNCTION_DECLARATION),
@@ -125,6 +123,7 @@ class EditorThemeAdapter {
                 editorKeyword = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.KEYWORD),
                 editorString = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.STRING),
                 editorProperty = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.INSTANCE_FIELD),
+                editorClassName = currentScheme.foregroundColor(DefaultLanguageHighlighterColors.CLASS_NAME),
             )
         }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
index 77528733556..b32b6e3af51 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
@@ -35,6 +35,7 @@ class ThemeBrowserAdapter {
         append(CssVariable.FontFamily, theme.font.toCssFontFamily())
 
         append(CssVariable.TextColorDefault, theme.defaultText)
+        append(CssVariable.TextColorAlt, theme.defaultText)
         append(CssVariable.TextColorStrong, theme.textFieldForeground)
         append(CssVariable.TextColorInput, theme.textFieldForeground)
         append(CssVariable.TextColorLink, theme.linkText)
@@ -42,7 +43,8 @@ class ThemeBrowserAdapter {
 
         append(CssVariable.Background, theme.background)
         append(CssVariable.BackgroundAlt, theme.background)
-        append(CssVariable.CardBackground, theme.cardBackground)
+        append(CssVariable.CardBackground, theme.editorBackground)
+        append(CssVariable.CardBackgroundAlt, theme.editorBackground)
         append(CssVariable.BorderDefault, theme.border)
         append(CssVariable.TabActive, theme.activeTab)
 
@@ -63,6 +65,7 @@ class ThemeBrowserAdapter {
 
         append(CssVariable.SyntaxCodeFontFamily, theme.editorFont.toCssFontFamily("monospace"))
         append(CssVariable.SyntaxCodeFontSize, theme.editorFont.toCssSize())
+        append(CssVariable.SyntaxCode, theme.editorForeground)
         append(CssVariable.SyntaxBackground, theme.editorBackground)
         append(CssVariable.SyntaxVariable, theme.editorVariable)
         append(CssVariable.SyntaxOperator, theme.editorOperator)
@@ -71,7 +74,9 @@ class ThemeBrowserAdapter {
         append(CssVariable.SyntaxAttributeValue, theme.editorKeyword)
         append(CssVariable.SyntaxAttribute, theme.editorString)
         append(CssVariable.SyntaxProperty, theme.editorProperty)
-        append(CssVariable.SyntaxCode, theme.editorForeground)
+        append(CssVariable.SyntaxKeyword, theme.editorKeyword)
+        append(CssVariable.SyntaxString, theme.editorString)
+        append(CssVariable.SyntaxClassName, theme.editorClassName)
 
         append(CssVariable.MainBackground, theme.buttonBackground)
         append(CssVariable.MainForeground, theme.buttonForeground)