@@ -10,6 +10,7 @@ PowerBarColor["RUNIC_POWER"] = { r = 0.0
 PowerBarColor["SOUL_SHARDS"] = { r = 0.50, g = 0.32, b = 0.55 };
 PowerBarColor["ECLIPSE"] = { negative = { r = 0.30, g = 0.52, b = 0.90 },  positive = { r = 0.80, g = 0.82, b = 0.60 }};
 PowerBarColor["HOLY_POWER"] = { r = 0.95, g = 0.90, b = 0.60 };
+PowerBarColor["DEMONIC_FURY"] = { r = 0.50, g = 0.32, b = 0.55 };
 -- vehicle colors
 PowerBarColor["AMMOSLOT"] = { r = 0.80, g = 0.60, b = 0.00 };
 PowerBarColor["FUEL"] = { r = 0.0, g = 0.55, b = 0.5 };
@@ -395,7 +396,8 @@ function UnitFrame_OnEnter (self)
 	UnitFrame_UpdateTooltip(self);
 end
 
-function UnitFrame_OnLeave ()
+function UnitFrame_OnLeave (self)
+	self.UpdateTooltip = nil;
 	if ( SHOW_NEWBIE_TIPS == "1" ) then
 		GameTooltip:Hide();
 	else
@@ -410,8 +412,8 @@ function UnitFrame_UpdateTooltip (self)
 	else
 		self.UpdateTooltip = nil;
 	end
+	
 	local r, g, b = GameTooltip_UnitColor(self.unit);
-	--GameTooltip:SetBackdropColor(r, g, b);
 	GameTooltipTextLeft1:SetTextColor(r, g, b);
 end
 
@@ -438,6 +440,7 @@ function UnitFrameManaBar_UpdateType (ma
 		end
 	end
 	manaBar.powerType = powerType;
+	manaBar.powerToken = powerToken;
 	
 	-- Update the manabar text
 	if ( not unitFrame.noTextPrefix ) then