diff --git a/api/config.lua b/api/config.lua
index 3fa6a889..1935bc4f 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -730,6 +730,10 @@ function pfUI:LoadConfig()
 
   pfUI:UpdateConfig("nameplates", nil,           "outcombatstate",   "1")
   pfUI:UpdateConfig("nameplates", nil,           "barcombatstate",   "0")
+  pfUI:UpdateConfig("nameplates", nil,           "combatthreat",     ".7,.2,.2,1")
+  pfUI:UpdateConfig("nameplates", nil,           "combatnothreat",   ".7,.7,.2,1")
+  pfUI:UpdateConfig("nameplates", nil,           "combatstun",       ".2,.7,.7,1")
+
   pfUI:UpdateConfig("nameplates", nil,           "outfriendly",      "0")
   pfUI:UpdateConfig("nameplates", nil,           "outfriendlynpc",   "1")
   pfUI:UpdateConfig("nameplates", nil,           "outneutral",       "1")
diff --git a/modules/gui.lua b/modules/gui.lua
index 54859c53..7923f5c2 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -2291,6 +2291,9 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["SuperWoW Settings"], nil, nil, "header")
       CreateConfig(U["nameplates"], T["Overwrite Border Color With Combat State"], C.nameplates, "outcombatstate", "checkbox")
       CreateConfig(U["nameplates"], T["Overwrite Health Color With Combat State"], C.nameplates, "barcombatstate", "checkbox")
+      CreateConfig(U["nameplates"], T["Unit Is Attacking You"], C.nameplates, "combatthreat", "color")
+      CreateConfig(U["nameplates"], T["Unit Is Attacking Others"], C.nameplates, "combatnothreat", "color")
+      CreateConfig(U["nameplates"], T["Unit Is Attacking No One"], C.nameplates, "combatstun", "color")
     end)
 
     CreateGUIEntry(T["Thirdparty"], T["Integrations"], function()
diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index a77ad585..756d067c 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -11,6 +11,7 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
   }
 
   local combatstate = {
+    -- gets overwritten by user config
     ["NOTHREAT"] = { r = .7, g = .7, b = .2, a = 1 },
     ["THREAT"]   = { r = .7, g = .2, b = .2, a = 1 },
     ["CASTING"]  = { r = .7, g = .2, b = .7, a = 1 },
@@ -463,6 +464,11 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
     local healthoffset = tonumber(C.nameplates.health.offset)
     local orientation = C.nameplates.verticalhealth == "1" and "VERTICAL" or "HORIZONTAL"
 
+    local c = combatstate -- load combat state colors
+    c.THREAT.r, c.THREAT.g, c.THREAT.b, c.THREAT.a = GetStringColor(C.nameplates.combatthreat)
+    c.NOTHREAT.r, c.NOTHREAT.g, c.NOTHREAT.b, c.NOTHREAT.a = GetStringColor(C.nameplates.combatnothreat)
+    c.STUN.r, c.STUN.g, c.STUN.b, c.STUN.a = GetStringColor(C.nameplates.combatstun)
+
     nameplate:SetWidth(plate_width)
     nameplate:SetHeight(plate_height)
     nameplate:SetPoint("TOP", parent, "TOP", 0, 0)