diff --git a/Definitions.lua b/Definitions.lua
index 74f1f0fd..90fc8a21 100644
--- a/Definitions.lua
+++ b/Definitions.lua
@@ -269,6 +269,7 @@
 ---@field damage_taken number amount of damage the actor took during the segment
 ---@field damage_from table<string, boolean> store the name of the actors which damaged the actor, format: [actorName] = true
 ---@field totalabsorbed number amount of damage dealt by the actor by got absorbed by the target, this is a "ABSORB" type of miss but still counts as damage done
+---@field augmentedSpellsContainer spellcontainer
 
 ---@class actorheal : actor
 ---@field healing_taken number amount of healing the actor took during the segment
diff --git a/Libs/DF/addon.lua b/Libs/DF/addon.lua
index d1af8ee0..6ebf0115 100644
--- a/Libs/DF/addon.lua
+++ b/Libs/DF/addon.lua
@@ -1,41 +1,74 @@
 
-local DF = _G ["DetailsFramework"]
-local _
-
-if (not DF or not DetailsFrameworkCanLoad) then
+local detailsFramework = _G ["DetailsFramework"]
+if (not detailsFramework or not DetailsFrameworkCanLoad) then
 	return
 end
 
---runs when the addon received addon_loaded
-local addonPreLoad = function(addonFrame, event, ...)
-	--check if the saved variables table is created, if not create one
-	_G[addonFrame.__savedVarsName] = _G[addonFrame.__savedVarsName] or {}
+local _
+local CONST_DEFAULT_PROFILE_NAME = "default"
 
-	if (addonFrame.__savedVarsDefaultTemplate) then
-		--load saved vars for this character
-		DF.SavedVars.LoadSavedVarsForPlayer(addonFrame)
+---@class df_addon : table
+---@field __name string the addon toc name
+---@field __savedGlobalVarsName string the name of the global saved variables
+---@field __savedVarsDefaultTemplate table the default template for the saved variables
+---@field __frame frame a frame to use for events
+---@field OnLoaded fun(addon:df_addon, profileTable:table) runs when the addon is loaded at event "ADDON_LOADED"
+---@field OnInit fun(addon:df_addon, profileTable:table) runs when the addon is initialized at event "PLAYER_LOGIN"
+---@field OnProfileChanged fun(addon:df_addon, profileTable:table) runs when the profile is changed
+
+--runs when the addon received addon_loaded
+local addonLoaded = function(addonFrame, event, addonName)
+	if (addonName ~= addonFrame.__name) then
+		return
 	end
 
-	if (addonFrame.OnLoad) then
-		DF:Dispatch(addonFrame.OnLoad, addonFrame, ...)
+	local addonObject = addonFrame.__addonObject
+
+	if (not addonObject.__savedGlobalVarsName) then
+		if (addonObject.OnLoad) then
+			detailsFramework:Dispatch(addonObject.OnLoad, addonObject)
+		end
+		return
+	end
+
+	local playerGUID = UnitGUID("player") --the guid points to a profile name
+
+	---@type table
+	local savedVariables = detailsFramework.SavedVars.GetSavedVariables(addonObject)
+
+	--check if the player has a profileId saved
+	local playerProfileId = savedVariables.profile_ids[playerGUID]
+	if (not playerProfileId) then
+		--it doesn't, set it to use the default profile
+		playerProfileId = CONST_DEFAULT_PROFILE_NAME
+		savedVariables.profile_ids[playerGUID] = playerProfileId
+	end
+
+	local profileTable = detailsFramework.SavedVars.GetProfile(addonObject)
+
+	if (addonObject.OnLoad) then
+		detailsFramework:Dispatch(addonObject.OnLoad, addonObject, profileTable)
 	end
 end
 
---runs when the addon received player_login
-local addonInit = function(addonFrame, event, ...)
-	if (addonFrame.OnInit) then
-		DF:Dispatch(addonFrame.OnInit, addonFrame, ...)
+--runs when the addon received PLAYER_LOGIN
+local addonInit = function(addonFrame)
+	local addonObject = addonFrame.__addonObject
+
+	if (addonObject.OnInit) then
+		local profileTable = detailsFramework.SavedVars.GetProfile(addonObject)
+		detailsFramework:Dispatch(addonObject.OnInit, addonObject, profileTable)
 	end
 end
 
 --when the player logout or reloadUI
-local addonUnload = function(addonFrame, event, ...)
-	--close saved tables
-	DF.SavedVars.CloseSavedTable(addonFrame.db)
+local addonUnload = function(addonFrame)
+	local addonObject = addonFrame.__addonObject
+	detailsFramework.SavedVars.SaveProfile(addonObject)
 end
 
 local addonEvents = {
-	["ADDON_LOADED"] = addonPreLoad,
+	["ADDON_LOADED"] = addonLoaded,
 	["PLAYER_LOGIN"] = addonInit,
 	["PLAYER_LOGOUT"] = addonUnload,
 }
@@ -47,36 +80,46 @@ local addonOnEvent = function(addonFrame, event, ...)
 	else
 		--might be a registered event from the user
 		if (addonFrame[event]) then
-			DF:CoreDispatch(addonFrame.__name, addonFrame[event], addonFrame, event, ...)
+			detailsFramework:CoreDispatch(addonFrame.__name, addonFrame[event], addonFrame, event, ...)
 		end
 	end
 end
 
-local getAddonName = function(addonFrame)
-	return addonFrame:GetName()
+detailsFramework.AddonMixin = {
+
+}
+
+---create an addon object
+---@param addonName addonname
+---@param globalSavedVariablesName string
+---@param savedVarsTemplate table
+---@return frame
+function detailsFramework:CreateNewAddOn(addonName, globalSavedVariablesName, savedVarsTemplate)
+	local newAddonObject = {}
+
+	---@type frame
+	local addonFrame = CreateFrame("frame")
+	newAddonObject.__name = addonName
+	newAddonObject.__savedGlobalVarsName = globalSavedVariablesName
+	newAddonObject.__savedVarsDefaultTemplate = savedVarsTemplate or {}
+	newAddonObject.__frame = addonFrame
+
+	addonFrame.__name = addonName
+	addonFrame.__savedGlobalVarsName = globalSavedVariablesName
+	addonFrame.__savedVarsDefaultTemplate = newAddonObject.__savedVarsDefaultTemplate
+	addonFrame.__addonObject = newAddonObject
+
+	addonFrame:RegisterEvent("ADDON_LOADED")
+	addonFrame:RegisterEvent("PLAYER_LOGIN")
+	addonFrame:RegisterEvent("PLAYER_LOGOUT")
+	addonFrame:SetScript("OnEvent", addonOnEvent)
+
+	return newAddonObject
 end
 
-function DF:CreateNewAddOn(addonName, globalSavedVariablesName, savedVarsTemplate)
-	local newAddon = CreateFrame("frame", addonName, UIParent)
-	newAddon.__name = addonName
-	newAddon.__savedVarsName = globalSavedVariablesName
-	newAddon.__savedVarsDefaultTemplate = savedVarsTemplate
-
-	newAddon.GetAddonName = getAddonName
-
-	newAddon:RegisterEvent("ADDON_LOADED")
-	newAddon:RegisterEvent("PLAYER_LOGIN")
-	newAddon:RegisterEvent("PLAYER_LOGOUT")
-	newAddon:SetScript("OnEvent", addonOnEvent)
-
-	return newAddon
-end
-
-
-
 
 --old create addon
-function DF:CreateAddOn (name, global_saved, global_table, options_table, broker)
+function detailsFramework:CreateAddOn(name, global_saved, global_table, options_table, broker)
 
 	local addon = LibStub("AceAddon-3.0"):NewAddon (name, "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "DetailsFramework-1.0", "AceComm-3.0")
 	_G [name] = addon
@@ -86,7 +129,7 @@ function DF:CreateAddOn (name, global_saved, global_table, options_table, broker
 
 		if (global_saved) then
 			if (broker and broker.Minimap and not global_table.Minimap) then
-				DF:Msg(name, "broker.Minimap is true but no global.Minimap declared.")
+				detailsFramework:Msg(name, "broker.Minimap is true but no global.Minimap declared.")
 			end
 			self.db = LibStub("AceDB-3.0"):New (global_saved, global_table or {}, true)
 		end
@@ -124,9 +167,9 @@ function DF:CreateAddOn (name, global_saved, global_table, options_table, broker
 		if (addon.OnInit) then
 			xpcall(addon.OnInit, geterrorhandler(), addon)
 		end
-		
+
 	end
-	
+
 	return addon
-	
+
 end
diff --git a/Libs/DF/button.lua b/Libs/DF/button.lua
index e500fe87..ec77f7c5 100644
--- a/Libs/DF/button.lua
+++ b/Libs/DF/button.lua
@@ -1120,6 +1120,9 @@ end
         local atlas
         if (type(texture) == "string") then
             atlas = C_Texture.GetAtlasInfo(texture)
+			if (atlas) then
+				atlas = texture
+			end
 		end
 
 		local normalTexture = button:GetNormalTexture()
diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index 22b67a1e..5f9c86fc 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -1,6 +1,6 @@
 
 
-local dversion = 451
+local dversion = 453
 local major, minor = "DetailsFramework-1.0", dversion
 local DF, oldminor = LibStub:NewLibrary(major, minor)
 
@@ -578,6 +578,29 @@ function DF.table.copytocompress(t1, t2)
 	return t1
 end
 
+---remove from table1 the values that are also on table2
+---@param table1 table the table to have the values removed
+---@param table2 table the reference table
+function DF.table.removeduplicate(table1, table2)
+    for key, value in pairs(table2) do
+        if (type(value) == "table") then
+            if (table1[key]) then
+                DF.SavedVars.removeduplicate(value, table1[key])
+            end
+        else
+			if (type(table1[key]) == "number" and type(value) == "number") then
+				if (DF:IsNearlyEqual(table1[key], value, 0.0001)) then
+					table1[key] = nil
+				end
+			else
+            	if (table1[key] == value) then
+	                table1[key] = nil
+            	end
+			end
+        end
+    end
+end
+
 ---add the indexes of table2 into the end of the table table1
 ---@param t1 table
 ---@param t2 table
diff --git a/Libs/DF/load.xml b/Libs/DF/load.xml
index e065eaf4..1f04f55d 100644
--- a/Libs/DF/load.xml
+++ b/Libs/DF/load.xml
@@ -7,6 +7,7 @@
 	<Script file="header.lua"/>
 	<Script file="containers.lua"/>
 	<Script file="iteminfo.lua"/>
+	<Script file="savedvars.lua"/>
 	<Script file="addon.lua"/>
 	<Script file="colors.lua"/>
 	<Script file="help.lua"/>
@@ -17,7 +18,6 @@
 	<Script file="scrollbar.lua"/>
 	<Script file="spells.lua"/>
 	<Script file="math.lua"/>
-	<Script file="savedvars.lua"/>
 	<Script file="languages.lua"/>
 	<Script file="timebar.lua"/>
 	<Script file="charts.lua"/>
@@ -34,6 +34,7 @@
 	<Include file="normal_bar.xml"/>
 	<Include file="panel.xml"/>
 
+	<Include file="unitframe.lua"/>
 	<Script file="icon.lua"/>
 	<Script file="pictureedit.lua"/>
 	<Script file="auras.lua"/>
diff --git a/Libs/DF/mixins.lua b/Libs/DF/mixins.lua
index 101ad248..75ad673e 100644
--- a/Libs/DF/mixins.lua
+++ b/Libs/DF/mixins.lua
@@ -974,4 +974,208 @@ detailsFramework.ValueMixin = {
 	SetMaxValueIfBigger = function(self, ...)
 		self.maxValue = math.max(self.maxValue, ...)
 	end,
+}
+
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--statusbar mixin
+
+--[=[
+	collection of functions to embed into a statusbar
+	the statusBar need to have a member called 'barTexture' for the texture set on SetStatusBarTexture
+	statusBar:GetTexture()
+	statusBar:SetTexture(texture)
+	statusBar:SetColor (unparsed color)
+	statusBar:GetColor()
+	statusBar:
+	statusBar:
+--]=]
+
+detailsFramework.StatusBarFunctions = {
+	SetTexture = function(self, texture, isTemporary)
+		self.barTexture:SetTexture(texture)
+		if (not isTemporary) then
+			self.barTexture.currentTexture = texture
+		end
+	end,
+
+	ResetTexture = function(self)
+		self.barTexture:SetTexture(self.barTexture.currentTexture)
+	end,
+
+	GetTexture = function(self)
+		return self.barTexture:GetTexture()
+	end,
+
+	SetAtlas = function(self, atlasName)
+		self.barTexture:SetAtlas(atlasName)
+	end,
+
+	GetAtlas = function(self)
+		self.barTexture:GetAtlas()
+	end,
+
+	SetTexCoord = function(self, ...)
+		return self.barTexture:SetTexCoord(...)
+	end,
+
+	GetTexCoord = function(self)
+		return self.barTexture:GetTexCoord()
+	end,
+
+	SetColor = function(self, r, g, b, a)
+		r, g, b, a = detailsFramework:ParseColors(r, g, b, a)
+		self:SetStatusBarColor(r, g, b, a)
+	end,
+
+	GetColor = function(self)
+		return self:GetStatusBarColor()
+	end,
+
+	SetMaskTexture = function(self, ...)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		self.barTextureMask:SetTexture(...)
+	end,
+
+	GetMaskTexture = function(self)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		self.barTextureMask:GetTexture()
+	end,
+
+	--SetMaskTexCoord = function(self, ...) --MaskTexture doesn't not support texcoord
+	--	if (not self:HasTextureMask()) then
+	--		return
+	--	end
+	--	self.barTextureMask:SetTexCoord(...)
+	--end,
+
+	--GetMaskTexCoord = function(self, ...)
+	--	if (not self:HasTextureMask()) then
+	--		return
+	--	end
+	--	self.barTextureMask:GetTexCoord()
+	--end,
+
+	SetMaskAtlas = function(self, atlasName)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		self.barTextureMask:SetAtlas(atlasName)
+	end,
+
+	GetMaskAtlas = function(self)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		self.barTextureMask:GetAtlas()
+	end,
+
+	AddMaskTexture = function(self, object)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		if (object.GetObjectType and object:GetObjectType() == "Texture") then
+			object:AddMaskTexture(self.barTextureMask)
+		else
+			detailsFramework:Msg("Invalid 'Texture' to object:AddMaskTexture(Texture)", debugstack())
+		end
+	end,
+
+	CreateTextureMask = function(self)
+		local barTexture = self:GetStatusBarTexture() or self.barTexture
+		if (not barTexture) then
+			detailsFramework:Msg("Object doesn't not have a statubar texture, create one and object:SetStatusBarTexture(textureObject)", debugstack())
+			return
+		end
+
+		if (self.barTextureMask) then
+			return self.barTextureMask
+		end
+
+		--statusbar texture mask
+		self.barTextureMask = self:CreateMaskTexture(nil, "artwork")
+		self.barTextureMask:SetAllPoints()
+		self.barTextureMask:SetTexture([[Interface\CHATFRAME\CHATFRAMEBACKGROUND]])
+
+		--border texture
+		self.barBorderTextureForMask = self:CreateTexture(nil, "overlay", nil, 7)
+		self.barBorderTextureForMask:SetAllPoints()
+		--self.barBorderTextureForMask:SetPoint("topleft", self, "topleft", -1, 1)
+		--self.barBorderTextureForMask:SetPoint("bottomright", self, "bottomright", 1, -1)
+		self.barBorderTextureForMask:Hide()
+
+		barTexture:AddMaskTexture(self.barTextureMask)
+
+		return self.barTextureMask
+	end,
+
+	HasTextureMask = function(self)
+		if (not self.barTextureMask) then
+			detailsFramework:Msg("Object doesn't not have a texture mask, create one using object:CreateTextureMask()", debugstack())
+			return false
+		end
+		return true
+	end,
+
+	SetBorderTexture = function(self, texture)
+		if (not self:HasTextureMask()) then
+			return
+		end
+
+		texture = texture or ""
+
+		self.barBorderTextureForMask:SetTexture(texture)
+
+		if (texture == "") then
+			self.barBorderTextureForMask:Hide()
+		else
+			self.barBorderTextureForMask:Show()
+		end
+	end,
+
+	GetBorderTexture = function(self)
+		if (not self:HasTextureMask()) then
+			return
+		end
+		return self.barBorderTextureForMask:GetTexture()
+	end,
+
+	SetBorderColor = function(self, r, g, b, a)
+		r, g, b, a = detailsFramework:ParseColors(r, g, b, a)
+
+		if (self.barBorderTextureForMask and self.barBorderTextureForMask:IsShown()) then
+			self.barBorderTextureForMask:SetVertexColor(r, g, b, a)
+
+			--if there's a square border on the widget, remove its color
+			if (self.border and self.border.UpdateSizes and self.border.SetVertexColor) then
+				self.border:SetVertexColor(0, 0, 0, 0)
+			end
+
+			return
+		end
+
+		if (self.border and self.border.UpdateSizes and self.border.SetVertexColor) then
+			self.border:SetVertexColor(r, g, b, a)
+
+			--adjust the mask border texture ask well in case the user set the mask color texture before setting a texture on it
+			if (self.barBorderTextureForMask) then
+				self.barBorderTextureForMask:SetVertexColor(r, g, b, a)
+			end
+			return
+		end
+	end,
+
+	GetBorderColor = function(self)
+		if (self.barBorderTextureForMask and self.barBorderTextureForMask:IsShown()) then
+			return self.barBorderTextureForMask:GetVertexColor()
+		end
+
+		if (self.border and self.border.UpdateSizes and self.border.GetVertexColor) then
+			return self.border:GetVertexColor()
+		end
+	end,
 }
\ No newline at end of file
diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua
index afc556e0..df476c8e 100644
--- a/Libs/DF/panel.lua
+++ b/Libs/DF/panel.lua
@@ -5723,1981 +5723,6 @@ function detailsFramework:CreateStatusBar(f, options)
 end
 
 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---statusbar mixin
-
---[=[
-	collection of functions to embed into a statusbar
-	statusBar:GetTexture()
-	statusBar:SetTexture(texture)
-	statusBar:SetColor (unparsed color)
-	statusBar:GetColor()
-	statusBar:
-	statusBar:
-
---]=]
-
-detailsFramework.StatusBarFunctions = {
-	SetTexture = function(self, texture, isTemporary)
-		self.barTexture:SetTexture(texture)
-		if (not isTemporary) then
-			self.barTexture.currentTexture = texture
-		end
-	end,
-
-	ResetTexture = function(self)
-		self.barTexture:SetTexture(self.barTexture.currentTexture)
-	end,
-
-	GetTexture = function(self)
-		return self.barTexture:GetTexture()
-	end,
-
-	SetAtlas = function(self, atlasName)
-		self.barTexture:SetAtlas(atlasName)
-	end,
-
-	GetAtlas = function(self)
-		self.barTexture:GetAtlas()
-	end,
-
-	SetTexCoord = function(self, ...)
-		return self.barTexture:SetTexCoord(...)
-	end,
-
-	GetTexCoord = function(self)
-		return self.barTexture:GetTexCoord()
-	end,
-
-	SetColor = function(self, r, g, b, a)
-		r, g, b, a = detailsFramework:ParseColors(r, g, b, a)
-		self:SetStatusBarColor(r, g, b, a)
-	end,
-
-	GetColor = function(self)
-		return self:GetStatusBarColor()
-	end,
-
-	SetMaskTexture = function(self, ...)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		self.barTextureMask:SetTexture(...)
-	end,
-
-	GetMaskTexture = function(self)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		self.barTextureMask:GetTexture()
-	end,
-
-	--SetMaskTexCoord = function(self, ...) --MaskTexture doesn't not support texcoord
-	--	if (not self:HasTextureMask()) then
-	--		return
-	--	end
-	--	self.barTextureMask:SetTexCoord(...)
-	--end,
-
-	--GetMaskTexCoord = function(self, ...)
-	--	if (not self:HasTextureMask()) then
-	--		return
-	--	end
-	--	self.barTextureMask:GetTexCoord()
-	--end,
-
-	SetMaskAtlas = function(self, atlasName)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		self.barTextureMask:SetAtlas(atlasName)
-	end,
-
-	GetMaskAtlas = function(self)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		self.barTextureMask:GetAtlas()
-	end,
-
-	AddMaskTexture = function(self, object)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		if (object.GetObjectType and object:GetObjectType() == "Texture") then
-			object:AddMaskTexture(self.barTextureMask)
-		else
-			detailsFramework:Msg("Invalid 'Texture' to object:AddMaskTexture(Texture)", debugstack())
-		end
-	end,
-
-	CreateTextureMask = function(self)
-		local barTexture = self:GetStatusBarTexture() or self.barTexture
-		if (not barTexture) then
-			detailsFramework:Msg("Object doesn't not have a statubar texture, create one and object:SetStatusBarTexture(textureObject)", debugstack())
-			return
-		end
-
-		if (self.barTextureMask) then
-			return self.barTextureMask
-		end
-
-		--statusbar texture mask
-		self.barTextureMask = self:CreateMaskTexture(nil, "artwork")
-		self.barTextureMask:SetAllPoints()
-		self.barTextureMask:SetTexture([[Interface\CHATFRAME\CHATFRAMEBACKGROUND]])
-
-		--border texture
-		self.barBorderTextureForMask = self:CreateTexture(nil, "overlay", nil, 7)
-		self.barBorderTextureForMask:SetAllPoints()
-		--self.barBorderTextureForMask:SetPoint("topleft", self, "topleft", -1, 1)
-		--self.barBorderTextureForMask:SetPoint("bottomright", self, "bottomright", 1, -1)
-		self.barBorderTextureForMask:Hide()
-
-		barTexture:AddMaskTexture(self.barTextureMask)
-
-		return self.barTextureMask
-	end,
-
-	HasTextureMask = function(self)
-		if (not self.barTextureMask) then
-			detailsFramework:Msg("Object doesn't not have a texture mask, create one using object:CreateTextureMask()", debugstack())
-			return false
-		end
-		return true
-	end,
-
-	SetBorderTexture = function(self, texture)
-		if (not self:HasTextureMask()) then
-			return
-		end
-
-		texture = texture or ""
-
-		self.barBorderTextureForMask:SetTexture(texture)
-
-		if (texture == "") then
-			self.barBorderTextureForMask:Hide()
-		else
-			self.barBorderTextureForMask:Show()
-		end
-	end,
-
-	GetBorderTexture = function(self)
-		if (not self:HasTextureMask()) then
-			return
-		end
-		return self.barBorderTextureForMask:GetTexture()
-	end,
-
-	SetBorderColor = function(self, r, g, b, a)
-		r, g, b, a = detailsFramework:ParseColors(r, g, b, a)
-
-		if (self.barBorderTextureForMask and self.barBorderTextureForMask:IsShown()) then
-			self.barBorderTextureForMask:SetVertexColor(r, g, b, a)
-
-			--if there's a square border on the widget, remove its color
-			if (self.border and self.border.UpdateSizes and self.border.SetVertexColor) then
-				self.border:SetVertexColor(0, 0, 0, 0)
-			end
-
-			return
-		end
-
-		if (self.border and self.border.UpdateSizes and self.border.SetVertexColor) then
-			self.border:SetVertexColor(r, g, b, a)
-
-			--adjust the mask border texture ask well in case the user set the mask color texture before setting a texture on it
-			if (self.barBorderTextureForMask) then
-				self.barBorderTextureForMask:SetVertexColor(r, g, b, a)
-			end
-			return
-		end
-	end,
-
-	GetBorderColor = function(self)
-		if (self.barBorderTextureForMask and self.barBorderTextureForMask:IsShown()) then
-			return self.barBorderTextureForMask:GetVertexColor()
-		end
-
-		if (self.border and self.border.UpdateSizes and self.border.GetVertexColor) then
-			return self.border:GetVertexColor()
-		end
-	end,
-}
-
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---health bar frame
-
---[=[
-	DF:CreateHealthBar (parent, name, settingsOverride)
-	creates a health bar to show an unit health
-	@parent = frame to pass for the CreateFrame function
-	@name = absolute name of the frame, if omitted it uses the parent's name .. "HealthBar"
-	@settingsOverride = table with keys and values to replace the defaults from the framework
-
-	methods:
-	healthbar:SetUnit(unit)
-	healthBar:GetTexture()
-	healthBar:SetTexture(texture)
---]=]
-
---debug performance isn't placed anywhere
---how to use debug performance: I don't remember
-
-	--Details:Dump (debugPerformance)
-
-	local debugPerformance = {
-		eventCall = {},
-		unitCall = {},
-		functionCall = {},
-		CPUUsageByFunction = {},
-	}
-
-	local function CalcPerformance (type, data)
-		if (type == "event") then
-			debugPerformance.eventCall [data] = (debugPerformance.eventCall [data] or 0) + 1
-
-		elseif (type == "unit") then
-			debugPerformance.unitCall [data] = (debugPerformance.unitCall [data] or 0) + 1
-
-		elseif (type == "call") then
-			debugPerformance.functionCall [data] = (debugPerformance.functionCall [data] or 0) + 1
-
-		end
-	end
-
-	function DF_CalcCpuUsage (name)
-		local cpu = debugPerformance.CPUUsageByFunction [name] or {usage = 0, last = 0, active = false}
-		debugPerformance.CPUUsageByFunction [name] = cpu
-
-		if (cpu.active) then
-			cpu.active = false
-			local diff = debugprofilestop() - cpu.last
-			cpu.usage = cpu.usage + diff
-		else
-			cpu.active = true
-			cpu.last = debugprofilestop()
-		end
-	end
-
-	function UnitFrameStats()
-		for functionName, functionTable in pairs(debugPerformance.CPUUsageByFunction) do
-			debugPerformance.CPUUsageByFunction [functionName] = floor(functionTable.usage)
-		end
-
-		for functionName, functionTable in pairs(debugPerformance.CPUUsageByFunction) do
-			debugPerformance.CPUUsageByFunction [functionName] = {usage = 0, last = 0, active = false}
-		end
-	end
---end of performance calcs
-
---healthBar meta prototype
-	local healthBarMetaPrototype = {
-		WidgetType = "healthBar",
-		dversion = detailsFramework.dversion,
-	}
-
-	--check if there's a metaPrototype already existing
-	if (_G[detailsFramework.GlobalWidgetControlNames["healthBar"]]) then
-		--get the already existing metaPrototype
-		local oldMetaPrototype = _G[detailsFramework.GlobalWidgetControlNames ["healthBar"]]
-		--check if is older
-		if ( (not oldMetaPrototype.dversion) or (oldMetaPrototype.dversion < detailsFramework.dversion) ) then
-			--the version is older them the currently loading one
-			--copy the new values into the old metatable
-			for funcName, _ in pairs(healthBarMetaPrototype) do
-				oldMetaPrototype[funcName] = healthBarMetaPrototype[funcName]
-			end
-		end
-	else
-		--first time loading the framework
-		_G[detailsFramework.GlobalWidgetControlNames["healthBar"]] = healthBarMetaPrototype
-	end
-
-	local healthBarMetaFunctions = _G[detailsFramework.GlobalWidgetControlNames["healthBar"]]
-	detailsFramework:Mixin(healthBarMetaFunctions, detailsFramework.ScriptHookMixin)
-
---hook list
-	local defaultHooksForHealthBar = {
-		OnHide = {},
-		OnShow = {},
-		OnHealthChange = {},
-		OnHealthMaxChange = {},
-	}
-
-	--use the hook already existing
-	healthBarMetaFunctions.HookList = healthBarMetaFunctions.HookList or defaultHooksForHealthBar
-	--copy the non existing values from a new version to the already existing hook table
-	detailsFramework.table.deploy(healthBarMetaFunctions.HookList, defaultHooksForHealthBar)
-
---Health Bar Meta Functions
-
-	--health bar settings
-	healthBarMetaFunctions.Settings = {
-		CanTick = false, --if true calls the method 'OnTick' every tick, the function needs to be overloaded, it receives self and deltaTime as parameters
-		ShowHealingPrediction = true, --when casting a healing pass, show the amount of health that spell will heal
-		ShowShields = true, --indicator of the amount of damage absortion the unit has
-
-		--appearance
-		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
-		Texture = [[Interface\RaidFrame\Raid-Bar-Hp-Fill]],
-		ShieldIndicatorTexture = [[Interface\RaidFrame\Shield-Fill]],
-		ShieldGlowTexture = [[Interface\RaidFrame\Shield-Overshield]],
-		ShieldGlowWidth = 16,
-
-		--default size
-		Width = 100,
-		Height = 20,
-	}
-
-	healthBarMetaFunctions.HealthBarEvents = {
-		{"PLAYER_ENTERING_WORLD"},
-		{"UNIT_HEALTH", true},
-		{"UNIT_MAXHEALTH", true},
-		{(IS_WOW_PROJECT_NOT_MAINLINE) and "UNIT_HEALTH_FREQUENT", true}, -- this one is classic-only...
-		{"UNIT_HEAL_PREDICTION", true},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_ABSORB_AMOUNT_CHANGED", true},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_HEAL_ABSORB_AMOUNT_CHANGED", true},
-	}
-
-	--setup the castbar to be used by another unit
-	healthBarMetaFunctions.SetUnit = function(self, unit, displayedUnit)
-		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
-
-			self.unit = unit
-			self.displayedUnit = displayedUnit or unit
-
-			--register events
-			if (unit) then
-				self.currentHealth = UnitHealth (unit) or 0
-				self.currentHealthMax = UnitHealthMax (unit) or 0
-
-				for _, eventTable in ipairs(self.HealthBarEvents) do
-					local event = eventTable [1]
-					local isUnitEvent = eventTable [2]
-					if event then
-						if (isUnitEvent) then
-							self:RegisterUnitEvent (event, self.displayedUnit, self.unit)
-						else
-							self:RegisterEvent(event)
-						end
-					end
-				end
-
-				--check for settings and update some events
-				if (not self.Settings.ShowHealingPrediction) then
-					self:UnregisterEvent ("UNIT_HEAL_PREDICTION")
-					if IS_WOW_PROJECT_MAINLINE then
-						self:UnregisterEvent ("UNIT_HEAL_ABSORB_AMOUNT_CHANGED")
-					end
-					self.incomingHealIndicator:Hide()
-					self.healAbsorbIndicator:Hide()
-				end
-				if (not self.Settings.ShowShields) then
-					if IS_WOW_PROJECT_MAINLINE then
-						self:UnregisterEvent ("UNIT_ABSORB_AMOUNT_CHANGED")
-					end
-					self.shieldAbsorbIndicator:Hide()
-					self.shieldAbsorbGlow:Hide()
-				end
-
-				--set scripts
-				self:SetScript("OnEvent", self.OnEvent)
-
-				if (self.Settings.CanTick) then
-					self:SetScript("OnUpdate", self.OnTick)
-				end
-
-				self:PLAYER_ENTERING_WORLD (self.unit, self.displayedUnit)
-			else
-				--remove all registered events
-				for _, eventTable in ipairs(self.HealthBarEvents) do
-					local event = eventTable [1]
-					if event then
-						self:UnregisterEvent (event)
-					end
-				end
-
-				--remove scripts
-				self:SetScript("OnEvent", nil)
-				self:SetScript("OnUpdate", nil)
-				self:Hide()
-			end
-		end
-	end
-
-	healthBarMetaFunctions.Initialize = function(self)
-		PixelUtil.SetWidth (self, self.Settings.Width, 1)
-		PixelUtil.SetHeight(self, self.Settings.Height, 1)
-
-		self:SetTexture(self.Settings.Texture)
-
-		self.background:SetAllPoints()
-		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
-
-		--setpoint of these widgets are set inside the function that updates the incoming heal
-		self.incomingHealIndicator:SetTexture(self:GetTexture())
-		self.healAbsorbIndicator:SetTexture(self:GetTexture())
-		self.healAbsorbIndicator:SetVertexColor(.1, .8, .8)
-		self.shieldAbsorbIndicator:SetTexture(self.Settings.ShieldIndicatorTexture, true, true)
-
-		self.shieldAbsorbGlow:SetWidth(self.Settings.ShieldGlowWidth)
-		self.shieldAbsorbGlow:SetTexture(self.Settings.ShieldGlowTexture)
-		self.shieldAbsorbGlow:SetBlendMode("ADD")
-		self.shieldAbsorbGlow:SetPoint("topright", self, "topright", 8, 0)
-		self.shieldAbsorbGlow:SetPoint("bottomright", self, "bottomright", 8, 0)
-		self.shieldAbsorbGlow:Hide()
-
-		self:SetUnit(nil)
-	end
-
-	--call every tick
-	healthBarMetaFunctions.OnTick = function(self, deltaTime) end --if overrided, set 'CanTick' to true on the settings table
-
-	--when an event happen for this unit, send it to the apropriate function
-	healthBarMetaFunctions.OnEvent = function(self, event, ...)
-		local eventFunc = self [event]
-		if (eventFunc) then
-			--the function doesn't receive which event was, only 'self' and the parameters
-			eventFunc (self, ...)
-		end
-	end
-
-	--when the unit max health is changed
-	healthBarMetaFunctions.UpdateMaxHealth = function(self)
-		local maxHealth = UnitHealthMax (self.displayedUnit)
-		self:SetMinMaxValues(0, maxHealth)
-		self.currentHealthMax = maxHealth
-
-		self:RunHooksForWidget("OnHealthMaxChange", self, self.displayedUnit)
-	end
-
-	healthBarMetaFunctions.UpdateHealth = function(self)
-		-- update max health regardless to avoid weird wrong values on UpdateMaxHealth sometimes
-		-- local maxHealth = UnitHealthMax (self.displayedUnit)
-		-- self:SetMinMaxValues(0, maxHealth)
-		-- self.currentHealthMax = maxHealth
-
-		self.oldHealth = self.currentHealth
-		local health = UnitHealth(self.displayedUnit)
-		self.currentHealth = health
-		PixelUtil.SetStatusBarValue(self, health)
-
-		self:RunHooksForWidget("OnHealthChange", self, self.displayedUnit)
-	end
-
-	--health and absorbs prediction
-	healthBarMetaFunctions.UpdateHealPrediction = function(self)
-		local currentHealth = self.currentHealth
-		local currentHealthMax = self.currentHealthMax
-		local healthPercent = currentHealth / currentHealthMax
-
-		if (not currentHealthMax or currentHealthMax <= 0) then
-			return
-		end
-
-		--order is: the health of the unit > damage absorb > heal absorb > incoming heal
-		local width = self:GetWidth()
-
-		if (self.Settings.ShowHealingPrediction) then
-			--incoming heal on the unit from all sources
-			local unitHealIncoming = self.displayedUnit and UnitGetIncomingHeals (self.displayedUnit) or 0
-			--heal absorbs
-			local unitHealAbsorb = IS_WOW_PROJECT_MAINLINE and self.displayedUnit and UnitGetTotalHealAbsorbs (self.displayedUnit) or 0
-
-			if (unitHealIncoming > 0) then
-				--calculate what is the percent of health incoming based on the max health the player has
-				local incomingPercent = unitHealIncoming / currentHealthMax
-				self.incomingHealIndicator:Show()
-				self.incomingHealIndicator:SetWidth(max(1, min (width * incomingPercent, abs(healthPercent - 1) * width)))
-				self.incomingHealIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
-				self.incomingHealIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
-			else
-				self.incomingHealIndicator:Hide()
-			end
-
-			if (unitHealAbsorb > 0) then
-				local healAbsorbPercent = unitHealAbsorb / currentHealthMax
-				self.healAbsorbIndicator:Show()
-				self.healAbsorbIndicator:SetWidth(max(1, min (width * healAbsorbPercent, abs(healthPercent - 1) * width)))
-				self.healAbsorbIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
-				self.healAbsorbIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
-			else
-				self.healAbsorbIndicator:Hide()
-			end
-		end
-
-		if (self.Settings.ShowShields and IS_WOW_PROJECT_MAINLINE) then
-			--damage absorbs
-			local unitDamageAbsorb = self.displayedUnit and UnitGetTotalAbsorbs (self.displayedUnit) or 0
-
-			if (unitDamageAbsorb > 0) then
-				local damageAbsorbPercent = unitDamageAbsorb / currentHealthMax
-				self.shieldAbsorbIndicator:Show()
-				--set the width where the max width size is what is lower: the absorb size or the missing amount of health in the health bar
-				--/dump NamePlate1PlaterUnitFrameHealthBar.shieldAbsorbIndicator:GetSize()
-				self.shieldAbsorbIndicator:SetWidth(max(1, min (width * damageAbsorbPercent, abs(healthPercent - 1) * width)))
-				self.shieldAbsorbIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
-				self.shieldAbsorbIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
-
-				--if the absorb percent pass 100%, show the glow
-				if ((healthPercent + damageAbsorbPercent) > 1) then
-					self.shieldAbsorbGlow:Show()
-				else
-					self.shieldAbsorbGlow:Hide()
-				end
-			else
-				self.shieldAbsorbIndicator:Hide()
-				self.shieldAbsorbGlow:Hide()
-			end
-		else
-			self.shieldAbsorbIndicator:Hide()
-			self.shieldAbsorbGlow:Hide()
-		end
-	end
-
-	--Health Events
-		healthBarMetaFunctions.PLAYER_ENTERING_WORLD = function(self, ...)
-			self:UpdateMaxHealth()
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-		healthBarMetaFunctions.UNIT_HEALTH = function(self, ...)
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-		healthBarMetaFunctions.UNIT_HEALTH_FREQUENT = function(self, ...)
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-		healthBarMetaFunctions.UNIT_MAXHEALTH = function(self, ...)
-			self:UpdateMaxHealth()
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-
-		healthBarMetaFunctions.UNIT_HEAL_PREDICTION = function(self, ...)
-			self:UpdateMaxHealth()
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-		healthBarMetaFunctions.UNIT_ABSORB_AMOUNT_CHANGED = function(self, ...)
-			self:UpdateMaxHealth()
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
-		healthBarMetaFunctions.UNIT_HEAL_ABSORB_AMOUNT_CHANGED = function(self, ...)
-			self:UpdateMaxHealth()
-			self:UpdateHealth()
-			self:UpdateHealPrediction()
-		end
-
--- ~healthbar
-function detailsFramework:CreateHealthBar (parent, name, settingsOverride)
-
-	assert(name or parent:GetName(), "DetailsFramework:CreateHealthBar parameter 'name' omitted and parent has no name.")
-
-	local healthBar = CreateFrame("StatusBar", name or (parent:GetName() .. "HealthBar"), parent, "BackdropTemplate")
-		do --layers
-			--background
-			healthBar.background = healthBar:CreateTexture(nil, "background")
-			healthBar.background:SetDrawLayer("background", -6)
-
-			--artwork
-			--healing incoming
-			healthBar.incomingHealIndicator = healthBar:CreateTexture(nil, "artwork")
-			healthBar.incomingHealIndicator:SetDrawLayer("artwork", 4)
-			--current shields on the unit
-			healthBar.shieldAbsorbIndicator =  healthBar:CreateTexture(nil, "artwork")
-			healthBar.shieldAbsorbIndicator:SetDrawLayer("artwork", 5)
-			--debuff absorbing heal
-			healthBar.healAbsorbIndicator = healthBar:CreateTexture(nil, "artwork")
-			healthBar.healAbsorbIndicator:SetDrawLayer("artwork", 6)
-			--the shield fills all the bar, show that cool glow
-			healthBar.shieldAbsorbGlow = healthBar:CreateTexture(nil, "artwork")
-			healthBar.shieldAbsorbGlow:SetDrawLayer("artwork", 7)
-			--statusbar texture
-			healthBar.barTexture = healthBar:CreateTexture(nil, "artwork")
-			healthBar:SetStatusBarTexture(healthBar.barTexture)
-		end
-
-	--mixins
-	detailsFramework:Mixin(healthBar, healthBarMetaFunctions)
-	detailsFramework:Mixin(healthBar, detailsFramework.StatusBarFunctions)
-
-	healthBar:CreateTextureMask()
-	healthBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
-
-	--settings and hooks
-	local settings = detailsFramework.table.copy({}, healthBarMetaFunctions.Settings)
-	if (settingsOverride) then
-		detailsFramework.table.copy(settings, settingsOverride)
-	end
-	healthBar.Settings = settings
-
-	--hook list
-	healthBar.HookList = detailsFramework.table.copy({}, healthBarMetaFunctions.HookList)
-
-	--initialize the cast bar
-	healthBar:Initialize()
-
-	return healthBar
-end
-
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---power bar frame
-
---[=[
-	DF:CreatePowerBar (parent, name, settingsOverride)
-	creates statusbar frame to show the unit power bar
-	@parent = frame to pass for the CreateFrame function
-	@name = absolute name of the frame, if omitted it uses the parent's name .. "PPowerBar"
-	@settingsOverride = table with keys and values to replace the defaults from the framework
---]=]
-
-detailsFramework.PowerFrameFunctions = {
-	WidgetType = "powerBar",
-
-	HookList = {
-		OnHide = {},
-		OnShow = {},
-	},
-
-	Settings = {
-		--misc
-		ShowAlternatePower = true, --if true it'll show alternate power over the regular power the unit uses
-		ShowPercentText = true, --if true show a text with the current energy percent
-		HideIfNoPower = true, --if true and the UnitMaxPower returns zero, it'll hide the power bar with self:Hide()
-		CanTick = false, --if it calls the OnTick function every tick
-
-		--appearance
-		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
-		Texture = [[Interface\RaidFrame\Raid-Bar-Resource-Fill]],
-
-		--default size
-		Width = 100,
-		Height = 20,
-	},
-
-	PowerBarEvents = {
-		{"PLAYER_ENTERING_WORLD"},
-		{"UNIT_DISPLAYPOWER", true},
-		{"UNIT_POWER_BAR_SHOW", true},
-		{"UNIT_POWER_BAR_HIDE", true},
-		{"UNIT_MAXPOWER", true},
-		{"UNIT_POWER_UPDATE", true},
-		{"UNIT_POWER_FREQUENT", true},
-	},
-
-	--setup the castbar to be used by another unit
-	SetUnit = function(self, unit, displayedUnit)
-		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
-			self.unit = unit
-			self.displayedUnit = displayedUnit or unit
-
-			--register events
-			if (unit) then
-				for _, eventTable in ipairs(self.PowerBarEvents) do
-					local event = eventTable [1]
-					local isUnitEvent = eventTable [2]
-
-					if (isUnitEvent) then
-						self:RegisterUnitEvent (event, self.displayedUnit)
-					else
-						self:RegisterEvent(event)
-					end
-				end
-
-				--set scripts
-				self:SetScript("OnEvent", self.OnEvent)
-
-				if (self.Settings.CanTick) then
-					self:SetScript("OnUpdate", self.OnTick)
-				end
-
-				self:Show()
-				self:UpdatePowerBar()
-			else
-				--remove all registered events
-				for _, eventTable in ipairs(self.PowerBarEvents) do
-					local event = eventTable [1]
-					self:UnregisterEvent (event)
-				end
-
-				--remove scripts
-				self:SetScript("OnEvent", nil)
-				self:SetScript("OnUpdate", nil)
-				self:Hide()
-			end
-		end
-	end,
-
-	Initialize = function(self)
-		PixelUtil.SetWidth (self, self.Settings.Width)
-		PixelUtil.SetHeight(self, self.Settings.Height)
-
-		self:SetTexture(self.Settings.Texture)
-
-		self.background:SetAllPoints()
-		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
-
-		if (self.Settings.ShowPercentText) then
-			self.percentText:Show()
-			PixelUtil.SetPoint(self.percentText, "center", self, "center", 0, 0)
-
-			detailsFramework:SetFontSize(self.percentText, 9)
-			detailsFramework:SetFontColor(self.percentText, "white")
-			detailsFramework:SetFontOutline (self.percentText, "OUTLINE")
-		else
-			self.percentText:Hide()
-		end
-
-		self:SetUnit(nil)
-	end,
-
-	--call every tick
-	OnTick = function(self, deltaTime) end, --if overrided, set 'CanTick' to true on the settings table
-
-	--when an event happen for this unit, send it to the apropriate function
-	OnEvent = function(self, event, ...)
-		local eventFunc = self [event]
-		if (eventFunc) then
-			--the function doesn't receive which event was, only 'self' and the parameters
-			eventFunc (self, ...)
-		end
-	end,
-
-	UpdatePowerBar = function(self)
-		self:UpdatePowerInfo()
-		self:UpdateMaxPower()
-		self:UpdatePower()
-		self:UpdatePowerColor()
-	end,
-
-	--power update
-	UpdateMaxPower = function(self)
-		self.currentPowerMax = UnitPowerMax (self.displayedUnit, self.powerType)
-		self:SetMinMaxValues(self.minPower, self.currentPowerMax)
-
-		if (self.currentPowerMax == 0 and self.Settings.HideIfNoPower) then
-			self:Hide()
-		end
-	end,
-	UpdatePower = function(self)
-		self.currentPower = UnitPower (self.displayedUnit, self.powerType)
-		PixelUtil.SetStatusBarValue (self, self.currentPower)
-
-		if (self.Settings.ShowPercentText) then
-			self.percentText:SetText(floor(self.currentPower / self.currentPowerMax * 100) .. "%")
-		end
-	end,
-
-	--when a event different from unit_power_update is triggered, update which type of power the unit should show
-	UpdatePowerInfo = function(self)
-		if (IS_WOW_PROJECT_MAINLINE and self.Settings.ShowAlternatePower) then -- not available in classic
-			local barID = UnitPowerBarID(self.displayedUnit)
-			local barInfo = GetUnitPowerBarInfoByID(barID)
-			--local name, tooltip, cost = GetUnitPowerBarStringsByID(barID);
-			--barInfo.barType,barInfo.minPower, barInfo.startInset, barInfo.endInset, barInfo.smooth, barInfo.hideFromOthers, barInfo.showOnRaid, barInfo.opaqueSpark, barInfo.opaqueFlash, barInfo.anchorTop, name, tooltip, cost, barInfo.ID, barInfo.forcePercentage, barInfo.sparkUnderFrame;
-			if (barInfo and barInfo.showOnRaid and IsInGroup()) then
-				self.powerType = ALTERNATE_POWER_INDEX
-				self.minPower = barInfo.minPower
-				return
-			end
-		end
-
-		self.powerType = UnitPowerType (self.displayedUnit)
-		self.minPower = 0
-	end,
-
-	--tint the bar with the color of the power, e.g. blue for a mana bar
-	UpdatePowerColor = function(self)
-		if (not UnitIsConnected (self.unit)) then
-			self:SetStatusBarColor(.5, .5, .5)
-			return
-		end
-
-		if (self.powerType == ALTERNATE_POWER_INDEX) then
-			--don't change this, keep the same color as the game tints on CompactUnitFrame.lua
-			self:SetStatusBarColor(0.7, 0.7, 0.6)
-			return
-		end
-
-		local powerColor = PowerBarColor [self.powerType] --don't appear to be, but PowerBarColor is a global table with all power colors /run Details:Dump (PowerBarColor)
-		if (powerColor) then
-			self:SetStatusBarColor(powerColor.r, powerColor.g, powerColor.b)
-			return
-		end
-
-		local _, _, r, g, b = UnitPowerType (self.displayedUnit)
-		if (r) then
-			self:SetStatusBarColor(r, g, b)
-			return
-		end
-
-		--if everything else fails, tint as rogue energy
-		powerColor = PowerBarColor ["ENERGY"]
-		self:SetStatusBarColor(powerColor.r, powerColor.g, powerColor.b)
-	end,
-
-	--events
-	PLAYER_ENTERING_WORLD = function(self, ...)
-		self:UpdatePowerBar()
-	end,
-	UNIT_DISPLAYPOWER  = function(self, ...)
-		self:UpdatePowerBar()
-	end,
-	UNIT_POWER_BAR_SHOW = function(self, ...)
-		self:UpdatePowerBar()
-	end,
-	UNIT_POWER_BAR_HIDE = function(self, ...)
-		self:UpdatePowerBar()
-	end,
-
-	UNIT_MAXPOWER = function(self, ...)
-		self:UpdateMaxPower()
-		self:UpdatePower()
-	end,
-	UNIT_POWER_UPDATE = function(self, ...)
-		self:UpdatePower()
-	end,
-	UNIT_POWER_FREQUENT = function(self, ...)
-		self:UpdatePower()
-	end,
-}
-
-detailsFramework:Mixin(detailsFramework.PowerFrameFunctions, detailsFramework.ScriptHookMixin)
-
--- ~powerbar
-function detailsFramework:CreatePowerBar(parent, name, settingsOverride)
-	assert(name or parent:GetName(), "DetailsFramework:CreatePowerBar parameter 'name' omitted and parent has no name.")
-
-	local powerBar = CreateFrame("StatusBar", name or (parent:GetName() .. "PowerBar"), parent, "BackdropTemplate")
-		do --layers
-			--background
-			powerBar.background = powerBar:CreateTexture(nil, "background")
-			powerBar.background:SetDrawLayer("background", -6)
-
-			--artwork
-			powerBar.barTexture = powerBar:CreateTexture(nil, "artwork")
-			powerBar:SetStatusBarTexture(powerBar.barTexture)
-
-			--overlay
-			powerBar.percentText = powerBar:CreateFontString(nil, "overlay", "GameFontNormal")
-		end
-
-	--mixins
-	detailsFramework:Mixin(powerBar, detailsFramework.PowerFrameFunctions)
-	detailsFramework:Mixin(powerBar, detailsFramework.StatusBarFunctions)
-
-	powerBar:CreateTextureMask()
-	powerBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
-
-	--settings and hooks
-	local settings = detailsFramework.table.copy({}, detailsFramework.PowerFrameFunctions.Settings)
-	if (settingsOverride) then
-		detailsFramework.table.copy(settings, settingsOverride)
-	end
-	powerBar.Settings = settings
-
-	local hookList = detailsFramework.table.copy({}, detailsFramework.PowerFrameFunctions.HookList)
-	powerBar.HookList = hookList
-
-	--initialize the cast bar
-	powerBar:Initialize()
-
-	return powerBar
-end
-
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---cast bar frame
-
---[=[
-	DF:CreateCastBar (parent, name, settingsOverride)
-	creates a cast bar to show an unit cast
-	@parent = frame to pass for the CreateFrame function
-	@name = absolute name of the frame, if omitted it uses the parent's name .. "CastBar"
-	@settingsOverride = table with keys and values to replace the defaults from the framework
---]=]
-
-detailsFramework.CastFrameFunctions = {
-	WidgetType = "castBar",
-
-	HookList = {
-		OnHide = {},
-		OnShow = {},
-
-		--can be regular cast or channel
-		OnCastStart = {},
-	},
-
-	CastBarEvents = {
-		{"UNIT_SPELLCAST_INTERRUPTED"},
-		{"UNIT_SPELLCAST_DELAYED"},
-		{"UNIT_SPELLCAST_CHANNEL_START"},
-		{"UNIT_SPELLCAST_CHANNEL_UPDATE"},
-		{"UNIT_SPELLCAST_CHANNEL_STOP"},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_START"},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_UPDATE"},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_STOP"},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_INTERRUPTIBLE"},
-		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_NOT_INTERRUPTIBLE"},
-		{"PLAYER_ENTERING_WORLD"},
-		{"UNIT_SPELLCAST_START", true},
-		{"UNIT_SPELLCAST_STOP", true},
-		{"UNIT_SPELLCAST_FAILED", true},
-	},
-
-	Settings = {
-		NoFadeEffects = false, --if true it won't play fade effects when a cast if finished
-		ShowTradeSkills = false, --if true, it shows cast for trade skills, e.g. creating an icon with blacksmith
-		ShowShield = true, --if true, shows the shield above the spell icon for non interruptible casts
-		CanTick = true, --if true it will run its OnTick function every tick.
-		ShowCastTime = true, --if true, show the remaining time to finish the cast, lazy tick must be enabled
-		FadeInTime = 0.1, --amount of time in seconds to go from zero to 100% alpha when starting to cast
-		FadeOutTime = 0.5, --amount of time in seconds to go from 100% to zero alpha when the cast finishes
-		CanLazyTick = true, --if true, it'll execute the lazy tick function, it ticks in a much slower pace comparece with the regular tick
-		LazyUpdateCooldown = 0.2, --amount of time to wait for the next lazy update, this updates non critical things like the cast timer
-
-		ShowEmpoweredDuration = true, --full hold time for empowered spells
-
-		FillOnInterrupt = true,
-		HideSparkOnInterrupt = true,
-
-		--default size
-		Width = 100,
-		Height = 20,
-
-		--colour the castbar statusbar by the type of the cast
-		Colors = {
-			Casting = detailsFramework:CreateColorTable (1, 0.73, .1, 1),
-			Channeling = detailsFramework:CreateColorTable (1, 0.73, .1, 1),
-			Finished = detailsFramework:CreateColorTable (0, 1, 0, 1),
-			NonInterruptible = detailsFramework:CreateColorTable (.7, .7, .7, 1),
-			Failed = detailsFramework:CreateColorTable (.4, .4, .4, 1),
-			Interrupted = detailsFramework:CreateColorTable (.965, .754, .154, 1),
-		},
-
-		--appearance
-		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
-		Texture = [[Interface\TargetingFrame\UI-StatusBar]],
-		BorderShieldWidth = 10,
-		BorderShieldHeight = 12,
-		BorderShieldCoords = {0.26171875, 0.31640625, 0.53125, 0.65625},
-		BorderShieldTexture = 1300837,
-		SpellIconWidth = 10,
-		SpellIconHeight = 10,
-		ShieldIndicatorTexture = [[Interface\RaidFrame\Shield-Fill]],
-		ShieldGlowTexture = [[Interface\RaidFrame\Shield-Overshield]],
-		SparkTexture = [[Interface\CastingBar\UI-CastingBar-Spark]],
-		SparkWidth = 16,
-		SparkHeight = 16,
-		SparkOffset = 0,
-	},
-
-	Initialize = function(self)
-		self.unit = "unutilized unit"
-		self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
-		self.Colors = self.Settings.Colors
-
-		self:SetUnit(nil)
-		PixelUtil.SetWidth (self, self.Settings.Width)
-		PixelUtil.SetHeight(self, self.Settings.Height)
-
-		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
-		self.background:SetAllPoints()
-		self.extraBackground:SetColorTexture(0, 0, 0, 1)
-		self.extraBackground:SetVertexColor(self.Settings.BackgroundColor:GetColor())
-		self.extraBackground:SetAllPoints()
-
-		self:SetTexture(self.Settings.Texture)
-
-		self.BorderShield:SetPoint("center", self, "left", 0, 0)
-		self.BorderShield:SetTexture(self.Settings.BorderShieldTexture)
-		self.BorderShield:SetTexCoord(unpack(self.Settings.BorderShieldCoords))
-		self.BorderShield:SetSize(self.Settings.BorderShieldWidth, self.Settings.BorderShieldHeight)
-
-		self.Icon:SetPoint("center", self, "left", 2, 0)
-		self.Icon:SetSize(self.Settings.SpellIconWidth, self.Settings.SpellIconHeight)
-
-		self.Spark:SetTexture(self.Settings.SparkTexture)
-		self.Spark:SetSize(self.Settings.SparkWidth, self.Settings.SparkHeight)
-
-		self.percentText:SetPoint("right", self, "right", -2, 0)
-		self.percentText:SetJustifyH("right")
-
-		self.fadeOutAnimation.alpha1:SetDuration(self.Settings.FadeOutTime)
-		self.fadeInAnimation.alpha1:SetDuration(self.Settings.FadeInTime)
-	end,
-
-	SetDefaultColor = function(self, colorType, r, g, b, a)
-		assert(type(colorType) == "string", "DetailsFramework: CastBar:SetDefaultColor require a string in the first argument.")
-		self.Colors [colorType]:SetColor (r, g, b, a)
-	end,
-
-	--this get a color suggestion based on the type of cast being shown in the cast bar
-	GetCastColor = function(self)
-		if (not self.canInterrupt) then
-			return self.Colors.NonInterruptible
-
-		elseif (self.channeling) then
-			return self.Colors.Channeling
-
-		elseif (self.failed) then
-			return self.Colors.Failed
-
-		elseif (self.interrupted) then
-			return self.Colors.Interrupted
-
-		elseif (self.finished) then
-			return self.Colors.Finished
-
-		else
-			return self.Colors.Casting
-		end
-	end,
-
-	--update all colors of the cast bar
-	UpdateCastColor = function(self)
-		local castColor = self:GetCastColor()
-		self:SetColor (castColor) --SetColor handles with ParseColors()
-	end,
-
-	--initial checks to know if this is a valid cast and should show the cast bar, if this fails the cast bar won't show
-	IsValid = function(self, unit, castName, isTradeSkill, ignoreVisibility)
-		if (not ignoreVisibility and not self:IsShown()) then
-			return false
-		end
-
-		if (not self.Settings.ShowTradeSkills) then
-			if (isTradeSkill) then
-				return false
-			end
-		end
-
-		if (not castName) then
-			return false
-		end
-
-		return true
-	end,
-
-	--handle the interrupt state of the cast
-	--this does not change the cast bar color because this function is called inside the start cast where is already handles the cast color
-	UpdateInterruptState = function(self)
-		if (self.Settings.ShowShield and not self.canInterrupt) then
-			self.BorderShield:Show()
-		else
-			self.BorderShield:Hide()
-		end
-	end,
-
-	--this check if the cast did reach 100% in the statusbar, mostly called from OnTick
-	CheckCastIsDone = function(self, event, isFinished)
-
-		--check max value
-		if (not isFinished and not self.finished) then
-			if (self.casting) then
-				if (self.value >= self.maxValue) then
-					isFinished = true
-				end
-
-			elseif (self.channeling) then
-				if (self.value > self.maxValue or self.value <= 0) then
-					isFinished = true
-				end
-			end
-
-			--check if passed an event (not begin used at the moment)
-			if (event) then
-				if (event == UNIT_SPELLCAST_STOP or event == UNIT_SPELLCAST_CHANNEL_STOP) then
-					isFinished = true
-				end
-			end
-		end
-
-		--the cast is finished
-		if (isFinished) then
-			if (self.casting) then
-				self.UNIT_SPELLCAST_STOP (self, self.unit, self.unit, self.castID, self.spellID)
-
-			elseif (self.channeling) then
-				self.UNIT_SPELLCAST_CHANNEL_STOP (self, self.unit, self.unit, self.castID, self.spellID)
-			end
-
-			return true
-		end
-	end,
-
-	--setup the castbar to be used by another unit
-	SetUnit = function(self, unit, displayedUnit)
-		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
-			self.unit = unit
-			self.displayedUnit = displayedUnit or unit
-
-			--reset the cast bar
-			self.casting = nil
-			self.channeling = nil
-			self.caninterrupt = nil
-
-			--register events
-			if (unit) then
-				for _, eventTable in ipairs(self.CastBarEvents) do
-					local event = eventTable [1]
-					local isUnitEvent = eventTable [2]
-
-					if event then
-						if (isUnitEvent) then
-							self:RegisterUnitEvent (event, unit)
-						else
-							self:RegisterEvent(event)
-						end
-					end
-				end
-
-				--set scripts
-				self:SetScript("OnEvent", self.OnEvent)
-				self:SetScript("OnShow", self.OnShow)
-				self:SetScript("OnHide", self.OnHide)
-
-				if (self.Settings.CanTick) then
-					self:SetScript("OnUpdate", self.OnTick)
-				end
-
-				--check is can show the cast time text
-				if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
-					self.percentText:Show()
-				else
-					self.percentText:Hide()
-				end
-
-				--setup animtions
-				self:CancelScheduleToHide()
-
-				--self:PLAYER_ENTERING_WORLD (unit, unit)
-				self:OnEvent ("PLAYER_ENTERING_WORLD", unit, unit)
-
-			else
-				for _, eventTable in ipairs(self.CastBarEvents) do
-					local event = eventTable [1]
-					if event then
-						self:UnregisterEvent (event)
-					end
-				end
-
-				--register main events
-				self:SetScript("OnUpdate", nil)
-				self:SetScript("OnEvent", nil)
-				self:SetScript("OnShow", nil)
-				self:SetScript("OnHide", nil)
-
-				self:Hide()
-			end
-		end
-	end,
-
-	--executed after a scheduled to hide timer is done
-	DoScheduledHide = function(timerObject)
-		timerObject.castBar.scheduledHideTime = nil
-
-		--just to make sure it isn't casting
-		if (not timerObject.castBar.casting and not timerObject.castBar.channeling) then
-			if (not timerObject.castBar.Settings.NoFadeEffects) then
-				timerObject.castBar:Animation_FadeOut()
-			else
-				timerObject.castBar:Hide()
-			end
-		end
-	end,
-
-	HasScheduledHide = function(self)
-		return self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()
-	end,
-
-	CancelScheduleToHide = function(self)
-		if (self:HasScheduledHide()) then
-			self.scheduledHideTime:Cancel()
-		end
-	end,
-
-	--after an interrupt, do not immediately hide the cast bar, let it up for short amount of time to give feedback to the player
-	ScheduleToHide = function(self, delay)
-		if (not delay) then
-			if (self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()) then
-				self.scheduledHideTime:Cancel()
-			end
-
-			self.scheduledHideTime = nil
-			return
-		end
-
-		--already have a scheduled timer?
-		if (self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()) then
-			self.scheduledHideTime:Cancel()
-		end
-
-		self.scheduledHideTime = C_Timer.NewTimer(delay, self.DoScheduledHide)
-		self.scheduledHideTime.castBar = self
-	end,
-
-	OnHide = function(self)
-		--just in case some other effects made it have a different alpha since SetUnit won't load if the unit is the same.
-		self:SetAlpha(1)
-		--cancel any timer to hide scheduled
-		self:CancelScheduleToHide()
-	end,
-
-	--just update the current value if a spell is being cast since it wasn't running its tick function during the hide state
-	--everything else should be in the correct state
-	OnShow = function(self)
-		self.flashTexture:Hide()
-
-		if (self.unit) then
-			if (self.casting) then
-				local name, text, texture, startTime = CastInfo.UnitCastingInfo (self.unit)
-				if (name) then
-					--[[if not self.spellStartTime then
-						self:UpdateCastingInfo(self.unit)
-					end]]--
-					self.value = GetTime() - self.spellStartTime
-				end
-
-				self:RunHooksForWidget("OnShow", self, self.unit)
-
-			elseif (self.channeling) then
-				local name, text, texture, endTime = CastInfo.UnitChannelInfo (self.unit)
-				if (name) then
-					--[[if not self.spellEndTime then
-						self:UpdateChannelInfo(self.unit)
-					end]]--
-					self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
-				end
-
-				self:RunHooksForWidget("OnShow", self, self.unit)
-			end
-		end
-	end,
-
-	--it's triggering several events since it's not registered for the unit with RegisterUnitEvent
-	OnEvent = function(self, event, ...)
-		local arg1 = ...
-		local unit = self.unit
-
-		if (event == "PLAYER_ENTERING_WORLD") then
-			local newEvent = self.PLAYER_ENTERING_WORLD (self, unit, ...)
-			if (newEvent) then
-				self.OnEvent (self, newEvent, unit)
-				return
-			end
-
-		elseif (arg1 ~= unit) then
-			return
-		end
-
-		local eventFunc = self [event]
-		if (eventFunc) then
-			eventFunc (self, unit, ...)
-		end
-	end,
-
-	OnTick_LazyTick = function(self)
-		--run the lazy tick if allowed
-		if (self.Settings.CanLazyTick) then
-			--update the cast time
-			if (self.Settings.ShowCastTime) then
-				if (self.casting) then
-					self.percentText:SetText(format("%.1f", abs(self.value - self.maxValue)))
-
-				elseif (self.channeling) then
-					local remainingTime = self.empowered and abs(self.value - self.maxValue) or abs(self.value)
-					if (remainingTime > 999) then
-						self.percentText:SetText("")
-					else
-						self.percentText:SetText(format("%.1f", remainingTime))
-					end
-				else
-					self.percentText:SetText("")
-				end
-			end
-
-			return true
-		else
-			return false
-		end
-	end,
-
-	--tick function for regular casts
-	OnTick_Casting = function(self, deltaTime)
-		self.value = self.value + deltaTime
-
-		if (self:CheckCastIsDone()) then
-			return
-		else
-			self:SetValue(self.value)
-		end
-
-		--update spark position
-		local sparkPosition = self.value / self.maxValue * self:GetWidth()
-		self.Spark:SetPoint("center", self, "left", sparkPosition + self.Settings.SparkOffset, 0)
-		
-
-		--in order to allow the lazy tick run, it must return true, it tell that the cast didn't finished
-		return true
-	end,
-
-	--tick function for channeling casts
-	OnTick_Channeling = function(self, deltaTime)
-		self.value = self.empowered and self.value + deltaTime or self.value - deltaTime
-
-		if (self:CheckCastIsDone()) then
-			return
-		else
-			self:SetValue(self.value)
-		end
-
-		--update spark position
-		local sparkPosition = self.value / self.maxValue * self:GetWidth()
-		self.Spark:SetPoint("center", self, "left", sparkPosition + self.Settings.SparkOffset, 0)
-		
-		self:CreateOrUpdateEmpoweredPips()
-
-		return true
-	end,
-
-	OnTick = function(self, deltaTime)
-		if (self.casting) then
-			if (not self:OnTick_Casting (deltaTime)) then
-				return
-			end
-
-			--lazy tick
-			self.lazyUpdateCooldown = self.lazyUpdateCooldown - deltaTime
-			if (self.lazyUpdateCooldown < 0) then
-				self:OnTick_LazyTick()
-				self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
-			end
-
-		elseif (self.channeling) then
-			if (not self:OnTick_Channeling (deltaTime)) then
-				return
-			end
-
-			--lazy tick
-			self.lazyUpdateCooldown = self.lazyUpdateCooldown - deltaTime
-			if (self.lazyUpdateCooldown < 0) then
-				self:OnTick_LazyTick()
-				self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
-			end
-		end
-	end,
-
-	--animation start script
-	Animation_FadeOutStarted = function(self)
-
-	end,
-
-	--animation finished script
-	Animation_FadeOutFinished = function(self)
-		local castBar = self:GetParent()
-		castBar:SetAlpha(1)
-		castBar:Hide()
-	end,
-
-	--animation start script
-	Animation_FadeInStarted = function(self)
-
-	end,
-
-	--animation finished script
-	Animation_FadeInFinished = function(self)
-		local castBar = self:GetParent()
-		castBar:Show()
-		castBar:SetAlpha(1)
-	end,
-
-	--animation calls
-	Animation_FadeOut = function(self)
-		self:ScheduleToHide (false)
-
-		if (self.fadeInAnimation:IsPlaying()) then
-			self.fadeInAnimation:Stop()
-		end
-
-		if (not self.fadeOutAnimation:IsPlaying()) then
-			self.fadeOutAnimation:Play()
-		end
-	end,
-
-	Animation_FadeIn = function(self)
-		self:ScheduleToHide (false)
-
-		if (self.fadeOutAnimation:IsPlaying()) then
-			self.fadeOutAnimation:Stop()
-		end
-
-		if (not self.fadeInAnimation:IsPlaying()) then
-			self.fadeInAnimation:Play()
-		end
-	end,
-
-	Animation_Flash = function(self)
-		if (not self.flashAnimation:IsPlaying()) then
-			self.flashAnimation:Play()
-		end
-	end,
-
-	Animation_StopAllAnimations = function(self)
-		if (self.flashAnimation:IsPlaying()) then
-			self.flashAnimation:Stop()
-		end
-
-		if (self.fadeOutAnimation:IsPlaying()) then
-			self.fadeOutAnimation:Stop()
-		end
-
-		if (self.fadeInAnimation:IsPlaying()) then
-			self.fadeInAnimation:Stop()
-		end
-	end,
-
-	PLAYER_ENTERING_WORLD = function(self, unit, arg1)
-		local isChannel = CastInfo.UnitChannelInfo (unit)
-		local isRegularCast = CastInfo.UnitCastingInfo (unit)
-
-		if (isChannel) then
-			self.channeling = true
-			self:UpdateChannelInfo(unit)
-			return self.unit == arg1 and "UNIT_SPELLCAST_CHANNEL_START"
-
-		elseif (isRegularCast) then
-			self.casting = true
-			self:UpdateCastingInfo(unit)
-			return self.unit == arg1 and "UNIT_SPELLCAST_START"
-
-		else
-			self.casting = nil
-			self.channeling = nil
-			self.failed = nil
-			self.finished = nil
-			self.interrupted = nil
-			self.Spark:Hide()
-			self:Hide()
-		end
-	end,
-
-	UpdateCastingInfo = function(self, unit)
-		local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = CastInfo.UnitCastingInfo (unit)
-
-		--is valid?
-		if (not self:IsValid (unit, name, isTradeSkill, true)) then
-			return
-		end
-		
-		--empowered? no!
-			self.holdAtMaxTime = nil
-			self.empowered = false
-			self.curStage = nil
-			self.numStages = nil
-			self.empStages = nil
-			self:CreateOrUpdateEmpoweredPips()
-
-		--setup cast
-			self.casting = true
-			self.channeling = nil
-			self.interrupted = nil
-			self.failed = nil
-			self.finished = nil
-			self.canInterrupt = not notInterruptible
-			self.spellID = spellID
-			self.castID = castID
-			self.spellName = name
-			self.spellTexture = texture
-			self.spellStartTime = startTime / 1000
-			self.spellEndTime = endTime / 1000
-			self.value = GetTime() - self.spellStartTime
-			self.maxValue = self.spellEndTime - self.spellStartTime
-
-			self:SetMinMaxValues(0, self.maxValue)
-			self:SetValue(self.value)
-			self:SetAlpha(1)
-			self.Icon:SetTexture(texture)
-			self.Icon:Show()
-			self.Text:SetText(text or name)
-
-			if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
-				self.percentText:Show()
-			end
-
-			self.flashTexture:Hide()
-			self:Animation_StopAllAnimations()
-
-			self:SetAlpha(1)
-
-			--set the statusbar color
-			self:UpdateCastColor()
-
-			if (not self:IsShown() and not self.Settings.NoFadeEffects) then
-				self:Animation_FadeIn()
-			end
-
-			self.Spark:Show()
-			self:Show()
-
-		--update the interrupt cast border
-		self:UpdateInterruptState()
-
-	end,
-
-	UNIT_SPELLCAST_START = function(self, unit)
-
-		self:UpdateCastingInfo(unit)
-
-		self:RunHooksForWidget("OnCastStart", self, self.unit, "UNIT_SPELLCAST_START")
-	end,
-	
-	CreateOrUpdateEmpoweredPips = function(self, unit, numStages, startTime, endTime)
-		unit = unit or self.unit
-		numStages = numStages or self.numStages
-		startTime = startTime or ((self.spellStartTime or 0) * 1000)
-		endTime = endTime or ((self.spellEndTime or 0) * 1000)
-		
-		if not self.empStages or not numStages or numStages <= 0 then
-			self.stagePips = self.stagePips or {}
-			for i, stagePip in pairs(self.stagePips) do
-				stagePip:Hide()
-			end
-			return
-		end
-		
-		local width = self:GetWidth()
-		local height = self:GetHeight()
-		for i = 1, numStages, 1 do
-			local curStartTime = self.empStages[i] and self.empStages[i].start
-			local curEndTime = self.empStages[i] and self.empStages[i].finish
-			local curDuration = curEndTime - curStartTime
-			local offset = width * curEndTime / (endTime - startTime) * 1000
-			if curDuration > -1 then
-				
-				stagePip = self.stagePips[i]
-				if not stagePip then
-					stagePip = self:CreateTexture(nil, "overlay", nil, 2)
-					stagePip:SetBlendMode("ADD")
-					stagePip:SetTexture([[Interface\CastingBar\UI-CastingBar-Spark]])
-					stagePip:SetTexCoord(11/32,18/32,9/32,23/32)
-					stagePip:SetSize(2, height)
-					--stagePip = CreateFrame("FRAME", nil, self, "CastingBarFrameStagePipTemplate")
-					self.stagePips[i] = stagePip
-				end
-				
-				stagePip:ClearAllPoints()
-				--stagePip:SetPoint("TOP", self, "TOPLEFT", offset, -1)
-				--stagePip:SetPoint("BOTTOM", self, "BOTTOMLEFT", offset, 1)
-				--stagePip.BasePip:SetVertexColor(1, 1, 1, 1)
-				stagePip:SetPoint("CENTER", self, "LEFT", offset, 0)
-				stagePip:SetVertexColor(1, 1, 1, 1)
-				stagePip:Show()
-			end
-		end
-	end,
-
-	UpdateChannelInfo = function(self, unit, ...)
-		local unitID, castID, spellID = ...
-		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID, _, numStages = CastInfo.UnitChannelInfo (unit)
-
-		--is valid?
-		if (not self:IsValid (unit, name, isTradeSkill, true)) then
-			return
-		end
-		
-		--empowered?
-			self.empStages = {}
-			self.stagePips = self.stagePips or {}
-			for i, stagePip in pairs(self.stagePips) do
-				stagePip:Hide()
-			end
-			
-			if numStages and numStages > 0 then
-				self.holdAtMaxTime = GetUnitEmpowerHoldAtMaxTime(self.unit)
-				self.empowered = true
-				self.numStages = numStages
-				
-
-				local lastStageEndTime = 0
-				for i = 1, numStages do
-					self.empStages[i] = {
-						start = lastStageEndTime,
-						finish = lastStageEndTime + GetUnitEmpowerStageDuration(unit, i - 1) / 1000,
-					}
-					lastStageEndTime = self.empStages[i].finish
-					
-					if startTime / 1000 + lastStageEndTime <= GetTime() then
-						self.curStage = i
-					end
-				end
-				
-				if (self.Settings.ShowEmpoweredDuration) then
-					endTime = endTime + self.holdAtMaxTime
-				end
-				
-				--create/update pips
-				self:CreateOrUpdateEmpoweredPips(unit, numStages, startTime, endTime)
-			else
-				self.holdAtMaxTime = nil
-				self.empowered = false
-				self.curStage = nil
-				self.numStages = nil
-			end
-
-		--setup cast
-			self.casting = nil
-			self.channeling = true
-			self.interrupted = nil
-			self.failed = nil
-			self.finished = nil
-			self.canInterrupt = not notInterruptible
-			self.spellID = spellID
-			self.castID = castID
-			self.spellName = name
-			self.spellTexture = texture
-			self.spellStartTime = startTime / 1000
-			self.spellEndTime = endTime / 1000
-			self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
-			self.maxValue = self.spellEndTime - self.spellStartTime
-			self.reverseChanneling = self.empowered
-
-			self:SetMinMaxValues(0, self.maxValue)
-			self:SetValue(self.value)
-
-			self:SetAlpha(1)
-			self.Icon:SetTexture(texture)
-			self.Icon:Show()
-			self.Text:SetText(text)
-
-			if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
-				self.percentText:Show()
-			end
-
-			self.flashTexture:Hide()
-			self:Animation_StopAllAnimations()
-
-			self:SetAlpha(1)
-
-			--set the statusbar color
-			self:UpdateCastColor()
-
-			if (not self:IsShown() and not self.Settings.NoFadeEffects) then
-				self:Animation_FadeIn()
-			end
-
-			self.Spark:Show()
-			self:Show()
-
-		--update the interrupt cast border
-		self:UpdateInterruptState()
-
-	end,
-
-	UNIT_SPELLCAST_CHANNEL_START = function(self, unit, ...)
-
-		self:UpdateChannelInfo(unit, ...)
-
-		self:RunHooksForWidget("OnCastStart", self, self.unit, "UNIT_SPELLCAST_CHANNEL_START")
-	end,
-
-	UNIT_SPELLCAST_STOP = function(self, unit, ...)
-		local unitID, castID, spellID = ...
-		if (self.castID == castID) then
-			if (self.interrupted) then
-				if (self.Settings.HideSparkOnInterrupt) then
-					self.Spark:Hide()
-				end
-			else
-				self.Spark:Hide()
-			end
-
-			self.percentText:Hide()
-
-			local value = self:GetValue()
-			local _, maxValue = self:GetMinMaxValues()
-
-			if (self.interrupted) then
-				if (self.Settings.FillOnInterrupt) then
-					self:SetValue(self.maxValue or maxValue or 1)
-				end
-			else
-				self:SetValue(self.maxValue or maxValue or 1)
-			end
-
-			self.casting = nil
-			self.channeling = nil
-			self.finished = true
-			self.castID = nil
-
-			if (not self:HasScheduledHide()) then
-				--check if settings has no fade option or if its parents are not visible
-				if (not self:IsVisible()) then
-					self:Hide()
-
-				elseif (self.Settings.NoFadeEffects) then
-					self:ScheduleToHide (0.3)
-
-				else
-					self:Animation_Flash()
-					self:Animation_FadeOut()
-				end
-			end
-
-			self:UpdateCastColor()
-		end
-	end,
-
-	UNIT_SPELLCAST_CHANNEL_STOP = function(self, unit, ...)
-		local unitID, castID, spellID = ...
-
-		if (self.channeling and castID == self.castID) then
-			self.Spark:Hide()
-			self.percentText:Hide()
-
-			local value = self:GetValue()
-			local _, maxValue = self:GetMinMaxValues()
-			self:SetValue(self.maxValue or maxValue or 1)
-
-			self.casting = nil
-			self.channeling = nil
-			self.finished = true
-			self.castID = nil
-
-			if (not self:HasScheduledHide()) then
-				--check if settings has no fade option or if its parents are not visible
-				if (not self:IsVisible()) then
-					self:Hide()
-
-				elseif (self.Settings.NoFadeEffects) then
-					self:ScheduleToHide (0.3)
-
-				else
-					self:Animation_Flash()
-					self:Animation_FadeOut()
-				end
-			end
-
-			self:UpdateCastColor()
-		end
-	end,
-	
-	UNIT_SPELLCAST_EMPOWER_START = function(self, unit, ...)
-		self:UNIT_SPELLCAST_CHANNEL_START(unit, ...)
-	end,
-	
-	UNIT_SPELLCAST_EMPOWER_UPDATE = function(self, unit, ...)
-		self:UNIT_SPELLCAST_CHANNEL_UPDATE(unit, ...)
-	end,
-	
-	UNIT_SPELLCAST_EMPOWER_STOP = function(self, unit, ...)
-		self:UNIT_SPELLCAST_CHANNEL_STOP(unit, ...)
-	end,
-
-	UNIT_SPELLCAST_FAILED = function(self, unit, ...)
-		local unitID, castID, spellID = ...
-
-		if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
-			self.casting = nil
-			self.channeling = nil
-			self.failed = true
-			self.finished = true
-			self.castID = nil
-			self:SetValue(self.maxValue or select(2, self:GetMinMaxValues()) or 1)
-
-			--set the statusbar color
-			self:UpdateCastColor()
-
-			self.Spark:Hide()
-			self.percentText:Hide()
-			self.Text:SetText(FAILED) --auto locale within the global namespace
-
-			self:ScheduleToHide (1)
-		end
-	end,
-
-	UNIT_SPELLCAST_INTERRUPTED = function(self, unit, ...)
-		local unitID, castID, spellID = ...
-
-		if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
-			self.casting = nil
-			self.channeling = nil
-			self.interrupted = true
-			self.finished = true
-			self.castID = nil
-
-			if (self.Settings.FillOnInterrupt) then
-				self:SetValue(self.maxValue or select(2, self:GetMinMaxValues()) or 1)
-			end
-
-			if (self.Settings.HideSparkOnInterrupt) then
-				self.Spark:Hide()
-			end
-
-			local castColor = self:GetCastColor()
-			self:SetColor (castColor) --SetColor handles with ParseColors()
-
-			self.percentText:Hide()
-			self.Text:SetText(INTERRUPTED) --auto locale within the global namespace
-
-			self:ScheduleToHide (1)
-		end
-	end,
-
-	UNIT_SPELLCAST_DELAYED = function(self, unit, ...)
-		local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible = CastInfo.UnitCastingInfo (unit)
-
-		if (not self:IsValid (unit, name, isTradeSkill)) then
-			return
-		end
-
-		--update the cast time
-		self.spellStartTime = startTime / 1000
-		self.spellEndTime = endTime / 1000
-		self.value = GetTime() - self.spellStartTime
-		self.maxValue = self.spellEndTime - self.spellStartTime
-		self:SetMinMaxValues(0, self.maxValue)
-	end,
-
-	UNIT_SPELLCAST_CHANNEL_UPDATE = function(self, unit, ...)
-		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID, _, numStages = CastInfo.UnitChannelInfo (unit)
-
-		if (not self:IsValid (unit, name, isTradeSkill)) then
-			return
-		end
-
-		--update the cast time
-		self.spellStartTime = startTime / 1000
-		self.spellEndTime = endTime / 1000
-		self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
-		self.maxValue = self.spellEndTime - self.spellStartTime
-
-		if (self.value < 0 or self.value > self.maxValue) then
-			self.value = 0
-		end
-
-		self:SetMinMaxValues(0, self.maxValue)
-		self:SetValue(self.value)
-	end,
-
-	--cast changed its state to interruptable
-	UNIT_SPELLCAST_INTERRUPTIBLE = function(self, unit, ...)
-		self.canInterrupt = true
-		self:UpdateCastColor()
-		self:UpdateInterruptState()
-	end,
-
-	--cast changed its state to non interruptable
-	UNIT_SPELLCAST_NOT_INTERRUPTIBLE = function(self, unit, ...)
-		self.canInterrupt = false
-		self:UpdateCastColor()
-		self:UpdateInterruptState()
-	end,
-
-}
-
-detailsFramework:Mixin(detailsFramework.CastFrameFunctions, detailsFramework.ScriptHookMixin)
-
--- ~castbar
-
-function detailsFramework:CreateCastBar(parent, name, settingsOverride)
-	assert(name or parent:GetName(), "DetailsFramework:CreateCastBar parameter 'name' omitted and parent has no name.")
-
-	local castBar = CreateFrame("StatusBar", name or (parent:GetName() .. "CastBar"), parent, "BackdropTemplate")
-
-		do --layers
-
-			--these widgets was been made with back compatibility in mind
-			--they are using the same names as the retail game uses on the nameplate castbar
-			--this should make Plater core and Plater scripts made by users compatible with the new unit frame made on the framework
-
-			--background
-			castBar.background = castBar:CreateTexture(nil, "background", nil, -6)
-			castBar.extraBackground = castBar:CreateTexture(nil, "background", nil, -5)
-
-			--overlay
-			castBar.Text = castBar:CreateFontString(nil, "overlay", "SystemFont_Shadow_Small")
-			castBar.Text:SetDrawLayer("overlay", 1)
-			castBar.Text:SetPoint("center", 0, 0)
-
-			castBar.BorderShield = castBar:CreateTexture(nil, "overlay", nil, 5)
-			castBar.BorderShield:Hide()
-
-			castBar.Icon = castBar:CreateTexture(nil, "overlay", nil, 4)
-			castBar.Icon:Hide()
-
-			castBar.Spark = castBar:CreateTexture(nil, "overlay", nil, 3)
-			castBar.Spark:SetBlendMode("ADD")
-
-			--time left on the cast
-			castBar.percentText = castBar:CreateFontString(nil, "overlay", "SystemFont_Shadow_Small")
-			castBar.percentText:SetDrawLayer("overlay", 7)
-
-			--statusbar texture
-			castBar.barTexture = castBar:CreateTexture(nil, "artwork", nil, -6)
-			castBar:SetStatusBarTexture(castBar.barTexture)
-
-			--animations fade in and out
-			local fadeOutAnimationHub = detailsFramework:CreateAnimationHub (castBar, detailsFramework.CastFrameFunctions.Animation_FadeOutStarted, detailsFramework.CastFrameFunctions.Animation_FadeOutFinished)
-			fadeOutAnimationHub.alpha1 = detailsFramework:CreateAnimation(fadeOutAnimationHub, "ALPHA", 1, 1, 1, 0)
-			castBar.fadeOutAnimation = fadeOutAnimationHub
-
-			local fadeInAnimationHub = detailsFramework:CreateAnimationHub (castBar, detailsFramework.CastFrameFunctions.Animation_FadeInStarted, detailsFramework.CastFrameFunctions.Animation_FadeInFinished)
-			fadeInAnimationHub.alpha1 = detailsFramework:CreateAnimation(fadeInAnimationHub, "ALPHA", 1, 0.150, 0, 1)
-			castBar.fadeInAnimation = fadeInAnimationHub
-
-			--animatios flash
-			local flashTexture = castBar:CreateTexture(nil, "overlay", nil, 7)
-			flashTexture:SetColorTexture(1, 1, 1, 1)
-			flashTexture:SetAllPoints()
-			flashTexture:SetAlpha(0)
-			flashTexture:Hide()
-			flashTexture:SetBlendMode("ADD")
-			castBar.flashTexture = flashTexture
-
-			local flashAnimationHub = detailsFramework:CreateAnimationHub (flashTexture, function() flashTexture:Show() end, function() flashTexture:Hide() end)
-			detailsFramework:CreateAnimation(flashAnimationHub, "ALPHA", 1, 0.2, 0, 0.8)
-			detailsFramework:CreateAnimation(flashAnimationHub, "ALPHA", 2, 0.2, 1, 0)
-			castBar.flashAnimation = flashAnimationHub
-		end
-
-	--mixins
-	detailsFramework:Mixin(castBar, detailsFramework.CastFrameFunctions)
-	detailsFramework:Mixin(castBar, detailsFramework.StatusBarFunctions)
-
-	castBar:CreateTextureMask()
-	castBar:AddMaskTexture(castBar.flashTexture)
-	castBar:AddMaskTexture(castBar.background)
-	castBar:AddMaskTexture(castBar.extraBackground)
-
-	castBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
-
-	--settings and hooks
-	local settings = detailsFramework.table.copy({}, detailsFramework.CastFrameFunctions.Settings)
-	if (settingsOverride) then
-		detailsFramework.table.copy(settings, settingsOverride)
-	end
-	castBar.Settings = settings
-
-	local hookList = detailsFramework.table.copy({}, detailsFramework.CastFrameFunctions.HookList)
-	castBar.HookList = hookList
-
-	--initialize the cast bar
-	castBar:Initialize()
-
-	return castBar
-end
-
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --border frame
 
@@ -7727,8 +5752,8 @@ detailsFramework.BorderFunctions = {
 }
 
 -- ~borderframe
-function detailsFramework:CreateBorderFrame (parent, name)
-	local parentName = name or "DetailsFrameworkBorderFrame" .. tostring(math.random(1, 100000000))
+function detailsFramework:CreateBorderFrame(parent, name)
+	local parentName = name or ("DetailsFrameworkBorderFrame" .. tostring(math.random(1, 100000000)))
 
 	local f = CreateFrame("frame", parentName, parent, "BackdropTemplate")
 	f:SetFrameLevel(f:GetFrameLevel()+1)
@@ -7781,524 +5806,6 @@ function detailsFramework:CreateBorderFrame (parent, name)
 	return f
 end
 
-
-
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---unit frame
-
---[=[
-	DF:CreateUnitFrame(parent, name, settingsOverride)
-	creates a very basic unit frame with a healthbar, castbar and power bar
-	each unit frame has a .Settings table which isn't shared among other unit frames created with this method
-	all members names are the same as the unit frame from the retail game
-
-	@parent = frame to pass for the CreateFrame function
-	@name = absolute name of the frame, if omitted a random name is created
-	@settingsOverride = table with keys and values to replace the defaults from the framework
-
---]=]
-
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---unit frame
-
-	--return true if the unit has been claimed by another player (health bar is gray)
-	local isUnitTapDenied = function(unit)
-		return unit and not UnitPlayerControlled(unit) and UnitIsTapDenied(unit)
-	end
-
-	detailsFramework.UnitFrameFunctions = {
-		WidgetType = "unitFrame",
-
-		Settings = {
-			--unit frames
-			ClearUnitOnHide = true, --if tue it'll set the unit to nil when the unit frame is set to hide
-			ShowCastBar = true, --if this is false, the cast bar for the unit won't be shown
-			ShowPowerBar = true, --if true it'll show the power bar for the unit, e.g. the mana bar
-			ShowUnitName = true, --if false, the unit name won't show
-			ShowBorder = true, --if false won't show the border frame
-
-			--health bar color
-			CanModifyHealhBarColor = true, --if false it won't change the color of the health bar
-			ColorByAggro = false, --if true it'll color the healthbar with red color when the unit has aggro on player
-			FixedHealthColor = false, --color override with a table {r=1, g=1, b=1}
-			UseFriendlyClassColor = true, --make the healthbar class color for friendly players
-			UseEnemyClassColor = true, --make the healthbar class color for enemy players
-
-			--misc
-			ShowTargetOverlay = true, --shows a highlighht for the player current target
-			BorderColor = detailsFramework:CreateColorTable (0, 0, 0, 1), --border color, set to alpha zero for no border
-			CanTick = false, --if true it'll run the OnTick event
-
-			--size
-			Width = 100,
-			Height = 20,
-			PowerBarHeight = 4,
-			CastBarHeight = 8,
-		},
-
-		UnitFrameEvents = {
-			--run for all units
-			{"PLAYER_ENTERING_WORLD"},
-			{"PARTY_MEMBER_DISABLE"},
-			{"PARTY_MEMBER_ENABLE"},
-			{"PLAYER_TARGET_CHANGED"},
-
-			--run for one unit
-			{"UNIT_NAME_UPDATE", true},
-			{"UNIT_CONNECTION", true},
-			{"UNIT_ENTERED_VEHICLE", true},
-			{"UNIT_EXITED_VEHICLE", true},
-			{"UNIT_PET", true},
-			{"UNIT_THREAT_LIST_UPDATE", true},
-		},
-
-		--used when a event is triggered to quickly check if is a unit event
-		IsUnitEvent = {
-			["UNIT_NAME_UPDATE"] = true,
-			["UNIT_CONNECTION"] = true,
-			["UNIT_ENTERED_VEHICLE"] = true,
-			["UNIT_EXITED_VEHICLE"] = true,
-			["UNIT_PET"] = true,
-			["UNIT_THREAT_LIST_UPDATE"] = true,
-		},
-
-		Initialize = function(self)
-			self.border:SetBorderColor (self.Settings.BorderColor)
-
-			PixelUtil.SetWidth (self, self.Settings.Width, 1)
-			PixelUtil.SetHeight(self, self.Settings.Height, 1)
-
-			PixelUtil.SetPoint(self.powerBar, "bottomleft", self, "bottomleft", 0, 0, 1, 1)
-			PixelUtil.SetPoint(self.powerBar, "bottomright", self, "bottomright", 0, 0, 1, 1)
-			PixelUtil.SetHeight(self.powerBar, self.Settings.PowerBarHeight, 1)
-
-			--make the castbar overlap the powerbar
-			PixelUtil.SetPoint(self.castBar, "bottomleft", self, "bottomleft", 0, 0, 1, 1)
-			PixelUtil.SetPoint(self.castBar, "bottomright", self, "bottomright", 0, 0, 1, 1)
-			PixelUtil.SetHeight(self.castBar, self.Settings.CastBarHeight, 1)
-		end,
-
-		SetHealthBarColor = function(self, r, g, b, a)
-			self.healthBar:SetColor (r, g, b, a)
-		end,
-
-		--register all events which will be used by the unit frame
-		RegisterEvents = function(self)
-			--register events
-			for index, eventTable in ipairs(self.UnitFrameEvents) do
-				local event, isUnitEvent = unpack(eventTable)
-				if (not isUnitEvent) then
-					self:RegisterEvent(event)
-				else
-					self:RegisterUnitEvent (event, self.unit, self.displayedUnit ~= unit and self.displayedUnit or nil)
-				end
-			end
-
-			--check settings and unregister events for disabled features
-			if (not self.Settings.ColorByAggro) then
-				self:UnregisterEvent ("UNIT_THREAT_LIST_UPDATE")
-			end
-
-			--set scripts
-			self:SetScript("OnEvent", self.OnEvent)
-			self:SetScript("OnHide", self.OnHide)
-
-			if (self.Settings.CanTick) then
-				self:SetScript("OnUpdate", self.OnTick)
-			end
-		end,
-
-		--unregister events, called when this unit frame losses its unit
-		UnregisterEvents = function(self)
-			for index, eventTable in ipairs(self.UnitFrameEvents) do
-				local event, firstUnit, secondUnit = unpack(eventTable)
-				self:UnregisterEvent (event)
-			end
-
-			self:SetScript("OnEvent", nil)
-			self:SetScript("OnUpdate", nil)
-			self:SetScript("OnHide", nil)
-		end,
-
-		--call every tick
-		OnTick = function(self, deltaTime) end, --if overrided, set 'CanTick' to true on the settings table
-
-		--when an event happen for this unit, send it to the apropriate function
-		OnEvent = function(self, event, ...)
-			--run the function for this event
-			local eventFunc = self [event]
-			if (eventFunc) then
-				--is this event an unit event?
-				if (self.IsUnitEvent [event]) then
-					local unit = ...
-					--check if is for this unit (even if the event is registered only for the unit)
-					if (unit == self.unit or unit == self.displayedUnit) then
-						eventFunc (self, ...)
-					end
-				else
-					eventFunc (self, ...)
-				end
-			end
-		end,
-
-		OnHide = function(self)
-			if (self.Settings.ClearUnitOnHide) then
-				self:SetUnit(nil)
-			end
-		end,
-
-		--run if the unit currently shown is different than the new one
-		SetUnit = function(self, unit)
-			if (unit ~= self.unit or unit == nil) then
-				self.unit = unit --absolute unit
-				self.displayedUnit = unit --~todo rename to 'displayedUnit' for back compatibility with older scripts in Plater
-				self.unitInVehicle = nil --true when the unit is in a vehicle
-
-				if (unit) then
-					self:RegisterEvents()
-
-					self.healthBar:SetUnit(unit, self.displayedUnit)
-
-					--is using castbars?
-					if (self.Settings.ShowCastBar) then
-						self.castBar:SetUnit(unit, self.displayedUnit)
-					else
-						self.castBar:SetUnit(nil)
-					end
-
-					--is using powerbars?
-					if (self.Settings.ShowPowerBar) then
-						self.powerBar:SetUnit(unit, self.displayedUnit)
-					else
-						self.powerBar:SetUnit(nil)
-					end
-
-					--is using the border?
-					if (self.Settings.ShowBorder) then
-						self.border:Show()
-					else
-						self.border:Hide()
-					end
-
-					if (not self.Settings.ShowUnitName) then
-						self.unitName:Hide()
-					end
-				else
-					self:UnregisterEvents()
-					self.healthBar:SetUnit(nil)
-					self.castBar:SetUnit(nil)
-					self.powerBar:SetUnit(nil)
-				end
-
-				self:UpdateUnitFrame()
-			end
-		end,
-
-		--if the unit is controlling a vehicle, need to show the vehicle instead
-		--.unit and .displayedUnit is always the same execept when the unit is controlling a vehicle, then .displayedUnit is the unitID for the vehicle
-		--todo: see what 'UnitTargetsVehicleInRaidUI' is, there's a call for this in the CompactUnitFrame.lua but zero documentation
-		CheckVehiclePossession = function(self)
-			--this unit is possessing a vehicle?
-			local unitPossessVehicle = (IS_WOW_PROJECT_MAINLINE) and UnitHasVehicleUI(self.unit)	or false
-			if (unitPossessVehicle) then
-				if (not self.unitInVehicle) then
-					if (UnitIsUnit("player", self.unit)) then
-						self.displayedUnit = "vehicle"
-						self.unitInVehicle = true
-						self:RegisterEvents()
-						self:UpdateAllWidgets()
-						return true
-					end
-
-					local prefix, id, suffix = string.match(self.unit, "([^%d]+)([%d]*)(.*)") --CompactUnitFrame.lua
-					local vehicleUnitID = prefix .. "pet" .. id .. suffix
-					if (UnitExists(vehicleUnitID)) then
-						self.displayedUnit = vehicleUnitID
-						self.unitInVehicle = true
-						self:RegisterEvents()
-						self:UpdateAllWidgets()
-						return true
-					end
-				end
-			end
-
-			if (self.unitInVehicle) then
-				self.displayedUnit = self.unit
-				self.unitInVehicle = nil
-				self:RegisterEvents()
-				self:UpdateAllWidgets()
-			end
-		end,
-
-		--find a color for the health bar, if a color has been passed in the arguments use it instead, 'CanModifyHealhBarColor' must be true for this function run
-		UpdateHealthColor = function(self, r, g, b)
-			--check if color changes is disabled
-			if (not self.Settings.CanModifyHealhBarColor) then
-				return
-			end
-
-			local unit = self.displayedUnit
-
-			--check if a color has been passed within the parameters
-			if (r) then
-				--check if passed a special color
-				if (type(r) ~= "number") then
-					r, g, b = detailsFramework:ParseColors(r)
-				end
-
-				self:SetHealthBarColor (r, g, b)
-				return
-			end
-
-			--check if there is a color override in the settings
-			if (self.Settings.FixedHealthColor) then
-				local FixedHealthColor = self.Settings.FixedHealthColor
-				r, g, b = FixedHealthColor.r, FixedHealthColor.g, FixedHealthColor.b
-				self:SetHealthBarColor (r, g, b)
-				return
-			end
-
-			--check if the unit is a player
-			if (UnitIsPlayer (unit)) then
-				--check if the unit is disconnected (in case it is a player
-				if (not UnitIsConnected (unit)) then
-					self:SetHealthBarColor (.5, .5, .5)
-					return
-				end
-
-				--is a friendly or enemy player?
-				if (UnitIsFriend ("player", unit)) then
-					if (self.Settings.UseFriendlyClassColor) then
-						local _, className = UnitClass(unit)
-						if (className) then
-							local classColor = RAID_CLASS_COLORS [className]
-							if (classColor) then
-								self:SetHealthBarColor (classColor.r, classColor.g, classColor.b)
-								return
-							end
-						end
-					else
-						self:SetHealthBarColor (0, 1, 0)
-						return
-					end
-				else
-					if (self.Settings.UseEnemyClassColor) then
-						local _, className = UnitClass(unit)
-						if (className) then
-							local classColor = RAID_CLASS_COLORS [className]
-							if (classColor) then
-								self:SetHealthBarColor (classColor.r, classColor.g, classColor.b)
-								return
-							end
-						end
-					else
-						self:SetHealthBarColor (1, 0, 0)
-						return
-					end
-				end
-			end
-
-			--is tapped?
-			if (isUnitTapDenied (unit)) then
-				self:SetHealthBarColor (.6, .6, .6)
-				return
-			end
-
-			--is this is a npc attacking the player?
-			if (self.Settings.ColorByAggro) then
-				local _, threatStatus = UnitDetailedThreatSituation ("player", unit)
-				if (threatStatus) then
-					self:SetHealthBarColor (1, 0, 0)
-					return
-				end
-			end
-
-			-- get the regular color by selection
-			r, g, b = UnitSelectionColor (unit)
-			self:SetHealthBarColor (r, g, b)
-		end,
-
-		--misc
-		UpdateName = function(self)
-			if (not self.Settings.ShowUnitName) then
-				return
-			end
-
-			--unit name without realm names by default
-			local name = UnitName (self.unit)
-			self.unitName:SetText(name)
-			self.unitName:Show()
-		end,
-
-		--this runs when the player it self changes its target, need to update the current target overlay
-		--todo: add focus overlay
-		UpdateTargetOverlay = function(self)
-			if (not self.Settings.ShowTargetOverlay) then
-				self.targetOverlay:Hide()
-				return
-			end
-
-			if (UnitIsUnit(self.displayedUnit, "target")) then
-				self.targetOverlay:Show()
-			else
-				self.targetOverlay:Hide()
-			end
-		end,
-
-		UpdateAllWidgets = function(self)
-			if (UnitExists(self.displayedUnit)) then
-				local unit = self.unit
-				local displayedUnit = self.displayedUnit
-
-				self:SetUnit(unit, displayedUnit)
-
-				--is using castbars?
-				if (self.Settings.ShowCastBar) then
-					self.castBar:SetUnit(unit, displayedUnit)
-				end
-
-				--is using powerbars?
-				if (self.Settings.ShowPowerBar) then
-					self.powerBar:SetUnit(unit, displayedUnit)
-				end
-
-				self:UpdateName()
-				self:UpdateTargetOverlay()
-				self:UpdateHealthColor()
-			end
-		end,
-
-		--update the unit frame and its widgets
-		UpdateUnitFrame = function(self)
-			local unitInVehicle = self:CheckVehiclePossession()
-
-			--if the unit is inside a vehicle, the vehicle possession function will call an update on all widgets
-			if (not unitInVehicle) then
-				self:UpdateAllWidgets()
-			end
-		end,
-
-		--event handles
-		PLAYER_ENTERING_WORLD = function(self, ...)
-			self:UpdateUnitFrame()
-		end,
-
-		--update overlays when the player changes its target
-		PLAYER_TARGET_CHANGED = function(self, ...)
-			self:UpdateTargetOverlay()
-		end,
-
-		--unit received a name update
-		UNIT_NAME_UPDATE = function(self, ...)
-			self:UpdateName()
-		end,
-
-		--this is registered only if .settings.ColorByAggro is true
-		UNIT_THREAT_LIST_UPDATE = function(self, ...)
-			if (self.Settings.ColorByAggro) then
-				self:UpdateHealthColor()
-			end
-		end,
-
-		--vehicle
-		UNIT_ENTERED_VEHICLE = function(self, ...)
-			self:UpdateUnitFrame()
-		end,
-		UNIT_EXITED_VEHICLE = function(self, ...)
-			self:UpdateUnitFrame()
-		end,
-
-		--pet
-		UNIT_PET = function(self, ...)
-			self:UpdateUnitFrame()
-		end,
-
-		--player connection
-		UNIT_CONNECTION = function(self, ...)
-			if (UnitIsConnected (self.unit)) then
-				self:UpdateUnitFrame()
-			end
-		end,
-		PARTY_MEMBER_ENABLE = function(self, ...)
-			if (UnitIsConnected (self.unit)) then
-				self:UpdateName()
-			end
-		end,
-	}
-
--- ~unitframe
-local globalBaseFrameLevel = 1 -- to be increased + used across each new plate
-function detailsFramework:CreateUnitFrame(parent, name, unitFrameSettingsOverride, healthBarSettingsOverride, castBarSettingsOverride, powerBarSettingsOverride)
-	local parentName = name or ("DetailsFrameworkUnitFrame" .. tostring(math.random(1, 100000000)))
-
-	--create the main unit frame
-	local mewUnitFrame = CreateFrame("button", parentName, parent, "BackdropTemplate")
-
-	--base level
-	--local baseFrameLevel = f:GetFrameLevel()
-	local baseFrameLevel = globalBaseFrameLevel
-	globalBaseFrameLevel = globalBaseFrameLevel + 50
-
-	mewUnitFrame:SetFrameLevel(baseFrameLevel)
-
-	--create the healthBar
-	local healthBar = detailsFramework:CreateHealthBar(mewUnitFrame, false, healthBarSettingsOverride)
-	healthBar:SetFrameLevel(baseFrameLevel + 1)
-	mewUnitFrame.healthBar = healthBar
-
-	--create the power bar
-	local powerBar = detailsFramework:CreatePowerBar(mewUnitFrame, false, powerBarSettingsOverride)
-	powerBar:SetFrameLevel(baseFrameLevel + 2)
-	mewUnitFrame.powerBar = powerBar
-
-	--create the castBar
-	local castBar = detailsFramework:CreateCastBar(mewUnitFrame, false, castBarSettingsOverride)
-	castBar:SetFrameLevel(baseFrameLevel + 3)
-	mewUnitFrame.castBar = castBar
-
-	--border frame
-	local borderFrame = detailsFramework:CreateBorderFrame(mewUnitFrame, mewUnitFrame:GetName() .. "Border")
-	borderFrame:SetFrameLevel(mewUnitFrame:GetFrameLevel() + 5)
-	mewUnitFrame.border = borderFrame
-
-	--overlay frame (widgets that need to stay above the unit frame)
-	local overlayFrame = CreateFrame("frame", "$parentOverlayFrame", mewUnitFrame, "BackdropTemplate")
-	overlayFrame:SetFrameLevel(mewUnitFrame:GetFrameLevel() + 6)
-	mewUnitFrame.overlayFrame = overlayFrame
-
-	--unit frame layers
-		do
-			--artwork
-			mewUnitFrame.unitName = mewUnitFrame:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
-			PixelUtil.SetPoint(mewUnitFrame.unitName, "topleft", healthBar, "topleft", 2, -2, 1, 1)
-
-			--target overlay - it's parented in the healthbar so other widgets won't get the overlay
-			mewUnitFrame.targetOverlay = overlayFrame:CreateTexture(nil, "artwork")
-			mewUnitFrame.targetOverlay:SetTexture(healthBar:GetTexture())
-			mewUnitFrame.targetOverlay:SetBlendMode("ADD")
-			mewUnitFrame.targetOverlay:SetAlpha(.5)
-			mewUnitFrame.targetOverlay:SetAllPoints(healthBar)
-		end
-
-	--mixins
-		--inject mixins
-		detailsFramework:Mixin(mewUnitFrame, detailsFramework.UnitFrameFunctions)
-
-		--create the settings table and copy the overrides into it, the table is set into the frame after the mixin
-		local unitFrameSettings = detailsFramework.table.copy({}, detailsFramework.UnitFrameFunctions.Settings)
-		if (unitFrameSettingsOverride) then
-			unitFrameSettings = detailsFramework.table.copy(unitFrameSettings, unitFrameSettingsOverride)
-		end
-		mewUnitFrame.Settings = unitFrameSettings
-
-	--initialize scripts
-		--unitframe
-		mewUnitFrame:Initialize()
-
-	return mewUnitFrame
-end
-
-
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --horizontal scroll frame
 
diff --git a/Libs/DF/savedvars.lua b/Libs/DF/savedvars.lua
index 8aecc490..11acdbb5 100644
--- a/Libs/DF/savedvars.lua
+++ b/Libs/DF/savedvars.lua
@@ -1,219 +1,132 @@
 
 --stopped doing the duplicate savedTable
 
-local DF = _G ["DetailsFramework"]
-if (not DF or not DetailsFrameworkCanLoad) then
+local detailsFramework = _G ["DetailsFramework"]
+if (not detailsFramework or not DetailsFrameworkCanLoad) then
 	return
 end
 
+local _
+local CONST_DEFAULT_PROFILE_NAME = "default"
+
+local UnitGUID = UnitGUID
+
 --create namespace
-DF.SavedVars = {}
+detailsFramework.SavedVars = {}
 
-function DF.SavedVars.CreateNewSavedTable(dbTable, savedTableName)
-    local defaultVars = dbTable.defaultSavedVars
-    local newSavedTable = DF.table.deploy({}, defaultVars)
+---get the saved variables table for the addon
+---@param addonObject df_addon the addon frame created by detailsFramework:CreateNewAddOn()
+---@return table
+function detailsFramework.SavedVars.GetSavedVariables(addonObject)
+    assert(type(addonObject) == "table", "SetProfile: addonObject must be a table.")
 
-    dbTable.profiles[savedTableName] = newSavedTable
-    return newSavedTable
-end
+	if (addonObject.__savedGlobalVarsName) then
+        local savedVariables = _G[addonObject.__savedGlobalVarsName]
 
-function DF.SavedVars.GetOrCreateAddonSavedTablesPlayerList(addonFrame)
-    local addonGlobalSavedTable = _G[addonFrame.__savedVarsName]
-
-    --player list
-    local playerList = addonGlobalSavedTable.__savedVarsByGUID
-    if (not playerList) then
-        addonGlobalSavedTable.__savedVarsByGUID = {}
-    end
-
-    --saved variables table
-    if (not addonGlobalSavedTable.__savedVars) then
-        addonGlobalSavedTable.__savedVars = {}
-    end
-
-    return addonGlobalSavedTable.__savedVarsByGUID
-end
-
---addon statup
-function DF.SavedVars.LoadSavedVarsForPlayer(addonFrame)
-    local playerSerial = UnitGUID("player")
-
-    --savedTableObject is equivalent of "addon.db"
-    local dbTable = DF.SavedVars.CreateSavedVarsTable(addonFrame, addonFrame.__savedVarsDefaultTemplate)
-    addonFrame.__savedVarsDefaultTemplate = nil
-    addonFrame.db = dbTable
-
-    --load players list
-    local savedVarsName = DF.SavedVars.GetOrCreateAddonSavedTablesPlayerList(addonFrame)
-
-    local playerSavedTableName = savedVarsName[playerSerial]
-    if (not playerSavedTableName) then
-        savedVarsName[playerSerial] = "Default"
-        playerSavedTableName = savedVarsName[playerSerial]
-    end
-
-    local savedTable = addonFrame.db:GetSavedTable(playerSavedTableName)
-    if (not savedTable) then
-        --create a new saved table for this character
-        savedTable = addonFrame.db:CreateNewSavedTable(playerSavedTableName)
-    end
-
-    DF.SavedVars.SetSavedTable(dbTable, playerSavedTableName, true, true)
-    return savedTable
-end
-
-function DF.SavedVars.TableCleanUpRecursive(t, default)
-    for key, value in pairs(t) do
-        if (type(value) == "table") then
-            DF.SavedVars.TableCleanUpRecursive(value, default[key])
-        else
-            if (value == default[key]) then
-                t[key] = nil
+        --check if the saved variables table is created, if not create one
+        if (not savedVariables) then
+            if (addonObject.__savedVarsDefaultTemplate) then
+                savedVariables = {
+                    profiles = {
+                        --store profiles created from the 'savedVarsTemplate'
+                        [CONST_DEFAULT_PROFILE_NAME] = detailsFramework.table.deploy({}, addonObject.__savedVarsDefaultTemplate)
+                    },
+                    profile_ids = {} --store the profile id for each character using its GUID
+                }
+            else
+                savedVariables = {}
             end
-        end
-    end
-end
 
-function DF.SavedVars.CloseSavedTable(dbTable)
-    local currentSavedTable = dbTable:GetSavedTable(dbTable:GetCurrentSavedTableName())
-
-    local default = dbTable.defaultSavedVars
-    if (type(currentSavedTable) == "table") then
-        DF.SavedVars.TableCleanUpRecursive(currentSavedTable, default)
-
-        --save
-        local addonGlobalSavedTable = _G[dbTable.addonFrame.__savedVarsName]
-        addonGlobalSavedTable.__savedVars[dbTable:GetCurrentSavedTableName()] = currentSavedTable
-    end
-end
-
---base functions
-function DF.SavedVars.SetSavedTable(dbTable, savedTableName, createIfNonExistant, isFromInit)
-    local savedTableToBeApplied = dbTable:GetSavedTable(savedTableName)
-
-    if (savedTableToBeApplied) then
-        if (not isFromInit) then
-            --callback unload profile table
-            local currentSavedTable = dbTable:GetSavedTable(dbTable:GetCurrentSavedTableName())
-            dbTable:TriggerCallback("OnProfileUnload", currentSavedTable)
-            DF.SavedVars.CloseSavedTable(dbTable, currentSavedTable)
+            --set the table to be global savedVariables
+            _G[addonObject.__savedGlobalVarsName] = savedVariables
         end
 
-        dbTable.profile = savedTableToBeApplied
-        dbTable.currentSavedTableName = savedTableName
-
-        dbTable:TriggerCallback("OnProfileLoad", savedTableToBeApplied)
-
-    else
-        if (createIfNonExistant) then
-            local newSavedTable = dbTable:CreateNewSavedTable(savedTableName)
-
-            --callback unload profile table
-            local currentSavedTable = dbTable:GetSavedTable(dbTable:GetCurrentSavedTableName())
-            dbTable:TriggerCallback("OnProfileUnload", currentSavedTable)
-            DF.SavedVars.CloseSavedTable(dbTable, currentSavedTable)
-
-            dbTable.profile = newSavedTable
-            dbTable.currentSavedTableName = savedTableName
-            dbTable:TriggerCallback("OnProfileLoad", newSavedTable)
-        else
-            DF:Msg("profile does not exists", savedTableName)
-            return
-        end
-    end
-end
-
-function DF.SavedVars.GetSavedTables(dbTable)
-    return dbTable.profiles
-end
-
-function DF.SavedVars.GetSavedTable(dbTable, savedTableName)
-    local profiles = dbTable:GetSavedTables()
-    return profiles[savedTableName]
-end
-
-function DF.SavedVars.GetCurrentSavedTableName(dbTable)
-    return dbTable.currentSavedTableName
-end
-
---duplicate savedTable
-function DF.SavedVars.DuplicateSavedTable(dbTable, savedTableName)
-    local originalSavedTable = dbTable:GetSavedTable(savedTableName)
-    if (originalSavedTable) then
-        local newSavedTable = DF.table.copy({}, originalSavedTable)
-
-    end
-end
-
---callbacks
-function DF.SavedVars.TriggerCallback(dbTable, callbackName, savedTable)
-    local registeredCallbacksTable = dbTable.registeredCallbacks[callbackName]
-    for i = 1, #registeredCallbacksTable do
-        local callback = registeredCallbacksTable[i]
-        DF:CoreDispatch(dbTable.addonFrame.__name, callback.func, savedTable, unpack(callback.payload))
-    end
-end
-
-function DF.SavedVars.RegisterCallback(dbTable, callbackName, func, ...)
-    local registeredCallbacksTable = dbTable.registeredCallbacks[callbackName]
-    if (registeredCallbacksTable) then
-        --check for duplicates
-        for i = 1, #registeredCallbacksTable do
-            if (registeredCallbacksTable[i].func == func) then
-                return
-            end
+        if (not savedVariables.profiles) then
+            savedVariables.profiles = {
+                profiles = {
+                    --store profiles created from the 'savedVarsTemplate'
+                    [CONST_DEFAULT_PROFILE_NAME] = detailsFramework.table.deploy({}, addonObject.__savedVarsDefaultTemplate)
+                }
+            }
         end
 
-        --register
-        registeredCallbacksTable[#registeredCallbacksTable+1] = {func = func, payload = {...}}
-
-        return true
-    end
-end
-
-function DF.SavedVars.UnregisterCallback(dbTable, callbackName, func)
-    local registeredCallbacksTable = dbTable.registeredCallbacks[callbackName]
-    if (registeredCallbacksTable) then
-        for i = 1, #registeredCallbacksTable do
-            if (registeredCallbacksTable[i].func == func) then
-                tremove(registeredCallbacksTable, i)
-                return true
-            end
+        if (not savedVariables.profile_ids) then
+            savedVariables.profile_ids = {}
         end
+
+		return savedVariables
+	end
+
+    return {}
+end
+
+
+---@param addonObject df_addon the addon frame created by detailsFramework:CreateNewAddOn()
+---@param bCreateIfNotFound boolean|nil if true, create the profile if it doesn't exist
+---@param profileToCopyFrom profile|nil if bCreateIfNotFound is true, copy the profile from this profile
+function detailsFramework.SavedVars.GetProfile(addonObject, bCreateIfNotFound, profileToCopyFrom)
+    assert(type(addonObject) == "table", "GetProfile: addonObject must be a table.")
+
+    local savedVariables = detailsFramework.SavedVars.GetSavedVariables(addonObject)
+    local playerProfileName = savedVariables.profile_ids[UnitGUID("player")] --get the profile name from the player guid
+    local profileTable = savedVariables.profiles[playerProfileName]
+
+    if (not profileTable and bCreateIfNotFound) then
+        profileTable = {}
+
+        if (profileToCopyFrom) then
+            --profileToCopyFrom has been cleaned at this point and only have values set by the user
+            profileTable = detailsFramework.table.deploy(profileTable, profileToCopyFrom)
+        end
+
+        --as deploy does not overwrite existing values, it won't overwrite the values set by 'profileToCopyFrom'
+        profileTable = detailsFramework.table.deploy(profileTable, addonObject.__savedVarsDefaultTemplate)
+        savedVariables.profiles[playerProfileName] = profileTable
+    end
+
+    return profileTable
+end
+
+---@param addonObject df_addon the addon frame created by detailsFramework:CreateNewAddOn()
+---@param profileName profilename the name of the profile to set
+---@param bCopyFromCurrentProfile boolean if true, copy the current profile to the new profile
+function detailsFramework.SavedVars.SetProfile(addonObject, profileName, bCopyFromCurrentProfile)
+    assert(type(addonObject) == "table", "SetProfile: addonObject must be a table.")
+    assert(type(profileName) == "string", "SetProfile: profileName must be a string.")
+
+    ---@type profile
+    local currentProfile = detailsFramework.SavedVars.GetProfile(addonObject)
+    --save the current profile
+    detailsFramework.SavedVars.SaveProfile(addonObject)
+
+    --set the new profile
+    local savedVariables = detailsFramework.SavedVars.GetSavedVariables(addonObject)
+    local playerGUID = UnitGUID("player")
+    savedVariables.profile_ids[playerGUID] = profileName
+
+    local bCreateIfNotFound = true
+
+    --get the new profile creating if doesn't exist
+    ---@type profile
+    local profileTable = detailsFramework.SavedVars.GetProfile(addonObject, bCreateIfNotFound, bCopyFromCurrentProfile and currentProfile or nil)
+
+    if (addonObject.OnProfileChanged) then
+        detailsFramework:Dispatch(addonObject.OnProfileChanged, addonObject, profileTable)
     end
 end
 
-function DF.SavedVars.CreateSavedVarsTable(addonFrame, templateTable)
-    local dbTable = {
-        profiles = {},
-        defaultSavedVars = templateTable,
-        currentSavedTableName = "",
-        addonFrame = addonFrame,
+---@param addonObject df_addon the addon frame created by detailsFramework:CreateNewAddOn()
+function detailsFramework.SavedVars.SaveProfile(addonObject)
+    assert(type(addonObject) == "table", "SetProfile: addonObject must be a table.")
 
-        --methods
-        GetSavedTable = DF.SavedVars.GetSavedTable,
-        SetSavedTable = DF.SavedVars.SetSavedTable,
-        GetSavedTables = DF.SavedVars.GetSavedTables,
-        GetCurrentSavedTableName = DF.SavedVars.GetCurrentSavedTableName,
-        CreateNewSavedTable = DF.SavedVars.CreateNewSavedTable,
-        TriggerCallback = DF.SavedVars.TriggerCallback,
+    --the current profile in use
+    local profileTable = detailsFramework.SavedVars.GetProfile(addonObject)
+    --profile template or "default profile"
+    local profileTemplate = addonObject.__savedVarsDefaultTemplate
 
-        --back compatibility with ace3DB
-        GetCurrentProfile = DF.SavedVars.GetCurrentSavedTableName,
-        GetProfile = DF.SavedVars.GetSavedTable,
-        GetProfiles = DF.SavedVars.GetSavedTables,
-        SetProfile = DF.SavedVars.SetSavedTable,
-        RegisterCallback = DF.SavedVars.RegisterCallback,
-
-        registeredCallbacks = {
-            ["OnProfileLoad"]  = {},
-            ["OnProfileUnload"]  = {},
-            ["OnProfileCopied"]  = {},
-            ["OnProfileReset"]  = {},
-            ["OnDatabaseLoad"]  = {},
-            ["OnDatabaseShutdown"]  = {},
-        },
-    }
-
-    return dbTable
-end
+    --if the addon has a default template, remove the keys which are the same as the default template
+    --these keys haven't been changed by the user, hence doesn't need to save them
+    if (profileTemplate) then
+        detailsFramework.table.removeduplicate(profileTable, addonObject.__savedVarsDefaultTemplate)
+    end
+end
\ No newline at end of file
diff --git a/Libs/DF/slider.lua b/Libs/DF/slider.lua
index 8460a1c9..cc59d30e 100644
--- a/Libs/DF/slider.lua
+++ b/Libs/DF/slider.lua
@@ -427,11 +427,10 @@ DF:Mixin(DFSliderMetaFunctions, DF.ScriptHookMixin)
 	buttonPlus:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
 	buttonMinor:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
 
-	local plusNormalTexture = buttonPlus:GetNormalTexture()
-	plusNormalTexture:SetDesaturated(true)
-
-	local minorNormalTexture = buttonMinor:GetNormalTexture()
-	minorNormalTexture:SetDesaturated(true)
+	C_Timer.After(0, function()
+		DF:SetButtonTexture(buttonPlus, "AlliedRace-UnlockingFrame-ZoomIn")
+		DF:SetButtonTexture(buttonMinor, "AlliedRace-UnlockingFrame-ZoomOut")
+	end)
 
 	buttonMinor:ClearAllPoints()
 	buttonPlus:ClearAllPoints()
@@ -441,6 +440,9 @@ DF:Mixin(DFSliderMetaFunctions, DF.ScriptHookMixin)
 	buttonPlus:SetSize(16, 16)
 	buttonMinor:SetSize(16, 16)
 
+	buttonPlus:SetAlpha(0.834)
+	buttonMinor:SetAlpha(0.834)
+
 	--increate the value on pressing the button or holding the button pressed
 	local buttonPlusOnClick = function()
 		local sliderObject = sliderButtonsParentFrame.host
diff --git a/Libs/DF/unitframe.lua b/Libs/DF/unitframe.lua
new file mode 100644
index 00000000..a6262c19
--- /dev/null
+++ b/Libs/DF/unitframe.lua
@@ -0,0 +1,2286 @@
+
+local detailsFramework = _G["DetailsFramework"]
+
+if (not detailsFramework or not DetailsFrameworkCanLoad) then
+	return
+end
+
+local _
+--lua locals
+local rawset = rawset --lua local
+local rawget = rawget --lua local
+local setmetatable = setmetatable --lua local
+local unpack = table.unpack or unpack --lua local
+local type = type --lua local
+local floor = math.floor --lua local
+local loadstring = loadstring --lua local
+local CreateFrame = CreateFrame
+
+local UnitHealth = UnitHealth
+local UnitHealthMax = UnitHealthMax
+local UnitGetIncomingHeals = UnitGetIncomingHeals
+local UnitGetTotalHealAbsorbs = UnitGetTotalHealAbsorbs
+local UnitGetTotalAbsorbs = UnitGetTotalAbsorbs
+local UnitPowerMax = UnitPowerMax
+local UnitPower = UnitPower
+local UnitPowerBarID = UnitPowerBarID
+local GetUnitPowerBarInfoByID = GetUnitPowerBarInfoByID
+local IsInGroup = IsInGroup
+local UnitPowerType = UnitPowerType
+local UnitIsConnected = UnitIsConnected
+local max = math.max
+local min = math.min
+local abs = math.abs
+
+local IS_WOW_PROJECT_MAINLINE = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
+local IS_WOW_PROJECT_NOT_MAINLINE = WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE
+local IS_WOW_PROJECT_CLASSIC_ERA = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
+
+local CastInfo = detailsFramework.CastInfo
+
+local PixelUtil = PixelUtil or DFPixelUtil
+
+local UnitGroupRolesAssigned = detailsFramework.UnitGroupRolesAssigned
+local cleanfunction = function() end
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--health bar frame
+
+--[=[
+	DF:CreateHealthBar (parent, name, settingsOverride)
+	creates a health bar to show an unit health
+	@parent = frame to pass for the CreateFrame function
+	@name = absolute name of the frame, if omitted it uses the parent's name .. "HealthBar"
+	@settingsOverride = table with keys and values to replace the defaults from the framework
+
+	methods:
+	healthbar:SetUnit(unit)
+	healthBar:GetTexture()
+	healthBar:SetTexture(texture)
+--]=]
+
+
+--healthBar meta prototype
+	local healthBarMetaPrototype = {
+		WidgetType = "healthBar",
+		dversion = detailsFramework.dversion,
+	}
+
+	--check if there's a metaPrototype already existing
+	if (_G[detailsFramework.GlobalWidgetControlNames["healthBar"]]) then
+		--get the already existing metaPrototype
+		local oldMetaPrototype = _G[detailsFramework.GlobalWidgetControlNames ["healthBar"]]
+		--check if is older
+		if ( (not oldMetaPrototype.dversion) or (oldMetaPrototype.dversion < detailsFramework.dversion) ) then
+			--the version is older them the currently loading one
+			--copy the new values into the old metatable
+			for funcName, _ in pairs(healthBarMetaPrototype) do
+				oldMetaPrototype[funcName] = healthBarMetaPrototype[funcName]
+			end
+		end
+	else
+		--first time loading the framework
+		_G[detailsFramework.GlobalWidgetControlNames["healthBar"]] = healthBarMetaPrototype
+	end
+
+	local healthBarMetaFunctions = _G[detailsFramework.GlobalWidgetControlNames["healthBar"]]
+	detailsFramework:Mixin(healthBarMetaFunctions, detailsFramework.ScriptHookMixin)
+
+--hook list
+	local defaultHooksForHealthBar = {
+		OnHide = {},
+		OnShow = {},
+		OnHealthChange = {},
+		OnHealthMaxChange = {},
+	}
+
+	--use the hook already existing
+	healthBarMetaFunctions.HookList = healthBarMetaFunctions.HookList or defaultHooksForHealthBar
+	--copy the non existing values from a new version to the already existing hook table
+	detailsFramework.table.deploy(healthBarMetaFunctions.HookList, defaultHooksForHealthBar)
+
+--Health Bar Meta Functions
+
+	--health bar settings
+	healthBarMetaFunctions.Settings = {
+		CanTick = false, --if true calls the method 'OnTick' every tick, the function needs to be overloaded, it receives self and deltaTime as parameters
+		ShowHealingPrediction = true, --when casting a healing pass, show the amount of health that spell will heal
+		ShowShields = true, --indicator of the amount of damage absortion the unit has
+
+		--appearance
+		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
+		Texture = [[Interface\RaidFrame\Raid-Bar-Hp-Fill]],
+		ShieldIndicatorTexture = [[Interface\RaidFrame\Shield-Fill]],
+		ShieldGlowTexture = [[Interface\RaidFrame\Shield-Overshield]],
+		ShieldGlowWidth = 16,
+
+		--default size
+		Width = 100,
+		Height = 20,
+	}
+
+	healthBarMetaFunctions.HealthBarEvents = {
+		{"PLAYER_ENTERING_WORLD"},
+		{"UNIT_HEALTH", true},
+		{"UNIT_MAXHEALTH", true},
+		{(IS_WOW_PROJECT_NOT_MAINLINE) and "UNIT_HEALTH_FREQUENT", true}, -- this one is classic-only...
+		{"UNIT_HEAL_PREDICTION", true},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_ABSORB_AMOUNT_CHANGED", true},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_HEAL_ABSORB_AMOUNT_CHANGED", true},
+	}
+
+	--setup the castbar to be used by another unit
+	healthBarMetaFunctions.SetUnit = function(self, unit, displayedUnit)
+		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
+
+			self.unit = unit
+			self.displayedUnit = displayedUnit or unit
+
+			--register events
+			if (unit) then
+				self.currentHealth = UnitHealth(unit) or 0
+				self.currentHealthMax = UnitHealthMax(unit) or 0
+
+				for _, eventTable in ipairs(self.HealthBarEvents) do
+					local event = eventTable [1]
+					local isUnitEvent = eventTable [2]
+					if event then
+						if (isUnitEvent) then
+							self:RegisterUnitEvent (event, self.displayedUnit, self.unit)
+						else
+							self:RegisterEvent(event)
+						end
+					end
+				end
+
+				--check for settings and update some events
+				if (not self.Settings.ShowHealingPrediction) then
+					self:UnregisterEvent ("UNIT_HEAL_PREDICTION")
+					if IS_WOW_PROJECT_MAINLINE then
+						self:UnregisterEvent ("UNIT_HEAL_ABSORB_AMOUNT_CHANGED")
+					end
+					self.incomingHealIndicator:Hide()
+					self.healAbsorbIndicator:Hide()
+				end
+				if (not self.Settings.ShowShields) then
+					if IS_WOW_PROJECT_MAINLINE then
+						self:UnregisterEvent ("UNIT_ABSORB_AMOUNT_CHANGED")
+					end
+					self.shieldAbsorbIndicator:Hide()
+					self.shieldAbsorbGlow:Hide()
+				end
+
+				--set scripts
+				self:SetScript("OnEvent", self.OnEvent)
+
+				if (self.Settings.CanTick) then
+					self:SetScript("OnUpdate", self.OnTick)
+				end
+
+				self:PLAYER_ENTERING_WORLD (self.unit, self.displayedUnit)
+			else
+				--remove all registered events
+				for _, eventTable in ipairs(self.HealthBarEvents) do
+					local event = eventTable [1]
+					if event then
+						self:UnregisterEvent (event)
+					end
+				end
+
+				--remove scripts
+				self:SetScript("OnEvent", nil)
+				self:SetScript("OnUpdate", nil)
+				self:Hide()
+			end
+		end
+	end
+
+	healthBarMetaFunctions.Initialize = function(self)
+		PixelUtil.SetWidth (self, self.Settings.Width, 1)
+		PixelUtil.SetHeight(self, self.Settings.Height, 1)
+
+		self:SetTexture(self.Settings.Texture)
+
+		self.background:SetAllPoints()
+		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
+
+		--setpoint of these widgets are set inside the function that updates the incoming heal
+		self.incomingHealIndicator:SetTexture(self:GetTexture())
+		self.healAbsorbIndicator:SetTexture(self:GetTexture())
+		self.healAbsorbIndicator:SetVertexColor(.1, .8, .8)
+		self.shieldAbsorbIndicator:SetTexture(self.Settings.ShieldIndicatorTexture, true, true)
+
+		self.shieldAbsorbGlow:SetWidth(self.Settings.ShieldGlowWidth)
+		self.shieldAbsorbGlow:SetTexture(self.Settings.ShieldGlowTexture)
+		self.shieldAbsorbGlow:SetBlendMode("ADD")
+		self.shieldAbsorbGlow:SetPoint("topright", self, "topright", 8, 0)
+		self.shieldAbsorbGlow:SetPoint("bottomright", self, "bottomright", 8, 0)
+		self.shieldAbsorbGlow:Hide()
+
+		self:SetUnit(nil)
+	end
+
+	--call every tick
+	healthBarMetaFunctions.OnTick = function(self, deltaTime) end --if overrided, set 'CanTick' to true on the settings table
+
+	--when an event happen for this unit, send it to the apropriate function
+	healthBarMetaFunctions.OnEvent = function(self, event, ...)
+		local eventFunc = self [event]
+		if (eventFunc) then
+			--the function doesn't receive which event was, only 'self' and the parameters
+			eventFunc (self, ...)
+		end
+	end
+
+	--when the unit max health is changed
+	healthBarMetaFunctions.UpdateMaxHealth = function(self)
+		local maxHealth = UnitHealthMax (self.displayedUnit)
+		self:SetMinMaxValues(0, maxHealth)
+		self.currentHealthMax = maxHealth
+
+		self:RunHooksForWidget("OnHealthMaxChange", self, self.displayedUnit)
+	end
+
+	healthBarMetaFunctions.UpdateHealth = function(self)
+		-- update max health regardless to avoid weird wrong values on UpdateMaxHealth sometimes
+		-- local maxHealth = UnitHealthMax (self.displayedUnit)
+		-- self:SetMinMaxValues(0, maxHealth)
+		-- self.currentHealthMax = maxHealth
+
+		self.oldHealth = self.currentHealth
+		local health = UnitHealth(self.displayedUnit)
+		self.currentHealth = health
+		PixelUtil.SetStatusBarValue(self, health)
+
+		self:RunHooksForWidget("OnHealthChange", self, self.displayedUnit)
+	end
+
+	--health and absorbs prediction
+	healthBarMetaFunctions.UpdateHealPrediction = function(self)
+		local currentHealth = self.currentHealth
+		local currentHealthMax = self.currentHealthMax
+		local healthPercent = currentHealth / currentHealthMax
+
+		if (not currentHealthMax or currentHealthMax <= 0) then
+			return
+		end
+
+		--order is: the health of the unit > damage absorb > heal absorb > incoming heal
+		local width = self:GetWidth()
+
+		if (self.Settings.ShowHealingPrediction) then
+			--incoming heal on the unit from all sources
+			local unitHealIncoming = self.displayedUnit and UnitGetIncomingHeals(self.displayedUnit) or 0
+			--heal absorbs
+			local unitHealAbsorb = IS_WOW_PROJECT_MAINLINE and self.displayedUnit and UnitGetTotalHealAbsorbs(self.displayedUnit) or 0
+
+			if (unitHealIncoming > 0) then
+				--calculate what is the percent of health incoming based on the max health the player has
+				local incomingPercent = unitHealIncoming / currentHealthMax
+				self.incomingHealIndicator:Show()
+				self.incomingHealIndicator:SetWidth(max(1, min (width * incomingPercent, abs(healthPercent - 1) * width)))
+				self.incomingHealIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
+				self.incomingHealIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
+			else
+				self.incomingHealIndicator:Hide()
+			end
+
+			if (unitHealAbsorb > 0) then
+				local healAbsorbPercent = unitHealAbsorb / currentHealthMax
+				self.healAbsorbIndicator:Show()
+				self.healAbsorbIndicator:SetWidth(max(1, min (width * healAbsorbPercent, abs(healthPercent - 1) * width)))
+				self.healAbsorbIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
+				self.healAbsorbIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
+			else
+				self.healAbsorbIndicator:Hide()
+			end
+		end
+
+		if (self.Settings.ShowShields and IS_WOW_PROJECT_MAINLINE) then
+			--damage absorbs
+			local unitDamageAbsorb = self.displayedUnit and UnitGetTotalAbsorbs (self.displayedUnit) or 0
+
+			if (unitDamageAbsorb > 0) then
+				local damageAbsorbPercent = unitDamageAbsorb / currentHealthMax
+				self.shieldAbsorbIndicator:Show()
+				--set the width where the max width size is what is lower: the absorb size or the missing amount of health in the health bar
+				--/dump NamePlate1PlaterUnitFrameHealthBar.shieldAbsorbIndicator:GetSize()
+				self.shieldAbsorbIndicator:SetWidth(max(1, min (width * damageAbsorbPercent, abs(healthPercent - 1) * width)))
+				self.shieldAbsorbIndicator:SetPoint("topleft", self, "topleft", width * healthPercent, 0)
+				self.shieldAbsorbIndicator:SetPoint("bottomleft", self, "bottomleft", width * healthPercent, 0)
+
+				--if the absorb percent pass 100%, show the glow
+				if ((healthPercent + damageAbsorbPercent) > 1) then
+					self.shieldAbsorbGlow:Show()
+				else
+					self.shieldAbsorbGlow:Hide()
+				end
+			else
+				self.shieldAbsorbIndicator:Hide()
+				self.shieldAbsorbGlow:Hide()
+			end
+		else
+			self.shieldAbsorbIndicator:Hide()
+			self.shieldAbsorbGlow:Hide()
+		end
+	end
+
+	--Health Events
+		healthBarMetaFunctions.PLAYER_ENTERING_WORLD = function(self, ...)
+			self:UpdateMaxHealth()
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+		healthBarMetaFunctions.UNIT_HEALTH = function(self, ...)
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+		healthBarMetaFunctions.UNIT_HEALTH_FREQUENT = function(self, ...)
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+		healthBarMetaFunctions.UNIT_MAXHEALTH = function(self, ...)
+			self:UpdateMaxHealth()
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+
+		healthBarMetaFunctions.UNIT_HEAL_PREDICTION = function(self, ...)
+			self:UpdateMaxHealth()
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+		healthBarMetaFunctions.UNIT_ABSORB_AMOUNT_CHANGED = function(self, ...)
+			self:UpdateMaxHealth()
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+		healthBarMetaFunctions.UNIT_HEAL_ABSORB_AMOUNT_CHANGED = function(self, ...)
+			self:UpdateMaxHealth()
+			self:UpdateHealth()
+			self:UpdateHealPrediction()
+		end
+
+-- ~healthbar
+function detailsFramework:CreateHealthBar (parent, name, settingsOverride)
+
+	assert(name or parent:GetName(), "DetailsFramework:CreateHealthBar parameter 'name' omitted and parent has no name.")
+
+	local healthBar = CreateFrame("StatusBar", name or (parent:GetName() .. "HealthBar"), parent, "BackdropTemplate")
+		do --layers
+			--background
+			healthBar.background = healthBar:CreateTexture(nil, "background")
+			healthBar.background:SetDrawLayer("background", -6)
+
+			--artwork
+			--healing incoming
+			healthBar.incomingHealIndicator = healthBar:CreateTexture(nil, "artwork")
+			healthBar.incomingHealIndicator:SetDrawLayer("artwork", 4)
+			--current shields on the unit
+			healthBar.shieldAbsorbIndicator =  healthBar:CreateTexture(nil, "artwork")
+			healthBar.shieldAbsorbIndicator:SetDrawLayer("artwork", 5)
+			--debuff absorbing heal
+			healthBar.healAbsorbIndicator = healthBar:CreateTexture(nil, "artwork")
+			healthBar.healAbsorbIndicator:SetDrawLayer("artwork", 6)
+			--the shield fills all the bar, show that cool glow
+			healthBar.shieldAbsorbGlow = healthBar:CreateTexture(nil, "artwork")
+			healthBar.shieldAbsorbGlow:SetDrawLayer("artwork", 7)
+			--statusbar texture
+			healthBar.barTexture = healthBar:CreateTexture(nil, "artwork")
+			healthBar:SetStatusBarTexture(healthBar.barTexture)
+		end
+
+	--mixins
+	detailsFramework:Mixin(healthBar, healthBarMetaFunctions)
+	detailsFramework:Mixin(healthBar, detailsFramework.StatusBarFunctions)
+
+	healthBar:CreateTextureMask()
+	healthBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
+
+	--settings and hooks
+	local settings = detailsFramework.table.copy({}, healthBarMetaFunctions.Settings)
+	if (settingsOverride) then
+		detailsFramework.table.copy(settings, settingsOverride)
+	end
+	healthBar.Settings = settings
+
+	--hook list
+	healthBar.HookList = detailsFramework.table.copy({}, healthBarMetaFunctions.HookList)
+
+	--initialize the cast bar
+	healthBar:Initialize()
+
+	return healthBar
+end
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--power bar frame
+
+--[=[
+	DF:CreatePowerBar (parent, name, settingsOverride)
+	creates statusbar frame to show the unit power bar
+	@parent = frame to pass for the CreateFrame function
+	@name = absolute name of the frame, if omitted it uses the parent's name .. "PPowerBar"
+	@settingsOverride = table with keys and values to replace the defaults from the framework
+--]=]
+
+detailsFramework.PowerFrameFunctions = {
+	WidgetType = "powerBar",
+
+	HookList = {
+		OnHide = {},
+		OnShow = {},
+	},
+
+	Settings = {
+		--misc
+		ShowAlternatePower = true, --if true it'll show alternate power over the regular power the unit uses
+		ShowPercentText = true, --if true show a text with the current energy percent
+		HideIfNoPower = true, --if true and the UnitMaxPower returns zero, it'll hide the power bar with self:Hide()
+		CanTick = false, --if it calls the OnTick function every tick
+
+		--appearance
+		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
+		Texture = [[Interface\RaidFrame\Raid-Bar-Resource-Fill]],
+
+		--default size
+		Width = 100,
+		Height = 20,
+	},
+
+	PowerBarEvents = {
+		{"PLAYER_ENTERING_WORLD"},
+		{"UNIT_DISPLAYPOWER", true},
+		{"UNIT_POWER_BAR_SHOW", true},
+		{"UNIT_POWER_BAR_HIDE", true},
+		{"UNIT_MAXPOWER", true},
+		{"UNIT_POWER_UPDATE", true},
+		{"UNIT_POWER_FREQUENT", true},
+	},
+
+	--setup the castbar to be used by another unit
+	SetUnit = function(self, unit, displayedUnit)
+		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
+			self.unit = unit
+			self.displayedUnit = displayedUnit or unit
+
+			--register events
+			if (unit) then
+				for _, eventTable in ipairs(self.PowerBarEvents) do
+					local event = eventTable [1]
+					local isUnitEvent = eventTable [2]
+
+					if (isUnitEvent) then
+						self:RegisterUnitEvent (event, self.displayedUnit)
+					else
+						self:RegisterEvent(event)
+					end
+				end
+
+				--set scripts
+				self:SetScript("OnEvent", self.OnEvent)
+
+				if (self.Settings.CanTick) then
+					self:SetScript("OnUpdate", self.OnTick)
+				end
+
+				self:Show()
+				self:UpdatePowerBar()
+			else
+				--remove all registered events
+				for _, eventTable in ipairs(self.PowerBarEvents) do
+					local event = eventTable [1]
+					self:UnregisterEvent (event)
+				end
+
+				--remove scripts
+				self:SetScript("OnEvent", nil)
+				self:SetScript("OnUpdate", nil)
+				self:Hide()
+			end
+		end
+	end,
+
+	Initialize = function(self)
+		PixelUtil.SetWidth (self, self.Settings.Width)
+		PixelUtil.SetHeight(self, self.Settings.Height)
+
+		self:SetTexture(self.Settings.Texture)
+
+		self.background:SetAllPoints()
+		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
+
+		if (self.Settings.ShowPercentText) then
+			self.percentText:Show()
+			PixelUtil.SetPoint(self.percentText, "center", self, "center", 0, 0)
+
+			detailsFramework:SetFontSize(self.percentText, 9)
+			detailsFramework:SetFontColor(self.percentText, "white")
+			detailsFramework:SetFontOutline (self.percentText, "OUTLINE")
+		else
+			self.percentText:Hide()
+		end
+
+		self:SetUnit(nil)
+	end,
+
+	--call every tick
+	OnTick = function(self, deltaTime) end, --if overrided, set 'CanTick' to true on the settings table
+
+	--when an event happen for this unit, send it to the apropriate function
+	OnEvent = function(self, event, ...)
+		local eventFunc = self [event]
+		if (eventFunc) then
+			--the function doesn't receive which event was, only 'self' and the parameters
+			eventFunc (self, ...)
+		end
+	end,
+
+	UpdatePowerBar = function(self)
+		self:UpdatePowerInfo()
+		self:UpdateMaxPower()
+		self:UpdatePower()
+		self:UpdatePowerColor()
+	end,
+
+	--power update
+	UpdateMaxPower = function(self)
+		self.currentPowerMax = UnitPowerMax(self.displayedUnit, self.powerType)
+		self:SetMinMaxValues(self.minPower, self.currentPowerMax)
+
+		if (self.currentPowerMax == 0 and self.Settings.HideIfNoPower) then
+			self:Hide()
+		end
+	end,
+	UpdatePower = function(self)
+		self.currentPower = UnitPower(self.displayedUnit, self.powerType)
+		PixelUtil.SetStatusBarValue (self, self.currentPower)
+
+		if (self.Settings.ShowPercentText) then
+			self.percentText:SetText(floor(self.currentPower / self.currentPowerMax * 100) .. "%")
+		end
+	end,
+
+	--when a event different from unit_power_update is triggered, update which type of power the unit should show
+	UpdatePowerInfo = function(self)
+		if (IS_WOW_PROJECT_MAINLINE and self.Settings.ShowAlternatePower) then -- not available in classic
+			local barID = UnitPowerBarID(self.displayedUnit)
+			local barInfo = GetUnitPowerBarInfoByID(barID)
+			--local name, tooltip, cost = GetUnitPowerBarStringsByID(barID);
+			--barInfo.barType,barInfo.minPower, barInfo.startInset, barInfo.endInset, barInfo.smooth, barInfo.hideFromOthers, barInfo.showOnRaid, barInfo.opaqueSpark, barInfo.opaqueFlash, barInfo.anchorTop, name, tooltip, cost, barInfo.ID, barInfo.forcePercentage, barInfo.sparkUnderFrame;
+			if (barInfo and barInfo.showOnRaid and IsInGroup()) then
+				self.powerType = ALTERNATE_POWER_INDEX
+				self.minPower = barInfo.minPower
+				return
+			end
+		end
+
+		self.powerType = UnitPowerType (self.displayedUnit)
+		self.minPower = 0
+	end,
+
+	--tint the bar with the color of the power, e.g. blue for a mana bar
+	UpdatePowerColor = function(self)
+		if (not UnitIsConnected (self.unit)) then
+			self:SetStatusBarColor(.5, .5, .5)
+			return
+		end
+
+		if (self.powerType == ALTERNATE_POWER_INDEX) then
+			--don't change this, keep the same color as the game tints on CompactUnitFrame.lua
+			self:SetStatusBarColor(0.7, 0.7, 0.6)
+			return
+		end
+
+		local powerColor = PowerBarColor [self.powerType] --don't appear to be, but PowerBarColor is a global table with all power colors /run Details:Dump (PowerBarColor)
+		if (powerColor) then
+			self:SetStatusBarColor(powerColor.r, powerColor.g, powerColor.b)
+			return
+		end
+
+		local _, _, r, g, b = UnitPowerType (self.displayedUnit)
+		if (r) then
+			self:SetStatusBarColor(r, g, b)
+			return
+		end
+
+		--if everything else fails, tint as rogue energy
+		powerColor = PowerBarColor ["ENERGY"]
+		self:SetStatusBarColor(powerColor.r, powerColor.g, powerColor.b)
+	end,
+
+	--events
+	PLAYER_ENTERING_WORLD = function(self, ...)
+		self:UpdatePowerBar()
+	end,
+	UNIT_DISPLAYPOWER  = function(self, ...)
+		self:UpdatePowerBar()
+	end,
+	UNIT_POWER_BAR_SHOW = function(self, ...)
+		self:UpdatePowerBar()
+	end,
+	UNIT_POWER_BAR_HIDE = function(self, ...)
+		self:UpdatePowerBar()
+	end,
+
+	UNIT_MAXPOWER = function(self, ...)
+		self:UpdateMaxPower()
+		self:UpdatePower()
+	end,
+	UNIT_POWER_UPDATE = function(self, ...)
+		self:UpdatePower()
+	end,
+	UNIT_POWER_FREQUENT = function(self, ...)
+		self:UpdatePower()
+	end,
+}
+
+detailsFramework:Mixin(detailsFramework.PowerFrameFunctions, detailsFramework.ScriptHookMixin)
+
+-- ~powerbar
+function detailsFramework:CreatePowerBar(parent, name, settingsOverride)
+	assert(name or parent:GetName(), "DetailsFramework:CreatePowerBar parameter 'name' omitted and parent has no name.")
+
+	local powerBar = CreateFrame("StatusBar", name or (parent:GetName() .. "PowerBar"), parent, "BackdropTemplate")
+		do --layers
+			--background
+			powerBar.background = powerBar:CreateTexture(nil, "background")
+			powerBar.background:SetDrawLayer("background", -6)
+
+			--artwork
+			powerBar.barTexture = powerBar:CreateTexture(nil, "artwork")
+			powerBar:SetStatusBarTexture(powerBar.barTexture)
+
+			--overlay
+			powerBar.percentText = powerBar:CreateFontString(nil, "overlay", "GameFontNormal")
+		end
+
+	--mixins
+	detailsFramework:Mixin(powerBar, detailsFramework.PowerFrameFunctions)
+	detailsFramework:Mixin(powerBar, detailsFramework.StatusBarFunctions)
+
+	powerBar:CreateTextureMask()
+	powerBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
+
+	--settings and hooks
+	local settings = detailsFramework.table.copy({}, detailsFramework.PowerFrameFunctions.Settings)
+	if (settingsOverride) then
+		detailsFramework.table.copy(settings, settingsOverride)
+	end
+	powerBar.Settings = settings
+
+	local hookList = detailsFramework.table.copy({}, detailsFramework.PowerFrameFunctions.HookList)
+	powerBar.HookList = hookList
+
+	--initialize the cast bar
+	powerBar:Initialize()
+
+	return powerBar
+end
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--cast bar frame
+
+--[=[
+	DF:CreateCastBar (parent, name, settingsOverride)
+	creates a cast bar to show an unit cast
+	@parent = frame to pass for the CreateFrame function
+	@name = absolute name of the frame, if omitted it uses the parent's name .. "CastBar"
+	@settingsOverride = table with keys and values to replace the defaults from the framework
+--]=]
+
+detailsFramework.CastFrameFunctions = {
+	WidgetType = "castBar",
+
+	HookList = {
+		OnHide = {},
+		OnShow = {},
+
+		--can be regular cast or channel
+		OnCastStart = {},
+	},
+
+	CastBarEvents = {
+		{"UNIT_SPELLCAST_INTERRUPTED"},
+		{"UNIT_SPELLCAST_DELAYED"},
+		{"UNIT_SPELLCAST_CHANNEL_START"},
+		{"UNIT_SPELLCAST_CHANNEL_UPDATE"},
+		{"UNIT_SPELLCAST_CHANNEL_STOP"},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_START"},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_UPDATE"},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_EMPOWER_STOP"},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_INTERRUPTIBLE"},
+		{(IS_WOW_PROJECT_MAINLINE) and "UNIT_SPELLCAST_NOT_INTERRUPTIBLE"},
+		{"PLAYER_ENTERING_WORLD"},
+		{"UNIT_SPELLCAST_START", true},
+		{"UNIT_SPELLCAST_STOP", true},
+		{"UNIT_SPELLCAST_FAILED", true},
+	},
+
+	Settings = {
+		NoFadeEffects = false, --if true it won't play fade effects when a cast if finished
+		ShowTradeSkills = false, --if true, it shows cast for trade skills, e.g. creating an icon with blacksmith
+		ShowShield = true, --if true, shows the shield above the spell icon for non interruptible casts
+		CanTick = true, --if true it will run its OnTick function every tick.
+		ShowCastTime = true, --if true, show the remaining time to finish the cast, lazy tick must be enabled
+		FadeInTime = 0.1, --amount of time in seconds to go from zero to 100% alpha when starting to cast
+		FadeOutTime = 0.5, --amount of time in seconds to go from 100% to zero alpha when the cast finishes
+		CanLazyTick = true, --if true, it'll execute the lazy tick function, it ticks in a much slower pace comparece with the regular tick
+		LazyUpdateCooldown = 0.2, --amount of time to wait for the next lazy update, this updates non critical things like the cast timer
+
+		ShowEmpoweredDuration = true, --full hold time for empowered spells
+
+		FillOnInterrupt = true,
+		HideSparkOnInterrupt = true,
+
+		--default size
+		Width = 100,
+		Height = 20,
+
+		--colour the castbar statusbar by the type of the cast
+		Colors = {
+			Casting = detailsFramework:CreateColorTable (1, 0.73, .1, 1),
+			Channeling = detailsFramework:CreateColorTable (1, 0.73, .1, 1),
+			Finished = detailsFramework:CreateColorTable (0, 1, 0, 1),
+			NonInterruptible = detailsFramework:CreateColorTable (.7, .7, .7, 1),
+			Failed = detailsFramework:CreateColorTable (.4, .4, .4, 1),
+			Interrupted = detailsFramework:CreateColorTable (.965, .754, .154, 1),
+		},
+
+		--appearance
+		BackgroundColor = detailsFramework:CreateColorTable (.2, .2, .2, .8),
+		Texture = [[Interface\TargetingFrame\UI-StatusBar]],
+		BorderShieldWidth = 10,
+		BorderShieldHeight = 12,
+		BorderShieldCoords = {0.26171875, 0.31640625, 0.53125, 0.65625},
+		BorderShieldTexture = 1300837,
+		SpellIconWidth = 10,
+		SpellIconHeight = 10,
+		ShieldIndicatorTexture = [[Interface\RaidFrame\Shield-Fill]],
+		ShieldGlowTexture = [[Interface\RaidFrame\Shield-Overshield]],
+		SparkTexture = [[Interface\CastingBar\UI-CastingBar-Spark]],
+		SparkWidth = 16,
+		SparkHeight = 16,
+		SparkOffset = 0,
+	},
+
+	Initialize = function(self)
+		self.unit = "unutilized unit"
+		self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
+		self.Colors = self.Settings.Colors
+
+		self:SetUnit(nil)
+		PixelUtil.SetWidth (self, self.Settings.Width)
+		PixelUtil.SetHeight(self, self.Settings.Height)
+
+		self.background:SetColorTexture(self.Settings.BackgroundColor:GetColor())
+		self.background:SetAllPoints()
+		self.extraBackground:SetColorTexture(0, 0, 0, 1)
+		self.extraBackground:SetVertexColor(self.Settings.BackgroundColor:GetColor())
+		self.extraBackground:SetAllPoints()
+
+		self:SetTexture(self.Settings.Texture)
+
+		self.BorderShield:SetPoint("center", self, "left", 0, 0)
+		self.BorderShield:SetTexture(self.Settings.BorderShieldTexture)
+		self.BorderShield:SetTexCoord(unpack(self.Settings.BorderShieldCoords))
+		self.BorderShield:SetSize(self.Settings.BorderShieldWidth, self.Settings.BorderShieldHeight)
+
+		self.Icon:SetPoint("center", self, "left", 2, 0)
+		self.Icon:SetSize(self.Settings.SpellIconWidth, self.Settings.SpellIconHeight)
+
+		self.Spark:SetTexture(self.Settings.SparkTexture)
+		self.Spark:SetSize(self.Settings.SparkWidth, self.Settings.SparkHeight)
+
+		self.percentText:SetPoint("right", self, "right", -2, 0)
+		self.percentText:SetJustifyH("right")
+
+		self.fadeOutAnimation.alpha1:SetDuration(self.Settings.FadeOutTime)
+		self.fadeInAnimation.alpha1:SetDuration(self.Settings.FadeInTime)
+	end,
+
+	SetDefaultColor = function(self, colorType, r, g, b, a)
+		assert(type(colorType) == "string", "DetailsFramework: CastBar:SetDefaultColor require a string in the first argument.")
+		self.Colors [colorType]:SetColor (r, g, b, a)
+	end,
+
+	--this get a color suggestion based on the type of cast being shown in the cast bar
+	GetCastColor = function(self)
+		if (not self.canInterrupt) then
+			return self.Colors.NonInterruptible
+
+		elseif (self.channeling) then
+			return self.Colors.Channeling
+
+		elseif (self.failed) then
+			return self.Colors.Failed
+
+		elseif (self.interrupted) then
+			return self.Colors.Interrupted
+
+		elseif (self.finished) then
+			return self.Colors.Finished
+
+		else
+			return self.Colors.Casting
+		end
+	end,
+
+	--update all colors of the cast bar
+	UpdateCastColor = function(self)
+		local castColor = self:GetCastColor()
+		self:SetColor (castColor) --SetColor handles with ParseColors()
+	end,
+
+	--initial checks to know if this is a valid cast and should show the cast bar, if this fails the cast bar won't show
+	IsValid = function(self, unit, castName, isTradeSkill, ignoreVisibility)
+		if (not ignoreVisibility and not self:IsShown()) then
+			return false
+		end
+
+		if (not self.Settings.ShowTradeSkills) then
+			if (isTradeSkill) then
+				return false
+			end
+		end
+
+		if (not castName) then
+			return false
+		end
+
+		return true
+	end,
+
+	--handle the interrupt state of the cast
+	--this does not change the cast bar color because this function is called inside the start cast where is already handles the cast color
+	UpdateInterruptState = function(self)
+		if (self.Settings.ShowShield and not self.canInterrupt) then
+			self.BorderShield:Show()
+		else
+			self.BorderShield:Hide()
+		end
+	end,
+
+	--this check if the cast did reach 100% in the statusbar, mostly called from OnTick
+	CheckCastIsDone = function(self, event, isFinished)
+
+		--check max value
+		if (not isFinished and not self.finished) then
+			if (self.casting) then
+				if (self.value >= self.maxValue) then
+					isFinished = true
+				end
+
+			elseif (self.channeling) then
+				if (self.value > self.maxValue or self.value <= 0) then
+					isFinished = true
+				end
+			end
+
+			--check if passed an event (not begin used at the moment)
+			if (event) then
+				if (event == UNIT_SPELLCAST_STOP or event == UNIT_SPELLCAST_CHANNEL_STOP) then
+					isFinished = true
+				end
+			end
+		end
+
+		--the cast is finished
+		if (isFinished) then
+			if (self.casting) then
+				self.UNIT_SPELLCAST_STOP (self, self.unit, self.unit, self.castID, self.spellID)
+
+			elseif (self.channeling) then
+				self.UNIT_SPELLCAST_CHANNEL_STOP (self, self.unit, self.unit, self.castID, self.spellID)
+			end
+
+			return true
+		end
+	end,
+
+	--setup the castbar to be used by another unit
+	SetUnit = function(self, unit, displayedUnit)
+		if (self.unit ~= unit or self.displayedUnit ~= displayedUnit or unit == nil) then
+			self.unit = unit
+			self.displayedUnit = displayedUnit or unit
+
+			--reset the cast bar
+			self.casting = nil
+			self.channeling = nil
+			self.caninterrupt = nil
+
+			--register events
+			if (unit) then
+				for _, eventTable in ipairs(self.CastBarEvents) do
+					local event = eventTable [1]
+					local isUnitEvent = eventTable [2]
+
+					if event then
+						if (isUnitEvent) then
+							self:RegisterUnitEvent (event, unit)
+						else
+							self:RegisterEvent(event)
+						end
+					end
+				end
+
+				--set scripts
+				self:SetScript("OnEvent", self.OnEvent)
+				self:SetScript("OnShow", self.OnShow)
+				self:SetScript("OnHide", self.OnHide)
+
+				if (self.Settings.CanTick) then
+					self:SetScript("OnUpdate", self.OnTick)
+				end
+
+				--check is can show the cast time text
+				if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
+					self.percentText:Show()
+				else
+					self.percentText:Hide()
+				end
+
+				--setup animtions
+				self:CancelScheduleToHide()
+
+				--self:PLAYER_ENTERING_WORLD (unit, unit)
+				self:OnEvent ("PLAYER_ENTERING_WORLD", unit, unit)
+
+			else
+				for _, eventTable in ipairs(self.CastBarEvents) do
+					local event = eventTable [1]
+					if event then
+						self:UnregisterEvent (event)
+					end
+				end
+
+				--register main events
+				self:SetScript("OnUpdate", nil)
+				self:SetScript("OnEvent", nil)
+				self:SetScript("OnShow", nil)
+				self:SetScript("OnHide", nil)
+
+				self:Hide()
+			end
+		end
+	end,
+
+	--executed after a scheduled to hide timer is done
+	DoScheduledHide = function(timerObject)
+		timerObject.castBar.scheduledHideTime = nil
+
+		--just to make sure it isn't casting
+		if (not timerObject.castBar.casting and not timerObject.castBar.channeling) then
+			if (not timerObject.castBar.Settings.NoFadeEffects) then
+				timerObject.castBar:Animation_FadeOut()
+			else
+				timerObject.castBar:Hide()
+			end
+		end
+	end,
+
+	HasScheduledHide = function(self)
+		return self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()
+	end,
+
+	CancelScheduleToHide = function(self)
+		if (self:HasScheduledHide()) then
+			self.scheduledHideTime:Cancel()
+		end
+	end,
+
+	--after an interrupt, do not immediately hide the cast bar, let it up for short amount of time to give feedback to the player
+	ScheduleToHide = function(self, delay)
+		if (not delay) then
+			if (self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()) then
+				self.scheduledHideTime:Cancel()
+			end
+
+			self.scheduledHideTime = nil
+			return
+		end
+
+		--already have a scheduled timer?
+		if (self.scheduledHideTime and not self.scheduledHideTime:IsCancelled()) then
+			self.scheduledHideTime:Cancel()
+		end
+
+		self.scheduledHideTime = C_Timer.NewTimer(delay, self.DoScheduledHide)
+		self.scheduledHideTime.castBar = self
+	end,
+
+	OnHide = function(self)
+		--just in case some other effects made it have a different alpha since SetUnit won't load if the unit is the same.
+		self:SetAlpha(1)
+		--cancel any timer to hide scheduled
+		self:CancelScheduleToHide()
+	end,
+
+	--just update the current value if a spell is being cast since it wasn't running its tick function during the hide state
+	--everything else should be in the correct state
+	OnShow = function(self)
+		self.flashTexture:Hide()
+
+		if (self.unit) then
+			if (self.casting) then
+				local name, text, texture, startTime = CastInfo.UnitCastingInfo (self.unit)
+				if (name) then
+					--[[if not self.spellStartTime then
+						self:UpdateCastingInfo(self.unit)
+					end]]--
+					self.value = GetTime() - self.spellStartTime
+				end
+
+				self:RunHooksForWidget("OnShow", self, self.unit)
+
+			elseif (self.channeling) then
+				local name, text, texture, endTime = CastInfo.UnitChannelInfo (self.unit)
+				if (name) then
+					--[[if not self.spellEndTime then
+						self:UpdateChannelInfo(self.unit)
+					end]]--
+					self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
+				end
+
+				self:RunHooksForWidget("OnShow", self, self.unit)
+			end
+		end
+	end,
+
+	--it's triggering several events since it's not registered for the unit with RegisterUnitEvent
+	OnEvent = function(self, event, ...)
+		local arg1 = ...
+		local unit = self.unit
+
+		if (event == "PLAYER_ENTERING_WORLD") then
+			local newEvent = self.PLAYER_ENTERING_WORLD (self, unit, ...)
+			if (newEvent) then
+				self.OnEvent (self, newEvent, unit)
+				return
+			end
+
+		elseif (arg1 ~= unit) then
+			return
+		end
+
+		local eventFunc = self [event]
+		if (eventFunc) then
+			eventFunc (self, unit, ...)
+		end
+	end,
+
+	OnTick_LazyTick = function(self)
+		--run the lazy tick if allowed
+		if (self.Settings.CanLazyTick) then
+			--update the cast time
+			if (self.Settings.ShowCastTime) then
+				if (self.casting) then
+					self.percentText:SetText(format("%.1f", abs(self.value - self.maxValue)))
+
+				elseif (self.channeling) then
+					local remainingTime = self.empowered and abs(self.value - self.maxValue) or abs(self.value)
+					if (remainingTime > 999) then
+						self.percentText:SetText("")
+					else
+						self.percentText:SetText(format("%.1f", remainingTime))
+					end
+				else
+					self.percentText:SetText("")
+				end
+			end
+
+			return true
+		else
+			return false
+		end
+	end,
+
+	--tick function for regular casts
+	OnTick_Casting = function(self, deltaTime)
+		self.value = self.value + deltaTime
+
+		if (self:CheckCastIsDone()) then
+			return
+		else
+			self:SetValue(self.value)
+		end
+
+		--update spark position
+		local sparkPosition = self.value / self.maxValue * self:GetWidth()
+		self.Spark:SetPoint("center", self, "left", sparkPosition + self.Settings.SparkOffset, 0)
+
+
+		--in order to allow the lazy tick run, it must return true, it tell that the cast didn't finished
+		return true
+	end,
+
+	--tick function for channeling casts
+	OnTick_Channeling = function(self, deltaTime)
+		self.value = self.empowered and self.value + deltaTime or self.value - deltaTime
+
+		if (self:CheckCastIsDone()) then
+			return
+		else
+			self:SetValue(self.value)
+		end
+
+		--update spark position
+		local sparkPosition = self.value / self.maxValue * self:GetWidth()
+		self.Spark:SetPoint("center", self, "left", sparkPosition + self.Settings.SparkOffset, 0)
+
+		self:CreateOrUpdateEmpoweredPips()
+
+		return true
+	end,
+
+	OnTick = function(self, deltaTime)
+		if (self.casting) then
+			if (not self:OnTick_Casting (deltaTime)) then
+				return
+			end
+
+			--lazy tick
+			self.lazyUpdateCooldown = self.lazyUpdateCooldown - deltaTime
+			if (self.lazyUpdateCooldown < 0) then
+				self:OnTick_LazyTick()
+				self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
+			end
+
+		elseif (self.channeling) then
+			if (not self:OnTick_Channeling (deltaTime)) then
+				return
+			end
+
+			--lazy tick
+			self.lazyUpdateCooldown = self.lazyUpdateCooldown - deltaTime
+			if (self.lazyUpdateCooldown < 0) then
+				self:OnTick_LazyTick()
+				self.lazyUpdateCooldown = self.Settings.LazyUpdateCooldown
+			end
+		end
+	end,
+
+	--animation start script
+	Animation_FadeOutStarted = function(self)
+
+	end,
+
+	--animation finished script
+	Animation_FadeOutFinished = function(self)
+		local castBar = self:GetParent()
+		castBar:SetAlpha(1)
+		castBar:Hide()
+	end,
+
+	--animation start script
+	Animation_FadeInStarted = function(self)
+
+	end,
+
+	--animation finished script
+	Animation_FadeInFinished = function(self)
+		local castBar = self:GetParent()
+		castBar:Show()
+		castBar:SetAlpha(1)
+	end,
+
+	--animation calls
+	Animation_FadeOut = function(self)
+		self:ScheduleToHide (false)
+
+		if (self.fadeInAnimation:IsPlaying()) then
+			self.fadeInAnimation:Stop()
+		end
+
+		if (not self.fadeOutAnimation:IsPlaying()) then
+			self.fadeOutAnimation:Play()
+		end
+	end,
+
+	Animation_FadeIn = function(self)
+		self:ScheduleToHide (false)
+
+		if (self.fadeOutAnimation:IsPlaying()) then
+			self.fadeOutAnimation:Stop()
+		end
+
+		if (not self.fadeInAnimation:IsPlaying()) then
+			self.fadeInAnimation:Play()
+		end
+	end,
+
+	Animation_Flash = function(self)
+		if (not self.flashAnimation:IsPlaying()) then
+			self.flashAnimation:Play()
+		end
+	end,
+
+	Animation_StopAllAnimations = function(self)
+		if (self.flashAnimation:IsPlaying()) then
+			self.flashAnimation:Stop()
+		end
+
+		if (self.fadeOutAnimation:IsPlaying()) then
+			self.fadeOutAnimation:Stop()
+		end
+
+		if (self.fadeInAnimation:IsPlaying()) then
+			self.fadeInAnimation:Stop()
+		end
+	end,
+
+	PLAYER_ENTERING_WORLD = function(self, unit, arg1)
+		local isChannel = CastInfo.UnitChannelInfo (unit)
+		local isRegularCast = CastInfo.UnitCastingInfo (unit)
+
+		if (isChannel) then
+			self.channeling = true
+			self:UpdateChannelInfo(unit)
+			return self.unit == arg1 and "UNIT_SPELLCAST_CHANNEL_START"
+
+		elseif (isRegularCast) then
+			self.casting = true
+			self:UpdateCastingInfo(unit)
+			return self.unit == arg1 and "UNIT_SPELLCAST_START"
+
+		else
+			self.casting = nil
+			self.channeling = nil
+			self.failed = nil
+			self.finished = nil
+			self.interrupted = nil
+			self.Spark:Hide()
+			self:Hide()
+		end
+	end,
+
+	UpdateCastingInfo = function(self, unit)
+		local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = CastInfo.UnitCastingInfo (unit)
+
+		--is valid?
+		if (not self:IsValid (unit, name, isTradeSkill, true)) then
+			return
+		end
+
+		--empowered? no!
+			self.holdAtMaxTime = nil
+			self.empowered = false
+			self.curStage = nil
+			self.numStages = nil
+			self.empStages = nil
+			self:CreateOrUpdateEmpoweredPips()
+
+		--setup cast
+			self.casting = true
+			self.channeling = nil
+			self.interrupted = nil
+			self.failed = nil
+			self.finished = nil
+			self.canInterrupt = not notInterruptible
+			self.spellID = spellID
+			self.castID = castID
+			self.spellName = name
+			self.spellTexture = texture
+			self.spellStartTime = startTime / 1000
+			self.spellEndTime = endTime / 1000
+			self.value = GetTime() - self.spellStartTime
+			self.maxValue = self.spellEndTime - self.spellStartTime
+
+			self:SetMinMaxValues(0, self.maxValue)
+			self:SetValue(self.value)
+			self:SetAlpha(1)
+			self.Icon:SetTexture(texture)
+			self.Icon:Show()
+			self.Text:SetText(text or name)
+
+			if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
+				self.percentText:Show()
+			end
+
+			self.flashTexture:Hide()
+			self:Animation_StopAllAnimations()
+
+			self:SetAlpha(1)
+
+			--set the statusbar color
+			self:UpdateCastColor()
+
+			if (not self:IsShown() and not self.Settings.NoFadeEffects) then
+				self:Animation_FadeIn()
+			end
+
+			self.Spark:Show()
+			self:Show()
+
+		--update the interrupt cast border
+		self:UpdateInterruptState()
+
+	end,
+
+	UNIT_SPELLCAST_START = function(self, unit)
+
+		self:UpdateCastingInfo(unit)
+
+		self:RunHooksForWidget("OnCastStart", self, self.unit, "UNIT_SPELLCAST_START")
+	end,
+
+	CreateOrUpdateEmpoweredPips = function(self, unit, numStages, startTime, endTime)
+		unit = unit or self.unit
+		numStages = numStages or self.numStages
+		startTime = startTime or ((self.spellStartTime or 0) * 1000)
+		endTime = endTime or ((self.spellEndTime or 0) * 1000)
+
+		if not self.empStages or not numStages or numStages <= 0 then
+			self.stagePips = self.stagePips or {}
+			for i, stagePip in pairs(self.stagePips) do
+				stagePip:Hide()
+			end
+			return
+		end
+
+		local width = self:GetWidth()
+		local height = self:GetHeight()
+		for i = 1, numStages, 1 do
+			local curStartTime = self.empStages[i] and self.empStages[i].start
+			local curEndTime = self.empStages[i] and self.empStages[i].finish
+			local curDuration = curEndTime - curStartTime
+			local offset = width * curEndTime / (endTime - startTime) * 1000
+			if curDuration > -1 then
+
+				stagePip = self.stagePips[i]
+				if not stagePip then
+					stagePip = self:CreateTexture(nil, "overlay", nil, 2)
+					stagePip:SetBlendMode("ADD")
+					stagePip:SetTexture([[Interface\CastingBar\UI-CastingBar-Spark]])
+					stagePip:SetTexCoord(11/32,18/32,9/32,23/32)
+					stagePip:SetSize(2, height)
+					--stagePip = CreateFrame("FRAME", nil, self, "CastingBarFrameStagePipTemplate")
+					self.stagePips[i] = stagePip
+				end
+
+				stagePip:ClearAllPoints()
+				--stagePip:SetPoint("TOP", self, "TOPLEFT", offset, -1)
+				--stagePip:SetPoint("BOTTOM", self, "BOTTOMLEFT", offset, 1)
+				--stagePip.BasePip:SetVertexColor(1, 1, 1, 1)
+				stagePip:SetPoint("CENTER", self, "LEFT", offset, 0)
+				stagePip:SetVertexColor(1, 1, 1, 1)
+				stagePip:Show()
+			end
+		end
+	end,
+
+	UpdateChannelInfo = function(self, unit, ...)
+		local unitID, castID, spellID = ...
+		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID, _, numStages = CastInfo.UnitChannelInfo (unit)
+
+		--is valid?
+		if (not self:IsValid (unit, name, isTradeSkill, true)) then
+			return
+		end
+
+		--empowered?
+			self.empStages = {}
+			self.stagePips = self.stagePips or {}
+			for i, stagePip in pairs(self.stagePips) do
+				stagePip:Hide()
+			end
+
+			if numStages and numStages > 0 then
+				self.holdAtMaxTime = GetUnitEmpowerHoldAtMaxTime(self.unit)
+				self.empowered = true
+				self.numStages = numStages
+
+
+				local lastStageEndTime = 0
+				for i = 1, numStages do
+					self.empStages[i] = {
+						start = lastStageEndTime,
+						finish = lastStageEndTime + GetUnitEmpowerStageDuration(unit, i - 1) / 1000,
+					}
+					lastStageEndTime = self.empStages[i].finish
+
+					if startTime / 1000 + lastStageEndTime <= GetTime() then
+						self.curStage = i
+					end
+				end
+
+				if (self.Settings.ShowEmpoweredDuration) then
+					endTime = endTime + self.holdAtMaxTime
+				end
+
+				--create/update pips
+				self:CreateOrUpdateEmpoweredPips(unit, numStages, startTime, endTime)
+			else
+				self.holdAtMaxTime = nil
+				self.empowered = false
+				self.curStage = nil
+				self.numStages = nil
+			end
+
+		--setup cast
+			self.casting = nil
+			self.channeling = true
+			self.interrupted = nil
+			self.failed = nil
+			self.finished = nil
+			self.canInterrupt = not notInterruptible
+			self.spellID = spellID
+			self.castID = castID
+			self.spellName = name
+			self.spellTexture = texture
+			self.spellStartTime = startTime / 1000
+			self.spellEndTime = endTime / 1000
+			self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
+			self.maxValue = self.spellEndTime - self.spellStartTime
+			self.reverseChanneling = self.empowered
+
+			self:SetMinMaxValues(0, self.maxValue)
+			self:SetValue(self.value)
+
+			self:SetAlpha(1)
+			self.Icon:SetTexture(texture)
+			self.Icon:Show()
+			self.Text:SetText(text)
+
+			if (self.Settings.ShowCastTime and self.Settings.CanLazyTick) then
+				self.percentText:Show()
+			end
+
+			self.flashTexture:Hide()
+			self:Animation_StopAllAnimations()
+
+			self:SetAlpha(1)
+
+			--set the statusbar color
+			self:UpdateCastColor()
+
+			if (not self:IsShown() and not self.Settings.NoFadeEffects) then
+				self:Animation_FadeIn()
+			end
+
+			self.Spark:Show()
+			self:Show()
+
+		--update the interrupt cast border
+		self:UpdateInterruptState()
+
+	end,
+
+	UNIT_SPELLCAST_CHANNEL_START = function(self, unit, ...)
+
+		self:UpdateChannelInfo(unit, ...)
+
+		self:RunHooksForWidget("OnCastStart", self, self.unit, "UNIT_SPELLCAST_CHANNEL_START")
+	end,
+
+	UNIT_SPELLCAST_STOP = function(self, unit, ...)
+		local unitID, castID, spellID = ...
+		if (self.castID == castID) then
+			if (self.interrupted) then
+				if (self.Settings.HideSparkOnInterrupt) then
+					self.Spark:Hide()
+				end
+			else
+				self.Spark:Hide()
+			end
+
+			self.percentText:Hide()
+
+			local value = self:GetValue()
+			local _, maxValue = self:GetMinMaxValues()
+
+			if (self.interrupted) then
+				if (self.Settings.FillOnInterrupt) then
+					self:SetValue(self.maxValue or maxValue or 1)
+				end
+			else
+				self:SetValue(self.maxValue or maxValue or 1)
+			end
+
+			self.casting = nil
+			self.channeling = nil
+			self.finished = true
+			self.castID = nil
+
+			if (not self:HasScheduledHide()) then
+				--check if settings has no fade option or if its parents are not visible
+				if (not self:IsVisible()) then
+					self:Hide()
+
+				elseif (self.Settings.NoFadeEffects) then
+					self:ScheduleToHide (0.3)
+
+				else
+					self:Animation_Flash()
+					self:Animation_FadeOut()
+				end
+			end
+
+			self:UpdateCastColor()
+		end
+	end,
+
+	UNIT_SPELLCAST_CHANNEL_STOP = function(self, unit, ...)
+		local unitID, castID, spellID = ...
+
+		if (self.channeling and castID == self.castID) then
+			self.Spark:Hide()
+			self.percentText:Hide()
+
+			local value = self:GetValue()
+			local _, maxValue = self:GetMinMaxValues()
+			self:SetValue(self.maxValue or maxValue or 1)
+
+			self.casting = nil
+			self.channeling = nil
+			self.finished = true
+			self.castID = nil
+
+			if (not self:HasScheduledHide()) then
+				--check if settings has no fade option or if its parents are not visible
+				if (not self:IsVisible()) then
+					self:Hide()
+
+				elseif (self.Settings.NoFadeEffects) then
+					self:ScheduleToHide (0.3)
+
+				else
+					self:Animation_Flash()
+					self:Animation_FadeOut()
+				end
+			end
+
+			self:UpdateCastColor()
+		end
+	end,
+
+	UNIT_SPELLCAST_EMPOWER_START = function(self, unit, ...)
+		self:UNIT_SPELLCAST_CHANNEL_START(unit, ...)
+	end,
+
+	UNIT_SPELLCAST_EMPOWER_UPDATE = function(self, unit, ...)
+		self:UNIT_SPELLCAST_CHANNEL_UPDATE(unit, ...)
+	end,
+
+	UNIT_SPELLCAST_EMPOWER_STOP = function(self, unit, ...)
+		self:UNIT_SPELLCAST_CHANNEL_STOP(unit, ...)
+	end,
+
+	UNIT_SPELLCAST_FAILED = function(self, unit, ...)
+		local unitID, castID, spellID = ...
+
+		if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
+			self.casting = nil
+			self.channeling = nil
+			self.failed = true
+			self.finished = true
+			self.castID = nil
+			self:SetValue(self.maxValue or select(2, self:GetMinMaxValues()) or 1)
+
+			--set the statusbar color
+			self:UpdateCastColor()
+
+			self.Spark:Hide()
+			self.percentText:Hide()
+			self.Text:SetText(FAILED) --auto locale within the global namespace
+
+			self:ScheduleToHide (1)
+		end
+	end,
+
+	UNIT_SPELLCAST_INTERRUPTED = function(self, unit, ...)
+		local unitID, castID, spellID = ...
+
+		if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
+			self.casting = nil
+			self.channeling = nil
+			self.interrupted = true
+			self.finished = true
+			self.castID = nil
+
+			if (self.Settings.FillOnInterrupt) then
+				self:SetValue(self.maxValue or select(2, self:GetMinMaxValues()) or 1)
+			end
+
+			if (self.Settings.HideSparkOnInterrupt) then
+				self.Spark:Hide()
+			end
+
+			local castColor = self:GetCastColor()
+			self:SetColor (castColor) --SetColor handles with ParseColors()
+
+			self.percentText:Hide()
+			self.Text:SetText(INTERRUPTED) --auto locale within the global namespace
+
+			self:ScheduleToHide (1)
+		end
+	end,
+
+	UNIT_SPELLCAST_DELAYED = function(self, unit, ...)
+		local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible = CastInfo.UnitCastingInfo (unit)
+
+		if (not self:IsValid (unit, name, isTradeSkill)) then
+			return
+		end
+
+		--update the cast time
+		self.spellStartTime = startTime / 1000
+		self.spellEndTime = endTime / 1000
+		self.value = GetTime() - self.spellStartTime
+		self.maxValue = self.spellEndTime - self.spellStartTime
+		self:SetMinMaxValues(0, self.maxValue)
+	end,
+
+	UNIT_SPELLCAST_CHANNEL_UPDATE = function(self, unit, ...)
+		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID, _, numStages = CastInfo.UnitChannelInfo (unit)
+
+		if (not self:IsValid (unit, name, isTradeSkill)) then
+			return
+		end
+
+		--update the cast time
+		self.spellStartTime = startTime / 1000
+		self.spellEndTime = endTime / 1000
+		self.value = self.empowered and (GetTime() - self.spellStartTime) or (self.spellEndTime - GetTime())
+		self.maxValue = self.spellEndTime - self.spellStartTime
+
+		if (self.value < 0 or self.value > self.maxValue) then
+			self.value = 0
+		end
+
+		self:SetMinMaxValues(0, self.maxValue)
+		self:SetValue(self.value)
+	end,
+
+	--cast changed its state to interruptable
+	UNIT_SPELLCAST_INTERRUPTIBLE = function(self, unit, ...)
+		self.canInterrupt = true
+		self:UpdateCastColor()
+		self:UpdateInterruptState()
+	end,
+
+	--cast changed its state to non interruptable
+	UNIT_SPELLCAST_NOT_INTERRUPTIBLE = function(self, unit, ...)
+		self.canInterrupt = false
+		self:UpdateCastColor()
+		self:UpdateInterruptState()
+	end,
+
+}
+
+detailsFramework:Mixin(detailsFramework.CastFrameFunctions, detailsFramework.ScriptHookMixin)
+
+-- ~castbar
+
+function detailsFramework:CreateCastBar(parent, name, settingsOverride)
+	assert(name or parent:GetName(), "DetailsFramework:CreateCastBar parameter 'name' omitted and parent has no name.")
+
+	local castBar = CreateFrame("StatusBar", name or (parent:GetName() .. "CastBar"), parent, "BackdropTemplate")
+
+		do --layers
+
+			--these widgets was been made with back compatibility in mind
+			--they are using the same names as the retail game uses on the nameplate castbar
+			--this should make Plater core and Plater scripts made by users compatible with the new unit frame made on the framework
+
+			--background
+			castBar.background = castBar:CreateTexture(nil, "background", nil, -6)
+			castBar.extraBackground = castBar:CreateTexture(nil, "background", nil, -5)
+
+			--overlay
+			castBar.Text = castBar:CreateFontString(nil, "overlay", "SystemFont_Shadow_Small")
+			castBar.Text:SetDrawLayer("overlay", 1)
+			castBar.Text:SetPoint("center", 0, 0)
+
+			castBar.BorderShield = castBar:CreateTexture(nil, "overlay", nil, 5)
+			castBar.BorderShield:Hide()
+
+			castBar.Icon = castBar:CreateTexture(nil, "overlay", nil, 4)
+			castBar.Icon:Hide()
+
+			castBar.Spark = castBar:CreateTexture(nil, "overlay", nil, 3)
+			castBar.Spark:SetBlendMode("ADD")
+
+			--time left on the cast
+			castBar.percentText = castBar:CreateFontString(nil, "overlay", "SystemFont_Shadow_Small")
+			castBar.percentText:SetDrawLayer("overlay", 7)
+
+			--statusbar texture
+			castBar.barTexture = castBar:CreateTexture(nil, "artwork", nil, -6)
+			castBar:SetStatusBarTexture(castBar.barTexture)
+
+			--animations fade in and out
+			local fadeOutAnimationHub = detailsFramework:CreateAnimationHub (castBar, detailsFramework.CastFrameFunctions.Animation_FadeOutStarted, detailsFramework.CastFrameFunctions.Animation_FadeOutFinished)
+			fadeOutAnimationHub.alpha1 = detailsFramework:CreateAnimation(fadeOutAnimationHub, "ALPHA", 1, 1, 1, 0)
+			castBar.fadeOutAnimation = fadeOutAnimationHub
+
+			local fadeInAnimationHub = detailsFramework:CreateAnimationHub (castBar, detailsFramework.CastFrameFunctions.Animation_FadeInStarted, detailsFramework.CastFrameFunctions.Animation_FadeInFinished)
+			fadeInAnimationHub.alpha1 = detailsFramework:CreateAnimation(fadeInAnimationHub, "ALPHA", 1, 0.150, 0, 1)
+			castBar.fadeInAnimation = fadeInAnimationHub
+
+			--animatios flash
+			local flashTexture = castBar:CreateTexture(nil, "overlay", nil, 7)
+			flashTexture:SetColorTexture(1, 1, 1, 1)
+			flashTexture:SetAllPoints()
+			flashTexture:SetAlpha(0)
+			flashTexture:Hide()
+			flashTexture:SetBlendMode("ADD")
+			castBar.flashTexture = flashTexture
+
+			local flashAnimationHub = detailsFramework:CreateAnimationHub (flashTexture, function() flashTexture:Show() end, function() flashTexture:Hide() end)
+			detailsFramework:CreateAnimation(flashAnimationHub, "ALPHA", 1, 0.2, 0, 0.8)
+			detailsFramework:CreateAnimation(flashAnimationHub, "ALPHA", 2, 0.2, 1, 0)
+			castBar.flashAnimation = flashAnimationHub
+		end
+
+	--mixins
+	detailsFramework:Mixin(castBar, detailsFramework.CastFrameFunctions)
+	detailsFramework:Mixin(castBar, detailsFramework.StatusBarFunctions)
+
+	castBar:CreateTextureMask()
+	castBar:AddMaskTexture(castBar.flashTexture)
+	castBar:AddMaskTexture(castBar.background)
+	castBar:AddMaskTexture(castBar.extraBackground)
+
+	castBar:SetTexture([[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
+
+	--settings and hooks
+	local settings = detailsFramework.table.copy({}, detailsFramework.CastFrameFunctions.Settings)
+	if (settingsOverride) then
+		detailsFramework.table.copy(settings, settingsOverride)
+	end
+	castBar.Settings = settings
+
+	local hookList = detailsFramework.table.copy({}, detailsFramework.CastFrameFunctions.HookList)
+	castBar.HookList = hookList
+
+	--initialize the cast bar
+	castBar:Initialize()
+
+	return castBar
+end
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--unit frame
+
+--[=[
+	DF:CreateUnitFrame(parent, name, settingsOverride)
+	creates a very basic unit frame with a healthbar, castbar and power bar
+	each unit frame has a .Settings table which isn't shared among other unit frames created with this method
+	all members names are the same as the unit frame from the retail game
+
+	@parent = frame to pass for the CreateFrame function
+	@name = absolute name of the frame, if omitted a random name is created
+	@settingsOverride = table with keys and values to replace the defaults from the framework
+
+--]=]
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--unit frame
+
+	--return true if the unit has been claimed by another player (health bar is gray)
+	local isUnitTapDenied = function(unit)
+		return unit and not UnitPlayerControlled(unit) and UnitIsTapDenied(unit)
+	end
+
+	detailsFramework.UnitFrameFunctions = {
+		WidgetType = "unitFrame",
+
+		Settings = {
+			--unit frames
+			ClearUnitOnHide = true, --if tue it'll set the unit to nil when the unit frame is set to hide
+			ShowCastBar = true, --if this is false, the cast bar for the unit won't be shown
+			ShowPowerBar = true, --if true it'll show the power bar for the unit, e.g. the mana bar
+			ShowUnitName = true, --if false, the unit name won't show
+			ShowBorder = true, --if false won't show the border frame
+
+			--health bar color
+			CanModifyHealhBarColor = true, --if false it won't change the color of the health bar
+			ColorByAggro = false, --if true it'll color the healthbar with red color when the unit has aggro on player
+			FixedHealthColor = false, --color override with a table {r=1, g=1, b=1}
+			UseFriendlyClassColor = true, --make the healthbar class color for friendly players
+			UseEnemyClassColor = true, --make the healthbar class color for enemy players
+
+			--misc
+			ShowTargetOverlay = true, --shows a highlighht for the player current target
+			BorderColor = detailsFramework:CreateColorTable (0, 0, 0, 1), --border color, set to alpha zero for no border
+			CanTick = false, --if true it'll run the OnTick event
+
+			--size
+			Width = 100,
+			Height = 20,
+			PowerBarHeight = 4,
+			CastBarHeight = 8,
+		},
+
+		UnitFrameEvents = {
+			--run for all units
+			{"PLAYER_ENTERING_WORLD"},
+			{"PARTY_MEMBER_DISABLE"},
+			{"PARTY_MEMBER_ENABLE"},
+			{"PLAYER_TARGET_CHANGED"},
+
+			--run for one unit
+			{"UNIT_NAME_UPDATE", true},
+			{"UNIT_CONNECTION", true},
+			{"UNIT_ENTERED_VEHICLE", true},
+			{"UNIT_EXITED_VEHICLE", true},
+			{"UNIT_PET", true},
+			{"UNIT_THREAT_LIST_UPDATE", true},
+		},
+
+		--used when a event is triggered to quickly check if is a unit event
+		IsUnitEvent = {
+			["UNIT_NAME_UPDATE"] = true,
+			["UNIT_CONNECTION"] = true,
+			["UNIT_ENTERED_VEHICLE"] = true,
+			["UNIT_EXITED_VEHICLE"] = true,
+			["UNIT_PET"] = true,
+			["UNIT_THREAT_LIST_UPDATE"] = true,
+		},
+
+		Initialize = function(self)
+			self.border:SetBorderColor (self.Settings.BorderColor)
+
+			PixelUtil.SetWidth (self, self.Settings.Width, 1)
+			PixelUtil.SetHeight(self, self.Settings.Height, 1)
+
+			PixelUtil.SetPoint(self.powerBar, "bottomleft", self, "bottomleft", 0, 0, 1, 1)
+			PixelUtil.SetPoint(self.powerBar, "bottomright", self, "bottomright", 0, 0, 1, 1)
+			PixelUtil.SetHeight(self.powerBar, self.Settings.PowerBarHeight, 1)
+
+			--make the castbar overlap the powerbar
+			PixelUtil.SetPoint(self.castBar, "bottomleft", self, "bottomleft", 0, 0, 1, 1)
+			PixelUtil.SetPoint(self.castBar, "bottomright", self, "bottomright", 0, 0, 1, 1)
+			PixelUtil.SetHeight(self.castBar, self.Settings.CastBarHeight, 1)
+		end,
+
+		SetHealthBarColor = function(self, r, g, b, a)
+			self.healthBar:SetColor (r, g, b, a)
+		end,
+
+		--register all events which will be used by the unit frame
+		RegisterEvents = function(self)
+			--register events
+			for index, eventTable in ipairs(self.UnitFrameEvents) do
+				local event, isUnitEvent = unpack(eventTable)
+				if (not isUnitEvent) then
+					self:RegisterEvent(event)
+				else
+					self:RegisterUnitEvent (event, self.unit, self.displayedUnit ~= unit and self.displayedUnit or nil)
+				end
+			end
+
+			--check settings and unregister events for disabled features
+			if (not self.Settings.ColorByAggro) then
+				self:UnregisterEvent ("UNIT_THREAT_LIST_UPDATE")
+			end
+
+			--set scripts
+			self:SetScript("OnEvent", self.OnEvent)
+			self:SetScript("OnHide", self.OnHide)
+
+			if (self.Settings.CanTick) then
+				self:SetScript("OnUpdate", self.OnTick)
+			end
+		end,
+
+		--unregister events, called when this unit frame losses its unit
+		UnregisterEvents = function(self)
+			for index, eventTable in ipairs(self.UnitFrameEvents) do
+				local event, firstUnit, secondUnit = unpack(eventTable)
+				self:UnregisterEvent (event)
+			end
+
+			self:SetScript("OnEvent", nil)
+			self:SetScript("OnUpdate", nil)
+			self:SetScript("OnHide", nil)
+		end,
+
+		--call every tick
+		OnTick = function(self, deltaTime) end, --if overrided, set 'CanTick' to true on the settings table
+
+		--when an event happen for this unit, send it to the apropriate function
+		OnEvent = function(self, event, ...)
+			--run the function for this event
+			local eventFunc = self [event]
+			if (eventFunc) then
+				--is this event an unit event?
+				if (self.IsUnitEvent [event]) then
+					local unit = ...
+					--check if is for this unit (even if the event is registered only for the unit)
+					if (unit == self.unit or unit == self.displayedUnit) then
+						eventFunc (self, ...)
+					end
+				else
+					eventFunc (self, ...)
+				end
+			end
+		end,
+
+		OnHide = function(self)
+			if (self.Settings.ClearUnitOnHide) then
+				self:SetUnit(nil)
+			end
+		end,
+
+		--run if the unit currently shown is different than the new one
+		SetUnit = function(self, unit)
+			if (unit ~= self.unit or unit == nil) then
+				self.unit = unit --absolute unit
+				self.displayedUnit = unit --~todo rename to 'displayedUnit' for back compatibility with older scripts in Plater
+				self.unitInVehicle = nil --true when the unit is in a vehicle
+
+				if (unit) then
+					self:RegisterEvents()
+
+					self.guid = UnitGUID(unit)
+					self.class = select(2, UnitClass(unit))
+					self.name = UnitName(unit)
+
+					self.healthBar:SetUnit(unit, self.displayedUnit)
+
+					--is using castbars?
+					if (self.Settings.ShowCastBar) then
+						self.castBar:SetUnit(unit, self.displayedUnit)
+					else
+						self.castBar:SetUnit(nil)
+					end
+
+					--is using powerbars?
+					if (self.Settings.ShowPowerBar) then
+						self.powerBar:SetUnit(unit, self.displayedUnit)
+					else
+						self.powerBar:SetUnit(nil)
+					end
+
+					--is using the border?
+					if (self.Settings.ShowBorder) then
+						self.border:Show()
+					else
+						self.border:Hide()
+					end
+
+					if (not self.Settings.ShowUnitName) then
+						self.unitName:Hide()
+					end
+				else
+					self:UnregisterEvents()
+					self.healthBar:SetUnit(nil)
+					self.castBar:SetUnit(nil)
+					self.powerBar:SetUnit(nil)
+				end
+
+				self:UpdateUnitFrame()
+			end
+		end,
+
+		--if the unit is controlling a vehicle, need to show the vehicle instead
+		--.unit and .displayedUnit is always the same execept when the unit is controlling a vehicle, then .displayedUnit is the unitID for the vehicle
+		--todo: see what 'UnitTargetsVehicleInRaidUI' is, there's a call for this in the CompactUnitFrame.lua but zero documentation
+		CheckVehiclePossession = function(self)
+			--this unit is possessing a vehicle?
+			local unitPossessVehicle = (IS_WOW_PROJECT_MAINLINE) and UnitHasVehicleUI(self.unit)	or false
+			if (unitPossessVehicle) then
+				if (not self.unitInVehicle) then
+					if (UnitIsUnit("player", self.unit)) then
+						self.displayedUnit = "vehicle"
+						self.unitInVehicle = true
+						self:RegisterEvents()
+						self:UpdateAllWidgets()
+						return true
+					end
+
+					local prefix, id, suffix = string.match(self.unit, "([^%d]+)([%d]*)(.*)") --CompactUnitFrame.lua
+					local vehicleUnitID = prefix .. "pet" .. id .. suffix
+					if (UnitExists(vehicleUnitID)) then
+						self.displayedUnit = vehicleUnitID
+						self.unitInVehicle = true
+						self:RegisterEvents()
+						self:UpdateAllWidgets()
+						return true
+					end
+				end
+			end
+
+			if (self.unitInVehicle) then
+				self.displayedUnit = self.unit
+				self.unitInVehicle = nil
+				self:RegisterEvents()
+				self:UpdateAllWidgets()
+			end
+		end,
+
+		--find a color for the health bar, if a color has been passed in the arguments use it instead, 'CanModifyHealhBarColor' must be true for this function run
+		UpdateHealthColor = function(self, r, g, b)
+			--check if color changes is disabled
+			if (not self.Settings.CanModifyHealhBarColor) then
+				return
+			end
+
+			local unit = self.displayedUnit
+
+			--check if a color has been passed within the parameters
+			if (r) then
+				--check if passed a special color
+				if (type(r) ~= "number") then
+					r, g, b = detailsFramework:ParseColors(r)
+				end
+
+				self:SetHealthBarColor (r, g, b)
+				return
+			end
+
+			--check if there is a color override in the settings
+			if (self.Settings.FixedHealthColor) then
+				local FixedHealthColor = self.Settings.FixedHealthColor
+				r, g, b = FixedHealthColor.r, FixedHealthColor.g, FixedHealthColor.b
+				self:SetHealthBarColor (r, g, b)
+				return
+			end
+
+			--check if the unit is a player
+			if (UnitIsPlayer (unit)) then
+				--check if the unit is disconnected (in case it is a player
+				if (not UnitIsConnected (unit)) then
+					self:SetHealthBarColor (.5, .5, .5)
+					return
+				end
+
+				--is a friendly or enemy player?
+				if (UnitIsFriend ("player", unit)) then
+					if (self.Settings.UseFriendlyClassColor) then
+						local _, className = UnitClass(unit)
+						if (className) then
+							local classColor = RAID_CLASS_COLORS [className]
+							if (classColor) then
+								self:SetHealthBarColor (classColor.r, classColor.g, classColor.b)
+								return
+							end
+						end
+					else
+						self:SetHealthBarColor (0, 1, 0)
+						return
+					end
+				else
+					if (self.Settings.UseEnemyClassColor) then
+						local _, className = UnitClass(unit)
+						if (className) then
+							local classColor = RAID_CLASS_COLORS [className]
+							if (classColor) then
+								self:SetHealthBarColor (classColor.r, classColor.g, classColor.b)
+								return
+							end
+						end
+					else
+						self:SetHealthBarColor (1, 0, 0)
+						return
+					end
+				end
+			end
+
+			--is tapped?
+			if (isUnitTapDenied (unit)) then
+				self:SetHealthBarColor (.6, .6, .6)
+				return
+			end
+
+			--is this is a npc attacking the player?
+			if (self.Settings.ColorByAggro) then
+				local _, threatStatus = UnitDetailedThreatSituation ("player", unit)
+				if (threatStatus) then
+					self:SetHealthBarColor (1, 0, 0)
+					return
+				end
+			end
+
+			-- get the regular color by selection
+			r, g, b = UnitSelectionColor (unit)
+			self:SetHealthBarColor (r, g, b)
+		end,
+
+		--misc
+		UpdateName = function(self)
+			if (not self.Settings.ShowUnitName) then
+				return
+			end
+
+			--unit name without realm names by default
+			local name = UnitName (self.unit)
+			self.unitName:SetText(name)
+			self.unitName:Show()
+		end,
+
+		--this runs when the player it self changes its target, need to update the current target overlay
+		--todo: add focus overlay
+		UpdateTargetOverlay = function(self)
+			if (not self.Settings.ShowTargetOverlay) then
+				self.targetOverlay:Hide()
+				return
+			end
+
+			if (UnitIsUnit(self.displayedUnit, "target")) then
+				self.targetOverlay:Show()
+			else
+				self.targetOverlay:Hide()
+			end
+		end,
+
+		UpdateAllWidgets = function(self)
+			if (UnitExists(self.displayedUnit)) then
+				local unit = self.unit
+				local displayedUnit = self.displayedUnit
+
+				self:SetUnit(unit, displayedUnit)
+
+				--is using castbars?
+				if (self.Settings.ShowCastBar) then
+					self.castBar:SetUnit(unit, displayedUnit)
+				end
+
+				--is using powerbars?
+				if (self.Settings.ShowPowerBar) then
+					self.powerBar:SetUnit(unit, displayedUnit)
+				end
+
+				self:UpdateName()
+				self:UpdateTargetOverlay()
+				self:UpdateHealthColor()
+			end
+		end,
+
+		--update the unit frame and its widgets
+		UpdateUnitFrame = function(self)
+			local unitInVehicle = self:CheckVehiclePossession()
+
+			--if the unit is inside a vehicle, the vehicle possession function will call an update on all widgets
+			if (not unitInVehicle) then
+				self:UpdateAllWidgets()
+			end
+		end,
+
+		--event handles
+		PLAYER_ENTERING_WORLD = function(self, ...)
+			self:UpdateUnitFrame()
+		end,
+
+		--update overlays when the player changes its target
+		PLAYER_TARGET_CHANGED = function(self, ...)
+			self:UpdateTargetOverlay()
+		end,
+
+		--unit received a name update
+		UNIT_NAME_UPDATE = function(self, ...)
+			self:UpdateName()
+		end,
+
+		--this is registered only if .settings.ColorByAggro is true
+		UNIT_THREAT_LIST_UPDATE = function(self, ...)
+			if (self.Settings.ColorByAggro) then
+				self:UpdateHealthColor()
+			end
+		end,
+
+		--vehicle
+		UNIT_ENTERED_VEHICLE = function(self, ...)
+			self:UpdateUnitFrame()
+		end,
+		UNIT_EXITED_VEHICLE = function(self, ...)
+			self:UpdateUnitFrame()
+		end,
+
+		--pet
+		UNIT_PET = function(self, ...)
+			self:UpdateUnitFrame()
+		end,
+
+		--player connection
+		UNIT_CONNECTION = function(self, ...)
+			if (UnitIsConnected (self.unit)) then
+				self:UpdateUnitFrame()
+			end
+		end,
+		PARTY_MEMBER_ENABLE = function(self, ...)
+			if (UnitIsConnected (self.unit)) then
+				self:UpdateName()
+			end
+		end,
+	}
+
+-- ~unitframe
+local globalBaseFrameLevel = 1 -- to be increased + used across each new plate
+function detailsFramework:CreateUnitFrame(parent, name, unitFrameSettingsOverride, healthBarSettingsOverride, castBarSettingsOverride, powerBarSettingsOverride)
+	local parentName = name or ("DetailsFrameworkUnitFrame" .. tostring(math.random(1, 100000000)))
+
+	--create the main unit frame
+	local mewUnitFrame = CreateFrame("button", parentName, parent, "BackdropTemplate")
+
+	--base level
+	--local baseFrameLevel = f:GetFrameLevel()
+	local baseFrameLevel = globalBaseFrameLevel
+	globalBaseFrameLevel = globalBaseFrameLevel + 50
+
+	mewUnitFrame:SetFrameLevel(baseFrameLevel)
+
+	--create the healthBar
+	local healthBar = detailsFramework:CreateHealthBar(mewUnitFrame, false, healthBarSettingsOverride)
+	healthBar:SetFrameLevel(baseFrameLevel + 1)
+	mewUnitFrame.healthBar = healthBar
+
+	--create the power bar
+	local powerBar = detailsFramework:CreatePowerBar(mewUnitFrame, false, powerBarSettingsOverride)
+	powerBar:SetFrameLevel(baseFrameLevel + 2)
+	mewUnitFrame.powerBar = powerBar
+
+	--create the castBar
+	local castBar = detailsFramework:CreateCastBar(mewUnitFrame, false, castBarSettingsOverride)
+	castBar:SetFrameLevel(baseFrameLevel + 3)
+	mewUnitFrame.castBar = castBar
+
+	--border frame
+	local borderFrame = detailsFramework:CreateBorderFrame(mewUnitFrame, mewUnitFrame:GetName() .. "Border")
+	borderFrame:SetFrameLevel(mewUnitFrame:GetFrameLevel() + 5)
+	mewUnitFrame.border = borderFrame
+
+	--overlay frame (widgets that need to stay above the unit frame)
+	local overlayFrame = CreateFrame("frame", "$parentOverlayFrame", mewUnitFrame, "BackdropTemplate")
+	overlayFrame:SetFrameLevel(mewUnitFrame:GetFrameLevel() + 6)
+	mewUnitFrame.overlayFrame = overlayFrame
+
+	--unit frame layers
+		do
+			--artwork
+			mewUnitFrame.unitName = mewUnitFrame:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
+			PixelUtil.SetPoint(mewUnitFrame.unitName, "topleft", healthBar, "topleft", 2, -2, 1, 1)
+
+			--target overlay - it's parented in the healthbar so other widgets won't get the overlay
+			mewUnitFrame.targetOverlay = overlayFrame:CreateTexture(nil, "artwork")
+			mewUnitFrame.targetOverlay:SetTexture(healthBar:GetTexture())
+			mewUnitFrame.targetOverlay:SetBlendMode("ADD")
+			mewUnitFrame.targetOverlay:SetAlpha(.5)
+			mewUnitFrame.targetOverlay:SetAllPoints(healthBar)
+		end
+
+	--mixins
+		--inject mixins
+		detailsFramework:Mixin(mewUnitFrame, detailsFramework.UnitFrameFunctions)
+
+		--create the settings table and copy the overrides into it, the table is set into the frame after the mixin
+		local unitFrameSettings = detailsFramework.table.copy({}, detailsFramework.UnitFrameFunctions.Settings)
+		if (unitFrameSettingsOverride) then
+			unitFrameSettings = detailsFramework.table.copy(unitFrameSettings, unitFrameSettingsOverride)
+		end
+		mewUnitFrame.Settings = unitFrameSettings
+
+	--initialize scripts
+		--unitframe
+		mewUnitFrame:Initialize()
+
+	return mewUnitFrame
+end
\ No newline at end of file
diff --git a/Libs/LibLuaServer/LibLuaServer.lua b/Libs/LibLuaServer/LibLuaServer.lua
index 29c19142..198d10dd 100644
--- a/Libs/LibLuaServer/LibLuaServer.lua
+++ b/Libs/LibLuaServer/LibLuaServer.lua
@@ -221,6 +221,9 @@
 ---@alias coordright number
 ---@alias coordtop number
 ---@alias coordbottom number
+---@alias addonname string name of an addon, same as the name of the ToC file.
+---@alias profile table a table containing the settings of an addon, usually saved in the SavedVariables file.
+---@alias profilename string name of a profile.
 
 ---@class _G
 ---@field RegisterAttributeDriver fun(statedriver: frame, attribute: string, conditional: string)
diff --git a/Libs/LibOpenRaid/GetPlayerInformation.lua b/Libs/LibOpenRaid/GetPlayerInformation.lua
index 7482c395..a019b031 100644
--- a/Libs/LibOpenRaid/GetPlayerInformation.lua
+++ b/Libs/LibOpenRaid/GetPlayerInformation.lua
@@ -925,5 +925,6 @@ openRaidLib.specAttribute = {
     ["EVOKER"] = {
         [1467] = 1, --Devastation
         [1468] = 1, --Preservation
+        [1473] = 1, --Augmentation
     },
 }
diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua
index c78c2c8a..acce5ce5 100644
--- a/Libs/LibOpenRaid/LibOpenRaid.lua
+++ b/Libs/LibOpenRaid/LibOpenRaid.lua
@@ -39,7 +39,7 @@ if (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and not isExpansion_Dragonflight()) t
 end
 
 local major = "LibOpenRaid-1.0"
-local CONST_LIB_VERSION = 108
+local CONST_LIB_VERSION = 111
 
 if (LIB_OPEN_RAID_MAX_VERSION) then
     if (CONST_LIB_VERSION <= LIB_OPEN_RAID_MAX_VERSION) then
@@ -1363,7 +1363,8 @@ end
 --talent update (when the player changes a talent and the lib needs to notify other players in the group)
 function openRaidLib.UnitInfoManager.SendTalentUpdate()
     --talents
-    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo("player", true)
+    local playerName = UnitName("player")
+    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo(playerName, true)
     local talentsToSend = unitInfo.talents
     local dataToSend = "" .. CONST_COMM_PLAYERINFO_TALENTS_PREFIX .. ","
     local talentsString = openRaidLib.PackTable(talentsToSend)
@@ -1375,16 +1376,25 @@ function openRaidLib.UnitInfoManager.SendTalentUpdate()
 end
 
 function openRaidLib.UnitInfoManager.OnPlayerTalentChanged()
-    --update the local player
-    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo("player", true)
-    local unitName = UnitName("player")
-    openRaidLib.UnitInfoManager.SetUnitInfo(unitName, unitInfo, nil, nil, nil, openRaidLib.UnitInfoManager.GetPlayerTalents())
+    --this talent update could be a specialization change, so we need to pass the specId as well
+    local playerName = UnitName("player")
+    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo(playerName, true)
+    local specId = 0
 
-    --schedule send to the group
-    openRaidLib.Schedules.NewUniqueTimer(1 + math.random(0, 1), openRaidLib.UnitInfoManager.SendTalentUpdate, "UnitInfoManager", "sendTalent_Schedule")
+    if (getSpecializationVersion() == CONST_SPECIALIZATION_VERSION_MODERN) then
+        local selectedSpecialization = GetSpecialization()
+        if (selectedSpecialization) then
+            specId = GetSpecializationInfo(selectedSpecialization) or 0
+        end
+    end
+
+    openRaidLib.UnitInfoManager.SetUnitInfo(playerName, unitInfo, specId, nil, nil, openRaidLib.UnitInfoManager.GetPlayerTalents())
 
     --trigger public callback event
     openRaidLib.publicCallback.TriggerCallback("TalentUpdate", "player", unitInfo.talents, unitInfo, openRaidLib.UnitInfoManager.GetAllUnitsInfo())
+
+    --schedule send to the group
+    openRaidLib.Schedules.NewUniqueTimer(1 + math.random(0, 1), openRaidLib.UnitInfoManager.SendTalentUpdate, "UnitInfoManager", "sendTalent_Schedule")
 end
 openRaidLib.internalCallback.RegisterCallback("talentUpdate", openRaidLib.UnitInfoManager.OnPlayerTalentChanged)
 
@@ -1403,7 +1413,8 @@ openRaidLib.commHandler.RegisterComm(CONST_COMM_PLAYERINFO_TALENTS_PREFIX, openR
 --pvp talent update (when the player changes a pvp talent and the lib needs to notify other players in the group)
 function openRaidLib.UnitInfoManager.SendPvPTalentUpdate()
     --pvp talents
-    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo("player", true)
+    local playerName = UnitName("player")
+    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo(playerName, true)
     local pvpTalentsToSend = unitInfo.pvpTalents
     local pvpTalentsString = openRaidLib.PackTable(pvpTalentsToSend)
 
@@ -1417,9 +1428,9 @@ end
 
 function openRaidLib.UnitInfoManager.OnPlayerPvPTalentChanged()
     --update the local player
-    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo("player", true)
-    local unitName = UnitName("player")
-    openRaidLib.UnitInfoManager.SetUnitInfo(unitName, unitInfo, nil, nil, nil, nil, nil, openRaidLib.UnitInfoManager.GetPlayerPvPTalents())
+    local playerName = UnitName("player")
+    local unitInfo = openRaidLib.UnitInfoManager.GetUnitInfo(playerName, true)
+    openRaidLib.UnitInfoManager.SetUnitInfo(playerName, unitInfo, nil, nil, nil, nil, nil, openRaidLib.UnitInfoManager.GetPlayerPvPTalents())
 
     --schedule send to the group
     openRaidLib.Schedules.NewUniqueTimer(1 + math.random(0, 1), openRaidLib.UnitInfoManager.SendPvPTalentUpdate, "UnitInfoManager", "sendPvPTalent_Schedule")
@@ -1584,7 +1595,7 @@ openRaidLib.internalCallback.RegisterCallback("onLeaveCombat", openRaidLib.UnitI
         local itemLevel = openRaidLib.GearManager.GetPlayerItemLevel()
 
         --repair status
-        local gearDurability = openRaidLib.GearManager.GetPlayerGearDurability()
+        local gearDurability, lowestItemDurability = openRaidLib.GearManager.GetPlayerGearDurability()
 
         --get weapon enchant
         local weaponEnchant, mainHandEnchantId, offHandEnchantId = openRaidLib.GearManager.GetPlayerWeaponEnchant()
diff --git a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua
index ed39cf2b..54505dd0 100644
--- a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua
+++ b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua
@@ -393,6 +393,7 @@ do
 			[213644] = {cooldown = 8,	duration = 0,	specs = {66,70},			talent = false,	charges = 1,	class = "PALADIN",	type = 7}, --Cleanse Toxins
 			[389539] = {cooldown = 120,	duration = 20,	specs = {66},			talent = false,	charges = 1,	class = "PALADIN",	type = 2}, --Sentinel
 			[31935] = {cooldown = 13,	duration = 0,	specs = {66},			talent = false,	charges = 1,	class = "PALADIN",	type = 6}, --Avenger's Shield
+			[387174] = {cooldown = 60,	duration = 9,	specs = {66},			talent = false,	charges = 1,	class = "PALADIN",	type = 2}, --Eye of Tyr
 
 			--~warrior
 			-- 71 - Arms
diff --git a/boot.lua b/boot.lua
index 5d8494b7..0d50c156 100644
--- a/boot.lua
+++ b/boot.lua
@@ -976,6 +976,7 @@ do
 		SharedMedia:Register("statusbar", "Splitbar", [[Interface\AddOns\Details\images\bar_textures\split_bar]])
 		SharedMedia:Register("statusbar", "Details2020", [[Interface\AddOns\Details\images\bar_textures\texture2020]])
 		SharedMedia:Register("statusbar", "Left White Gradient", [[Interface\AddOns\Details\images\bar_textures\gradient_white_10percent_left]])
+		SharedMedia:Register("statusbar", "Details! Slash", [[Interface\AddOns\Details\images\bar_textures\bar_of_bars.png]])
 
 		--window bg and bar order
 		SharedMedia:Register("background", "Details Ground", [[Interface\AddOns\Details\images\background]])
diff --git a/classes/class_damage.lua b/classes/class_damage.lua
index 33366a67..fce33ea7 100644
--- a/classes/class_damage.lua
+++ b/classes/class_damage.lua
@@ -46,7 +46,7 @@
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --constants
 
-	local container_habilidades	= 	Details.container_habilidades
+	local spellContainerClass	= 	Details.container_habilidades
 	local damageClass	=	Details.atributo_damage
 	local atributo_misc		=	Details.atributo_misc
 	local container_damage	=	Details.container_type.CONTAINER_DAMAGE_CLASS
@@ -304,23 +304,23 @@ local void_zone_sort = function(t1, t2)
 end
 
 
-function Details.Sort1 (table1, table2) --[[exported]]
+function Details.Sort1(table1, table2) --[[exported]]
 	return table1[1] > table2[1]
 end
 
-function Details.Sort2 (table1, table2) --[[exported]]
+function Details.Sort2(table1, table2) --[[exported]]
 	return table1[2] > table2[2]
 end
 
-function Details.Sort3 (table1, table2) --[[exported]]
+function Details.Sort3(table1, table2) --[[exported]]
 	return table1[3] > table2[3]
 end
 
-function Details.Sort4 (table1, table2) --[[exported]]
+function Details.Sort4(table1, table2) --[[exported]]
 	return table1[4] > table2[4]
 end
 
-function Details.Sort4Reverse (table1, table2) --[[exported]]
+function Details.Sort4Reverse(table1, table2) --[[exported]]
 	if (not table2) then
 		return true
 	end
@@ -456,7 +456,7 @@ end
 			--targets: table where key is the target name (actor name) and the value is the amount of damage done to that target
 			targets = {},
 			--spells: spell container
-			spells = container_habilidades:NovoContainer(container_damage)
+			spells = spellContainerClass:NovoContainer(container_damage)
 		}
 
 		setmetatable(newDamageActor, damageClass)
@@ -470,9 +470,6 @@ end
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --special cases
 
-	--todo: Details.use_realtimedps "realtimedps_order_bars" need to come from the sorter function.
-	--todo: "realtimedps_always_arena" need to come from the sorter function because it'll have "realtimedps_order_bars" always on.
-
 	---calculate real time dps for each actor within the passed table
 	---@param tableWithActors actor[]
 	---@return number
@@ -3411,7 +3408,7 @@ function damageClass.PredictedAugSpellsOnEnter(self)
 
 			table.sort(spellsAugmented, Details.Sort2)
 
-			for i = 1, #spellsAugmented do
+			for i = 1, math.min(#spellsAugmented, 5) do
 				local sourceName, sourceAmount = unpack(spellsAugmented[i])
 				GameCooltip:AddLine(sourceName, Details:Format(sourceAmount), 1, "yellow", "yellow", 10)
 				local actorObject = combatObject:GetActor(1, sourceName)
@@ -6706,6 +6703,17 @@ end
 			end
 		end
 
+		if (actorObject.augmentedSpellsContainer) then
+			local overallAugmentedSpellsContainer = overallActor.augmentedSpellsContainer or spellContainerClass:CreateSpellContainer(Details.container_type.CONTAINER_DAMAGE_CLASS)
+			for spellId, spellTable in pairs(actorObject.augmentedSpellsContainer._ActorTable) do --same as actorObject.augmentedSpellsContainer:GetRawSpellTable()
+				local overallSpellTable = overallAugmentedSpellsContainer:GetOrCreateSpell(spellId, true)
+				overallSpellTable.total = overallSpellTable.total + spellTable.total
+				for targetName, amount in pairs(spellTable.targets) do
+					overallSpellTable.targets[targetName] = (overallSpellTable.targets[targetName] or 0) + amount
+				end
+			end
+		end
+
 		--copy the friendly fire container
 		for targetName, friendlyFireTable in pairs(actorObject.friendlyfire) do
 			--get or create the friendly fire table in the overall data
@@ -6722,7 +6730,7 @@ end
 	end
 
 --actor 1 is who will receive the sum from actor2
-function Details.SumDamageActors(actor1, actor2, actorContainer)
+function Details.SumDamageActors(actor1, actor2, actorContainer) --not called anywhere, can be deprecated
 	--general
 	actor1.total = actor1.total + actor2.total
 	actor1.damage_taken = actor1.damage_taken + actor2.damage_taken
diff --git a/classes/class_spellutility.lua b/classes/class_spellutility.lua
index 488f56d0..64b48f3f 100644
--- a/classes/class_spellutility.lua
+++ b/classes/class_spellutility.lua
@@ -2,91 +2,81 @@
 	local _detalhes = 		_G.Details
 	local _
 	local addonName, Details222 = ...
+	local classUtility		=	_detalhes.habilidade_misc
 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---local pointers
-
-	local setmetatable = setmetatable --lua local
-	local ipairs = ipairs --lua local
-	local _UnitAura = UnitAura --api local
-
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---constants
-
-	local alvo_da_habilidade	=	_detalhes.alvo_da_habilidade
-	local habilidade_misc		=	_detalhes.habilidade_misc
-	local container_combatentes	=	_detalhes.container_combatentes
-	local container_misc_target	= 	_detalhes.container_type.CONTAINER_MISCTARGET_CLASS
-	local container_playernpc	=	_detalhes.container_type.CONTAINER_PLAYERNPC
-
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---internals
-
-	function habilidade_misc:NovaTabela (id, link, token)
-
-		local _newMiscSpell = {
+	function classUtility:NovaTabela(id, link, token)
+		local spellTable = {
 			id = id,
 			counter = 0,
 			targets = {}
 		}
 
 		if (token == "BUFF_UPTIME" or token == "DEBUFF_UPTIME") then
-			_newMiscSpell.uptime = 0
-			_newMiscSpell.actived = false
-			_newMiscSpell.activedamt = 0 --s�o quantos estao ativados no momento
-			_newMiscSpell.refreshamt = 0
-			_newMiscSpell.appliedamt = 0
+			spellTable.uptime = 0
+			spellTable.actived = false
+			spellTable.activedamt = 0 --amount of active auras
+			spellTable.refreshamt = 0
+			spellTable.appliedamt = 0
 
 		elseif (token == "SPELL_INTERRUPT") then
-			_newMiscSpell.interrompeu_oque = {}
+			spellTable.interrompeu_oque = {}
 
 		elseif (token == "SPELL_DISPEL" or token == "SPELL_STOLEN") then
-			_newMiscSpell.dispell_oque = {}
+			spellTable.dispell_oque = {}
 
 		elseif (token == "SPELL_AURA_BROKEN" or token == "SPELL_AURA_BROKEN_SPELL") then
-			_newMiscSpell.cc_break_oque = {}
-
+			spellTable.cc_break_oque = {}
 		end
 
-		return _newMiscSpell
+		return spellTable
 	end
 
-	function habilidade_misc:Add (serial, nome, flag, who_nome, token, spellID, spellName)
-		local actorUtilityObject = token
-
-		if (spellID == "BUFF_OR_DEBUFF") then
+	---@param self spelltable
+	---@param targetName string
+	---@param targetFlags number
+	---@param sourceName string
+	---@param token string|actor
+	---@param spellId number
+	---@param spellName string
+	function classUtility:Add(targetSerial, targetName, targetFlags, sourceName, token, spellId, spellName)
+		--as the passed parameters for aura are different from the reset of the abilities, this should be a different function
+		if (spellId == "BUFF_OR_DEBUFF") then
+			local actorUtilityObject = token
 			local parserToken = spellName
+
 			if (parserToken == "COOLDOWN") then
 				self.counter = self.counter + 1
-				--target
-				self.targets [nome] = (self.targets [nome] or 0) + 1
+				self.targets[targetName] = (self.targets[targetName] or 0) + 1
 
 			elseif (parserToken == "BUFF_UPTIME_REFRESH") then
 				if (self.actived_at and self.actived) then
-					self.uptime = self.uptime + _detalhes._tempo - self.actived_at
+					self.uptime = self.uptime + (_detalhes._tempo - self.actived_at)
 					self.refreshamt = self.refreshamt + 1
-					actorUtilityObject.buff_uptime = actorUtilityObject.buff_uptime + _detalhes._tempo - self.actived_at
+					actorUtilityObject.buff_uptime = actorUtilityObject.buff_uptime + (_detalhes._tempo - self.actived_at)
 				end
+
 				self.actived_at = _detalhes._tempo
 				self.actived = true
 
 			elseif (parserToken == "BUFF_UPTIME_OUT") then
 				if (self.actived_at and self.actived) then
-					self.uptime = self.uptime + _detalhes._tempo - self.actived_at
-					actorUtilityObject.buff_uptime = actorUtilityObject.buff_uptime + _detalhes._tempo - self.actived_at
+					self.uptime = self.uptime + (_detalhes._tempo - self.actived_at)
+					actorUtilityObject.buff_uptime = actorUtilityObject.buff_uptime + (_detalhes._tempo - self.actived_at)
 				end
+
 				self.actived = false
 				self.actived_at = nil
 
 			elseif (parserToken == "BUFF_UPTIME_IN" or parserToken == "DEBUFF_UPTIME_IN") then
+				--aura applied
 				self.actived = true
 				self.activedamt = self.activedamt + 1
 				self.appliedamt = self.appliedamt + 1
 
 				if (self.actived_at and self.actived and parserToken == "DEBUFF_UPTIME_IN") then
 					--ja esta ativo em outro mob e jogou num novo
-					self.uptime = self.uptime + _detalhes._tempo - self.actived_at
-					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + _detalhes._tempo - self.actived_at
+					self.uptime = self.uptime + (_detalhes._tempo - self.actived_at)
+					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + (_detalhes._tempo - self.actived_at)
 				end
 
 				self.actived_at = _detalhes._tempo
@@ -97,17 +87,18 @@
 
 			elseif (parserToken == "DEBUFF_UPTIME_REFRESH") then
 				if (self.actived_at and self.actived) then
-					self.uptime = self.uptime + _detalhes._tempo - self.actived_at
+					self.uptime = self.uptime + (_detalhes._tempo - self.actived_at)
 					self.refreshamt = self.refreshamt + 1
-					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + _detalhes._tempo - self.actived_at
+					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + (_detalhes._tempo - self.actived_at)
 				end
+
 				self.actived_at = _detalhes._tempo
 				self.actived = true
 
 			elseif (parserToken == "DEBUFF_UPTIME_OUT") then
 				if (self.actived_at and self.actived) then
-					self.uptime = self.uptime + _detalhes._tempo - self.actived_at
-					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + _detalhes._tempo - self.actived_at
+					self.uptime = self.uptime + (_detalhes._tempo - self.actived_at)
+					actorUtilityObject.debuff_uptime = actorUtilityObject.debuff_uptime + (_detalhes._tempo - self.actived_at)
 				end
 
 				self.activedamt = self.activedamt - 1
@@ -123,42 +114,42 @@
 		elseif (token == "SPELL_INTERRUPT") then
 			self.counter = self.counter + 1
 
-			if (not self.interrompeu_oque [spellID]) then
-				self.interrompeu_oque [spellID] = 1
+			if (not self.interrompeu_oque[spellId]) then
+				self.interrompeu_oque[spellId] = 1
 			else
-				self.interrompeu_oque [spellID] = self.interrompeu_oque [spellID] + 1
+				self.interrompeu_oque[spellId] = self.interrompeu_oque[spellId] + 1
 			end
 
 			--target
-			self.targets [nome] = (self.targets [nome] or 0) + 1
+			self.targets[targetName] = (self.targets[targetName] or 0) + 1
 
 		elseif (token == "SPELL_RESURRECT") then
 			self.ress = (self.ress or 0) + 1
 			--target
-			self.targets [nome] = (self.targets [nome] or 0) + 1
+			self.targets[targetName] = (self.targets[targetName] or 0) + 1
 
 		elseif (token == "SPELL_DISPEL" or token == "SPELL_STOLEN") then
 			self.dispell = (self.dispell or 0) + 1
 
-			if (not self.dispell_oque [spellID]) then
-				self.dispell_oque [spellID] = 1
+			if (not self.dispell_oque[spellId]) then
+				self.dispell_oque[spellId] = 1
 			else
-				self.dispell_oque [spellID] = self.dispell_oque [spellID] + 1
+				self.dispell_oque[spellId] = self.dispell_oque[spellId] + 1
 			end
 
 			--target
-			self.targets [nome] = (self.targets [nome] or 0) + 1
+			self.targets[targetName] = (self.targets[targetName] or 0) + 1
 
 		elseif (token == "SPELL_AURA_BROKEN_SPELL" or token == "SPELL_AURA_BROKEN") then
 			self.cc_break = (self.cc_break or 0) + 1
 
-			if (not self.cc_break_oque [spellID]) then
-				self.cc_break_oque [spellID] = 1
+			if (not self.cc_break_oque[spellId]) then
+				self.cc_break_oque[spellId] = 1
 			else
-				self.cc_break_oque [spellID] = self.cc_break_oque [spellID] + 1
+				self.cc_break_oque[spellId] = self.cc_break_oque[spellId] + 1
 			end
 
 			--target
-			self.targets [nome] = (self.targets [nome] or 0) + 1
+			self.targets[targetName] = (self.targets[targetName] or 0) + 1
 		end
 	end
\ No newline at end of file
diff --git a/classes/class_utility.lua b/classes/class_utility.lua
index d53ce036..d88448b2 100644
--- a/classes/class_utility.lua
+++ b/classes/class_utility.lua
@@ -2398,8 +2398,8 @@ function atributo_misc:r_onlyrefresh_shadow (actor)
 
 	--cc done
 		if (actor.cc_done) then
-			refresh_alvos (shadow.cc_done_targets, actor.cc_done_targets)
-			refresh_habilidades (shadow.cc_done_spells, actor.cc_done_spells)
+			refresh_alvos(shadow.cc_done_targets, actor.cc_done_targets)
+			refresh_habilidades(shadow.cc_done_spells, actor.cc_done_spells)
 		end
 
 	--cooldowns
@@ -2412,6 +2412,10 @@ function atributo_misc:r_onlyrefresh_shadow (actor)
 		if (actor.buff_uptime) then
 			refresh_alvos (shadow.buff_uptime_targets, actor.buff_uptime_targets)
 			refresh_habilidades (shadow.buff_uptime_spells, actor.buff_uptime_spells)
+
+			if (actor.received_buffs_spells) then
+				refresh_habilidades(shadow.received_buffs_spells, actor.received_buffs_spells)
+			end
 		end
 
 	--debuff uptime
@@ -2462,45 +2466,45 @@ function atributo_misc:r_onlyrefresh_shadow (actor)
 		end
 
 	return shadow
-
 end
 
-local somar_keys = function(habilidade, habilidade_tabela1)
+local sumKeyValues = function(habilidade, habilidade_tabela1)
 	for key, value in pairs(habilidade) do
 		if (type(value) == "number") then
 			if (key ~= "id" and key ~= "spellschool") then
-				habilidade_tabela1 [key] = (habilidade_tabela1 [key] or 0) + value
+				habilidade_tabela1[key] = (habilidade_tabela1[key] or 0) + value
 			end
 		end
 	end
 end
-local somar_alvos = function(container1, container2)
-	for target_name, amount in pairs(container2) do
-		container1 [target_name] = (container1 [target_name] or 0) + amount
-	end
-end
-local somar_habilidades = function(container1, container2)
-	for spellid, habilidade in pairs(container2._ActorTable) do
-		local habilidade_tabela1 = container1:PegaHabilidade (spellid, true, nil, false)
-		somar_alvos (habilidade_tabela1.targets, habilidade.targets)
-		somar_keys (habilidade, habilidade_tabela1)
+
+local sumTargetValues = function(container1, container2)
+	for targetName, amount in pairs(container2) do
+		container1[targetName] = (container1[targetName] or 0) + amount
 	end
 end
 
-function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
+local sumSpellTableKeyValues = function(container1, container2)
+	for spellId, spellTable in pairs(container2._ActorTable) do
+		local spellTable1 = container1:PegaHabilidade(spellId, true, nil, false)
+		sumTargetValues(spellTable1.targets, spellTable.targets)
+		sumKeyValues(spellTable, spellTable1)
+	end
+end
 
+function atributo_misc:r_connect_shadow(actor, no_refresh, combat_object)
 	local host_combat = combat_object or _detalhes.tabela_overall
 
 	--criar uma shadow desse ator se ainda n�o tiver uma
-	local overall_misc = host_combat [4]
-	local shadow = overall_misc._ActorTable [overall_misc._NameIndexTable [actor.nome]]
+	local overall_misc = host_combat[4]
+	local shadow = overall_misc._ActorTable[overall_misc._NameIndexTable[actor.nome]]
 
 	if (not actor.nome) then
 		actor.nome = "unknown"
 	end
 
 	if (not shadow) then
-		shadow = overall_misc:PegarCombatente (actor.serial, actor.nome, actor.flag_original, true)
+		shadow = overall_misc:PegarCombatente(actor.serial, actor.nome, actor.flag_original, true)
 
 		shadow.classe = actor.classe
 		shadow:SetSpecId(actor.spec)
@@ -2510,30 +2514,29 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 		shadow.boss = actor.boss
 		shadow.boss_fight_component = actor.boss_fight_component
 		shadow.fight_component = actor.fight_component
-
 	end
 
 	--aplica a meta e indexes
 	if (not no_refresh) then
-		_detalhes.refresh:r_atributo_misc (actor, shadow)
+		_detalhes.refresh:r_atributo_misc(actor, shadow)
 	end
 
 	--pets (add unique pet names)
 	for _, petName in ipairs(actor.pets) do
-		DetailsFramework.table.addunique (shadow.pets, petName)
+		DetailsFramework.table.addunique(shadow.pets, petName)
 	end
 
 	if (actor.cc_done) then
 		if (not shadow.cc_done_targets) then
 			shadow.cc_done = _detalhes:GetOrderNumber()
 			shadow.cc_done_targets = {}
-			shadow.cc_done_spells = container_habilidades:NovoContainer (_detalhes.container_type.CONTAINER_MISC_CLASS)
+			shadow.cc_done_spells = container_habilidades:NovoContainer(_detalhes.container_type.CONTAINER_MISC_CLASS)
 		end
 
 		shadow.cc_done = shadow.cc_done + actor.cc_done
 
-		somar_alvos (shadow.cc_done_targets, actor.cc_done_targets)
-		somar_habilidades (shadow.cc_done_spells, actor.cc_done_spells)
+		sumTargetValues(shadow.cc_done_targets, actor.cc_done_targets)
+		sumSpellTableKeyValues(shadow.cc_done_spells, actor.cc_done_spells)
 	end
 
 	if (actor.cooldowns_defensive) then
@@ -2549,8 +2552,8 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			host_combat.totals_grupo[4].cooldowns_defensive = host_combat.totals_grupo[4].cooldowns_defensive + actor.cooldowns_defensive
 		end
 
-		somar_alvos (shadow.cooldowns_defensive_targets, actor.cooldowns_defensive_targets)
-		somar_habilidades (shadow.cooldowns_defensive_spells, actor.cooldowns_defensive_spells)
+		sumTargetValues (shadow.cooldowns_defensive_targets, actor.cooldowns_defensive_targets)
+		sumSpellTableKeyValues (shadow.cooldowns_defensive_spells, actor.cooldowns_defensive_spells)
 	end
 
 	if (actor.buff_uptime) then
@@ -2560,9 +2563,16 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			shadow.buff_uptime_spells = container_habilidades:NovoContainer (_detalhes.container_type.CONTAINER_MISC_CLASS)
 		end
 
+		if (actor.received_buffs_spells) then
+			if (not shadow.received_buffs_spells) then
+				shadow.received_buffs_spells = container_habilidades:NovoContainer(_detalhes.container_type.CONTAINER_MISC_CLASS)
+			end
+			sumSpellTableKeyValues(shadow.received_buffs_spells, actor.received_buffs_spells)
+		end
+
 		shadow.buff_uptime = shadow.buff_uptime + actor.buff_uptime
-		somar_alvos (shadow.buff_uptime_targets, actor.buff_uptime_targets)
-		somar_habilidades (shadow.buff_uptime_spells, actor.buff_uptime_spells)
+		sumTargetValues (shadow.buff_uptime_targets, actor.buff_uptime_targets)
+		sumSpellTableKeyValues (shadow.buff_uptime_spells, actor.buff_uptime_spells)
 	end
 
 
@@ -2600,7 +2610,7 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			end
 		end
 
-		somar_habilidades (shadow.debuff_uptime_spells, actor.debuff_uptime_spells)
+		sumSpellTableKeyValues (shadow.debuff_uptime_spells, actor.debuff_uptime_spells)
 	end
 
 	--interrupt
@@ -2618,8 +2628,8 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			host_combat.totals_grupo[4].interrupt = host_combat.totals_grupo[4].interrupt + actor.interrupt
 		end
 
-		somar_alvos (shadow.interrupt_targets, actor.interrupt_targets)
-		somar_habilidades (shadow.interrupt_spells, actor.interrupt_spells)
+		sumTargetValues (shadow.interrupt_targets, actor.interrupt_targets)
+		sumSpellTableKeyValues (shadow.interrupt_spells, actor.interrupt_spells)
 
 		for spellid, habilidade in pairs(actor.interrupt_spells._ActorTable) do
 			local habilidade_shadow = shadow.interrupt_spells:PegaHabilidade (spellid, true, nil, true)
@@ -2649,8 +2659,8 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			host_combat.totals_grupo[4].ress = host_combat.totals_grupo[4].ress + actor.ress
 		end
 
-		somar_alvos (shadow.ress_targets, actor.ress_targets)
-		somar_habilidades (shadow.ress_spells, actor.ress_spells)
+		sumTargetValues (shadow.ress_targets, actor.ress_targets)
+		sumSpellTableKeyValues (shadow.ress_spells, actor.ress_spells)
 	end
 
 	--dispell
@@ -2668,8 +2678,8 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			host_combat.totals_grupo[4].dispell = host_combat.totals_grupo[4].dispell + actor.dispell
 		end
 
-		somar_alvos (shadow.dispell_targets, actor.dispell_targets)
-		somar_habilidades (shadow.dispell_spells, actor.dispell_spells)
+		sumTargetValues (shadow.dispell_targets, actor.dispell_targets)
+		sumSpellTableKeyValues (shadow.dispell_spells, actor.dispell_spells)
 
 		for spellid, habilidade in pairs(actor.dispell_spells._ActorTable) do
 			local habilidade_shadow = shadow.dispell_spells:PegaHabilidade (spellid, true, nil, true)
@@ -2698,8 +2708,8 @@ function atributo_misc:r_connect_shadow (actor, no_refresh, combat_object)
 			host_combat.totals_grupo[4].cc_break = host_combat.totals_grupo[4].cc_break + actor.cc_break
 		end
 
-		somar_alvos (shadow.cc_break_targets, actor.cc_break_targets)
-		somar_habilidades (shadow.cc_break_spells, actor.cc_break_spells)
+		sumTargetValues (shadow.cc_break_targets, actor.cc_break_targets)
+		sumSpellTableKeyValues (shadow.cc_break_spells, actor.cc_break_spells)
 
 		for spellid, habilidade in pairs(actor.cc_break_spells._ActorTable) do
 			local habilidade_shadow = shadow.cc_break_spells:PegaHabilidade (spellid, true, nil, true)
@@ -2749,9 +2759,18 @@ function _detalhes.refresh:r_atributo_misc(thisActor, shadow)
 		if (shadow and not shadow.buff_uptime_targets) then
 			shadow.buff_uptime = 0
 			shadow.buff_uptime_targets = {}
-			shadow.buff_uptime_spells = container_habilidades:NovoContainer (_detalhes.container_type.CONTAINER_MISC_CLASS)
+			shadow.buff_uptime_spells = container_habilidades:NovoContainer(_detalhes.container_type.CONTAINER_MISC_CLASS)
+
+			if (thisActor.received_buffs_spells) then
+				shadow.received_buffs_spells = container_habilidades:NovoContainer(_detalhes.container_type.CONTAINER_MISC_CLASS)
+			end
+		end
+
+		_detalhes.refresh:r_container_habilidades(thisActor.buff_uptime_spells, shadow and shadow.buff_uptime_spells)
+
+		if (thisActor.received_buffs_spells) then
+			_detalhes.refresh:r_container_habilidades(thisActor.received_buffs_spells, shadow and shadow.received_buffs_spells)
 		end
-		_detalhes.refresh:r_container_habilidades (thisActor.buff_uptime_spells, shadow and shadow.buff_uptime_spells)
 	end
 
 	--refresh buff uptime
@@ -2834,7 +2853,11 @@ function _detalhes.clear:c_atributo_misc (este_jogador)
 	end
 
 	if (este_jogador.buff_uptime_targets) then
-		_detalhes.clear:c_container_habilidades (este_jogador.buff_uptime_spells)
+		_detalhes.clear:c_container_habilidades(este_jogador.buff_uptime_spells)
+
+		if (este_jogador.received_buffs_spells) then
+			_detalhes.clear:c_container_habilidades(este_jogador.received_buffs_spells)
+		end
 	end
 
 	if (este_jogador.debuff_uptime_targets) then
@@ -2859,55 +2882,56 @@ atributo_misc.__add = function(tabela1, tabela2)
 	if (tabela2.cc_done) then
 		tabela1.cc_done = tabela1.cc_done + tabela2.cc_done
 
-		for target_name, amount in pairs(tabela2.cc_done_targets) do
-			tabela1.cc_done_targets [target_name] = (tabela1.cc_done_targets [target_name] or 0) + amount
+		for targetName, amount in pairs(tabela2.cc_done_targets) do
+			tabela1.cc_done_targets[targetName] = (tabela1.cc_done_targets[targetName] or 0) + amount
 		end
 
-		for spellid, habilidade in pairs(tabela2.cc_done_spells._ActorTable) do
-			local habilidade_tabela1 = tabela1.cc_done_spells:PegaHabilidade (spellid, true, nil, false)
+		for spellId, spellTable in pairs(tabela2.cc_done_spells._ActorTable) do
+			local spellTable1 = tabela1.cc_done_spells:PegaHabilidade(spellId, true, nil, false)
 
-			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+			for target_name, amount in pairs(spellTable.targets) do
+				spellTable1.targets[target_name] = (spellTable1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues(spellTable, spellTable1)
 		end
 	end
 
 	if (tabela2.interrupt) then
-
 		if (not tabela1.interrupt) then
 			tabela1.interrupt = 0
 			tabela1.interrupt_targets = {}
-			tabela1.interrupt_spells = container_habilidades:NovoContainer (container_misc)
+			tabela1.interrupt_spells = container_habilidades:NovoContainer(container_misc)
 			tabela1.interrompeu_oque = {}
 		end
 
 		--total de interrupts
 			tabela1.interrupt = tabela1.interrupt + tabela2.interrupt
+
 		--soma o interrompeu o que
 			for spellid, amount in pairs(tabela2.interrompeu_oque) do
-				tabela1.interrompeu_oque [spellid] = (tabela1.interrompeu_oque [spellid] or 0) + amount
+				tabela1.interrompeu_oque[spellid] = (tabela1.interrompeu_oque [spellid] or 0) + amount
 			end
+
 		--soma os containers de alvos
 			for target_name, amount in pairs(tabela2.interrupt_targets) do
-				tabela1.interrupt_targets [target_name] = (tabela1.interrupt_targets [target_name] or 0) + amount
+				tabela1.interrupt_targets[target_name] = (tabela1.interrupt_targets[target_name] or 0) + amount
 			end
 
 		--soma o container de habilidades
 			for spellid, habilidade in pairs(tabela2.interrupt_spells._ActorTable) do
-				local habilidade_tabela1 = tabela1.interrupt_spells:PegaHabilidade (spellid, true, nil, false)
+				local habilidade_tabela1 = tabela1.interrupt_spells:PegaHabilidade(spellid, true, nil, false)
 
 				habilidade_tabela1.interrompeu_oque = habilidade_tabela1.interrompeu_oque or {}
 				for _spellid, amount in pairs(habilidade.interrompeu_oque) do
-					habilidade_tabela1.interrompeu_oque [_spellid] = (habilidade_tabela1.interrompeu_oque [_spellid] or 0) + amount
+					habilidade_tabela1.interrompeu_oque[_spellid] = (habilidade_tabela1.interrompeu_oque[_spellid] or 0) + amount
 				end
 
 				for target_name, amount in pairs(habilidade.targets) do
-					habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+					habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 				end
 
-				somar_keys (habilidade, habilidade_tabela1)
+				sumKeyValues (habilidade, habilidade_tabela1)
 			end
 
 	end
@@ -2916,23 +2940,39 @@ atributo_misc.__add = function(tabela1, tabela2)
 		if (not tabela1.buff_uptime) then
 			tabela1.buff_uptime = 0
 			tabela1.buff_uptime_targets = {}
-			tabela1.buff_uptime_spells = container_habilidades:NovoContainer (container_misc)
+			tabela1.buff_uptime_spells = container_habilidades:NovoContainer(container_misc)
+		end
+
+		if (tabela2.received_buffs_spells) then
+			if (not tabela1.received_buffs_spells) then
+				tabela1.received_buffs_spells = container_habilidades:NovoContainer(container_misc)
+			end
+
+			for spellId, spellTable in pairs(tabela2.received_buffs_spells._ActorTable) do
+				local habilidade_tabela1 = tabela1.received_buffs_spells:PegaHabilidade(spellId, true, nil, false)
+
+				for target_name, amount in pairs(spellTable.targets) do
+					habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
+				end
+
+				sumKeyValues(spellTable, habilidade_tabela1)
+			end
 		end
 
 		tabela1.buff_uptime = tabela1.buff_uptime + tabela2.buff_uptime
 
 		for target_name, amount in pairs(tabela2.buff_uptime_targets) do
-			tabela1.buff_uptime_targets [target_name] = (tabela1.buff_uptime_targets [target_name] or 0) + amount
+			tabela1.buff_uptime_targets[target_name] = (tabela1.buff_uptime_targets[target_name] or 0) + amount
 		end
 
-		for spellid, habilidade in pairs(tabela2.buff_uptime_spells._ActorTable) do
-			local habilidade_tabela1 = tabela1.buff_uptime_spells:PegaHabilidade (spellid, true, nil, false)
+		for spellId, spellTable in pairs(tabela2.buff_uptime_spells._ActorTable) do
+			local habilidade_tabela1 = tabela1.buff_uptime_spells:PegaHabilidade(spellId, true, nil, false)
 
-			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+			for target_name, amount in pairs(spellTable.targets) do
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues(spellTable, habilidade_tabela1)
 		end
 	end
 
@@ -2956,17 +2996,17 @@ atributo_misc.__add = function(tabela1, tabela2)
 
 		for target_name, amount in pairs(tabela2.debuff_uptime_targets) do
 			if (type(amount) == "table") then --boss debuff
-				local t = tabela1.debuff_uptime_targets [target_name]
+				local t = tabela1.debuff_uptime_targets[target_name]
 				if (not t) then
-					tabela1.debuff_uptime_targets [target_name] = atributo_misc:CreateBuffTargetObject()
-					t = tabela1.debuff_uptime_targets [target_name]
+					tabela1.debuff_uptime_targets[target_name] = atributo_misc:CreateBuffTargetObject()
+					t = tabela1.debuff_uptime_targets[target_name]
 				end
 				t.uptime = t.uptime + amount.uptime
 				t.activedamt = t.activedamt + amount.activedamt
 				t.refreshamt = t.refreshamt + amount.refreshamt
 				t.appliedamt = t.appliedamt + amount.appliedamt
 			else
-				tabela1.debuff_uptime_targets [target_name] = (tabela1.debuff_uptime_targets [target_name] or 0) + amount
+				tabela1.debuff_uptime_targets[target_name] = (tabela1.debuff_uptime_targets[target_name] or 0) + amount
 			end
 		end
 
@@ -2974,10 +3014,10 @@ atributo_misc.__add = function(tabela1, tabela2)
 			local habilidade_tabela1 = tabela1.debuff_uptime_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues (habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -2991,17 +3031,17 @@ atributo_misc.__add = function(tabela1, tabela2)
 		tabela1.cooldowns_defensive = tabela1.cooldowns_defensive + tabela2.cooldowns_defensive
 
 		for target_name, amount in pairs(tabela2.cooldowns_defensive_targets) do
-			tabela1.cooldowns_defensive_targets [target_name] = (tabela1.cooldowns_defensive_targets [target_name] or 0) + amount
+			tabela1.cooldowns_defensive_targets[target_name] = (tabela1.cooldowns_defensive_targets[target_name] or 0) + amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.cooldowns_defensive_spells._ActorTable) do
 			local habilidade_tabela1 = tabela1.cooldowns_defensive_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues (habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -3015,17 +3055,17 @@ atributo_misc.__add = function(tabela1, tabela2)
 		tabela1.ress = tabela1.ress + tabela2.ress
 
 		for target_name, amount in pairs(tabela2.ress_targets) do
-			tabela1.ress_targets [target_name] = (tabela1.ress_targets [target_name] or 0) + amount
+			tabela1.ress_targets[target_name] = (tabela1.ress_targets[target_name] or 0) + amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.ress_spells._ActorTable) do
 			local habilidade_tabela1 = tabela1.ress_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues (habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -3041,7 +3081,7 @@ atributo_misc.__add = function(tabela1, tabela2)
 		tabela1.dispell = tabela1.dispell + tabela2.dispell
 
 		for target_name, amount in pairs(tabela2.dispell_targets) do
-			tabela1.dispell_targets [target_name] = (tabela1.dispell_targets [target_name] or 0) + amount
+			tabela1.dispell_targets[target_name] = (tabela1.dispell_targets[target_name] or 0) + amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.dispell_spells._ActorTable) do
@@ -3050,24 +3090,23 @@ atributo_misc.__add = function(tabela1, tabela2)
 			habilidade_tabela1.dispell_oque = habilidade_tabela1.dispell_oque or {}
 
 			for _spellid, amount in pairs(habilidade.dispell_oque) do
-				habilidade_tabela1.dispell_oque [_spellid] = (habilidade_tabela1.dispell_oque [_spellid] or 0) + amount
+				habilidade_tabela1.dispell_oque[_spellid] = (habilidade_tabela1.dispell_oque[_spellid] or 0) + amount
 			end
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues (habilidade, habilidade_tabela1)
 		end
 
 		for spellid, amount in pairs(tabela2.dispell_oque) do
-			tabela1.dispell_oque [spellid] = (tabela1.dispell_oque [spellid] or 0) + amount
+			tabela1.dispell_oque[spellid] = (tabela1.dispell_oque[spellid] or 0) + amount
 		end
 
 	end
 
 	if (tabela2.cc_break) then
-
 		if (not tabela1.cc_break) then
 			tabela1.cc_break = 0
 			tabela1.cc_break_targets = {}
@@ -3078,7 +3117,7 @@ atributo_misc.__add = function(tabela1, tabela2)
 		tabela1.cc_break = tabela1.cc_break + tabela2.cc_break
 
 		for target_name, amount in pairs(tabela2.cc_break_targets) do
-			tabela1.cc_break_targets [target_name] = (tabela1.cc_break_targets [target_name] or 0) + amount
+			tabela1.cc_break_targets[target_name] = (tabela1.cc_break_targets[target_name] or 0) + amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.cc_break_spells._ActorTable) do
@@ -3086,29 +3125,29 @@ atributo_misc.__add = function(tabela1, tabela2)
 
 			habilidade_tabela1.cc_break_oque = habilidade_tabela1.cc_break_oque or {}
 			for _spellid, amount in pairs(habilidade.cc_break_oque) do
-				habilidade_tabela1.cc_break_oque [_spellid] = (habilidade_tabela1.cc_break_oque [_spellid] or 0) + amount
+				habilidade_tabela1.cc_break_oque[_spellid] = (habilidade_tabela1.cc_break_oque[_spellid] or 0) + amount
 			end
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) + amount
 			end
 
-			somar_keys (habilidade, habilidade_tabela1)
+			sumKeyValues (habilidade, habilidade_tabela1)
 		end
 
 		for spellid, amount in pairs(tabela2.cc_break_oque) do
-			tabela1.cc_break_oque [spellid] = (tabela1.cc_break_oque [spellid] or 0) + amount
+			tabela1.cc_break_oque[spellid] = (tabela1.cc_break_oque[spellid] or 0) + amount
 		end
 	end
 
 	return tabela1
 end
 
-local subtrair_keys = function(habilidade, habilidade_tabela1)
+local subtractKeyValues = function(habilidade, habilidade_tabela1)
 	for key, value in pairs(habilidade) do
 		if (type(value) == "number") then
 			if (key ~= "id" and key ~= "spellschool") then
-				habilidade_tabela1 [key] = (habilidade_tabela1 [key] or 0) - value
+				habilidade_tabela1[key] = (habilidade_tabela1[key] or 0) - value
 			end
 		end
 	end
@@ -3119,30 +3158,32 @@ atributo_misc.__sub = function(tabela1, tabela2)
 		tabela1.cc_done = tabela1.cc_done - tabela2.cc_done
 
 		for target_name, amount in pairs(tabela2.cc_done_targets) do
-			tabela1.cc_done_targets [target_name] = (tabela1.cc_done_targets [target_name] or 0) - amount
+			tabela1.cc_done_targets[target_name] = (tabela1.cc_done_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.cc_done_spells._ActorTable) do
 			local habilidade_tabela1 = tabela1.cc_done_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 	end
 
 	if (tabela2.interrupt) then
 		--total de interrupts
 			tabela1.interrupt = tabela1.interrupt - tabela2.interrupt
+
 		--soma o interrompeu o que
 			for spellid, amount in pairs(tabela2.interrompeu_oque) do
-				tabela1.interrompeu_oque [spellid] = (tabela1.interrompeu_oque [spellid] or 0) - amount
+				tabela1.interrompeu_oque[spellid] = (tabela1.interrompeu_oque[spellid] or 0) - amount
 			end
+
 		--soma os containers de alvos
 			for target_name, amount in pairs(tabela2.interrupt_targets) do
-				tabela1.interrupt_targets [target_name] = (tabela1.interrupt_targets [target_name] or 0) - amount
+				tabela1.interrupt_targets[target_name] = (tabela1.interrupt_targets[target_name] or 0) - amount
 			end
 
 		--soma o container de habilidades
@@ -3151,14 +3192,14 @@ atributo_misc.__sub = function(tabela1, tabela2)
 
 				habilidade_tabela1.interrompeu_oque = habilidade_tabela1.interrompeu_oque or {}
 				for _spellid, amount in pairs(habilidade.interrompeu_oque) do
-					habilidade_tabela1.interrompeu_oque [_spellid] = (habilidade_tabela1.interrompeu_oque [_spellid] or 0) - amount
+					habilidade_tabela1.interrompeu_oque[_spellid] = (habilidade_tabela1.interrompeu_oque[_spellid] or 0) - amount
 				end
 
 				for target_name, amount in pairs(habilidade.targets) do
-					habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+					habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 				end
 
-				subtrair_keys (habilidade, habilidade_tabela1)
+				subtractKeyValues(habilidade, habilidade_tabela1)
 			end
 	end
 
@@ -3166,17 +3207,24 @@ atributo_misc.__sub = function(tabela1, tabela2)
 		tabela1.buff_uptime = tabela1.buff_uptime - tabela2.buff_uptime
 
 		for target_name, amount in pairs(tabela2.buff_uptime_targets) do
-			tabela1.buff_uptime_targets [target_name] = (tabela1.buff_uptime_targets [target_name] or 0) - amount
+			tabela1.buff_uptime_targets[target_name] = (tabela1.buff_uptime_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.buff_uptime_spells._ActorTable) do
-			local habilidade_tabela1 = tabela1.buff_uptime_spells:PegaHabilidade (spellid, true, nil, false)
+			local habilidade_tabela1 = tabela1.buff_uptime_spells:PegaHabilidade(spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
+		end
+
+		if (tabela2.received_buffs_spells) then
+			for spellId, spellTable in pairs(tabela2.received_buffs_spells._ActorTable) do
+				local habilidade_tabela1 = tabela1.received_buffs_spells:PegaHabilidade(spellId, true, nil, false)
+				subtractKeyValues(spellTable, habilidade_tabela1)
+			end
 		end
 	end
 
@@ -3185,17 +3233,17 @@ atributo_misc.__sub = function(tabela1, tabela2)
 
 		for target_name, amount in pairs(tabela2.debuff_uptime_targets) do
 			if (type(amount) == "table") then --boss debuff
-				local t = tabela1.debuff_uptime_targets [target_name]
+				local t = tabela1.debuff_uptime_targets[target_name]
 				if (not t) then
-					tabela1.debuff_uptime_targets [target_name] = atributo_misc:CreateBuffTargetObject()
-					t = tabela1.debuff_uptime_targets [target_name]
+					tabela1.debuff_uptime_targets[target_name] = atributo_misc:CreateBuffTargetObject()
+					t = tabela1.debuff_uptime_targets[target_name]
 				end
 				t.uptime = t.uptime - amount.uptime
 				t.activedamt = t.activedamt - amount.activedamt
 				t.refreshamt = t.refreshamt - amount.refreshamt
 				t.appliedamt = t.appliedamt - amount.appliedamt
 			else
-				tabela2.debuff_uptime_targets [target_name] = (tabela2.debuff_uptime_targets [target_name] or 0) - amount
+				tabela2.debuff_uptime_targets[target_name] = (tabela2.debuff_uptime_targets[target_name] or 0) - amount
 			end
 		end
 
@@ -3203,10 +3251,10 @@ atributo_misc.__sub = function(tabela1, tabela2)
 			local habilidade_tabela1 = tabela1.debuff_uptime_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -3214,17 +3262,17 @@ atributo_misc.__sub = function(tabela1, tabela2)
 		tabela1.cooldowns_defensive = tabela1.cooldowns_defensive - tabela2.cooldowns_defensive
 
 		for target_name, amount in pairs(tabela2.cooldowns_defensive_targets) do
-			tabela1.cooldowns_defensive_targets [target_name] = (tabela1.cooldowns_defensive_targets [target_name] or 0) - amount
+			tabela1.cooldowns_defensive_targets[target_name] = (tabela1.cooldowns_defensive_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.cooldowns_defensive_spells._ActorTable) do
 			local habilidade_tabela1 = tabela1.cooldowns_defensive_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -3232,17 +3280,17 @@ atributo_misc.__sub = function(tabela1, tabela2)
 		tabela1.ress = tabela1.ress - tabela2.ress
 
 		for target_name, amount in pairs(tabela2.ress_targets) do
-			tabela1.ress_targets [target_name] = (tabela1.ress_targets [target_name] or 0) - amount
+			tabela1.ress_targets[target_name] = (tabela1.ress_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.ress_spells._ActorTable) do
 			local habilidade_tabela1 = tabela1.ress_spells:PegaHabilidade (spellid, true, nil, false)
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 	end
 
@@ -3250,7 +3298,7 @@ atributo_misc.__sub = function(tabela1, tabela2)
 		tabela1.dispell = tabela1.dispell - tabela2.dispell
 
 		for target_name, amount in pairs(tabela2.dispell_targets) do
-			tabela1.dispell_targets [target_name] = (tabela1.dispell_targets [target_name] or 0) - amount
+			tabela1.dispell_targets[target_name] = (tabela1.dispell_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.dispell_spells._ActorTable) do
@@ -3259,27 +3307,26 @@ atributo_misc.__sub = function(tabela1, tabela2)
 			habilidade_tabela1.dispell_oque = habilidade_tabela1.dispell_oque or {}
 
 			for _spellid, amount in pairs(habilidade.dispell_oque) do
-				habilidade_tabela1.dispell_oque [_spellid] = (habilidade_tabela1.dispell_oque [_spellid] or 0) - amount
+				habilidade_tabela1.dispell_oque[_spellid] = (habilidade_tabela1.dispell_oque[_spellid] or 0) - amount
 			end
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 
 		for spellid, amount in pairs(tabela2.dispell_oque) do
-			tabela1.dispell_oque [spellid] = (tabela1.dispell_oque [spellid] or 0) - amount
+			tabela1.dispell_oque[spellid] = (tabela1.dispell_oque[spellid] or 0) - amount
 		end
 	end
 
 	if (tabela2.cc_break) then
-
 		tabela1.cc_break = tabela1.cc_break - tabela2.cc_break
 
 		for target_name, amount in pairs(tabela2.cc_break_targets) do
-			tabela1.cc_break_targets [target_name] = (tabela1.cc_break_targets [target_name] or 0) - amount
+			tabela1.cc_break_targets[target_name] = (tabela1.cc_break_targets[target_name] or 0) - amount
 		end
 
 		for spellid, habilidade in pairs(tabela2.cc_break_spells._ActorTable) do
@@ -3287,18 +3334,18 @@ atributo_misc.__sub = function(tabela1, tabela2)
 
 			habilidade_tabela1.cc_break_oque = habilidade_tabela1.cc_break_oque or {}
 			for _spellid, amount in pairs(habilidade.cc_break_oque) do
-				habilidade_tabela1.cc_break_oque [_spellid] = (habilidade_tabela1.cc_break_oque [_spellid] or 0) - amount
+				habilidade_tabela1.cc_break_oque[_spellid] = (habilidade_tabela1.cc_break_oque[_spellid] or 0) - amount
 			end
 
 			for target_name, amount in pairs(habilidade.targets) do
-				habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) - amount
+				habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets[target_name] or 0) - amount
 			end
 
-			subtrair_keys (habilidade, habilidade_tabela1)
+			subtractKeyValues(habilidade, habilidade_tabela1)
 		end
 
 		for spellid, amount in pairs(tabela2.cc_break_oque) do
-			tabela1.cc_break_oque [spellid] = (tabela1.cc_break_oque [spellid] or 0) - amount
+			tabela1.cc_break_oque[spellid] = (tabela1.cc_break_oque[spellid] or 0) - amount
 		end
 	end
 
diff --git a/classes/container_spells.lua b/classes/container_spells.lua
index bdbcba1f..f08dfb04 100644
--- a/classes/container_spells.lua
+++ b/classes/container_spells.lua
@@ -120,7 +120,7 @@ local habilidade_misc 	=	_detalhes.habilidade_misc
 	---@return spelltable|nil
 	function spellContainerClass:GetOrCreateSpell(spellId, bCanCreateSpellIfMissing, cleuToken)
 		---@type spelltable
-		local spellTable = self._ActorTable [spellId]
+		local spellTable = self._ActorTable[spellId]
 
 		if (spellTable) then
 			return spellTable
diff --git a/core/control.lua b/core/control.lua
index aef37ab3..7c4c1884 100644
--- a/core/control.lua
+++ b/core/control.lua
@@ -1066,6 +1066,13 @@
 		Details.tabela_vigente.is_arena = {name = Details.zone_name, zone = Details.zone_name, mapid = Details.zone_id}
 
 		Details:SendEvent("COMBAT_ARENA_START")
+
+		local bOrderDpsByRealTime = Details.CurrentDps.CanSortByRealTimeDps()
+		if (bOrderDpsByRealTime) then
+			local bNoSave = true
+			local nTimeIntervalBetweenUpdates = 0.1
+			Details:SetWindowUpdateSpeed(nTimeIntervalBetweenUpdates, bNoSave)
+		end
 	end
 
 	--return the GetTime() of the current or latest arena match
@@ -1122,6 +1129,9 @@
 		Details:TimeDataUnregister ("Enemy Team Healing")
 
 		Details:SendEvent("COMBAT_ARENA_END")
+
+		--reset the update speed, as it could have changed when the arena started.
+		Details:SetWindowUpdateSpeed(Details.update_speed)
 	end
 
 	local validSpells = {
diff --git a/core/gears.lua b/core/gears.lua
index 670d5d31..645ea47d 100644
--- a/core/gears.lua
+++ b/core/gears.lua
@@ -504,20 +504,23 @@ function _detalhes:RefreshUpdater(suggested_interval)
 	_detalhes.atualizador = Details.Schedules.NewTicker(updateInterval, Details.RefreshMainWindow, Details, -1)
 end
 
-function _detalhes:SetWindowUpdateSpeed(interval, nosave)
+---set the amount of time between each update of all windows
+---@param interval number?
+---@param bNoSave boolean?
+function Details:SetWindowUpdateSpeed(interval, bNoSave)
 	if (not interval) then
-		interval = _detalhes.update_speed
+		interval = Details.update_speed
 	end
 
 	if (type(interval) ~= "number") then
-		interval = _detalhes.update_speed or 0.3
+		interval = Details.update_speed or 0.3
 	end
 
-	if (not nosave) then
-		_detalhes.update_speed = interval
+	if (not bNoSave) then
+		Details.update_speed = interval
 	end
 
-	_detalhes:RefreshUpdater(interval)
+	Details:RefreshUpdater(interval)
 end
 
 function _detalhes:SetUseAnimations(enabled, nosave)
@@ -2464,6 +2467,7 @@ Details.specToRole = {
 	--EVOKER
 	[1467] = "DAMAGER", --Devastation Evoker
 	[1468] = "HEALER", --Preservation Evoker
+	[1473] = "DAMAGER", --Augmentation Evoker
 }
 
 --oldschool talent tree
diff --git a/core/parser.lua b/core/parser.lua
index 1011f1e4..547f12f7 100755
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -164,18 +164,12 @@
 		}
 
 		local buffs_to_other_players = {
-			[10060] = true, --power infusion
+			--[10060] = true, --power infusion
 			[413426] = true, --rippling anthem (trinket 10.1)
 			[405734] = true, --spore tender
 			[406785] = true, --invigorating spore cloud
 		}
 
-		--list of buffs given by another player but should be considered as a self buff
-		local buffs_makeyourown = {
-			[395152] = true, --ebon might (evoker 10.1.5)
-			[410089] = true, --prescience (evoker 10.1.5)
-		}
-
 		---@class evokerinfo : table
 		---@field key1 serial
 		---@field key2 actorname
@@ -191,6 +185,23 @@
 		---@field key6 number
 		---@field key7 number
 
+		local augmentation_aura_list = {
+			[395152] = true,
+			[413984] = true,
+			[410089] = true,
+			[409560] = true,
+			[360827] = true,
+			[410263] = true,
+		}
+
+		--list of buffs given by another player but should also be credited to the which received it
+		local buffs_on_target = {
+			--[395152] = true, --ebon might (evoker 10.1.5)
+			[395152] = true, --ebon might (evoker 10.1.5) 395296 = the evoker buff on it self
+			[410089] = true, --prescience (evoker 10.1.5)
+			[10060] = true, --power infusion
+		}
+
 		--store all information about augmentation evokers ~roskash
 		local augmentation_cache = {
 			ebon_might = {},
@@ -453,15 +464,6 @@
 		[372824] = true, --Burning Chains
 	}
 
-	local special_buffs_spells = {
-		[395152] = true,
-		[413984] = true,
-		[410089] = true,
-		[409560] = true,
-		[360827] = true,
-		[410263] = true,
-	}
-
 	--damage spells to ignore
 	local damage_spells_to_ignore = {
 		--the damage that the warlock apply to its pet through soullink is ignored
@@ -1255,17 +1257,20 @@
 	--amount add
 
 		--~roskash - augmentation evoker damage buff
-		if (augmentation_cache.ebon_might[sourceSerial]) then
+		if (augmentation_cache.ebon_might[sourceSerial] or (ownerActor and augmentation_cache.ebon_might[ownerActor.serial])) then
+			--get the serial number of the player who did the damage, in case of a pet or minion use the owner serial
+			local thisSourceSerial = augmentation_cache.ebon_might[sourceSerial] and sourceSerial or ownerActor.serial
+
 			---actor buffed with ebonmight -> list of evokers whose buffed
 			---@type table<serial, evokerinfo[]>
-			local currentlyBuffedWithEbonMight = augmentation_cache.ebon_might[sourceSerial]
+			local currentlyBuffedWithEbonMight = augmentation_cache.ebon_might[thisSourceSerial]
 
 			for i, evokerInfo in ipairs(currentlyBuffedWithEbonMight) do
 				---@cast evokerInfo evokerinfo
 				---@type serial, actorname, controlflags
 				local evokerSourceSerial, evokerSourceName, evokerSourceFlags, attributedGained = unpack(evokerInfo)
 
-				if (evokerSourceSerial ~= sourceSerial) then
+				if (evokerSourceSerial ~= thisSourceSerial) then
 					---@type actor
 					local evokerActor = damage_cache[evokerSourceSerial]
 					if (not evokerActor) then
@@ -1281,7 +1286,7 @@
 						end
 
 						local predictedAmount = 0
-						if (Details.zone_type == "raid") then
+						if (Details.zone_type == "raid") then --0x410b
 							predictedAmount = amount * 0.06947705
 						else
 							predictedAmount = amount * 0.08416225
@@ -1295,15 +1300,19 @@
 			end
 		end
 
-		if (augmentation_cache.ss[sourceSerial]) then --actor buffed with ss
+		if (augmentation_cache.ss[sourceSerial] or (ownerActor and augmentation_cache.ss[ownerActor.serial])) then --actor buffed with ss
+			--get the serial number of the player who did the damage, in case of a pet or minion use the owner serial
+			local thisSourceSerial = augmentation_cache.ss[sourceSerial] and sourceSerial or ownerActor.serial
+
 			---@type table<serial, evokerinfo[]>
-			local currentlyBuffedWithSS = augmentation_cache.ss[sourceSerial]
+			local currentlyBuffedWithSS = augmentation_cache.ss[thisSourceSerial]
+
 			for i, evokerInfo in ipairs(currentlyBuffedWithSS) do
 				---@cast evokerInfo evokerinfo
 				---@type serial, actorname, controlflags
 				local evokerSourceSerial, evokerSourceName, evokerSourceFlags, versaBuff = unpack(evokerInfo)
 
-				if (evokerSourceSerial ~= sourceSerial) then
+				if (evokerSourceSerial ~= thisSourceSerial) then
 					---@type actor
 					local evokerActor = damage_cache[evokerSourceSerial]
 					if (not evokerActor) then
@@ -1319,7 +1328,7 @@
 						end
 
 						versaBuff = versaBuff / 100
-						local predictedAmount = amount * versaBuff * 0.73548755
+						local predictedAmount = amount * versaBuff * 0.73548755 --0x410f
 						evokerActor.total_extra = evokerActor.total_extra + predictedAmount
 
 						augmentedSpell.total = augmentedSpell.total + predictedAmount
@@ -1388,7 +1397,7 @@
 							augmentedSpell = evokerActor.augmentedSpellsContainer:GetOrCreateSpell(extraSpellId, true, token)
 						end
 
-						local fateMirror_plus_Prescience = amount + amount * 0.56848040
+						local fateMirror_plus_Prescience = amount + amount * 0.58782001
 
 						evokerActor.total_extra = evokerActor.total_extra + fateMirror_plus_Prescience
 
@@ -2712,14 +2721,10 @@
 			sourceSerial = ""
 		end
 
-		if (special_buffs_spells[spellId]) then
+		if (augmentation_aura_list[spellId]) then
 			Details222.SpecHelpers[1473].BuffIn(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellschool, auraType, amount)
 		end
 
-		if (buffs_makeyourown[spellId]) then
-			sourceSerial, sourceName, sourceFlags = targetSerial, targetName, targetFlags
-		end
-
 		------------------------------------------------------------------------------------------------
 		--spell reflection
 		if (reflection_spellid[spellId]) then --~reflect
@@ -2826,7 +2831,10 @@
 				end
 			end
 
-			if (sourceName == targetName and raid_members_cache[sourceSerial] and _in_combat) then
+			if (buffs_on_target[spellId]) then
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_IN", true)
+
+			elseif (sourceName == targetName and raid_members_cache[sourceSerial] and _in_combat) then
 				--player itself
 				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_IN")
 
@@ -2899,7 +2907,7 @@
 		end
 	end
 
-	function parser:buff_refresh(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellschool, tipo, amount)
+	function parser:buff_refresh(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellschool, tipo, amount)
 		if (not sourceName) then
 			sourceName = names_cache[spellName]
 			if (not sourceName) then
@@ -2910,16 +2918,16 @@
 			sourceSerial = ""
 		end
 
-		if (special_buffs_spells[spellid]) then
-			Details222.SpecHelpers[1473].BuffRefresh(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellschool, tipo, amount)
+		if (augmentation_aura_list[spellId]) then
+			Details222.SpecHelpers[1473].BuffRefresh(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellschool, tipo, amount)
 		end
 
 		if (tipo == "BUFF") then
-			if (spellid == 272790 and cacheAnything.track_hunter_frenzy) then --hunter pet Frenzy spellid
+			if (spellId == 272790 and cacheAnything.track_hunter_frenzy) then --hunter pet Frenzy spellid
 				local miscActorObject = misc_cache[sourceName]
 				if (miscActorObject) then
 					--fastest way to query utility spell data
-					local spellTable = miscActorObject.buff_uptime_spells and miscActorObject.buff_uptime_spells._ActorTable[spellid]
+					local spellTable = miscActorObject.buff_uptime_spells and miscActorObject.buff_uptime_spells._ActorTable[spellId]
 					if (spellTable) then
 						if (spellTable.actived and pet_frenzy_cache[sourceName]) then
 							if (detailsFramework:IsNearlyEqual(pet_frenzy_cache[sourceName], time, 0.2)) then
@@ -2929,42 +2937,41 @@
 					end
 				end
 
-				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, sourceSerial, sourceName, sourceFlags, 0x0, spellid, spellName, "BUFF_UPTIME_REFRESH")
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, sourceSerial, sourceName, sourceFlags, 0x0, spellId, spellName, "BUFF_UPTIME_REFRESH")
 				pet_frenzy_cache[sourceName] = time
 				return
 			end
 
-			if (buffs_makeyourown[spellid]) then
-				sourceSerial, sourceName, sourceFlags = targetSerial, targetName, targetFlags
-			end
+			if (buffs_on_target[spellId]) then
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_REFRESH", true)
 
-			if (sourceName == targetName and raid_members_cache [sourceSerial] and _in_combat) then
+			elseif (sourceName == targetName and raid_members_cache [sourceSerial] and _in_combat) then
 				--call record buffs uptime
-				parser:add_buff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_REFRESH")
+				parser:add_buff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_REFRESH")
 
 			elseif (container_pets [sourceSerial] and container_pets [sourceSerial][2] == targetSerial) then
 				--um pet colocando uma aura do dono
-				parser:add_buff_uptime (token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_REFRESH")
+				parser:add_buff_uptime (token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_REFRESH")
 
-			elseif (buffs_to_other_players[spellid]) then
-				parser:add_buff_uptime(token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_REFRESH")
+			elseif (buffs_to_other_players[spellId]) then
+				parser:add_buff_uptime(token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_REFRESH")
 			end
 
 			if (_use_shield_overheal) then
-				if (shield_spellid_cache[spellid] and amount) then
-					if (shield_cache[targetName] and shield_cache[targetName][spellid] and shield_cache[targetName][spellid][sourceName]) then
-						if (ignored_overheal[spellid]) then
-							shield_cache[targetName][spellid][sourceName] = amount --refresh gives the updated amount
+				if (shield_spellid_cache[spellId] and amount) then
+					if (shield_cache[targetName] and shield_cache[targetName][spellId] and shield_cache[targetName][spellId][sourceName]) then
+						if (ignored_overheal[spellId]) then
+							shield_cache[targetName][spellId][sourceName] = amount --refresh gives the updated amount
 							return
 						end
 
 						--get the shield overheal
-						local overhealAmount = shield_cache[targetName][spellid][sourceName]
+						local overhealAmount = shield_cache[targetName][spellId][sourceName]
 						--set the new shield amount
-						shield_cache[targetName][spellid][sourceName] = amount
+						shield_cache[targetName][spellId][sourceName] = amount
 
 						if (overhealAmount > 0) then
-							return parser:heal(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, nil, 0, ceil (overhealAmount), 0, nil, true)
+							return parser:heal(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, nil, 0, ceil (overhealAmount), 0, nil, true)
 						end
 					end
 				end
@@ -2975,7 +2982,7 @@
 
 		elseif (tipo == "DEBUFF") then
 			if (isWOTLK) then --buff refresh
-				if (spellid == 27162 and false) then --Judgement Of Light
+				if (spellId == 27162 and false) then --Judgement Of Light
 					--which player applied the judgement of light on this mob
 					TBC_JudgementOfLightCache[targetName] = {sourceSerial, sourceName, sourceFlags}
 				end
@@ -2986,16 +2993,16 @@
 				--buff uptime
 				if (raid_members_cache [sourceSerial]) then
 					--call record debuffs uptime
-					parser:add_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "DEBUFF_UPTIME_REFRESH")
+					parser:add_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "DEBUFF_UPTIME_REFRESH")
 				elseif (raid_members_cache [targetSerial] and not raid_members_cache [sourceSerial]) then --alvo � da raide e o caster � inimigo
-					parser:add_bad_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellschool, "DEBUFF_UPTIME_REFRESH", amount)
+					parser:add_bad_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellschool, "DEBUFF_UPTIME_REFRESH", amount)
 				end
 			end
 		end
 	end
 
 	-- ~unbuff
-	function parser:unbuff(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellSchool, tipo, amount)
+	function parser:unbuff(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, tipo, amount)
 		if (not sourceName) then
 			sourceName = names_cache[spellName]
 			if (not sourceName) then
@@ -3006,67 +3013,66 @@
 			sourceSerial = ""
 		end
 
-		if (special_buffs_spells[spellid]) then
-			Details222.SpecHelpers[1473].BuffOut(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellSchool, tipo, amount)
+		if (augmentation_aura_list[spellId]) then
+			Details222.SpecHelpers[1473].BuffOut(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, tipo, amount)
 		end
 
 		if (tipo == "BUFF") then
-			if (buffs_makeyourown[spellid]) then
-				sourceSerial, sourceName, sourceFlags = targetSerial, targetName, targetFlags
-			end
-
-			if (spellid == 272790 and cacheAnything.track_hunter_frenzy) then --hunter pet Frenzy spellid
+			if (spellId == 272790 and cacheAnything.track_hunter_frenzy) then --hunter pet Frenzy spellid
 				if (not pet_frenzy_cache[sourceName]) then
 					return
 				end
-				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, sourceSerial, sourceName, sourceFlags, 0x0, spellid, spellName, "BUFF_UPTIME_OUT")
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, sourceSerial, sourceName, sourceFlags, 0x0, spellId, spellName, "BUFF_UPTIME_OUT")
 				pet_frenzy_cache[sourceName] = nil
 				return
 			end
 
-			if (sourceName == targetName and raid_members_cache [sourceSerial] and _in_combat) then
-				--call record buffs uptime
-				parser:add_buff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_OUT")
-			elseif (container_pets [sourceSerial] and container_pets [sourceSerial][2] == targetSerial) then
-				--um pet colocando uma aura do dono
-				parser:add_buff_uptime (token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_OUT")
+			if (buffs_on_target[spellId]) then
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_OUT", true)
 
-			elseif (buffs_to_other_players[spellid]) then
-				parser:add_buff_uptime(token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "BUFF_UPTIME_OUT")
+			elseif (sourceName == targetName and raid_members_cache[sourceSerial] and _in_combat) then
+				--call record buffs uptime
+				parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_OUT")
+			elseif (container_pets[sourceSerial] and container_pets[sourceSerial][2] == targetSerial) then
+				--um pet colocando uma aura do dono
+				parser:add_buff_uptime(token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_OUT")
+
+			elseif (buffs_to_other_players[spellId]) then
+				parser:add_buff_uptime(token, time, targetSerial, targetName, targetFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "BUFF_UPTIME_OUT")
 			end
 
-			if (spellid == SPELLID_MONK_GUARD) then
+			if (spellId == SPELLID_MONK_GUARD) then
 				--BfA monk talent
-				if (monk_guard_talent [sourceSerial]) then
-					local damage_prevented = monk_guard_talent [sourceSerial] - (amount or 0)
-					parser:heal(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellSchool, damage_prevented, ceil (amount or 0), 0, 0, true)
+				if (monk_guard_talent[sourceSerial]) then
+					local damage_prevented = monk_guard_talent[sourceSerial] - (amount or 0)
+					parser:heal(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, damage_prevented, ceil (amount or 0), 0, 0, true)
 				end
 
-			elseif (spellid == 388007 or spellid == 388011) then --buff: bleesing of the summer
+			elseif (spellId == 388007 or spellId == 388011) then --buff: bleesing of the summer
 				cacheAnything.paladin_vivaldi_blessings[targetSerial] = nil
 			end
 
 			------------------------------------------------------------------------------------------------
 			--shield overheal
 			if (_use_shield_overheal) then
-				if (shield_spellid_cache[spellid]) then
-					if (shield_cache [targetName] and shield_cache [targetName][spellid] and shield_cache [targetName][spellid][sourceName]) then
+				if (shield_spellid_cache[spellId]) then
+					if (shield_cache [targetName] and shield_cache [targetName][spellId] and shield_cache [targetName][spellId][sourceName]) then
 						if (amount) then
 							-- o amount � o que sobrou do escudo
 							--local overheal = escudo [alvo_name][spellid][who_name] --usando o 'amount' passado pela função
 							--overheal não esta dando refresh quando um valor é adicionado ao escudo
-							shield_cache [targetName][spellid][sourceName] = 0
+							shield_cache [targetName][spellId][sourceName] = 0
 
 							--can't use monk guard since its overheal is computed inside the unbuff
-							if (amount > 0 and spellid ~= SPELLID_MONK_GUARD) then
+							if (amount > 0 and spellId ~= SPELLID_MONK_GUARD) then
 								--removing the nil at the end before true for is_shield, I have no documentation change about it, not sure the reason why it was addded
-								return parser:heal (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, nil, 0, ceil (amount), 0, 0, true) --0, 0, nil, true
+								return parser:heal (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, nil, 0, ceil (amount), 0, 0, true) --0, 0, nil, true
 							else
 								return
 							end
 						end
 
-						shield_cache [targetName][spellid][sourceName] = 0
+						shield_cache [targetName][spellId][sourceName] = 0
 					end
 				end
 			end
@@ -3075,19 +3081,19 @@
 	--recording debuffs applied by player
 		elseif (tipo == "DEBUFF") then
 			if (isWOTLK) then --buff removed
-				if (spellid == 27162 and false) then --Judgement Of Light
+				if (spellId == 27162 and false) then --Judgement Of Light
 					TBC_JudgementOfLightCache[targetName] = nil
 				end
 			end
 
 		------------------------------------------------------------------------------------------------
 		--spell reflection
-			if (reflection_dispels[targetSerial] and reflection_dispels[targetSerial][spellid]) then
+			if (reflection_dispels[targetSerial] and reflection_dispels[targetSerial][spellId]) then
 				--debuff was dispelled by a reflecting dispel and could've been reflected
 				--save the data about whom dispelled who and the spell that was dispelled
-				local reflection = reflection_dispels[targetSerial][spellid]
+				local reflection = reflection_dispels[targetSerial][spellId]
 				reflection_events[sourceSerial] = reflection_events[sourceSerial] or {}
-				reflection_events[sourceSerial][spellid] = {
+				reflection_events[sourceSerial][spellId] = {
 					who_serial = reflection.who_serial,
 					who_name = reflection.who_name,
 					who_flags = reflection.who_flags,
@@ -3096,7 +3102,7 @@
 					spelltype = reflection.spelltype,
 					time = time,
 				}
-				reflection_dispels[targetSerial][spellid] = nil
+				reflection_dispels[targetSerial][spellId] = nil
 				if (next(reflection_dispels[targetSerial]) == nil) then
 					--suggestion on how to make this better?
 					reflection_dispels[targetSerial] = nil
@@ -3105,9 +3111,9 @@
 
 		------------------------------------------------------------------------------------------------
 		--spell reflection
-			if (reflection_debuffs[sourceSerial] and reflection_debuffs[sourceSerial][spellid]) then
+			if (reflection_debuffs[sourceSerial] and reflection_debuffs[sourceSerial][spellId]) then
 				--self-inflicted debuff was removed, so we just clear this data
-				reflection_debuffs[sourceSerial][spellid] = nil
+				reflection_debuffs[sourceSerial][spellId] = nil
 				if (next(reflection_debuffs[sourceSerial]) == nil) then
 					--better way of doing this? accepting suggestions
 					reflection_debuffs[sourceSerial] = nil
@@ -3119,12 +3125,12 @@
 			--buff uptime
 				if (raid_members_cache [sourceSerial]) then
 					--call record debuffs uptime
-					parser:add_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, "DEBUFF_UPTIME_OUT")
+					parser:add_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, "DEBUFF_UPTIME_OUT")
 				elseif (raid_members_cache [targetSerial] and not raid_members_cache [sourceSerial]) then --alvo � da raide e o caster � inimigo
-					parser:add_bad_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellid, spellName, spellSchool, "DEBUFF_UPTIME_OUT")
+					parser:add_bad_debuff_uptime (token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, "DEBUFF_UPTIME_OUT")
 				end
 
-				if ((bitfield_debuffs[spellName] or bitfield_debuffs[spellid]) and targetSerial) then
+				if ((bitfield_debuffs[spellName] or bitfield_debuffs[spellId]) and targetSerial) then
 					bitfield_swap_cache[targetSerial] = nil
 				end
 			end
@@ -3363,81 +3369,120 @@
 	end
 
 	-- ~debuff
-	function parser:add_debuff_uptime (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellname, in_out)
-	------------------------------------------------------------------------------------------------
-	--early checks and fixes
-
+	---@param token string
+	---@param time unixtime
+	---@param sourceSerial guid
+	---@param sourceName actorname
+	---@param sourceFlags controlflags
+	---@param targetSerial guid
+	---@param targetName actorname
+	---@param targetFlags controlflags
+	---@param targetFlags2 number
+	---@param spellId spellid
+	---@param spellName spellname
+	---@param sAuraInOrOut string
+	---@param bAddToTarget boolean|nil not in use on debuffs at the moment
+	function parser:add_debuff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, sAuraInOrOut, bAddToTarget)
 		_current_misc_container.need_refresh = true
 
-	------------------------------------------------------------------------------------------------
-	--get actors
-		local este_jogador = misc_cache [who_name]
-		if (not este_jogador) then --pode ser um desconhecido ou um pet
-			este_jogador = _current_misc_container:GetOrCreateActor (who_serial, who_name, who_flags, true)
-			misc_cache [who_name] = este_jogador
+		local sourceActor = misc_cache[sourceName]
+		if (not sourceActor) then
+			sourceActor = _current_misc_container:GetOrCreateActor(sourceSerial, sourceName, sourceFlags, true)
+			misc_cache[sourceName] = sourceActor
 		end
 
-	------------------------------------------------------------------------------------------------
-	--build containers on the fly
-
-		if (not este_jogador.debuff_uptime) then
-			este_jogador.debuff_uptime = 0
-			este_jogador.debuff_uptime_spells = spellContainerClass:CreateSpellContainer (container_misc)
-			este_jogador.debuff_uptime_targets = {}
+		if (not sourceActor.debuff_uptime) then
+			sourceActor.debuff_uptime = 0
+			sourceActor.debuff_uptime_spells = spellContainerClass:CreateSpellContainer(container_misc)
+			sourceActor.debuff_uptime_targets = {}
 		end
 
-	------------------------------------------------------------------------------------------------
-	--add amount
-
-		--update last event
-		este_jogador.last_event = _tempo
+		sourceActor.last_event = _tempo
 
 		--actor spells table
-		local spell = este_jogador.debuff_uptime_spells._ActorTable [spellid]
-		if (not spell) then
-			spell = este_jogador.debuff_uptime_spells:GetOrCreateSpell(spellid, true, "DEBUFF_UPTIME")
+		do
+			local spellTable = sourceActor.debuff_uptime_spells._ActorTable[spellId]
+			if (not spellTable) then
+				spellTable = sourceActor.debuff_uptime_spells:GetOrCreateSpell(spellId, true, "DEBUFF_UPTIME")
+			end
+			return _spell_utility_func(spellTable, targetSerial, targetName, targetFlags, sourceName, sourceActor, "BUFF_OR_DEBUFF", sAuraInOrOut)
 		end
-		return _spell_utility_func (spell, alvo_serial, alvo_name, alvo_flags, who_name, este_jogador, "BUFF_OR_DEBUFF", in_out)
-
 	end
 
-	function parser:add_buff_uptime (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellname, in_out)
-
-	------------------------------------------------------------------------------------------------
-	--early checks and fixes
-
+	--~buff
+	---@param token string
+	---@param time unixtime
+	---@param sourceSerial guid
+	---@param sourceName actorname
+	---@param sourceFlags controlflags
+	---@param targetSerial guid
+	---@param targetName actorname
+	---@param targetFlags controlflags
+	---@param targetFlags2 number
+	---@param spellId spellid
+	---@param spellName spellname
+	---@param sAuraInOrOut string
+	---@param bAddToTarget boolean? --augmentation evoker
+	function parser:add_buff_uptime(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, sAuraInOrOut, bAddToTarget)
 		_current_misc_container.need_refresh = true
 
-	------------------------------------------------------------------------------------------------
-	--get actors
-		local este_jogador = misc_cache [who_name]
-		if (not este_jogador) then --pode ser um desconhecido ou um pet
-			este_jogador = _current_misc_container:GetOrCreateActor(who_serial, who_name, who_flags, true)
-			misc_cache [who_name] = este_jogador
+		local sourceActor = misc_cache[sourceName]
+		if (not sourceActor) then
+			sourceActor = _current_misc_container:GetOrCreateActor(sourceSerial, sourceName, sourceFlags, true)
+			misc_cache[sourceName] = sourceActor
 		end
 
-	------------------------------------------------------------------------------------------------
-	--build containers on the fly
+		sourceActor.last_event = _tempo
 
-		if (not este_jogador.buff_uptime) then
-			este_jogador.buff_uptime = 0
-			este_jogador.buff_uptime_spells = spellContainerClass:CreateSpellContainer(container_misc)
-			este_jogador.buff_uptime_targets = {}
+		--build containers on the fly if not exist
+		if (not sourceActor.buff_uptime) then
+			sourceActor.buff_uptime = 0
+			sourceActor.buff_uptime_spells = spellContainerClass:CreateSpellContainer(container_misc)
+			sourceActor.buff_uptime_targets = {}
 		end
 
-	------------------------------------------------------------------------------------------------
-	--add amount
-
-		--update last event
-		este_jogador.last_event = _tempo
-
 		--actor spells table
-		local spell = este_jogador.buff_uptime_spells._ActorTable [spellid]
-		if (not spell) then
-			spell = este_jogador.buff_uptime_spells:GetOrCreateSpell(spellid, true, "BUFF_UPTIME")
+		do
+			---@type spelltable
+			local spellTable = sourceActor.buff_uptime_spells._ActorTable[spellId]
+			if (not spellTable) then
+				spellTable = sourceActor.buff_uptime_spells:GetOrCreateSpell(spellId, true, "BUFF_UPTIME")
+			end
+			_spell_utility_func(spellTable, targetSerial, targetName, targetFlags, sourceName, sourceActor, "BUFF_OR_DEBUFF", sAuraInOrOut)
 		end
-		return _spell_utility_func (spell, alvo_serial, alvo_name, alvo_flags, who_name, este_jogador, "BUFF_OR_DEBUFF", in_out)
 
+		if (bAddToTarget and sourceSerial ~= targetSerial) then
+			local targetActor = misc_cache[targetName]
+			if (not targetActor) then
+				targetActor = _current_misc_container:GetOrCreateActor(targetSerial, targetName, targetFlags, true)
+				misc_cache[targetName] = targetActor
+			end
+
+			targetActor.last_event = _tempo
+
+			--build containers on the fly if not exist
+			if (not targetActor.buff_uptime) then
+				targetActor.buff_uptime = 0
+				targetActor.buff_uptime_spells = spellContainerClass:CreateSpellContainer(container_misc)
+				targetActor.buff_uptime_targets = {}
+			end
+
+			--build containers on the fly if not exist
+			if (not targetActor.received_buffs_spells) then
+				targetActor.received_buffs_spells = spellContainerClass:CreateSpellContainer(container_misc)
+			end
+
+			local nameWithSpellId = sourceName .. "@" .. spellId
+
+			---@type spelltable
+			local spellTable = targetActor.received_buffs_spells._ActorTable[nameWithSpellId]
+			if (not spellTable) then
+				spellTable = targetActor.received_buffs_spells:GetOrCreateSpell(nameWithSpellId, true, "BUFF_UPTIME")
+				spellTable.id = spellId
+			end
+
+			_spell_utility_func(spellTable, sourceSerial, sourceName, sourceFlags, targetName, targetActor, "BUFF_OR_DEBUFF", sAuraInOrOut)
+		end
 	end
 
 -----------------------------------------------------------------------------------------------------------------------------------------
@@ -3711,15 +3756,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 -----------------------------------------------------------------------------------------------------------------------------------------
 
 	function parser:add_defensive_cooldown(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName)
-	------------------------------------------------------------------------------------------------
-	--early checks and fixes
-
 		_current_misc_container.need_refresh = true
 
-	------------------------------------------------------------------------------------------------
-	--get actors
-
-		--main actor
 		local sourceActor, ownerActor = misc_cache[sourceName], nil
 		if (not sourceActor) then
 			sourceActor, ownerActor, sourceName = _current_misc_container:GetOrCreateActor(sourceSerial, sourceName, sourceFlags, true)
@@ -3728,20 +3766,12 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 			end
 		end
 
-	------------------------------------------------------------------------------------------------
-	--build containers on the fly
 		if (not sourceActor.cooldowns_defensive) then
 			sourceActor.cooldowns_defensive = Details:GetOrderNumber(sourceName)
 			sourceActor.cooldowns_defensive_targets = {}
 			sourceActor.cooldowns_defensive_spells = spellContainerClass:CreateSpellContainer(container_misc)
 		end
 
-		--local targetActor, targetOwner = damage_cache[targetSerial] or damage_cache_pets[targetSerial] or damage_cache[targetName], damage_cache_petsOwners[targetSerial]
-		--sourceActor, ownerActor, sourceName
-
-	------------------------------------------------------------------------------------------------
-	--add amount
-
 		--actor cooldowns used
 		sourceActor.cooldowns_defensive = sourceActor.cooldowns_defensive + 1
 
@@ -3752,16 +3782,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 			_current_gtotal[4].cooldowns_defensive = _current_gtotal[4].cooldowns_defensive + 1
 
 			if (sourceName == targetName) then
-				--[=[
-				local damage_actor = damage_cache[sourceSerial]
-				if (not damage_actor) then
-					damage_actor = _current_damage_container:GetOrCreateActor(sourceSerial, sourceName, sourceFlags, true)
-					if (sourceFlags) then
-						damage_cache[sourceSerial] = damage_actor
-					end
-				end
-				--]=]
-
 				--last events
 				local t = last_events_cache[sourceName]
 
@@ -5082,6 +5102,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 					instancia:AdjustAlphaByContext(true)
 				end
 			end
+
+			Details222.Cache.ClearAugmentationCache()
 		end
 
 		Details.time_type = Details.time_type_original
@@ -5337,6 +5359,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 			return
 		end
 
+		Details222.Cache.ClearAugmentationCache()
+
 		Details.latest_ENCOUNTER_END = Details.latest_ENCOUNTER_END or 0
 		if (Details.latest_ENCOUNTER_END + 15 > GetTime()) then
 			return
@@ -6439,6 +6463,14 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 		return Details.cache_healing_group
 	end
 
+	function Details222.Cache.ClearAugmentationCache()
+		Details:Destroy(augmentation_cache.ebon_might) --~roskash
+		Details:Destroy(augmentation_cache.prescience)
+		Details:Destroy(augmentation_cache.shield)
+		Details:Destroy(augmentation_cache.infernobless)
+		Details:Destroy(augmentation_cache.breath_targets)
+	end
+
 	function Details:ClearParserCache(bIsFromCombatStart) --~wipe
 		Details:Destroy(damage_cache)
 		Details:Destroy(damage_cache_pets)
@@ -6467,13 +6499,16 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 		Details:Destroy(cacheAnything.rampage_cast_amount)
 
 		if (not bIsFromCombatStart) then
-			Details:Destroy(augmentation_cache.ebon_might) --~roskash
-			Details:Destroy(augmentation_cache.prescience)
-			Details:Destroy(augmentation_cache.shield)
+			--check if the player is in a mythic dungeon run, if so, don't clear the cache
+			if (Details.zone_type ~= "party") then
+				Details:Destroy(augmentation_cache.ebon_might) --~roskash
+				Details:Destroy(augmentation_cache.prescience)
+				Details:Destroy(augmentation_cache.shield)
+				Details:Destroy(augmentation_cache.infernobless)
+			end
 		end
 
 		Details:Destroy(augmentation_cache.breath_targets)
-		Details:Destroy(augmentation_cache.infernobless)
 
 		cacheAnything.track_hunter_frenzy = Details.combat_log.track_hunter_frenzy
 
diff --git a/frames/window_breakdown/window_playerbreakdown_auras.lua b/frames/window_breakdown/window_playerbreakdown_auras.lua
index ccd55911..96d1331a 100644
--- a/frames/window_breakdown/window_playerbreakdown_auras.lua
+++ b/frames/window_breakdown/window_playerbreakdown_auras.lua
@@ -6,6 +6,17 @@ local unpack = unpack
 local CreateFrame = CreateFrame
 local GetSpellInfo = GetSpellInfo
 
+local buffs_to_ignore = {
+    [186401] = true, --Sign of the Skirmisher
+    [366646] = true, --Familiar Skies
+    [403265] = true, --Bronze Attunement
+    [381748] = true, --Blessing of the Bronze
+    [397734] = true, --Word of a Worthy Ally
+    [402221] = true, --Obsidian Resonance
+    --[] = true, --
+    --[] = true, --
+}
+
 local createAuraTabOnBreakdownWindow = function(tab, frame)
     local scroll_line_amount = 25
     local scroll_width = 410
@@ -15,6 +26,8 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
 
     local debuffScrollStartX = 445
 
+    local lineBackgroundColor = {{1, 1, 1, .1}, {1, 1, 1, 0}}
+
     local headerOffsetsBuffs = {
         --buff label, uptime, applications, refreshes, wa
         6, 190, 290, 336, 380
@@ -51,15 +64,26 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
 
         line:SetBackdrop({bgFile =[[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
         line:SetBackdropColor(0, 0, 0, 0.2)
+        line.BackgroundColor = lineBackgroundColor[1]
 
         local iconTexture = line:CreateTexture("$parentIcon", "overlay")
         iconTexture:SetSize(scroll_line_height -2 , scroll_line_height - 2)
+        iconTexture:SetAlpha(0.834)
         local nameLabel = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
         local uptimeLabel = line:CreateFontString("$parentUptime", "overlay", "GameFontNormal")
         local uptimePercentLabel = line:CreateFontString("$parentPercent", "overlay", "GameFontNormal")
         local applyLabel = line:CreateFontString("$parentApplyed", "overlay", "GameFontNormal")
         local refreshLabel = line:CreateFontString("$parentRefreshed", "overlay", "GameFontNormal")
 
+        local receivedTexture = line:CreateTexture("$parentReceived", "artwork")
+        receivedTexture:SetPoint("topright", line, "topright", 0, 0)
+        receivedTexture:SetPoint("bottomright", line, "bottomright", 0, 0)
+        receivedTexture:SetWidth(line:GetWidth())
+        receivedTexture:SetTexture([[Interface\AddOns\Details\images\bar_textures\gradient_white_10percent_left]])
+        receivedTexture:SetTexCoord(0, 1, 0, 1)
+        receivedTexture:SetVertexColor(0, .8, 0, 0.7)
+        receivedTexture:Hide()
+
         detailsFramework:SetFontSize(nameLabel, text_size)
         detailsFramework:SetFontSize(uptimeLabel, text_size)
         detailsFramework:SetFontSize(uptimePercentLabel, text_size)
@@ -79,6 +103,7 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
         line.UptimePercent = uptimePercentLabel
         line.Apply = applyLabel
         line.Refresh = refreshLabel
+        line.ReceivedAura = receivedTexture
 
         nameLabel:SetJustifyH("left")
         uptimeLabel:SetJustifyH("left")
@@ -92,25 +117,31 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
         return line
     end
 
-    local lineBackgroundColor = {{1, 1, 1, .1}, {1, 1, 1, 0}}
-
     local scrollRefreshBuffs = function(self, data, offset, total_lines)
         for i = 1, total_lines do
             local index = i + offset
             local aura = data[index]
 
             if (aura) then
+                local spellIcon, spellName, uptime, applicationsAmount, refreshedAmount, uptimePercent = unpack(aura)
                 local line = self:GetLine(i)
+
+                if (aura.bReceived) then
+                    line.ReceivedAura:Show()
+                else
+                    line.ReceivedAura:Hide()
+                end
+
                 line.spellID = aura.spellID
-                line.Icon:SetTexture(aura[1])
+                line.Icon:SetTexture(spellIcon)
 
                 line.Icon:SetTexCoord(.1, .9, .1, .9)
 
-                line.Name:SetText(aura[2])
-                line.Uptime:SetText(detailsFramework:IntegerToTimer(aura[3]))
-                line.UptimePercent:SetText("|cFFBBAAAA" .. math.floor(aura[6]) .. "%|r")
-                line.Apply:SetText(aura[4])
-                line.Refresh:SetText(aura[5])
+                line.Name:SetText(spellName)
+                line.Uptime:SetText(detailsFramework:IntegerToTimer(uptime))
+                line.UptimePercent:SetText("|cFFBBAAAA" .. math.floor(uptimePercent) .. "%|r")
+                line.Apply:SetText(applicationsAmount)
+                line.Refresh:SetText(refreshedAmount)
 
                 if (i % 2 == 0) then
                     line:SetBackdropColor(unpack(lineBackgroundColor[1]))
@@ -205,9 +236,27 @@ local aurasTabFillCallback = function(tab, player, combat)
             local spellContainer = miscActor:GetSpellContainer("buff")
             if (spellContainer) then
                 for spellId, spellTable in spellContainer:ListSpells() do
-                    local spellName, _, spellIcon = GetSpellInfo(spellId)
+                    local spellName, _, spellIcon = Details.GetSpellInfo(spellId)
                     local uptime = spellTable.uptime or 0
-                    table.insert(newAuraTable, {spellIcon, spellName, uptime, spellTable.appliedamt, spellTable.refreshamt, uptime / combatTime * 100, spellID = spellId})
+                    if (not buffs_to_ignore[spellId]) then
+                        table.insert(newAuraTable, {spellIcon, spellName, uptime, spellTable.appliedamt, spellTable.refreshamt, uptime / combatTime * 100, spellID = spellId})
+                    end
+                end
+            end
+
+            --check if this player has a augmentation buff container
+            local augmentedBuffContainer = miscActor.received_buffs_spells
+            if (augmentedBuffContainer) then
+                for sourceNameSpellId, spellTable in augmentedBuffContainer:ListSpells() do
+                    local sourceName, spellId = strsplit("@", sourceNameSpellId)
+                    spellId = tonumber(spellId)
+                    local spellName, _, spellIcon = Details.GetSpellInfo(spellId)
+
+                    if (spellName) then
+                        sourceName = detailsFramework:RemoveRealmName(sourceName)
+                        local uptime = spellTable.uptime or 0
+                        table.insert(newAuraTable, {spellIcon, spellName .. " [" .. sourceName .. "]", uptime, spellTable.appliedamt, spellTable.refreshamt, uptime / combatTime * 100, spellID = spellId, bReceived = true})
+                    end
                 end
             end
 
@@ -221,7 +270,7 @@ local aurasTabFillCallback = function(tab, player, combat)
             local spellContainer = miscActor:GetSpellContainer("debuff")
             if (spellContainer) then
                 for spellId, spellTable in spellContainer:ListSpells() do
-                    local spellName, _, spellIcon = GetSpellInfo(spellId)
+                    local spellName, _, spellIcon = Details.GetSpellInfo(spellId)
                     table.insert(newAuraTable, {spellIcon, spellName, spellTable.uptime, spellTable.appliedamt, spellTable.refreshamt, spellTable.uptime / combatTime * 100, spellID = spellId})
                 end
             end
diff --git a/frames/window_main.lua b/frames/window_main.lua
index 448a3565..a8376e76 100644
--- a/frames/window_main.lua
+++ b/frames/window_main.lua
@@ -4085,9 +4085,12 @@ function gump:CreateNewLine(instance, index)
 	newLine.extraStatusbar:SetMinMaxValues(0, 100)
 	newLine.extraStatusbar.texture = newLine.extraStatusbar:CreateTexture(nil, "overlay")
 	newLine.extraStatusbar:SetStatusBarTexture(newLine.extraStatusbar.texture)
+
 	--by default painting the extraStatusbar with the evoker color
 	local evokerColor = Details.class_colors["EVOKER"]
+	--newLine.extraStatusbar.texture:SetTexture([[Interface\AddOns\Details\images\bar_textures\bar_of_bars.png]]) --setColorTexture is very expensive, so set the color once and use vertex color to change it
 	newLine.extraStatusbar.texture:SetColorTexture(1, 1, 1, 1) --setColorTexture is very expensive, so set the color once and use vertex color to change it
+
 	newLine.extraStatusbar.texture:SetVertexColor(unpack(evokerColor))
 	newLine.extraStatusbar:SetAlpha(0.7)
 	newLine.extraStatusbar.defaultAlpha = 0.7
diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua
index 1cf44914..cf29f1d1 100644
--- a/frames/window_options2_sections.lua
+++ b/frames/window_options2_sections.lua
@@ -690,7 +690,7 @@ do
 
         sectionFrame.sectionOptions = sectionOptions
         sectionOptions.always_boxfirst = true
-        DF:BuildMenu(sectionFrame, sectionOptions, startX, startY-20, heightSize+20, false, options_text_template, options_dropdown_template, options_switch_template, true, options_slider_template, options_button_template)
+        DF:BuildMenu(sectionFrame, sectionOptions, startX, startY-20, heightSize+40, false, options_text_template, options_dropdown_template, options_switch_template, true, options_slider_template, options_button_template)
     end
 
     tinsert(Details.optionsSection, buildSection) --optionsSection is declared on boot.lua
diff --git a/frames/window_report.lua b/frames/window_report.lua
index b1372696..f30f686a 100644
--- a/frames/window_report.lua
+++ b/frames/window_report.lua
@@ -762,6 +762,8 @@ local createDropdown = function(thisFrame)
 		Details.janela_report = window
 		Details:InstallRPSkin("defaultSkin", defaultSkin)
 
+		DetailsFramework:AddRoundedCornersToFrame(window, Details.PlayerBreakdown.RoundedCornerPreset)
+
 		--recently reported:
 		window.recently_report_buttons = {}
 
diff --git a/functions/spellcache.lua b/functions/spellcache.lua
index cf712ab6..b7bf14dc 100644
--- a/functions/spellcache.lua
+++ b/functions/spellcache.lua
@@ -203,7 +203,7 @@ do
 			[277185] = {name = GetSpellInfo(277185) .. " (Trinket)"}, --[Dread Gladiator's Badge]
 			[278057] = {name = GetSpellInfo(278057) .. " (Trinket)"}, --[Vigilant's Bloodshaper]
 		}
-	else
+	else --retail
 		defaultSpellCustomization = {
 			[1] = {name = Loc ["STRING_MELEE"], icon = [[Interface\ICONS\INV_Sword_04]]},
 			[2] = {name = Loc ["STRING_AUTOSHOT"], icon = [[Interface\ICONS\INV_Weapon_Bow_07]]},
@@ -217,6 +217,7 @@ do
 			[108271] = {name = GetSpellInfo(108271), icon = "Interface\\Addons\\Details\\images\\icon_astral_shift"},
 			[196917] = {name = lightOfTheMartyr_Name .. " (" .. Loc ["STRING_DAMAGE"] .. ")", icon = lightOfTheMartyr_Icon},
 			[77535] = {name = GetSpellInfo(77535), icon = "Interface\\Addons\\Details\\images\\icon_blood_shield"},
+			[395296] = {name = GetSpellInfo(395296), icon = "Interface\\Addons\\Details\\images\\ebon_might"},
 		}
 
 		customItemList[394453] = {itemId = 195480, isPassive = true} --ring: Seal of Diurna's Chosen
diff --git a/functions/spells.lua b/functions/spells.lua
index d0af1f75..8539d047 100644
--- a/functions/spells.lua
+++ b/functions/spells.lua
@@ -1992,6 +1992,7 @@ do
 
 		[1467] = "EVOKER", --Devastation Evoker
 		[1468] = "EVOKER", --Preservation Evoker
+		[1473] = "EVOKER", --Augmentation Evoker
 	}
 
 	_detalhes.ClassSpellList = {
diff --git a/images/ebon_might.jpg b/images/ebon_might.jpg
new file mode 100644
index 00000000..bf0bd16a
Binary files /dev/null and b/images/ebon_might.jpg differ