diff --git a/KkthnxUI/Config/AuraWatchGUI.lua b/KkthnxUI/Config/AuraWatchGUI.lua
index 7024b48a..d693f9e9 100644
--- a/KkthnxUI/Config/AuraWatchGUI.lua
+++ b/KkthnxUI/Config/AuraWatchGUI.lua
@@ -10,7 +10,7 @@ local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
 local GameTooltip = GameTooltip
 local GetInventoryItemTexture = GetInventoryItemTexture
 local GetItemInfo = GetItemInfo
-local GetSpellInfo = GetSpellInfo
+local C_Spell_GetSpellInfo = C_Spell.GetSpellInfo
 local INVTYPE_CLOAK = INVTYPE_CLOAK
 local INVTYPE_FINGER = INVTYPE_FINGER
 local INVTYPE_TRINKET = INVTYPE_TRINKET
@@ -404,7 +404,7 @@ local function CreatePanel()
 
 	local function AddAura(parent, index, data)
 		local typeID, spellID, unitID, caster, stack, amount, timeless, combat, text, flash = unpack(data)
-		local name, _, texture = GetSpellInfo(spellID)
+		local name, _, texture = C_Spell_GetSpellInfo(spellID)
 		if typeID == "SlotID" then
 			texture = GetInventoryItemTexture("player", spellID)
 			name = slotIndex[spellID]
@@ -461,7 +461,7 @@ local function CreatePanel()
 
 	local function AddInternal(parent, index, data)
 		local intID, duration, trigger, unit, itemID = unpack(data)
-		local name, _, texture = GetSpellInfo(intID)
+		local name, _, texture = C_Spell_GetSpellInfo(intID)
 		if itemID then
 			name = GetItemInfo(itemID)
 		end
@@ -703,7 +703,7 @@ local function CreatePanel()
 					return
 				end
 
-				if (typeID == "AuraID" or typeID == "SpellID") and not GetSpellInfo(spellID) then
+				if (typeID == "AuraID" or typeID == "SpellID") and not C_Spell_GetSpellInfo(spellID) then
 					UIErrorsFrame:AddMessage(K.InfoColor .. L["Incorrect SpellID"])
 					return
 				end
@@ -727,7 +727,7 @@ local function CreatePanel()
 					return
 				end
 
-				if intID and not GetSpellInfo(intID) then
+				if intID and not C_Spell_GetSpellInfo(intID) then
 					UIErrorsFrame:AddMessage(K.InfoColor .. L["Incorrect SpellID"])
 					return
 				end
diff --git a/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua b/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua
index 49ee655c..87130ab8 100644
--- a/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua
+++ b/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua
@@ -4,7 +4,7 @@ local Module = K:NewModule("AurasTable")
 local string_format = string.format
 local table_wipe = table.wipe
 
-local GetSpellInfo = GetSpellInfo
+local C_Spell_GetSpellInfo = C_Spell.GetSpellInfo
 local UIParent = UIParent
 
 local AuraWatchList = {}
@@ -46,7 +46,7 @@ function Module:AddNewAuraWatch(class, list)
 		for _, v in pairs(k) do
 			local spellID = v.AuraID or v.SpellID
 			if spellID then
-				local name = GetSpellInfo(spellID)
+				local name = C_Spell_GetSpellInfo(spellID)
 				if not name then
 					table_wipe(v)
 					if K.isDeveloper then
diff --git a/KkthnxUI/Config/Elements/FilterLists/BadBuffs.lua b/KkthnxUI/Config/Elements/FilterLists/BadBuffs.lua
index bd5b3cdf..7c9d77fe 100644
--- a/KkthnxUI/Config/Elements/FilterLists/BadBuffs.lua
+++ b/KkthnxUI/Config/Elements/FilterLists/BadBuffs.lua
@@ -1,9 +1,9 @@
 local K, C = KkthnxUI[1], KkthnxUI[2]
 
-local GetSpellInfo = GetSpellInfo
+local C_Spell_GetSpellInfo = C_Spell.GetSpellInfo
 
 local function SpellName(id)
-	local name = GetSpellInfo(id)
+	local name = C_Spell_GetSpellInfo(id)
 	if name then
 		return name
 	else
diff --git a/KkthnxUI/Developer/Elements/Frame.lua b/KkthnxUI/Developer/Elements/Frame.lua
index a030fdb9..6ee51354 100644
--- a/KkthnxUI/Developer/Elements/Frame.lua
+++ b/KkthnxUI/Developer/Elements/Frame.lua
@@ -21,7 +21,7 @@ local GetInstanceInfo = GetInstanceInfo
 local GetScreenHeight = GetScreenHeight
 local GetScreenWidth = GetScreenWidth
 local GetSpellDescription = GetSpellDescription
-local GetSpellInfo = GetSpellInfo
+local C_Spell_GetSpellInfo = C_Spell.GetSpellInfo
 local GetSpellTexture = GetSpellTexture
 local IsInGuild = IsInGuild
 local IsInRaid = IsInRaid
@@ -75,7 +75,7 @@ end
 _G.SLASH_KKTHNXUI_ENUMFRAME1 = "/getframe"
 
 SlashCmdList["KKTHNXUI_DUMPSPELL"] = function(arg)
-	local name = GetSpellInfo(arg)
+	local name = C_Spell_GetSpellInfo(arg)
 	if not name then
 		print("Please enter a spell name --> /getspell SPELLNAME")
 		return
diff --git a/KkthnxUI/Init.lua b/KkthnxUI/Init.lua
index ee64b1f5..1e7da00e 100644
--- a/KkthnxUI/Init.lua
+++ b/KkthnxUI/Init.lua
@@ -1,34 +1,7 @@
 local AddOnName, Engine = ...
 
--- KkthnxUI Compatibility Layer for Firestorm Dragonflight Release
--- This script ensures backward compatibility with older WoW API functions.
-
--- Checking and initializing the C_AddOns table if it doesn't exist
--- This is necessary to avoid nil reference errors in older WoW versions.
-C_AddOns = C_AddOns or {}
-
--- Overwrite the IsAddOnLoaded function in the C_AddOns table.
--- This ensures that C_AddOns.IsAddOnLoaded references the global IsAddOnLoaded function.
--- Useful for older WoW versions where C_AddOns.IsAddOnLoaded might not be available.
-C_AddOns.IsAddOnLoaded = C_AddOns.IsAddOnLoaded or IsAddOnLoaded
-
--- Overwrite the GetAddOnInfo function in the C_AddOns table.
--- This ensures that C_AddOns.GetAddOnInfo references the global GetAddOnInfo function.
--- Ensures compatibility for accessing addon information across different WoW versions.
-C_AddOns.GetAddOnInfo = C_AddOns.GetAddOnInfo or GetAddOnInfo
-
--- Overwrite the GetNumAddOns function in the C_AddOns table.
--- This ensures that C_AddOns.GetNumAddOns references the global GetNumAddOns function.
--- Aligns with the above modification for consistency and backward compatibility.
-C_AddOns.GetNumAddOns = C_AddOns.GetNumAddOns or GetNumAddOns
-
--- Overwrite C_AddOns.GetAddOnEnableState with the global GetAddOnEnableState function.
--- Allows querying the enable state of addons in a manner compatible with older versions.
-C_AddOns.GetAddOnEnableState = C_AddOns.GetAddOnEnableState or GetAddOnEnableState
-
--- Note: These overrides are specifically tailored for the Firestorm Dragonflight release
--- and older versions of WoW. Ensure extensive testing across different WoW versions
--- to maintain compatibility and avoid conflicts with other addons or game client behavior.
+GetSpellTexture = C_Spell and C_Spell.GetSpellTexture or GetSpellTexture
+GetSpellInfo = C_Spell and C_Spell.GetSpellInfo or GetSpellInfo
 
 local bit_band = bit.band
 local bit_bor = bit.bor
diff --git a/KkthnxUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua b/KkthnxUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
index 7c9d584b..05ed0bc8 100644
--- a/KkthnxUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
+++ b/KkthnxUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
@@ -55,7 +55,7 @@ local UseCustomFlyout = WoWRetail
 
 local KeyBound = LibStub("LibKeyBound-1.0", true)
 local CBH = LibStub("CallbackHandler-1.0")
-local LCG = LibStub("LibCustomGlow-1.0-KkthnxUI", true) -- NDui: use LCG mod
+local LCG = LibStub("LibCustomGlow-1.0-NDui", true) -- NDui: use LCG mod
 local Masque = LibStub("Masque", true)
 
 lib.eventFrame = lib.eventFrame or CreateFrame("Frame")
@@ -1710,7 +1710,7 @@ local function UpdateProfessionQuality(self)
 		if quality then
 			if not self.ProfessionQuality then
 				self.ProfessionQuality = CreateFrame("Frame", nil, self)
-				self.ProfessionQuality:SetInside()
+				self.ProfessionQuality:SetAllPoints()
 				local tex = self.ProfessionQuality:CreateTexture(nil, "ARTWORK")
 				tex:SetPoint("TOPLEFT")
 				self.ProfessionQuality.Texture = tex
diff --git a/KkthnxUI/Libraries/cargBags/base-add/bags.sieve.lua b/KkthnxUI/Libraries/cargBags/base-add/bags.sieve.lua
index a1039207..3e29546b 100644
--- a/KkthnxUI/Libraries/cargBags/base-add/bags.sieve.lua
+++ b/KkthnxUI/Libraries/cargBags/base-add/bags.sieve.lua
@@ -45,13 +45,11 @@ local Container = cargBags.classes.Container
 	@param bags <BagType>
 ]]
 function Container:SetBags(bags)
-	if cargBags.ParseBags then
+	if(cargBags.ParseBags) then
 		bags = cargBags:ParseBags(bags)
 	end
 
-	if not bags then
-		return
-	end
+	if(not bags) then return end
 
 	self.implementation.bagToContainer = self.implementation.bagToContainer or {}
 	local b2c = self.implementation.bagToContainer
diff --git a/KkthnxUI/Libraries/cargBags/base-add/filters.sieve.lua b/KkthnxUI/Libraries/cargBags/base-add/filters.sieve.lua
index 064b3128..3a67be5a 100644
--- a/KkthnxUI/Libraries/cargBags/base-add/filters.sieve.lua
+++ b/KkthnxUI/Libraries/cargBags/base-add/filters.sieve.lua
@@ -46,15 +46,9 @@ end
 	Empties the filter table
 ]]
 function FilterSet:Empty()
-	for k in pairs(self.funcs) do
-		self.funcs[k] = nil
-	end
-	for k in pairs(self.params) do
-		self.params[k] = nil
-	end
-	for k in pairs(self.chained) do
-		self.chained[k] = nil
-	end
+	for k in pairs(self.funcs) do self.funcs[k] = nil end
+	for k in pairs(self.params) do self.params[k] = nil end
+	for k in pairs(self.chained) do self.chained[k] = nil end
 end
 
 --[[!
@@ -73,7 +67,7 @@ end
 	@param flag <bool> whether the filter is enabled (-1: inverted) [optional]
 ]]
 function FilterSet:SetExtended(filter, param, flag)
-	if not flag and param then
+	if(not flag and param) then
 		flag = true
 	end
 
@@ -87,7 +81,7 @@ end
 	@param ... <function> a list of filters
 ]]
 function FilterSet:SetMultiple(flag, ...)
-	for i = 1, select("#", ...) do
+	for i=1, select("#", ...) do
 		local filter = select(i, ...)
 		self:Set(filter, flag)
 	end
@@ -113,14 +107,14 @@ function FilterSet:Check(item)
 	-- check own filters
 	for filter, flag in pairs(funcs) do
 		local result = filter(item, params[filter])
-		if (flag == true and not result) or (flag == -1 and result) then
+		if((flag == true and not result) or (flag == -1 and result)) then
 			return nil
 		end
 	end
 
 	-- check filters of chained sets
 	for tbl in pairs(self.chained) do
-		if not tbl:Check(item) then
+		if(not tbl:Check(item)) then
 			return nil
 		end
 	end
@@ -135,7 +129,7 @@ end
 ]]
 function Implementation:GetContainerForItem(item)
 	for _, container in ipairs(self.contByID) do
-		if not container.filters or container.filters:Check(item) then
+		if(not container.filters or container.filters:Check(item)) then
 			return container
 		end
 	end
@@ -144,13 +138,13 @@ end
 --[[
 	Simple function shortcuts for Containers
 ]]
-for name, func in pairs({
+for name, func in pairs{
 	["SetFilter"] = "Set",
 	["SetExtendedFilter"] = "SetExtended",
 	["SetMultipleFilters"] = "SetMultiple",
 	["ChainFilters"] = "Chain",
-	["CheckFilters"] = "Check",
-}) do
+	["CheckFilters"]= "Check",
+} do
 	Container[name] = function(self, ...)
 		self.filters = self.filters or FilterSet:New()
 		self.filters[func](self.filters, ...)
@@ -169,4 +163,4 @@ function Container:FilterForFunction(func, filters)
 		local result = filters:Check(button:GetInfo())
 		func(button, result)
 	end
-end
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/base/container.lua b/KkthnxUI/Libraries/cargBags/base/container.lua
index fa9f820c..ab2b96f4 100644
--- a/KkthnxUI/Libraries/cargBags/base/container.lua
+++ b/KkthnxUI/Libraries/cargBags/base/container.lua
@@ -26,13 +26,11 @@ local cargBags = ns.cargBags
 ]]
 local Container = cargBags:NewClass("Container", nil, "Button")
 
-local mt_bags = {
-	__index = function(self, bagID)
-		self[bagID] = CreateFrame("Frame", nil, self.container)
-		self[bagID]:SetID(bagID)
-		return self[bagID]
-	end,
-}
+local mt_bags = {__index=function(self, bagID)
+	self[bagID] = CreateFrame("Frame", nil, self.container)
+	self[bagID]:SetID(bagID)
+	return self[bagID]
+end}
 
 --[[!
 	Creates a new instance of the class
@@ -43,11 +41,11 @@ local mt_bags = {
 ]]
 function Container:New(name, ...)
 	local implName = self.implementation.name
-	local container = setmetatable(CreateFrame("Button", implName .. name), self.__index)
+	local container = setmetatable(CreateFrame("Button", implName..name), self.__index)
 
 	container.name = name
 	container.buttons = {}
-	container.bags = setmetatable({ container = container }, mt_bags)
+	container.bags = setmetatable({container = container}, mt_bags)
 	container:ScheduleContentCallback()
 
 	container.implementation.contByName[name] = container -- Make this into pretty function?
@@ -55,9 +53,7 @@ function Container:New(name, ...)
 
 	container:SetParent(self.implementation)
 
-	if container.OnCreate then
-		container:OnCreate(name, ...)
-	end
+	if(container.OnCreate) then container:OnCreate(name, ...) end
 
 	return container
 end
@@ -73,12 +69,8 @@ function Container:AddButton(button)
 	button:SetParent(self.bags[button.bagId])
 	self:ScheduleContentCallback()
 	table.insert(self.buttons, button)
-	if button.OnAdd then
-		button:OnAdd(self)
-	end
-	if self.OnButtonAdd then
-		self:OnButtonAdd(button)
-	end
+	if(button.OnAdd) then button:OnAdd(self) end
+	if(self.OnButtonAdd) then self:OnButtonAdd(button) end
 end
 
 --[[!
@@ -89,15 +81,11 @@ end
 ]]
 function Container:RemoveButton(button)
 	for i, single in ipairs(self.buttons) do
-		if button == single then
+		if(button == single) then
 			self:ScheduleContentCallback()
 			button.container = nil
-			if button.OnRemove then
-				button:OnRemove(self)
-			end
-			if self.OnButtonRemove then
-				self:OnButtonRemove(button)
-			end
+			if(button.OnRemove) then button:OnRemove(self) end
+			if(self.OnButtonRemove) then self:OnButtonRemove(button) end
 			return table.remove(self.buttons, i)
 		end
 	end
@@ -106,14 +94,12 @@ end
 --[[
 	@callback OnContentsChanged()
 ]]
-local updater, scheduled = CreateFrame("Frame"), {}
+local updater, scheduled = CreateFrame"Frame", {}
 updater:Hide()
 updater:SetScript("OnUpdate", function(self)
 	self:Hide()
 	for container in pairs(scheduled) do
-		if container.OnContentsChanged then
-			container:OnContentsChanged()
-		end
+		if(container.OnContentsChanged) then container:OnContentsChanged() end
 		scheduled[container] = nil
 	end
 end)
diff --git a/KkthnxUI/Libraries/cargBags/base/core.lua b/KkthnxUI/Libraries/cargBags/base/core.lua
index a9b88c39..2d5bfae6 100644
--- a/KkthnxUI/Libraries/cargBags/base/core.lua
+++ b/KkthnxUI/Libraries/cargBags/base/core.lua
@@ -19,7 +19,7 @@
 	class-generation, helper-functions and the Blizzard-replacement.
 ]]
 local parent, ns = ...
-local global = C_AddOns.GetAddOnMetadata(parent, "X-cargBags")
+local global = C_AddOns.GetAddOnMetadata(parent, 'X-cargBags')
 
 --- @class table
 --  @name cargBags
@@ -27,20 +27,19 @@ local global = C_AddOns.GetAddOnMetadata(parent, "X-cargBags")
 --  class-generation, helper-functions and the Blizzard-replacement
 local cargBags = CreateFrame("Button")
 
+
 ns.cargBags = cargBags
-if global then
+if(global) then
 	_G[global] = cargBags
 end
 
 cargBags.classes = {} --- <table> Holds all classes by their name
 cargBags.itemKeys = {} --- <table> Holds all ItemKeys by their name
 
-local widgets = setmetatable({}, {
-	__index = function(self, widget)
-		self[widget] = getmetatable(CreateFrame(widget))
-		return self[widget]
-	end,
-})
+local widgets = setmetatable({}, {__index = function(self, widget)
+	self[widget] = getmetatable(CreateFrame(widget))
+	return self[widget]
+end})
 
 --- Creates a new class
 --  @param name <string> The name of the class
@@ -48,9 +47,7 @@ local widgets = setmetatable({}, {
 --  @param widget <string> The widget type of the class
 --  @return class <table> The prototype of the class
 function cargBags:NewClass(name, parent, widget)
-	if self.classes[name] then
-		return
-	end
+	if(self.classes[name]) then return end
 	parent = parent and self.classes[parent]
 	local class = setmetatable({}, parent or (widget and widgets[widget]))
 	class.__index = class
@@ -73,15 +70,9 @@ function cargBags:GetImplementation(name)
 	return self.classes.Implementation:Get(name)
 end
 
-local function toggleBag(forceopen)
-	cargBags.blizzard:Toggle(forceopen)
-end
-local function toggleNoForce()
-	cargBags.blizzard:Toggle()
-end
-local function closeBag()
-	cargBags.blizzard:Hide()
-end
+local function toggleBag(forceopen)	cargBags.blizzard:Toggle(forceopen)	end
+local function toggleNoForce() cargBags.blizzard:Toggle() end
+local function closeBag() cargBags.blizzard:Hide() end
 
 --- Overwrites Blizzards Bag-Toggle-Functions with the implementation's ones
 --  @param name <string> The name of the implementation [optional]
@@ -94,11 +85,11 @@ function cargBags:ReplaceBlizzard(name)
 	ToggleBag = toggleNoForce
 	ToggleBackpack = toggleNoForce
 
-	OpenAllBags = toggleBag -- Name is misleading, Blizz-function actually toggles bags
+	OpenAllBags = toggleBag	-- Name is misleading, Blizz-function actually toggles bags
 	OpenBackpack = toggleBag -- Blizz does not provide toggling here
 	CloseAllBags = closeBag
 	CloseBackpack = closeBag
-	OpenBag = toggleBag -- fixed the loot won alert frame
+	OpenBag = toggleBag		-- fixed the loot won alert frame
 
 	BankFrame:UnregisterAllEvents()
 end
@@ -108,7 +99,7 @@ end
 function cargBags:RegisterBlizzard(implementation)
 	self.blizzard = implementation
 
-	if IsLoggedIn() then
+	if(IsLoggedIn()) then
 		self:ReplaceBlizzard(self.blizzard)
 	else
 		self:RegisterEvent("PLAYER_LOGIN")
@@ -121,7 +112,7 @@ end
 --  @param ... arguments of the event [optional]
 function cargBags:FireEvent(force, event, ...)
 	for _, impl in pairs(self.classes.Implementation.instances) do
-		if force or impl:IsShown() then
+		if(force or impl:IsShown()) then
 			impl:OnEvent(event or "BAG_UPDATE", ...)
 		end
 	end
@@ -131,53 +122,47 @@ cargBags:RegisterEvent("BANKFRAME_OPENED")
 cargBags:RegisterEvent("BANKFRAME_CLOSED")
 
 cargBags:SetScript("OnEvent", function(self, event)
-	if not self.blizzard then
-		return
-	end
+	if(not self.blizzard) then return end
 
 	local impl = self.blizzard
 
-	if event == "PLAYER_LOGIN" then
+	if(event == "PLAYER_LOGIN") then
 		self:ReplaceBlizzard(impl)
-	elseif event == "BANKFRAME_OPENED" then
+	elseif(event == "BANKFRAME_OPENED") then
 		self.atBank = true
 
-		if impl:IsShown() then
+		if(impl:IsShown()) then
 			impl:OnEvent("BAG_UPDATE")
 		else
 			impl:Show()
 		end
 
-		if impl.OnBankOpened then
+		if(impl.OnBankOpened) then
 			impl:OnBankOpened()
 		end
-	elseif event == "BANKFRAME_CLOSED" then
+	elseif(event == "BANKFRAME_CLOSED") then
 		self.atBank = nil
 
-		if impl:IsShown() then
+		if(impl:IsShown()) then
 			impl:Hide()
 		end
 
-		if impl.OnBankClosed then
+		if(impl.OnBankClosed) then
 			impl:OnBankClosed()
 		end
 	end
 end)
 
-local handlerFuncs = setmetatable({}, {
-	__index = function(self, handler)
-		self[handler] = function(self, ...)
-			return self[handler] and self[handler](self, ...)
-		end
-		return self[handler]
-	end,
-})
+local handlerFuncs = setmetatable({}, {__index=function(self, handler)
+	self[handler] = function(self, ...) return self[handler] and self[handler](self, ...) end
+	return self[handler]
+end})
 
 --- Sets a number of script handlers by redirecting them to the members function, e.g. self:OnEvent(self, ...)
 --  @param self <frame>
 --  @param ... <string> A number of script handlers
 function cargBags.SetScriptHandlers(self, ...)
-	for i = 1, select("#", ...) do
+	for i=1, select("#", ...) do
 		local handler = select(i, ...)
 		self:SetScript(handler, handlerFuncs[handler])
 	end
@@ -188,24 +173,22 @@ end
 --  @param slotID <number>
 --  @return bagSlot <number>
 function cargBags.ToBagSlot(bagID, slotID)
-	return bagID * 100 + slotID
+	return bagID*100+slotID
 end
 
+
 --- Gets the bagID-slotID-pair of a bagSlot-index
 --  @param bagSlot <number>
 --  @return bagID <number>
 --  @return bagSlot <number>
 function cargBags.FromBagSlot(bagSlot)
-	return floor(bagSlot / 100), bagSlot % 100
+	return floor(bagSlot/100), bagSlot % 100
 end
 
 --- Creates a new item table which has access to ItemKeys
 --  @return itemTable <table>
-local m_item = {
-	__index = function(i, k)
-		return cargBags.itemKeys[k] and cargBags.itemKeys[k](i, k)
-	end,
-}
+local m_item = {__index = function(i,k) return cargBags.itemKeys[k] and cargBags.itemKeys[k](i,k) end}
 function cargBags:NewItemTable()
 	return setmetatable({}, m_item)
 end
+
diff --git a/KkthnxUI/Libraries/cargBags/base/implementation.lua b/KkthnxUI/Libraries/cargBags/base/implementation.lua
index ec414cdb..626988c2 100644
--- a/KkthnxUI/Libraries/cargBags/base/implementation.lua
+++ b/KkthnxUI/Libraries/cargBags/base/implementation.lua
@@ -18,6 +18,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ]]
 local _, ns = ...
+local B, C, L, DB = unpack(ns)
 local cargBags = ns.cargBags
 
 local GetContainerNumSlots = C_Container.GetContainerNumSlots
@@ -44,12 +45,8 @@ local MYTHIC_KEYSTONES = {
 	@return impl <Implementation>
 ]]
 function Implementation:New(name)
-	if self.instances[name] then
-		return error(("cargBags: Implementation '%s' already exists!"):format(name))
-	end
-	if _G[name] then
-		return error(("cargBags: Global '%s' for Implementation is already used!"):format(name))
-	end
+	if(self.instances[name]) then return error(("cargBags: Implementation '%s' already exists!"):format(name)) end
+	if(_G[name]) then return error(("cargBags: Global '%s' for Implementation is already used!"):format(name)) end
 
 	local impl = setmetatable(CreateFrame("Button", name, UIParent), self.__index)
 	impl.name = name
@@ -79,17 +76,15 @@ end
 	@callback OnOpen
 ]]
 function Implementation:OnShow()
-	if self.notInited then
-		if not (InCombatLockdown()) then -- initialization of bags in combat taints the itembuttons within - Lars Norberg
+	if(self.notInited) then
+		if not(InCombatLockdown()) then -- initialization of bags in combat taints the itembuttons within - Lars Norberg
 			self:Init()
 		else
 			return
 		end
 	end
 
-	if self.OnOpen then
-		self:OnOpen()
-	end
+	if(self.OnOpen) then self:OnOpen() end
 	self:OnEvent("BAG_UPDATE")
 end
 
@@ -98,16 +93,10 @@ end
 	@callback OnClose
 ]]
 function Implementation:OnHide()
-	if self.notInited then
-		return
-	end
+	if(self.notInited) then return end
 
-	if self.OnClose then
-		self:OnClose()
-	end
-	if self:AtBank() then
-		CloseBankFrame()
-	end
+	if(self.OnClose) then self:OnClose() end
+	if(self:AtBank()) then C_Bank.CloseBankFrame() end
 end
 
 --[[!
@@ -115,7 +104,7 @@ end
 	@param forceopen <bool> Only open it
 ]]
 function Implementation:Toggle(forceopen)
-	if not forceopen and self:IsShown() then
+	if(not forceopen and self:IsShown()) then
 		self:Hide()
 	else
 		self:Show()
@@ -153,15 +142,11 @@ end
 	@return class <table> The class prototype
 ]]
 function Implementation:GetClass(name, create, ...)
-	if not name then
-		return
-	end
+	if(not name) then return end
 
-	name = self.name .. name
+	name = self.name..name
 	local class = cargBags.classes[name]
-	if class or not create then
-		return class
-	end
+	if(class or not create) then return class end
 
 	class = cargBags:NewClass(name, ...)
 	class.implementation = self
@@ -175,7 +160,7 @@ end
 	@return class <table> The class prototype
 ]]
 function Implementation:GetContainerClass(name)
-	return self:GetClass((name or "") .. "Container", true, "Container")
+	return self:GetClass((name or "").."Container", true, "Container")
 end
 
 --[[!
@@ -185,7 +170,7 @@ end
 	@return class <table> The class prototype
 ]]
 function Implementation:GetItemButtonClass(name)
-	return self:GetClass((name or "") .. "ItemButton", true, "ItemButton")
+	return self:GetClass((name or "").."ItemButton", true, "ItemButton")
 end
 
 --[[!
@@ -219,12 +204,12 @@ local _isEventRegistered = UIParent.IsEventRegistered
 function Implementation:RegisterEvent(event, key, func)
 	local events = self.events
 
-	if not events[event] then
+	if(not events[event]) then
 		events[event] = {}
 	end
 
 	events[event][key] = func
-	if event:upper() == event and not _isEventRegistered(self, event) then
+	if(event:upper() == event and not _isEventRegistered(self, event)) then
 		_registerEvent(self, event)
 	end
 end
@@ -242,9 +227,7 @@ end
 	Script handler, dispatches the events
 ]]
 function Implementation:OnEvent(event, ...)
-	if not (self.events[event] and self:IsShown()) then
-		return
-	end
+	if(not (self.events[event] and self:IsShown())) then return end
 
 	for key, func in pairs(self.events[event]) do
 		func(key, event, ...)
@@ -256,22 +239,18 @@ end
 	@callback OnInit
 ]]
 function Implementation:Init()
-	if not self.notInited then
-		return
-	end
+	if(not self.notInited) then return end
 
 	-- initialization of bags in combat taints the itembuttons within - Lars Norberg
-	if InCombatLockdown() then
+	if (InCombatLockdown()) then
 		return
 	end
 
 	self.notInited = nil
 
-	if self.OnInit then
-		self:OnInit()
-	end
+	if(self.OnInit) then self:OnInit() end
 
-	if not self.buttonClass then
+	if(not self.buttonClass) then
 		self:SetDefaultItemButtonClass()
 	end
 
@@ -322,18 +301,17 @@ local defaultItem = cargBags:NewItemTable()
 	@param i <table> [optional]
 	@return i <table>
 ]]
-function Implementation:GetCustomItemInfo(bagID, slotID, i)
+function Implementation:GetItemInfo(bagID, slotID, i)
 	i = i or defaultItem
-	for k in pairs(i) do
-		i[k] = nil
-	end
+	for k in pairs(i) do i[k] = nil end
 
 	i.bagId = bagID
 	i.slotId = slotID
 
+	local texture, count, locked, quality, itemLink, noValue, itemID
 	local info = C_Container.GetContainerItemInfo(bagID, slotID)
 	if info then
-		i.texture, i.count, i.locked, i.quality, i.link, i.id, i.bound, i.hasPrice = info.iconFileID, info.stackCount, info.isLocked, (info.quality or 1), info.hyperlink, info.itemID, info.isBound, not info.hasNoValue
+		i.texture, i.count, i.locked, i.quality, i.link, i.id, i.hasPrice = info.iconFileID, info.stackCount, info.isLocked, (info.quality or 1), info.hyperlink, info.itemID, (not info.hasNoValue)
 
 		i.isInSet, i.setName = C_Container.GetContainerItemEquipmentSetInfo(bagID, slotID)
 
@@ -342,8 +320,7 @@ function Implementation:GetCustomItemInfo(bagID, slotID, i)
 		local questInfo = C_Container.GetContainerItemQuestInfo(bagID, slotID)
 		i.isQuestItem, i.questID, i.questActive = questInfo.isQuestItem, questInfo.questID, questInfo.isActive
 
-		i.spellID = GetItemSpell(i.link)
-		i.name, _, _, _, i.minlevel, i.type, i.subType, _, i.equipLoc, _, _, i.classID, i.subClassID, i.bindType = GetItemInfo(i.link)
+		i.name, _, _, _, _, i.type, i.subType, _, i.equipLoc, _, _, i.classID, i.subClassID = C_Item.GetItemInfo(i.link)
 		i.equipLoc = _G[i.equipLoc] -- INVTYPE to localized string
 
 		if i.id == PET_CAGE then
@@ -368,13 +345,13 @@ end
 	@param slotID <number>
 ]]
 function Implementation:UpdateSlot(bagID, slotID)
-	local item = self:GetCustomItemInfo(bagID, slotID)
+	local item = self:GetItemInfo(bagID, slotID)
 	local button = self:GetButton(bagID, slotID)
 	local container = self:GetContainerForItem(item, button)
 
-	if container then
-		if button then
-			if container ~= button.container then
+	if(container) then
+		if(button) then
+			if(container ~= button.container) then
 				button.container:RemoveButton(button)
 				container:AddButton(button)
 			end
@@ -385,7 +362,7 @@ function Implementation:UpdateSlot(bagID, slotID)
 		end
 
 		button:ButtonUpdate(item)
-	elseif button then
+	elseif(button) then
 		button.container:RemoveButton(button)
 		self:SetButton(bagID, slotID, nil)
 		button:Free()
@@ -400,7 +377,7 @@ local closed
 ]]
 function Implementation:UpdateBag(bagID)
 	local numSlots
-	if closed then
+	if(closed) then
 		numSlots, closed = 0
 	else
 		numSlots = GetContainerNumSlots(bagID)
@@ -408,12 +385,12 @@ function Implementation:UpdateBag(bagID)
 	local lastSlots = self.bagSizes[bagID] or 0
 	self.bagSizes[bagID] = numSlots
 
-	for slotID = 1, numSlots do
+	for slotID=1, numSlots do
 		self:UpdateSlot(bagID, slotID)
 	end
-	for slotID = numSlots + 1, lastSlots do
+	for slotID=numSlots+1, lastSlots do
 		local button = self:GetButton(bagID, slotID)
-		if button then
+		if(button) then
 			button.container:RemoveButton(button)
 			self:SetButton(bagID, slotID, nil)
 			button:Free()
@@ -428,16 +405,14 @@ end
 	@callback Container:OnBagUpdate(bagID, slotID)
 ]]
 function Implementation:BAG_UPDATE(_, bagID, slotID)
-	if self.isSorting then
-		return
-	end
+	if self.isSorting then return end
 
-	if bagID and slotID then
+	if(bagID and slotID) then
 		self:UpdateSlot(bagID, slotID)
-	elseif bagID then
+	elseif(bagID) then
 		self:UpdateBag(bagID)
 	else
-		for bagID = -3, 12 do
+		for bagID = -3, 17 do
 			self:UpdateBag(bagID)
 		end
 	end
@@ -457,18 +432,18 @@ end
 	@param bagID <number> [optional]
 ]]
 function Implementation:BAG_UPDATE_COOLDOWN(_, bagID)
-	if bagID then
-		for slotID = 1, GetContainerNumSlots(bagID) do
+	if(bagID) then
+		for slotID=1, GetContainerNumSlots(bagID) do
 			local button = self:GetButton(bagID, slotID)
-			if button then
-				local item = self:GetCustomItemInfo(bagID, slotID)
+			if(button) then
+				local item = self:GetItemInfo(bagID, slotID)
 				button:ButtonUpdateCooldown(item)
 			end
 		end
 	else
 		for _, container in pairs(self.contByID) do
 			for _, button in pairs(container.buttons) do
-				local item = self:GetCustomItemInfo(button.bagId, button.slotId)
+				local item = self:GetItemInfo(button.bagId, button.slotId)
 				button:ButtonUpdateCooldown(item)
 			end
 		end
@@ -481,16 +456,12 @@ end
 	@param slotID <number> [optional]
 ]]
 function Implementation:ITEM_LOCK_CHANGED(_, bagID, slotID)
-	if self.isSorting then
-		return
-	end
-	if not slotID then
-		return
-	end
+	if self.isSorting then return end
+	if(not slotID) then return end
 
 	local button = self:GetButton(bagID, slotID)
-	if button then
-		local item = self:GetCustomItemInfo(bagID, slotID)
+	if(button) then
+		local item = self:GetItemInfo(bagID, slotID)
 		button:ButtonUpdateLock(item)
 	end
 end
@@ -501,7 +472,7 @@ end
 	@param slotID <number> [optional]
 ]]
 function Implementation:PLAYERBANKSLOTS_CHANGED(event, bagID, slotID)
-	if bagID <= NUM_BANKGENERIC_SLOTS then
+	if(bagID <= NUM_BANKGENERIC_SLOTS) then
 		slotID = bagID
 		bagID = -1
 	else
@@ -528,8 +499,8 @@ end
 function Implementation:UNIT_QUEST_LOG_CHANGED()
 	for _, container in pairs(self.contByID) do
 		for _, button in pairs(container.buttons) do
-			local item = self:GetCustomItemInfo(button.bagId, button.slotId)
+			local item = self:GetItemInfo(button.bagId, button.slotId)
 			button:ButtonUpdateQuest(item)
 		end
 	end
-end
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/base/itembutton.lua b/KkthnxUI/Libraries/cargBags/base/itembutton.lua
index 34ef7bea..127215b1 100644
--- a/KkthnxUI/Libraries/cargBags/base/itembutton.lua
+++ b/KkthnxUI/Libraries/cargBags/base/itembutton.lua
@@ -20,10 +20,18 @@
 local _, ns = ...
 local cargBags = ns.cargBags
 
-local ReagentButtonInventorySlot = ReagentButtonInventorySlot
-local ButtonInventorySlot = ButtonInventorySlot
+local _G = _G
+local ReagentButtonInventorySlot = _G.ReagentButtonInventorySlot
+local ButtonInventorySlot = _G.ButtonInventorySlot
 local BANK_CONTAINER = BANK_CONTAINER or -1
 local REAGENTBANK_CONTAINER = REAGENTBANK_CONTAINER or -3
+local ACCOUNTBANK_CONTAINERS = {
+	[Enum.BagIndex.AccountBankTab_1 or 13] = true,
+	[Enum.BagIndex.AccountBankTab_2 or 14] = true,
+	[Enum.BagIndex.AccountBankTab_3 or 15] = true,
+	[Enum.BagIndex.AccountBankTab_4 or 16] = true,
+	[Enum.BagIndex.AccountBankTab_5 or 17] = true,
+}
 local SplitContainerItem = C_Container.SplitContainerItem
 
 --[[!
@@ -44,17 +52,13 @@ function ItemButton:GetTemplate(bagID)
 		or (bagID and "ContainerFrameItemButtonTemplate")
 		or "",
 		(bagID == REAGENTBANK_CONTAINER and ReagentBankFrame)
-			or (bagID == BANK_CONTAINER and BankFrame)
-			or (bagID and _G["ContainerFrame" .. (bagID + 1)])
-			or ""
+		or (bagID == BANK_CONTAINER and BankFrame)
+		or (bagID and _G["ContainerFrame"..(bagID + 1)])
+		or (ACCOUNTBANK_CONTAINERS[bagID] and AccountBankPanel)
+		or ""
 end
 
-local mt_gen_key = {
-	__index = function(self, k)
-		self[k] = {}
-		return self[k]
-	end,
-}
+local mt_gen_key = {__index = function(self,k) self[k] = {}; return self[k]; end}
 
 --[[!
 	Fetches a new instance of the ItemButton, creating one if necessary
@@ -109,31 +113,19 @@ function ItemButton:Create(tpl, parent)
 	impl.numSlots = (impl.numSlots or 0) + 1
 	local name = ("%sSlot%d"):format(impl.name, impl.numSlots)
 
-	local button = setmetatable(CreateFrame("ItemButton", name, parent, tpl .. ", BackdropTemplate"), self.__index)
+	local button = setmetatable(CreateFrame("ItemButton", name, parent, tpl..", BackdropTemplate"), self.__index)
 
-	if button.Scaffold then
-		button:Scaffold(tpl)
-	end
-	if button.OnCreate then
-		button:OnCreate(tpl)
-	end
+	if(button.Scaffold) then button:Scaffold(tpl) end
+	if(button.OnCreate) then button:OnCreate(tpl) end
 
-	local btnNT = _G[button:GetName() .. "NormalTexture"]
+	local btnNT = _G[button:GetName().."NormalTexture"]
 	local btnNIT = button.NewItemTexture
 	local btnBIT = button.BattlepayItemTexture
 	local btnICO = button.ItemContextOverlay
-	if btnNT then
-		btnNT:SetTexture("")
-	end
-	if btnNIT then
-		btnNIT:SetTexture("")
-	end
-	if btnBIT then
-		btnBIT:SetTexture("")
-	end
-	if btnICO then
-		btnICO:SetTexture("")
-	end
+	if btnNT then btnNT:SetTexture("") end
+	if btnNIT then btnNIT:SetTexture("") end
+	if btnBIT then btnBIT:SetTexture("") end
+	if btnICO then btnICO:SetTexture("") end
 
 	button:RegisterForDrag("LeftButton") -- fix button drag in 9.0
 
@@ -154,5 +146,5 @@ end
 	@return item <table>
 ]]
 function ItemButton:GetInfo(item)
-	return self.implementation:GetCustomItemInfo(self.bagId, self.slotId, item)
-end
+	return self.implementation:GetItemInfo(self.bagId, self.slotId, item)
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/cargBags.xml b/KkthnxUI/Libraries/cargBags/cargBags.xml
index 5ce27225..a83dcd8d 100644
--- a/KkthnxUI/Libraries/cargBags/cargBags.xml
+++ b/KkthnxUI/Libraries/cargBags/cargBags.xml
@@ -60,6 +60,7 @@
 		All optional
 	-->
 	<Script file='mixins-add\plugins\bagBar.lua' />
+	<Script file='mixins-add\plugins\bagTabs.lua' />
 	<Script file='mixins-add\plugins\searchBar.lua' />
 	<Script file='mixins-add\plugins\tagDisplay.lua' />
 
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/default.scaffold.lua b/KkthnxUI/Libraries/cargBags/mixins-add/default.scaffold.lua
index 769c9b53..3c9f481c 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/default.scaffold.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/default.scaffold.lua
@@ -33,19 +33,19 @@ local function ItemButton_Scaffold(self)
 
 	local name = self:GetName()
 	if not self.Icon then
-		self.Icon = _G[name .. "IconTexture"]
+		self.Icon = _G[name.."IconTexture"]
 	end
 	if not self.Count then
-		self.Count = _G[name .. "Count"]
+		self.Count = _G[name.."Count"]
 	end
 	if not self.Cooldown then
-		self.Cooldown = _G[name .. "Cooldown"]
+		self.Cooldown = _G[name.."Cooldown"]
 	end
 	if not self.Quest then
-		self.Quest = _G[name .. "IconQuestTexture"]
+		self.Quest = _G[name.."IconQuestTexture"]
 	end
 	if not self.Border then
-		self.Border = _G[name .. "NormalTexture"]
+		self.Border = _G[name.."NormalTexture"]
 	end
 end
 
@@ -57,7 +57,7 @@ end
 local function ItemButton_Update(self, item)
 	self.Icon:SetTexture(item.texture or self.bgTex)
 
-	if item.count and item.count > 1 then
+	if(item.count and item.count > 1) then
 		self.Count:SetText(item.count > 1e4 and "*" or item.count)
 		self.Count:Show()
 	else
@@ -69,9 +69,7 @@ local function ItemButton_Update(self, item)
 	self:ButtonUpdateLock(item)
 	self:ButtonUpdateQuest(item)
 
-	if self.OnUpdateButton then
-		self:OnUpdateButton(item)
-	end
+	if(self.OnUpdateButton) then self:OnUpdateButton(item) end
 end
 
 --[[!
@@ -80,16 +78,14 @@ end
 	@callback OnUpdateCooldown(item)
 ]]
 local function ItemButton_UpdateCooldown(self, item)
-	if item.cdEnable == 1 and item.cdStart and item.cdStart > 0 then
+	if(item.cdEnable == 1 and item.cdStart and item.cdStart > 0) then
 		self.Cooldown:SetCooldown(item.cdStart, item.cdFinish)
 		self.Cooldown:Show()
 	else
 		self.Cooldown:Hide()
 	end
 
-	if self.OnUpdateCooldown then
-		self:OnUpdateCooldown(item)
-	end
+	if(self.OnUpdateCooldown) then self:OnUpdateCooldown(item) end
 end
 
 --[[!
@@ -100,9 +96,7 @@ end
 local function ItemButton_UpdateLock(self, item)
 	self.Icon:SetDesaturated(item.locked)
 
-	if self.OnUpdateLock then
-		self:OnUpdateLock(item)
-	end
+	if(self.OnUpdateLock) then self:OnUpdateLock(item) end
 end
 
 --[[!
@@ -111,31 +105,25 @@ end
 	@callback OnUpdateQuest(item)
 ]]
 local function ItemButton_UpdateQuest(self, item)
-	if self.OnUpdateQuest then
-		self:OnUpdateQuest(item)
-	end
+	if(self.OnUpdateQuest) then self:OnUpdateQuest(item) end
 end
 
 local function ItemButton_OnEnter(self)
-	if self.ItemOnEnter then
-		self:ItemOnEnter()
-	end
+	if(self.ItemOnEnter) then self:ItemOnEnter() end
 end
 
 local function ItemButton_OnLeave(self)
-	if self.ItemOnLeave then
-		self:ItemOnLeave()
-	end
+	if(self.ItemOnLeave) then self:ItemOnLeave() end
 end
 
 cargBags:RegisterScaffold("Default", function(self)
 	self.glowTex = "Interface\\Buttons\\UI-ActionButton-Border" --! @property glowTex <string> The textures used for the glow
 	self.glowAlpha = 0.8 --! @property glowAlpha <number> The alpha of the glow texture
 	self.glowBlend = "ADD" --! @property glowBlend <string> The blendMode of the glow texture
-	self.glowCoords = { 14 / 64, 50 / 64, 14 / 64, 50 / 64 } --! @property glowCoords <table> Indexed table of texCoords for the glow texture
+	self.glowCoords = { 14/64, 50/64, 14/64, 50/64 } --! @property glowCoords <table> Indexed table of texCoords for the glow texture
 	self.bgTex = nil --! @property bgTex <string> Texture used as a background if no item is in the slot
 
-	-- self.CreateFrame = ItemButton_CreateFrame
+	self.CreateFrame = ItemButton_CreateFrame
 	self.Scaffold = ItemButton_Scaffold
 
 	self.ButtonUpdate = ItemButton_Update
@@ -145,4 +133,4 @@ cargBags:RegisterScaffold("Default", function(self)
 
 	self.ButtonOnEnter = ItemButton_OnEnter
 	self.ButtonOnLeave = ItemButton_OnLeave
-end)
+end)
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/basic.lua b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/basic.lua
index 966bea4c..1e902dc1 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/basic.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/basic.lua
@@ -41,10 +41,10 @@ cargBags.itemKeys["string"] = function(i)
 end
 
 cargBags.itemKeys["stats"] = function(i)
-	if not i.link or not GetItemStats then
+	if not i.link or not C_Item.GetItemStats then
 		return
 	end
-	local stats = GetItemStats(i.link)
+	local stats = C_Item.GetItemStats(i.link)
 	i.stats = stats
 	return stats
 end
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/equipSets.lua b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/equipSets.lua
index d8863b97..8f184a2d 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/equipSets.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/equipSets.lua
@@ -1,19 +1,25 @@
 --[[
 	cargBags: An inventory framework addon for World of Warcraft
+
 	Copyright (C) 2010  Constantin "Cargor" Schomburg <xconstruct@gmail.com>
+
 	cargBags is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
 	as published by the Free Software Foundation; either version 2
 	of the License, or (at your option) any later version.
+
 	cargBags is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
+
 	You should have received a copy of the GNU General Public License
 	along with cargBags; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 DESCRIPTION
 	Item keys for the Blizz equipment sets
+
 DEPENDENCIES
 	mixins-add/itemkeys/basic.lua
 ]]
@@ -26,9 +32,7 @@ local setItems, isUpdating
 
 local function initUpdater()
 	local function updateSets()
-		if isUpdating then
-			return
-		end
+		if isUpdating then return end
 		isUpdating = true
 
 		setItems = setItems or {}
@@ -40,11 +44,12 @@ local function initUpdater()
 				for _, location in pairs(locations) do
 					local _, bank, bags, _, slot, bag = EquipmentManager_UnpackLocation(location)
 					if (bank or bags) and slot and bag then
-						setItems[bag .. ":" .. slot] = true
+						setItems[bag..":"..slot] = true
 					end
 				end
 			end
 		end
+
 		isUpdating = nil
 	end
 
@@ -58,8 +63,6 @@ local function initUpdater()
 end
 
 ItemKeys["isItemSet"] = function(item)
-	if not setItems then
-		initUpdater()
-	end
-	return setItems[item.bagId .. ":" .. item.slotId]
-end
+	if not setItems then initUpdater() end
+	return setItems[item.bagId..":"..item.slotId]
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/tooltip.lua b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/tooltip.lua
index 5059a772..5148c240 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/tooltip.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/itemkeys/tooltip.lua
@@ -22,6 +22,7 @@ DESCRIPTION:
 	Item keys which require tooltip parsing to work
 ]]
 local _, ns = ...
+local B, C, L, DB = unpack(ns)
 local cargBags = ns.cargBags
 
 local bindTypeToString = {
@@ -33,23 +34,18 @@ local bindTypeToString = {
 	[ITEM_ACCOUNTBOUND] = "account",
 	[ITEM_BIND_TO_ACCOUNT] = "account",
 	[ITEM_BNETACCOUNTBOUND] = "account",
+	[ITEM_ACCOUNTBOUND_UNTIL_EQUIP] = "accountequip",
 }
 
 cargBags.itemKeys["bindOn"] = function(i)
-	if not i.link then
-		return
-	end
+	if not i.link then return end
 
 	local data = C_TooltipInfo.GetBagItem(i.bagId, i.slotId)
-	if not data then
-		return
-	end
+	if not data then return end
 
 	for j = 2, 5 do
 		local lineData = data.lines[j]
-		if not lineData then
-			break
-		end
+		if not lineData then break end
 		local lineText = lineData.leftText
 		local bindOn = lineText and bindTypeToString[lineText]
 		if bindOn then
@@ -57,4 +53,4 @@ cargBags.itemKeys["bindOn"] = function(i)
 			return bindOn
 		end
 	end
-end
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/layouts.lua b/KkthnxUI/Libraries/cargBags/mixins-add/layouts.lua
index a482186e..a8979085 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/layouts.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/layouts.lua
@@ -30,27 +30,27 @@ function layouts.grid(self, columns, spacing, xOffset, yOffset)
 	columns, spacing = columns or 8, spacing or 5
 	xOffset, yOffset = xOffset or 0, yOffset or 0
 
+
 	local width, height = 0, 0
 	local col, row = 0, 0
 	for i, button in ipairs(self.buttons) do
-		if i == 1 then -- Hackish, I know
+
+		if(i == 1) then -- Hackish, I know
 			width, height = button:GetSize()
 		end
 
 		col = i % columns
-		if col == 0 then
-			col = columns
-		end
-		row = math.ceil(i / columns)
+		if(col == 0) then col = columns end
+		row = math.ceil(i/columns)
 
-		local xPos = (col - 1) * (width + spacing)
-		local yPos = -1 * (row - 1) * (height + spacing)
+		local xPos = (col-1) * (width + spacing)
+		local yPos = -1 * (row-1) * (height + spacing)
 
 		button:ClearAllPoints()
-		button:SetPoint("TOPLEFT", self, "TOPLEFT", xPos + xOffset, yPos + yOffset)
+		button:SetPoint("TOPLEFT", self, "TOPLEFT", xPos+xOffset, yPos+yOffset)
 	end
 
-	return columns * (width + spacing) - spacing, row * (height + spacing) - spacing
+	return columns * (width+spacing)-spacing, row * (height+spacing)-spacing
 end
 
 --[[!
@@ -60,17 +60,17 @@ end
 	@param yOffset <number> y-offset of the whole layout [default: 0]
 ]]
 function layouts.circle(self, radius, xOffset, yOffset)
-	radius = radius or (#self.buttons * 50) / math.pi / 2
+	radius = radius or (#self.buttons*50)/math.pi/2
 	xOffset, yOffset = xOffset or 0, yOffset or 0
 
-	local a = 360 / #self.buttons
+	local a = 360/#self.buttons
 
 	for i, button in ipairs(self.buttons) do
-		local x = radius * cos(a * i)
-		local y = -radius * sin(a * i)
+		local x = radius*cos(a*i)
+		local y = -radius*sin(a*i)
 
 		button:ClearAllPoints()
-		button:SetPoint("TOPLEFT", self, "TOPLEFT", radius + x + xOffset, y - radius + yOffset)
+		button:SetPoint("TOPLEFT", self, "TOPLEFT", radius+x+xOffset, y-radius+yOffset)
 	end
-	return radius * 2, radius * 2
+	return radius*2, radius*2
 end
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagBar.lua b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagBar.lua
index 857e1472..ec664f5f 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagBar.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagBar.lua
@@ -33,6 +33,7 @@ CALLBACKS
 ]]
 
 local addon, ns = ...
+local B, C, L, DB = unpack(ns)
 local cargBags = ns.cargBags
 local Implementation = cargBags.classes.Implementation
 
@@ -57,8 +58,8 @@ end
 
 local buttonNum = 0
 function BagButton:Create(bagID)
-	buttonNum = buttonNum + 1
-	local name = addon .. "BagButton" .. buttonNum
+	buttonNum = buttonNum+1
+	local name = addon.."BagButton"..buttonNum
 	local isBankBag = bagID > 5 and bagID < 13
 	local button = setmetatable(CreateFrame("ItemButton", name, nil, "BackdropTemplate"), self.__index)
 
@@ -75,13 +76,11 @@ function BagButton:Create(bagID)
 	button:RegisterForDrag("LeftButton", "RightButton")
 	button:RegisterForClicks("AnyUp")
 	button:SetSize(37, 37)
-	button.Icon = _G[name .. "IconTexture"]
+	button.Icon = _G[name.."IconTexture"]
 
 	cargBags.SetScriptHandlers(button, "OnClick", "OnReceiveDrag", "OnEnter", "OnLeave", "OnDragStart")
 
-	if button.OnCreate then
-		button:OnCreate(bagID)
-	end
+	if(button.OnCreate) then button:OnCreate(bagID) end
 
 	return button
 end
@@ -91,8 +90,8 @@ function BagButton:UpdateButton()
 	self.Icon:SetTexture(icon or self.bgTex)
 	self.Icon:SetDesaturated(IsInventoryItemLocked(self.invID))
 
-	if self.bagId > maxBagSlots then
-		if self.bagId - maxBagSlots <= GetNumBankSlots() then
+	if(self.bagId > maxBagSlots) then
+		if(self.bagId - maxBagSlots <= GetNumBankSlots()) then
 			self.Icon:SetVertexColor(1, 1, 1)
 			self.notBought = nil
 		else
@@ -101,9 +100,7 @@ function BagButton:UpdateButton()
 		end
 	end
 
-	if self.OnUpdateButton then
-		self:OnUpdateButton()
-	end
+	if(self.OnUpdateButton) then self:OnUpdateButton() end
 end
 
 local function highlight(button, func, bagID)
@@ -113,8 +110,8 @@ end
 function BagButton:OnEnter()
 	local hlFunction = self.bar.highlightFunction
 
-	if hlFunction then
-		if self.bar.isGlobal then
+	if(hlFunction) then
+		if(self.bar.isGlobal) then
 			for _, container in pairs(self.implementation.contByID) do
 				container:ApplyToButtons(highlight, hlFunction, self.bagId)
 			end
@@ -133,8 +130,8 @@ end
 function BagButton:OnLeave()
 	local hlFunction = self.bar.highlightFunction
 
-	if hlFunction then
-		if self.bar.isGlobal then
+	if(hlFunction) then
+		if(self.bar.isGlobal) then
 			for _, container in pairs(self.implementation.contByID) do
 				container:ApplyToButtons(highlight, hlFunction)
 			end
@@ -147,35 +144,26 @@ function BagButton:OnLeave()
 end
 
 function BagButton:OnClick(btn)
-	if InCombatLockdown() then
-		UIErrorsFrame:AddMessage("|cff99ccff" .. ERR_NOT_IN_COMBAT)
-		return
-	end -- PutItemInBag is secure in combat
+	if InCombatLockdown() then UIErrorsFrame:AddMessage("|cff99ccff"..ERR_NOT_IN_COMBAT) return end -- PutItemInBag is secure in combat
 
-	if self.notBought then
+	if(self.notBought) then
 		BankFrame.nextSlotCost = GetBankSlotCost(GetNumBankSlots())
 		return StaticPopup_Show("CONFIRM_BUY_BANK_SLOT")
 	end
 
-	if PutItemInBag((self.GetInventorySlot and self:GetInventorySlot()) or self.invID) then
-		return
-	end
+	if(PutItemInBag((self.GetInventorySlot and self:GetInventorySlot()) or self.invID)) then return end
 
-	if btn ~= "RightButton" then
-		return
-	end
+	if btn ~= "RightButton" then return end
 	-- Somehow we need to disconnect this from the filter-sieve
 	local container = self.bar.container
-	if container and container.SetFilter then
-		if not self.filter then
+	if(container and container.SetFilter) then
+		if(not self.filter) then
 			local bagID = self.bagId
-			self.filter = function(i)
-				return i.bagId ~= bagID
-			end
+			self.filter = function(i) return i.bagId ~= bagID end
 		end
 		self.hidden = not self.hidden
 
-		if self.bar.isGlobal then
+		if(self.bar.isGlobal) then
 			for _, container in pairs(container.implementation.contByID) do
 				container:SetFilter(self.filter, self.hidden)
 				container.implementation:OnEvent("BAG_UPDATE", self.bagId)
@@ -200,16 +188,14 @@ local function updater(self)
 end
 
 local function onLock(self, _, bagID, slotID)
-	if bagID == -1 and slotID > NUM_BANKGENERIC_SLOTS then
+	if(bagID == -1 and slotID > NUM_BANKGENERIC_SLOTS) then
 		bagID, slotID = ContainerIDToInventoryID(slotID - NUM_BANKGENERIC_SLOTS + maxBagSlots)
 	end
 
-	if slotID then
-		return
-	end
+	if(slotID) then return end
 
 	for _, button in pairs(self.buttons) do
-		if button.invID == bagID then
+		if(button.invID == bagID) then
 			return button:UpdateButton()
 		end
 	end
@@ -223,7 +209,7 @@ local disabled = {
 
 -- Register the plugin
 cargBags:RegisterPlugin("BagBar", function(self, bags)
-	if cargBags.ParseBags then
+	if(cargBags.ParseBags) then
 		bags = cargBags:ParseBags(bags)
 	end
 
@@ -235,8 +221,8 @@ cargBags:RegisterPlugin("BagBar", function(self, bags)
 
 	local buttonClass = self.implementation:GetBagButtonClass()
 	bar.buttons = {}
-	for i = 1, #bags do
-		if not disabled[bags[i]] then -- Temporary until I include fake buttons for backpack, bankframe and keyring
+	for i=1, #bags do
+		if(not disabled[bags[i]]) then -- Temporary until I include fake buttons for backpack, bankframe and keyring
 			local button = buttonClass:Create(bags[i])
 			button:SetParent(bar)
 			button.bar = bar
@@ -249,4 +235,4 @@ cargBags:RegisterPlugin("BagBar", function(self, bags)
 	self.implementation:RegisterEvent("ITEM_LOCK_CHANGED", bar, onLock)
 
 	return bar
-end)
+end)
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagTabs.lua b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagTabs.lua
new file mode 100644
index 00000000..9922d500
--- /dev/null
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/bagTabs.lua
@@ -0,0 +1,199 @@
+--[[
+	Create tabs for blizzard AccountBankPanel.
+	By siweia.
+]]
+local addon, ns = ...
+local B, C, L, DB = unpack(ns)
+local cargBags = ns.cargBags
+local Implementation = cargBags.classes.Implementation
+
+local AccountBankPanel = AccountBankPanel
+local BANK_TAB1 = Enum.BagIndex.AccountBankTab_1 or 13
+local ACCOUNT_BANK_TYPE = Enum.BankType.Account or 2
+
+cargBags.selectedTabID = 1 -- default tabID
+
+function Implementation:GetBagTabClass()
+	return self:GetClass("BagTab", true, "BagTab")
+end
+
+local BagTab = cargBags:NewClass("BagTab", nil, "Button")
+
+-- Default attributes
+BagTab.bgTex = QUESTION_MARK_ICON
+
+local function AddBankTabSettingsToTooltip(tooltip, depositFlags)
+	if not tooltip or not depositFlags then return end
+
+	if FlagsUtil.IsSet(depositFlags, Enum.BagSlotFlags.ExpansionCurrent) then
+		GameTooltip_AddNormalLine(tooltip, BANK_TAB_EXPANSION_ASSIGNMENT:format(BANK_TAB_EXPANSION_FILTER_CURRENT))
+	elseif FlagsUtil.IsSet(depositFlags, Enum.BagSlotFlags.ExpansionLegacy) then
+		GameTooltip_AddNormalLine(tooltip, BANK_TAB_EXPANSION_ASSIGNMENT:format(BANK_TAB_EXPANSION_FILTER_LEGACY))
+	end
+	
+	local filterList = ContainerFrameUtil_ConvertFilterFlagsToList(depositFlags)
+	if filterList then
+		GameTooltip_AddNormalLine(tooltip, BANK_TAB_DEPOSIT_ASSIGNMENTS:format(filterList), true)
+	end
+end
+
+local function UpdateTooltip(self, id)
+	local data = AccountBankPanel.purchasedBankTabData[id]
+	if not data then return end
+
+	GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
+	GameTooltip_SetTitle(GameTooltip, data.name, NORMAL_FONT_COLOR)
+	AddBankTabSettingsToTooltip(GameTooltip, data.depositFlags)
+	GameTooltip_AddInstructionLine(GameTooltip, BANK_TAB_TOOLTIP_CLICK_INSTRUCTION)
+	GameTooltip:Show()
+end
+
+local buttonNum = 0
+function BagTab:Create(bagID)
+	buttonNum = buttonNum + 1
+	local name = addon.."BagTab"..buttonNum
+	local button = setmetatable(CreateFrame("Button", name, nil, "BackdropTemplate"), self.__index)
+	button:SetID(buttonNum)
+	button.bagId = buttonNum + BANK_TAB1 - 1
+
+	B.PixelIcon(button, BagTab.bgTex, true)
+	button:RegisterForDrag("LeftButton", "RightButton")
+	button:RegisterForClicks("AnyUp")
+	button:SetSize(37, 37)
+
+	cargBags.SetScriptHandlers(button, "OnClick", "OnEnter", "OnLeave")
+
+	if(button.OnCreate) then button:OnCreate(bagID) end
+
+	return button
+end
+
+local function highlight(button, func, bagID)
+	func(button, not bagID or button.bagId == bagID)
+end
+
+function BagTab:OnEnter()
+	local hlFunction = self.bar.highlightFunction
+
+	if(hlFunction) then
+		if(self.bar.isGlobal) then
+			for _, container in pairs(self.implementation.contByID) do
+				container:ApplyToButtons(highlight, hlFunction, self.bagId)
+			end
+		else
+			self.bar.container:ApplyToButtons(highlight, hlFunction, self.bagId)
+		end
+	end
+
+	UpdateTooltip(self, self:GetID())
+end
+
+function BagTab:OnLeave()
+	local hlFunction = self.bar.highlightFunction
+
+	if(hlFunction) then
+		if(self.bar.isGlobal) then
+			for _, container in pairs(self.implementation.contByID) do
+				container:ApplyToButtons(highlight, hlFunction)
+			end
+		else
+			self.bar.container:ApplyToButtons(highlight, hlFunction)
+		end
+	end
+
+	GameTooltip:Hide()
+end
+
+function BagTab:UpdateButton()
+	local container = self.bar.container
+	if(container and container.SetFilter) then
+		if(not self.filter) then
+			local bagID = self.bagId
+			self.filter = function(i) return i.bagId ~= bagID end
+		end
+
+		if(self.bar.isGlobal) then
+			for _, container in pairs(container.implementation.contByID) do
+				container:SetFilter(self.filter, self.hidden)
+				container.implementation:OnEvent("BAG_UPDATE", self.bagId)
+			end
+		else
+			container:SetFilter(self.filter, self.hidden)
+			container.implementation:OnEvent("BAG_UPDATE", self.bagId)
+		end
+	end
+
+	if self.hidden then
+		self.bg:SetBackdropBorderColor(0, 0, 0)
+	else
+		self.bg:SetBackdropBorderColor(1, .8, 0)
+	end
+end
+
+function BagTab:OnClick(btn)
+	local currentTabID = self:GetID()
+	cargBags.selectedTabID = currentTabID
+
+	local data = AccountBankPanel.purchasedBankTabData[currentTabID]
+	if not data then
+		StaticPopup_Show("CONFIRM_BUY_BANK_TAB", nil, nil, {bankType = ACCOUNT_BANK_TYPE})
+	else
+		if btn == "LeftButton" then
+			local buttons = self.bar.buttons
+			for i = 1, #buttons do
+				buttons[i].hidden = i ~= currentTabID
+				buttons[i]:UpdateButton()
+			end
+		else -- right button
+			local menu = AccountBankPanel.TabSettingsMenu
+			if menu then
+				if menu:IsShown() then menu:Hide() end
+				menu:SetParent(UIParent)
+				menu:ClearAllPoints()
+				menu:SetPoint("CENTER", 0, 100)
+				menu:EnableMouse(true)
+				menu:TriggerEvent(BankPanelTabSettingsMenuMixin.Event.OpenTabSettingsRequested, self.bagId)
+			end
+		end
+	end
+end
+
+local function updater(self)
+	for _, button in pairs(self.buttons) do
+		button:UpdateButton()
+	end
+end
+
+-- Register the plugin
+cargBags:RegisterPlugin("BagTab", function(self, bags)
+	if(cargBags.ParseBags) then
+		bags = cargBags:ParseBags(bags)
+	end
+
+	local bar = CreateFrame("Frame", nil, self)
+	bar.container = self
+
+	bar.layouts = cargBags.classes.Container.layouts
+	bar.LayoutButtons = cargBags.classes.Container.LayoutButtons
+
+	local buttonClass = self.implementation:GetBagTabClass()
+	bar.buttons = {}
+	for i = 1, #bags do
+		local button = buttonClass:Create(bags[i])
+		button:SetParent(bar)
+		button.hidden = i ~= 1
+		button.bar = bar
+		table.insert(bar.buttons, button)
+	end
+
+	hooksecurefunc(AccountBankPanel, "RefreshBankTabs", function(self)
+		for index, data in pairs(self.purchasedBankTabData) do
+			bar.buttons[index].Icon:SetTexture(data.icon)
+		end
+	end)
+
+	updater(bar)
+	self.implementation:RegisterEvent("BANK_TABS_CHANGED", bar, updater)
+
+	return bar
+end)
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/searchBar.lua b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/searchBar.lua
index ccacf8fc..e20eefd3 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/searchBar.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/searchBar.lua
@@ -30,7 +30,7 @@ local _, ns = ...
 local cargBags = ns.cargBags
 
 local function apply(self, container, text)
-	if text == "" or not text then
+	if(text == "" or not text) then
 		container:ApplyToButtons(self.highlightFunction, true)
 	else
 		container:FilterForFunction(self.highlightFunction, self.currFilters)
@@ -38,19 +38,19 @@ local function apply(self, container, text)
 end
 
 local function doSearch(self, text)
-	if type(text) == "string" then
+	if(type(text) == "string") then
 		self:SetText(text)
 	else
 		text = self:GetText()
 	end
 
-	if self.currFilters then
+	if(self.currFilters) then
 		self.currFilters:Empty()
 	end
 
 	self.currFilters = self.parent.implementation:ParseTextFilter(text, self.currFilters, self.textFilters)
 
-	if self.isGlobal then
+	if(self.isGlobal) then
 		for _, container in pairs(self.parent.implementation.contByName) do
 			apply(self, container, text)
 		end
@@ -74,16 +74,12 @@ end
 local function onEscape(search)
 	doSearch(search, "")
 	search:ClearFocus()
-	if search.OnEscapePressed then
-		search:OnEscapePressed()
-	end
+	if(search.OnEscapePressed) then search:OnEscapePressed() end
 end
 
 local function onEnter(search)
 	search:ClearFocus()
-	if search.OnEnterPressed then
-		search:OnEnterPressed()
-	end
+	if(search.OnEnterPressed) then search:OnEnterPressed() end
 end
 
 local function onHide(self)
@@ -127,13 +123,13 @@ cargBags:RegisterPlugin("SearchBar", function(self, target)
 	search:SetScript("OnEnterPressed", onEnter)
 	self:HookScript("OnHide", onHide)
 
-	if target then
+	if(target) then
 		search:SetAutoFocus(true)
 		search:SetAllPoints(target)
 		search:Hide()
 
 		target.search, search.target = search, target
-		target:RegisterForClicks("AnyUp")
+		target:RegisterForClicks("anyUp")
 		target:SetScript("OnClick", target_openSearch)
 		search:SetScript("OnEditFocusLost", target_closeSearch)
 	end
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/tagDisplay.lua b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/tagDisplay.lua
index 9d5ab3fd..b104580a 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/plugins/tagDisplay.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/plugins/tagDisplay.lua
@@ -118,6 +118,8 @@ local function GetNumFreeSlots(name)
 		return GetContainerNumFreeSlots(-3)
 	elseif name == "BagReagent" then
 		return GetContainerNumFreeSlots(5)
+	elseif name == "AccountBank" then
+		return GetContainerNumFreeSlots(cargBags.selectedTabID + 12)
 	end
 end
 
@@ -127,12 +129,12 @@ tagPool["space"] = function(self)
 end
 
 tagPool["item"] = function(self, item)
-	local bags = GetItemCount(item, nil)
-	local total = GetItemCount(item, true)
+	local bags = C_Item.GetItemCount(item, nil)
+	local total = C_Item.GetItemCount(item, true)
 	local bank = total - bags
 
 	if total > 0 then
-		return bags .. (bank and " (" .. bank .. ")") .. createIcon(GetItemIcon(item), self.iconValues)
+		return bags .. (bank and " (" .. bank .. ")") .. createIcon(C_Item.GetItemIconByID(item), self.iconValues)
 	end
 end
 
@@ -151,7 +153,7 @@ tagEvents["currency"] = { "CURRENCY_DISPLAY_UPDATE" }
 
 tagPool["currencies"] = function(self)
 	local str
-	for i = 1, 6 do -- Limit to 6 tracked
+	for i = 1, GetNumWatchedTokens() do
 		local curr = self.tags["currency"](self, i)
 		if curr then
 			str = (str and str .. " " or "") .. curr
@@ -161,6 +163,19 @@ tagPool["currencies"] = function(self)
 end
 tagEvents["currencies"] = tagEvents["currency"]
 
+local atlasCache = {}
+local function createAtlasCoin(coin)
+	local str = atlasCache[coin]
+	if not str then
+		local info = C_Texture.GetAtlasInfo("coin-" .. coin)
+		if info then
+			str = B:GetTextureStrByAtlas(info, 16, 16)
+			atlasCache[coin] = str
+		end
+	end
+	return str
+end
+
 tagPool["money"] = function()
 	local coppername = "|cffeda55fc|r"
 	local goldname = "|cffffd700g|r"
@@ -181,3 +196,22 @@ tagPool["money"] = function()
 	end
 end
 tagEvents["money"] = { "PLAYER_MONEY" }
+
+tagPool["accountmoney"] = function()
+	local money = C_Bank.FetchDepositedMoney(Enum.BankType.Account) or 0
+	local str = ""
+	local gold, silver, copper = floor(money / 1e4), floor(money / 100) % 100, money % 100
+
+	if gold > 0 then
+		str = str .. BreakUpLargeNumbers(gold) .. createAtlasCoin("gold") .. " "
+	end
+	if silver > 0 then
+		str = str .. silver .. createAtlasCoin("silver") .. " "
+	end
+	if copper >= 0 then
+		str = str .. copper .. createAtlasCoin("copper") .. " "
+	end
+
+	return str
+end
+tagEvents["accountmoney"] = { "PLAYER_MONEY", "ACCOUNT_MONEY" }
diff --git a/KkthnxUI/Libraries/cargBags/mixins-add/sorts.lua b/KkthnxUI/Libraries/cargBags/mixins-add/sorts.lua
index 05036d33..9f663f90 100644
--- a/KkthnxUI/Libraries/cargBags/mixins-add/sorts.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins-add/sorts.lua
@@ -31,7 +31,7 @@ local sorts = ns.cargBags.classes.Container.sorts
 	Sorts the buttons depending on their bagSlot
 ]]
 function sorts.bagSlot(a, b)
-	if a.bagId == b.bagId then
+	if(a.bagId == b.bagId) then
 		return a.slotId < b.slotId
 	else
 		return a.bagId < b.bagId
diff --git a/KkthnxUI/Libraries/cargBags/mixins/api-common.lua b/KkthnxUI/Libraries/cargBags/mixins/api-common.lua
index 29d99a02..a6fae6c5 100644
--- a/KkthnxUI/Libraries/cargBags/mixins/api-common.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins/api-common.lua
@@ -40,6 +40,7 @@ function Container:LayoutButtons(layout, ...)
 	return self.layouts[layout](self, ...)
 end
 
+
 --[[################################
 	Plugins
 		Additional widgets for a bag
@@ -48,9 +49,9 @@ end
 cargBags.plugins = {}
 
 function Implementation:SpawnPlugin(name, ...)
-	if cargBags.plugins[name] then
+	if(cargBags.plugins[name]) then
 		local plugin = cargBags.plugins[name](self, ...)
-		if plugin then
+		if(plugin) then
 			plugin.parent = self
 		end
 		return plugin
@@ -62,6 +63,7 @@ function cargBags:RegisterPlugin(name, func)
 	cargBags.plugins[name] = func
 end
 
+
 --[[################################
 	Sorts
 		Sort-functions for your containers
diff --git a/KkthnxUI/Libraries/cargBags/mixins/parseBags.lua b/KkthnxUI/Libraries/cargBags/mixins/parseBags.lua
index 69e6b818..e89aa8c2 100644
--- a/KkthnxUI/Libraries/cargBags/mixins/parseBags.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins/parseBags.lua
@@ -32,14 +32,15 @@ local _, ns = ...
 local cargBags = ns.cargBags
 
 local bagStrings = {
-	["backpack"] = { 0 },
-	["bags"] = { 1, 2, 3, 4, 5 },
-	["backpack+bags"] = { 0, 1, 2, 3, 4, 5 },
-	["bankframe"] = { -1 },
-	["bankframe+bank"] = { -1, 6, 7, 8, 9, 10, 11, 12 },
-	["bankreagent"] = { -3 },
-	["bank"] = { 6, 7, 8, 9, 10, 11, 12 },
-	["keyring"] = { -2 },
+	["backpack"]		= { 0 },
+	["bags"]			= { 1, 2, 3, 4, 5 },
+	["backpack+bags"]	= { 0, 1, 2, 3, 4, 5 },
+	["bankframe"]		= { -1 },
+	["bankframe+bank"]	= { -1, 6, 7, 8, 9, 10, 11, 12 },
+	["bankreagent"]		= { -3 },
+	["bank"]			= { 6, 7, 8, 9, 10, 11, 12 },
+	["keyring"]			= { -2 },
+	["accountbank"]		= { 13, 14, 15, 16, 17 },
 }
 cargBags.BagStrings = bagStrings
 
@@ -49,26 +50,20 @@ cargBags.BagStrings = bagStrings
 	@return bags <table>
 ]]
 function cargBags:ParseBags(bags)
-	if not bags then
-		return
-	end
-	if type(bags) == "table" then
-		return bags
-	end
-	if bagStrings[bags] then
-		return bagStrings[bags]
-	end
+	if not bags then return end
+	if(type(bags) == "table") then return bags end
+	if(bagStrings[bags]) then return bagStrings[bags] end
 	local min, max = bags:match("(%d+)-(%d+)")
-	if min then
+	if(min) then
 		local t = {}
-		for i = min, max do
-			t[#t + 1] = i
+		for i=min, max do
+			t[#t+1] = i
 		end
 		bagStrings[bags] = t
 		return t
-	elseif tonumber(bags) then
-		local t = { tonumber(bags) }
+	elseif(tonumber(bags)) then
+		local t = {tonumber(bags)}
 		bagStrings[bags] = t
 		return t
 	end
-end
+end
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/cargBags/mixins/textFilter.lua b/KkthnxUI/Libraries/cargBags/mixins/textFilter.lua
index 555b8a7e..bf06302e 100644
--- a/KkthnxUI/Libraries/cargBags/mixins/textFilter.lua
+++ b/KkthnxUI/Libraries/cargBags/mixins/textFilter.lua
@@ -32,24 +32,12 @@ local Container = cargBags.classes.Container
 local Implementation = cargBags.classes.Implementation
 
 local defaultFilters = {
-	n = function(i, arg)
-		return i.name and i.name:lower():match(arg)
-	end,
-	t = function(i, arg)
-		return (i.type and i.type:lower():match(arg)) or (i.subType and i.subType:lower():match(arg)) or (i.equipLoc and i.equipLoc:lower():match(arg))
-	end,
-	b = function(i, arg)
-		return i.bindOn and i.bindOn:match(arg)
-	end,
-	q = function(i, arg)
-		return i.quality == tonumber(arg)
-	end,
-	bag = function(i, arg)
-		return i.bagId == tonumber(arg)
-	end,
-	quest = function(i)
-		return i.isQuestItem
-	end,
+	n = function(i, arg) return i.name and i.name:lower():match(arg) end,
+	t = function(i, arg) return (i.type and i.type:lower():match(arg)) or (i.subType and i.subType:lower():match(arg)) or (i.equipLoc and i.equipLoc:lower():match(arg)) end,
+	b = function(i, arg) return i.bindOn and i.bindOn:match(arg) end,
+	q = function(i, arg) return i.quality == tonumber(arg) end,
+	bag = function(i, arg) return i.bagId == tonumber(arg) end,
+	quest = function(i) return i.isQuestItem end,
 
 	_default = "n",
 }
@@ -69,9 +57,9 @@ function Implementation:ParseTextFilter(text, filters, textFilters)
 	for match in text:gmatch("[^,;&]+") do
 		local mod, type, value = match:trim():match("^(!?)(.-)[:=]?([^:=]*)$")
 		mod = (mod == "!" and -1) or true
-		if value and type ~= "" and textFilters[type] then
+		if(value and type ~= "" and textFilters[type]) then
 			filters:SetExtended(textFilters[type], value:lower(), mod)
-		elseif value and type == "" and textFilters._default then
+		elseif(value and type == "" and textFilters._default) then
 			local name = textFilters._default
 			filters:SetExtended(textFilters[name], value:lower(), mod)
 		end
diff --git a/KkthnxUI/Libraries/oUF/blizzard.lua b/KkthnxUI/Libraries/oUF/blizzard.lua
index 97fc15ee..d85371ad 100644
--- a/KkthnxUI/Libraries/oUF/blizzard.lua
+++ b/KkthnxUI/Libraries/oUF/blizzard.lua
@@ -1,10 +1,10 @@
 local _, ns = ...
 local oUF = ns.oUF
 
--- sourced from FrameXML/TargetFrame.lua
+-- sourced from Blizzard_UnitFrame/TargetFrame.lua
 local MAX_BOSS_FRAMES = _G.MAX_BOSS_FRAMES or 5
 
--- sourced from FrameXML/RaidFrame.lua
+-- sourced from Blizzard_FrameXMLBase/Shared/Constants.lua
 local MEMBERS_PER_RAID_GROUP = _G.MEMBERS_PER_RAID_GROUP or 5
 
 local hookedFrames = {}
diff --git a/KkthnxUI/Libraries/oUF/colors.lua b/KkthnxUI/Libraries/oUF/colors.lua
index 64eb8052..36771ddc 100644
--- a/KkthnxUI/Libraries/oUF/colors.lua
+++ b/KkthnxUI/Libraries/oUF/colors.lua
@@ -33,7 +33,7 @@ local colorMixin = {
 }
 
 --[[ Colors: oUF:CreateColor(r, g, b[, a])
-Wrapper for [SharedXML\Color.lua's ColorMixin](https://wowpedia.fandom.com/wiki/ColorMixin), extended to support indexed colors used in oUF, as
+Wrapper for [SharedXML\Color.lua's ColorMixin](https://warcraft.wiki.gg/wiki/ColorMixin), extended to support indexed colors used in oUF, as
 well as extra methods for dealing with atlases.
 
 The rgb values can be either normalized (0-1) or bytes (0-255).
@@ -168,32 +168,35 @@ for power, color in next, PowerBarColor do
 	end
 end
 
--- sourced from FrameXML/Constants.lua
-colors.power[0] = colors.power.MANA
-colors.power[1] = colors.power.RAGE
-colors.power[2] = colors.power.FOCUS
-colors.power[3] = colors.power.ENERGY
-colors.power[4] = colors.power.COMBO_POINTS
-colors.power[5] = colors.power.RUNES
-colors.power[6] = colors.power.RUNIC_POWER
-colors.power[7] = colors.power.SOUL_SHARDS
-colors.power[8] = colors.power.LUNAR_POWER
-colors.power[9] = colors.power.HOLY_POWER
-colors.power[11] = colors.power.MAELSTROM
-colors.power[12] = colors.power.CHI
-colors.power[13] = colors.power.INSANITY
-colors.power[16] = colors.power.ARCANE_CHARGES
-colors.power[17] = colors.power.FURY
-colors.power[18] = colors.power.PAIN
+-- fallback integer index to named index
+-- sourced from PowerBarColor - Blizzard_UnitFrame/Mainline/PowerBarColorUtil.lua
+colors.power[Enum.PowerType.Mana or 0] = colors.power.MANA
+colors.power[Enum.PowerType.Rage or 1] = colors.power.RAGE
+colors.power[Enum.PowerType.Focus or 2] = colors.power.FOCUS
+colors.power[Enum.PowerType.Energy or 3] = colors.power.ENERGY
+colors.power[Enum.PowerType.ComboPoints or 4] = colors.power.COMBO_POINTS
+colors.power[Enum.PowerType.Runes or 5] = colors.power.RUNES
+colors.power[Enum.PowerType.RunicPower or 6] = colors.power.RUNIC_POWER
+colors.power[Enum.PowerType.SoulShards or 7] = colors.power.SOUL_SHARDS
+colors.power[Enum.PowerType.LunarPower or 8] = colors.power.LUNAR_POWER
+colors.power[Enum.PowerType.HolyPower or 9] = colors.power.HOLY_POWER
+colors.power[Enum.PowerType.Maelstrom or 11] = colors.power.MAELSTROM
+colors.power[Enum.PowerType.Insanity or 13] = colors.power.INSANITY
+colors.power[Enum.PowerType.Fury or 17] = colors.power.FURY
+colors.power[Enum.PowerType.Pain or 18] = colors.power.PAIN
+
+-- these two don't have fallback values in PowerBarColor, but we want them
+colors.power[Enum.PowerType.Chi or 12] = colors.power.CHI
+colors.power[Enum.PowerType.ArcaneCharges or 16] = colors.power.ARCANE_CHARGES
 
 -- there's no official colour for evoker's essence
 -- use the average colour of the essence texture instead
 colors.power.ESSENCE = oUF:CreateColor(100, 173, 206)
-colors.power[19] = colors.power.ESSENCE
+colors.power[Enum.PowerType.Essence or 19] = colors.power.ESSENCE
 
--- alternate power, sourced from FrameXML/CompactUnitFrame.lua
+-- alternate power, sourced from Blizzard_UnitFrame/Mainline/CompactUnitFrame.lua
 colors.power.ALTERNATE = oUF:CreateColor(0.7, 0.7, 0.6)
-colors.power[10] = colors.power.ALTERNATE
+colors.power[Enum.PowerType.Alternate or 10] = colors.power.ALTERNATE
 
 for i = 0, 3 do
 	colors.threat[i] = oUF:CreateColor(GetThreatStatusColor(i))
@@ -211,7 +214,7 @@ local function colorsAndPercent(a, b, ...)
 	return relperc, select((segment * 3) + 1, ...)
 end
 
--- http://www.wowwiki.com/ColorGradient
+-- https://warcraft.wiki.gg/wiki/ColorGradient
 --[[ Colors: oUF:RGBColorGradient(a, b, ...)
 Used to convert a percent value (the quotient of `a` and `b`) into a gradient from 2 or more RGB colors. If more than 2
 colors are passed, the gradient will be between the two colors which perc lies in an evenly divided range. A RGB color
diff --git a/KkthnxUI/Libraries/oUF/elements/additionalpower.lua b/KkthnxUI/Libraries/oUF/elements/additionalpower.lua
index 58dade65..476c40de 100644
--- a/KkthnxUI/Libraries/oUF/elements/additionalpower.lua
+++ b/KkthnxUI/Libraries/oUF/elements/additionalpower.lua
@@ -27,7 +27,7 @@ The following options are listed by priority. The first check that returns true
 .colorPower  - Use `self.colors.power[token]` to color the bar based on the player's additional power type
                (boolean)
 .colorClass  - Use `self.colors.class[class]` to color the bar based on unit class. `class` is defined by the
-               second return of [UnitClass](http://wowprogramming.com/docs/api/UnitClass.html) (boolean)
+               second return of [UnitClass](https://warcraft.wiki.gg/wiki/API_UnitClass) (boolean)
 .colorSmooth - Use `self.colors.smooth` to color the bar with a smooth gradient based on the player's current
                additional power percentage (boolean)
 
@@ -59,8 +59,9 @@ local oUF = ns.oUF
 
 local _, playerClass = UnitClass('player')
 
--- sourced from FrameXML/AlternatePowerBar.lua
+-- sourced from Blizzard_UnitFrame/AlternatePowerBar.lua
 local ALT_POWER_BAR_PAIR_DISPLAY_INFO = _G.ALT_POWER_BAR_PAIR_DISPLAY_INFO
+
 local ADDITIONAL_POWER_BAR_NAME = 'MANA'
 local ADDITIONAL_POWER_BAR_INDEX = 0
 
diff --git a/KkthnxUI/Libraries/oUF/elements/alternativepower.lua b/KkthnxUI/Libraries/oUF/elements/alternativepower.lua
index 899e6796..518c7bab 100644
--- a/KkthnxUI/Libraries/oUF/elements/alternativepower.lua
+++ b/KkthnxUI/Libraries/oUF/elements/alternativepower.lua
@@ -22,18 +22,18 @@ A default texture will be applied if the widget is a StatusBar and doesn't have
 The following options are listed by priority. The first check that returns true decides the color of the bar.
 
 .colorThreat       - Use `self.colors.threat[threat]` to color the bar based on the unit's threat status. `threat` is
-                     defined by the first return of [UnitThreatSituation](https://wow.gamepedia.com/API_UnitThreatSituation) (boolean)
+                     defined by the first return of [UnitThreatSituation](https://warcraft.wiki.gg/wiki/API_UnitThreatSituation) (boolean)
 .colorPower        - Use `self.colors.power[token]` to color the bar based on the unit's alternative power type
                      (boolean)
 .colorClass        - Use `self.colors.class[class]` to color the bar based on unit class. `class` is defined by the
-                     second return of [UnitClass](http://wowprogramming.com/docs/api/UnitClass.html) (boolean)
+                     second return of [UnitClass](https://warcraft.wiki.gg/wiki/API_UnitClass) (boolean)
 .colorClassNPC     - Use `self.colors.class[class]` to color the bar if the unit is a NPC (boolean)
 .colorSelection    - Use `self.colors.selection[selection]` to color the bar based on the unit's selection color.
                      `selection` is defined by the return value of Private.unitSelectionType, a wrapper function
-                     for [UnitSelectionType](https://wow.gamepedia.com/API_UnitSelectionType) (boolean)
+                     for [UnitSelectionType](https://warcraft.wiki.gg/wiki/API_UnitSelectionType) (boolean)
 .colorReaction     - Use `self.colors.reaction[reaction]` to color the bar based on the player's reaction towards the
                      unit. `reaction` is defined by the return value of
-                     [UnitReaction](http://wowprogramming.com/docs/api/UnitReaction.html) (boolean)
+                     [UnitReaction](https://warcraft.wiki.gg/wiki/API_UnitReaction) (boolean)
 .colorSmooth       - Use `self.colors.smooth` to color the bar with a smooth gradient based on the unit's current
                      alternative power percentage (boolean)
 
@@ -56,8 +56,9 @@ local Private = oUF.Private
 
 local unitSelectionType = Private.unitSelectionType
 
--- sourced from FrameXML/UnitPowerBarAlt.lua
+-- sourced from Blizzard_UnitFrame/UnitPowerBarAlt.lua
 local ALTERNATE_POWER_INDEX = Enum.PowerType.Alternate or 10
+
 local ALTERNATE_POWER_NAME = 'ALTERNATE'
 
 local function updateTooltip(self)
@@ -87,8 +88,8 @@ local function UpdateColor(self, event, unit, powerType)
 		color =  self.colors.threat[UnitThreatSituation('player', unit)]
 	elseif(element.colorPower) then
 		color = self.colors.power[ALTERNATE_POWER_INDEX]
-	elseif(element.colorClass and UnitIsPlayer(unit))
-		or (element.colorClassNPC and not UnitIsPlayer(unit)) then
+	elseif(element.colorClass and (UnitIsPlayer(unit) or UnitInPartyIsAI(unit)))
+		or (element.colorClassNPC and not (UnitIsPlayer(unit) or UnitInPartyIsAI(unit))) then
 		local _, class = UnitClass(unit)
 		color = self.colors.class[class]
 	elseif(element.colorSelection and unitSelectionType(unit, element.considerSelectionInCombatHostile)) then
diff --git a/KkthnxUI/Libraries/oUF/elements/auras.lua b/KkthnxUI/Libraries/oUF/elements/auras.lua
index e0c20cbc..128c7995 100644
--- a/KkthnxUI/Libraries/oUF/elements/auras.lua
+++ b/KkthnxUI/Libraries/oUF/elements/auras.lua
@@ -237,7 +237,7 @@ local function updateAura(element, unit, data, position)
 	* self     - the widget holding the aura buttons
 	* button   - the updated aura button (Button)
 	* unit     - the unit for which the update has been triggered (string)
-	* data     - the [UnitAuraInfo](https://wowpedia.fandom.com/wiki/Struct_UnitAuraInfo) object (table)
+	* data     - the [AuraData](https://warcraft.wiki.gg/wiki/Struct_AuraData) object (table)
 	* position - the actual position of the aura button (number)
 	--]]
 	if(element.PostUpdateButton) then
@@ -274,7 +274,7 @@ local function processData(element, unit, data)
 
 	* self - the widget holding the aura buttons
 	* unit - the unit for which the update has been triggered (string)
-	* data - [UnitAuraInfo](https://wowpedia.fandom.com/wiki/Struct_UnitAuraInfo) object (table)
+	* data - [AuraData](https://warcraft.wiki.gg/wiki/Struct_AuraData) object (table)
 
 	## Returns
 
@@ -334,7 +334,7 @@ local function UpdateAuras(self, event, unit, updateInfo)
 
 				* self - the widget holding the aura buttons
 				* unit - the unit for which the update has been triggered (string)
-				* data - [UnitAuraInfo](https://wowpedia.fandom.com/wiki/Struct_UnitAuraInfo) object (table)
+				* data - [AuraData](https://warcraft.wiki.gg/wiki/Struct_AuraData) object (table)
 
 				## Returns
 
@@ -450,12 +450,12 @@ local function UpdateAuras(self, event, unit, updateInfo)
 				--[[ Override: Auras:SortBuffs(a, b)
 				Defines a custom sorting algorithm for ordering the auras.
 
-				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=DefaultAuraCompare).
+				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=symbol:DefaultAuraCompare).
 				--]]
 				--[[ Override: Auras:SortAuras(a, b)
 				Defines a custom sorting algorithm for ordering the auras.
 
-				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=DefaultAuraCompare).
+				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=symbol:DefaultAuraCompare).
 
 				Overridden by the more specific SortBuffs and/or SortDebuffs overrides if they are defined.
 				--]]
@@ -481,7 +481,7 @@ local function UpdateAuras(self, event, unit, updateInfo)
 				--[[ Override: Auras:SortDebuffs(a, b)
 				Defines a custom sorting algorithm for ordering the auras.
 
-				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=DefaultAuraCompare).
+				Defaults to [AuraUtil.DefaultAuraCompare](https://github.com/Gethe/wow-ui-source/search?q=symbol:DefaultAuraCompare).
 				--]]
 				table.sort(auras.sortedDebuffs, auras.SortDebuffs or auras.SortAuras or SortAuras)
 			end
diff --git a/KkthnxUI/Libraries/oUF/elements/castbar.lua b/KkthnxUI/Libraries/oUF/elements/castbar.lua
index 7ea25bb0..22da1ad6 100644
--- a/KkthnxUI/Libraries/oUF/elements/castbar.lua
+++ b/KkthnxUI/Libraries/oUF/elements/castbar.lua
@@ -201,7 +201,7 @@ local function UpdatePips(element, numStages)
 end
 
 --[[ Override: Castbar:ShouldShow(unit)
-Handles check for which unit the castbar should show for.  
+Handles check for which unit the castbar should show for. 
 Defaults to the object unit.
 
 * self - the Castbar widget
diff --git a/KkthnxUI/Libraries/oUF/elements/classpower.lua b/KkthnxUI/Libraries/oUF/elements/classpower.lua
index 40d36668..769ace0a 100644
--- a/KkthnxUI/Libraries/oUF/elements/classpower.lua
+++ b/KkthnxUI/Libraries/oUF/elements/classpower.lua
@@ -5,7 +5,7 @@ Handles the visibility and updating of the player's class resources (like Chi Or
 
 ## Widget
 
-ClassPower - An `table` consisting of as many StatusBars as the theoretical maximum return of [UnitPowerMax](http://wowprogramming.com/docs/api/UnitPowerMax.html).
+ClassPower - An `table` consisting of as many StatusBars as the theoretical maximum return of [UnitPowerMax](https://warcraft.wiki.gg/wiki/API_UnitPowerMax).
 
 ## Sub-Widgets
 
@@ -22,6 +22,7 @@ If the sub-widgets are StatusBars, their minimum and maximum values will be set
 
 Supported class powers:
   - All     - Combo Points
+  - Evoker  - Essence
   - Mage    - Arcane Charges
   - Monk    - Chi Orbs
   - Paladin - Holy Power
@@ -49,10 +50,11 @@ local oUF = ns.oUF
 
 local _, PlayerClass = UnitClass('player')
 
--- sourced from FrameXML/Constants.lua
+-- sourced from Blizzard_FrameXMLBase/Constants.lua
 local SPEC_MAGE_ARCANE = _G.SPEC_MAGE_ARCANE or 1
 local SPEC_MONK_WINDWALKER = _G.SPEC_MONK_WINDWALKER or 3
 local SPEC_WARLOCK_DESTRUCTION = _G.SPEC_WARLOCK_DESTRUCTION or 3
+
 local SPELL_POWER_ENERGY = Enum.PowerType.Energy or 3
 local SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints or 4
 local SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards or 7
diff --git a/KkthnxUI/Libraries/oUF/elements/grouproleindicator.lua b/KkthnxUI/Libraries/oUF/elements/grouproleindicator.lua
index bb6745a2..fe46eefd 100644
--- a/KkthnxUI/Libraries/oUF/elements/grouproleindicator.lua
+++ b/KkthnxUI/Libraries/oUF/elements/grouproleindicator.lua
@@ -24,7 +24,17 @@ A default texture will be applied if the widget is a Texture and doesn't have a
 
 local _, ns = ...
 local oUF = ns.oUF
-local GetTexCoordsForRoleSmallCircle = GetTexCoordsForRoleSmallCircle or (function() return 1, 1, 1, 1 end)
+
+-- originally sourced from Blizzard_Deprecated/Deprecated_10_1_5.lua
+local function GetTexCoordsForRoleSmallCircle(role)
+	if(role == 'TANK') then
+		return 0, 19 / 64, 22 / 64, 41 / 64
+	elseif(role == 'HEALER') then
+		return 20 / 64, 39 / 64, 1 / 64, 20 / 64
+	elseif(role == 'DAMAGER') then
+		return 20 / 64, 39 / 64, 22 / 64, 41 / 64
+	end
+end
 
 local function Update(self, event)
 	local element = self.GroupRoleIndicator
@@ -50,7 +60,7 @@ local function Update(self, event)
 	Called after the element has been updated.
 
 	* self - the GroupRoleIndicator element
-	* role - the role as returned by [UnitGroupRolesAssigned](http://wowprogramming.com/docs/api/UnitGroupRolesAssigned.html)
+	* role - the role as returned by [UnitGroupRolesAssigned](https://warcraft.wiki.gg/wiki/API_UnitGroupRolesAssigned)
 	--]]
 	if(element.PostUpdate) then
 		return element:PostUpdate(role)
diff --git a/KkthnxUI/Libraries/oUF/elements/health.lua b/KkthnxUI/Libraries/oUF/elements/health.lua
index 7e47007f..524ca1a9 100644
--- a/KkthnxUI/Libraries/oUF/elements/health.lua
+++ b/KkthnxUI/Libraries/oUF/elements/health.lua
@@ -9,7 +9,8 @@ Health - A `StatusBar` used to represent the unit's health.
 
 ## Sub-Widgets
 
-.bg - A `Texture` used as a background. It will inherit the color of the main StatusBar.
+.TempLoss - A `StatusBar` used to represent temporary max health reduction.
+.bg       - A `Texture` used as a background. It will inherit the color of the main StatusBar.
 
 ## Notes
 
@@ -26,18 +27,18 @@ The following options are listed by priority. The first check that returns true
 .colorDisconnected - Use `self.colors.disconnected` to color the bar if the unit is offline (boolean)
 .colorTapping      - Use `self.colors.tapping` to color the bar if the unit isn't tapped by the player (boolean)
 .colorThreat       - Use `self.colors.threat[threat]` to color the bar based on the unit's threat status. `threat` is
-                     defined by the first return of [UnitThreatSituation](https://wow.gamepedia.com/API_UnitThreatSituation) (boolean)
+                     defined by the first return of [UnitThreatSituation](https://warcraft.wiki.gg/wiki/API_UnitThreatSituation) (boolean)
 .colorClass        - Use `self.colors.class[class]` to color the bar based on unit class. `class` is defined by the
-                     second return of [UnitClass](http://wowprogramming.com/docs/api/UnitClass.html) (boolean)
+                     second return of [UnitClass](https://warcraft.wiki.gg/wiki/API_UnitClass) (boolean)
 .colorClassNPC     - Use `self.colors.class[class]` to color the bar if the unit is a NPC (boolean)
 .colorClassPet     - Use `self.colors.class[class]` to color the bar if the unit is player controlled, but not a player
                      (boolean)
 .colorSelection    - Use `self.colors.selection[selection]` to color the bar based on the unit's selection color.
                      `selection` is defined by the return value of Private.unitSelectionType, a wrapper function
-                     for [UnitSelectionType](https://wow.gamepedia.com/API_UnitSelectionType) (boolean)
+                     for [UnitSelectionType](https://warcraft.wiki.gg/wiki/API_UnitSelectionType) (boolean)
 .colorReaction     - Use `self.colors.reaction[reaction]` to color the bar based on the player's reaction towards the
                      unit. `reaction` is defined by the return value of
-                     [UnitReaction](http://wowprogramming.com/docs/api/UnitReaction.html) (boolean)
+                     [UnitReaction](https://warcraft.wiki.gg/wiki/API_UnitReaction) (boolean)
 .colorSmooth       - Use `smoothGradient` if present or `self.colors.smooth` to color the bar with a smooth gradient
                      based on the player's current health percentage (boolean)
 .colorHealth       - Use `self.colors.health` to color the bar. This flag is used to reset the bar color back to default
@@ -58,7 +59,7 @@ The following options are listed by priority. The first check that returns true
 
     -- Add a background
     local Background = Health:CreateTexture(nil, 'BACKGROUND')
-    Background:SetAllPoints(Health)
+    Background:SetAllPoints()
     Background:SetTexture(1, 1, 1, .5)
 
     -- Options
@@ -74,6 +75,39 @@ The following options are listed by priority. The first check that returns true
     -- Register it with oUF
     Health.bg = Background
     self.Health = Health
+
+    -- Alternatively, if .TempLoss is being used
+    local TempLoss = CreateFrame('StatusBar', nil, self)
+    TempLoss:SetReverseFill(true)
+    TempLoss:SetHeight(20)
+    TempLoss:SetPoint('TOP')
+    TempLoss:SetPoint('LEFT')
+    TempLoss:SetPoint('RIGHT')
+
+    local Health = CreateFrame('StatusBar', nil, self)
+    Health:SetPoint('LEFT')
+    Health:SetPoint('TOPRIGHT', TempLoss:GetStatusBarTexture(), 'TOPLEFT')
+    Health:SetPoint('BOTTOMRIGHT', TempLoss:GetStatusBarTexture(), 'BOTTOMLEFT')
+
+    -- Add a background
+    local Background = TempLoss:CreateTexture(nil, 'BACKGROUND')
+    Background:SetAllPoints()
+    Background:SetTexture(1, 1, 1, .5)
+
+    -- Options
+    Health.colorTapping = true
+    Health.colorDisconnected = true
+    Health.colorClass = true
+    Health.colorReaction = true
+    Health.colorHealth = true
+
+    -- Make the background darker.
+    Background.multiplier = .5
+
+    -- Register it with oUF
+    Health.TempLoss = TempLoss
+    Health.bg = Background
+    self.Health = Health
 --]]
 
 local _, ns = ...
@@ -93,8 +127,8 @@ local function UpdateColor(self, event, unit)
 		color = self.colors.tapped
 	elseif(element.colorThreat and not UnitPlayerControlled(unit) and UnitThreatSituation('player', unit)) then
 		color =  self.colors.threat[UnitThreatSituation('player', unit)]
-	elseif(element.colorClass and UnitIsPlayer(unit))
-		or (element.colorClassNPC and not UnitIsPlayer(unit))
+	elseif(element.colorClass and (UnitIsPlayer(unit) or UnitInPartyIsAI(unit)))
+		or (element.colorClassNPC and not (UnitIsPlayer(unit) or UnitInPartyIsAI(unit)))
 		or (element.colorClassPet and UnitPlayerControlled(unit) and not UnitIsPlayer(unit)) then
 		local _, class = UnitClass(unit)
 		color = self.colors.class[class]
@@ -173,16 +207,24 @@ local function Update(self, event, unit)
 	element.cur = cur
 	element.max = max
 
-	--[[ Callback: Health:PostUpdate(unit, cur, max)
+	local lossPerc = 0
+	if(element.TempLoss) then
+		lossPerc = Clamp(GetUnitTotalModifiedMaxHealthPercent(unit), 0, 1)
+
+		element.TempLoss:SetValue(lossPerc)
+	end
+
+	--[[ Callback: Health:PostUpdate(unit, cur, max, lossPerc)
 	Called after the element has been updated.
 
-	* self - the Health element
-	* unit - the unit for which the update has been triggered (string)
-	* cur  - the unit's current health value (number)
-	* max  - the unit's maximum possible health value (number)
+	* self     - the Health element
+	* unit     - the unit for which the update has been triggered (string)
+	* cur      - the unit's current health value (number)
+	* max      - the unit's maximum possible health value (number)
+	* lossPerc - the percent by which the unit's max health has been temporarily reduced (number)
 	--]]
 	if(element.PostUpdate) then
-		element:PostUpdate(unit, cur, max)
+		element:PostUpdate(unit, cur, max, lossPerc)
 	end
 end
 
@@ -279,38 +321,6 @@ local function SetColorThreat(element, state, isForced)
 	end
 end
 
-local onUpdateElapsed, onUpdateWait = 0, 0.25
-local function onUpdateHealth(self, elapsed)
-	if onUpdateElapsed > onUpdateWait then
-		Path(self.__owner, 'OnUpdate', self.__owner.unit)
-
-		onUpdateElapsed = 0
-	else
-		onUpdateElapsed = onUpdateElapsed + elapsed
-	end
-end
-
-local function SetHealthUpdateSpeed(self, state)
-	if state < .1 then state = .1 end
-	onUpdateWait = state
-end
-
-local function SetHealthUpdateMethod(self, state, force)
-	if self.effectiveHealth ~= state or force then
-		self.effectiveHealth = state
-
-		if state then
-			self.Health:SetScript('OnUpdate', onUpdateHealth)
-			self:UnregisterEvent('UNIT_HEALTH', Path)
-			self:UnregisterEvent('UNIT_MAXHEALTH', Path)
-		else
-			self.Health:SetScript('OnUpdate', nil)
-			self:RegisterEvent('UNIT_HEALTH', Path) -- Needed for Pet Battles
-			self:RegisterEvent('UNIT_MAXHEALTH', Path)
-		end
-	end
-end
-
 local function Enable(self)
 	local element = self.Health
 	if(element) then
@@ -321,10 +331,6 @@ local function Enable(self)
 		element.SetColorTapping = SetColorTapping
 		element.SetColorThreat = SetColorThreat
 
-		self.SetHealthUpdateSpeed = SetHealthUpdateSpeed
-		self.SetHealthUpdateMethod = SetHealthUpdateMethod
-		SetHealthUpdateMethod(self, self.effectiveHealth, true)
-
 		if(element.colorDisconnected) then
 			self:RegisterEvent('UNIT_CONNECTION', ColorPath)
 			self:RegisterEvent('PARTY_MEMBER_ENABLE', ColorPath)
@@ -345,6 +351,7 @@ local function Enable(self)
 
 		self:RegisterEvent('UNIT_HEALTH', Path)
 		self:RegisterEvent('UNIT_MAXHEALTH', Path)
+		self:RegisterEvent('UNIT_MAX_HEALTH_MODIFIERS_CHANGED', Path)
 
 		if(element:IsObjectType('StatusBar') and not element:GetStatusBarTexture()) then
 			element:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
@@ -352,6 +359,19 @@ local function Enable(self)
 
 		element:Show()
 
+		if(element.TempLoss) then
+			if(element.TempLoss:IsObjectType('StatusBar')) then
+				element.TempLoss:SetMinMaxValues(0, 1)
+				element.TempLoss:SetValue(0)
+
+				if(not element.TempLoss:GetStatusBarTexture()) then
+					element.TempLoss:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
+				end
+			end
+
+			element.TempLoss:Show()
+		end
+
 		return true
 	end
 end
@@ -361,8 +381,6 @@ local function Disable(self)
 	if(element) then
 		element:Hide()
 
-		element:SetScript('OnUpdate', nil)
-
 		self:UnregisterEvent('UNIT_HEALTH', Path)
 		self:UnregisterEvent('UNIT_MAXHEALTH', Path)
 		self:UnregisterEvent('UNIT_CONNECTION', ColorPath)
@@ -371,6 +389,11 @@ local function Disable(self)
 		self:UnregisterEvent('PARTY_MEMBER_ENABLE', ColorPath)
 		self:UnregisterEvent('PARTY_MEMBER_DISABLE', ColorPath)
 		self:UnregisterEvent('UNIT_THREAT_LIST_UPDATE', ColorPath)
+		self:UnregisterEvent('UNIT_MAX_HEALTH_MODIFIERS_CHANGED', Path)
+
+		if(element.TempLoss) then
+			element.TempLoss:Hide()
+		end
 	end
 end
 
diff --git a/KkthnxUI/Libraries/oUF/elements/power.lua b/KkthnxUI/Libraries/oUF/elements/power.lua
index cbb1dd36..b588a1c0 100644
--- a/KkthnxUI/Libraries/oUF/elements/power.lua
+++ b/KkthnxUI/Libraries/oUF/elements/power.lua
@@ -31,7 +31,7 @@ The following options are listed by priority. The first check that returns true
 .colorDisconnected - Use `self.colors.disconnected` to color the bar if the unit is offline (boolean)
 .colorTapping      - Use `self.colors.tapping` to color the bar if the unit isn't tapped by the player (boolean)
 .colorThreat       - Use `self.colors.threat[threat]` to color the bar based on the unit's threat status. `threat` is
-                     defined by the first return of [UnitThreatSituation](https://wow.gamepedia.com/API_UnitThreatSituation) (boolean)
+                     defined by the first return of [UnitThreatSituation](https://warcraft.wiki.gg/wiki/API_UnitThreatSituation) (boolean)
 .colorPower        - Use `self.colors.power[token]` to color the bar based on the unit's power type. This method will
                      fall-back to `:GetAlternativeColor()` if it can't find a color matching the token. If this function
                      isn't defined, then it will attempt to color based upon the alternative power colors returned by
@@ -39,16 +39,16 @@ The following options are listed by priority. The first check that returns true
                      defined, then it will attempt to color the bar based upon `self.colors.power[type]`. In case of
                      failure it'll default to `self.colors.power.MANA` (boolean)
 .colorClass        - Use `self.colors.class[class]` to color the bar based on unit class. `class` is defined by the
-                     second return of [UnitClass](http://wowprogramming.com/docs/api/UnitClass.html) (boolean)
+                     second return of [UnitClass](https://warcraft.wiki.gg/wiki/API_UnitClass) (boolean)
 .colorClassNPC     - Use `self.colors.class[class]` to color the bar if the unit is a NPC (boolean)
 .colorClassPet     - Use `self.colors.class[class]` to color the bar if the unit is player controlled, but not a player
                      (boolean)
 .colorSelection    - Use `self.colors.selection[selection]` to color the bar based on the unit's selection color.
                      `selection` is defined by the return value of Private.unitSelectionType, a wrapper function
-                     for [UnitSelectionType](https://wow.gamepedia.com/API_UnitSelectionType) (boolean)
+                     for [UnitSelectionType](https://warcraft.wiki.gg/wiki/API_UnitSelectionType) (boolean)
 .colorReaction     - Use `self.colors.reaction[reaction]` to color the bar based on the player's reaction towards the
                      unit. `reaction` is defined by the return value of
-                     [UnitReaction](http://wowprogramming.com/docs/api/UnitReaction.html) (boolean)
+                     [UnitReaction](https://warcraft.wiki.gg/wiki/API_UnitReaction) (boolean)
 .colorSmooth       - Use `smoothGradient` if present or `self.colors.smooth` to color the bar with a smooth gradient
                      based on the player's current power percentage (boolean)
 
@@ -93,13 +93,13 @@ local Private = oUF.Private
 
 local unitSelectionType = Private.unitSelectionType
 
--- sourced from FrameXML/UnitPowerBarAlt.lua
+-- sourced from Blizzard_UnitFrame/UnitPowerBarAlt.lua
 local ALTERNATE_POWER_INDEX = Enum.PowerType.Alternate or 10
 
 --[[ Override: Power:GetDisplayPower()
 Used to get info on the unit's alternative power, if any.
-Should return the power type index (see [Enum.PowerType.Alternate](https://wow.gamepedia.com/Enum_Unit.PowerType))
-and the minimum value for the given power type (see [info.minPower](https://wow.gamepedia.com/API_GetUnitPowerBarInfo))
+Should return the power type index (see [Enum.PowerType.Alternate](https://warcraft.wiki.gg/wiki/Enum_Unit.PowerType))
+and the minimum value for the given power type (see [info.minPower](https://warcraft.wiki.gg/wiki/API_GetUnitPowerBarInfo))
 or nil if the unit has no alternative (alternate) power or it should not be
 displayed. In case of a nil return, the element defaults to the primary power
 type and zero for the minimum value.
@@ -146,8 +146,8 @@ local function UpdateColor(self, event, unit)
 		else
 			color = self.colors.power[ALTERNATE_POWER_INDEX]
 		end
-	elseif(element.colorClass and UnitIsPlayer(unit))
-		or (element.colorClassNPC and not UnitIsPlayer(unit))
+	elseif(element.colorClass and (UnitIsPlayer(unit) or UnitInPartyIsAI(unit)))
+		or (element.colorClassNPC and not (UnitIsPlayer(unit) or UnitInPartyIsAI(unit)))
 		or (element.colorClassPet and UnitPlayerControlled(unit) and not UnitIsPlayer(unit)) then
 		local _, class = UnitClass(unit)
 		color = self.colors.class[class]
diff --git a/KkthnxUI/Libraries/oUF/elements/pvpclassificationindicator.lua b/KkthnxUI/Libraries/oUF/elements/pvpclassificationindicator.lua
index 6819122d..4fcdb2d3 100644
--- a/KkthnxUI/Libraries/oUF/elements/pvpclassificationindicator.lua
+++ b/KkthnxUI/Libraries/oUF/elements/pvpclassificationindicator.lua
@@ -29,7 +29,7 @@ This element updates by changing the texture.
 local _, ns = ...
 local oUF = ns.oUF
 
--- sourced from FrameXML/CompactUnitFrame.lua
+-- sourced from Blizzard_UnitFrame/Mainline/CompactUnitFrame.lua
 local ICONS = {
 	[Enum.PvPUnitClassification.FlagCarrierHorde or 0] = "nameplates-icon-flag-horde",
 	[Enum.PvPUnitClassification.FlagCarrierAlliance or 1] = "nameplates-icon-flag-alliance",
diff --git a/KkthnxUI/Libraries/oUF/elements/range.lua b/KkthnxUI/Libraries/oUF/elements/range.lua
index 2107b099..88d0808f 100644
--- a/KkthnxUI/Libraries/oUF/elements/range.lua
+++ b/KkthnxUI/Libraries/oUF/elements/range.lua
@@ -28,11 +28,6 @@ Offline units are handled as if they are in range.
 local _, ns = ...
 local oUF = ns.oUF
 
-local _FRAMES = {}
-local OnRangeFrame
-
-local UnitInRange, UnitIsConnected = UnitInRange, UnitIsConnected
-
 local function Update(self, event)
 	local element = self.Range
 	local unit = self.unit
@@ -83,22 +78,6 @@ local function Path(self, ...)
 	return (self.Range.Override or Update) (self, ...)
 end
 
--- Internal updating method
-local timer = 0
-local function OnRangeUpdate(_, elapsed)
-	timer = timer + elapsed
-
-	if(timer >= .20) then
-		for _, object in next, _FRAMES do
-			if(object:IsShown()) then
-				Path(object, 'OnUpdate')
-			end
-		end
-
-		timer = 0
-	end
-end
-
 local function Enable(self)
 	local element = self.Range
 	if(element) then
@@ -106,13 +85,7 @@ local function Enable(self)
 		element.insideAlpha = element.insideAlpha or 1
 		element.outsideAlpha = element.outsideAlpha or 0.55
 
-		if(not OnRangeFrame) then
-			OnRangeFrame = CreateFrame('Frame')
-			OnRangeFrame:SetScript('OnUpdate', OnRangeUpdate)
-		end
-
-		table.insert(_FRAMES, self)
-		OnRangeFrame:Show()
+		self:RegisterEvent('UNIT_IN_RANGE_UPDATE', Path)
 
 		return true
 	end
@@ -121,18 +94,10 @@ end
 local function Disable(self)
 	local element = self.Range
 	if(element) then
-		for index, frame in next, _FRAMES do
-			if(frame == self) then
-				table.remove(_FRAMES, index)
-				break
-			end
-		end
 		self:SetAlpha(element.insideAlpha)
 
-		if(#_FRAMES == 0) then
-			OnRangeFrame:Hide()
-		end
+		self:UnregisterEvent('UNIT_IN_RANGE_UPDATE', Path)
 	end
 end
 
-oUF:AddElement('Range', nil, Enable, Disable)
\ No newline at end of file
+oUF:AddElement('Range', Path, Enable, Disable)
\ No newline at end of file
diff --git a/KkthnxUI/Libraries/oUF/elements/readycheckindicator.lua b/KkthnxUI/Libraries/oUF/elements/readycheckindicator.lua
index adc85a26..e8071fca 100644
--- a/KkthnxUI/Libraries/oUF/elements/readycheckindicator.lua
+++ b/KkthnxUI/Libraries/oUF/elements/readycheckindicator.lua
@@ -42,10 +42,9 @@ local Private = oUF.Private
 
 local unitExists = Private.unitExists
 
--- TODO: Replace with atlases in the next major
-local READY_CHECK_READY_TEXTURE = "Interface\\RaidFrame\\ReadyCheck-Ready"
-local READY_CHECK_NOT_READY_TEXTURE = "Interface\\RaidFrame\\ReadyCheck-NotReady"
-local READY_CHECK_WAITING_TEXTURE = "Interface\\RaidFrame\\ReadyCheck-Waiting"
+local READY_CHECK_READY_TEXTURE = "UI-LFG-ReadyMark"
+local READY_CHECK_NOT_READY_TEXTURE = "UI-LFG-DeclineMark"
+local READY_CHECK_WAITING_TEXTURE = "UI-LFG-PendingMark"
 
 local function OnFinished(self)
 	local element = self:GetParent()
@@ -77,11 +76,11 @@ local function Update(self, event)
 	local status = GetReadyCheckStatus(unit)
 	if(unitExists(unit) and status) then
 		if(status == 'ready') then
-			element:SetTexture(element.readyTexture)
+			element:SetAtlas(element.readyTexture)
 		elseif(status == 'notready') then
-			element:SetTexture(element.notReadyTexture)
+			element:SetAtlas(element.notReadyTexture)
 		else
-			element:SetTexture(element.waitingTexture)
+			element:SetAtlas(element.waitingTexture)
 		end
 
 		element.status = status
diff --git a/KkthnxUI/Libraries/oUF/elements/runes.lua b/KkthnxUI/Libraries/oUF/elements/runes.lua
index d9fdda6d..6c26eadf 100644
--- a/KkthnxUI/Libraries/oUF/elements/runes.lua
+++ b/KkthnxUI/Libraries/oUF/elements/runes.lua
@@ -18,7 +18,7 @@ A default texture will be applied if the sub-widgets are StatusBars and don't ha
 ## Options
 
 .colorSpec - Use `self.colors.runes[specID]` to color the bar based on player's spec. `specID` is defined by the return
-             value of [GetSpecialization](http://wowprogramming.com/docs/api/GetSpecialization.html) (boolean)
+             value of [GetSpecialization](https://warcraft.wiki.gg/wiki/API_GetSpecialization) (boolean)
 .sortOrder - Sorting order. Sorts by the remaining cooldown time, 'asc' - from the least cooldown time remaining (fully
              charged) to the most (fully depleted), 'desc' - the opposite (string?)['asc', 'desc']
 
diff --git a/KkthnxUI/Libraries/oUF/elements/stagger.lua b/KkthnxUI/Libraries/oUF/elements/stagger.lua
index aba4e7ff..031d1519 100644
--- a/KkthnxUI/Libraries/oUF/elements/stagger.lua
+++ b/KkthnxUI/Libraries/oUF/elements/stagger.lua
@@ -34,11 +34,10 @@ if(select(2, UnitClass('player')) ~= 'MONK') then return end
 local _, ns = ...
 local oUF = ns.oUF
 
--- sourced from FrameXML/Constants.lua
+-- sourced from Blizzard_FrameXMLBase/Constants.lua
 local SPEC_MONK_BREWMASTER = SPEC_MONK_BREWMASTER or 1
 
--- sourced from FrameXML/MonkStaggerBar.lua
-local BREWMASTER_POWER_BAR_NAME = BREWMASTER_POWER_BAR_NAME or 'STAGGER'
+local BREWMASTER_POWER_BAR_NAME = 'STAGGER'
 
 -- percentages at which bar should change color
 local STAGGER_YELLOW_TRANSITION =  STAGGER_YELLOW_TRANSITION or 0.3
diff --git a/KkthnxUI/Libraries/oUF/elements/summonindicator.lua b/KkthnxUI/Libraries/oUF/elements/summonindicator.lua
index 16ae8687..1a7e183a 100644
--- a/KkthnxUI/Libraries/oUF/elements/summonindicator.lua
+++ b/KkthnxUI/Libraries/oUF/elements/summonindicator.lua
@@ -25,7 +25,7 @@ This element updates by changing the texture.
 local _, ns = ...
 local oUF = ns.oUF
 
--- sourced from Blizzard_APIDocumentation/IncomingSummonDocumentation.lua
+-- sourced from Blizzard_APIDocumentationGenerated/IncomingSummonDocumentation.lua
 local SUMMON_STATUS_NONE = Enum.SummonStatus.None or 0
 local SUMMON_STATUS_PENDING = Enum.SummonStatus.Pending or 1
 local SUMMON_STATUS_ACCEPTED = Enum.SummonStatus.Accepted or 2
diff --git a/KkthnxUI/Libraries/oUF/elements/threatindicator.lua b/KkthnxUI/Libraries/oUF/elements/threatindicator.lua
index 396218ea..4e571eab 100644
--- a/KkthnxUI/Libraries/oUF/elements/threatindicator.lua
+++ b/KkthnxUI/Libraries/oUF/elements/threatindicator.lua
@@ -15,7 +15,7 @@ A default texture will be applied if the widget is a Texture and doesn't have a
 ## Options
 
 .feedbackUnit - The unit whose threat situation is being requested. If defined, it'll be passed as the first argument to
-                [UnitThreatSituation](https://wow.gamepedia.com/API_UnitThreatSituation).
+                [UnitThreatSituation](https://warcraft.wiki.gg/wiki/API_UnitThreatSituation).
 
 ## Examples
 
@@ -78,7 +78,7 @@ local function Update(self, event, unit)
 
 	* self   - the ThreatIndicator element
 	* unit   - the unit for which the update has been triggered (string)
-	* status - the unit's threat status (see [UnitThreatSituation](http://wowprogramming.com/docs/api/UnitThreatSituation.html))
+	* status - the unit's threat status (see [UnitThreatSituation](https://warcraft.wiki.gg/wiki/API_UnitThreatSituation))
 	* r      - the red color component based on the unit's threat status (number?)[0-1]
 	* g      - the green color component based on the unit's threat status (number?)[0-1]
 	* b      - the blue color component based on the unit's threat status (number?)[0-1]
diff --git a/KkthnxUI/Libraries/oUF/ouf.lua b/KkthnxUI/Libraries/oUF/ouf.lua
index e01d9c0b..e0491351 100644
--- a/KkthnxUI/Libraries/oUF/ouf.lua
+++ b/KkthnxUI/Libraries/oUF/ouf.lua
@@ -620,8 +620,8 @@ do
 	* template     - name of a template to be used for creating the header. Defaults to `'SecureGroupHeaderTemplate'`
 	                 (string?)
 	* visibility   - macro conditional(s) which define when to display the header (string).
-	* ...          - further argument pairs. Consult [Group Headers](http://wowprogramming.com/docs/secure_template/Group_Headers.html)
-	                 for possible values.
+	* ...          - further argument pairs. Consult [Group Headers](https://warcraft.wiki.gg/wiki/SecureGroupHeaderTemplate)
+	                 for possible values. If preferred, the attributes can be an associative table.
 
 	In addition to the standard group headers, oUF implements some of its own attributes. These can be supplied by the
 	layout, but are optional. PingableUnitFrameTemplate is inherited for Ping support.
@@ -640,10 +640,19 @@ do
 		local header = CreateFrame('Frame', name, PetBattleFrameHider, template)
 
 		header:SetAttribute('template', 'SecureUnitButtonTemplate, SecureHandlerStateTemplate, SecureHandlerEnterLeaveTemplate, PingableUnitFrameTemplate, SecureHandlerShowHideTemplate, SecureHandlerMouseUpDownTemplate')
-		for i = 1, select('#', ...), 2 do
-			local att, val = select(i, ...)
-			if(not att) then break end
-			header:SetAttribute(att, val)
+
+		if(...) then
+			if(type(...) == 'table') then
+				for att, val in next, (...) do
+					header:SetAttribute(att, val)
+				end
+			else
+				for i = 1, select('#', ...), 2 do
+					local att, val = select(i, ...)
+					if(not att) then break end
+					header:SetAttribute(att, val)
+				end
+			end
 		end
 
 		header.style = style
diff --git a/KkthnxUI/Modules/Announcements/Elements/ItemAlert.lua b/KkthnxUI/Modules/Announcements/Elements/ItemAlert.lua
index 7312978a..44591947 100644
--- a/KkthnxUI/Modules/Announcements/Elements/ItemAlert.lua
+++ b/KkthnxUI/Modules/Announcements/Elements/ItemAlert.lua
@@ -3,8 +3,8 @@ local Module = K:GetModule("Announcements")
 
 local string_format = string.format
 
-local GetSpellInfo = GetSpellInfo
-local GetSpellLink = GetSpellLink
+local C_Spell_GetSpellInfo = C_Spell.GetSpellInfo
+local C_Spell_GetSpellLink = C_Spell and C_Spell.GetSpellLink
 local IsInGroup = IsInGroup
 local SendChatMessage = SendChatMessage
 local UnitName = UnitName
@@ -55,7 +55,7 @@ local importantSpells = {
 -- Function to handle spell cast alerts
 function Module:UpdateItemAlert(unit, castID, spellID)
 	if groupUnits[unit] and importantSpells[spellID] and (importantSpells[spellID] ~= castID) then
-		SendChatMessage(string_format("%s used %s", UnitName(unit), GetSpellLink(spellID) or GetSpellInfo(spellID)), K.CheckChat())
+		SendChatMessage(string_format("%s used %s", UnitName(unit), C_Spell_GetSpellLink(spellID) or C_Spell_GetSpellInfo(spellID)), K.CheckChat())
 		importantSpells[spellID] = castID
 	end
 end
@@ -72,7 +72,7 @@ end
 -- Main function to handle spell and item alerts
 function Module:CreateItemAnnounce()
 	Module.factionSpell = K.Faction == "Alliance" and 32182 or 2825
-	Module.factionSpell = GetSpellLink(Module.factionSpell)
+	Module.factionSpell = C_Spell_GetSpellLink(Module.factionSpell)
 
 	if C["Announcements"].ItemAlert then
 		Module:CheckGroupStatus()
diff --git a/KkthnxUI/Modules/Announcements/Elements/Keystone.lua b/KkthnxUI/Modules/Announcements/Elements/Keystone.lua
index 0a0254d6..7e47eb8a 100644
--- a/KkthnxUI/Modules/Announcements/Elements/Keystone.lua
+++ b/KkthnxUI/Modules/Announcements/Elements/Keystone.lua
@@ -94,7 +94,7 @@ function Module.KeystoneLink(message, sender)
 end
 
 function Module:CreateKeystoneAnnounce()
-	if IsAddOnLoaded("MythicKeyReporter") or not C["Announcements"].KeystoneAlert then
+	if C_AddOns.IsAddOnLoaded("MythicKeyReporter") or not C["Announcements"].KeystoneAlert then
 		return
 	end
 
diff --git a/KkthnxUI/Modules/Auras/Core.lua b/KkthnxUI/Modules/Auras/Core.lua
index 13d14f2f..5c36ef92 100644
--- a/KkthnxUI/Modules/Auras/Core.lua
+++ b/KkthnxUI/Modules/Auras/Core.lua
@@ -18,7 +18,6 @@ local RegisterAttributeDriver = RegisterAttributeDriver
 local RegisterStateDriver = RegisterStateDriver
 local SecureHandlerSetFrameRef = SecureHandlerSetFrameRef
 local UIParent = UIParent
-local UnitAura = UnitAura
 
 local day, hour, minute = 86400, 3600, 60
 
@@ -146,13 +145,13 @@ end
 
 function Module:UpdateAuras(button, index)
 	local unit, filter = button.header:GetAttribute("unit"), button.filter
-	local name, texture, count, debuffType, duration, expirationTime, _, _, _, spellID, _, _, _, _, _, arg16, arg17, arg18 = UnitAura(unit, index, filter)
-	if not name then
+	local auraData = C_UnitAuras.GetAuraDataByIndex(unit, index, filter)
+	if not auraData then
 		return
 	end
 
-	if duration > 0 and expirationTime then
-		local timeLeft = expirationTime - GetTime()
+	if auraData.duration > 0 and auraData.expirationTime then
+		local timeLeft = auraData.expirationTime - GetTime()
 		if not button.timeLeft then
 			button.nextUpdate = -1
 			button.timeLeft = timeLeft
@@ -167,6 +166,7 @@ function Module:UpdateAuras(button, index)
 		button.timer:SetText("")
 	end
 
+	local count = auraData.applications
 	if count and count > 1 then
 		button.count:SetText(count)
 	else
@@ -174,20 +174,20 @@ function Module:UpdateAuras(button, index)
 	end
 
 	if filter == "HARMFUL" then
-		local color = DebuffTypeColor[debuffType or "none"]
+		local color = DebuffTypeColor[auraData.dispelName or "none"]
 		button.KKUI_Border:SetVertexColor(color.r, color.g, color.b)
 	else
 		K.SetBorderColor(button.KKUI_Border)
 	end
 
 	-- Show spell stat for 'Soleahs Secret Technique'
-	if spellID == 368512 then
-		button.count:SetText(Module:GetSpellStat(arg16, arg17, arg18))
+	if auraData.spellId == 368512 then
+		button.count:SetText(Module:GetSpellStat(unpack(auraData.points)))
 	end
 
-	button.spellID = spellID
-	button.icon:SetTexture(texture)
-	button.offset = nil
+	button.spellID = auraData.spellId
+	button.icon:SetTexture(auraData.icon)
+	button.expiration = nil
 end
 
 function Module:UpdateTempEnchant(button, index)
diff --git a/KkthnxUI/Modules/Auras/Elements/AuraWatch.lua b/KkthnxUI/Modules/Auras/Elements/AuraWatch.lua
index 9c406a98..6cc8dded 100644
--- a/KkthnxUI/Modules/Auras/Elements/AuraWatch.lua
+++ b/KkthnxUI/Modules/Auras/Elements/AuraWatch.lua
@@ -12,12 +12,11 @@ local CreateFrame = CreateFrame
 local GameTooltip = GameTooltip
 local GetInventoryItemCooldown = GetInventoryItemCooldown
 local GetInventoryItemLink = GetInventoryItemLink
-local GetItemCooldown = GetItemCooldown
-local GetItemInfo = GetItemInfo
+local GetItemCooldown = C_Item.GetItemCooldown
+local GetItemInfo = C_Item.GetItemInfo
 local GetPlayerInfoByGUID = GetPlayerInfoByGUID
-local GetSpellCharges = GetSpellCharges
-local GetSpellCooldown = GetSpellCooldown
-local GetSpellInfo = GetSpellInfo
+local GetSpellCharges = C_Spell.GetSpellCharges
+local GetSpellCooldown = C_Spell.GetSpellCooldown
 local GetTime = GetTime
 local GetTotemInfo = GetTotemInfo
 local InCombatLockdown = InCombatLockdown
@@ -26,7 +25,6 @@ local IsControlKeyDown = IsControlKeyDown
 local IsPlayerSpell = IsPlayerSpell
 local PlaySound = PlaySound
 local SlashCmdList = SlashCmdList
-local UnitAura = UnitAura
 local UnitGUID = UnitGUID
 local UnitInParty = UnitInParty
 local UnitInRaid = UnitInRaid
@@ -462,8 +460,10 @@ function Module:AuraWatch_UpdateCD()
 			local value = group.List[spellID]
 			if value then
 				if value.SpellID then
-					local name, _, icon = GetSpellInfo(value.SpellID)
-					local start, duration = GetSpellCooldown(value.SpellID)
+					local name, _, icon = C_Spell.GetSpellName(value.SpellID)
+					local start = C_Spell.GetSpellCooldown(value.SpellID).startTime
+					local duration = C_Spell.GetSpellCooldown(value.SpellID).duration
+					-- local start, duration = GetSpellCooldown(value.SpellID)
 					local charges, maxCharges, chargeStart, chargeDuration = GetSpellCharges(value.SpellID)
 					if group.Mode == "ICON" then
 						name = nil
@@ -617,11 +617,11 @@ function Module:UpdateAuraWatchByFilter(unit, filter, inCombat)
 	local index = 1
 
 	while true do
-		local name, icon, count, _, duration, expires, caster, _, _, spellID, _, _, _, _, _, number1, number2 = UnitAura(unit, index, filter)
-		if not name then
+		local auraData = C_UnitAuras.GetAuraDataByIndex(unit, index, filter)
+		if not auraData then
 			break
 		end
-		Module:AuraWatch_UpdateAura(unit, index, filter, name, icon, count, duration, expires, caster, spellID, (number1 == 0 and tonumber(number2) or tonumber(number1)), inCombat)
+		Module:AuraWatch_UpdateAura(unit, index, filter, auraData.name, auraData.icon, auraData.applications, auraData.duration, auraData.expirationTime, auraData.sourceUnit, auraData.spellId, (auraData.points[1] == 0 and tonumber(auraData.points[2]) or tonumber(auraData.points[1])), inCombat)
 
 		index = index + 1
 	end
@@ -697,7 +697,7 @@ function Module:AuraWatch_SetupInt(intID, itemID, duration, unitID, guid, source
 		frame.type = 2
 		frame.spellID = itemID
 	else
-		name, _, icon = GetSpellInfo(intID)
+		name, _, icon = C_Spell.GetSpellName(intID)
 		frame.type = 1
 		frame.spellID = intID
 	end
diff --git a/KkthnxUI/Modules/Auras/Lumos/Core.lua b/KkthnxUI/Modules/Auras/Lumos/Core.lua
index 6f9e05a0..f6f81a8f 100644
--- a/KkthnxUI/Modules/Auras/Lumos/Core.lua
+++ b/KkthnxUI/Modules/Auras/Lumos/Core.lua
@@ -3,19 +3,27 @@ local Module = K:GetModule("Auras")
 
 function Module:GetUnitAura(unit, spell, filter)
 	for index = 1, 32 do
-		local name, _, count, _, duration, expire, caster, _, _, spellID, _, _, _, _, _, value = UnitAura(unit, index, filter)
-		if not name then
+		local auraData = C_UnitAuras.GetAuraDataByIndex(unit, index, filter)
+		if not auraData then
 			break
 		end
-		if name and spellID == spell then
-			return name, count, duration, expire, caster, spellID, value
+		if auraData.spellId == spell then
+			return auraData.name, auraData.applications, auraData.duration, auraData.expirationTime, auraData.sourceUnit, auraData.spellId, auraData.points[1]
 		end
 	end
 end
 
 function Module:UpdateCooldown(button, spellID, texture)
-	local charges, maxCharges, chargeStart, chargeDuration = GetSpellCharges(spellID)
-	local start, duration = GetSpellCooldown(spellID)
+	local chargeInfo = C_Spell.GetSpellCharges(spellID)
+	local charges = chargeInfo and chargeInfo.currentCharges
+	local maxCharges = chargeInfo and chargeInfo.maxCharges
+	local chargeStart = chargeInfo and chargeInfo.cooldownStartTime
+	local chargeDuration = chargeInfo and chargeInfo.cooldownDuration
+
+	local cooldownInfo = C_Spell.GetSpellCooldown(spellID)
+	local start = cooldownInfo and cooldownInfo.startTime
+	local duration = cooldownInfo and cooldownInfo.duration
+
 	if charges and maxCharges > 1 then
 		button.Count:SetText(charges)
 	else
diff --git a/KkthnxUI/Modules/Blizzard/Elements/ObjectiveFrame.lua b/KkthnxUI/Modules/Blizzard/Elements/ObjectiveFrame.lua
index 050c07cf..917db181 100644
--- a/KkthnxUI/Modules/Blizzard/Elements/ObjectiveFrame.lua
+++ b/KkthnxUI/Modules/Blizzard/Elements/ObjectiveFrame.lua
@@ -75,15 +75,15 @@ end
 -- keeping old name, not used to move just to handle the objective things
 -- wrath has it's own file, which actually has the mover on that client
 function Module:CreateObjectiveFrame()
-	local tracker = ObjectiveTrackerFrame
-	tracker.AutoHider = CreateFrame("Frame", nil, tracker, "SecureHandlerStateTemplate")
-	tracker.AutoHider:SetAttribute("_onstate-objectiveHider", "if newstate == 1 then self:Hide() else self:Show() end")
-	tracker.AutoHider:SetScript("OnHide", AutoHider_OnHide)
-	tracker.AutoHider:SetScript("OnShow", AutoHider_OnShow)
-	Module:SetObjectiveFrameAutoHide()
+	-- local tracker = ObjectiveTrackerFrame
+	-- tracker.AutoHider = CreateFrame("Frame", nil, tracker, "SecureHandlerStateTemplate")
+	-- tracker.AutoHider:SetAttribute("_onstate-objectiveHider", "if newstate == 1 then self:Hide() else self:Show() end")
+	-- tracker.AutoHider:SetScript("OnHide", AutoHider_OnHide)
+	-- tracker.AutoHider:SetScript("OnShow", AutoHider_OnShow)
+	-- Module:SetObjectiveFrameAutoHide()
 
 	-- hooksecurefunc("BonusObjectiveTracker_AnimateReward", RewardsFrame_SetPosition) -- What was this changed to? Bugged!
 
-	K:RegisterEvent("ZONE_CHANGED_NEW_AREA", Module.HandleMawBuffsFrame)
-	Module:HandleMawBuffsFrame()
+	-- K:RegisterEvent("ZONE_CHANGED_NEW_AREA", Module.HandleMawBuffsFrame)
+	-- Module:HandleMawBuffsFrame()
 end
diff --git a/KkthnxUI/Modules/Chat/Elements/ILevel.lua b/KkthnxUI/Modules/Chat/Elements/ILevel.lua
index 87cf1f89..fb5a71f0 100644
--- a/KkthnxUI/Modules/Chat/Elements/ILevel.lua
+++ b/KkthnxUI/Modules/Chat/Elements/ILevel.lua
@@ -9,8 +9,8 @@ local string_rep = string.rep
 
 local ChatFrame_AddMessageEventFilter = ChatFrame_AddMessageEventFilter
 local DUNGEON_SCORE_LEADER = DUNGEON_SCORE_LEADER
-local GetItemInfo = GetItemInfo
-local GetItemStats = GetItemStats
+local GetItemInfo = C_Item.GetItemInfo
+local GetItemStats = C_Item.GetItemStats
 
 local itemCache = {}
 local GetDungeonScoreInColor
diff --git a/KkthnxUI/Modules/Inventory/Core.lua b/KkthnxUI/Modules/Inventory/Core.lua
index 49ff3b29..7d08bfac 100644
--- a/KkthnxUI/Modules/Inventory/Core.lua
+++ b/KkthnxUI/Modules/Inventory/Core.lua
@@ -1065,10 +1065,10 @@ function Module:OnEnable()
 
 	function Backpack:OnBankClosed()
 		BankFrame.selectedTab = 1
-		BankFrame:Hide()
+		BankFrame.activeTabIndex = 1
 		self:GetContainer("Bank"):Hide()
 		self:GetContainer("Reagent"):Hide()
-		ReagentBankFrame:Hide()
+		self:GetContainer("AccountBank"):Hide()
 	end
 
 	local MyButton = Backpack:GetItemButtonClass()
@@ -1435,7 +1435,7 @@ function Module:OnEnable()
 		elseif name:match("Equipment$") then
 			label = BAG_FILTER_EQUIPMENT
 		elseif name:match("EquipSet$") then
-			label = L["Equipment Set"]
+			label = "Equipment Set" -- L["Equipment Set"]
 		elseif name == "Junk" then
 			label = BAG_FILTER_JUNK
 		elseif name == "BagRelic" then
@@ -1443,7 +1443,7 @@ function Module:OnEnable()
 		elseif name == "BagReagent" then
 			label = "Reagent Bag"
 		elseif name == "BagStone" then
-			label = GetSpellInfo(404861)
+			label = C_Spell.GetSpellName(404861)
 		else
 			if name:match("Legendary$") then
 				label = LOOT_JOURNAL_LEGENDARIES
diff --git a/KkthnxUI/Modules/Miscellaneous/Core.lua b/KkthnxUI/Modules/Miscellaneous/Core.lua
index a261ab12..1d5edbc8 100644
--- a/KkthnxUI/Modules/Miscellaneous/Core.lua
+++ b/KkthnxUI/Modules/Miscellaneous/Core.lua
@@ -65,7 +65,7 @@ function Module:OnEnable()
 		"CreateDeathCounter",
 		"CreateDurabilityFrameMove",
 		"CreateErrorFrameToggle",
-		"CreateGUIGameMenuButton",
+		-- "CreateGUIGameMenuButton",
 		"CreateMinimapButtonToggle",
 		"CreateObjectiveSizeUpdate",
 		"CreateQuestSizeUpdate",
diff --git a/KkthnxUI/Modules/Miscellaneous/Elements/ExpRep.lua b/KkthnxUI/Modules/Miscellaneous/Elements/ExpRep.lua
index 21d0fe6b..c30ae444 100644
--- a/KkthnxUI/Modules/Miscellaneous/Elements/ExpRep.lua
+++ b/KkthnxUI/Modules/Miscellaneous/Elements/ExpRep.lua
@@ -120,61 +120,80 @@ local function OnExpBarEvent(self, event, unit)
 
 		-- Update text display with XP information
 		self.text:SetText(barDisplayString)
-	elseif GetWatchedFactionInfo() then
-		local standing, rewardPending, _
-		local name, reaction, minValue, maxValue, curValue, factionID = GetWatchedFactionInfo()
-
-		local info = factionID and C_GossipInfo_GetFriendshipReputation(factionID)
-		if info and info.friendshipFactionID and info.friendshipFactionID > 0 then
-			standing, minValue, maxValue, curValue = info.reaction, info.reactionThreshold or 0, info.nextThreshold or math.huge, info.standing or 1
-		end
-
-		if not standing and factionID and C_Reputation_IsFactionParagon(factionID) then
-			local current, threshold
-			current, threshold, _, rewardPending = C_Reputation_GetFactionParagonInfo(factionID)
-
-			if current and threshold then
-				standing, minValue, maxValue, curValue, reaction = L["Paragon"], 0, threshold, current % threshold, 9
-			end
-		end
-
-		if not standing and factionID and C_Reputation_IsMajorFaction(factionID) then
-			local majorFactionData = C_MajorFactions_GetMajorFactionData(factionID)
-			local renownColor = { r = 0, g = 0.74, b = 0.95 }
-			local renownHex = K.RGBToHex(renownColor.r, renownColor.g, renownColor.b)
-
-			reaction, minValue, maxValue = 10, 0, majorFactionData.renownLevelThreshold
-			curValue = C_MajorFactions_HasMaximumRenown(factionID) and majorFactionData.renownLevelThreshold or majorFactionData.renownReputationEarned or 0
-			standing = string_format("%s%s %s|r", renownHex, RENOWN_LEVEL_LABEL, majorFactionData.renownLevel)
-		end
-
-		if not standing then
-			standing = _G["FACTION_STANDING_LABEL" .. reaction] or UNKNOWN
-		end
-
-		local customColors = true
-		local customReaction = reaction == 9 or reaction == 10 -- 9 is paragon, 10 is renown
-		local color = (customColors or customReaction) and K.Colors.faction[reaction] or _G.FACTION_BAR_COLORS[reaction]
-		local alpha = (customColors and 1)
-		local total = maxValue == math.huge and 1 or maxValue -- we need to correct the min/max of friendship factions to display the bar at 100%
-
-		self:SetStatusBarColor(color.r or 1, color.g or 1, color.b or 1, alpha or 1)
-		self:SetMinMaxValues((maxValue == math.huge or minValue == maxValue) and 0 or minValue, total) -- we force min to 0 because the min will match max when a rep is maxed and cause the bar to be 0%
-		self:SetValue(curValue)
-
-		self.reward:ClearAllPoints()
-		self.reward:SetPoint("CENTER", self, "LEFT")
-		self.reward:SetShown(rewardPending)
-
-		local current, _, percent, capped = RepGetValues(curValue, minValue, total) -- Check these please.
-		if capped then -- show only name and standing on exalted
-			barDisplayString = string_format("%s: [%s]", name, standing)
-		else
-			barDisplayString = string_format("%s: %s - %d%% [%s]", name, K.ShortValue(current), percent, standing)
-		end
-
-		self:Show()
-		self.text:SetText(barDisplayString)
+		-- elseif GetWatchedFactionInfo() then
+		-- local standing, rewardPending, _
+		-- local name, reaction, minValue, maxValue, curValue, factionID = GetWatchedFactionInfo()
+
+		-- local factionData = C_Reputation.GetWatchedFactionInfo()
+		-- -- factionID	number
+		-- -- name	string
+		-- -- description	string
+		-- -- reaction	number
+		-- -- currentReactionThreshold	number
+		-- -- nextReactionThreshold	number
+		-- -- currentStanding	number
+		-- -- atWarWith	boolean
+		-- -- canToggleAtWar	boolean
+		-- -- isChild	boolean
+		-- -- isHeader	boolean
+		-- -- isHeaderWithRep	boolean
+		-- -- isCollapsed	boolean
+		-- -- isWatched	boolean
+		-- -- hasBonusRepGain	boolean
+		-- -- canSetInactive	boolean
+		-- -- isAccountWide	boolean
+
+		-- local info = factionID and C_GossipInfo_GetFriendshipReputation(factionID)
+		-- if info and info.friendshipFactionID and info.friendshipFactionID > 0 then
+		-- 	standing, minValue, maxValue, curValue = info.reaction, info.reactionThreshold or 0, info.nextThreshold or math.huge, info.standing or 1
+		-- end
+
+		-- if not standing and factionID and C_Reputation_IsFactionParagon(factionID) then
+		-- 	local current, threshold
+		-- 	current, threshold, _, rewardPending = C_Reputation_GetFactionParagonInfo(factionID)
+
+		-- 	if current and threshold then
+		-- 		standing, minValue, maxValue, curValue, reaction = L["Paragon"], 0, threshold, current % threshold, 9
+		-- 	end
+		-- end
+
+		-- if not standing and factionID and C_Reputation_IsMajorFaction(factionID) then
+		-- 	local majorFactionData = C_MajorFactions_GetMajorFactionData(factionID)
+		-- 	local renownColor = { r = 0, g = 0.74, b = 0.95 }
+		-- 	local renownHex = K.RGBToHex(renownColor.r, renownColor.g, renownColor.b)
+
+		-- 	reaction, minValue, maxValue = 10, 0, majorFactionData.renownLevelThreshold
+		-- 	curValue = C_MajorFactions_HasMaximumRenown(factionID) and majorFactionData.renownLevelThreshold or majorFactionData.renownReputationEarned or 0
+		-- 	standing = string_format("%s%s %s|r", renownHex, RENOWN_LEVEL_LABEL, majorFactionData.renownLevel)
+		-- end
+
+		-- if not standing then
+		-- 	standing = _G["FACTION_STANDING_LABEL" .. reaction] or UNKNOWN
+		-- end
+
+		-- local customColors = true
+		-- local customReaction = reaction == 9 or reaction == 10 -- 9 is paragon, 10 is renown
+		-- local color = (customColors or customReaction) and K.Colors.faction[reaction] or _G.FACTION_BAR_COLORS[reaction]
+		-- local alpha = (customColors and 1)
+		-- local total = maxValue == math.huge and 1 or maxValue -- we need to correct the min/max of friendship factions to display the bar at 100%
+
+		-- self:SetStatusBarColor(color.r or 1, color.g or 1, color.b or 1, alpha or 1)
+		-- self:SetMinMaxValues((maxValue == math.huge or minValue == maxValue) and 0 or minValue, total) -- we force min to 0 because the min will match max when a rep is maxed and cause the bar to be 0%
+		-- self:SetValue(curValue)
+
+		-- self.reward:ClearAllPoints()
+		-- self.reward:SetPoint("CENTER", self, "LEFT")
+		-- self.reward:SetShown(rewardPending)
+
+		-- local current, _, percent, capped = RepGetValues(curValue, minValue, total) -- Check these please.
+		-- if capped then -- show only name and standing on exalted
+		-- 	barDisplayString = string_format("%s: [%s]", name, standing)
+		-- else
+		-- 	barDisplayString = string_format("%s: %s - %d%% [%s]", name, K.ShortValue(current), percent, standing)
+		-- end
+
+		-- self:Show()
+		-- self.text:SetText(barDisplayString)
 	elseif IsWatchingHonorAsXP() then
 		if event == "PLAYER_FLAGS_CHANGED" and unit ~= "player" then
 			return
@@ -250,66 +269,66 @@ local function OnExpBarEnter(self)
 		GameTooltip:AddDoubleLine(altKeyText .. KEY_PLUS .. K.RightButton, sendExperienceText)
 	end
 
-	if GetWatchedFactionInfo() then
-		if not XPIsLevelMax() then
-			GameTooltip:AddLine(" ")
-		end
-
-		local name, reaction, minValue, maxValue, curValue, factionID = GetWatchedFactionInfo()
-		local isParagon = factionID and C_Reputation_IsFactionParagon(factionID)
-		local standing
-
-		if isParagon then
-			local current, threshold = C_Reputation_GetFactionParagonInfo(factionID)
-			if current and threshold then
-				standing, minValue, maxValue, curValue = L["Paragon"], 0, threshold, current % threshold
-			end
-		end
-
-		if name then
-			GameTooltip:AddLine(name, K.RGBToHex(0, 0.74, 0.95))
-			GameTooltip:AddLine(" ")
-
-			local info = factionID and C_GossipInfo.GetFriendshipReputation(factionID)
-			if info and info.friendshipFactionID and info.friendshipFactionID > 0 then
-				standing, minValue, maxValue, curValue = info.reaction, info.reactionThreshold or 0, info.nextThreshold or math.huge, info.standing or 1
-			end
-
-			if not standing then
-				standing = _G["FACTION_STANDING_LABEL" .. reaction] or UNKNOWN
-			end
-
-			local isMajorFaction = factionID and C_Reputation_IsMajorFaction(factionID)
-			if not isMajorFaction then
-				GameTooltip:AddDoubleLine(STANDING .. ":", standing, 1, 1, 1)
-			end
-
-			if not isParagon and isMajorFaction then
-				local majorFactionData = C_MajorFactions_GetMajorFactionData(factionID)
-				curValue = (C_MajorFactions_HasMaximumRenown(factionID) and majorFactionData.renownLevelThreshold) or majorFactionData.renownReputationEarned or 0
-				maxValue = majorFactionData.renownLevelThreshold
-				GameTooltip:AddDoubleLine(RENOWN_LEVEL_LABEL .. majorFactionData.renownLevel, string_format("%d / %d (%d%%)", RepGetValues(curValue, 0, maxValue)), BLUE_FONT_COLOR.r, BLUE_FONT_COLOR.g, BLUE_FONT_COLOR.b, 1, 1, 1)
-			elseif (isParagon or (reaction ~= _G.MAX_REPUTATION_REACTION)) and maxValue ~= math.huge then
-				GameTooltip:AddDoubleLine(REPUTATION .. ":", string_format("%d / %d (%d%%)", RepGetValues(curValue, minValue, maxValue)), 1, 1, 1)
-			end
-
-			-- Check for specific faction
-			if factionID == 2465 then -- Translate "荒猎团" if necessary
-				local repInfo = C_GossipInfo_GetFriendshipReputation(2463) -- Translate "玛拉斯缪斯" if necessary
-				local rep, name, reaction, threshold, nextThreshold = repInfo.standing, repInfo.name, repInfo.reaction, repInfo.reactionThreshold, repInfo.nextThreshold
-				if nextThreshold and rep > 0 then
-					local current = rep - threshold
-					local currentMax = nextThreshold - threshold
-					GameTooltip:AddLine(" ") -- Translate if necessary
-					GameTooltip:AddLine(name, 0, 0.6, 1) -- Translate "name" if necessary
-					GameTooltip:AddDoubleLine(reaction, current .. " / " .. currentMax .. " (" .. floor(current / currentMax * 100) .. "%)", 0.6, 0.8, 1, 1, 1, 1) -- Translate "reaction" if necessary
-				end
-			end
-		end
-
-		GameTooltip:AddLine(" ")
-		GameTooltip:AddDoubleLine(altKeyText .. KEY_PLUS .. K.RightButton, sendReputationText)
-	end
+	-- if GetWatchedFactionInfo() then
+	-- 	if not XPIsLevelMax() then
+	-- 		GameTooltip:AddLine(" ")
+	-- 	end
+
+	-- 	local name, reaction, minValue, maxValue, curValue, factionID = GetWatchedFactionInfo()
+	-- 	local isParagon = factionID and C_Reputation_IsFactionParagon(factionID)
+	-- 	local standing
+
+	-- 	if isParagon then
+	-- 		local current, threshold = C_Reputation_GetFactionParagonInfo(factionID)
+	-- 		if current and threshold then
+	-- 			standing, minValue, maxValue, curValue = L["Paragon"], 0, threshold, current % threshold
+	-- 		end
+	-- 	end
+
+	-- 	if name then
+	-- 		GameTooltip:AddLine(name, K.RGBToHex(0, 0.74, 0.95))
+	-- 		GameTooltip:AddLine(" ")
+
+	-- 		local info = factionID and C_GossipInfo.GetFriendshipReputation(factionID)
+	-- 		if info and info.friendshipFactionID and info.friendshipFactionID > 0 then
+	-- 			standing, minValue, maxValue, curValue = info.reaction, info.reactionThreshold or 0, info.nextThreshold or math.huge, info.standing or 1
+	-- 		end
+
+	-- 		if not standing then
+	-- 			standing = _G["FACTION_STANDING_LABEL" .. reaction] or UNKNOWN
+	-- 		end
+
+	-- 		local isMajorFaction = factionID and C_Reputation_IsMajorFaction(factionID)
+	-- 		if not isMajorFaction then
+	-- 			GameTooltip:AddDoubleLine(STANDING .. ":", standing, 1, 1, 1)
+	-- 		end
+
+	-- 		if not isParagon and isMajorFaction then
+	-- 			local majorFactionData = C_MajorFactions_GetMajorFactionData(factionID)
+	-- 			curValue = (C_MajorFactions_HasMaximumRenown(factionID) and majorFactionData.renownLevelThreshold) or majorFactionData.renownReputationEarned or 0
+	-- 			maxValue = majorFactionData.renownLevelThreshold
+	-- 			GameTooltip:AddDoubleLine(RENOWN_LEVEL_LABEL .. majorFactionData.renownLevel, string_format("%d / %d (%d%%)", RepGetValues(curValue, 0, maxValue)), BLUE_FONT_COLOR.r, BLUE_FONT_COLOR.g, BLUE_FONT_COLOR.b, 1, 1, 1)
+	-- 		elseif (isParagon or (reaction ~= _G.MAX_REPUTATION_REACTION)) and maxValue ~= math.huge then
+	-- 			GameTooltip:AddDoubleLine(REPUTATION .. ":", string_format("%d / %d (%d%%)", RepGetValues(curValue, minValue, maxValue)), 1, 1, 1)
+	-- 		end
+
+	-- 		-- Check for specific faction
+	-- 		if factionID == 2465 then -- Translate "荒猎团" if necessary
+	-- 			local repInfo = C_GossipInfo_GetFriendshipReputation(2463) -- Translate "玛拉斯缪斯" if necessary
+	-- 			local rep, name, reaction, threshold, nextThreshold = repInfo.standing, repInfo.name, repInfo.reaction, repInfo.reactionThreshold, repInfo.nextThreshold
+	-- 			if nextThreshold and rep > 0 then
+	-- 				local current = rep - threshold
+	-- 				local currentMax = nextThreshold - threshold
+	-- 				GameTooltip:AddLine(" ") -- Translate if necessary
+	-- 				GameTooltip:AddLine(name, 0, 0.6, 1) -- Translate "name" if necessary
+	-- 				GameTooltip:AddDoubleLine(reaction, current .. " / " .. currentMax .. " (" .. floor(current / currentMax * 100) .. "%)", 0.6, 0.8, 1, 1, 1, 1) -- Translate "reaction" if necessary
+	-- 			end
+	-- 		end
+	-- 	end
+
+	-- 	GameTooltip:AddLine(" ")
+	-- 	GameTooltip:AddDoubleLine(altKeyText .. KEY_PLUS .. K.RightButton, sendReputationText)
+	-- end
 
 	if IsWatchingHonorAsXP() then
 		GameTooltip:AddLine(HONOR)
diff --git a/KkthnxUI/Modules/Miscellaneous/Elements/ParagonRep.lua b/KkthnxUI/Modules/Miscellaneous/Elements/ParagonRep.lua
index fcf78ec9..5cf8c2b4 100644
--- a/KkthnxUI/Modules/Miscellaneous/Elements/ParagonRep.lua
+++ b/KkthnxUI/Modules/Miscellaneous/Elements/ParagonRep.lua
@@ -1002,7 +1002,7 @@ function Module:CreateParagonRep()
 
 	K:RegisterEvent("QUEST_ACCEPTED", Module.QUEST_ACCEPTED)
 	hooksecurefunc("ReputationParagonFrame_SetupParagonTooltip", Module.SetupParagonTooltip)
-	hooksecurefunc("ReputationFrame_InitReputationRow", Module.ChangeReputationBars)
+	-- hooksecurefunc("ReputationFrame_InitReputationRow", Module.ChangeReputationBars)
 	Module:CreateToast()
 
 	K.Mover(Module.toast, "ParagonRepToastMover", "Paragon Reputation Toast", { "BOTTOM", UIParent, "BOTTOM", 0, 250 })
diff --git a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua
index 6c889759..6f7356b3 100644
--- a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua
+++ b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua
@@ -219,14 +219,14 @@ tinsert(C.defaultThemes, function()
 		CharacterFrame.Inset.Bg:SetVertTile(isExpanded)
 	end
 
-	-- Expand/collapse hooks
-	hooksecurefunc("CharacterFrame_Expand", function()
-		UpdateCharacterFrameLayout(true)
-	end)
-
-	hooksecurefunc("CharacterFrame_Collapse", function()
-		UpdateCharacterFrameLayout(false)
-	end)
+	-- -- Expand/collapse hooks
+	-- hooksecurefunc("CharacterFrame_Expand", function()
+	-- 	UpdateCharacterFrameLayout(true)
+	-- end)
+
+	-- hooksecurefunc("CharacterFrame_Collapse", function()
+	-- 	UpdateCharacterFrameLayout(false)
+	-- end)
 
 	-- Fonts
 	if CharacterLevelText then
diff --git a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/GameMenuFrame.lua b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/GameMenuFrame.lua
index e60ecf71..7d0d3679 100644
--- a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/GameMenuFrame.lua
+++ b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/GameMenuFrame.lua
@@ -30,9 +30,9 @@ table_insert(C.defaultThemes, function()
 		button:SkinButton(true)
 	end
 
-	GameMenuButtonLogoutText:SetTextColor(1, 1, 0)
-	GameMenuButtonQuitText:SetTextColor(1, 0, 0)
-	GameMenuButtonContinueText:SetTextColor(0, 1, 0)
+	-- GameMenuButtonLogoutText:SetTextColor(1, 1, 0)
+	-- GameMenuButtonQuitText:SetTextColor(1, 0, 0)
+	-- GameMenuButtonContinueText:SetTextColor(0, 1, 0)
 
 	-- ScriptErrorsFrame
 	ScriptErrorsFrame:SetScale(UIParent:GetScale())
diff --git a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/ObjectiveTracker.lua b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/ObjectiveTracker.lua
index 2f1c8ff8..69f6ec0a 100644
--- a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/ObjectiveTracker.lua
+++ b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/ObjectiveTracker.lua
@@ -249,7 +249,7 @@ tinsert(C.defaultThemes, function()
 		return
 	end
 
-	local minimizeButton = ObjectiveTrackerFrame.HeaderMenu.MinimizeButton
+	local minimizeButton = ObjectiveTrackerFrame.Header.MinimizeButton
 	minimizeButton:SetNormalTexture(0)
 	minimizeButton:SetPushedTexture(0)
 	minimizeButton:SetSize(16, 16)
@@ -260,48 +260,48 @@ tinsert(C.defaultThemes, function()
 	minimizeButton.tex:SetDesaturated(true)
 	minimizeButton.tex:SetAllPoints()
 
-	hooksecurefunc("ObjectiveTracker_Expand", ChangeTrackerState)
-	hooksecurefunc("ObjectiveTracker_Collapse", ChangeTrackerState)
-	hooksecurefunc("QuestObjectiveSetupBlockButton_Item", ReskinItemButton)
-	hooksecurefunc(_G.BONUS_OBJECTIVE_TRACKER_MODULE, "AddObjective", ReskinItemButton)
-	hooksecurefunc("QuestObjectiveSetupBlockButton_AddRightButton", RepositionFindGroupButton)
-	hooksecurefunc("QuestObjectiveSetupBlockButton_FindGroup", ReskinFindGroupButton)
-	hooksecurefunc(_G.BONUS_OBJECTIVE_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.WORLD_QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.DEFAULT_OBJECTIVE_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.SCENARIO_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.CAMPAIGN_QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.UI_WIDGET_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
-	hooksecurefunc(_G.QUEST_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
-	hooksecurefunc(_G.SCENARIO_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
-	hooksecurefunc(_G.ACHIEVEMENT_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
+	-- hooksecurefunc("ObjectiveTracker_Expand", ChangeTrackerState)
+	-- hooksecurefunc("ObjectiveTracker_Collapse", ChangeTrackerState)
+	-- hooksecurefunc("QuestObjectiveSetupBlockButton_Item", ReskinItemButton)
+	-- hooksecurefunc(_G.BONUS_OBJECTIVE_TRACKER_MODULE, "AddObjective", ReskinItemButton)
+	-- hooksecurefunc("QuestObjectiveSetupBlockButton_AddRightButton", RepositionFindGroupButton)
+	-- hooksecurefunc("QuestObjectiveSetupBlockButton_FindGroup", ReskinFindGroupButton)
+	-- hooksecurefunc(_G.BONUS_OBJECTIVE_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.WORLD_QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.DEFAULT_OBJECTIVE_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.SCENARIO_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.CAMPAIGN_QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.QUEST_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.UI_WIDGET_TRACKER_MODULE, "AddProgressBar", ReskinProgressBars)
+	-- hooksecurefunc(_G.QUEST_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
+	-- hooksecurefunc(_G.SCENARIO_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
+	-- hooksecurefunc(_G.ACHIEVEMENT_TRACKER_MODULE, "AddTimerBar", ReskinTimerBars)
 
 	-- Reskin Headers
-	local headers = {
-		_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
-		_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
-		_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
-		_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
-		_G.ObjectiveTrackerBlocksFrame.QuestHeader,
-		_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
-		_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader,
-		_G.WORLD_QUEST_TRACKER_MODULE.Header,
-	}
-	for _, header in pairs(headers) do
-		ReskinObjectiveHeader(header)
-
-		local button = header.MinimizeButton
-		if button then
-			button:SetNormalTexture(0)
-			button:SetPushedTexture(0)
-			button:SetSize(16, 16)
-			button.tex = button:CreateTexture(nil, "OVERLAY")
-			button.tex:SetTexture(C["Media"].Textures.ArrowTexture)
-			button.tex:SetRotation(math.rad(0))
-			button.tex:SetAllPoints()
-
-			hooksecurefunc(button, "SetCollapsed", UpdateMinimizeButton)
-		end
-	end
+	-- local headers = {
+	-- 	_G.BONUS_OBJECTIVE_TRACKER_MODULE.Header,
+	-- 	_G.ObjectiveTrackerBlocksFrame.AchievementHeader,
+	-- 	_G.ObjectiveTrackerBlocksFrame.CampaignQuestHeader,
+	-- 	_G.ObjectiveTrackerBlocksFrame.ProfessionHeader,
+	-- 	_G.ObjectiveTrackerBlocksFrame.QuestHeader,
+	-- 	_G.ObjectiveTrackerBlocksFrame.ScenarioHeader,
+	-- 	_G.ObjectiveTrackerFrame.BlocksFrame.UIWidgetsHeader,
+	-- 	_G.WORLD_QUEST_TRACKER_MODULE.Header,
+	-- }
+	-- for _, header in pairs(headers) do
+	-- 	ReskinObjectiveHeader(header)
+
+	-- 	local button = header.MinimizeButton
+	-- 	if button then
+	-- 		button:SetNormalTexture(0)
+	-- 		button:SetPushedTexture(0)
+	-- 		button:SetSize(16, 16)
+	-- 		button.tex = button:CreateTexture(nil, "OVERLAY")
+	-- 		button.tex:SetTexture(C["Media"].Textures.ArrowTexture)
+	-- 		button.tex:SetRotation(math.rad(0))
+	-- 		button.tex:SetAllPoints()
+
+	-- 		hooksecurefunc(button, "SetCollapsed", UpdateMinimizeButton)
+	-- 	end
+	-- end
 end)
diff --git a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/SpellBookFrame.lua b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/SpellBookFrame.lua
index 23e29a49..5261cd95 100644
--- a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/SpellBookFrame.lua
+++ b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/SpellBookFrame.lua
@@ -120,36 +120,36 @@ local function HideTutorialButtons()
 end
 
 table_insert(C.defaultThemes, function()
-	if not C["Skins"].BlizzardFrames then
-		return
-	end
-
-	local professionTexture = K.GetTexture(C["General"].Texture)
-
-	for i = 1, SPELLS_PER_PAGE do
-		ReskinSpellButton(_G["SpellButton" .. i])
-	end
-
-	local professions = { "PrimaryProfession1", "PrimaryProfession2", "SecondaryProfession1", "SecondaryProfession2", "SecondaryProfession3" }
-	for i, profession in pairs(professions) do
-		ReskinProfessionButton(_G[profession])
-		if i <= 2 then
-			ReskinProfessionIcons(i)
-		end
-	end
-
-	hooksecurefunc("FormatProfession", function(frame, index)
-		if InCombatLockdown() then
-			return
-		end
-
-		if index then
-			local _, texture = GetProfessionInfo(index)
-			if frame.icon and texture then
-				frame.icon:SetTexture(texture)
-			end
-		end
-	end)
-
-	HideTutorialButtons()
+	-- if not C["Skins"].BlizzardFrames then
+	-- 	return
+	-- end
+
+	-- local professionTexture = K.GetTexture(C["General"].Texture)
+
+	-- for i = 1, SPELLS_PER_PAGE do
+	-- 	ReskinSpellButton(_G["SpellButton" .. i])
+	-- end
+
+	-- local professions = { "PrimaryProfession1", "PrimaryProfession2", "SecondaryProfession1", "SecondaryProfession2", "SecondaryProfession3" }
+	-- for i, profession in pairs(professions) do
+	-- 	ReskinProfessionButton(_G[profession])
+	-- 	if i <= 2 then
+	-- 		ReskinProfessionIcons(i)
+	-- 	end
+	-- end
+
+	-- hooksecurefunc("FormatProfession", function(frame, index)
+	-- 	if InCombatLockdown() then
+	-- 		return
+	-- 	end
+
+	-- 	if index then
+	-- 		local _, texture = GetProfessionInfo(index)
+	-- 		if frame.icon and texture then
+	-- 			frame.icon:SetTexture(texture)
+	-- 		end
+	-- 	end
+	-- end)
+
+	-- HideTutorialButtons()
 end)
diff --git a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/UIWidgets.lua b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/UIWidgets.lua
index 50714ef4..0565f61a 100644
--- a/KkthnxUI/Modules/Skins/Blizzard/FrameXML/UIWidgets.lua
+++ b/KkthnxUI/Modules/Skins/Blizzard/FrameXML/UIWidgets.lua
@@ -179,21 +179,21 @@ tinsert(C.defaultThemes, function()
 	hooksecurefunc(_G.ObjectiveTrackerUIWidgetContainer, "UpdateWidgetLayout", ReskinPowerBarWidget)
 	ReskinPowerBarWidget(_G.ObjectiveTrackerUIWidgetContainer)
 
-	hooksecurefunc(_G.TopScenarioWidgetContainerBlock.WidgetContainer, "UpdateWidgetLayout", ReskinPowerBarWidget)
-
-	hooksecurefunc(_G.BottomScenarioWidgetContainerBlock.WidgetContainer, "UpdateWidgetLayout", function(self)
-		if not self.widgetFrames then
-			return
-		end
-
-		for _, widgetFrame in pairs(self.widgetFrames) do
-			if widgetFrame.widgetType == Type_SpellDisplay then
-				if not widgetFrame:IsForbidden() then
-					ReskinSpellDisplayWidget(widgetFrame.Spell)
-				end
-			end
-		end
-	end)
+	-- hooksecurefunc(_G.TopScenarioWidgetContainerBlock.WidgetContainer, "UpdateWidgetLayout", ReskinPowerBarWidget)
+
+	-- hooksecurefunc(_G.BottomScenarioWidgetContainerBlock.WidgetContainer, "UpdateWidgetLayout", function(self)
+	-- 	if not self.widgetFrames then
+	-- 		return
+	-- 	end
+
+	-- 	for _, widgetFrame in pairs(self.widgetFrames) do
+	-- 		if widgetFrame.widgetType == Type_SpellDisplay then
+	-- 			if not widgetFrame:IsForbidden() then
+	-- 				ReskinSpellDisplayWidget(widgetFrame.Spell)
+	-- 			end
+	-- 		end
+	-- 	end
+	-- end)
 
 	-- if font outline enabled in tooltip, fix text shows in two lines on Torghast info
 	hooksecurefunc(_G.UIWidgetTemplateTextWithStateMixin, "Setup", function(self)
diff --git a/KkthnxUI/Modules/UnitFrames/Plugins/oUF_GCD.lua b/KkthnxUI/Modules/UnitFrames/Plugins/oUF_GCD.lua
index 735edf34..3e668690 100644
--- a/KkthnxUI/Modules/UnitFrames/Plugins/oUF_GCD.lua
+++ b/KkthnxUI/Modules/UnitFrames/Plugins/oUF_GCD.lua
@@ -26,7 +26,7 @@ end
 
 local function Update(self)
 	local bar = self.GCD
-	local start, dur = GetSpellCooldown(61304)
+	local start, dur = C_Spell.GetSpellCooldown(61304)
 	if dur and dur > 0 and dur <= 2 then
 		bar:Show()
 		usingspell = 1
diff --git a/KkthnxUI/Modules/UnitFrames/Plugins/oUF_Swing.lua b/KkthnxUI/Modules/UnitFrames/Plugins/oUF_Swing.lua
index f2c5eb99..97de8c41 100644
--- a/KkthnxUI/Modules/UnitFrames/Plugins/oUF_Swing.lua
+++ b/KkthnxUI/Modules/UnitFrames/Plugins/oUF_Swing.lua
@@ -59,7 +59,7 @@ do
 	local checkelapsed = 0
 	local slamelapsed = 0
 	local slamtime = 0
-	local slam = GetSpellInfo(1464)
+	local slam = C_Spell.GetSpellInfo(1464)
 	function OnDurationUpdate(self, elapsed)
 		local now = GetTime()