diff --git a/lua/chatgpt/code_edits.lua b/lua/chatgpt/code_edits.lua
index 1b02a830..88d581d0 100644
--- a/lua/chatgpt/code_edits.lua
+++ b/lua/chatgpt/code_edits.lua
@@ -91,7 +91,11 @@ end
 local spinner = Spinner:new(function(state)
   vim.schedule(function()
     if input_window.bufnr ~= nil then
-      output_window.border:set_text("top", " " .. state .. " ", "center")
+      output_window.border:set_text(
+        "top",
+        { { " " .. state .. " ", Config.options.highlights.code_edit_result_title } },
+        "center"
+      )
     end
     display_input_suffix(state)
   end)
@@ -108,7 +112,11 @@ local hide_progress = function()
   display_input_suffix()
 
   if output_window.bufnr ~= nil then
-    output_window.border:set_text("top", " Result ", "center")
+    output_window.border:set_text(
+      "top",
+      { { " Result ", Config.options.highlights.code_edit_result_title } },
+      "center"
+    )
   end
 end
 
diff --git a/lua/chatgpt/common/input_widget.lua b/lua/chatgpt/common/input_widget.lua
index 160c2eff..cfcd45f1 100644
--- a/lua/chatgpt/common/input_widget.lua
+++ b/lua/chatgpt/common/input_widget.lua
@@ -12,7 +12,7 @@ return function(name, on_submit)
     border = {
       style = "rounded",
       text = {
-        top = " " .. name .. " ",
+        top = { { " " .. name .. " ",Config.options.highlights.input_title } },
         top_align = "center",
       },
     },
diff --git a/lua/chatgpt/config.lua b/lua/chatgpt/config.lua
index 681a21cc..e3f881a3 100644
--- a/lua/chatgpt/config.lua
+++ b/lua/chatgpt/config.lua
@@ -180,6 +180,10 @@ function M.defaults()
     highlights = {
       help_key = "@symbol",
       help_description = "@comment",
+      params_value = "Identifier",
+      input_title = "FloatBorder",
+      active_session = "ErrorMsg",
+      code_edit_result_title = "FloatBorder",
     },
   }
   return defaults
diff --git a/lua/chatgpt/flows/chat/sessions.lua b/lua/chatgpt/flows/chat/sessions.lua
index 670e3fca..19505606 100644
--- a/lua/chatgpt/flows/chat/sessions.lua
+++ b/lua/chatgpt/flows/chat/sessions.lua
@@ -58,7 +58,7 @@ M.render_list = function()
   for i, session in pairs(M.sessions) do
     local icon = i == M.active_line and Config.options.chat.sessions_window.active_sign
       or Config.options.chat.sessions_window.inactive_sign
-    local cls = i == M.active_line and "ErrorMsg" or "Comment"
+    local cls = i == M.active_line and Config.options.highlights.active_session or "Comment"
     local name = Utils.trimText(session.name, 30)
     local vt = {
       { (M.current_line == i and Config.options.chat.sessions_window.current_line_sign or " ") .. icon .. name, cls },
diff --git a/lua/chatgpt/settings.lua b/lua/chatgpt/settings.lua
index fbb55649..3f5ed421 100644
--- a/lua/chatgpt/settings.lua
+++ b/lua/chatgpt/settings.lua
@@ -79,7 +79,7 @@ M.get_settings_panel = function(type, default_params)
     if M.params[key] ~= nil then
       local vt = {
         { Config.options.settings_window.setting_sign .. key .. ": ", "ErrorMsg" },
-        { M.params[key] .. "", "Identifier" },
+        { M.params[key] .. "", Config.options.highlights.params_value },
       }
       table.insert(details, vt)
     end