diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css
index 0c8aa9ca2..7df82c278 100644
--- a/src/frontend/src/index.css
+++ b/src/frontend/src/index.css
@@ -921,13 +921,13 @@ The cursor: default; property value restores the browser's default cursor style
   }
 
   .form-modal-lock-true {
-    @apply bg-input text-black
+    @apply bg-input text-primary
   }
   .form-modal-no-input {
-    @apply bg-input text-center text-black dark:bg-gray-700 dark:text-gray-300
+    @apply bg-input text-center text-primary dark:bg-gray-700 dark:text-gray-300
   }
   .form-modal-lock-false {
-    @apply bg-white text-black
+    @apply bg-white text-primary
   }
   .form-modal-lockchat {
     @apply form-input focus:ring-ring focus:border-ring block w-full rounded-md border-border p-4 pr-16 custom-scroll sm:text-sm
@@ -1080,5 +1080,9 @@ The cursor: default; property value restores the browser's default cursor style
     @apply font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70
   }
 
+  .chat-message-highlight {
+    @apply my-1 rounded-md bg-indigo-100 dark:bg-indigo-900
+  }
+
 
 }
diff --git a/src/frontend/src/modals/formModal/chatMessage/index.tsx b/src/frontend/src/modals/formModal/chatMessage/index.tsx
index d75b901fe..5c318cb17 100644
--- a/src/frontend/src/modals/formModal/chatMessage/index.tsx
+++ b/src/frontend/src/modals/formModal/chatMessage/index.tsx
@@ -181,7 +181,7 @@ export default function ChatMessage({
                       // Push div with matched text
                       if (chat.message[match[1]]) {
                         parts.push(
-                          <span className="my-1 rounded-md bg-indigo-100">
+                          <span className="chat-message-highlight">
                             {chat.message[match[1]]}
                           </span>
                         );