Index: Highlight.lua
===================================================================
--- Highlight.lua	(revision 77131)
+++ Highlight.lua	(working copy)
@@ -43,11 +43,15 @@
 	local hasHighlight
 	
 	if frameHighlight ~= "Cureable by me" and frameHighlight ~= "Cureable" or UnitIsFriend("player", unit) then
-	local _, htexture, hdispel
+	local hname, htexture, hdispel
 		for i = 1, 40 do
-			_, _, htexture, _, hdispel = UnitDebuff(unit, i) -- ignore the raidfilter for frame highlighting
+			hname, _, htexture, _, hdispel = UnitDebuff(unit, i) -- ignore the raidfilter for frame highlighting
 			if htexture then
-				if not hdispel then -- no dispel type set
+				if profile.filter.extraFriendHighlights[hname] then
+					-- tostring will set the hasHighlight to "nil" if it is not dispellable. 
+					hasHighlight = tostring(hdispel)
+					-- We deliberately continue here to find an optional cureable or cureable by me debuff which has priority for highlighting.
+				elseif not hdispel then -- no dispel type set
 					if frameHighlight == "All Debuffs" and self:HighlightHook(unit, frame, i) then -- only set highlight to "nil"  if we want to show all debuffs
 						hasHighlight = "nil" -- we specifically continue here to find an optional cureable or cureable by me debuff which has priority for highlighting
 					end
Index: Core.lua
===================================================================
--- Core.lua	(revision 77131)
+++ Core.lua	(working copy)
@@ -583,6 +583,9 @@
 			extraFriendDebuffs = {
 				['*'] = false,
 			},
+			extraFriendHighlights = {
+				['*'] = false,
+			},
 		}
 	})
 	--TODO: remove this  conversion code when 2.4 goes live
@@ -769,8 +772,14 @@
 	lastUpdated[frame] = GetTime()
 	
 	local db = self.db.profile[frame.group]
-	
-	if db.frameHighlight == "Never" then
+
+	local extraFriendHighlightsCount = 0
+	for k,v in pairs(self.db.profile.filter.extraFriendHighlights) do
+		if v then
+			extraFriendHighlightsCount = extraFriendHighlightsCount + 1
+		end
+	end
+	if db.frameHighlight == "Never" and extraFriendHighlightsCount == 0 then
 		if frame.debuffHighlight then
 			frame.debuffHighlight = delFrame(frame.debuffHighlight)
 		end
Index: Options.lua
===================================================================
--- Options.lua	(revision 77131)
+++ Options.lua	(working copy)
@@ -1067,6 +1067,47 @@
 				usage = L["<Debuff name>"],
 				order = 158,
 			},
+			extraFriendHighlightFilter = {
+				type = "multichoice",
+				name = L["Extra friend highlights"],
+				desc = L["Additional debuffs that will be highlighted on friends and yourself."],
+				choices = function()
+					local t = newDict()
+					for k in pairs(PitBull_Aura.db.profile.filter.extraFriendHighlights) do
+						t[k] = k
+					end
+					return "@dict", unpackDictAndDel(t)
+				end,
+				get = function(key)
+					return PitBull_Aura.db.profile.filter.extraFriendHighlights[key]
+				end,
+				set = function(key, value)
+					PitBull_Aura.db.profile.filter.extraFriendHighlights[key] = value
+
+					for unit, frame in PitBull:IterateUnitFrames() do
+						PitBull_Aura:OnUpdateFrame(unit, frame)
+					end
+				end,
+				disabled = function()
+					return not next(PitBull_Aura.db.profile.filter.extraFriendHighlights)
+				end,
+				order = 159,
+			},
+			addFriendHighlight = {
+				type = 'string',
+				name = L["Add extra friend highlight"],
+				desc = L["Add a debuff to highlight on friends that is not listed."],
+				get = false,
+				set = function(value)
+					PitBull_Aura.db.profile.filter.extraFriendHighlights[value] = true
+
+					for unit, frame in PitBull:IterateUnitFrames() do
+						PitBull_Aura:OnUpdateFrame(unit, frame)
+					end
+				end,
+				usage = L["<Debuff name>"],
+				order = 160,
+			},
 		},
 	}
 end)