diff --git a/modules/DruidMana.lua b/modules/DruidMana.lua
index caa072e..08d4e81 100644
--- a/modules/DruidMana.lua
+++ b/modules/DruidMana.lua
@@ -34,8 +34,13 @@ function DruidMana.prototype:Enable(core)
 	DruidMana.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UPDATE_SHAPESHIFT_FORM", "Update")
-	self:RegisterEvent("UNIT_MAXMANA", "Update")
-	self:RegisterEvent("UNIT_MANA", "Update")
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "Update")
+		self:RegisterEvent("UNIT_MAXPOWER", "Update")
+	else
+		self:RegisterEvent("UNIT_MAXMANA", "Update")
+		self:RegisterEvent("UNIT_MANA", "Update")
+	end
 end
 
 
diff --git a/modules/FocusMana.lua b/modules/FocusMana.lua
index 0c32857..3be86e2 100644
--- a/modules/FocusMana.lua
+++ b/modules/FocusMana.lua
@@ -32,14 +32,19 @@ end
 function FocusMana.prototype:Enable(core)
 	FocusMana.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_MANA", "Update")
-	self:RegisterEvent("UNIT_MAXMANA", "Update")
-	self:RegisterEvent("UNIT_RAGE", "Update")
-	self:RegisterEvent("UNIT_MAXRAGE", "Update")
-	self:RegisterEvent("UNIT_ENERGY", "Update")
-	self:RegisterEvent("UNIT_MAXENERGY", "Update")
-	self:RegisterEvent("UNIT_FOCUS", "Update")
-	self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "Update")
+		self:RegisterEvent("UNIT_MAXPOWER", "Update")
+	else
+		self:RegisterEvent("UNIT_MANA", "Update")
+		self:RegisterEvent("UNIT_MAXMANA", "Update")
+		self:RegisterEvent("UNIT_RAGE", "Update")
+		self:RegisterEvent("UNIT_MAXRAGE", "Update")
+		self:RegisterEvent("UNIT_ENERGY", "Update")
+		self:RegisterEvent("UNIT_MAXENERGY", "Update")
+		self:RegisterEvent("UNIT_FOCUS", "Update")
+		self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+	end
 	self:RegisterEvent("UNIT_AURA", "Update")
 	self:RegisterEvent("UNIT_FLAGS", "Update")
 	self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateFocus")
diff --git a/modules/MirrorBar.lua b/modules/MirrorBar.lua
index d43a4f5..1c6aef4 100644
--- a/modules/MirrorBar.lua
+++ b/modules/MirrorBar.lua
@@ -114,7 +114,7 @@ function MirrorBar.prototype:MirrorStart(timer, value, maxValue, scale, paused,
 
 	self:Update()
 	self:Show(true)
-	self.frame:SetScript("OnUpdate", function() self:OnUpdate(arg1) end)
+	self.frame:SetScript("OnUpdate", function(this, arg1, ...) self:OnUpdate(arg1) end)
 end
 
 
diff --git a/modules/PetMana.lua b/modules/PetMana.lua
index 77cc710..0402849 100644
--- a/modules/PetMana.lua
+++ b/modules/PetMana.lua
@@ -57,14 +57,19 @@ function PetMana.prototype:Enable(core)
 	self:RegisterEvent("UNIT_PET", "CheckPet");
 	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "CheckPet")
 
-	self:RegisterEvent("UNIT_MANA", "Update")
-	self:RegisterEvent("UNIT_MAXMANA", "Update")
-	self:RegisterEvent("UNIT_RAGE", "Update")
-	self:RegisterEvent("UNIT_MAXRAGE", "Update")
-	self:RegisterEvent("UNIT_ENERGY", "Update")
-	self:RegisterEvent("UNIT_MAXENERGY", "Update")
-	self:RegisterEvent("UNIT_FOCUS", "Update")
-	self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "Update")
+		self:RegisterEvent("UNIT_MAXPOWER", "Update")
+	else
+		self:RegisterEvent("UNIT_MANA", "Update")
+		self:RegisterEvent("UNIT_MAXMANA", "Update")
+		self:RegisterEvent("UNIT_RAGE", "Update")
+		self:RegisterEvent("UNIT_MAXRAGE", "Update")
+		self:RegisterEvent("UNIT_ENERGY", "Update")
+		self:RegisterEvent("UNIT_MAXENERGY", "Update")
+		self:RegisterEvent("UNIT_FOCUS", "Update")
+		self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+	end
 
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "ManaType")
 
diff --git a/modules/PlayerMana.lua b/modules/PlayerMana.lua
index 8327a98..107632f 100644
--- a/modules/PlayerMana.lua
+++ b/modules/PlayerMana.lua
@@ -101,16 +101,21 @@ function PlayerMana.prototype:Enable(core)
 
 	self:CreateTickerFrame()
 
-	self:RegisterEvent("UNIT_MAXMANA", "Update")
-	self:RegisterEvent("UNIT_MAXRAGE", "Update")
-	self:RegisterEvent("UNIT_MAXENERGY", "Update")
-	self:RegisterEvent("UNIT_MAXRUNIC_POWER", "Update")
-
-	self:RegisterEvent("UNIT_MANA", "Update")
-	self:RegisterEvent("UNIT_RAGE", "Update")
-	self:RegisterEvent("UNIT_ENERGY", "UpdateEnergy")
-	self:RegisterEvent("UNIT_RUNIC_POWER", "Update")
+	if IceHUD.WowVer >= 40000 then
+		self:RegisterEvent("UNIT_POWER", "Update")
+		self:RegisterEvent("UNIT_MAXPOWER", "Update")
+	else
+		self:RegisterEvent("UNIT_MAXMANA", "Update")
+		self:RegisterEvent("UNIT_MAXRAGE", "Update")
+		self:RegisterEvent("UNIT_MAXENERGY", "Update")
+		self:RegisterEvent("UNIT_MAXRUNIC_POWER", "Update")
 
+		self:RegisterEvent("UNIT_MANA", "Update")
+		self:RegisterEvent("UNIT_RAGE", "Update")
+		self:RegisterEvent("UNIT_ENERGY", "UpdateEnergy")
+		self:RegisterEvent("UNIT_RUNIC_POWER", "Update")
+	end
+	
 	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
 	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 
@@ -211,11 +216,15 @@ function PlayerMana.prototype:ManaType(unit)
 end
 
 
-function PlayerMana.prototype:Update(unit)
+function PlayerMana.prototype:Update(unit, powertype)
 	PlayerMana.super.prototype.Update(self)
 	if (unit and (unit ~= self.unit)) then
 		return
 	end
+	
+	if powertype ~= nil and powertype == "ENERGY" then
+		self:UpdateEnergy(unit)
+	end
 
 	if self.unit == "vehicle" and ((not UnitExists(unit)) or (self.maxMana == 0)) then
 		self:Show(false)
@@ -305,7 +314,9 @@ function PlayerMana.prototype:UpdateEnergy(unit)
 	end
 
 	self.previousEnergy = UnitPower(self.unit)
-	self:Update(unit)
+	if IceHUD.WowVer < 40000 then
+		self:Update(unit)
+	end
 
 	if self:ShouldUseTicker() and
 		((not (self.previousEnergy) or (self.previousEnergy <= UnitPower(self.unit))) and
diff --git a/modules/TargetInfo.lua b/modules/TargetInfo.lua
index 6754a18..07a374b 100644
--- a/modules/TargetInfo.lua
+++ b/modules/TargetInfo.lua
@@ -1022,18 +1022,18 @@ function IceTargetInfo.prototype:CreateIconFrames(parent, direction, buffs, type
 			buffs[i].icon.texture:ClearAllPoints()
 			buffs[i].icon.texture:SetAllPoints(buffs[i].icon)
 		end
-		
+
 		buffs[i].icon.stack = self:FontFactory(self.moduleSettings.stackFontSize, buffs[i].icon, buffs[i].icon.stack,
 			"OUTLINE")
 
 		buffs[i].icon.stack:ClearAllPoints()
 		buffs[i].icon.stack:SetPoint("BOTTOMRIGHT" , buffs[i].icon, "BOTTOMRIGHT", 3, -1)
-		
-		
+
+
 		buffs[i].id = i
 		if (self.moduleSettings.mouseBuff) then
 			buffs[i]:EnableMouse(true)
-			buffs[i]:SetScript("OnEnter", function() self:BuffOnEnter(buffs[i].type or type) end)
+			buffs[i]:SetScript("OnEnter", function(this, ...) self:BuffOnEnter(this, buffs[i].type or type) end)
 			buffs[i]:SetScript("OnLeave", function() GameTooltip:Hide() end)
 		else
 			buffs[i]:EnableMouse(false)
@@ -1391,8 +1391,8 @@ function IceTargetInfo.prototype:OnLeave(frame)
 end
 
 
-function IceTargetInfo.prototype:BuffOnEnter(type)
-	if (not this:IsVisible()) then
+function IceTargetInfo.prototype:BuffOnEnter(this, type)
+	if (not self:IsVisible()) then
 		return
 	end
 
diff --git a/modules/TargetMana.lua b/modules/TargetMana.lua
index 4447163..60def6b 100644
--- a/modules/TargetMana.lua
+++ b/modules/TargetMana.lua
@@ -39,23 +39,28 @@ function IceTargetMana.prototype:Enable(core)
 	IceTargetMana.super.prototype.Enable(self, core)
 
 	if self.registerEvents then
-		self:RegisterEvent("UNIT_MAXMANA", "Update")
-		self:RegisterEvent("UNIT_MAXRAGE", "Update")
-		self:RegisterEvent("UNIT_MAXENERGY", "Update")
-		self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+		if IceHUD.WowVer >= 40000 then
+			self:RegisterEvent("UNIT_POWER", "Update")
+			self:RegisterEvent("UNIT_MAXPOWER", "Update")
+		else
+			self:RegisterEvent("UNIT_MAXMANA", "Update")
+			self:RegisterEvent("UNIT_MAXRAGE", "Update")
+			self:RegisterEvent("UNIT_MAXENERGY", "Update")
+			self:RegisterEvent("UNIT_MAXFOCUS", "Update")
+
+			self:RegisterEvent("UNIT_MANA", "Update")
+			self:RegisterEvent("UNIT_RAGE", "Update")
+			self:RegisterEvent("UNIT_ENERGY", "Update")
+			self:RegisterEvent("UNIT_FOCUS", "Update")
+
+			-- DK rune stuff
+			if IceHUD.WowVer >= 30000 then
+				self:RegisterEvent("UNIT_RUNIC_POWER", "Update")
+				self:RegisterEvent("UNIT_MAXRUNIC_POWER", "Update")
+			end
+		end
 		self:RegisterEvent("UNIT_AURA", "Update")
 		self:RegisterEvent("UNIT_FLAGS", "Update")
-
-		self:RegisterEvent("UNIT_MANA", "Update")
-		self:RegisterEvent("UNIT_RAGE", "Update")
-		self:RegisterEvent("UNIT_ENERGY", "Update")
-		self:RegisterEvent("UNIT_FOCUS", "Update")
-
-		-- DK rune stuff
-		if IceHUD.WowVer >= 30000 then
-			self:RegisterEvent("UNIT_RUNIC_POWER", "Update")
-			self:RegisterEvent("UNIT_MAXRUNIC_POWER", "Update")
-		end
 	end
 
 	self:Update(self.unit)
diff --git a/modules/TargetOfTarget.lua b/modules/TargetOfTarget.lua
index 5aba8aa..dd42f88 100644
--- a/modules/TargetOfTarget.lua
+++ b/modules/TargetOfTarget.lua
@@ -391,7 +391,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
 		
 		if (self.moduleSettings.mouse) then
 			buffs[i]:EnableMouse(true)
-			buffs[i]:SetScript("OnEnter", function() self:BuffOnEnter() end)
+			buffs[i]:SetScript("OnEnter", function(this) self:BuffOnEnter(this) end)
 			buffs[i]:SetScript("OnLeave", function() GameTooltip:Hide() end)
 		else
 			buffs[i]:EnableMouse(false)
@@ -505,7 +505,7 @@ function TargetOfTarget.prototype:OnLeave(frame)
 end
 
 
-function TargetOfTarget.prototype:BuffOnEnter(type)
+function TargetOfTarget.prototype:BuffOnEnter(this)
 	if (not this:IsVisible()) then
 		return
 	end