diff --git a/BossData.lua b/BossData.lua
index 62f420d..6f1234f 100755
--- a/BossData.lua
+++ b/BossData.lua
@@ -185,11 +185,16 @@ function AddShadowlands()
 	local criteria = {
 		level = 60
 	}
+	local antrosCriteria = {
+		['Alliance'] = 64230,
+		['Horde'] = 64230
+	}
 
 	category.name = _G["EXPANSION_NAME8"]
 	category.title = category.name.." "..L["Bosses"]
 	category.expansion = 8
 	category.bosses = {
+            GetWorldBoss({worldQuestID = 65143, encounterID = 2468, prerequisite = antrosCriteria }),		-- Antros
 		GetWorldBoss({worldQuestID = 61813, encounterID = 2430, prerequisite = criteria }),		-- Valinor, the Light of Eons
 		GetWorldBoss({worldQuestID = 61816, encounterID = 2431, prerequisite = criteria }),		-- Mortanis
 		GetWorldBoss({worldQuestID = 61815, encounterID = 2432, prerequisite = criteria }),		-- Oranonomos, the Everbreaching
diff --git a/Libs/Ace3.lua b/Libs/Ace3.lua
new file mode 100644
index 0000000..3461a23
--- /dev/null
+++ b/Libs/Ace3.lua
@@ -0,0 +1,110 @@
+
+-- This file is only there in standalone Ace3 and provides handy dev tool stuff I guess
+-- for now only /rl to reload your UI :)
+-- note the complete overkill use of AceAddon and console, ain't it cool?
+
+-- GLOBALS: next, loadstring, ReloadUI, geterrorhandler
+-- GLOBALS: BINDING_HEADER_ACE3, BINDING_NAME_RELOADUI, Ace3, LibStub
+
+-- BINDINGs labels
+BINDING_HEADER_ACE3 = "Ace3"
+BINDING_NAME_RELOADUI = "ReloadUI"
+--
+
+local gui = LibStub("AceGUI-3.0")
+local reg = LibStub("AceConfigRegistry-3.0")
+local dialog = LibStub("AceConfigDialog-3.0")
+
+Ace3 = LibStub("AceAddon-3.0"):NewAddon("Ace3", "AceConsole-3.0")
+local Ace3 = Ace3
+
+local selectedgroup
+local frame
+local select
+local status = {}
+local configs = {}
+
+local function frameOnClose()
+	gui:Release(frame)
+	frame = nil
+end
+
+local function RefreshConfigs()
+	for name in reg:IterateOptionsTables() do
+		configs[name] = name
+	end
+end
+
+local function ConfigSelected(widget, event, value)
+	selectedgroup = value
+	dialog:Open(value, widget)
+end
+
+local old_CloseSpecialWindows
+
+-- GLOBALS: CloseSpecialWindows, next
+function Ace3:Open()
+	if not old_CloseSpecialWindows then
+		old_CloseSpecialWindows = CloseSpecialWindows
+		CloseSpecialWindows = function()
+			local found = old_CloseSpecialWindows()
+			if frame then
+				frame:Hide()
+				return true
+			end
+			return found
+		end
+	end
+	RefreshConfigs()
+	if next(configs) == nil then
+		self:Print("No Configs are Registered")
+		return
+	end
+
+	if not frame then
+		frame = gui:Create("Frame")
+		frame:ReleaseChildren()
+		frame:SetTitle("Ace3 Options")
+		frame:SetLayout("FILL")
+		frame:SetCallback("OnClose", frameOnClose)
+
+		select = gui:Create("DropdownGroup")
+		select:SetGroupList(configs)
+		select:SetCallback("OnGroupSelected", ConfigSelected)
+		frame:AddChild(select)
+	end
+	if not selectedgroup then
+		selectedgroup = next(configs)
+	end
+	select:SetGroup(selectedgroup)
+	frame:Show()
+end
+
+local function RefreshOnUpdate(this)
+	select:SetGroup(selectedgroup)
+	this:SetScript("OnUpdate", nil)
+end
+
+function Ace3:ConfigTableChanged(event, appName)
+	if selectedgroup == appName and frame then
+		frame.frame:SetScript("OnUpdate", RefreshOnUpdate)
+	end
+end
+
+reg.RegisterCallback(Ace3, "ConfigTableChange", "ConfigTableChanged")
+
+function Ace3:PrintCmd(input)
+	input = input:trim():match("^(.-);*$")
+	local func, err = loadstring("LibStub(\"AceConsole-3.0\"):Print(" .. input .. ")")
+	if not func then
+		LibStub("AceConsole-3.0"):Print("Error: " .. err)
+	else
+		func()
+	end
+end
+
+function Ace3:OnInitialize()
+	self:RegisterChatCommand("ace3", function() self:Open() end)
+	self:RegisterChatCommand("rl", function() ReloadUI() end)
+	self:RegisterChatCommand("print", "PrintCmd")
+end
diff --git a/Libs/Ace3.toc b/Libs/Ace3.toc
new file mode 100644
index 0000000..5619a0a
--- /dev/null
+++ b/Libs/Ace3.toc
@@ -0,0 +1,28 @@
+## Interface: 90200
+
+## Title: Lib: Ace3
+## Notes: AddOn development framework
+## Author: Ace3 Development Team
+## X-Website: http://www.wowace.com
+## X-Category: Library
+## X-License: Limited BSD
+## Version: Release-r1259
+
+LibStub\LibStub.lua
+CallbackHandler-1.0\CallbackHandler-1.0.xml
+AceAddon-3.0\AceAddon-3.0.xml
+AceEvent-3.0\AceEvent-3.0.xml
+AceTimer-3.0\AceTimer-3.0.xml
+AceBucket-3.0\AceBucket-3.0.xml
+AceHook-3.0\AceHook-3.0.xml
+AceDB-3.0\AceDB-3.0.xml
+AceDBOptions-3.0\AceDBOptions-3.0.xml
+AceLocale-3.0\AceLocale-3.0.xml
+AceConsole-3.0\AceConsole-3.0.xml
+AceGUI-3.0\AceGUI-3.0.xml
+AceConfig-3.0\AceConfig-3.0.xml
+AceComm-3.0\AceComm-3.0.xml
+AceTab-3.0\AceTab-3.0.xml
+AceSerializer-3.0\AceSerializer-3.0.xml
+
+Ace3.lua
diff --git a/Libs/AceAddon-3.0/AceAddon-3.0.lua b/Libs/AceAddon-3.0/AceAddon-3.0.lua
index 4e3b40b..1b63bd1 100755
--- a/Libs/AceAddon-3.0/AceAddon-3.0.lua
+++ b/Libs/AceAddon-3.0/AceAddon-3.0.lua
@@ -28,9 +28,9 @@
 -- end
 -- @class file
 -- @name AceAddon-3.0.lua
--- @release $Id: AceAddon-3.0.lua 980 2010-10-27 14:20:11Z nevcairiel $
+-- @release $Id: AceAddon-3.0.lua 1238 2020-08-28 16:18:42Z nevcairiel $
 
-local MAJOR, MINOR = "AceAddon-3.0", 10
+local MAJOR, MINOR = "AceAddon-3.0", 13
 local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceAddon then return end -- No Upgrade needed.
@@ -62,43 +62,12 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-
-		return dispatch
-	]]
-
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
-
 local function safecall(func, ...)
 	-- we check to see if the func is passed is actually a function here and don't error when it isn't
 	-- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not
 	-- present execution should continue without hinderance
 	if type(func) == "function" then
-		return Dispatchers[select('#', ...)](func, ...)
+		return xpcall(func, errorhandler, ...)
 	end
 end
 
@@ -108,6 +77,16 @@ local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule,
 -- used in the addon metatable
 local function addontostring( self ) return self.name end
 
+-- Check if the addon is queued for initialization
+local function queuedForInitialization(addon)
+	for i = 1, #AceAddon.initializequeue do
+		if AceAddon.initializequeue[i] == addon then
+			return true
+		end
+	end
+	return false
+end
+
 --- Create a new AceAddon-3.0 addon.
 -- Any libraries you specified will be embeded, and the addon will be scheduled for
 -- its OnInitialize and OnEnable callbacks.
@@ -314,7 +293,12 @@ end
 -- MyModule:Enable()
 function Enable(self)
 	self:SetEnabledState(true)
-	return AceAddon:EnableAddon(self)
+
+	-- nevcairiel 2013-04-27: don't enable an addon/module if its queued for init still
+	-- it'll be enabled after the init process
+	if not queuedForInitialization(self) then
+		return AceAddon:EnableAddon(self)
+	end
 end
 
 --- Disables the Addon, if possible, return true or false depending on success.
@@ -617,9 +601,20 @@ function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
 function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
 function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
 
+-- Blizzard AddOns which can load very early in the loading process and mess with Ace3 addon loading
+local BlizzardEarlyLoadAddons = {
+	Blizzard_DebugTools = true,
+	Blizzard_TimeManager = true,
+	Blizzard_BattlefieldMap = true,
+	Blizzard_MapCanvas = true,
+	Blizzard_SharedMapDataProviders = true,
+	Blizzard_CombatLog = true,
+}
+
 -- Event Handling
 local function onEvent(this, event, arg1)
-	if event == "ADDON_LOADED" or event == "PLAYER_LOGIN" then
+	-- 2020-08-28 nevcairiel - ignore the load event of Blizzard addons which occur early in the loading process
+	if (event == "ADDON_LOADED"  and (arg1 == nil or not BlizzardEarlyLoadAddons[arg1])) or event == "PLAYER_LOGIN" then
 		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
 		while(#AceAddon.initializequeue > 0) do
 			local addon = tremove(AceAddon.initializequeue, 1)
diff --git a/Libs/AceAddon-3.0/AceAddon-3.0.xml b/Libs/AceAddon-3.0/AceAddon-3.0.xml
index e6ad639..dcf24c7 100755
--- a/Libs/AceAddon-3.0/AceAddon-3.0.xml
+++ b/Libs/AceAddon-3.0/AceAddon-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceAddon-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceBucket-3.0/AceBucket-3.0.lua b/Libs/AceBucket-3.0/AceBucket-3.0.lua
new file mode 100644
index 0000000..514c05e
--- /dev/null
+++ b/Libs/AceBucket-3.0/AceBucket-3.0.lua
@@ -0,0 +1,264 @@
+--- A bucket to catch events in. **AceBucket-3.0** provides throttling of events that fire in bursts and
+-- your addon only needs to know about the full burst.
+--
+-- This Bucket implementation works as follows:\\
+--   Initially, no schedule is running, and its waiting for the first event to happen.\\
+--   The first event will start the bucket, and get the scheduler running, which will collect all
+--   events in the given interval. When that interval is reached, the bucket is pushed to the
+--   callback and a new schedule is started. When a bucket is empty after its interval, the scheduler is
+--   stopped, and the bucket is only listening for the next event to happen, basically back in its initial state.
+--
+-- In addition, the buckets collect information about the "arg1" argument of the events that fire, and pass those as a
+-- table to your callback. This functionality was mostly designed for the UNIT_* events.\\
+-- The table will have the different values of "arg1" as keys, and the number of occurances as their value, e.g.\\
+--   { ["player"] = 2, ["target"] = 1, ["party1"] = 1 }
+--
+-- **AceBucket-3.0** can be embeded into your addon, either explicitly by calling AceBucket:Embed(MyAddon) or by
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceBucket itself.\\
+-- It is recommended to embed AceBucket, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceBucket.
+-- @usage
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("BucketExample", "AceBucket-3.0")
+--
+-- function MyAddon:OnEnable()
+--   -- Register a bucket that listens to all the HP related events,
+--   -- and fires once per second
+--   self:RegisterBucketEvent({"UNIT_HEALTH", "UNIT_MAXHEALTH"}, 1, "UpdateHealth")
+-- end
+--
+-- function MyAddon:UpdateHealth(units)
+--   if units.player then
+--     print("Your HP changed!")
+--   end
+-- end
+-- @class file
+-- @name AceBucket-3.0.lua
+-- @release $Id: AceBucket-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+
+local MAJOR, MINOR = "AceBucket-3.0", 4
+local AceBucket, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceBucket then return end -- No Upgrade needed
+
+AceBucket.buckets = AceBucket.buckets or {}
+AceBucket.embeds = AceBucket.embeds or {}
+
+-- the libraries will be lazyly bound later, to avoid errors due to loading order issues
+local AceEvent, AceTimer
+
+-- Lua APIs
+local tconcat = table.concat
+local type, next, pairs, select = type, next, pairs, select
+local tonumber, tostring, rawset = tonumber, tostring, rawset
+local assert, loadstring, error = assert, loadstring, error
+
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, geterrorhandler
+
+local bucketCache = setmetatable({}, {__mode='k'})
+
+--[[
+	 xpcall safecall implementation
+]]
+local xpcall = xpcall
+
+local function errorhandler(err)
+	return geterrorhandler()(err)
+end
+
+local function safecall(func, ...)
+	if func then
+		return xpcall(func, errorhandler, ...)
+	end
+end
+
+-- FireBucket ( bucket )
+--
+-- send the bucket to the callback function and schedule the next FireBucket in interval seconds
+local function FireBucket(bucket)
+	local received = bucket.received
+
+	-- we dont want to fire empty buckets
+	if next(received) ~= nil then
+		local callback = bucket.callback
+		if type(callback) == "string" then
+			safecall(bucket.object[callback], bucket.object, received)
+		else
+			safecall(callback, received)
+		end
+
+		for k in pairs(received) do
+			received[k] = nil
+		end
+
+		-- if the bucket was not empty, schedule another FireBucket in interval seconds
+		bucket.timer = AceTimer.ScheduleTimer(bucket, FireBucket, bucket.interval, bucket)
+	else -- if it was empty, clear the timer and wait for the next event
+		bucket.timer = nil
+	end
+end
+
+-- BucketHandler ( event, arg1 )
+--
+-- callback func for AceEvent
+-- stores arg1 in the received table, and schedules the bucket if necessary
+local function BucketHandler(self, event, arg1)
+	if arg1 == nil then
+		arg1 = "nil"
+	end
+
+	self.received[arg1] = (self.received[arg1] or 0) + 1
+
+	-- if we are not scheduled yet, start a timer on the interval for our bucket to be cleared
+	if not self.timer then
+		self.timer = AceTimer.ScheduleTimer(self, FireBucket, self.interval, self)
+	end
+end
+
+-- RegisterBucket( event, interval, callback, isMessage )
+--
+-- event(string or table) - the event, or a table with the events, that this bucket listens to
+-- interval(int) - time between bucket fireings
+-- callback(func or string) - function pointer, or method name of the object, that gets called when the bucket is cleared
+-- isMessage(boolean) - register AceEvent Messages instead of game events
+local function RegisterBucket(self, event, interval, callback, isMessage)
+	-- try to fetch the librarys
+	if not AceEvent or not AceTimer then
+		AceEvent = LibStub:GetLibrary("AceEvent-3.0", true)
+		AceTimer = LibStub:GetLibrary("AceTimer-3.0", true)
+		if not AceEvent or not AceTimer then
+			error(MAJOR .. " requires AceEvent-3.0 and AceTimer-3.0", 3)
+		end
+	end
+
+	if type(event) ~= "string" and type(event) ~= "table" then error("Usage: RegisterBucket(event, interval, callback): 'event' - string or table expected.", 3) end
+	if not callback then
+		if type(event) == "string" then
+			callback = event
+		else
+			error("Usage: RegisterBucket(event, interval, callback): cannot omit callback when event is not a string.", 3)
+		end
+	end
+	if not tonumber(interval) then error("Usage: RegisterBucket(event, interval, callback): 'interval' - number expected.", 3) end
+	if type(callback) ~= "string" and type(callback) ~= "function" then error("Usage: RegisterBucket(event, interval, callback): 'callback' - string or function or nil expected.", 3) end
+	if type(callback) == "string" and type(self[callback]) ~= "function" then error("Usage: RegisterBucket(event, interval, callback): 'callback' - method not found on target object.", 3) end
+
+	local bucket = next(bucketCache)
+	if bucket then
+		bucketCache[bucket] = nil
+	else
+		bucket = { handler = BucketHandler, received = {} }
+	end
+	bucket.object, bucket.callback, bucket.interval = self, callback, tonumber(interval)
+
+	local regFunc = isMessage and AceEvent.RegisterMessage or AceEvent.RegisterEvent
+
+	if type(event) == "table" then
+		for _,e in pairs(event) do
+			regFunc(bucket, e, "handler")
+		end
+	else
+		regFunc(bucket, event, "handler")
+	end
+
+	local handle = tostring(bucket)
+	AceBucket.buckets[handle] = bucket
+
+	return handle
+end
+
+--- Register a Bucket for an event (or a set of events)
+-- @param event The event to listen for, or a table of events.
+-- @param interval The Bucket interval (burst interval)
+-- @param callback The callback function, either as a function reference, or a string pointing to a method of the addon object.
+-- @return The handle of the bucket (for unregistering)
+-- @usage
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceBucket-3.0")
+-- MyAddon:RegisterBucketEvent("BAG_UPDATE", 0.2, "UpdateBags")
+--
+-- function MyAddon:UpdateBags()
+--   -- do stuff
+-- end
+function AceBucket:RegisterBucketEvent(event, interval, callback)
+	return RegisterBucket(self, event, interval, callback, false)
+end
+
+--- Register a Bucket for an AceEvent-3.0 addon message (or a set of messages)
+-- @param message The message to listen for, or a table of messages.
+-- @param interval The Bucket interval (burst interval)
+-- @param callback The callback function, either as a function reference, or a string pointing to a method of the addon object.
+-- @return The handle of the bucket (for unregistering)
+-- @usage
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceBucket-3.0")
+-- MyAddon:RegisterBucketEvent("SomeAddon_InformationMessage", 0.2, "ProcessData")
+--
+-- function MyAddon:ProcessData()
+--   -- do stuff
+-- end
+function AceBucket:RegisterBucketMessage(message, interval, callback)
+	return RegisterBucket(self, message, interval, callback, true)
+end
+
+--- Unregister any events and messages from the bucket and clear any remaining data.
+-- @param handle The handle of the bucket as returned by RegisterBucket*
+function AceBucket:UnregisterBucket(handle)
+	local bucket = AceBucket.buckets[handle]
+	if bucket then
+		AceEvent.UnregisterAllEvents(bucket)
+		AceEvent.UnregisterAllMessages(bucket)
+
+		-- clear any remaining data in the bucket
+		for k in pairs(bucket.received) do
+			bucket.received[k] = nil
+		end
+
+		if bucket.timer then
+			AceTimer.CancelTimer(bucket, bucket.timer)
+			bucket.timer = nil
+		end
+
+		AceBucket.buckets[handle] = nil
+		-- store our bucket in the cache
+		bucketCache[bucket] = true
+	end
+end
+
+--- Unregister all buckets of the current addon object (or custom "self").
+function AceBucket:UnregisterAllBuckets()
+	-- hmm can we do this more efficient? (it is not done often so shouldn't matter much)
+	for handle, bucket in pairs(AceBucket.buckets) do
+		if bucket.object == self then
+			AceBucket.UnregisterBucket(self, handle)
+		end
+	end
+end
+
+
+
+-- embedding and embed handling
+local mixins = {
+	"RegisterBucketEvent",
+	"RegisterBucketMessage",
+	"UnregisterBucket",
+	"UnregisterAllBuckets",
+}
+
+-- Embeds AceBucket into the target object making the functions from the mixins list available on target:..
+-- @param target target object to embed AceBucket in
+function AceBucket:Embed( target )
+	for _, v in pairs( mixins ) do
+		target[v] = self[v]
+	end
+	self.embeds[target] = true
+	return target
+end
+
+function AceBucket:OnEmbedDisable( target )
+	target:UnregisterAllBuckets()
+end
+
+for addon in pairs(AceBucket.embeds) do
+	AceBucket:Embed(addon)
+end
diff --git a/Libs/AceBucket-3.0/AceBucket-3.0.xml b/Libs/AceBucket-3.0/AceBucket-3.0.xml
new file mode 100644
index 0000000..06ab712
--- /dev/null
+++ b/Libs/AceBucket-3.0/AceBucket-3.0.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="AceBucket-3.0.lua"/>
+</Ui>
diff --git a/Libs/AceComm-3.0/AceComm-3.0.lua b/Libs/AceComm-3.0/AceComm-3.0.lua
index 9a38979..242d92c 100755
--- a/Libs/AceComm-3.0/AceComm-3.0.lua
+++ b/Libs/AceComm-3.0/AceComm-3.0.lua
@@ -2,14 +2,14 @@
 -- It'll automatically split the messages into multiple parts and rebuild them on the receiving end.\\
 -- **ChatThrottleLib** is of course being used to avoid being disconnected by the server.
 --
--- **AceComm-3.0** can be embeded into your addon, either explicitly by calling AceComm:Embed(MyAddon) or by 
+-- **AceComm-3.0** can be embeded into your addon, either explicitly by calling AceComm:Embed(MyAddon) or by
 -- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
 -- and can be accessed directly, without having to explicitly call AceComm itself.\\
 -- It is recommended to embed AceComm, otherwise you'll have to specify a custom `self` on all calls you
 -- make into AceComm.
 -- @class file
 -- @name AceComm-3.0
--- @release $Id: AceComm-3.0.lua 1174 2018-05-14 17:29:49Z h.leppkes@gmail.com $
+-- @release $Id: AceComm-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 
 --[[ AceComm-3.0
 
@@ -52,7 +52,7 @@ AceComm.multipart_origprefixes = nil
 AceComm.multipart_reassemblers = nil
 
 -- the multipart message spool: indexed by a combination of sender+distribution+
-AceComm.multipart_spool = AceComm.multipart_spool or {} 
+AceComm.multipart_spool = AceComm.multipart_spool or {}
 
 --- Register for Addon Traffic on a specified prefix
 -- @param prefix A printable character (\032-\255) classification of the message (typically AddonName or AddonNameEvent), max 16 characters
@@ -90,7 +90,7 @@ function AceComm:SendCommMessage(prefix, text, distribution, target, prio, callb
 			type(text)=="string" and
 			type(distribution)=="string" and
 			(target==nil or type(target)=="string" or type(target)=="number") and
-			(prio=="BULK" or prio=="NORMAL" or prio=="ALERT") 
+			(prio=="BULK" or prio=="NORMAL" or prio=="ALERT")
 		) then
 		error('Usage: SendCommMessage(addon, "prefix", "text", "distribution"[, "target"[, "prio"[, callbackFn, callbackarg]]])', 2)
 	end
@@ -105,7 +105,7 @@ function AceComm:SendCommMessage(prefix, text, distribution, target, prio, callb
 			return callbackFn(callbackArg, sent, textlen)
 		end
 	end
-	
+
 	local forceMultipart
 	if match(text, "^[\001-\009]") then -- 4.1+: see if the first character is a control character
 		-- we need to escape the first character with a \004
@@ -150,17 +150,17 @@ do
 	local compost = setmetatable({}, {__mode = "k"})
 	local function new()
 		local t = next(compost)
-		if t then 
+		if t then
 			compost[t]=nil
 			for i=#t,3,-1 do	-- faster than pairs loop. don't even nil out 1/2 since they'll be overwritten
 				t[i]=nil
 			end
 			return t
 		end
-		
+
 		return {}
 	end
-	
+
 	local function lostdatawarning(prefix,sender,where)
 		DEFAULT_CHAT_FRAME:AddMessage(MAJOR..": Warning: lost network data regarding '"..tostring(prefix).."' from '"..tostring(sender).."' (in "..where..")")
 	end
@@ -168,14 +168,14 @@ do
 	function AceComm:OnReceiveMultipartFirst(prefix, message, distribution, sender)
 		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
 		local spool = AceComm.multipart_spool
-		
+
 		--[[
-		if spool[key] then 
+		if spool[key] then
 			lostdatawarning(prefix,sender,"First")
 			-- continue and overwrite
 		end
 		--]]
-		
+
 		spool[key] = message  -- plain string for now
 	end
 
@@ -183,7 +183,7 @@ do
 		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
 		local spool = AceComm.multipart_spool
 		local olddata = spool[key]
-		
+
 		if not olddata then
 			--lostdatawarning(prefix,sender,"Next")
 			return
@@ -204,14 +204,14 @@ do
 		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
 		local spool = AceComm.multipart_spool
 		local olddata = spool[key]
-		
+
 		if not olddata then
 			--lostdatawarning(prefix,sender,"End")
 			return
 		end
 
 		spool[key] = nil
-		
+
 		if type(olddata) == "table" then
 			-- if we've received a "next", the spooled data will be a table for rapid & garbage-free tconcat
 			tinsert(olddata, message)
diff --git a/Libs/AceComm-3.0/ChatThrottleLib.lua b/Libs/AceComm-3.0/ChatThrottleLib.lua
index 01088f6..d1dd8a0 100755
--- a/Libs/AceComm-3.0/ChatThrottleLib.lua
+++ b/Libs/AceComm-3.0/ChatThrottleLib.lua
@@ -3,7 +3,7 @@
 --
 -- Manages AddOn chat output to keep player from getting kicked off.
 --
--- ChatThrottleLib:SendChatMessage/:SendAddonMessage functions that accept 
+-- ChatThrottleLib:SendChatMessage/:SendAddonMessage functions that accept
 -- a Priority ("BULK", "NORMAL", "ALERT") as well as prefix for SendChatMessage.
 --
 -- Priorities get an equal share of available bandwidth when fully loaded.
@@ -75,7 +75,7 @@ local next = next
 local strlen = string.len
 local GetFramerate = GetFramerate
 local strlower = string.lower
-local unpack,type,pairs,wipe = unpack,type,pairs,wipe
+local unpack,type,pairs,wipe = unpack,type,pairs,table.wipe
 local UnitInRaid,UnitInParty = UnitInRaid,UnitInParty
 
 
@@ -118,7 +118,7 @@ end
 
 
 -----------------------------------------------------------------------
--- Recycling bin for pipes 
+-- Recycling bin for pipes
 -- A pipe is a plain integer-indexed queue of messages
 -- Pipes normally live in Rings of pipes  (3 rings total, one per priority)
 
@@ -169,7 +169,7 @@ end
 -- Initialize queues, set up frame for OnUpdate, etc
 
 
-function ChatThrottleLib:Init()	
+function ChatThrottleLib:Init()
 
 	-- Set up queues
 	if not self.Prio then
@@ -356,8 +356,8 @@ function ChatThrottleLib.OnUpdate(this,delay)
 	-- See how many of our priorities have queued messages (we only have 3, don't worry about the loop)
 	local n = 0
 	for prioname,Prio in pairs(self.Prio) do
-		if Prio.Ring.pos or Prio.avail < 0 then 
-			n = n + 1 
+		if Prio.Ring.pos or Prio.avail < 0 then
+			n = n + 1
 		end
 	end
 
diff --git a/Libs/AceConfig-3.0/AceConfig-3.0.lua b/Libs/AceConfig-3.0/AceConfig-3.0.lua
index 3bedf8c..5071cdc 100755
--- a/Libs/AceConfig-3.0/AceConfig-3.0.lua
+++ b/Libs/AceConfig-3.0/AceConfig-3.0.lua
@@ -3,7 +3,7 @@
 -- as well as associate it with a slash command.
 -- @class file
 -- @name AceConfig-3.0
--- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $
+-- @release $Id: AceConfig-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 
 --[[
 AceConfig-3.0
@@ -12,13 +12,14 @@ Very light wrapper library that combines all the AceConfig subcomponents into on
 
 ]]
 
-local MAJOR, MINOR = "AceConfig-3.0", 2
+local cfgreg = LibStub("AceConfigRegistry-3.0")
+local cfgcmd = LibStub("AceConfigCmd-3.0")
+
+local MAJOR, MINOR = "AceConfig-3.0", 3
 local AceConfig = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfig then return end
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local cfgcmd = LibStub("AceConfigCmd-3.0")
 --TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true)
 --TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true)
 
@@ -44,7 +45,7 @@ local pcall, error, type, pairs = pcall, error, type, pairs
 function AceConfig:RegisterOptionsTable(appName, options, slashcmd)
 	local ok,msg = pcall(cfgreg.RegisterOptionsTable, self, appName, options)
 	if not ok then error(msg, 2) end
-	
+
 	if slashcmd then
 		if type(slashcmd) == "table" then
 			for _,cmd in pairs(slashcmd) do
diff --git a/Libs/AceConfig-3.0/AceConfig-3.0.xml b/Libs/AceConfig-3.0/AceConfig-3.0.xml
index 87972ad..a3569b7 100755
--- a/Libs/AceConfig-3.0/AceConfig-3.0.xml
+++ b/Libs/AceConfig-3.0/AceConfig-3.0.xml
@@ -5,4 +5,4 @@
 	<Include file="AceConfigDialog-3.0\AceConfigDialog-3.0.xml"/>
 	<!--<Include file="AceConfigDropdown-3.0\AceConfigDropdown-3.0.xml"/>-->
 	<Script file="AceConfig-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
index e764a99..5113875 100755
--- a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
+++ b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
@@ -1,7 +1,7 @@
 --- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
 -- @class file
 -- @name AceConfigCmd-3.0
--- @release $Id: AceConfigCmd-3.0.lua 904 2009-12-13 11:56:37Z nevcairiel $
+-- @release $Id: AceConfigCmd-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 
 --[[
 AceConfigCmd-3.0
@@ -14,8 +14,9 @@ REQUIRES: AceConsole-3.0 for command registration (loaded on demand)
 
 -- TODO: plugin args
 
+local cfgreg = LibStub("AceConfigRegistry-3.0")
 
-local MAJOR, MINOR = "AceConfigCmd-3.0", 12
+local MAJOR, MINOR = "AceConfigCmd-3.0", 14
 local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigCmd then return end
@@ -23,7 +24,6 @@ if not AceConfigCmd then return end
 AceConfigCmd.commands = AceConfigCmd.commands or {}
 local commands = AceConfigCmd.commands
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
 local AceConsole -- LoD
 local AceConsoleName = "AceConsole-3.0"
 
@@ -63,7 +63,7 @@ local funcmsg = "expected function or member name"
 
 -- pickfirstset() - picks the first non-nil value and returns it
 
-local function pickfirstset(...)	
+local function pickfirstset(...)
 	for i=1,select("#",...) do
 		if select(i,...)~=nil then
 			return select(i,...)
@@ -120,7 +120,7 @@ local function callfunction(info, tab, methodtype, ...)
 	info.arg = tab.arg
 	info.option = tab
 	info.type = tab.type
-	
+
 	if type(method)=="function" then
 		return method(info, ...)
 	else
@@ -131,7 +131,7 @@ end
 -- do_final() - do the final step (set/execute) along with validation and confirmation
 
 local function do_final(info, inputpos, tab, methodtype, ...)
-	if info.validate then 
+	if info.validate then
 		local res = callmethod(info,inputpos,tab,"validate",...)
 		if type(res)=="string" then
 			usererr(info, inputpos, "'"..strsub(info.input, inputpos).."' - "..res)
@@ -139,7 +139,7 @@ local function do_final(info, inputpos, tab, methodtype, ...)
 		end
 	end
 	-- console ignores .confirm
-	
+
 	callmethod(info,inputpos,tab,methodtype, ...)
 end
 
@@ -152,8 +152,8 @@ local function getparam(info, inputpos, tab, depth, paramname, types, errormsg)
 	if val~=nil then
 		if val==false then
 			val=nil
-		elseif not types[type(val)] then 
-			err(info, inputpos, "'" .. paramname.. "' - "..errormsg) 
+		elseif not types[type(val)] then
+			err(info, inputpos, "'" .. paramname.. "' - "..errormsg)
 		end
 		info[paramname] = val
 		info[paramname.."_at"] = depth
@@ -166,13 +166,13 @@ end
 local dummytable={}
 
 local function iterateargs(tab)
-	if not tab.plugins then 
-		return pairs(tab.args) 
+	if not tab.plugins then
+		return pairs(tab.args)
 	end
-	
+
 	local argtabkey,argtab=next(tab.plugins)
 	local v
-	
+
 	return function(_, k)
 		while argtab do
 			k,v = next(argtab, k)
@@ -206,18 +206,18 @@ local function showhelp(info, inputpos, tab, depth, noHead)
 	if not noHead then
 		print("|cff33ff99"..info.appName.."|r: Arguments to |cffffff78/"..info[0].."|r "..strsub(info.input,1,inputpos-1)..":")
 	end
-	
+
 	local sortTbl = {}	-- [1..n]=name
 	local refTbl = {}   -- [name]=tableref
-	
+
 	for k,v in iterateargs(tab) do
 		if not refTbl[k] then	-- a plugin overriding something in .args
 			tinsert(sortTbl, k)
 			refTbl[k] = v
 		end
 	end
-	
-	tsort(sortTbl, function(one, two) 
+
+	tsort(sortTbl, function(one, two)
 		local o1 = refTbl[one].order or 100
 		local o2 = refTbl[two].order or 100
 		if type(o1) == "function" or type(o1) == "string" then
@@ -240,7 +240,7 @@ local function showhelp(info, inputpos, tab, depth, noHead)
 		if o1==o2 then return tostring(one)<tostring(two) end   -- compare names
 		return o1<o2
 	end)
-	
+
 	for i = 1, #sortTbl do
 		local k = sortTbl[i]
 		local v = refTbl[k]
@@ -327,7 +327,7 @@ local function keybindingValidateFunc(text)
 	return s
 end
 
--- handle() - selfrecursing function that processes input->optiontable 
+-- handle() - selfrecursing function that processes input->optiontable
 -- - depth - starts at 0
 -- - retfalse - return false rather than produce error if a match is not found (used by inlined groups)
 
@@ -346,16 +346,16 @@ local function handle(info, inputpos, tab, depth, retfalse)
 	local oldfunc,oldfunc_at = getparam(info,inputpos,tab,depth,"func",functypes,funcmsg)
 	local oldvalidate,oldvalidate_at = getparam(info,inputpos,tab,depth,"validate",functypes,funcmsg)
 	--local oldconfirm,oldconfirm_at = getparam(info,inputpos,tab,depth,"confirm",functypes,funcmsg)
-	
+
 	-------------------------------------------------------------------
 	-- Act according to .type of this table
-		
+
 	if tab.type=="group" then
 		------------ group --------------------------------------------
-		
+
 		if type(tab.args)~="table" then err(info, inputpos) end
 		if tab.plugins and type(tab.plugins)~="table" then err(info,inputpos) end
-		
+
 		-- grab next arg from input
 		local _,nextpos,arg = (info.input):find(" *([^ ]+) *", inputpos)
 		if not arg then
@@ -363,11 +363,11 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			return
 		end
 		nextpos=nextpos+1
-		
+
 		-- loop .args and try to find a key with a matching name
 		for k,v in iterateargs(tab) do
 			if not(type(k)=="string" and type(v)=="table" and type(v.type)=="string") then err(info,inputpos, "options table child '"..tostring(k).."' is malformed") end
-			
+
 			-- is this child an inline group? if so, traverse into it
 			if v.type=="group" and pickfirstset(v.cmdInline, v.inline, false) then
 				info[depth+1] = k
@@ -383,8 +383,8 @@ local function handle(info, inputpos, tab, depth, retfalse)
 				return handle(info,nextpos,v,depth+1)
 			end
 		end
-			
-		-- no match 
+
+		-- no match
 		if retfalse then
 			-- restore old infotable members and return false to indicate failure
 			info.handler,info.handler_at = oldhandler,oldhandler_at
@@ -395,23 +395,23 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			--info.confirm,info.confirm_at = oldconfirm,oldconfirm_at
 			return false
 		end
-		
+
 		-- couldn't find the command, display error
 		usererr(info, inputpos, "'"..arg.."' - " .. L["unknown argument"])
 		return
 	end
-	
+
 	local str = strsub(info.input,inputpos);
-	
+
 	if tab.type=="execute" then
 		------------ execute --------------------------------------------
 		do_final(info, inputpos, tab, "func")
-		
 
-	
+
+
 	elseif tab.type=="input" then
 		------------ input --------------------------------------------
-		
+
 		local res = true
 		if tab.pattern then
 			if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
@@ -420,11 +420,11 @@ local function handle(info, inputpos, tab, depth, retfalse)
 				return
 			end
 		end
-		
+
 		do_final(info, inputpos, tab, "set", str)
-		
 
-	
+
+
 	elseif tab.type=="toggle" then
 		------------ toggle --------------------------------------------
 		local b
@@ -444,7 +444,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			else
 				b = not b
 			end
-			
+
 		elseif str==L["on"] then
 			b = true
 		elseif str==L["off"] then
@@ -459,9 +459,9 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			end
 			return
 		end
-		
+
 		do_final(info, inputpos, tab, "set", b)
-		
+
 
 	elseif tab.type=="range" then
 		------------ range --------------------------------------------
@@ -481,21 +481,21 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			usererr(info, inputpos, val.." - "..format(L["must be equal to or lower than %s"], tostring(info.max)) )
 			return
 		end
-		
+
 		do_final(info, inputpos, tab, "set", val)
 
-	
+
 	elseif tab.type=="select" then
 		------------ select ------------------------------------
 		local str = strtrim(strlower(str))
-		
+
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
 			info.values = values
 			values = callmethod(info, inputpos, tab, "values")
 			info.values = nil
 		end
-		
+
 		if str == "" then
 			local b = callmethod(info, inputpos, tab, "get")
 			local fmt = "|cffffff78- [%s]|r %s"
@@ -512,7 +512,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		end
 
 		local ok
-		for k,v in pairs(values) do 
+		for k,v in pairs(values) do
 			if strlower(k)==str then
 				str = k	-- overwrite with key (in case of case mismatches)
 				ok = true
@@ -523,20 +523,20 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			usererr(info, inputpos, "'"..str.."' - "..L["unknown selection"])
 			return
 		end
-		
+
 		do_final(info, inputpos, tab, "set", str)
-		
+
 	elseif tab.type=="multiselect" then
 		------------ multiselect -------------------------------------------
 		local str = strtrim(strlower(str))
-		
+
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
 			info.values = values
 			values = callmethod(info, inputpos, tab, "values")
 			info.values = nil
 		end
-		
+
 		if str == "" then
 			local fmt = "|cffffff78- [%s]|r %s"
 			local fmt_sel = "|cffffff78- [%s]|r %s |cffff0000*|r"
@@ -550,7 +550,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			end
 			return
 		end
-		
+
 		--build a table of the selections, checking that they exist
 		--parse for =on =off =default in the process
 		--table will be key = true for options that should toggle, key = [on|off|default] for options to be set
@@ -559,25 +559,25 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			--parse option=on etc
 			local opt, val = v:match('(.+)=(.+)')
 			--get option if toggling
-			if not opt then 
-				opt = v 
+			if not opt then
+				opt = v
 			end
-			
+
 			--check that the opt is valid
 			local ok
-			for k,v in pairs(values) do 
+			for k,v in pairs(values) do
 				if strlower(k)==opt then
 					opt = k	-- overwrite with key (in case of case mismatches)
 					ok = true
 					break
 				end
 			end
-			
+
 			if not ok then
 				usererr(info, inputpos, "'"..opt.."' - "..L["unknown selection"])
 				return
 			end
-			
+
 			--check that if val was supplied it is valid
 			if val then
 				if val == L["on"] or val == L["off"] or (tab.tristate and val == L["default"]) then
@@ -596,14 +596,14 @@ local function handle(info, inputpos, tab, depth, retfalse)
 				sels[opt] = true
 			end
 		end
-		
+
 		for opt, val in pairs(sels) do
 			local newval
-			
+
 			if (val == true) then
 				--toggle the option
 				local b = callmethod(info, inputpos, tab, "get", opt)
-				
+
 				if tab.tristate then
 					--cycle in true, nil, false order
 					if b then
@@ -627,11 +627,11 @@ local function handle(info, inputpos, tab, depth, retfalse)
 					newval = nil
 				end
 			end
-			
+
 			do_final(info, inputpos, tab, "set", opt, newval)
 		end
-					
-		
+
+
 	elseif tab.type=="color" then
 		------------ color --------------------------------------------
 		local str = strtrim(strlower(str))
@@ -639,10 +639,17 @@ local function handle(info, inputpos, tab, depth, retfalse)
 			--TODO: Show current value
 			return
 		end
-		
+
 		local r, g, b, a
-		
-		if tab.hasAlpha then
+
+		local hasAlpha = tab.hasAlpha
+		if type(hasAlpha) == "function" or type(hasAlpha) == "string" then
+			info.hasAlpha = hasAlpha
+			hasAlpha = callmethod(info, inputpos, tab, 'hasAlpha')
+			info.hasAlpha = nil
+		end
+
+		if hasAlpha then
 			if str:len() == 8 and str:find("^%x*$")  then
 				--parse a hex string
 				r,g,b,a = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255, tonumber(str:sub(7, 8), 16) / 255
@@ -655,7 +662,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 				usererr(info, inputpos, format(L["'%s' - expected 'RRGGBBAA' or 'r g b a'."], str))
 				return
 			end
-			
+
 			if r >= 0.0 and r <= 1.0 and g >= 0.0 and g <= 1.0 and b >= 0.0 and b <= 1.0 and a >= 0.0 and a <= 1.0 then
 				--values are valid
 			elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 and a >= 0 and a <= 255 then
@@ -694,7 +701,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 				usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0-1 or 0-255."], str))
 			end
 		end
-		
+
 		do_final(info, inputpos, tab, "set", r,g,b,a)
 
 	elseif tab.type=="keybinding" then
@@ -730,7 +737,7 @@ end
 -- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceConsole-3.0")
 -- -- Use AceConsole-3.0 to register a Chat Command
 -- MyAddon:RegisterChatCommand("mychat", "ChatCommand")
--- 
+--
 -- -- Show the GUI if no input is supplied, otherwise handle the chat input.
 -- function MyAddon:ChatCommand(input)
 --   -- Assuming "MyOptions" is the appName of a valid options table
@@ -747,7 +754,7 @@ function AceConfigCmd:HandleCommand(slashcmd, appName, input)
 		error([[Usage: HandleCommand("slashcmd", "appName", "input"): 'appName' - no options table "]]..tostring(appName)..[[" has been registered]], 2)
 	end
 	local options = assert( optgetter("cmd", MAJOR) )
-	
+
 	local info = {   -- Don't try to recycle this, it gets handed off to callbacks and whatnot
 		[0] = slashcmd,
 		appName = appName,
@@ -758,7 +765,7 @@ function AceConfigCmd:HandleCommand(slashcmd, appName, input)
 		uiType = "cmd",
 		uiName = MAJOR,
 	}
-	
+
 	handle(info, 1, options, 0)  -- (info, inputpos, table, depth)
 end
 
diff --git a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
index 188d354..9e157b5 100755
--- a/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
+++ b/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceConfigCmd-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
index 70c69d4..764f431 100755
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
@@ -1,10 +1,13 @@
 --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
 -- @class file
 -- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 998 2010-12-01 18:39:53Z nevcairiel $
+-- @release $Id: AceConfigDialog-3.0.lua 1255 2021-11-14 09:14:15Z nevcairiel $
 
 local LibStub = LibStub
-local MAJOR, MINOR = "AceConfigDialog-3.0", 54
+local gui = LibStub("AceGUI-3.0")
+local reg = LibStub("AceConfigRegistry-3.0")
+
+local MAJOR, MINOR = "AceConfigDialog-3.0", 82
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -12,25 +15,23 @@ if not AceConfigDialog then return end
 AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
 AceConfigDialog.Status = AceConfigDialog.Status or {}
 AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
+AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate")
 
 AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
 AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
 AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
 
-local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
-
 -- Lua APIs
-local tconcat, tinsert, tsort, tremove = table.concat, table.insert, table.sort, table.remove
+local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
 local strmatch, format = string.match, string.format
-local assert, loadstring, error = assert, loadstring, error
-local pairs, next, select, type, unpack, wipe = pairs, next, select, type, unpack, wipe
-local rawset, tostring, tonumber = rawset, tostring, tonumber
+local error = error
+local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
+local tostring, tonumber = tostring, tonumber
 local math_min, math_max, math_floor = math.min, math.max, math.floor
 
 -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
 -- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
+-- GLOBALS: NORMAL_FONT_COLOR, ACCEPT, CANCEL
 -- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
 -- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
 
@@ -45,39 +46,10 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-
-		return dispatch
-	]]
-
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
-
 local function safecall(func, ...)
-	return Dispatchers[select("#", ...)](func, ...)
+	if func then
+		return xpcall(func, errorhandler, ...)
+	end
 end
 
 local width_multiplier = 170
@@ -85,18 +57,18 @@ local width_multiplier = 170
 --[[
 Group Types
   Tree 	- All Descendant Groups will all become nodes on the tree, direct child options will appear above the tree
-		- Descendant Groups with inline=true and thier children will not become nodes
+        - Descendant Groups with inline=true and thier children will not become nodes
 
   Tab	- Direct Child Groups will become tabs, direct child options will appear above the tab control
-		- Grandchild groups will default to inline unless specified otherwise
+        - Grandchild groups will default to inline unless specified otherwise
 
   Select- Same as Tab but with entries in a dropdown rather than tabs
 
 
   Inline Groups
-	- Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
-	- If declared on a direct child of a root node of a select group, they will appear above the group container control
-	- When a group is displayed inline, all descendants will also be inline members of the group
+    - Will not become nodes of a select group, they will be effectivly part of thier parent group seperated by a border
+    - If declared on a direct child of a root node of a select group, they will appear above the group container control
+    - When a group is displayed inline, all descendants will also be inline members of the group
 
 ]]
 
@@ -325,7 +297,7 @@ local function compareOptions(a,b)
 		return NameA:upper() < NameB:upper()
 	end
 	if OrderA < 0 then
-		if OrderB > 0 then
+		if OrderB >= 0 then
 			return false
 		end
 	else
@@ -533,8 +505,9 @@ local function OptionOnMouseOver(widget, event)
 	local options = user.options
 	local path = user.path
 	local appName = user.appName
+	local tooltip = AceConfigDialog.tooltip
 
-	GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
+	tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
 	local name = GetOptionsMemberValue("name", opt, options, path, appName)
 	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
 	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
@@ -542,23 +515,23 @@ local function OptionOnMouseOver(widget, event)
 
 	if descStyle and descStyle ~= "tooltip" then return end
 
-	GameTooltip:SetText(name, 1, .82, 0, 1)
+	tooltip:SetText(name, 1, .82, 0, true)
 
 	if opt.type == "multiselect" then
-		GameTooltip:AddLine(user.text,0.5, 0.5, 0.8, 1)
+		tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
 	end
 	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, 1)
+		tooltip:AddLine(desc, 1, 1, 1, true)
 	end
 	if type(usage) == "string" then
-		GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, 1)
+		tooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
 	end
 
-	GameTooltip:Show()
+	tooltip:Show()
 end
 
 local function OptionOnMouseLeave(widget, event)
-	GameTooltip:Hide()
+	AceConfigDialog.tooltip:Hide()
 end
 
 local function GetFuncName(option)
@@ -569,45 +542,127 @@ local function GetFuncName(option)
 		return "set"
 	end
 end
-local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
-	if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
-		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
-	end
-	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
-	for k in pairs(t) do
-		t[k] = nil
-	end
-	t.text = message
-	t.button1 = ACCEPT
-	t.button2 = CANCEL
-	local dialog, oldstrata
-	t.OnAccept = function()
-		safecall(func, unpack(t))
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
+do
+	local frame = AceConfigDialog.popup
+	if not frame or oldminor < 81 then
+		frame = CreateFrame("Frame", nil, UIParent)
+		AceConfigDialog.popup = frame
+		frame:Hide()
+		frame:SetPoint("CENTER", UIParent, "CENTER")
+		frame:SetSize(320, 72)
+		frame:EnableMouse(true) -- Do not allow click-through on the frame
+		frame:SetFrameStrata("TOOLTIP")
+		frame:SetFrameLevel(100) -- Lots of room to draw under it
+		frame:SetScript("OnKeyDown", function(self, key)
+			if key == "ESCAPE" then
+				self:SetPropagateKeyboardInput(false)
+				if self.cancel:IsShown() then
+					self.cancel:Click()
+				else -- Showing a validation error
+					self:Hide()
+				end
+			else
+				self:SetPropagateKeyboardInput(true)
+			end
+		end)
+
+		if not frame.SetFixedFrameStrata then -- API capability check (classic check)
+			frame:SetBackdrop({
+				bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
+				edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
+				tile = true,
+				tileSize = 32,
+				edgeSize = 32,
+				insets = { left = 11, right = 11, top = 11, bottom = 11 },
+			})
+		else
+			local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
+			border:SetAllPoints(frame)
+			frame:SetFixedFrameStrata(true)
+			frame:SetFixedFrameLevel(true)
+		end
+
+		local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
+		text:SetSize(290, 0)
+		text:SetPoint("TOP", 0, -16)
+		frame.text = text
+
+		local function newButton(text)
+			local button = CreateFrame("Button", nil, frame)
+			button:SetSize(128, 21)
+			button:SetNormalFontObject(GameFontNormal)
+			button:SetHighlightFontObject(GameFontHighlight)
+			button:SetNormalTexture(130763) -- "Interface\\Buttons\\UI-DialogBox-Button-Up"
+			button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetPushedTexture(130761) -- "Interface\\Buttons\\UI-DialogBox-Button-Down"
+			button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
+			button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
+			button:SetText(text)
+			return button
 		end
+
+		local accept = newButton(ACCEPT)
+		accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+		frame.accept = accept
+
+		local cancel = newButton(CANCEL)
+		cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0)
+		frame.cancel = cancel
+	end
+end
+local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
+	local frame = AceConfigDialog.popup
+	frame:Show()
+	frame.text:SetText(message)
+	-- From StaticPopup.lua
+	-- local height = 32 + text:GetHeight() + 2;
+	-- height = height + 6 + accept:GetHeight()
+	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	local height = 61 + frame.text:GetHeight()
+	frame:SetHeight(height)
+
+	frame.accept:ClearAllPoints()
+	frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+	frame.cancel:Show()
+
+	local t = {...}
+	local tCount = select("#", ...)
+	frame.accept:SetScript("OnClick", function(self)
+		safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table)
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+		frame:Hide()
+		self:SetScript("OnClick", nil)
+		frame.cancel:SetScript("OnClick", nil)
 		del(info)
-	end
-	t.OnCancel = function()
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
+	end)
+	frame.cancel:SetScript("OnClick", function(self)
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
+		frame:Hide()
+		self:SetScript("OnClick", nil)
+		frame.accept:SetScript("OnClick", nil)
 		del(info)
-	end
-	for i = 1, select("#", ...) do
-		t[i] = select(i, ...) or false
-	end
-	t.timeout = 0
-	t.whileDead = 1
-	t.hideOnEscape = 1
+	end)
+end
 
-	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
-	if dialog then
-		oldstrata = dialog:GetFrameStrata()
-		dialog:SetFrameStrata("TOOLTIP")
-	end
+local function validationErrorPopup(message)
+	local frame = AceConfigDialog.popup
+	frame:Show()
+	frame.text:SetText(message)
+	-- From StaticPopup.lua
+	-- local height = 32 + text:GetHeight() + 2;
+	-- height = height + 6 + accept:GetHeight()
+	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	local height = 61 + frame.text:GetHeight()
+	frame:SetHeight(height)
+
+	frame.accept:ClearAllPoints()
+	frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16)
+	frame.cancel:Hide()
+
+	frame.accept:SetScript("OnClick", function()
+		frame:Hide()
+	end)
 end
 
 local function ActivateControl(widget, event, ...)
@@ -695,32 +750,26 @@ local function ActivateControl(widget, event, ...)
 	end
 
 	local rootframe = user.rootframe
-	if type(validated) == "string" then
-		--validate function returned a message to display
-		if rootframe.SetStatusText then
-			rootframe:SetStatusText(validated)
-		else
-			-- TODO: do something else.
-		end
-		PlaySound("igPlayerInviteDecline")
-		del(info)
-		return true
-	elseif not validated then
-		--validate returned false
-		if rootframe.SetStatusText then
+	if not validated or type(validated) == "string" then
+		if not validated then
 			if usage then
-				rootframe:SetStatusText(name..": "..usage)
+				validated = name..": "..usage
 			else
 				if pattern then
-					rootframe:SetStatusText(name..": Expected "..pattern)
+					validated = name..": Expected "..pattern
 				else
-					rootframe:SetStatusText(name..": Invalid Value")
+					validated = name..": Invalid Value"
 				end
 			end
+		end
+
+		-- show validate message
+		if rootframe.SetStatusText then
+			rootframe:SetStatusText(validated)
 		else
-			-- TODO: do something else
+			validationErrorPopup(validated)
 		end
-		PlaySound("igPlayerInviteDecline")
+		PlaySound(882) -- SOUNDKIT.IG_PLAYER_INVITE_DECLINE || _DECLINE is actually missing from the table
 		del(info)
 		return true
 	else
@@ -866,7 +915,7 @@ end
 
 local function MultiControlOnClosed(widget, event, ...)
 	local user = widget:GetUserDataTable()
-	if user.valuechanged then
+	if user.valuechanged and not widget:IsReleasing() then
 		local iscustom = user.rootframe:GetUserData("iscustom")
 		local basepath = user.rootframe:GetUserData("basepath") or emptyTbl
 		if iscustom then
@@ -1014,6 +1063,7 @@ local function BuildGroups(group, options, path, appName, recurse)
 				entry.value = k
 				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
 				entry.icon = GetOptionsMemberValue("icon", v, options, path, appName)
+				entry.iconCoords = GetOptionsMemberValue("iconCoords", v, options, path, appName)
 				entry.disabled = CheckOptionDisabled(v, options, path, appName)
 				tinsert(tree,entry)
 				if recurse and (v.childGroups or "tree") == "tree" then
@@ -1043,6 +1093,23 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
 	control:SetCallback("OnEnter", OptionOnMouseOver)
 end
 
+local function CreateControl(userControlType, fallbackControlType)
+	local control
+	if userControlType then
+		control = gui:Create(userControlType)
+		if not control then
+			geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(userControlType)))
+		end
+	end
+	if not control then
+		control = gui:Create(fallbackControlType)
+	end
+	return control
+end
+
+local function sortTblAsStrings(x,y)
+	return tostring(x) < tostring(y) -- Support numbers as keys
+end
 
 --[[
 	options - root of the options table being fed
@@ -1091,8 +1158,9 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 
-					if type(image) == "string" then
-						control = gui:Create("Icon")
+					local iconControl = type(image) == "string" or type(image) == "number"
+					control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button")
+					if iconControl then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
 						end
@@ -1113,18 +1181,12 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:SetImageSize(width, height)
 						control:SetLabel(name)
 					else
-						control = gui:Create("Button")
 						control:SetText(name)
 					end
 					control:SetCallback("OnClick",ActivateControl)
 
 				elseif v.type == "input" then
-					local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
-					control = gui:Create(controlType)
-					if not control then
-						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
-					end
+					control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox" or "EditBox")
 
 					if v.multiline and control.SetNumLines then
 						control:SetNumLines(tonumber(v.multiline) or 4)
@@ -1138,7 +1200,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					control:SetText(text)
 
 				elseif v.type == "toggle" then
-					control = gui:Create("CheckBox")
+					control = CreateControl(v.dialogControl or v.control, "CheckBox")
 					control:SetLabel(name)
 					control:SetTriState(v.tristate)
 					local value = GetOptionsMemberValue("get",v, options, path, appName)
@@ -1153,7 +1215,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local image = GetOptionsMemberValue("image", v, options, path, appName)
 					local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName)
 
-					if type(image) == "string" then
+					if type(image) == "string" or type(image) == "number" then
 						if type(imageCoords) == "table" then
 							control:SetImage(image, unpack(imageCoords))
 						else
@@ -1161,7 +1223,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 					end
 				elseif v.type == "range" then
-					control = gui:Create("Slider")
+					control = CreateControl(v.dialogControl or v.control, "Slider")
 					control:SetLabel(name)
 					control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
 					control:SetIsPercent(v.isPercent)
@@ -1175,6 +1237,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 
 				elseif v.type == "select" then
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
+					local sorting = GetOptionsMemberValue("sorting", v, options, path, appName)
 					if v.style == "radio" then
 						local disabled = CheckOptionDisabled(v, options, path, appName)
 						local width = GetOptionsMemberValue("width",v,options,path,appName)
@@ -1184,8 +1247,16 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control.width = "fill"
 
 						control:PauseLayout()
-						local optionValue = GetOptionsMemberValue("get",v, options, path, appName, value)
-						for value, text in pairs(values) do
+						local optionValue = GetOptionsMemberValue("get",v, options, path, appName)
+						if not sorting then
+							sorting = {}
+							for value, text in pairs(values) do
+								sorting[#sorting+1]=value
+							end
+							tsort(sorting, sortTblAsStrings)
+						end
+						for k, value in ipairs(sorting) do
+							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
 							radio:SetUserData("value", value)
@@ -1200,6 +1271,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 								radio:SetWidth(width_multiplier * 2)
 							elseif width == "half" then
 								radio:SetWidth(width_multiplier / 2)
+							elseif (type(width) == "number") then
+								radio:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								radio.width = "fill"
 							else
@@ -1209,19 +1282,14 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:ResumeLayout()
 						control:DoLayout()
 					else
-						local controlType = v.dialogControl or v.control or "Dropdown"
-						control = gui:Create(controlType)
-						if not control then
-							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-							control = gui:Create("Dropdown")
-						end
+						control = CreateControl(v.dialogControl or v.control, "Dropdown")
 						local itemType = v.itemControl
 						if itemType and not gui:GetWidgetVersion(itemType) then
 							geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
 							itemType = nil
 						end
 						control:SetLabel(name)
-						control:SetList(values, nil, itemType)
+						control:SetList(values, sorting, itemType)
 						local value = GetOptionsMemberValue("get",v, options, path, appName)
 						if not values[value] then
 							value = nil
@@ -1234,8 +1302,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
 					local disabled = CheckOptionDisabled(v, options, path, appName)
 
-					local controlType = v.dialogControl or v.control
-
 					local valuesort = new()
 					if values then
 						for value, text in pairs(values) do
@@ -1244,6 +1310,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					end
 					tsort(valuesort)
 
+					local controlType = v.dialogControl or v.control
 					if controlType then
 						control = gui:Create(controlType)
 						if not control then
@@ -1262,6 +1329,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
+						elseif (type(width) == "number") then
+							control:SetWidth(width_multiplier * width)
 						elseif width == "full" then
 							control.width = "fill"
 						else
@@ -1298,6 +1367,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 								check:SetWidth(width_multiplier * 2)
 							elseif width == "half" then
 								check:SetWidth(width_multiplier / 2)
+							elseif (type(width) == "number") then
+								check:SetWidth(width_multiplier * width)
 							elseif width == "full" then
 								check.width = "fill"
 							else
@@ -1313,26 +1384,26 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					del(valuesort)
 
 				elseif v.type == "color" then
-					control = gui:Create("ColorPicker")
+					control = CreateControl(v.dialogControl or v.control, "ColorPicker")
 					control:SetLabel(name)
-					control:SetHasAlpha(v.hasAlpha)
+					control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
 					control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
 					control:SetCallback("OnValueChanged",ActivateControl)
 					control:SetCallback("OnValueConfirmed",ActivateControl)
 
 				elseif v.type == "keybinding" then
-					control = gui:Create("Keybinding")
+					control = CreateControl(v.dialogControl or v.control, "Keybinding")
 					control:SetLabel(name)
 					control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
 					control:SetCallback("OnKeyChanged",ActivateControl)
 
 				elseif v.type == "header" then
-					control = gui:Create("Heading")
+					control = CreateControl(v.dialogControl or v.control, "Heading")
 					control:SetText(name)
 					control.width = "fill"
 
 				elseif v.type == "description" then
-					control = gui:Create("Label")
+					control = CreateControl(v.dialogControl or v.control, "Label")
 					control:SetText(name)
 
 					local fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
@@ -1347,7 +1418,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 
-					if type(image) == "string" then
+					if type(image) == "string" or type(image) == "number" then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
 						end
@@ -1379,6 +1450,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							control:SetWidth(width_multiplier * 2)
 						elseif width == "half" then
 							control:SetWidth(width_multiplier / 2)
+						elseif (type(width) == "number") then
+							control:SetWidth(width_multiplier * width)
 						elseif width == "full" then
 							control.width = "fill"
 						else
@@ -1418,6 +1491,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local option = user.option
 	local path = user.path
 	local appName = user.appName
+	local tooltip = AceConfigDialog.tooltip
 
 	local feedpath = new()
 	for i = 1, #path do
@@ -1434,24 +1508,25 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
 	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
 
-	GameTooltip:SetOwner(button, "ANCHOR_NONE")
+	tooltip:SetOwner(button, "ANCHOR_NONE")
+	tooltip:ClearAllPoints()
 	if widget.type == "TabGroup" then
-		GameTooltip:SetPoint("BOTTOM",button,"TOP")
+		tooltip:SetPoint("BOTTOM",button,"TOP")
 	else
-		GameTooltip:SetPoint("LEFT",button,"RIGHT")
+		tooltip:SetPoint("LEFT",button,"RIGHT")
 	end
 
-	GameTooltip:SetText(name, 1, .82, 0, 1)
+	tooltip:SetText(name, 1, .82, 0, true)
 
 	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, 1)
+		tooltip:AddLine(desc, 1, 1, 1, true)
 	end
 
-	GameTooltip:Show()
+	tooltip:Show()
 end
 
 local function TreeOnButtonLeave(widget, event, value, button)
-	GameTooltip:Hide()
+	AceConfigDialog.tooltip:Hide()
 end
 
 
@@ -1498,10 +1573,6 @@ local function GroupSelected(widget, event, uniquevalue)
 	end
 
 	BuildPath(feedpath, ("\001"):split(uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		group = GetSubOption(group, feedpath[i])
-	end
 	widget:ReleaseChildren()
 	AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
 
@@ -1810,6 +1881,14 @@ function AceConfigDialog:Open(appName, container, ...)
 		tinsert(path, (select(n, ...)))
 	end
 
+	local option = options
+	if type(container) == "table" and container.type == "BlizOptionsGroup" and #path > 0 then
+		for i = 1, #path do
+			option = options.args[path[i]]
+		end
+		name = format("%s - %s", name, GetOptionsMemberValue("name", option, options, path, appName))
+	end
+
 	--if a container is given feed into that
 	if container then
 		f = container
diff --git a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
index 86ce057..8e1e606 100755
--- a/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
+++ b/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceConfigDialog-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
index 35a35ad..f8d9225 100755
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
@@ -4,20 +4,20 @@
 -- * Valid **uiTypes**: "cmd", "dropdown", "dialog". This is verified by the library at call time. \\
 -- * The **uiName** field is expected to contain the full name of the calling addon, including version, e.g. "FooBar-1.0". This is verified by the library at call time.\\
 -- * The **appName** field is the options table name as given at registration time \\
--- 
+--
 -- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
 -- @class file
 -- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 998 2010-12-01 18:39:53Z nevcairiel $
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 13
+-- @release $Id: AceConfigRegistry-3.0.lua 1207 2019-06-23 12:08:33Z nevcairiel $
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 20
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
 
 AceConfigRegistry.tables = AceConfigRegistry.tables or {}
 
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
 if not AceConfigRegistry.callbacks then
 	AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry)
 end
@@ -33,7 +33,7 @@ local error, assert = error, assert
 
 
 AceConfigRegistry.validated = {
-	-- list of options table names ran through :ValidateOptionsTable automatically. 
+	-- list of options table names ran through :ValidateOptionsTable automatically.
 	-- CLEARED ON PURPOSE, since newer versions may have newer validators
 	cmd = {},
 	dropdown = {},
@@ -57,8 +57,8 @@ local istable={["table"]=true,   _="table"}
 local ismethodtable={["table"]=true,["string"]=true,["function"]=true,   _="methodname, funcref or table"}
 local optstring={["nil"]=true,["string"]=true, _="string"}
 local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
+local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
 local optnumber={["nil"]=true,["number"]=true, _="number"}
-local optmethod={["nil"]=true,["string"]=true,["function"]=true, _="methodname or funcref"}
 local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true},  _="methodname, funcref or false"}
 local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true,  _="methodname, funcref or number"}
 local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true,  _="methodname, funcref or table"}
@@ -66,6 +66,7 @@ local optmethodbool={["nil"]=true,["string"]=true,["function"]=true,["boolean"]=
 local opttable={["nil"]=true,["table"]=true,  _="table"}
 local optbool={["nil"]=true,["boolean"]=true,  _="boolean"}
 local optboolnumber={["nil"]=true,["boolean"]=true,["number"]=true,  _="boolean or number"}
+local optstringnumber={["nil"]=true,["string"]=true,["number"]=true, _="string or number"}
 
 local basekeys={
 	type=isstring,
@@ -82,24 +83,31 @@ local basekeys={
 		dialogHidden=optmethodbool,
 		dropdownHidden=optmethodbool,
 	cmdHidden=optmethodbool,
-	icon=optstringfunc,
+	icon=optstringnumberfunc,
 	iconCoords=optmethodtable,
 	handler=opttable,
 	get=optmethodfalse,
 	set=optmethodfalse,
 	func=optmethodfalse,
 	arg={["*"]=true},
-	width=optstring,
+	width=optstringnumber,
 }
 
 local typedkeys={
-	header={},
+	header={
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
+	},
 	description={
-		image=optstringfunc,
+		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
 		fontSize=optstringfunc,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	group={
 		args=istable,
@@ -112,10 +120,13 @@ local typedkeys={
 		childGroups=optstring,
 	},
 	execute={
-		image=optstringfunc,
+		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	input={
 		pattern=optstring,
@@ -127,8 +138,11 @@ local typedkeys={
 	},
 	toggle={
 		tristate=optbool,
-		image=optstringfunc,
+		image=optstringnumberfunc,
 		imageCoords=optmethodtable,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	tristate={
 	},
@@ -140,12 +154,16 @@ local typedkeys={
 		step=optnumber,
 		bigStep=optnumber,
 		isPercent=optbool,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	select={
 		values=ismethodtable,
+		sorting=optmethodtable,
 		style={
-			["nil"]=true, 
-			["string"]={dropdown=true,radio=true}, 
+			["nil"]=true,
+			["string"]={dropdown=true,radio=true},
 			_="string: 'dropdown' or 'radio'"
 		},
 		control=optstring,
@@ -162,10 +180,15 @@ local typedkeys={
 		dropdownControl=optstring,
 	},
 	color={
-		hasAlpha=optbool,
+		hasAlpha=optmethodbool,
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 	keybinding={
-		-- TODO
+		control=optstring,
+		dialogControl=optstring,
+		dropdownControl=optstring,
 	},
 }
 
@@ -202,13 +225,13 @@ local function validate(options,errlvl,...)
 	if type(options.type)~="string" then
 		err(".type: expected a string, got a "..type(options.type), errlvl,...)
 	end
-	
+
 	-- get type and 'typedkeys' member
 	local tk = typedkeys[options.type]
 	if not tk then
 		err(".type: unknown type '"..options.type.."'", errlvl,...)
 	end
-	
+
 	-- make sure that all options[] are known parameters
 	for k,v in pairs(options) do
 		if not (tk[k] or basekeys[k]) then
@@ -288,7 +311,8 @@ end
 -- @param appName The application name as given to `:RegisterOptionsTable()`
 -- @param options The options table, OR a function reference that generates it on demand. \\
 -- See the top of the page for info on arguments passed to such functions.
-function AceConfigRegistry:RegisterOptionsTable(appName, options)
+-- @param skipValidation Skip options table validation (primarily useful for extremely huge options, with a noticeable slowdown)
+function AceConfigRegistry:RegisterOptionsTable(appName, options, skipValidation)
 	if type(options)=="table" then
 		if options.type~="group" then	-- quick sanity checker
 			error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - missing type='group' member in root group", 2)
@@ -296,18 +320,18 @@ function AceConfigRegistry:RegisterOptionsTable(appName, options)
 		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
 			errlvl=(errlvl or 0)+1
 			validateGetterArgs(uiType, uiName, errlvl)
-			if not AceConfigRegistry.validated[uiType][appName] then
+			if not AceConfigRegistry.validated[uiType][appName] and not skipValidation then
 				AceConfigRegistry:ValidateOptionsTable(options, appName, errlvl)	-- upgradable
 				AceConfigRegistry.validated[uiType][appName] = true
 			end
-			return options 
+			return options
 		end
 	elseif type(options)=="function" then
 		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
 			errlvl=(errlvl or 0)+1
 			validateGetterArgs(uiType, uiName, errlvl)
 			local tab = assert(options(uiType, uiName, appName))
-			if not AceConfigRegistry.validated[uiType][appName] then
+			if not AceConfigRegistry.validated[uiType][appName] and not skipValidation then
 				AceConfigRegistry:ValidateOptionsTable(tab, appName, errlvl)	-- upgradable
 				AceConfigRegistry.validated[uiType][appName] = true
 			end
@@ -338,7 +362,7 @@ function AceConfigRegistry:GetOptionsTable(appName, uiType, uiName)
 	if not f then
 		return nil
 	end
-	
+
 	if uiType then
 		return f(uiType,uiName,1)	-- get the table for us
 	else
diff --git a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
index 101bfda..4ea69ca 100755
--- a/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
+++ b/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceConfigRegistry-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceConsole-3.0/AceConsole-3.0.lua b/Libs/AceConsole-3.0/AceConsole-3.0.lua
index c001123..678fa95 100755
--- a/Libs/AceConsole-3.0/AceConsole-3.0.lua
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.lua
@@ -2,14 +2,14 @@
 -- You can register slash commands to your custom functions and use the `GetArgs` function to parse them
 -- to your addons individual needs.
 --
--- **AceConsole-3.0** can be embeded into your addon, either explicitly by calling AceConsole:Embed(MyAddon) or by 
+-- **AceConsole-3.0** can be embeded into your addon, either explicitly by calling AceConsole:Embed(MyAddon) or by
 -- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
 -- and can be accessed directly, without having to explicitly call AceConsole itself.\\
 -- It is recommended to embed AceConsole, otherwise you'll have to specify a custom `self` on all calls you
 -- make into AceConsole.
 -- @class file
 -- @name AceConsole-3.0
--- @release $Id: AceConsole-3.0.lua 878 2009-11-02 18:51:58Z nevcairiel $
+-- @release $Id: AceConsole-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 local MAJOR,MINOR = "AceConsole-3.0", 7
 
 local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -84,11 +84,11 @@ end
 -- @param persist if false, the command will be soft disabled/enabled when aceconsole is used as a mixin (default: true)
 function AceConsole:RegisterChatCommand( command, func, persist )
 	if type(command)~="string" then error([[Usage: AceConsole:RegisterChatCommand( "command", func[, persist ]): 'command' - expected a string]], 2) end
-	
+
 	if persist==nil then persist=true end	-- I'd rather have my addon's "/addon enable" around if the author screws up. Having some extra slash regged when it shouldnt be isn't as destructive. True is a better default. /Mikk
-	
+
 	local name = "ACECONSOLE_"..command:upper()
-	
+
 	if type( func ) == "string" then
 		SlashCmdList[name] = function(input, editBox)
 			self[func](self, input, editBox)
@@ -132,11 +132,11 @@ local function nils(n, ...)
 		return ...
 	end
 end
-	
 
---- Retreive one or more space-separated arguments from a string. 
+
+--- Retreive one or more space-separated arguments from a string.
 -- Treats quoted strings and itemlinks as non-spaced.
--- @param string The raw argument string
+-- @param str The raw argument string
 -- @param numargs How many arguments to get (default 1)
 -- @param startpos Where in the string to start scanning (default  1)
 -- @return Returns arg1, arg2, ..., nextposition\\
@@ -144,7 +144,7 @@ end
 function AceConsole:GetArgs(str, numargs, startpos)
 	numargs = numargs or 1
 	startpos = max(startpos or 1, 1)
-	
+
 	local pos=startpos
 
 	-- find start of new arg
@@ -169,24 +169,24 @@ function AceConsole:GetArgs(str, numargs, startpos)
 	else
 		delim_or_pipe="([| ])"
 	end
-	
+
 	startpos = pos
-	
+
 	while true do
 		-- find delimiter or hyperlink
 		local ch,_
 		pos,_,ch = strfind(str, delim_or_pipe, pos)
-		
+
 		if not pos then break end
-		
+
 		if ch=="|" then
 			-- some kind of escape
-			
+
 			if strsub(str,pos,pos+1)=="|H" then
 				-- It's a |H....|hhyper link!|h
 				pos=strfind(str, "|h", pos+2)	-- first |h
 				if not pos then break end
-				
+
 				pos=strfind(str, "|h", pos+2)	-- second |h
 				if not pos then break end
 			elseif strsub(str,pos, pos+1) == "|T" then
@@ -194,16 +194,16 @@ function AceConsole:GetArgs(str, numargs, startpos)
 				pos=strfind(str, "|t", pos+2)
 				if not pos then break end
 			end
-			
+
 			pos=pos+2 -- skip past this escape (last |h if it was a hyperlink)
-		
+
 		else
 			-- found delimiter, done with this arg
 			return strsub(str, startpos, pos-1), AceConsole:GetArgs(str, numargs-1, pos+1)
 		end
-		
+
 	end
-	
+
 	-- search aborted, we hit end of string. return it all as one argument. (yes, even if it's an unterminated quote or hyperlink)
 	return strsub(str, startpos), nils(numargs-1, 1e9)
 end
@@ -214,10 +214,10 @@ end
 local mixins = {
 	"Print",
 	"Printf",
-	"RegisterChatCommand", 
+	"RegisterChatCommand",
 	"UnregisterChatCommand",
 	"GetArgs",
-} 
+}
 
 -- Embeds AceConsole into the target object making the functions from the mixins list available on target:..
 -- @param target target object to embed AceBucket in
diff --git a/Libs/AceConsole-3.0/AceConsole-3.0.xml b/Libs/AceConsole-3.0/AceConsole-3.0.xml
index be9f47c..4f4699a 100755
--- a/Libs/AceConsole-3.0/AceConsole-3.0.xml
+++ b/Libs/AceConsole-3.0/AceConsole-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceConsole-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceDB-3.0/AceDB-3.0.lua b/Libs/AceDB-3.0/AceDB-3.0.lua
index d7ca32b..440330f 100755
--- a/Libs/AceDB-3.0/AceDB-3.0.lua
+++ b/Libs/AceDB-3.0/AceDB-3.0.lua
@@ -10,6 +10,7 @@
 -- * **race** Race-specific data. All of the players characters of the same race share this database.
 -- * **faction** Faction-specific data. All of the players characters of the same faction share this database.
 -- * **factionrealm** Faction and realm specific data. All of the players characters on the same realm and of the same faction share this database.
+-- * **locale** Locale specific data, based on the locale of the players game client.
 -- * **global** Global Data. All characters on the same account share this database.
 -- * **profile** Profile-specific data. All characters using the same profile share this database. The user can control which profile should be used.
 --
@@ -39,15 +40,15 @@
 -- end
 -- @class file
 -- @name AceDB-3.0.lua
--- @release $Id: AceDB-3.0.lua 940 2010-06-19 08:01:47Z nevcairiel $
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 21
-local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
+-- @release $Id: AceDB-3.0.lua 1217 2019-07-11 03:06:18Z funkydude $
+local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
+local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
 
 if not AceDB then return end -- No upgrade needed
 
 -- Lua APIs
 local type, pairs, next, error = type, pairs, next, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
+local setmetatable, rawset, rawget = setmetatable, rawset, rawget
 
 -- WoW APIs
 local _G = _G
@@ -260,6 +261,12 @@ local _, classKey = UnitClass("player")
 local _, raceKey = UnitRace("player")
 local factionKey = UnitFactionGroup("player")
 local factionrealmKey = factionKey .. " - " .. realmKey
+local localeKey = GetLocale():lower()
+
+local regionTable = { "US", "KR", "EU", "TW", "CN" }
+local regionKey = regionTable[GetCurrentRegion()]
+local factionrealmregionKey = factionrealmKey .. " - " .. regionKey
+
 -- Actual database initialization function
 local function initdb(sv, defaults, defaultProfile, olddb, parent)
 	-- Generate the database keys for each section
@@ -295,7 +302,9 @@ local function initdb(sv, defaults, defaultProfile, olddb, parent)
 		["race"] = raceKey,
 		["faction"] = factionKey,
 		["factionrealm"] = factionrealmKey,
+		["factionrealmregion"] = factionrealmregionKey,
 		["profile"] = profileKey,
+		["locale"] = localeKey,
 		["global"] = true,
 		["profiles"] = true,
 	}
@@ -388,7 +397,7 @@ AceDB.frame:SetScript("OnEvent", logoutHandler)
 -- @param defaults A table of defaults for this database
 function DBObjectLib:RegisterDefaults(defaults)
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
 	end
 
 	validateDefaults(defaults, self.keys)
@@ -420,7 +429,7 @@ end
 -- @param name The name of the profile to set as the current profile
 function DBObjectLib:SetProfile(name)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:SetProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	-- changing to the same profile, dont do anything
@@ -462,7 +471,7 @@ end
 -- @param tbl A table to store the profile names in (optional)
 function DBObjectLib:GetProfiles(tbl)
 	if tbl and type(tbl) ~= "table" then
-		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected, got %q."):format(type(tbl)), 2)
 	end
 
 	-- Clear the container table
@@ -500,15 +509,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:DeleteProfile(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	if self.keys.profile == name then
-		error("Cannot delete the active profile in an AceDBObject.", 2)
+		error(("Cannot delete the active profile (%q) in an AceDBObject."):format(name), 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
+		error(("Cannot delete profile %q as it does not exist."):format(name), 2)
 	end
 
 	self.profiles[name] = nil
@@ -520,6 +529,15 @@ function DBObjectLib:DeleteProfile(name, silent)
 		end
 	end
 
+	-- switch all characters that use this profile back to the default
+	if self.sv.profileKeys then
+		for key, profile in pairs(self.sv.profileKeys) do
+			if profile == name then
+				self.sv.profileKeys[key] = nil
+			end
+		end
+	end
+
 	-- Callback: OnProfileDeleted, database, profileKey
 	self.callbacks:Fire("OnProfileDeleted", self, name)
 end
@@ -530,15 +548,15 @@ end
 -- @param silent If true, do not raise an error when the profile does not exist
 function DBObjectLib:CopyProfile(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:CopyProfile(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 
 	if name == self.keys.profile then
-		error("Cannot have the same source and destination profiles.", 2)
+		error(("Cannot have the same source and destination profiles (%q)."):format(name), 2)
 	end
 
 	if not rawget(self.profiles, name) and not silent then
-		error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
+		error(("Cannot copy profile %q as it does not exist."):format(name), 2)
 	end
 
 	-- Reset the profile before copying
@@ -593,7 +611,7 @@ end
 -- @param defaultProfile The profile name to use as the default
 function DBObjectLib:ResetDB(defaultProfile)
 	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
+		error(("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected, got %q."):format(type(defaultProfile)), 2)
 	end
 
 	local sv = self.sv
@@ -601,8 +619,6 @@ function DBObjectLib:ResetDB(defaultProfile)
 		sv[k] = nil
 	end
 
-	local parent = self.parent
-
 	initdb(sv, self.defaults, defaultProfile, self)
 
 	-- fix the child namespaces
@@ -629,13 +645,13 @@ end
 -- @param defaults A table of values to use as defaults
 function DBObjectLib:RegisterNamespace(name, defaults)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected, got %q."):format(type(defaults)), 2)
 	end
 	if self.children and self.children[name] then
-		error ("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace with that name already exists.", 2)
+		error(("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - a namespace called %q already exists."):format(name), 2)
 	end
 
 	local sv = self.sv
@@ -659,10 +675,10 @@ end
 -- @return the namespace object if found
 function DBObjectLib:GetNamespace(name, silent)
 	if type(name) ~= "string" then
-		error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
+		error(("Usage: AceDBObject:GetNamespace(name): 'name' - string expected, got %q."):format(type(name)), 2)
 	end
 	if not silent and not (self.children and self.children[name]) then
-		error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
+		error(("Usage: AceDBObject:GetNamespace(name): 'name' - namespace %q does not exist."):format(name), 2)
 	end
 	if not self.children then self.children = {} end
 	return self.children[name]
@@ -701,15 +717,15 @@ function AceDB:New(tbl, defaults, defaultProfile)
 	end
 
 	if type(tbl) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected, got %q."):format(type(tbl)), 2)
 	end
 
 	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected, got %q."):format(type(defaults)), 2)
 	end
 
 	if defaultProfile and type(defaultProfile) ~= "string" and defaultProfile ~= true then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected.", 2)
+		error(("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true expected, got %q."):format(type(defaultProfile)), 2)
 	end
 
 	return initdb(tbl, defaults, defaultProfile)
diff --git a/Libs/AceDB-3.0/AceDB-3.0.xml b/Libs/AceDB-3.0/AceDB-3.0.xml
index 46b20ba..108fc70 100755
--- a/Libs/AceDB-3.0/AceDB-3.0.xml
+++ b/Libs/AceDB-3.0/AceDB-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceDB-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua
new file mode 100644
index 0000000..6ed3103
--- /dev/null
+++ b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua
@@ -0,0 +1,460 @@
+--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
+-- @class file
+-- @name AceDBOptions-3.0
+-- @release $Id: AceDBOptions-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
+local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
+
+if not AceDBOptions then return end -- No upgrade needed
+
+-- Lua APIs
+local pairs, next = pairs, next
+
+-- WoW APIs
+local UnitClass = UnitClass
+
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
+
+AceDBOptions.optionTables = AceDBOptions.optionTables or {}
+AceDBOptions.handlers = AceDBOptions.handlers or {}
+
+--[[
+	Localization of AceDBOptions-3.0
+]]
+
+local L = {
+	choose = "Existing Profiles",
+	choose_desc = "You can either create a new profile by entering a name in the editbox, or choose one of the already existing profiles.",
+	choose_sub = "Select one of your currently available profiles.",
+	copy = "Copy From",
+	copy_desc = "Copy the settings from one existing profile into the currently active profile.",
+	current = "Current Profile:",
+	default = "Default",
+	delete = "Delete a Profile",
+	delete_confirm = "Are you sure you want to delete the selected profile?",
+	delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.",
+	delete_sub = "Deletes a profile from the database.",
+	intro = "You can change the active database profile, so you can have different settings for every character.",
+	new = "New",
+	new_sub = "Create a new empty profile.",
+	profiles = "Profiles",
+	profiles_sub = "Manage Profiles",
+	reset = "Reset Profile",
+	reset_desc = "Reset the current profile back to its default values, in case your configuration is broken, or you simply want to start over.",
+	reset_sub = "Reset the current profile to the default",
+}
+
+local LOCALE = GetLocale()
+if LOCALE == "deDE" then
+	L["choose"] = "Vorhandene Profile"
+	L["choose_desc"] = "Du kannst ein neues Profil erstellen, indem du einen neuen Namen in der Eingabebox 'Neu' eingibst, oder wähle eines der vorhandenen Profile aus."
+	L["choose_sub"] = "Wählt ein bereits vorhandenes Profil aus."
+	L["copy"] = "Kopieren von..."
+	L["copy_desc"] = "Kopiere die Einstellungen von einem vorhandenen Profil in das aktive Profil."
+	L["current"] = "Aktuelles Profil:"
+	L["default"] = "Standard"
+	L["delete"] = "Profil löschen"
+	L["delete_confirm"] = "Willst du das ausgewählte Profil wirklich löschen?"
+	L["delete_desc"] = "Lösche vorhandene oder unbenutzte Profile aus der Datenbank, um Platz zu sparen und die SavedVariables-Datei 'sauber' zu halten."
+	L["delete_sub"] = "Löscht ein Profil aus der Datenbank."
+	L["intro"] = "Hier kannst du das aktive Datenbankprofil ändern, damit du verschiedene Einstellungen für jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration möglich wird."
+	L["new"] = "Neu"
+	L["new_sub"] = "Ein neues Profil erstellen."
+	L["profiles"] = "Profile"
+	L["profiles_sub"] = "Profile verwalten"
+	L["reset"] = "Profil zurücksetzen"
+	L["reset_desc"] = "Setzt das momentane Profil auf Standardwerte zurück, für den Fall, dass mit der Konfiguration etwas schief lief oder weil du einfach neu starten willst."
+	L["reset_sub"] = "Das aktuelle Profil auf Standard zurücksetzen."
+elseif LOCALE == "frFR" then
+	L["choose"] = "Profils existants"
+	L["choose_desc"] = "Vous pouvez créer un nouveau profil en entrant un nouveau nom dans la boîte de saisie, ou en choississant un des profils déjà existants."
+	L["choose_sub"] = "Permet de choisir un des profils déjà disponibles."
+	L["copy"] = "Copier à partir de"
+	L["copy_desc"] = "Copie les paramètres d'un profil déjà existant dans le profil actuellement actif."
+	L["current"] = "Profil actuel :"
+	L["default"] = "Défaut"
+	L["delete"] = "Supprimer un profil"
+	L["delete_confirm"] = "Etes-vous sûr de vouloir supprimer le profil sélectionné ?"
+	L["delete_desc"] = "Supprime les profils existants inutilisés de la base de données afin de gagner de la place et de nettoyer le fichier SavedVariables."
+	L["delete_sub"] = "Supprime un profil de la base de données."
+	L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des paramètres différents pour chaque personnage, permettant ainsi d'avoir une configuration très flexible."
+	L["new"] = "Nouveau"
+	L["new_sub"] = "Créée un nouveau profil vierge."
+	L["profiles"] = "Profils"
+	L["profiles_sub"] = "Gestion des profils"
+	L["reset"] = "Réinitialiser le profil"
+	L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
+	L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
+elseif LOCALE == "koKR" then
+	L["choose"] = "저장 중인 프로필"
+	L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
+	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
+	L["copy"] = "복사해오기"
+	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
+	L["current"] = "현재 프로필:"
+	L["default"] = "기본값"
+	L["delete"] = "프로필 삭제"
+	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
+	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
+	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
+	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
+	L["new"] = "새로운 프로필"
+	L["new_sub"] = "새로운 프로필을 만듭니다."
+	L["profiles"] = "프로필"
+	L["profiles_sub"] = "프로필 관리"
+	L["reset"] = "프로필 초기화"
+	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
+	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
+elseif LOCALE == "esES" or LOCALE == "esMX" then
+	L["choose"] = "Perfiles existentes"
+	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
+	L["choose_sub"] = "Selecciona uno de los perfiles disponibles."
+	L["copy"] = "Copiar de"
+	L["copy_desc"] = "Copia los ajustes de un perfil existente al perfil actual."
+	L["current"] = "Perfil actual:"
+	L["default"] = "Por defecto"
+	L["delete"] = "Borrar un Perfil"
+	L["delete_confirm"] = "¿Estas seguro que quieres borrar el perfil seleccionado?"
+	L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables."
+	L["delete_sub"] = "Borra un perfil de la base de datos."
+	L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones."
+	L["new"] = "Nuevo"
+	L["new_sub"] = "Crear un nuevo perfil vacio."
+	L["profiles"] = "Perfiles"
+	L["profiles_sub"] = "Manejar Perfiles"
+	L["reset"] = "Reiniciar Perfil"
+	L["reset_desc"] = "Reinicia el perfil actual a los valores por defectos, en caso de que se haya estropeado la configuración o quieras volver a empezar de nuevo."
+	L["reset_sub"] = "Reinicar el perfil actual al de por defecto"
+elseif LOCALE == "zhTW" then
+	L["choose"] = "現有的設定檔"
+	L["choose_desc"] = "您可以在文字方塊內輸入名字以建立新的設定檔，或是選擇一個現有的設定檔使用。"
+	L["choose_sub"] = "從當前可用的設定檔裡面選擇一個。"
+	L["copy"] = "複製自"
+	L["copy_desc"] = "從一個現有的設定檔，將設定複製到現在使用中的設定檔。"
+	L["current"] = "目前設定檔："
+	L["default"] = "預設"
+	L["delete"] = "刪除一個設定檔"
+	L["delete_confirm"] = "確定要刪除所選擇的設定檔嗎？"
+	L["delete_desc"] = "從資料庫裡刪除不再使用的設定檔，以節省空間，並且清理 SavedVariables 檔案。"
+	L["delete_sub"] = "從資料庫裡刪除一個設定檔。"
+	L["intro"] = "您可以從資料庫中選擇一個設定檔來使用，如此就可以讓每個角色使用不同的設定。"
+	L["new"] = "新建"
+	L["new_sub"] = "新建一個空的設定檔。"
+	L["profiles"] = "設定檔"
+	L["profiles_sub"] = "管理設定檔"
+	L["reset"] = "重置設定檔"
+	L["reset_desc"] = "將現用的設定檔重置為預設值；用於設定檔損壞，或者單純想要重來的情況。"
+	L["reset_sub"] = "將目前的設定檔重置為預設值"
+elseif LOCALE == "zhCN" then
+	L["choose"] = "现有的配置文件"
+	L["choose_desc"] = "你可以通过在文本框内输入一个名字创立一个新的配置文件，也可以选择一个已经存在的配置文件。"
+	L["choose_sub"] = "从当前可用的配置文件里面选择一个。"
+	L["copy"] = "复制自"
+	L["copy_desc"] = "从当前某个已保存的配置文件复制到当前正使用的配置文件。"
+	L["current"] = "当前配置文件："
+	L["default"] = "默认"
+	L["delete"] = "删除一个配置文件"
+	L["delete_confirm"] = "你确定要删除所选择的配置文件么？"
+	L["delete_desc"] = "从数据库里删除不再使用的配置文件，以节省空间，并且清理SavedVariables文件。"
+	L["delete_sub"] = "从数据库里删除一个配置文件。"
+	L["intro"] = "你可以选择一个活动的数据配置文件，这样你的每个角色就可以拥有不同的设置值，可以给你的插件配置带来极大的灵活性。"
+	L["new"] = "新建"
+	L["new_sub"] = "新建一个空的配置文件。"
+	L["profiles"] = "配置文件"
+	L["profiles_sub"] = "管理配置文件"
+	L["reset"] = "重置配置文件"
+	L["reset_desc"] = "将当前的配置文件恢复到它的默认值，用于你的配置文件损坏，或者你只是想重来的情况。"
+	L["reset_sub"] = "将当前的配置文件恢复为默认值"
+elseif LOCALE == "ruRU" then
+	L["choose"] = "Существующие профили"
+	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
+	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
+	L["copy"] = "Скопировать из"
+	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
+	L["current"] = "Текущий профиль:"
+	L["default"] = "По умолчанию"
+	L["delete"] = "Удалить профиль"
+	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
+	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
+	L["delete_sub"] = "Удаление профиля из БД"
+	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
+	L["new"] = "Новый"
+	L["new_sub"] = "Создать новый чистый профиль"
+	L["profiles"] = "Профили"
+	L["profiles_sub"] = "Управление профилями"
+	L["reset"] = "Сброс профиля"
+	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
+	L["reset_sub"] = "Сброс текущего профиля на стандартный"
+elseif LOCALE == "itIT" then
+	L["choose"] = "Profili Esistenti"
+	L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
+	L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
+	L["copy"] = "Copia Da"
+	L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
+	L["current"] = "Profilo Attivo:"
+	L["default"] = "Standard"
+	L["delete"] = "Cancella un Profilo"
+	L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
+	L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."
+	L["delete_sub"] = "Cancella un profilo dal Database."
+	L["intro"] = "Puoi cambiare il profilo attivo, in modo da usare impostazioni diverse per ogni personaggio."
+	L["new"] = "Nuovo"
+	L["new_sub"] = "Crea un nuovo profilo vuoto."
+	L["profiles"] = "Profili"
+	L["profiles_sub"] = "Gestisci Profili"
+	L["reset"] = "Reimposta Profilo"
+	L["reset_desc"] = "Riporta il tuo profilo attivo alle sue impostazioni predefinite, nel caso in cui la tua configurazione si sia corrotta, o semplicemente tu voglia re-inizializzarla."
+	L["reset_sub"] = "Reimposta il profilo ai suoi valori predefiniti."
+elseif LOCALE == "ptBR" then
+	L["choose"] = "Perfis Existentes"
+	L["choose_desc"] = "Você pode tanto criar um perfil novo tanto digitando um nome na caixa de texto, quanto escolher um dos perfis já existentes."
+	L["choose_sub"] = "Selecione um de seus perfis atualmente disponíveis."
+	L["copy"] = "Copiar De"
+	L["copy_desc"] = "Copia as definições de um perfil existente no perfil atualmente ativo."
+	L["current"] = "Perfil Autal:"
+	L["default"] = "Padrão"
+	L["delete"] = "Remover um Perfil"
+	L["delete_confirm"] = "Tem certeza que deseja remover o perfil selecionado?"
+	L["delete_desc"] = "Remove perfis existentes e inutilizados do banco de dados para economizar espaço, e limpar o arquivo SavedVariables."
+	L["delete_sub"] = "Remove um perfil do banco de dados."
+	L["intro"] = "Você pode alterar o perfil do banco de dados ativo, para que possa ter definições diferentes para cada personagem."
+	L["new"] = "Novo"
+	L["new_sub"] = "Cria um novo perfil vazio."
+	L["profiles"] = "Perfis"
+	L["profiles_sub"] = "Gerenciar Perfis"
+	L["reset"] = "Resetar Perfil"
+	L["reset_desc"] = "Reseta o perfil atual para os valores padrões, no caso de sua configuração estar quebrada, ou simplesmente se deseja começar novamente."
+	L["reset_sub"] = "Resetar o perfil atual ao padrão"
+end
+
+local defaultProfiles
+local tmpprofiles = {}
+
+-- Get a list of available profiles for the specified database.
+-- You can specify which profiles to include/exclude in the list using the two boolean parameters listed below.
+-- @param db The db object to retrieve the profiles from
+-- @param common If true, getProfileList will add the default profiles to the return list, even if they have not been created yet
+-- @param nocurrent If true, then getProfileList will not display the current profile in the list
+-- @return Hashtable of all profiles with the internal name as keys and the display name as value.
+local function getProfileList(db, common, nocurrent)
+	local profiles = {}
+
+	-- copy existing profiles into the table
+	local currentProfile = db:GetCurrentProfile()
+	for i,v in pairs(db:GetProfiles(tmpprofiles)) do
+		if not (nocurrent and v == currentProfile) then
+			profiles[v] = v
+		end
+	end
+
+	-- add our default profiles to choose from ( or rename existing profiles)
+	for k,v in pairs(defaultProfiles) do
+		if (common or profiles[k]) and not (nocurrent and k == currentProfile) then
+			profiles[k] = v
+		end
+	end
+
+	return profiles
+end
+
+--[[
+	OptionsHandlerPrototype
+	prototype class for handling the options in a sane way
+]]
+local OptionsHandlerPrototype = {}
+
+--[[ Reset the profile ]]
+function OptionsHandlerPrototype:Reset()
+	self.db:ResetProfile()
+end
+
+--[[ Set the profile to value ]]
+function OptionsHandlerPrototype:SetProfile(info, value)
+	self.db:SetProfile(value)
+end
+
+--[[ returns the currently active profile ]]
+function OptionsHandlerPrototype:GetCurrentProfile()
+	return self.db:GetCurrentProfile()
+end
+
+--[[
+	List all active profiles
+	you can control the output with the .arg variable
+	currently four modes are supported
+
+	(empty) - return all available profiles
+	"nocurrent" - returns all available profiles except the currently active profile
+	"common" - returns all avaialble profiles + some commonly used profiles ("char - realm", "realm", "class", "Default")
+	"both" - common except the active profile
+]]
+function OptionsHandlerPrototype:ListProfiles(info)
+	local arg = info.arg
+	local profiles
+	if arg == "common" and not self.noDefaultProfiles then
+		profiles = getProfileList(self.db, true, nil)
+	elseif arg == "nocurrent" then
+		profiles = getProfileList(self.db, nil, true)
+	elseif arg == "both" then -- currently not used
+		profiles = getProfileList(self.db, (not self.noDefaultProfiles) and true, true)
+	else
+		profiles = getProfileList(self.db)
+	end
+
+	return profiles
+end
+
+function OptionsHandlerPrototype:HasNoProfiles(info)
+	local profiles = self:ListProfiles(info)
+	return ((not next(profiles)) and true or false)
+end
+
+--[[ Copy a profile ]]
+function OptionsHandlerPrototype:CopyProfile(info, value)
+	self.db:CopyProfile(value)
+end
+
+--[[ Delete a profile from the db ]]
+function OptionsHandlerPrototype:DeleteProfile(info, value)
+	self.db:DeleteProfile(value)
+end
+
+--[[ fill defaultProfiles with some generic values ]]
+local function generateDefaultProfiles(db)
+	defaultProfiles = {
+		["Default"] = L["default"],
+		[db.keys.char] = db.keys.char,
+		[db.keys.realm] = db.keys.realm,
+		[db.keys.class] = UnitClass("player")
+	}
+end
+
+--[[ create and return a handler object for the db, or upgrade it if it already existed ]]
+local function getOptionsHandler(db, noDefaultProfiles)
+	if not defaultProfiles then
+		generateDefaultProfiles(db)
+	end
+
+	local handler = AceDBOptions.handlers[db] or { db = db, noDefaultProfiles = noDefaultProfiles }
+
+	for k,v in pairs(OptionsHandlerPrototype) do
+		handler[k] = v
+	end
+
+	AceDBOptions.handlers[db] = handler
+	return handler
+end
+
+--[[
+	the real options table
+]]
+local optionsTable = {
+	desc = {
+		order = 1,
+		type = "description",
+		name = L["intro"] .. "\n",
+	},
+	descreset = {
+		order = 9,
+		type = "description",
+		name = L["reset_desc"],
+	},
+	reset = {
+		order = 10,
+		type = "execute",
+		name = L["reset"],
+		desc = L["reset_sub"],
+		func = "Reset",
+	},
+	current = {
+		order = 11,
+		type = "description",
+		name = function(info) return L["current"] .. " " .. NORMAL_FONT_COLOR_CODE .. info.handler:GetCurrentProfile() .. FONT_COLOR_CODE_CLOSE end,
+		width = "default",
+	},
+	choosedesc = {
+		order = 20,
+		type = "description",
+		name = "\n" .. L["choose_desc"],
+	},
+	new = {
+		name = L["new"],
+		desc = L["new_sub"],
+		type = "input",
+		order = 30,
+		get = false,
+		set = "SetProfile",
+	},
+	choose = {
+		name = L["choose"],
+		desc = L["choose_sub"],
+		type = "select",
+		order = 40,
+		get = "GetCurrentProfile",
+		set = "SetProfile",
+		values = "ListProfiles",
+		arg = "common",
+	},
+	copydesc = {
+		order = 50,
+		type = "description",
+		name = "\n" .. L["copy_desc"],
+	},
+	copyfrom = {
+		order = 60,
+		type = "select",
+		name = L["copy"],
+		desc = L["copy_desc"],
+		get = false,
+		set = "CopyProfile",
+		values = "ListProfiles",
+		disabled = "HasNoProfiles",
+		arg = "nocurrent",
+	},
+	deldesc = {
+		order = 70,
+		type = "description",
+		name = "\n" .. L["delete_desc"],
+	},
+	delete = {
+		order = 80,
+		type = "select",
+		name = L["delete"],
+		desc = L["delete_sub"],
+		get = false,
+		set = "DeleteProfile",
+		values = "ListProfiles",
+		disabled = "HasNoProfiles",
+		arg = "nocurrent",
+		confirm = true,
+		confirmText = L["delete_confirm"],
+	},
+}
+
+--- Get/Create a option table that you can use in your addon to control the profiles of AceDB-3.0.
+-- @param db The database object to create the options table for.
+-- @return The options table to be used in AceConfig-3.0
+-- @usage
+-- -- Assuming `options` is your top-level options table and `self.db` is your database:
+-- options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db)
+function AceDBOptions:GetOptionsTable(db, noDefaultProfiles)
+	local tbl = AceDBOptions.optionTables[db] or {
+			type = "group",
+			name = L["profiles"],
+			desc = L["profiles_sub"],
+		}
+
+	tbl.handler = getOptionsHandler(db, noDefaultProfiles)
+	tbl.args = optionsTable
+
+	AceDBOptions.optionTables[db] = tbl
+	return tbl
+end
+
+-- upgrade existing tables
+for db,tbl in pairs(AceDBOptions.optionTables) do
+	tbl.handler = getOptionsHandler(db)
+	tbl.args = optionsTable
+end
diff --git a/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml
new file mode 100644
index 0000000..51305f9
--- /dev/null
+++ b/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="AceDBOptions-3.0.lua"/>
+</Ui>
diff --git a/Libs/AceEvent-3.0/AceEvent-3.0.lua b/Libs/AceEvent-3.0/AceEvent-3.0.lua
index 578ae25..7ccd880 100755
--- a/Libs/AceEvent-3.0/AceEvent-3.0.lua
+++ b/Libs/AceEvent-3.0/AceEvent-3.0.lua
@@ -2,15 +2,17 @@
 -- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around
 -- CallbackHandler, and dispatches all game events or addon message to the registrees.
 --
--- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by 
+-- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by
 -- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
 -- and can be accessed directly, without having to explicitly call AceEvent itself.\\
 -- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you
 -- make into AceEvent.
 -- @class file
 -- @name AceEvent-3.0
--- @release $Id: AceEvent-3.0.lua 975 2010-10-23 11:26:18Z nevcairiel $
-local MAJOR, MINOR = "AceEvent-3.0", 3
+-- @release $Id: AceEvent-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+
+local MAJOR, MINOR = "AceEvent-3.0", 4
 local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceEvent then return end
@@ -18,29 +20,27 @@ if not AceEvent then return end
 -- Lua APIs
 local pairs = pairs
 
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
 AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
 AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib
 
 -- APIs and registry for blizzard events, using CallbackHandler lib
 if not AceEvent.events then
-	AceEvent.events = CallbackHandler:New(AceEvent, 
+	AceEvent.events = CallbackHandler:New(AceEvent,
 		"RegisterEvent", "UnregisterEvent", "UnregisterAllEvents")
 end
 
-function AceEvent.events:OnUsed(target, eventname) 
+function AceEvent.events:OnUsed(target, eventname)
 	AceEvent.frame:RegisterEvent(eventname)
 end
 
-function AceEvent.events:OnUnused(target, eventname) 
+function AceEvent.events:OnUnused(target, eventname)
 	AceEvent.frame:UnregisterEvent(eventname)
 end
 
 
 -- APIs and registry for IPC messages, using CallbackHandler lib
 if not AceEvent.messages then
-	AceEvent.messages = CallbackHandler:New(AceEvent, 
+	AceEvent.messages = CallbackHandler:New(AceEvent,
 		"RegisterMessage", "UnregisterMessage", "UnregisterAllMessages"
 	)
 	AceEvent.SendMessage = AceEvent.messages.Fire
diff --git a/Libs/AceEvent-3.0/AceEvent-3.0.xml b/Libs/AceEvent-3.0/AceEvent-3.0.xml
index 313ef4d..41ef791 100755
--- a/Libs/AceEvent-3.0/AceEvent-3.0.xml
+++ b/Libs/AceEvent-3.0/AceEvent-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceEvent-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceGUI-3.0/AceGUI-3.0.lua b/Libs/AceGUI-3.0/AceGUI-3.0.lua
index 53295bb..438650f 100755
--- a/Libs/AceGUI-3.0/AceGUI-3.0.lua
+++ b/Libs/AceGUI-3.0/AceGUI-3.0.lua
@@ -1,6 +1,6 @@
 --- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs.
 -- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself
--- to create any custom GUI. There are more extensive examples in the test suite in the Ace3 
+-- to create any custom GUI. There are more extensive examples in the test suite in the Ace3
 -- stand-alone distribution.
 --
 -- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly,
@@ -24,17 +24,17 @@
 -- f:AddChild(btn)
 -- @class file
 -- @name AceGUI-3.0
--- @release $Id: AceGUI-3.0.lua 924 2010-05-13 15:12:20Z nevcairiel $
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 33
+-- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $
+local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
 
 if not AceGUI then return end -- No upgrade needed
 
 -- Lua APIs
-local tconcat, tremove, tinsert = table.concat, table.remove, table.insert
+local tinsert, wipe = table.insert, table.wipe
 local select, pairs, next, type = select, pairs, next, type
-local error, assert, loadstring = error, assert, loadstring
-local setmetatable, rawget, rawset = setmetatable, rawget, rawset
+local error, assert = error, assert
+local setmetatable, rawget = setmetatable, rawget
 local math_max = math.max
 
 -- WoW APIs
@@ -51,7 +51,8 @@ AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
 AceGUI.WidgetBase = AceGUI.WidgetBase or {}
 AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {}
 AceGUI.WidgetVersions = AceGUI.WidgetVersions or {}
- 
+AceGUI.tooltip = AceGUI.tooltip or CreateFrame("GameTooltip", "AceGUITooltip", UIParent, "GameTooltipTemplate")
+
 -- local upvalues
 local WidgetRegistry = AceGUI.WidgetRegistry
 local LayoutRegistry = AceGUI.LayoutRegistry
@@ -66,39 +67,10 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			method = func
-			if not method then return end
-			ARGS = ...
-			return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
- 
 local function safecall(func, ...)
-	return Dispatchers[select("#", ...)](func, ...)
+	if func then
+		return xpcall(func, errorhandler, ...)
+	end
 end
 
 -- Recycling functions
@@ -108,7 +80,7 @@ do
 	-- Internal Storage of the objects changed, from an array table
 	-- to a hash table, and additionally we introduced versioning on
 	-- the widgets which would discard all widgets from a pre-29 version
-	-- anyway, so we just clear the storage now, and don't try to 
+	-- anyway, so we just clear the storage now, and don't try to
 	-- convert the storage tables to the new format.
 	-- This should generally not cause *many* widgets to end up in trash,
 	-- since once dialogs are opened, all addons should be loaded already
@@ -118,7 +90,7 @@ do
 	if oldminor and oldminor < 29 and AceGUI.objPools then
 		AceGUI.objPools = nil
 	end
-	
+
 	AceGUI.objPools = AceGUI.objPools or {}
 	local objPools = AceGUI.objPools
 	--Returns a new instance, if none are available either returns a new table or calls the given contructor
@@ -126,11 +98,11 @@ do
 		if not WidgetRegistry[type] then
 			error("Attempt to instantiate unknown widget type", 2)
 		end
-		
+
 		if not objPools[type] then
 			objPools[type] = {}
 		end
-		
+
 		local newObj = next(objPools[type])
 		if not newObj then
 			newObj = WidgetRegistry[type]()
@@ -180,12 +152,12 @@ function AceGUI:Create(type)
 			widget.OnAcquire = widget.Aquire
 			widget.Aquire = nil
 		end
-		
+
 		if rawget(widget, "Release") then
-			widget.OnRelease = rawget(widget, "Release") 
+			widget.OnRelease = rawget(widget, "Release")
 			widget.Release = nil
 		end
-		
+
 		if widget.OnAcquire then
 			widget:OnAcquire()
 		else
@@ -204,7 +176,10 @@ end
 -- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well.
 -- @param widget The widget to release
 function AceGUI:Release(widget)
+	if widget.isQueuedForRelease then return end
+	widget.isQueuedForRelease = true
 	safecall(widget.PauseLayout, widget)
+	widget.frame:Hide()
 	widget:Fire("OnRelease")
 	safecall(widget.ReleaseChildren, widget)
 
@@ -233,9 +208,26 @@ function AceGUI:Release(widget)
 		widget.content.width = nil
 		widget.content.height = nil
 	end
+	widget.isQueuedForRelease = nil
 	delWidget(widget, widget.type)
 end
 
+--- Check if a widget is currently in the process of being released
+-- This function check if this widget, or any of its parents (in which case it'll be released shortly as well)
+-- are currently being released. This allows addon to handle any callbacks accordingly.
+-- @param widget The widget to check
+function AceGUI:IsReleasing(widget)
+	if widget.isQueuedForRelease then
+		return true
+	end
+
+	if widget.parent and widget.parent.AceGUIWidgetVersion then
+		return AceGUI:IsReleasing(widget.parent)
+	end
+
+	return false
+end
+
 -----------
 -- Focus --
 -----------
@@ -267,18 +259,18 @@ end
 --[[
 	Widgets must provide the following functions
 		OnAcquire() - Called when the object is acquired, should set everything to a default hidden state
-		
+
 	And the following members
 		frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes
 		type - the type of the object, same as the name given to :RegisterWidget()
-		
+
 	Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet
 	It will be cleared automatically when a widget is released
 	Placing values directly into a widget object should be avoided
-	
+
 	If the Widget can act as a container for other Widgets the following
 		content - frame or derivitive that children will be anchored to
-		
+
 	The Widget can supply the following Optional Members
 		:OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data
 		:OnWidthSet(width) - Called when the width of the widget is changed
@@ -294,21 +286,21 @@ end
 -- Widget Base Template --
 --------------------------
 do
-	local WidgetBase = AceGUI.WidgetBase 
-	
+	local WidgetBase = AceGUI.WidgetBase
+
 	WidgetBase.SetParent = function(self, parent)
 		local frame = self.frame
 		frame:SetParent(nil)
 		frame:SetParent(parent.content)
 		self.parent = parent
 	end
-	
+
 	WidgetBase.SetCallback = function(self, name, func)
 		if type(func) == "function" then
 			self.events[name] = func
 		end
 	end
-	
+
 	WidgetBase.Fire = function(self, name, ...)
 		if self.events[name] then
 			local success, ret = safecall(self.events[name], self, name, ...)
@@ -317,7 +309,7 @@ do
 			end
 		end
 	end
-	
+
 	WidgetBase.SetWidth = function(self, width)
 		self.frame:SetWidth(width)
 		self.frame.width = width
@@ -325,7 +317,7 @@ do
 			self:OnWidthSet(width)
 		end
 	end
-	
+
 	WidgetBase.SetRelativeWidth = function(self, width)
 		if width <= 0 or width > 1 then
 			error(":SetRelativeWidth(width): Invalid relative width.", 2)
@@ -333,7 +325,7 @@ do
 		self.relWidth = width
 		self.width = "relative"
 	end
-	
+
 	WidgetBase.SetHeight = function(self, height)
 		self.frame:SetHeight(height)
 		self.frame.height = height
@@ -341,7 +333,7 @@ do
 			self:OnHeightSet(height)
 		end
 	end
-	
+
 	--[[ WidgetBase.SetRelativeHeight = function(self, height)
 		if height <= 0 or height > 1 then
 			error(":SetRelativeHeight(height): Invalid relative height.", 2)
@@ -353,47 +345,51 @@ do
 	WidgetBase.IsVisible = function(self)
 		return self.frame:IsVisible()
 	end
-	
+
 	WidgetBase.IsShown= function(self)
 		return self.frame:IsShown()
 	end
-		
+
 	WidgetBase.Release = function(self)
 		AceGUI:Release(self)
 	end
-	
+
+	WidgetBase.IsReleasing = function(self)
+		return AceGUI:IsReleasing(self)
+	end
+
 	WidgetBase.SetPoint = function(self, ...)
 		return self.frame:SetPoint(...)
 	end
-	
+
 	WidgetBase.ClearAllPoints = function(self)
 		return self.frame:ClearAllPoints()
 	end
-	
+
 	WidgetBase.GetNumPoints = function(self)
 		return self.frame:GetNumPoints()
 	end
-	
+
 	WidgetBase.GetPoint = function(self, ...)
 		return self.frame:GetPoint(...)
-	end	
-	
+	end
+
 	WidgetBase.GetUserDataTable = function(self)
 		return self.userdata
 	end
-	
+
 	WidgetBase.SetUserData = function(self, key, value)
 		self.userdata[key] = value
 	end
-	
+
 	WidgetBase.GetUserData = function(self, key)
 		return self.userdata[key]
 	end
-	
+
 	WidgetBase.IsFullHeight = function(self)
 		return self.height == "fill"
 	end
-	
+
 	WidgetBase.SetFullHeight = function(self, isFull)
 		if isFull then
 			self.height = "fill"
@@ -401,11 +397,11 @@ do
 			self.height = nil
 		end
 	end
-	
+
 	WidgetBase.IsFullWidth = function(self)
 		return self.width == "fill"
 	end
-		
+
 	WidgetBase.SetFullWidth = function(self, isFull)
 		if isFull then
 			self.width = "fill"
@@ -413,29 +409,29 @@ do
 			self.width = nil
 		end
 	end
-	
+
 --	local function LayoutOnUpdate(this)
 --		this:SetScript("OnUpdate",nil)
 --		this.obj:PerformLayout()
 --	end
-	
+
 	local WidgetContainerBase = AceGUI.WidgetContainerBase
-		
+
 	WidgetContainerBase.PauseLayout = function(self)
 		self.LayoutPaused = true
 	end
-	
+
 	WidgetContainerBase.ResumeLayout = function(self)
 		self.LayoutPaused = nil
 	end
-	
+
 	WidgetContainerBase.PerformLayout = function(self)
 		if self.LayoutPaused then
 			return
 		end
 		safecall(self.LayoutFunc, self.content, self.children)
 	end
-	
+
 	--call this function to layout, makes sure layed out objects get a frame to get sizes etc
 	WidgetContainerBase.DoLayout = function(self)
 		self:PerformLayout()
@@ -443,7 +439,7 @@ do
 --			self.frame:SetScript("OnUpdate", LayoutOnUpdate)
 --		end
 	end
-	
+
 	WidgetContainerBase.AddChild = function(self, child, beforeWidget)
 		if beforeWidget then
 			local siblingIndex = 1
@@ -451,7 +447,7 @@ do
 				if widget == beforeWidget then
 					break
 				end
-				siblingIndex = siblingIndex + 1 
+				siblingIndex = siblingIndex + 1
 			end
 			tinsert(self.children, siblingIndex, child)
 		else
@@ -461,7 +457,7 @@ do
 		child.frame:Show()
 		self:DoLayout()
 	end
-	
+
 	WidgetContainerBase.AddChildren = function(self, ...)
 		for i = 1, select("#", ...) do
 			local child = select(i, ...)
@@ -471,7 +467,7 @@ do
 		end
 		self:DoLayout()
 	end
-	
+
 	WidgetContainerBase.ReleaseChildren = function(self)
 		local children = self.children
 		for i = 1,#children do
@@ -479,7 +475,7 @@ do
 			children[i] = nil
 		end
 	end
-	
+
 	WidgetContainerBase.SetLayout = function(self, Layout)
 		self.LayoutFunc = AceGUI:GetLayout(Layout)
 	end
@@ -503,7 +499,7 @@ do
 			end
 		end
 	end
-	
+
 	local function ContentResize(this)
 		if this:GetWidth() and this:GetHeight() then
 			this.width = this:GetWidth()
@@ -515,7 +511,7 @@ do
 	setmetatable(WidgetContainerBase, {__index=WidgetBase})
 
 	--One of these function should be called on each Widget Instance as part of its creation process
-	
+
 	--- Register a widget-class as a container for newly created widgets.
 	-- @param widget The widget class
 	function AceGUI:RegisterAsContainer(widget)
@@ -531,7 +527,7 @@ do
 		widget:SetLayout("List")
 		return widget
 	end
-	
+
 	--- Register a widget-class as a widget.
 	-- @param widget The widget class
 	function AceGUI:RegisterAsWidget(widget)
@@ -558,11 +554,11 @@ end
 -- @param Version The version of the widget
 function AceGUI:RegisterWidgetType(Name, Constructor, Version)
 	assert(type(Constructor) == "function")
-	assert(type(Version) == "number") 
-	
+	assert(type(Version) == "number")
+
 	local oldVersion = WidgetVersions[Name]
 	if oldVersion and oldVersion >= Version then return end
-	
+
 	WidgetVersions[Name] = Version
 	WidgetRegistry[Name] = Constructor
 end
@@ -631,7 +627,7 @@ AceGUI:RegisterLayout("List",
 		local width = content.width or content:GetWidth() or 0
 		for i = 1, #children do
 			local child = children[i]
-			
+
 			local frame = child.frame
 			frame:ClearAllPoints()
 			frame:Show()
@@ -640,22 +636,22 @@ AceGUI:RegisterLayout("List",
 			else
 				frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT")
 			end
-			
+
 			if child.width == "fill" then
 				child:SetWidth(width)
 				frame:SetPoint("RIGHT", content)
-				
+
 				if child.DoLayout then
 					child:DoLayout()
 				end
 			elseif child.width == "relative" then
 				child:SetWidth(width * child.relWidth)
-				
+
 				if child.DoLayout then
 					child:DoLayout()
 				end
 			end
-			
+
 			height = height + (frame.height or frame:GetHeight() or 0)
 		end
 		safecall(content.obj.LayoutFinished, content.obj, nil, height)
@@ -667,14 +663,23 @@ AceGUI:RegisterLayout("Fill",
 		if children[1] then
 			children[1]:SetWidth(content:GetWidth() or 0)
 			children[1]:SetHeight(content:GetHeight() or 0)
+			children[1].frame:ClearAllPoints()
 			children[1].frame:SetAllPoints(content)
 			children[1].frame:Show()
 			safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight())
 		end
 	end)
 
+local layoutrecursionblock = nil
+local function safelayoutcall(object, func, ...)
+	layoutrecursionblock = true
+	object[func](object, ...)
+	layoutrecursionblock = nil
+end
+
 AceGUI:RegisterLayout("Flow",
 	function(content, children)
+		if layoutrecursionblock then return end
 		--used height so far
 		local height = 0
 		--width used in the current row
@@ -682,19 +687,17 @@ AceGUI:RegisterLayout("Flow",
 		--height of the current row
 		local rowheight = 0
 		local rowoffset = 0
-		local lastrowoffset
-		
+
 		local width = content.width or content:GetWidth() or 0
-		
+
 		--control at the start of the row
 		local rowstart
 		local rowstartoffset
-		local lastrowstart
 		local isfullheight
-		
+
 		local frameoffset
 		local lastframeoffset
-		local oversize 
+		local oversize
 		for i = 1, #children do
 			local child = children[i]
 			oversize = nil
@@ -702,17 +705,17 @@ AceGUI:RegisterLayout("Flow",
 			local frameheight = frame.height or frame:GetHeight() or 0
 			local framewidth = frame.width or frame:GetWidth() or 0
 			lastframeoffset = frameoffset
-			-- HACK: Why did we set a frameoffset of (frameheight / 2) ? 
+			-- HACK: Why did we set a frameoffset of (frameheight / 2) ?
 			-- That was moving all widgets half the widgets size down, is that intended?
 			-- Actually, it seems to be neccessary for many cases, we'll leave it in for now.
 			-- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them.
 			-- TODO: Investigate moar!
 			frameoffset = child.alignoffset or (frameheight / 2)
-			
+
 			if child.width == "relative" then
 				framewidth = width * child.relWidth
 			end
-			
+
 			frame:Show()
 			frame:ClearAllPoints()
 			if i == 1 then
@@ -751,24 +754,24 @@ AceGUI:RegisterLayout("Flow",
 				else
 					--handles cases where the new height is higher than either control because of the offsets
 					--math.max(rowheight-rowoffset+frameoffset, frameheight-frameoffset+rowoffset)
-					
+
 					--offset is always the larger of the two offsets
 					rowoffset = math_max(rowoffset, frameoffset)
 					rowheight = math_max(rowheight, rowoffset + (frameheight / 2))
-					
+
 					frame:SetPoint("TOPLEFT", children[i-1].frame, "TOPRIGHT", 0, frameoffset - lastframeoffset)
 					usedwidth = framewidth + usedwidth
 				end
 			end
 
 			if child.width == "fill" then
-				child:SetWidth(width)
+				safelayoutcall(child, "SetWidth", width)
 				frame:SetPoint("RIGHT", content)
-				
+
 				usedwidth = 0
 				rowstart = frame
 				rowstartoffset = frameoffset
-				
+
 				if child.DoLayout then
 					child:DoLayout()
 				end
@@ -776,8 +779,8 @@ AceGUI:RegisterLayout("Flow",
 				rowoffset = child.alignoffset or (rowheight / 2)
 				rowstartoffset = rowoffset
 			elseif child.width == "relative" then
-				child:SetWidth(width * child.relWidth)
-				
+				safelayoutcall(child, "SetWidth", width * child.relWidth)
+
 				if child.DoLayout then
 					child:DoLayout()
 				end
@@ -786,20 +789,238 @@ AceGUI:RegisterLayout("Flow",
 					frame:SetPoint("RIGHT", content)
 				end
 			end
-			
+
 			if child.height == "fill" then
 				frame:SetPoint("BOTTOM", content)
 				isfullheight = true
 			end
 		end
-		
+
 		--anchor the last row, if its full height needs a special case since  its height has just been changed by the anchor
 		if isfullheight then
 			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height)
 		elseif rowstart then
 			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3))
 		end
-		
+
 		height = height + rowheight + 3
 		safecall(content.obj.LayoutFinished, content.obj, nil, height)
 	end)
+
+-- Get alignment method and value. Possible alignment methods are a callback, a number, "start", "middle", "end", "fill" or "TOPLEFT", "BOTTOMRIGHT" etc.
+local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
+	local fn = cellObj and (cellObj["align" .. dir] or cellObj.align)
+			or colObj and (colObj["align" .. dir] or colObj.align)
+			or tableObj["align" .. dir] or tableObj.align
+			or "CENTERLEFT"
+	local child, cell, val = child or 0, cell or 0, nil
+
+	if type(fn) == "string" then
+		fn = fn:lower()
+		fn = dir == "V" and (fn:sub(1, 3) == "top" and "start" or fn:sub(1, 6) == "bottom" and "end" or fn:sub(1, 6) == "center" and "middle")
+		  or dir == "H" and (fn:sub(-4) == "left" and "start" or fn:sub(-5) == "right" and "end" or fn:sub(-6) == "center" and "middle")
+		  or fn
+		val = (fn == "start" or fn == "fill") and 0 or fn == "end" and cell - child or (cell - child) / 2
+	elseif type(fn) == "function" then
+		val = fn(child or 0, cell, dir)
+	else
+		val = fn
+	end
+
+	return fn, max(0, min(val, cell))
+end
+
+-- Get width or height for multiple cells combined
+local GetCellDimension = function (dir, laneDim, from, to, space)
+	local dim = 0
+	for cell=from,to do
+		dim = dim + (laneDim[cell] or 0)
+	end
+	return dim + max(0, to - from) * (space or 0)
+end
+
+--[[ Options
+============
+Container:
+ - columns ({col, col, ...}): Column settings. "col" can be a number (<= 0: content width, <1: rel. width, <10: weight, >=10: abs. width) or a table with column setting.
+ - space, spaceH, spaceV: Overall, horizontal and vertical spacing between cells.
+ - align, alignH, alignV: Overall, horizontal and vertical cell alignment. See GetCellAlign() for possible values.
+Columns:
+ - width: Fixed column width (nil or <=0: content width, <1: rel. width, >=1: abs. width).
+ - min or 1: Min width for content based width
+ - max or 2: Max width for content based width
+ - weight: Flexible column width. The leftover width after accounting for fixed-width columns is distributed to weighted columns according to their weights.
+ - align, alignH, alignV: Overwrites the container setting for alignment.
+Cell:
+ - colspan: Makes a cell span multiple columns.
+ - rowspan: Makes a cell span multiple rows.
+ - align, alignH, alignV: Overwrites the container and column setting for alignment.
+]]
+AceGUI:RegisterLayout("Table",
+	function (content, children)
+		local obj = content.obj
+		obj:PauseLayout()
+
+		local tableObj = obj:GetUserData("table")
+		local cols = tableObj.columns
+		local spaceH = tableObj.spaceH or tableObj.space or 0
+		local spaceV = tableObj.spaceV or tableObj.space or 0
+		local totalH = (content:GetWidth() or content.width or 0) - spaceH * (#cols - 1)
+
+		-- We need to reuse these because layout events can come in very frequently
+		local layoutCache = obj:GetUserData("layoutCache")
+		if not layoutCache then
+			layoutCache = {{}, {}, {}, {}, {}, {}}
+			obj:SetUserData("layoutCache", layoutCache)
+		end
+		local t, laneH, laneV, rowspans, rowStart, colStart = unpack(layoutCache)
+
+		-- Create the grid
+		local n, slotFound = 0
+		for i,child in ipairs(children) do
+			if child:IsShown() then
+				repeat
+					n = n + 1
+					local col = (n - 1) % #cols + 1
+					local row = ceil(n / #cols)
+					local rowspan = rowspans[col]
+					local cell = rowspan and rowspan.child or child
+					local cellObj = cell:GetUserData("cell")
+					slotFound = not rowspan
+
+					-- Rowspan
+					if not rowspan and cellObj and cellObj.rowspan then
+						rowspan = {child = child, from = row, to = row + cellObj.rowspan - 1}
+						rowspans[col] = rowspan
+					end
+					if rowspan and i == #children then
+						rowspan.to = row
+					end
+
+					-- Colspan
+					local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
+					n = n + colspan
+
+					-- Place the cell
+					if not rowspan or rowspan.to == row then
+						t[n] = cell
+						rowStart[cell] = rowspan and rowspan.from or row
+						colStart[cell] = col
+
+						if rowspan then
+							rowspans[col] = nil
+						end
+					end
+				until slotFound
+			end
+		end
+
+		local rows = ceil(n / #cols)
+
+		-- Determine fixed size cols and collect weights
+		local extantH, totalWeight = totalH, 0
+		for col,colObj in ipairs(cols) do
+			laneH[col] = 0
+
+			if type(colObj) == "number" then
+				colObj = {[colObj >= 1 and colObj < 10 and "weight" or "width"] = colObj}
+				cols[col] = colObj
+			end
+
+			if colObj.weight then
+				-- Weight
+				totalWeight = totalWeight + (colObj.weight or 1)
+			else
+				if not colObj.width or colObj.width <= 0 then
+					-- Content width
+					for row=1,rows do
+						local child = t[(row - 1) * #cols + col]
+						if child then
+							local f = child.frame
+							f:ClearAllPoints()
+							local childH = f:GetWidth() or 0
+
+							laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
+						end
+					end
+
+					laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col]))
+				else
+					-- Rel./Abs. width
+					laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
+				end
+				extantH = max(0, extantH - laneH[col])
+			end
+		end
+
+		-- Determine sizes based on weight
+		local scale = totalWeight > 0 and extantH / totalWeight or 0
+		for col,colObj in pairs(cols) do
+			if colObj.weight then
+				laneH[col] = scale * colObj.weight
+			end
+		end
+
+		-- Arrange children
+		for row=1,rows do
+			local rowV = 0
+
+			-- Horizontal placement and sizing
+			for col=1,#cols do
+				local child = t[(row - 1) * #cols + col]
+				if child then
+					local colObj = cols[colStart[child]]
+					local cellObj = child:GetUserData("cell")
+					local offsetH = GetCellDimension("H", laneH, 1, colStart[child] - 1, spaceH) + (colStart[child] == 1 and 0 or spaceH)
+					local cellH = GetCellDimension("H", laneH, colStart[child], col, spaceH)
+
+					local f = child.frame
+					f:ClearAllPoints()
+					local childH = f:GetWidth() or 0
+
+					local alignFn, align = GetCellAlign("H", tableObj, colObj, cellObj, cellH, childH)
+					f:SetPoint("LEFT", content, offsetH + align, 0)
+					if child:IsFullWidth() or alignFn == "fill" or childH > cellH then
+						f:SetPoint("RIGHT", content, "LEFT", offsetH + align + cellH, 0)
+					end
+
+					if child.DoLayout then
+						child:DoLayout()
+					end
+
+					rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
+				end
+			end
+
+			laneV[row] = rowV
+
+			-- Vertical placement and sizing
+			for col=1,#cols do
+				local child = t[(row - 1) * #cols + col]
+				if child then
+					local colObj = cols[colStart[child]]
+					local cellObj = child:GetUserData("cell")
+					local offsetV = GetCellDimension("V", laneV, 1, rowStart[child] - 1, spaceV) + (rowStart[child] == 1 and 0 or spaceV)
+					local cellV = GetCellDimension("V", laneV, rowStart[child], row, spaceV)
+
+					local f = child.frame
+					local childV = f:GetHeight() or 0
+
+					local alignFn, align = GetCellAlign("V", tableObj, colObj, cellObj, cellV, childV)
+					if child:IsFullHeight() or alignFn == "fill" then
+						f:SetHeight(cellV)
+					end
+					f:SetPoint("TOP", content, 0, -(offsetV + align))
+				end
+			end
+		end
+
+		-- Calculate total height
+		local totalV = GetCellDimension("V", laneV, 1, #laneV, spaceV)
+
+		-- Cleanup
+		for _,v in pairs(layoutCache) do wipe(v) end
+
+		safecall(obj.LayoutFinished, obj, nil, totalV)
+		obj:ResumeLayout()
+	end)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
index 7f92d82..2f8ba04 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
@@ -2,7 +2,7 @@
 BlizOptionsGroup Container
 Simple container widget for the integration of AceGUI into the Blizzard Interface Options
 -------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 20
+local Type, Version = "BlizOptionsGroup", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -36,8 +36,12 @@ local function cancel(frame)
 	frame.obj:Fire("cancel")
 end
 
-local function defaults(frame)
-	frame.obj:Fire("defaults")
+local function default(frame)
+	frame.obj:Fire("default")
+end
+
+local function refresh(frame)
+	frame.obj:Fire("refresh")
 end
 
 --[[-----------------------------------------------------------------------------
@@ -95,13 +99,14 @@ local methods = {
 Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
-	local frame = CreateFrame("Frame")
+	local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
 	frame:Hide()
 
 	-- support functions for the Blizzard Interface Options
 	frame.okay = okay
 	frame.cancel = cancel
-	frame.defaults = defaults
+	frame.default = default
+	frame.refresh = refresh
 
 	frame:SetScript("OnHide", OnHide)
 	frame:SetScript("OnShow", OnShow)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
index b0f81b7..379ea25 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
@@ -2,7 +2,7 @@
 DropdownGroup Container
 Container controlled by a dropdown on the top.
 -------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 21
+local Type, Version = "DropdownGroup", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -125,7 +125,7 @@ local function Constructor()
 	dropdown.frame:Show()
 	dropdown:SetLabel("")
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	border:SetPoint("TOPLEFT", 0, -26)
 	border:SetPoint("BOTTOMRIGHT", 0, 3)
 	border:SetBackdrop(PaneBackdrop)
@@ -150,7 +150,7 @@ local function Constructor()
 		widget[method] = func
 	end
 	dropdown.parentgroup = widget
-	
+
 	return AceGUI:RegisterAsContainer(widget)
 end
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
index 59a8d5f..de7b358 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 22
+local Type, Version = "Frame", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -21,10 +21,14 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 Scripts
 -------------------------------------------------------------------------------]]
 local function Button_OnClick(frame)
-	PlaySound("gsTitleOptionExit")
+	PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT
 	frame.obj:Hide()
 end
 
+local function Frame_OnShow(frame)
+	frame.obj:Fire("OnShow")
+end
+
 local function Frame_OnClose(frame)
 	frame.obj:Fire("OnClose")
 end
@@ -79,10 +83,12 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self.frame:SetParent(UIParent)
 		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
+		self.frame:SetFrameLevel(100) -- Lots of room to draw under it
 		self:SetTitle()
 		self:SetStatusText()
 		self:ApplyStatus()
 		self:Show()
+        self:EnableResize(true)
 	end,
 
 	["OnRelease"] = function(self)
@@ -127,6 +133,13 @@ local methods = {
 		self.frame:Show()
 	end,
 
+	["EnableResize"] = function(self, state)
+		local func = state and "Show" or "Hide"
+		self.sizer_se[func](self.sizer_se)
+		self.sizer_s[func](self.sizer_s)
+		self.sizer_e[func](self.sizer_e)
+	end,
+
 	-- called to set an external table to store status in
 	["SetStatusTable"] = function(self, status)
 		assert(type(status) == "table")
@@ -167,17 +180,19 @@ local PaneBackdrop  = {
 }
 
 local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
+	local frame = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	frame:Hide()
 
 	frame:EnableMouse(true)
 	frame:SetMovable(true)
 	frame:SetResizable(true)
 	frame:SetFrameStrata("FULLSCREEN_DIALOG")
+	frame:SetFrameLevel(100) -- Lots of room to draw under it
 	frame:SetBackdrop(FrameBackdrop)
 	frame:SetBackdropColor(0, 0, 0, 1)
 	frame:SetMinResize(400, 200)
 	frame:SetToplevel(true)
+	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
 	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
 
@@ -188,7 +203,7 @@ local function Constructor()
 	closebutton:SetWidth(100)
 	closebutton:SetText(CLOSE)
 
-	local statusbg = CreateFrame("Button", nil, frame)
+	local statusbg = CreateFrame("Button", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
 	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
 	statusbg:SetHeight(24)
@@ -206,7 +221,7 @@ local function Constructor()
 	statustext:SetText("")
 
 	local titlebg = frame:CreateTexture(nil, "OVERLAY")
-	titlebg:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
+	titlebg:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header
 	titlebg:SetTexCoord(0.31, 0.67, 0, 0.63)
 	titlebg:SetPoint("TOP", 0, 12)
 	titlebg:SetWidth(100)
@@ -222,14 +237,14 @@ local function Constructor()
 	titletext:SetPoint("TOP", titlebg, "TOP", 0, -14)
 
 	local titlebg_l = frame:CreateTexture(nil, "OVERLAY")
-	titlebg_l:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
+	titlebg_l:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header
 	titlebg_l:SetTexCoord(0.21, 0.31, 0, 0.63)
 	titlebg_l:SetPoint("RIGHT", titlebg, "LEFT")
 	titlebg_l:SetWidth(30)
 	titlebg_l:SetHeight(40)
 
 	local titlebg_r = frame:CreateTexture(nil, "OVERLAY")
-	titlebg_r:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
+	titlebg_r:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header
 	titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63)
 	titlebg_r:SetPoint("LEFT", titlebg, "RIGHT")
 	titlebg_r:SetWidth(30)
@@ -247,7 +262,7 @@ local function Constructor()
 	line1:SetWidth(14)
 	line1:SetHeight(14)
 	line1:SetPoint("BOTTOMRIGHT", -8, 8)
-	line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+	line1:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 	local x = 0.1 * 14/17
 	line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
@@ -255,7 +270,7 @@ local function Constructor()
 	line2:SetWidth(8)
 	line2:SetHeight(8)
 	line2:SetPoint("BOTTOMRIGHT", -8, 8)
-	line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+	line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 	local x = 0.1 * 8/17
 	line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
@@ -285,6 +300,9 @@ local function Constructor()
 		titletext   = titletext,
 		statustext  = statustext,
 		titlebg     = titlebg,
+		sizer_se    = sizer_se,
+		sizer_s     = sizer_s,
+		sizer_e     = sizer_e,
 		content     = content,
 		frame       = frame,
 		type        = Type
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
index 9413611..357e843 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
@@ -2,7 +2,7 @@
 InlineGroup Container
 Simple container widget that creates a visible "box" with an optional title.
 -------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 20
+local Type, Version = "InlineGroup", 22
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -19,6 +19,7 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self:SetWidth(300)
 		self:SetHeight(100)
+		self:SetTitle("")
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -74,7 +75,7 @@ local function Constructor()
 	titletext:SetJustifyH("LEFT")
 	titletext:SetHeight(18)
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	border:SetPoint("TOPLEFT", 0, -17)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
index 10a4d58..d110d03 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
@@ -2,13 +2,13 @@
 ScrollFrame Container
 Plain container that scrolls its content and doesn't grow in height.
 -------------------------------------------------------------------------------]]
-local Type, Version = "ScrollFrame", 21
+local Type, Version = "ScrollFrame", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
 local pairs, assert, type = pairs, assert, type
-local min, max, floor, abs = math.min, math.max, math.floor, math.abs
+local min, max, floor = math.min, math.max, math.floor
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
@@ -40,8 +40,9 @@ end
 Methods
 -------------------------------------------------------------------------------]]
 local methods = {
-	["OnAcquire"] = function(self) 
+	["OnAcquire"] = function(self)
 		self:SetScroll(0)
+		self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
 	end,
 
 	["OnRelease"] = function(self)
@@ -52,7 +53,7 @@ local methods = {
 		self.scrollframe:SetPoint("BOTTOMRIGHT")
 		self.scrollbar:Hide()
 		self.scrollBarShown = nil
-		self.content.height, self.content.width = nil, nil
+		self.content.height, self.content.width, self.content.original_width = nil, nil, nil
 	end,
 
 	["SetScroll"] = function(self, value)
@@ -76,7 +77,7 @@ local methods = {
 	["MoveScroll"] = function(self, value)
 		local status = self.status or self.localstatus
 		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
-		
+
 		if self.scrollBarShown then
 			local diff = height - viewheight
 			local delta = 1
@@ -93,7 +94,6 @@ local methods = {
 		local status = self.status or self.localstatus
 		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
 		local offset = status.offset or 0
-		local curvalue = self.scrollbar:GetValue()
 		-- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys
 		-- No-one is going to miss 2 pixels at the bottom of the frame, anyhow!
 		if viewheight < height + 2 then
@@ -102,6 +102,9 @@ local methods = {
 				self.scrollbar:Hide()
 				self.scrollbar:SetValue(0)
 				self.scrollframe:SetPoint("BOTTOMRIGHT")
+				if self.content.original_width then
+					self.content.width = self.content.original_width
+				end
 				self:DoLayout()
 			end
 		else
@@ -109,6 +112,9 @@ local methods = {
 				self.scrollBarShown = true
 				self.scrollbar:Show()
 				self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0)
+				if self.content.original_width then
+					self.content.width = self.content.original_width - 20
+				end
 				self:DoLayout()
 			end
 			local value = (offset / (viewheight - height) * 1000)
@@ -127,6 +133,11 @@ local methods = {
 
 	["LayoutFinished"] = function(self, width, height)
 		self.content:SetHeight(height or 0 + 20)
+
+		-- update the scrollframe
+		self:FixScroll()
+
+		-- schedule another update when everything has "settled"
 		self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
 	end,
 
@@ -140,7 +151,8 @@ local methods = {
 
 	["OnWidthSet"] = function(self, width)
 		local content = self.content
-		content.width = width
+		content.width = width - (self.scrollBarShown and 20 or 0)
+		content.original_width = width
 	end,
 
 	["OnHeightSet"] = function(self, height)
@@ -175,7 +187,7 @@ local function Constructor()
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0, 0, 0, 0.4)
+	scrollbg:SetColorTexture(0, 0, 0, 0.4)
 
 	--Container Support
 	local content = CreateFrame("Frame", nil, scrollframe)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
index df6f5ad..3e45541 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
@@ -2,12 +2,12 @@
 TabGroup Container
 Container that uses tabs on top to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 34
+local Type, Version = "TabGroup", 37
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
-local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
+local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, table.wipe
 
 -- WoW APIs
 local PlaySound = PlaySound
@@ -23,13 +23,6 @@ local widths = {}
 local rowwidths = {}
 local rowends = {}
 
--- Determine if we're on WoW 4.0.6 or not.
-local wow_406
-do
-	local _,wow_build = GetBuildInfo()
-	wow_406 = tonumber(wow_build) >= 13596
-end
-
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -46,11 +39,7 @@ end
 local function Tab_SetText(frame, text)
 	frame:_SetText(text)
 	local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0
-	if wow_406 then
-		PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth())
-	else
-		PanelTemplates_TabResize(frame, 0, nil, width)
-	end
+	PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth())
 end
 
 local function Tab_SetSelected(frame, selected)
@@ -74,7 +63,7 @@ Scripts
 -------------------------------------------------------------------------------]]
 local function Tab_OnClick(frame)
 	if not (frame.selected or frame.disabled) then
-		PlaySound("igCharacterInfoTab")
+		PlaySound(841) -- SOUNDKIT.IG_CHARACTER_INFO_TAB
 		frame.obj:SelectTab(frame.value)
 	end
 end
@@ -172,22 +161,21 @@ local methods = {
 		self.tablist = tabs
 		self:BuildTabs()
 	end,
-	
+
 
 	["BuildTabs"] = function(self)
 		local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "")
-		local status = self.status or self.localstatus
 		local tablist = self.tablist
 		local tabs = self.tabs
-		
+
 		if not tablist then return end
-		
+
 		local width = self.frame.width or self.frame:GetWidth() or 0
-		
+
 		wipe(widths)
 		wipe(rowwidths)
 		wipe(rowends)
-		
+
 		--Place Text into tabs and get thier initial width
 		for i, v in ipairs(tablist) do
 			local tab = tabs[i]
@@ -195,19 +183,19 @@ local methods = {
 				tab = self:CreateTab(i)
 				tabs[i] = tab
 			end
-			
+
 			tab:Show()
 			tab:SetText(v.text)
 			tab:SetDisabled(v.disabled)
 			tab.value = v.value
-			
+
 			widths[i] = tab:GetWidth() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text
 		end
-		
+
 		for i = (#tablist)+1, #tabs, 1 do
 			tabs[i]:Hide()
 		end
-		
+
 		--First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout
 		local numtabs = #tablist
 		local numrows = 1
@@ -225,7 +213,7 @@ local methods = {
 		end
 		rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px
 		rowends[numrows] = #tablist
-		
+
 		--Fix for single tabs being left on the last row, move a tab from the row above if applicable
 		if numrows > 1 then
 			--if the last row has only one tab
@@ -256,26 +244,22 @@ local methods = {
 					tab:SetPoint("LEFT", tabs[tabno-1], "RIGHT", -10, 0)
 				end
 			end
-			
+
 			-- equal padding for each tab to fill the available width,
 			-- if the used space is above 75% already
-			-- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame, 
+			-- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame,
 			-- and not have the tabs jump around funny when switching between tabs that need scrolling and those that don't
 			local padding = 0
 			if not (numrows == 1 and rowwidths[1] < width*0.75 - 18) then
 				padding = (width - rowwidths[row]) / (endtab - starttab+1)
 			end
-			
+
 			for i = starttab, endtab do
-				if wow_406 then
-					PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth())
-				else
-					PanelTemplates_TabResize(tabs[i], padding + 4, nil, width)
-				end
+				PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth())
 			end
 			starttab = endtab + 1
 		end
-		
+
 		self.borderoffset = (hastitle and 17 or 10)+((numrows)*20)
 		self.border:SetPoint("TOPLEFT", 1, -self.borderoffset)
 	end,
@@ -301,7 +285,7 @@ local methods = {
 		content:SetHeight(contentheight)
 		content.height = contentheight
 	end,
-	
+
 	["LayoutFinished"] = function(self, width, height)
 		if self.noAutoHeight then return end
 		self:SetHeight((height or 0) + (self.borderoffset + 23))
@@ -332,7 +316,7 @@ local function Constructor()
 	titletext:SetHeight(18)
 	titletext:SetText("")
 
-	local border = CreateFrame("Frame", nil, frame)
+	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	border:SetPoint("TOPLEFT", 1, -27)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)
@@ -358,7 +342,7 @@ local function Constructor()
 	for method, func in pairs(methods) do
 		widget[method] = func
 	end
-	
+
 	return AceGUI:RegisterAsContainer(widget)
 end
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
index 592cea1..cdc8051 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
@@ -2,21 +2,21 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 33
+local Type, Version = "TreeGroup", 45
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
 local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
 local math_min, math_max, floor = math.min, math.max, floor
-local select, tremove, unpack = select, table.remove, unpack
+local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
 -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
 -- List them here for Mikk's FindGlobals script
--- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE
+-- GLOBALS: FONT_COLOR_CODE_CLOSE
 
 -- Recycling functions
 local new, del
@@ -34,7 +34,7 @@ do
 	function del(t)
 		for k in pairs(t) do
 			t[k] = nil
-		end	
+		end
 		pool[t] = true
 	end
 end
@@ -57,7 +57,6 @@ end
 local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
 	local self = button.obj
 	local toggle = button.toggle
-	local frame = self.frame
 	local text = treeline.text or ""
 	local icon = treeline.icon
 	local iconCoords = treeline.iconCoords
@@ -65,7 +64,7 @@ local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
 	local value = treeline.value
 	local uniquevalue = treeline.uniquevalue
 	local disabled = treeline.disabled
-	
+
 	button.treeline = treeline
 	button.value = value
 	button.uniquevalue = uniquevalue
@@ -76,8 +75,6 @@ local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
 		button:UnlockHighlight()
 		button.selected = false
 	end
-	local normalTexture = button:GetNormalTexture()
-	local line = button.line
 	button.level = level
 	if ( level == 1 ) then
 		button:SetNormalFontObject("GameFontNormal")
@@ -88,7 +85,7 @@ local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
 		button:SetHighlightFontObject("GameFontHighlightSmall")
 		button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2)
 	end
-	
+
 	if disabled then
 		button:EnableMouse(false)
 		button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE)
@@ -96,27 +93,27 @@ local function UpdateButton(button, treeline, selected, canExpand, isExpanded)
 		button.text:SetText(text)
 		button:EnableMouse(true)
 	end
-	
+
 	if icon then
 		button.icon:SetTexture(icon)
 		button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1)
 	else
 		button.icon:SetTexture(nil)
 	end
-	
+
 	if iconCoords then
 		button.icon:SetTexCoord(unpack(iconCoords))
 	else
 		button.icon:SetTexCoord(0, 1, 0, 1)
 	end
-	
+
 	if canExpand then
 		if not isExpanded then
-			toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP")
-			toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN")
+			toggle:SetNormalTexture(130838) -- Interface\\Buttons\\UI-PlusButton-UP
+			toggle:SetPushedTexture(130836) -- Interface\\Buttons\\UI-PlusButton-DOWN
 		else
-			toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-UP")
-			toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-DOWN")
+			toggle:SetNormalTexture(130821) -- Interface\\Buttons\\UI-MinusButton-UP
+			toggle:SetPushedTexture(130820) -- Interface\\Buttons\\UI-MinusButton-DOWN
 		end
 		toggle:Show()
 	else
@@ -162,7 +159,7 @@ end
 local function FirstFrameUpdate(frame)
 	local self = frame.obj
 	frame:SetScript("OnUpdate", nil)
-	self:RefreshTree()
+	self:RefreshTree(nil, true)
 end
 
 local function BuildUniqueValue(...)
@@ -199,7 +196,6 @@ end
 
 local function Button_OnDoubleClick(button)
 	local self = button.obj
-	local status = self.status or self.localstatus
 	local status = (self.status or self.localstatus).groups
 	status[button.uniquevalue] = not status[button.uniquevalue]
 	self:RefreshTree()
@@ -210,11 +206,13 @@ local function Button_OnEnter(frame)
 	self:Fire("OnButtonEnter", frame.uniquevalue, frame)
 
 	if self.enabletooltips then
-		GameTooltip:SetOwner(frame, "ANCHOR_NONE")
-		GameTooltip:SetPoint("LEFT",frame,"RIGHT")
-		GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1)
+		local tooltip = AceGUI.tooltip
+		tooltip:SetOwner(frame, "ANCHOR_NONE")
+		tooltip:ClearAllPoints()
+		tooltip:SetPoint("LEFT",frame,"RIGHT")
+		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true)
 
-		GameTooltip:Show()
+		tooltip:Show()
 	end
 end
 
@@ -223,7 +221,7 @@ local function Button_OnLeave(frame)
 	self:Fire("OnButtonLeave", frame.uniquevalue, frame)
 
 	if self.enabletooltips then
-		GameTooltip:Hide()
+		AceGUI.tooltip:Hide()
 	end
 end
 
@@ -231,7 +229,7 @@ local function OnScrollValueChanged(frame, value)
 	if frame.obj.noupdate then return end
 	local self = frame.obj
 	local status = self.status or self.localstatus
-	status.scrollvalue = value
+	status.scrollvalue = floor(value + 0.5)
 	self:RefreshTree()
 	AceGUI:ClearFocus()
 end
@@ -269,18 +267,19 @@ end
 local function Dragger_OnMouseUp(frame)
 	local treeframe = frame:GetParent()
 	local self = treeframe.obj
-	local frame = treeframe:GetParent()
+	local treeframeParent = treeframe:GetParent()
 	treeframe:StopMovingOrSizing()
 	--treeframe:SetScript("OnUpdate", nil)
 	treeframe:SetUserPlaced(false)
 	--Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize
 	treeframe:SetHeight(0)
-	treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0)
-	treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0)
-	
+	treeframe:ClearAllPoints()
+	treeframe:SetPoint("TOPLEFT", treeframeParent, "TOPLEFT",0,0)
+	treeframe:SetPoint("BOTTOMLEFT", treeframeParent, "BOTTOMLEFT",0,0)
+
 	local status = self.status or self.localstatus
 	status.treewidth = treeframe:GetWidth()
-	
+
 	treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth())
 	-- recalculate the content width
 	treeframe.obj:OnWidthSet(status.fullwidth)
@@ -295,10 +294,13 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE)
 		self:EnableButtonTooltips(true)
+		self.frame:SetScript("OnUpdate", FirstFrameUpdate)
 	end,
 
 	["OnRelease"] = function(self)
 		self.status = nil
+		self.tree = nil
+		self.frame:SetScript("OnUpdate", nil)
 		for k, v in pairs(self.localstatus) do
 			if k == "groups" then
 				for k2 in pairs(v) do
@@ -335,6 +337,8 @@ local methods = {
 		button.toggle.button = button
 		button.toggle:SetScript("OnClick",Expand_OnClick)
 
+		button.text:SetHeight(14) -- Prevents text wrapping
+
 		return button
 	end,
 
@@ -360,8 +364,8 @@ local methods = {
 	--sets the tree to be displayed
 	["SetTree"] = function(self, tree, filter)
 		self.filter = filter
-		if tree then 
-			assert(type(tree) == "table") 
+		if tree then
+			assert(type(tree) == "table")
 		end
 		self.tree = tree
 		self:RefreshTree()
@@ -369,8 +373,7 @@ local methods = {
 
 	["BuildLevel"] = function(self, tree, level, parent)
 		local groups = (self.status or self.localstatus).groups
-		local hasChildren = self.hasChildren
-		
+
 		for i, v in ipairs(tree) do
 			if v.children then
 				if not self.filter or ShouldDisplayLevel(v.children) then
@@ -385,8 +388,8 @@ local methods = {
 		end
 	end,
 
-	["RefreshTree"] = function(self)
-		local buttons = self.buttons 
+	["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
+		local buttons = self.buttons
 		local lines = self.lines
 
 		for i, v in ipairs(buttons) do
@@ -408,6 +411,8 @@ local methods = {
 
 		local treeframe = self.treeframe
 
+		status.scrollToSelection = status.scrollToSelection or scrollToSelection	-- needs to be cached in case the control hasn't been drawn yet (code bails out below)
+
 		self:BuildLevel(tree, 1)
 
 		local numlines = #lines
@@ -415,8 +420,16 @@ local methods = {
 		local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
 		if maxlines <= 0 then return end
 
+		if self.frame:GetParent() == UIParent and not fromOnUpdate then
+			self.frame:SetScript("OnUpdate", FirstFrameUpdate)
+			return
+		end
+
 		local first, last
 
+		scrollToSelection = status.scrollToSelection
+		status.scrollToSelection = nil
+
 		if numlines <= maxlines then
 			--the whole tree fits in the frame
 			status.scrollvalue = 0
@@ -431,11 +444,33 @@ local methods = {
 			if numlines - status.scrollvalue < maxlines then
 				status.scrollvalue = numlines - maxlines
 			end
+			self.noupdate = nil
+			first, last = status.scrollvalue+1, status.scrollvalue + maxlines
+			--show selection?
+			if scrollToSelection and status.selected then
+				local show
+				for i,line in ipairs(lines) do	-- find the line number
+					if line.uniquevalue==status.selected then
+						show=i
+					end
+				end
+				if not show then
+					-- selection was deleted or something?
+				elseif show>=first and show<=last then
+					-- all good
+				else
+					-- scrolling needed!
+					if show<first then
+						status.scrollvalue = show-1
+					else
+						status.scrollvalue = show-maxlines
+					end
+					first, last = status.scrollvalue+1, status.scrollvalue + maxlines
+				end
+			end
 			if self.scrollbar:GetValue() ~= status.scrollvalue then
 				self.scrollbar:SetValue(status.scrollvalue)
 			end
-			self.noupdate = nil
-			first, last = status.scrollvalue+1, status.scrollvalue + maxlines
 		end
 
 		local buttonnum = 1
@@ -467,8 +502,9 @@ local methods = {
 			button:Show()
 			buttonnum = buttonnum + 1
 		end
+
 	end,
-	
+
 	["SetSelected"] = function(self, value)
 		local status = self.status or self.localstatus
 		if status.selected ~= value then
@@ -481,11 +517,12 @@ local methods = {
 		self.filter = false
 		local status = self.status or self.localstatus
 		local groups = status.groups
-		for i = 1, select('#', ...) do
-			groups[BuildUniqueValue(select(i, ...))] = true
+		local path = {...}
+		for i = 1, #path do
+			groups[tconcat(path, "\001", 1, i)] = true
 		end
 		status.selected = uniquevalue
-		self:RefreshTree()
+		self:RefreshTree(true)
 		self:Fire("OnGroupSelected", uniquevalue)
 	end,
 
@@ -517,16 +554,16 @@ local methods = {
 		local treeframe = self.treeframe
 		local status = self.status or self.localstatus
 		status.fullwidth = width
-		
+
 		local contentwidth = width - status.treewidth - 20
 		if contentwidth < 0 then
 			contentwidth = 0
 		end
 		content:SetWidth(contentwidth)
 		content.width = contentwidth
-		
+
 		local maxtreewidth = math_min(400, width - 50)
-		
+
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
@@ -552,16 +589,16 @@ local methods = {
 				treewidth = DEFAULT_TREE_WIDTH
 			else
 				resizable = false
-				treewidth = DEFAULT_TREE_WIDTH 
+				treewidth = DEFAULT_TREE_WIDTH
 			end
 		end
 		self.treeframe:SetWidth(treewidth)
 		self.dragger:EnableMouse(resizable)
-		
+
 		local status = self.status or self.localstatus
 		status.treewidth = treewidth
 		status.treesizable = resizable
-		
+
 		-- recalculate the content width
 		if status.fullwidth then
 			self:OnWidthSet(status.fullwidth)
@@ -592,7 +629,7 @@ local PaneBackdrop  = {
 local DraggerBackdrop  = {
 	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
 	edgeFile = nil,
-	tile = true, tileSize = 16, edgeSize = 0,
+	tile = true, tileSize = 16, edgeSize = 1,
 	insets = { left = 3, right = 3, top = 7, bottom = 7 }
 }
 
@@ -600,7 +637,7 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 	local frame = CreateFrame("Frame", nil, UIParent)
 
-	local treeframe = CreateFrame("Frame", nil, frame)
+	local treeframe = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	treeframe:SetPoint("TOPLEFT")
 	treeframe:SetPoint("BOTTOMLEFT")
 	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
@@ -615,7 +652,7 @@ local function Constructor()
 	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
 	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
 
-	local dragger = CreateFrame("Frame", nil, treeframe)
+	local dragger = CreateFrame("Frame", nil, treeframe, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	dragger:SetWidth(8)
 	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
 	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
@@ -638,9 +675,9 @@ local function Constructor()
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0,0,0,0.4)
+	scrollbg:SetColorTexture(0,0,0,0.4)
 
-	local border = CreateFrame("Frame",nil,frame)
+	local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
 	border:SetPoint("BOTTOMRIGHT")
 	border:SetBackdrop(PaneBackdrop)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
index bb0a2a2..2e28a3d 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
@@ -21,26 +21,30 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 ]]
 do
 	local Type = "Window"
-	local Version = 4
+	local Version = 6
+
+	local function frameOnShow(this)
+		this.obj:Fire("OnShow")
+	end
 
 	local function frameOnClose(this)
 		this.obj:Fire("OnClose")
 	end
-	
+
 	local function closeOnClick(this)
-		PlaySound("gsTitleOptionExit")
+		PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT
 		this.obj:Hide()
 	end
-	
+
 	local function frameOnMouseDown(this)
 		AceGUI:ClearFocus()
 	end
-	
+
 	local function titleOnMouseDown(this)
 		this:GetParent():StartMoving()
 		AceGUI:ClearFocus()
 	end
-	
+
 	local function frameOnMouseUp(this)
 		local frame = this:GetParent()
 		frame:StopMovingOrSizing()
@@ -51,22 +55,22 @@ do
 		status.top = frame:GetTop()
 		status.left = frame:GetLeft()
 	end
-	
+
 	local function sizerseOnMouseDown(this)
 		this:GetParent():StartSizing("BOTTOMRIGHT")
 		AceGUI:ClearFocus()
 	end
-	
+
 	local function sizersOnMouseDown(this)
 		this:GetParent():StartSizing("BOTTOM")
 		AceGUI:ClearFocus()
 	end
-	
+
 	local function sizereOnMouseDown(this)
 		this:GetParent():StartSizing("RIGHT")
 		AceGUI:ClearFocus()
 	end
-	
+
 	local function sizerOnMouseUp(this)
 		this:GetParent():StopMovingOrSizing()
 	end
@@ -74,19 +78,19 @@ do
 	local function SetTitle(self,title)
 		self.titletext:SetText(title)
 	end
-	
+
 	local function SetStatusText(self,text)
 		-- self.statustext:SetText(text)
 	end
-	
+
 	local function Hide(self)
 		self.frame:Hide()
 	end
-	
+
 	local function Show(self)
 		self.frame:Show()
 	end
-	
+
 	local function OnAcquire(self)
 		self.frame:SetParent(UIParent)
 		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
@@ -94,21 +98,21 @@ do
 		self:EnableResize(true)
 		self:Show()
 	end
-	
+
 	local function OnRelease(self)
 		self.status = nil
 		for k in pairs(self.localstatus) do
 			self.localstatus[k] = nil
 		end
 	end
-	
+
 	-- called to set an external table to store status in
 	local function SetStatusTable(self, status)
 		assert(type(status) == "table")
 		self.status = status
 		self:ApplyStatus()
 	end
-	
+
 	local function ApplyStatus(self)
 		local status = self.status or self.localstatus
 		local frame = self.frame
@@ -121,7 +125,7 @@ do
 			frame:SetPoint("CENTER",UIParent,"CENTER")
 		end
 	end
-	
+
 	local function OnWidthSet(self, width)
 		local content = self.content
 		local contentwidth = width - 34
@@ -131,8 +135,8 @@ do
 		content:SetWidth(contentwidth)
 		content.width = contentwidth
 	end
-	
-	
+
+
 	local function OnHeightSet(self, height)
 		local content = self.content
 		local contentheight = height - 57
@@ -142,19 +146,19 @@ do
 		content:SetHeight(contentheight)
 		content.height = contentheight
 	end
-	
+
 	local function EnableResize(self, state)
 		local func = state and "Show" or "Hide"
 		self.sizer_se[func](self.sizer_se)
 		self.sizer_s[func](self.sizer_s)
 		self.sizer_e[func](self.sizer_e)
 	end
-	
+
 	local function Constructor()
 		local frame = CreateFrame("Frame",nil,UIParent)
 		local self = {}
 		self.type = "Window"
-		
+
 		self.Hide = Hide
 		self.Show = Show
 		self.SetTitle =  SetTitle
@@ -166,9 +170,9 @@ do
 		self.OnWidthSet = OnWidthSet
 		self.OnHeightSet = OnHeightSet
 		self.EnableResize = EnableResize
-		
+
 		self.localstatus = {}
-		
+
 		self.frame = frame
 		frame.obj = self
 		frame:SetWidth(700)
@@ -179,90 +183,91 @@ do
 		frame:SetResizable(true)
 		frame:SetFrameStrata("FULLSCREEN_DIALOG")
 		frame:SetScript("OnMouseDown", frameOnMouseDown)
-		
+
+		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
 		frame:SetMinResize(240,240)
 		frame:SetToplevel(true)
 
 		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
-		titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]])
+		titlebg:SetTexture(251966) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Title-Background
 		titlebg:SetPoint("TOPLEFT", 9, -6)
 		titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24)
-		
+
 		local dialogbg = frame:CreateTexture(nil, "BACKGROUND")
-		dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]])
+		dialogbg:SetTexture(137056) -- Interface\\Tooltips\\UI-Tooltip-Background
 		dialogbg:SetPoint("TOPLEFT", 8, -24)
 		dialogbg:SetPoint("BOTTOMRIGHT", -6, 8)
 		dialogbg:SetVertexColor(0, 0, 0, .75)
-		
+
 		local topleft = frame:CreateTexture(nil, "BORDER")
-		topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		topleft:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		topleft:SetWidth(64)
 		topleft:SetHeight(64)
 		topleft:SetPoint("TOPLEFT")
 		topleft:SetTexCoord(0.501953125, 0.625, 0, 1)
-		
+
 		local topright = frame:CreateTexture(nil, "BORDER")
-		topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		topright:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		topright:SetWidth(64)
 		topright:SetHeight(64)
 		topright:SetPoint("TOPRIGHT")
 		topright:SetTexCoord(0.625, 0.75, 0, 1)
-		
+
 		local top = frame:CreateTexture(nil, "BORDER")
-		top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		top:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		top:SetHeight(64)
 		top:SetPoint("TOPLEFT", topleft, "TOPRIGHT")
 		top:SetPoint("TOPRIGHT", topright, "TOPLEFT")
 		top:SetTexCoord(0.25, 0.369140625, 0, 1)
-		
+
 		local bottomleft = frame:CreateTexture(nil, "BORDER")
-		bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		bottomleft:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		bottomleft:SetWidth(64)
 		bottomleft:SetHeight(64)
 		bottomleft:SetPoint("BOTTOMLEFT")
 		bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1)
-		
+
 		local bottomright = frame:CreateTexture(nil, "BORDER")
-		bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		bottomright:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		bottomright:SetWidth(64)
 		bottomright:SetHeight(64)
 		bottomright:SetPoint("BOTTOMRIGHT")
 		bottomright:SetTexCoord(0.875, 1, 0, 1)
-		
+
 		local bottom = frame:CreateTexture(nil, "BORDER")
-		bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		bottom:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		bottom:SetHeight(64)
 		bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT")
 		bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT")
 		bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1)
-		
+
 		local left = frame:CreateTexture(nil, "BORDER")
-		left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		left:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		left:SetWidth(64)
 		left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT")
 		left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT")
 		left:SetTexCoord(0.001953125, 0.125, 0, 1)
-		
+
 		local right = frame:CreateTexture(nil, "BORDER")
-		right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
+		right:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border
 		right:SetWidth(64)
 		right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT")
 		right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT")
 		right:SetTexCoord(0.1171875, 0.2421875, 0, 1)
-		
+
 		local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton")
 		close:SetPoint("TOPRIGHT", 2, 1)
 		close:SetScript("OnClick", closeOnClick)
 		self.closebutton = close
 		close.obj = self
-		
+
 		local titletext = frame:CreateFontString(nil, "ARTWORK")
 		titletext:SetFontObject(GameFontNormal)
 		titletext:SetPoint("TOPLEFT", 12, -8)
 		titletext:SetPoint("TOPRIGHT", -32, -8)
 		self.titletext = titletext
-		
+
 		local title = CreateFrame("Button", nil, frame)
 		title:SetPoint("TOPLEFT", titlebg)
 		title:SetPoint("BOTTOMRIGHT", titlebg)
@@ -270,7 +275,7 @@ do
 		title:SetScript("OnMouseDown",titleOnMouseDown)
 		title:SetScript("OnMouseUp", frameOnMouseUp)
 		self.title = title
-		
+
 		local sizer_se = CreateFrame("Frame",nil,frame)
 		sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
 		sizer_se:SetWidth(25)
@@ -285,7 +290,7 @@ do
 		line1:SetWidth(14)
 		line1:SetHeight(14)
 		line1:SetPoint("BOTTOMRIGHT", -8, 8)
-		line1:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+		line1:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 		local x = 0.1 * 14/17
 		line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
@@ -294,7 +299,7 @@ do
 		line2:SetWidth(8)
 		line2:SetHeight(8)
 		line2:SetPoint("BOTTOMRIGHT", -8, 8)
-		line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+		line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 		local x = 0.1 * 8/17
 		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
@@ -306,7 +311,7 @@ do
 		sizer_s:SetScript("OnMouseDown",sizersOnMouseDown)
 		sizer_s:SetScript("OnMouseUp", sizerOnMouseUp)
 		self.sizer_s = sizer_s
-		
+
 		local sizer_e = CreateFrame("Frame",nil,frame)
 		sizer_e:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,25)
 		sizer_e:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
@@ -315,17 +320,17 @@ do
 		sizer_e:SetScript("OnMouseDown",sizereOnMouseDown)
 		sizer_e:SetScript("OnMouseUp", sizerOnMouseUp)
 		self.sizer_e = sizer_e
-	
+
 		--Container Support
 		local content = CreateFrame("Frame",nil,frame)
 		self.content = content
 		content.obj = self
 		content:SetPoint("TOPLEFT",frame,"TOPLEFT",12,-32)
 		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13)
-		
+
 		AceGUI:RegisterAsContainer(self)
-		return self	
+		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(Type,Constructor,Version)
 end
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Button.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Button.lua
index 901f874..0e286ca 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Button.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Button.lua
@@ -2,7 +2,7 @@
 Button Widget
 Graphical Button.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Button", 21
+local Type, Version = "Button", 24
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -18,7 +18,7 @@ Scripts
 -------------------------------------------------------------------------------]]
 local function Button_OnClick(frame, ...)
 	AceGUI:ClearFocus()
-	PlaySound("igMainMenuOption")
+	PlaySound(852) -- SOUNDKIT.IG_MAINMENU_OPTION
 	frame.obj:Fire("OnClick", ...)
 end
 
@@ -39,6 +39,7 @@ local methods = {
 		self:SetHeight(24)
 		self:SetWidth(200)
 		self:SetDisabled(false)
+		self:SetAutoWidth(false)
 		self:SetText()
 	end,
 
@@ -46,6 +47,16 @@ local methods = {
 
 	["SetText"] = function(self, text)
 		self.text:SetText(text)
+		if self.autoWidth then
+			self:SetWidth(self.text:GetStringWidth() + 30)
+		end
+	end,
+
+	["SetAutoWidth"] = function(self, autoWidth)
+		self.autoWidth = autoWidth
+		if self.autoWidth then
+			self:SetWidth(self.text:GetStringWidth() + 30)
+		end
 	end,
 
 	["SetDisabled"] = function(self, disabled)
@@ -63,7 +74,7 @@ Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
 	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
+	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
 	frame:Hide()
 
 	frame:EnableMouse(true)
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-CheckBox.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-CheckBox.lua
index 34a2591..53ef618 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-CheckBox.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-CheckBox.lua
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Checkbox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "CheckBox", 21
+local Type, Version = "CheckBox", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -26,7 +26,7 @@ local function AlignImage(self)
 		self.text:SetPoint("LEFT", self.checkbg, "RIGHT")
 		self.text:SetPoint("RIGHT")
 	else
-		self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0)
+		self.text:SetPoint("LEFT", self.image, "RIGHT", 1, 0)
 		self.text:SetPoint("RIGHT")
 	end
 end
@@ -60,9 +60,9 @@ local function CheckBox_OnMouseUp(frame)
 		self:ToggleChecked()
 
 		if self.checked then
-			PlaySound("igMainMenuOptionCheckBoxOn")
+			PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		else -- for both nil and false (tristate)
-			PlaySound("igMainMenuOptionCheckBoxOff")
+			PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF
 		end
 
 		self:Fire("OnValueChanged", self.checked)
@@ -91,7 +91,7 @@ local methods = {
 		if self.desc then
 			self.desc:SetWidth(width - 30)
 			if self.desc:GetText() and self.desc:GetText() ~= "" then
-				self:SetHeight(28 + self.desc:GetHeight())
+				self:SetHeight(28 + self.desc:GetStringHeight())
 			end
 		end
 	end,
@@ -102,6 +102,9 @@ local methods = {
 			self.frame:Disable()
 			self.text:SetTextColor(0.5, 0.5, 0.5)
 			SetDesaturation(self.check, true)
+			if self.desc then
+				self.desc:SetTextColor(0.5, 0.5, 0.5)
+			end
 		else
 			self.frame:Enable()
 			self.text:SetTextColor(1, 1, 1)
@@ -110,23 +113,26 @@ local methods = {
 			else
 				SetDesaturation(self.check, false)
 			end
+			if self.desc then
+				self.desc:SetTextColor(1, 1, 1)
+			end
 		end
 	end,
 
-	["SetValue"] = function(self,value)
+	["SetValue"] = function(self, value)
 		local check = self.check
 		self.checked = value
 		if value then
-			SetDesaturation(self.check, false)
-			self.check:Show()
+			SetDesaturation(check, false)
+			check:Show()
 		else
 			--Nil is the unknown tristate value
 			if self.tristate and value == nil then
-				SetDesaturation(self.check, true)
-				self.check:Show()
+				SetDesaturation(check, true)
+				check:Show()
 			else
-				SetDesaturation(self.check, false)
-				self.check:Hide()
+				SetDesaturation(check, false)
+				check:Hide()
 			end
 		end
 		self:SetDisabled(self.disabled)
@@ -149,21 +155,21 @@ local methods = {
 		local size
 		if type == "radio" then
 			size = 16
-			checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton")
+			checkbg:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton
 			checkbg:SetTexCoord(0, 0.25, 0, 1)
-			check:SetTexture("Interface\\Buttons\\UI-RadioButton")
+			check:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton
 			check:SetTexCoord(0.25, 0.5, 0, 1)
 			check:SetBlendMode("ADD")
-			highlight:SetTexture("Interface\\Buttons\\UI-RadioButton")
+			highlight:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton
 			highlight:SetTexCoord(0.5, 0.75, 0, 1)
 		else
 			size = 24
-			checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
+			checkbg:SetTexture(130755) -- Interface\\Buttons\\UI-CheckBox-Up
 			checkbg:SetTexCoord(0, 1, 0, 1)
-			check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
+			check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check
 			check:SetTexCoord(0, 1, 0, 1)
 			check:SetBlendMode("BLEND")
-			highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
+			highlight:SetTexture(130753) -- Interface\\Buttons\\UI-CheckBox-Highlight
 			highlight:SetTexCoord(0, 1, 0, 1)
 		end
 		checkbg:SetHeight(size)
@@ -197,6 +203,7 @@ local methods = {
 				desc:ClearAllPoints()
 				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
 				desc:SetWidth(self.frame.width - 30)
+				desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
 				desc:SetJustifyH("LEFT")
 				desc:SetJustifyV("TOP")
 				self.desc = desc
@@ -204,7 +211,7 @@ local methods = {
 			self.desc:Show()
 			--self.text:SetFontObject(GameFontNormal)
 			self.desc:SetText(desc)
-			self:SetHeight(28 + self.desc:GetHeight())
+			self:SetHeight(28 + self.desc:GetStringHeight())
 		else
 			if self.desc then
 				self.desc:SetText("")
@@ -214,11 +221,11 @@ local methods = {
 			self:SetHeight(24)
 		end
 	end,
-	
+
 	["SetImage"] = function(self, path, ...)
 		local image = self.image
 		image:SetTexture(path)
-		
+
 		if image:GetTexture() then
 			local n = select("#", ...)
 			if n == 4 or n == 8 then
@@ -248,11 +255,11 @@ local function Constructor()
 	checkbg:SetWidth(24)
 	checkbg:SetHeight(24)
 	checkbg:SetPoint("TOPLEFT")
-	checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
+	checkbg:SetTexture(130755) -- Interface\\Buttons\\UI-CheckBox-Up
 
 	local check = frame:CreateTexture(nil, "OVERLAY")
 	check:SetAllPoints(checkbg)
-	check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
+	check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check
 
 	local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
 	text:SetJustifyH("LEFT")
@@ -261,7 +268,7 @@ local function Constructor()
 	text:SetPoint("RIGHT")
 
 	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
+	highlight:SetTexture(130753) -- Interface\\Buttons\\UI-CheckBox-Highlight
 	highlight:SetBlendMode("ADD")
 	highlight:SetAllPoints(checkbg)
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-ColorPicker.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-ColorPicker.lua
index ba02615..1101162 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-ColorPicker.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-ColorPicker.lua
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 ColorPicker Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 20
+local Type, Version = "ColorPicker", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,7 +13,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 
 -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
 -- List them here for Mikk's FindGlobals script
--- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame
+-- GLOBALS: ColorPickerFrame, OpacitySliderFrame
 
 --[[-----------------------------------------------------------------------------
 Support functions
@@ -47,10 +47,12 @@ local function Control_OnLeave(frame)
 end
 
 local function ColorSwatch_OnClick(frame)
-	HideUIPanel(ColorPickerFrame)
+	ColorPickerFrame:Hide()
 	local self = frame.obj
 	if not self.disabled then
 		ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG")
+		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
+		ColorPickerFrame:SetClampedToScreen(true)
 
 		ColorPickerFrame.func = function()
 			local r, g, b = ColorPickerFrame:GetColorRGB()
@@ -75,7 +77,7 @@ local function ColorSwatch_OnClick(frame)
 			ColorCallback(self, r, g, b, a, true)
 		end
 
-		ShowUIPanel(ColorPickerFrame)
+		ColorPickerFrame:Show()
 	end
 	AceGUI:ClearFocus()
 end
@@ -138,20 +140,22 @@ local function Constructor()
 	local colorSwatch = frame:CreateTexture(nil, "OVERLAY")
 	colorSwatch:SetWidth(19)
 	colorSwatch:SetHeight(19)
-	colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch")
+	colorSwatch:SetTexture(130939) -- Interface\\ChatFrame\\ChatFrameColorSwatch
 	colorSwatch:SetPoint("LEFT")
 
 	local texture = frame:CreateTexture(nil, "BACKGROUND")
+	colorSwatch.background = texture
 	texture:SetWidth(16)
 	texture:SetHeight(16)
-	texture:SetTexture(1, 1, 1)
+	texture:SetColorTexture(1, 1, 1)
 	texture:SetPoint("CENTER", colorSwatch)
 	texture:Show()
 
 	local checkers = frame:CreateTexture(nil, "BACKGROUND")
+	colorSwatch.checkers = checkers
 	checkers:SetWidth(14)
 	checkers:SetHeight(14)
-	checkers:SetTexture("Tileset\\Generic\\Checkers")
+	checkers:SetTexture(188523) -- Tileset\\Generic\\Checkers
 	checkers:SetTexCoord(.25, 0, 0.5, .25)
 	checkers:SetDesaturated(true)
 	checkers:SetVertexColor(1, 1, 1, 0.75)
@@ -166,7 +170,7 @@ local function Constructor()
 	text:SetPoint("RIGHT")
 
 	--local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	--highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
+	--highlight:SetTexture(136810) -- Interface\\QuestFrame\\UI-QuestTitleHighlight
 	--highlight:SetBlendMode("ADD")
 	--highlight:SetAllPoints(frame)
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown-Items.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown-Items.lua
index 1f28cb5..7ae1401 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown-Items.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown-Items.lua
@@ -1,4 +1,4 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua 996 2010-12-01 18:34:17Z nevcairiel $ ]]--
+--[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]--
 
 local AceGUI = LibStub("AceGUI-3.0")
 
@@ -33,7 +33,7 @@ end
 
 -- ItemBase is the base "class" for all dropdown items.
 -- Each item has to use ItemBase.Create(widgetType) to
--- create an initial 'self' value. 
+-- create an initial 'self' value.
 -- ItemBase will add common functions and ui event handlers.
 -- Be sure to keep basic usage when you override functions.
 
@@ -52,7 +52,7 @@ function ItemBase.Frame_OnEnter(this)
 		self.highlight:Show()
 	end
 	self:Fire("OnEnter")
-	
+
 	if self.specialOnEnter then
 		self.specialOnEnter(self)
 	end
@@ -60,10 +60,10 @@ end
 
 function ItemBase.Frame_OnLeave(this)
 	local self = this.obj
-	
+
 	self.highlight:Hide()
 	self:Fire("OnLeave")
-	
+
 	if self.specialOnLeave then
 		self.specialOnLeave(self)
 	end
@@ -89,7 +89,7 @@ end
 --       Do not call this method directly
 function ItemBase.SetPullout(self, pullout)
 	self.pullout = pullout
-	
+
 	self.frame:SetParent(nil)
 	self.frame:SetParent(pullout.itemFrame)
 	self.parent = pullout.itemFrame
@@ -155,12 +155,12 @@ function ItemBase.Create(type)
 	self.frame = frame
 	frame.obj = self
 	self.type = type
-	
+
 	self.useHighlight = true
-	
+
 	frame:SetHeight(17)
 	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-	
+
 	local text = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
 	text:SetTextColor(1,1,1)
 	text:SetJustifyH("LEFT")
@@ -169,7 +169,7 @@ function ItemBase.Create(type)
 	self.text = text
 
 	local highlight = frame:CreateTexture(nil, "OVERLAY")
-	highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
+	highlight:SetTexture(136810) -- Interface\\QuestFrame\\UI-QuestTitleHighlight
 	highlight:SetBlendMode("ADD")
 	highlight:SetHeight(14)
 	highlight:ClearAllPoints()
@@ -178,11 +178,11 @@ function ItemBase.Create(type)
 	highlight:Hide()
 	self.highlight = highlight
 
-	local check = frame:CreateTexture("OVERLAY")	
+	local check = frame:CreateTexture("OVERLAY")
 	check:SetWidth(16)
 	check:SetHeight(16)
 	check:SetPoint("LEFT",frame,"LEFT",3,-1)
-	check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
+	check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check
 	check:Hide()
 	self.check = check
 
@@ -190,28 +190,28 @@ function ItemBase.Create(type)
 	sub:SetWidth(16)
 	sub:SetHeight(16)
 	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
-	sub:SetTexture("Interface\\ChatFrame\\ChatFrameExpandArrow")
+	sub:SetTexture(130940) -- Interface\\ChatFrame\\ChatFrameExpandArrow
 	sub:Hide()
-	self.sub = sub	
-	
+	self.sub = sub
+
 	frame:SetScript("OnEnter", ItemBase.Frame_OnEnter)
 	frame:SetScript("OnLeave", ItemBase.Frame_OnLeave)
-	
+
 	self.OnAcquire = ItemBase.OnAcquire
 	self.OnRelease = ItemBase.OnRelease
-	
+
 	self.SetPullout = ItemBase.SetPullout
 	self.GetText    = ItemBase.GetText
 	self.SetText    = ItemBase.SetText
 	self.SetDisabled = ItemBase.SetDisabled
-	
+
 	self.SetPoint   = ItemBase.SetPoint
 	self.Show       = ItemBase.Show
 	self.Hide       = ItemBase.Hide
-	
+
 	self.SetOnLeave = ItemBase.SetOnLeave
 	self.SetOnEnter = ItemBase.SetOnEnter
-	
+
 	return self
 end
 
@@ -223,20 +223,20 @@ end
 
 --[[
 	Template for items:
-	
+
 -- Item:
 --
 do
 	local widgetType = "Dropdown-Item-"
 	local widgetVersion = 1
-	
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
 --]]
@@ -247,25 +247,25 @@ end
 do
 	local widgetType = "Dropdown-Item-Header"
 	local widgetVersion = 1
-	
+
 	local function OnEnter(this)
 		local self = this.obj
 		self:Fire("OnEnter")
-		
+
 		if self.specialOnEnter then
 			self.specialOnEnter(self)
 		end
 	end
-	
+
 	local function OnLeave(this)
 		local self = this.obj
 		self:Fire("OnLeave")
-		
+
 		if self.specialOnLeave then
 			self.specialOnLeave(self)
 		end
 	end
-	
+
 	-- exported, override
 	local function SetDisabled(self, disabled)
 		ItemBase.SetDisabled(self, disabled)
@@ -273,21 +273,21 @@ do
 			self.text:SetTextColor(1, 1, 0)
 		end
 	end
-	
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		self.SetDisabled = SetDisabled
-		
+
 		self.frame:SetScript("OnEnter", OnEnter)
 		self.frame:SetScript("OnLeave", OnLeave)
-		
+
 		self.text:SetTextColor(1, 1, 0)
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
 
@@ -296,7 +296,7 @@ end
 do
 	local widgetType = "Dropdown-Item-Execute"
 	local widgetVersion = 1
-	
+
 	local function Frame_OnClick(this, button)
 		local self = this.obj
 		if self.disabled then return end
@@ -305,16 +305,16 @@ do
 			self.pullout:Close()
 		end
 	end
-	
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		self.frame:SetScript("OnClick", Frame_OnClick)
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
 
@@ -323,8 +323,8 @@ end
 -- Does not close the pullout on click.
 do
 	local widgetType = "Dropdown-Item-Toggle"
-	local widgetVersion = 3
-	
+	local widgetVersion = 4
+
 	local function UpdateToggle(self)
 		if self.value then
 			self.check:Show()
@@ -332,49 +332,49 @@ do
 			self.check:Hide()
 		end
 	end
-	
+
 	local function OnRelease(self)
 		ItemBase.OnRelease(self)
 		self:SetValue(nil)
 	end
-	
+
 	local function Frame_OnClick(this, button)
 		local self = this.obj
 		if self.disabled then return end
 		self.value = not self.value
 		if self.value then
-			PlaySound("igMainMenuOptionCheckBoxOn")
+			PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		else
-			PlaySound("igMainMenuOptionCheckBoxOff")
+			PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF
 		end
 		UpdateToggle(self)
 		self:Fire("OnValueChanged", self.value)
 	end
-	
+
 	-- exported
 	local function SetValue(self, value)
 		self.value = value
 		UpdateToggle(self)
 	end
-	
+
 	-- exported
 	local function GetValue(self)
 		return self.value
 	end
-	
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		self.frame:SetScript("OnClick", Frame_OnClick)
-		
+
 		self.SetValue = SetValue
 		self.GetValue = GetValue
 		self.OnRelease = OnRelease
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
 
@@ -384,55 +384,55 @@ end
 do
 	local widgetType = "Dropdown-Item-Menu"
 	local widgetVersion = 2
-	
+
 	local function OnEnter(this)
 		local self = this.obj
 		self:Fire("OnEnter")
-		
+
 		if self.specialOnEnter then
 			self.specialOnEnter(self)
 		end
-		
+
 		self.highlight:Show()
-		
+
 		if not self.disabled and self.submenu then
 			self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100)
 		end
 	end
-	
+
 	local function OnHide(this)
 		local self = this.obj
 		if self.submenu then
 			self.submenu:Close()
 		end
 	end
-	
+
 	-- exported
 	local function SetMenu(self, menu)
 		assert(menu.type == "Dropdown-Pullout")
 		self.submenu = menu
 	end
-		
+
 	-- exported
 	local function CloseMenu(self)
 		self.submenu:Close()
 	end
-		
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		self.sub:Show()
-		
+
 		self.frame:SetScript("OnEnter", OnEnter)
 		self.frame:SetScript("OnHide", OnHide)
-		
+
 		self.SetMenu   = SetMenu
 		self.CloseMenu = CloseMenu
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
 
@@ -440,32 +440,32 @@ end
 -- A single line to separate items
 do
 	local widgetType = "Dropdown-Item-Separator"
-	local widgetVersion = 1
-	
+	local widgetVersion = 2
+
 	-- exported, override
 	local function SetDisabled(self, disabled)
 		ItemBase.SetDisabled(self, disabled)
 		self.useHighlight = false
 	end
-		
+
 	local function Constructor()
 		local self = ItemBase.Create(widgetType)
-		
+
 		self.SetDisabled = SetDisabled
-		
+
 		local line = self.frame:CreateTexture(nil, "OVERLAY")
 		line:SetHeight(1)
-		line:SetTexture(.5, .5, .5)
+		line:SetColorTexture(.5, .5, .5)
 		line:SetPoint("LEFT", self.frame, "LEFT", 10, 0)
 		line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0)
-		
+
 		self.text:Hide()
-		
+
 		self.useHighlight = false
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
 end
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown.lua
index 71d4570..341c070 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-DropDown.lua
@@ -1,9 +1,9 @@
---[[ $Id: AceGUIWidget-DropDown.lua 997 2010-12-01 18:36:28Z nevcairiel $ ]]--
+--[[ $Id: AceGUIWidget-DropDown.lua 1257 2022-01-10 16:25:37Z nevcairiel $ ]]--
 local AceGUI = LibStub("AceGUI-3.0")
 
 -- Lua APIs
 local min, max, floor = math.min, math.max, math.floor
-local select, pairs, ipairs, type = select, pairs, ipairs, type
+local select, pairs, ipairs, type, tostring = select, pairs, ipairs, type, tostring
 local tsort = table.sort
 
 -- WoW APIs
@@ -39,10 +39,10 @@ end
 
 do
 	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 3
-	
+	local widgetVersion = 5
+
 	--[[ Static data ]]--
-	
+
 	local backdrop = {
 		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
 		edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
@@ -60,9 +60,9 @@ do
 
 	local defaultWidth = 200
 	local defaultMaxHeight = 600
-	
+
 	--[[ UI Event Handlers ]]--
-	
+
 	-- HACK: This should be no part of the pullout, but there
 	--       is no other 'clean' way to response to any item-OnEnter
 	--       Used to close Submenus when an other item is entered
@@ -74,22 +74,22 @@ do
 			end
 		end
 	end
-	
+
 	-- See the note in Constructor() for each scroll related function
 	local function OnMouseWheel(this, value)
 		this.obj:MoveScroll(value)
 	end
-	
+
 	local function OnScrollValueChanged(this, value)
 		this.obj:SetScroll(value)
 	end
-	
+
 	local function OnSizeChanged(this)
 		this.obj:FixScroll()
 	end
-	
+
 	--[[ Exported methods ]]--
-	
+
 	-- exported
 	local function SetScroll(self, value)
 		local status = self.scrollStatus
@@ -106,9 +106,9 @@ do
 		child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
 		child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset)
 		status.offset = offset
-		status.scrollvalue = value		
+		status.scrollvalue = value
 	end
-	
+
 	-- exported
 	local function MoveScroll(self, value)
 		local status = self.scrollStatus
@@ -127,7 +127,7 @@ do
 			self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
 		end
 	end
-	
+
 	-- exported
 	local function FixScroll(self)
 		local status = self.scrollStatus
@@ -140,7 +140,7 @@ do
 			child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset)
 			self.slider:SetValue(0)
 		else
-			self.slider:Show()			
+			self.slider:Show()
 			local value = (offset / (viewheight - height) * 1000)
 			if value > 1000 then value = 1000 end
 			self.slider:SetValue(value)
@@ -153,68 +153,63 @@ do
 			end
 		end
 	end
-	
+
 	-- exported, AceGUI callback
 	local function OnAcquire(self)
 		self.frame:SetParent(UIParent)
 		--self.itemFrame:SetToplevel(true)
 	end
-	
+
 	-- exported, AceGUI callback
 	local function OnRelease(self)
 		self:Clear()
 		self.frame:ClearAllPoints()
 		self.frame:Hide()
 	end
-	
+
 	-- exported
 	local function AddItem(self, item)
 		self.items[#self.items + 1] = item
-		
+
 		local h = #self.items * 16
 		self.itemFrame:SetHeight(h)
 		self.frame:SetHeight(min(h + 34, self.maxHeight)) -- +34: 20 for scrollFrame placement (10 offset) and +14 for item placement
-		
+
 		item.frame:SetPoint("LEFT", self.itemFrame, "LEFT")
 		item.frame:SetPoint("RIGHT", self.itemFrame, "RIGHT")
-		
+
 		item:SetPullout(self)
 		item:SetOnEnter(OnEnter)
 	end
-		
+
 	-- exported
-	local function Open(self, point, relFrame, relPoint, x, y)		
+	local function Open(self, point, relFrame, relPoint, x, y)
 		local items = self.items
 		local frame = self.frame
 		local itemFrame = self.itemFrame
-		
+
 		frame:SetPoint(point, relFrame, relPoint, x, y)
 
-				
+
 		local height = 8
 		for i, item in pairs(items) do
-			if i == 1 then
-				item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
-			else
-				item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
-			end
-			
+			item:SetPoint("TOP", itemFrame, "TOP", 0, -2 + (i - 1) * -16)
 			item:Show()
-			
+
 			height = height + 16
 		end
 		itemFrame:SetHeight(height)
 		fixstrata("TOOLTIP", frame, frame:GetChildren())
 		frame:Show()
 		self:Fire("OnOpen")
-	end	
-	
+	end
+
 	-- exported
 	local function Close(self)
 		self.frame:Hide()
 		self:Fire("OnClose")
-	end	
-	
+	end
+
 	-- exported
 	local function Clear(self)
 		local items = self.items
@@ -222,18 +217,18 @@ do
 			AceGUI:Release(item)
 			items[i] = nil
 		end
-	end	
-	
+	end
+
 	-- exported
 	local function IterateItems(self)
 		return ipairs(self.items)
 	end
-	
+
 	-- exported
 	local function SetHideOnLeave(self, val)
 		self.hideOnLeave = val
 	end
-	
+
 	-- exported
 	local function SetMaxHeight(self, height)
 		self.maxHeight = height or defaultMaxHeight
@@ -243,28 +238,28 @@ do
 			self.frame:SetHeight(self.itemFrame:GetHeight() + 34) -- see :AddItem
 		end
 	end
-		
+
 	-- exported
 	local function GetRightBorderWidth(self)
 		return 6 + (self.slider:IsShown() and 12 or 0)
 	end
-	
+
 	-- exported
 	local function GetLeftBorderWidth(self)
 		return 6
 	end
-	
+
 	--[[ Constructor ]]--
-	
+
 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
+		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
 		local self = {}
 		self.count = count
 		self.type = widgetType
 		self.frame = frame
 		frame.obj = self
-		
+
 		self.OnAcquire = OnAcquire
 		self.OnRelease = OnRelease
 
@@ -278,38 +273,38 @@ do
 		self.SetScroll  = SetScroll
 		self.MoveScroll = MoveScroll
 		self.FixScroll  = FixScroll
-		
+
 		self.SetMaxHeight = SetMaxHeight
 		self.GetRightBorderWidth = GetRightBorderWidth
 		self.GetLeftBorderWidth = GetLeftBorderWidth
-		
+
 		self.items = {}
-		
+
 		self.scrollStatus = {
 			scrollvalue = 0,
 		}
-		
+
 		self.maxHeight = defaultMaxHeight
-			
+
 		frame:SetBackdrop(backdrop)
 		frame:SetBackdropColor(0, 0, 0)
 		frame:SetFrameStrata("FULLSCREEN_DIALOG")
 		frame:SetClampedToScreen(true)
 		frame:SetWidth(defaultWidth)
-		frame:SetHeight(self.maxHeight)	
+		frame:SetHeight(self.maxHeight)
 		--frame:SetToplevel(true)
-	
+
 		-- NOTE: The whole scroll frame code is copied from the AceGUI-3.0 widget ScrollFrame
 		local scrollFrame = CreateFrame("ScrollFrame", nil, frame)
 		local itemFrame = CreateFrame("Frame", nil, scrollFrame)
-		
+
 		self.scrollFrame = scrollFrame
 		self.itemFrame = itemFrame
-		
+
 		scrollFrame.obj = self
 		itemFrame.obj = self
-		
-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
+
+		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 		slider:SetOrientation("VERTICAL")
 		slider:SetHitRectInsets(0, 0, -10, 0)
 		slider:SetBackdrop(sliderBackdrop)
@@ -318,7 +313,7 @@ do
 		slider:SetFrameStrata("FULLSCREEN_DIALOG")
 		self.slider = slider
 		slider.obj = self
-					
+
 		scrollFrame:SetScrollChild(itemFrame)
 		scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12)
 		scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12)
@@ -327,46 +322,48 @@ do
 		scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
 		scrollFrame:SetToplevel(true)
 		scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
+
 		itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0)
 		itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0)
 		itemFrame:SetHeight(400)
 		itemFrame:SetToplevel(true)
 		itemFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
+
 		slider:SetPoint("TOPLEFT", scrollFrame, "TOPRIGHT", -16, 0)
 		slider:SetPoint("BOTTOMLEFT", scrollFrame, "BOTTOMRIGHT", -16, 0)
 		slider:SetScript("OnValueChanged", OnScrollValueChanged)
 		slider:SetMinMaxValues(0, 1000)
 		slider:SetValueStep(1)
 		slider:SetValue(0)
-		
+
 		scrollFrame:Show()
 		itemFrame:Show()
 		slider:Hide()
-						
+
 		self:FixScroll()
-		
+
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
 end
 
 do
 	local widgetType = "Dropdown"
-	local widgetVersion = 24
-	
+	local widgetVersion = 36
+
 	--[[ Static data ]]--
-	
+
 	--[[ UI event handler ]]--
-	
+
 	local function Control_OnEnter(this)
+		this.obj.button:LockHighlight()
 		this.obj:Fire("OnEnter")
 	end
-	
+
 	local function Control_OnLeave(this)
+		this.obj.button:UnlockHighlight()
 		this.obj:Fire("OnLeave")
 	end
 
@@ -376,33 +373,33 @@ do
 			self.pullout:Close()
 		end
 	end
-	
+
 	local function Dropdown_TogglePullout(this)
 		local self = this.obj
-		PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound
 		if self.open then
 			self.open = nil
 			self.pullout:Close()
 			AceGUI:ClearFocus()
 		else
 			self.open = true
-			self.pullout:SetWidth(self.frame:GetWidth())
+			self.pullout:SetWidth(self.pulloutWidth or self.frame:GetWidth())
 			self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0)
 			AceGUI:SetFocus(self)
 		end
 	end
-	
+
 	local function OnPulloutOpen(this)
 		local self = this.userdata.obj
 		local value = self.value
-		
+
 		if not self.multiselect then
 			for i, item in this:IterateItems() do
 				item:SetValue(item.userdata.value == value)
 			end
 		end
-		
+
 		self.open = true
+		self:Fire("OnOpened")
 	end
 
 	local function OnPulloutClose(this)
@@ -410,7 +407,7 @@ do
 		self.open = nil
 		self:Fire("OnClosed")
 	end
-	
+
 	local function ShowMultiText(self)
 		local text
 		for i, widget in self.pullout:IterateItems() do
@@ -426,10 +423,10 @@ do
 		end
 		self:SetText(text)
 	end
-	
+
 	local function OnItemValueChanged(this, event, checked)
 		local self = this.userdata.obj
-		
+
 		if self.multiselect then
 			self:Fire("OnValueChanged", this.userdata.value, checked)
 			ShowMultiText(self)
@@ -440,14 +437,14 @@ do
 			else
 				this:SetValue(true)
 			end
-			if self.open then	
+			if self.open then
 				self.pullout:Close()
 			end
 		end
 	end
-	
+
 	--[[ Exported methods ]]--
-	
+
 	-- exported, AceGUI callback
 	local function OnAcquire(self)
 		local pullout = AceGUI:Create("Dropdown-Pullout")
@@ -457,11 +454,14 @@ do
 		pullout:SetCallback("OnOpen", OnPulloutOpen)
 		self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1)
 		fixlevels(self.pullout.frame, self.pullout.frame:GetChildren())
-		
+
 		self:SetHeight(44)
 		self:SetWidth(200)
+		self:SetLabel()
+		self:SetPulloutWidth(nil)
+		self.list = {}
 	end
-	
+
 	-- exported, AceGUI callback
 	local function OnRelease(self)
 		if self.open then
@@ -469,75 +469,76 @@ do
 		end
 		AceGUI:Release(self.pullout)
 		self.pullout = nil
-		
+
 		self:SetText("")
-		self:SetLabel("")
 		self:SetDisabled(false)
 		self:SetMultiselect(false)
-		
+
 		self.value = nil
 		self.list = nil
 		self.open = nil
 		self.hasClose = nil
-		
+
 		self.frame:ClearAllPoints()
 		self.frame:Hide()
 	end
-	
+
 	-- exported
 	local function SetDisabled(self, disabled)
 		self.disabled = disabled
 		if disabled then
 			self.text:SetTextColor(0.5,0.5,0.5)
 			self.button:Disable()
+			self.button_cover:Disable()
 			self.label:SetTextColor(0.5,0.5,0.5)
 		else
 			self.button:Enable()
+			self.button_cover:Enable()
 			self.label:SetTextColor(1,.82,0)
 			self.text:SetTextColor(1,1,1)
 		end
 	end
-	
+
 	-- exported
 	local function ClearFocus(self)
 		if self.open then
 			self.pullout:Close()
 		end
 	end
-	
+
 	-- exported
 	local function SetText(self, text)
 		self.text:SetText(text or "")
 	end
-	
+
 	-- exported
 	local function SetLabel(self, text)
 		if text and text ~= "" then
 			self.label:SetText(text)
 			self.label:Show()
-			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-18)
-			self.frame:SetHeight(44)
+			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-14)
+			self:SetHeight(40)
+			self.alignoffset = 26
 		else
 			self.label:SetText("")
 			self.label:Hide()
 			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0)
-			self.frame:SetHeight(26)
+			self:SetHeight(26)
+			self.alignoffset = 12
 		end
 	end
-	
+
 	-- exported
 	local function SetValue(self, value)
-		if self.list then
-			self:SetText(self.list[value] or "")
-		end
+		self:SetText(self.list[value] or "")
 		self.value = value
 	end
-	
+
 	-- exported
 	local function GetValue(self)
 		return self.value
 	end
-	
+
 	-- exported
 	local function SetItemValue(self, item, value)
 		if not self.multiselect then return end
@@ -550,7 +551,7 @@ do
 		end
 		ShowMultiText(self)
 	end
-	
+
 	-- exported
 	local function SetItemDisabled(self, item, disabled)
 		for i, widget in self.pullout:IterateItems() do
@@ -559,7 +560,7 @@ do
 			end
 		end
 	end
-	
+
 	local function AddListItem(self, value, text, itemType)
 		if not itemType then itemType = "Dropdown-Item-Toggle" end
 		local exists = AceGUI:GetWidgetVersion(itemType)
@@ -572,7 +573,7 @@ do
 		item:SetCallback("OnValueChanged", OnItemValueChanged)
 		self.pullout:AddItem(item)
 	end
-	
+
 	local function AddCloseButton(self)
 		if not self.hasClose then
 			local close = AceGUI:Create("Dropdown-Item-Execute")
@@ -581,21 +582,29 @@ do
 			self.hasClose = true
 		end
 	end
-	
+
 	-- exported
 	local sortlist = {}
+	local function sortTbl(x,y)
+		local num1, num2 = tonumber(x), tonumber(y)
+		if num1 and num2 then -- numeric comparison, either two numbers or numeric strings
+			return num1 < num2
+		else -- compare everything else tostring'ed
+			return tostring(x) < tostring(y)
+		end
+	end
 	local function SetList(self, list, order, itemType)
-		self.list = list
+		self.list = list or {}
 		self.pullout:Clear()
 		self.hasClose = nil
 		if not list then return end
-		
+
 		if type(order) ~= "table" then
 			for v in pairs(list) do
 				sortlist[#sortlist + 1] = v
 			end
-			tsort(sortlist)
-			
+			tsort(sortlist, sortTbl)
+
 			for i, key in ipairs(sortlist) do
 				AddListItem(self, key, list[key], itemType)
 				sortlist[i] = nil
@@ -610,15 +619,13 @@ do
 			AddCloseButton(self)
 		end
 	end
-	
+
 	-- exported
 	local function AddItem(self, value, text, itemType)
-		if self.list then
-			self.list[value] = text
-			AddListItem(self, value, text, itemType)
-		end
+		self.list[value] = text
+		AddListItem(self, value, text, itemType)
 	end
-	
+
 	-- exported
 	local function SetMultiselect(self, multi)
 		self.multiselect = multi
@@ -627,19 +634,23 @@ do
 			AddCloseButton(self)
 		end
 	end
-	
+
 	-- exported
 	local function GetMultiselect(self)
 		return self.multiselect
 	end
-	
+
+	local function SetPulloutWidth(self, width)
+		self.pulloutWidth = width
+	end
+
 	--[[ Constructor ]]--
-	
+
 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
 		local frame = CreateFrame("Frame", nil, UIParent)
 		local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate")
-		
+
 		local self = {}
 		self.type = widgetType
 		self.frame = frame
@@ -647,10 +658,10 @@ do
 		self.count = count
 		frame.obj = self
 		dropdown.obj = self
-		
+
 		self.OnRelease   = OnRelease
 		self.OnAcquire   = OnAcquire
-		
+
 		self.ClearFocus  = ClearFocus
 
 		self.SetText     = SetText
@@ -664,11 +675,10 @@ do
 		self.GetMultiselect = GetMultiselect
 		self.SetItemValue = SetItemValue
 		self.SetItemDisabled = SetItemDisabled
-		
-		self.alignoffset = 31
-		
-		frame:SetHeight(44)
-		frame:SetWidth(200)
+		self.SetPulloutWidth = SetPulloutWidth
+
+		self.alignoffset = 26
+
 		frame:SetScript("OnHide",Dropdown_OnHide)
 
 		dropdown:ClearAllPoints()
@@ -679,10 +689,10 @@ do
 		local left = _G[dropdown:GetName() .. "Left"]
 		local middle = _G[dropdown:GetName() .. "Middle"]
 		local right = _G[dropdown:GetName() .. "Right"]
-		
+
 		middle:ClearAllPoints()
 		right:ClearAllPoints()
-		
+
 		middle:SetPoint("LEFT", left, "RIGHT", 0, 0)
 		middle:SetPoint("RIGHT", right, "LEFT", 0, 0)
 		right:SetPoint("TOPRIGHT", dropdown, "TOPRIGHT", 0, 17)
@@ -693,14 +703,23 @@ do
 		button:SetScript("OnEnter",Control_OnEnter)
 		button:SetScript("OnLeave",Control_OnLeave)
 		button:SetScript("OnClick",Dropdown_TogglePullout)
-		
+
+		local button_cover = CreateFrame("BUTTON",nil,self.frame)
+		self.button_cover = button_cover
+		button_cover.obj = self
+		button_cover:SetPoint("TOPLEFT",self.frame,"BOTTOMLEFT",0,25)
+		button_cover:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT")
+		button_cover:SetScript("OnEnter",Control_OnEnter)
+		button_cover:SetScript("OnLeave",Control_OnLeave)
+		button_cover:SetScript("OnClick",Dropdown_TogglePullout)
+
 		local text = _G[dropdown:GetName() .. "Text"]
 		self.text = text
 		text.obj = self
 		text:ClearAllPoints()
 		text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2)
 		text:SetPoint("LEFT", left, "LEFT", 25, 2)
-		
+
 		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
 		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
 		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
@@ -712,6 +731,6 @@ do
 		AceGUI:RegisterAsWidget(self)
 		return self
 	end
-	
+
 	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-end	
+end
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-EditBox.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-EditBox.lua
index acd7131..29f7e00 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-EditBox.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-EditBox.lua
@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 EditBox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 24
+local Type, Version = "EditBox", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -73,7 +73,7 @@ local function EditBox_OnEnterPressed(frame)
 	local value = frame:GetText()
 	local cancel = self:Fire("OnEnterPressed", value)
 	if not cancel then
-		PlaySound("igMainMenuOptionCheckBoxOn")
+		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		HideButton(self)
 	end
 end
@@ -81,18 +81,21 @@ end
 local function EditBox_OnReceiveDrag(frame)
 	local self = frame.obj
 	local type, id, info = GetCursorInfo()
+	local name
 	if type == "item" then
-		self:SetText(info)
-		self:Fire("OnEnterPressed", info)
-		ClearCursor()
+		name = info
 	elseif type == "spell" then
-		local name = GetSpellInfo(id, info)
+		name = GetSpellInfo(id, info)
+	elseif type == "macro" then
+		name = GetMacroInfo(id)
+	end
+	if name then
 		self:SetText(name)
 		self:Fire("OnEnterPressed", name)
 		ClearCursor()
+		HideButton(self)
+		AceGUI:ClearFocus()
 	end
-	HideButton(self)
-	AceGUI:ClearFocus()
 end
 
 local function EditBox_OnTextChanged(frame)
@@ -195,6 +198,10 @@ local methods = {
 		if not self.frame:IsShown() then
 			self.frame:SetScript("OnShow", Frame_OnShowFocus)
 		end
+	end,
+
+	["HighlightText"] = function(self, from, to)
+		self.editbox:HighlightText(from, to)
 	end
 }
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Heading.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Heading.lua
index 1aaf3f5..862ae88 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Heading.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Heading.lua
@@ -51,14 +51,14 @@ local function Constructor()
 	left:SetHeight(8)
 	left:SetPoint("LEFT", 3, 0)
 	left:SetPoint("RIGHT", label, "LEFT", -5, 0)
-	left:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+	left:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 	left:SetTexCoord(0.81, 0.94, 0.5, 1)
 
 	local right = frame:CreateTexture(nil, "BACKGROUND")
 	right:SetHeight(8)
 	right:SetPoint("RIGHT", -3, 0)
 	right:SetPoint("LEFT", label, "RIGHT", 5, 0)
-	right:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
+	right:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
 	right:SetTexCoord(0.81, 0.94, 0.5, 1)
 
 	local widget = {
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Icon.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Icon.lua
index 8d01b54..378e813 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Icon.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Icon.lua
@@ -9,7 +9,7 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local select, pairs, print = select, pairs, print
 
 -- WoW APIs
-local CreateFrame, UIParent, GetBuildInfo = CreateFrame, UIParent, GetBuildInfo
+local CreateFrame, UIParent = CreateFrame, UIParent
 
 --[[-----------------------------------------------------------------------------
 Scripts
@@ -56,7 +56,7 @@ local methods = {
 	["SetImage"] = function(self, path, ...)
 		local image = self.image
 		image:SetTexture(path)
-		
+
 		if image:GetTexture() then
 			local n = select("#", ...)
 			if n == 4 or n == 8 then
@@ -118,7 +118,7 @@ local function Constructor()
 
 	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
 	highlight:SetAllPoints(image)
-	highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight")
+	highlight:SetTexture(136580) -- Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight
 	highlight:SetTexCoord(0, 1, 0.23, 0.77)
 	highlight:SetBlendMode("ADD")
 
@@ -131,12 +131,8 @@ local function Constructor()
 	for method, func in pairs(methods) do
 		widget[method] = func
 	end
-	-- SetText is deprecated, but keep it around for a while. (say, to WoW 4.0)
-	if (select(4, GetBuildInfo()) < 40000) then
-		widget.SetText = widget.SetLabel
-	else
-		widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
-	end
+
+	widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
 
 	return AceGUI:RegisterAsWidget(widget)
 end
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-InteractiveLabel.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-InteractiveLabel.lua
index 9e06049..255dd97 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-InteractiveLabel.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-InteractiveLabel.lua
@@ -1,20 +1,13 @@
 --[[-----------------------------------------------------------------------------
 InteractiveLabel Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "InteractiveLabel", 20
+local Type, Version = "InteractiveLabel", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
 local select, pairs = select, pairs
 
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Keybinding.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Keybinding.lua
index 2dbe236..17a3c0b 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Keybinding.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Keybinding.lua
@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 22
+local Type, Version = "Keybinding", 26
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -34,11 +34,13 @@ local function Keybinding_OnClick(frame, button)
 		local self = frame.obj
 		if self.waitingForKey then
 			frame:EnableKeyboard(false)
+			frame:EnableMouseWheel(false)
 			self.msgframe:Hide()
 			frame:UnlockHighlight()
 			self.waitingForKey = nil
 		else
 			frame:EnableKeyboard(true)
+			frame:EnableMouseWheel(true)
 			self.msgframe:Show()
 			frame:LockHighlight()
 			self.waitingForKey = true
@@ -73,6 +75,7 @@ local function Keybinding_OnKeyDown(frame, key)
 		end
 
 		frame:EnableKeyboard(false)
+		frame:EnableMouseWheel(false)
 		self.msgframe:Hide()
 		frame:UnlockHighlight()
 		self.waitingForKey = nil
@@ -97,6 +100,16 @@ local function Keybinding_OnMouseDown(frame, button)
 	Keybinding_OnKeyDown(frame, button)
 end
 
+local function Keybinding_OnMouseWheel(frame, direction)
+	local button
+	if direction >= 0 then
+		button = "MOUSEWHEELUP"
+	else
+		button = "MOUSEWHEELDOWN"
+	end
+	Keybinding_OnKeyDown(frame, button)
+end
+
 --[[-----------------------------------------------------------------------------
 Methods
 -------------------------------------------------------------------------------]]
@@ -109,6 +122,7 @@ local methods = {
 		self.msgframe:Hide()
 		self:SetDisabled(false)
 		self.button:EnableKeyboard(false)
+		self.button:EnableMouseWheel(false)
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -174,15 +188,17 @@ local function Constructor()
 	local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
 
 	local frame = CreateFrame("Frame", nil, UIParent)
-	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2")
+	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate")
 
 	button:EnableMouse(true)
+	button:EnableMouseWheel(false)
 	button:RegisterForClicks("AnyDown")
 	button:SetScript("OnEnter", Control_OnEnter)
 	button:SetScript("OnLeave", Control_OnLeave)
 	button:SetScript("OnClick", Keybinding_OnClick)
 	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
 	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
+	button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel)
 	button:SetPoint("BOTTOMLEFT")
 	button:SetPoint("BOTTOMRIGHT")
 	button:SetHeight(24)
@@ -198,12 +214,13 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(18)
 
-	local msgframe = CreateFrame("Frame", nil, UIParent)
+	local msgframe = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	msgframe:SetHeight(30)
 	msgframe:SetBackdrop(ControlBackdrop)
 	msgframe:SetBackdropColor(0,0,0)
 	msgframe:SetFrameStrata("FULLSCREEN_DIALOG")
 	msgframe:SetFrameLevel(1000)
+	msgframe:SetToplevel(true)
 
 	local msg = msgframe:CreateFontString(nil, "OVERLAY", "GameFontNormal")
 	msg:SetText("Press a key to bind, ESC to clear the binding or click the button again to cancel.")
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Label.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Label.lua
index 7f5f1c5..5c75f3b 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Label.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Label.lua
@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 21
+local Type, Version = "Label", 27
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -39,21 +39,30 @@ local function UpdateImageAnchor(self)
 			label:SetPoint("TOP", image, "BOTTOM")
 			label:SetPoint("LEFT")
 			label:SetWidth(width)
-			height = image:GetHeight() + label:GetHeight()
+			height = image:GetHeight() + label:GetStringHeight()
 		else
 			-- image on the left
 			image:SetPoint("TOPLEFT")
-			label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0)
+			if image:GetHeight() > label:GetStringHeight() then
+				label:SetPoint("LEFT", image, "RIGHT", 4, 0)
+			else
+				label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0)
+			end
 			label:SetWidth(width - imagewidth - 4)
-			height = max(image:GetHeight(), label:GetHeight())
+			height = max(image:GetHeight(), label:GetStringHeight())
 		end
 	else
 		-- no image shown
 		label:SetPoint("TOPLEFT")
 		label:SetWidth(width)
-		height = label:GetHeight()
+		height = label:GetStringHeight()
+	end
+
+	-- avoid zero-height labels, since they can used as spacers
+	if not height or height == 0 then
+		height = 1
 	end
-	
+
 	self.resizing = true
 	frame:SetHeight(height)
 	frame.height = height
@@ -74,6 +83,8 @@ local methods = {
 		self:SetImageSize(16, 16)
 		self:SetColor()
 		self:SetFontObject()
+		self:SetJustifyH("LEFT")
+		self:SetJustifyV("TOP")
 
 		-- reset the flag
 		self.resizing = nil
@@ -102,7 +113,7 @@ local methods = {
 	["SetImage"] = function(self, path, ...)
 		local image = self.image
 		image:SetTexture(path)
-		
+
 		if image:GetTexture() then
 			self.imageshown = true
 			local n = select("#", ...)
@@ -119,6 +130,7 @@ local methods = {
 
 	["SetFont"] = function(self, font, height, flags)
 		self.label:SetFont(font, height, flags)
+		UpdateImageAnchor(self)
 	end,
 
 	["SetFontObject"] = function(self, font)
@@ -130,6 +142,14 @@ local methods = {
 		self.image:SetHeight(height)
 		UpdateImageAnchor(self)
 	end,
+
+	["SetJustifyH"] = function(self, justifyH)
+		self.label:SetJustifyH(justifyH)
+	end,
+
+	["SetJustifyV"] = function(self, justifyV)
+		self.label:SetJustifyV(justifyV)
+	end,
 }
 
 --[[-----------------------------------------------------------------------------
@@ -140,9 +160,6 @@ local function Constructor()
 	frame:Hide()
 
 	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall")
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
 	local image = frame:CreateTexture(nil, "BACKGROUND")
 
 	-- create widget
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-MultiLineEditBox.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-MultiLineEditBox.lua
index af60dac..0e953ab 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-MultiLineEditBox.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-MultiLineEditBox.lua
@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 25
+local Type, Version = "MultiLineEditBox", 29
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -17,6 +17,23 @@ local _G = _G
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
+
+if not AceGUIMultiLineEditBoxInsertLink then
+	-- upgradeable hook
+	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
+end
+
+function _G.AceGUIMultiLineEditBoxInsertLink(text)
+	for i = 1, AceGUI:GetWidgetCount(Type) do
+		local editbox = _G[("MultiLineEditBox%uEdit"):format(i)]
+		if editbox and editbox:IsVisible() and editbox:HasFocus() then
+			editbox:Insert(text)
+			return true
+		end
+	end
+end
+
+
 local function Layout(self)
 	self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight)
 
@@ -216,7 +233,7 @@ local methods = {
 		end
 		Layout(self)
 	end,
-	
+
 	["ClearFocus"] = function(self)
 		self.editBox:ClearFocus()
 		self.frame:SetScript("OnShow", nil)
@@ -228,16 +245,20 @@ local methods = {
 			self.frame:SetScript("OnShow", OnShowFocus)
 		end
 	end,
-	
+
+	["HighlightText"] = function(self, from, to)
+		self.editBox:HighlightText(from, to)
+	end,
+
 	["GetCursorPosition"] = function(self)
 		return self.editBox:GetCursorPosition()
 	end,
-	
+
 	["SetCursorPosition"] = function(self, ...)
 		return self.editBox:SetCursorPosition(...)
 	end,
-	
-	
+
+
 }
 
 --[[-----------------------------------------------------------------------------
@@ -252,7 +273,7 @@ local backdrop = {
 local function Constructor()
 	local frame = CreateFrame("Frame", nil, UIParent)
 	frame:Hide()
-	
+
 	local widgetNum = AceGUI:GetNextWidgetNum(Type)
 
 	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
@@ -262,21 +283,21 @@ local function Constructor()
 	label:SetText(ACCEPT)
 	label:SetHeight(10)
 
-	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate2")
+	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate")
 	button:SetPoint("BOTTOMLEFT", 0, 4)
 	button:SetHeight(22)
 	button:SetWidth(label:GetStringWidth() + 24)
 	button:SetText(ACCEPT)
 	button:SetScript("OnClick", OnClick)
 	button:Disable()
-	
+
 	local text = button:GetFontString()
 	text:ClearAllPoints()
 	text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5)
 	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
 	text:SetJustifyV("MIDDLE")
 
-	local scrollBG = CreateFrame("Frame", nil, frame)
+	local scrollBG = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	scrollBG:SetBackdrop(backdrop)
 	scrollBG:SetBackdropColor(0, 0, 0)
 	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
@@ -301,7 +322,7 @@ local function Constructor()
 	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
 	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
 
-	local editBox = CreateFrame("EditBox", nil, scrollFrame)
+	local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
 	editBox:SetAllPoints()
 	editBox:SetFontObject(ChatFontNormal)
 	editBox:SetMultiLine(true)
@@ -318,7 +339,7 @@ local function Constructor()
 	editBox:SetScript("OnTextChanged", OnTextChanged)
 	editBox:SetScript("OnTextSet", OnTextSet)
 	editBox:SetScript("OnEditFocusGained", OnEditFocusGained)
-	
+
 
 	scrollFrame:SetScrollChild(editBox)
 
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Slider.lua b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Slider.lua
index 7f0bd5f..9f26d2d 100755
--- a/Libs/AceGUI-3.0/widgets/AceGUIwidget-Slider.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIwidget-Slider.lua
@@ -2,7 +2,7 @@
 Slider Widget
 Graphical Slider, like, for Range values.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 20
+local Type, Version = "Slider", 23
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -57,10 +57,13 @@ local function Frame_OnMouseDown(frame)
 	AceGUI:ClearFocus()
 end
 
-local function Slider_OnValueChanged(frame)
+local function Slider_OnValueChanged(frame, newvalue)
 	local self = frame.obj
 	if not frame.setup then
-		local newvalue = frame:GetValue()
+		if self.step and self.step > 0 then
+			local min_value = self.min or 0
+			newvalue = floor((newvalue - min_value) / self.step + 0.5) * self.step + min_value
+		end
 		if newvalue ~= self.value and not self.disabled then
 			self.value = newvalue
 			self:Fire("OnValueChanged", newvalue)
@@ -102,9 +105,9 @@ local function EditBox_OnEnterPressed(frame)
 	else
 		value = tonumber(value)
 	end
-	
+
 	if value then
-		PlaySound("igMainMenuOptionCheckBoxOn")
+		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
 		self.slider:SetValue(value)
 		self:Fire("OnMouseUp", value)
 	end
@@ -222,7 +225,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(15)
 
-	local slider = CreateFrame("Slider", nil, frame)
+	local slider = CreateFrame("Slider", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	slider:SetOrientation("HORIZONTAL")
 	slider:SetHeight(15)
 	slider:SetHitRectInsets(0, 0, -10, 0)
@@ -244,7 +247,7 @@ local function Constructor()
 	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
 	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
 
-	local editbox = CreateFrame("EditBox", nil, frame)
+	local editbox = CreateFrame("EditBox", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
 	editbox:SetAutoFocus(false)
 	editbox:SetFontObject(GameFontHighlightSmall)
 	editbox:SetPoint("TOP", slider, "BOTTOM")
diff --git a/Libs/AceHook-3.0/AceHook-3.0.lua b/Libs/AceHook-3.0/AceHook-3.0.lua
new file mode 100644
index 0000000..af6a265
--- /dev/null
+++ b/Libs/AceHook-3.0/AceHook-3.0.lua
@@ -0,0 +1,511 @@
+--- **AceHook-3.0** offers safe Hooking/Unhooking of functions, methods and frame scripts.
+-- Using AceHook-3.0 is recommended when you need to unhook your hooks again, so the hook chain isn't broken
+-- when you manually restore the original function.
+--
+-- **AceHook-3.0** can be embeded into your addon, either explicitly by calling AceHook:Embed(MyAddon) or by
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceHook itself.\\
+-- It is recommended to embed AceHook, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceHook.
+-- @class file
+-- @name AceHook-3.0
+-- @release $Id: AceHook-3.0.lua 1243 2020-10-18 00:00:19Z nevcairiel $
+local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
+local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
+
+if not AceHook then return end -- No upgrade needed
+
+AceHook.embeded = AceHook.embeded or {}
+AceHook.registry = AceHook.registry or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end })
+AceHook.handlers = AceHook.handlers or {}
+AceHook.actives = AceHook.actives or {}
+AceHook.scripts = AceHook.scripts or {}
+AceHook.onceSecure = AceHook.onceSecure or {}
+AceHook.hooks = AceHook.hooks or {}
+
+-- local upvalues
+local registry = AceHook.registry
+local handlers = AceHook.handlers
+local actives = AceHook.actives
+local scripts = AceHook.scripts
+local onceSecure = AceHook.onceSecure
+
+-- Lua APIs
+local pairs, next, type = pairs, next, type
+local format = string.format
+local assert, error = assert, error
+
+-- WoW APIs
+local issecurevariable, hooksecurefunc = issecurevariable, hooksecurefunc
+local _G = _G
+
+-- functions for later definition
+local donothing, createHook, hook
+
+local protectedScripts = {
+	OnClick = true,
+}
+
+-- upgrading of embeded is done at the bottom of the file
+
+local mixins = {
+	"Hook", "SecureHook",
+	"HookScript", "SecureHookScript",
+	"Unhook", "UnhookAll",
+	"IsHooked",
+	"RawHook", "RawHookScript"
+}
+
+-- AceHook:Embed( target )
+-- target (object) - target object to embed AceHook in
+--
+-- Embeds AceEevent into the target object making the functions from the mixins list available on target:..
+function AceHook:Embed( target )
+	for k, v in pairs( mixins ) do
+		target[v] = self[v]
+	end
+	self.embeded[target] = true
+	-- inject the hooks table safely
+	target.hooks = target.hooks or {}
+	return target
+end
+
+-- AceHook:OnEmbedDisable( target )
+-- target (object) - target object that is being disabled
+--
+-- Unhooks all hooks when the target disables.
+-- this method should be called by the target manually or by an addon framework
+function AceHook:OnEmbedDisable( target )
+	target:UnhookAll()
+end
+
+function createHook(self, handler, orig, secure, failsafe)
+	local uid
+	local method = type(handler) == "string"
+	if failsafe and not secure then
+		-- failsafe hook creation
+		uid = function(...)
+			if actives[uid] then
+				if method then
+					self[handler](self, ...)
+				else
+					handler(...)
+				end
+			end
+			return orig(...)
+		end
+		-- /failsafe hook
+	else
+		-- all other hooks
+		uid = function(...)
+			if actives[uid] then
+				if method then
+					return self[handler](self, ...)
+				else
+					return handler(...)
+				end
+			elseif not secure then -- backup on non secure
+				return orig(...)
+			end
+		end
+		-- /hook
+	end
+	return uid
+end
+
+function donothing() end
+
+function hook(self, obj, method, handler, script, secure, raw, forceSecure, usage)
+	if not handler then handler = method end
+
+	-- These asserts make sure AceHooks's devs play by the rules.
+	assert(not script or type(script) == "boolean")
+	assert(not secure or type(secure) == "boolean")
+	assert(not raw or type(raw) == "boolean")
+	assert(not forceSecure or type(forceSecure) == "boolean")
+	assert(usage)
+
+	-- Error checking Battery!
+	if obj and type(obj) ~= "table" then
+		error(format("%s: 'object' - nil or table expected got %s", usage, type(obj)), 3)
+	end
+	if type(method) ~= "string" then
+		error(format("%s: 'method' - string expected got %s", usage, type(method)), 3)
+	end
+	if type(handler) ~= "string" and type(handler) ~= "function" then
+		error(format("%s: 'handler' - nil, string, or function expected got %s", usage, type(handler)), 3)
+	end
+	if type(handler) == "string" and type(self[handler]) ~= "function" then
+		error(format("%s: 'handler' - Handler specified does not exist at self[handler]", usage), 3)
+	end
+	if script then
+		if not obj or not obj.GetScript or not obj:HasScript(method) then
+			error(format("%s: You can only hook a script on a frame object", usage), 3)
+		end
+		if not secure and obj.IsProtected and obj:IsProtected() and protectedScripts[method] then
+			error(format("Cannot hook secure script %q; Use SecureHookScript(obj, method, [handler]) instead.", method), 3)
+		end
+	else
+		local issecure
+		if obj then
+			issecure = onceSecure[obj] and onceSecure[obj][method] or issecurevariable(obj, method)
+		else
+			issecure = onceSecure[method] or issecurevariable(method)
+		end
+		if issecure then
+			if forceSecure then
+				if obj then
+					onceSecure[obj] = onceSecure[obj] or {}
+					onceSecure[obj][method] = true
+				else
+					onceSecure[method] = true
+				end
+			elseif not secure then
+				error(format("%s: Attempt to hook secure function %s. Use `SecureHook' or add `true' to the argument list to override.", usage, method), 3)
+			end
+		end
+	end
+
+	local uid
+	if obj then
+		uid = registry[self][obj] and registry[self][obj][method]
+	else
+		uid = registry[self][method]
+	end
+
+	if uid then
+		if actives[uid] then
+			-- Only two sane choices exist here.  We either a) error 100% of the time or b) always unhook and then hook
+			-- choice b would likely lead to odd debuging conditions or other mysteries so we're going with a.
+			error(format("Attempting to rehook already active hook %s.", method))
+		end
+
+		if handlers[uid] == handler then -- turn on a decative hook, note enclosures break this ability, small memory leak
+			actives[uid] = true
+			return
+		elseif obj then -- is there any reason not to call unhook instead of doing the following several lines?
+			if self.hooks and self.hooks[obj] then
+				self.hooks[obj][method] = nil
+			end
+			registry[self][obj][method] = nil
+		else
+			if self.hooks then
+				self.hooks[method] = nil
+			end
+			registry[self][method] = nil
+		end
+		handlers[uid], actives[uid], scripts[uid] = nil, nil, nil
+		uid = nil
+	end
+
+	local orig
+	if script then
+		orig = obj:GetScript(method) or donothing
+	elseif obj then
+		orig = obj[method]
+	else
+		orig = _G[method]
+	end
+
+	if not orig then
+		error(format("%s: Attempting to hook a non existing target", usage), 3)
+	end
+
+	uid = createHook(self, handler, orig, secure, not (raw or secure))
+
+	if obj then
+		self.hooks[obj] = self.hooks[obj] or {}
+		registry[self][obj] = registry[self][obj] or {}
+		registry[self][obj][method] = uid
+
+		if not secure then
+			self.hooks[obj][method] = orig
+		end
+
+		if script then
+			if not secure then
+				obj:SetScript(method, uid)
+			else
+				obj:HookScript(method, uid)
+			end
+		else
+			if not secure then
+				obj[method] = uid
+			else
+				hooksecurefunc(obj, method, uid)
+			end
+		end
+	else
+		registry[self][method] = uid
+
+		if not secure then
+			_G[method] = uid
+			self.hooks[method] = orig
+		else
+			hooksecurefunc(method, uid)
+		end
+	end
+
+	actives[uid], handlers[uid], scripts[uid] = true, handler, script and true or nil
+end
+
+--- Hook a function or a method on an object.
+-- The hook created will be a "safe hook", that means that your handler will be called
+-- before the hooked function ("Pre-Hook"), and you don't have to call the original function yourself,
+-- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
+-- This type of hook is typically used if you need to know if some function got called, and don't want to modify it.
+-- @paramsig [object], method, [handler], [hookSecure]
+-- @param object The object to hook a method from
+-- @param method If object was specified, the name of the method, or the name of the function to hook.
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
+-- @param hookSecure If true, AceHook will allow hooking of secure functions.
+-- @usage
+-- -- create an addon with AceHook embeded
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
+--
+-- function MyAddon:OnEnable()
+--   -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
+--   self:Hook("ActionButton_UpdateHotkeys", true)
+-- end
+--
+-- function MyAddon:ActionButton_UpdateHotkeys(button, type)
+--   print(button:GetName() .. " is updating its HotKey")
+-- end
+function AceHook:Hook(object, method, handler, hookSecure)
+	if type(object) == "string" then
+		method, handler, hookSecure, object = object, method, handler, nil
+	end
+
+	if handler == true then
+		handler, hookSecure = nil, true
+	end
+
+	hook(self, object, method, handler, false, false, false, hookSecure or false, "Usage: Hook([object], method, [handler], [hookSecure])")
+end
+
+--- RawHook a function or a method on an object.
+-- The hook created will be a "raw hook", that means that your handler will completly replace
+-- the original function, and your handler has to call the original function (or not, depending on your intentions).\\
+-- The original function will be stored in `self.hooks[object][method]` or `self.hooks[functionName]` respectively.\\
+-- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
+-- or want to control execution of the original function.
+-- @paramsig [object], method, [handler], [hookSecure]
+-- @param object The object to hook a method from
+-- @param method If object was specified, the name of the method, or the name of the function to hook.
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
+-- @param hookSecure If true, AceHook will allow hooking of secure functions.
+-- @usage
+-- -- create an addon with AceHook embeded
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
+--
+-- function MyAddon:OnEnable()
+--   -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
+--   self:RawHook("ActionButton_UpdateHotkeys", true)
+-- end
+--
+-- function MyAddon:ActionButton_UpdateHotkeys(button, type)
+--   if button:GetName() == "MyButton" then
+--     -- do stuff here
+--   else
+--     self.hooks.ActionButton_UpdateHotkeys(button, type)
+--   end
+-- end
+function AceHook:RawHook(object, method, handler, hookSecure)
+	if type(object) == "string" then
+		method, handler, hookSecure, object = object, method, handler, nil
+	end
+
+	if handler == true then
+		handler, hookSecure = nil, true
+	end
+
+	hook(self, object, method, handler, false, false, true, hookSecure or false,  "Usage: RawHook([object], method, [handler], [hookSecure])")
+end
+
+--- SecureHook a function or a method on an object.
+-- This function is a wrapper around the `hooksecurefunc` function in the WoW API. Using AceHook
+-- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
+-- required anymore, or the addon is being disabled.\\
+-- Secure Hooks should be used if the secure-status of the function is vital to its function,
+-- and taint would block execution. Secure Hooks are always called after the original function was called
+-- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
+-- @paramsig [object], method, [handler]
+-- @param object The object to hook a method from
+-- @param method If object was specified, the name of the method, or the name of the function to hook.
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
+function AceHook:SecureHook(object, method, handler)
+	if type(object) == "string" then
+		method, handler, object = object, method, nil
+	end
+
+	hook(self, object, method, handler, false, true, false, false,  "Usage: SecureHook([object], method, [handler])")
+end
+
+--- Hook a script handler on a frame.
+-- The hook created will be a "safe hook", that means that your handler will be called
+-- before the hooked script ("Pre-Hook"), and you don't have to call the original function yourself,
+-- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
+-- This is the frame script equivalent of the :Hook safe-hook. It would typically be used to be notified
+-- when a certain event happens to a frame.
+-- @paramsig frame, script, [handler]
+-- @param frame The Frame to hook the script on
+-- @param script The script to hook
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
+-- @usage
+-- -- create an addon with AceHook embeded
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
+--
+-- function MyAddon:OnEnable()
+--   -- Hook the OnShow of FriendsFrame
+--   self:HookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
+-- end
+--
+-- function MyAddon:FriendsFrameOnShow(frame)
+--   print("The FriendsFrame was shown!")
+-- end
+function AceHook:HookScript(frame, script, handler)
+	hook(self, frame, script, handler, true, false, false, false,  "Usage: HookScript(object, method, [handler])")
+end
+
+--- RawHook a script handler on a frame.
+-- The hook created will be a "raw hook", that means that your handler will completly replace
+-- the original script, and your handler has to call the original script (or not, depending on your intentions).\\
+-- The original script will be stored in `self.hooks[frame][script]`.\\
+-- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
+-- or want to control execution of the original script.
+-- @paramsig frame, script, [handler]
+-- @param frame The Frame to hook the script on
+-- @param script The script to hook
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
+-- @usage
+-- -- create an addon with AceHook embeded
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
+--
+-- function MyAddon:OnEnable()
+--   -- Hook the OnShow of FriendsFrame
+--   self:RawHookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
+-- end
+--
+-- function MyAddon:FriendsFrameOnShow(frame)
+--   -- Call the original function
+--   self.hooks[frame].OnShow(frame)
+--   -- Do our processing
+--   -- .. stuff
+-- end
+function AceHook:RawHookScript(frame, script, handler)
+	hook(self, frame, script, handler, true, false, true, false, "Usage: RawHookScript(object, method, [handler])")
+end
+
+--- SecureHook a script handler on a frame.
+-- This function is a wrapper around the `frame:HookScript` function in the WoW API. Using AceHook
+-- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
+-- required anymore, or the addon is being disabled.\\
+-- Secure Hooks should be used if the secure-status of the function is vital to its function,
+-- and taint would block execution. Secure Hooks are always called after the original function was called
+-- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
+-- @paramsig frame, script, [handler]
+-- @param frame The Frame to hook the script on
+-- @param script The script to hook
+-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
+function AceHook:SecureHookScript(frame, script, handler)
+	hook(self, frame, script, handler, true, true, false, false, "Usage: SecureHookScript(object, method, [handler])")
+end
+
+--- Unhook from the specified function, method or script.
+-- @paramsig [obj], method
+-- @param obj The object or frame to unhook from
+-- @param method The name of the method, function or script to unhook from.
+function AceHook:Unhook(obj, method)
+	local usage = "Usage: Unhook([obj], method)"
+	if type(obj) == "string" then
+		method, obj = obj, nil
+	end
+
+	if obj and type(obj) ~= "table" then
+		error(format("%s: 'obj' - expecting nil or table got %s", usage, type(obj)), 2)
+	end
+	if type(method) ~= "string" then
+		error(format("%s: 'method' - expeting string got %s", usage, type(method)), 2)
+	end
+
+	local uid
+	if obj then
+		uid = registry[self][obj] and registry[self][obj][method]
+	else
+		uid = registry[self][method]
+	end
+
+	if not uid or not actives[uid] then
+		-- Declining to error on an unneeded unhook since the end effect is the same and this would just be annoying.
+		return false
+	end
+
+	actives[uid], handlers[uid] = nil, nil
+
+	if obj then
+		registry[self][obj][method] = nil
+		registry[self][obj] = next(registry[self][obj]) and registry[self][obj] or nil
+
+		-- if the hook reference doesnt exist, then its a secure hook, just bail out and dont do any unhooking
+		if not self.hooks[obj] or not self.hooks[obj][method] then return true end
+
+		if scripts[uid] and obj:GetScript(method) == uid then  -- unhooks scripts
+			obj:SetScript(method, self.hooks[obj][method] ~= donothing and self.hooks[obj][method] or nil)
+			scripts[uid] = nil
+		elseif obj and self.hooks[obj] and self.hooks[obj][method] and obj[method] == uid then -- unhooks methods
+			obj[method] = self.hooks[obj][method]
+		end
+
+		self.hooks[obj][method] = nil
+		self.hooks[obj] = next(self.hooks[obj]) and self.hooks[obj] or nil
+	else
+		registry[self][method] = nil
+
+		-- if self.hooks[method] doesn't exist, then this is a SecureHook, just bail out
+		if not self.hooks[method] then return true end
+
+		if self.hooks[method] and _G[method] == uid then -- unhooks functions
+			_G[method] = self.hooks[method]
+		end
+
+		self.hooks[method] = nil
+	end
+	return true
+end
+
+--- Unhook all existing hooks for this addon.
+function AceHook:UnhookAll()
+	for key, value in pairs(registry[self]) do
+		if type(key) == "table" then
+			for method in pairs(value) do
+				AceHook.Unhook(self, key, method)
+			end
+		else
+			AceHook.Unhook(self, key)
+		end
+	end
+end
+
+--- Check if the specific function, method or script is already hooked.
+-- @paramsig [obj], method
+-- @param obj The object or frame to unhook from
+-- @param method The name of the method, function or script to unhook from.
+function AceHook:IsHooked(obj, method)
+	-- we don't check if registry[self] exists, this is done by evil magicks in the metatable
+	if type(obj) == "string" then
+		if registry[self][obj] and actives[registry[self][obj]] then
+			return true, handlers[registry[self][obj]]
+		end
+	else
+		if registry[self][obj] and registry[self][obj][method] and actives[registry[self][obj][method]] then
+			return true, handlers[registry[self][obj][method]]
+		end
+	end
+
+	return false, nil
+end
+
+--- Upgrade our old embeded
+for target, v in pairs( AceHook.embeded ) do
+	AceHook:Embed( target )
+end
diff --git a/Libs/AceHook-3.0/AceHook-3.0.xml b/Libs/AceHook-3.0/AceHook-3.0.xml
new file mode 100644
index 0000000..fe51336
--- /dev/null
+++ b/Libs/AceHook-3.0/AceHook-3.0.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="AceHook-3.0.lua"/>
+</Ui>
diff --git a/Libs/AceLocale-3.0/AceLocale-3.0.lua b/Libs/AceLocale-3.0/AceLocale-3.0.lua
index ddd7de5..e133781 100755
--- a/Libs/AceLocale-3.0/AceLocale-3.0.lua
+++ b/Libs/AceLocale-3.0/AceLocale-3.0.lua
@@ -1,8 +1,8 @@
 --- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
 -- @class file
 -- @name AceLocale-3.0
--- @release $Id: AceLocale-3.0.lua 1005 2011-01-29 14:19:43Z mikk $
-local MAJOR,MINOR = "AceLocale-3.0", 5
+-- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $
+local MAJOR,MINOR = "AceLocale-3.0", 6
 
 local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
@@ -10,7 +10,7 @@ if not AceLocale then return end -- no upgrade needed
 
 -- Lua APIs
 local assert, tostring, error = assert, tostring, error
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
+local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
 
 -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
 -- List them here for Mikk's FindGlobals script
@@ -56,10 +56,10 @@ local writeproxy = setmetatable({}, {
 	__index = assertfalse
 })
 
--- This metatable proxy is used when registering the default locale. 
+-- This metatable proxy is used when registering the default locale.
 -- It refuses to overwrite existing values
 -- Reason 1: Allows loading locales in any order
--- Reason 2: If 2 modules have the same string, but only the first one to be 
+-- Reason 2: If 2 modules have the same string, but only the first one to be
 --           loaded has a translation for the current locale, the translation
 --           doesn't get overwritten.
 --
@@ -91,16 +91,16 @@ local writedefaultproxy = setmetatable({}, {
 -- L["string1"] = "Zeichenkette1"
 -- @return Locale Table to add localizations to, or nil if the current locale is not required.
 function AceLocale:NewLocale(application, locale, isDefault, silent)
-	
+
 	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
 	local gameLocale = GAME_LOCALE or gameLocale
 
 	local app = AceLocale.apps[application]
-	
-	if silent and app then
+
+	if silent and app and getmetatable(app) ~= readmetasilent then
 		geterrorhandler()("Usage: NewLocale(application, locale[, isDefault[, silent]]): 'silent' must be specified for the first locale registered")
 	end
-	
+
 	if not app then
 		if silent=="raw" then
 			app = {}
@@ -110,13 +110,13 @@ function AceLocale:NewLocale(application, locale, isDefault, silent)
 		AceLocale.apps[application] = app
 		AceLocale.appnames[app] = application
 	end
-	
+
 	if locale ~= gameLocale and not isDefault then
 		return -- nop, we don't need these translations
 	end
-	
+
 	registering = app -- remember globally for writeproxy and writedefaultproxy
-	
+
 	if isDefault then
 		return writedefaultproxy
 	end
diff --git a/Libs/AceLocale-3.0/AceLocale-3.0.xml b/Libs/AceLocale-3.0/AceLocale-3.0.xml
index e017af0..bf023f0 100755
--- a/Libs/AceLocale-3.0/AceLocale-3.0.xml
+++ b/Libs/AceLocale-3.0/AceLocale-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceLocale-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/AceSerializer-3.0/AceSerializer-3.0.lua b/Libs/AceSerializer-3.0/AceSerializer-3.0.lua
index 0b19e08..2a4c5ef 100755
--- a/Libs/AceSerializer-3.0/AceSerializer-3.0.lua
+++ b/Libs/AceSerializer-3.0/AceSerializer-3.0.lua
@@ -1,16 +1,16 @@
 --- **AceSerializer-3.0** can serialize any variable (except functions or userdata) into a string format,
--- that can be send over the addon comm channel. AceSerializer was designed to keep all data intact, especially 
+-- that can be send over the addon comm channel. AceSerializer was designed to keep all data intact, especially
 -- very large numbers or floating point numbers, and table structures. The only caveat currently is, that multiple
 -- references to the same table will be send individually.
 --
--- **AceSerializer-3.0** can be embeded into your addon, either explicitly by calling AceSerializer:Embed(MyAddon) or by 
+-- **AceSerializer-3.0** can be embeded into your addon, either explicitly by calling AceSerializer:Embed(MyAddon) or by
 -- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
 -- and can be accessed directly, without having to explicitly call AceSerializer itself.\\
 -- It is recommended to embed AceSerializer, otherwise you'll have to specify a custom `self` on all calls you
 -- make into AceSerializer.
 -- @class file
 -- @name AceSerializer-3.0
--- @release $Id: AceSerializer-3.0.lua 1135 2015-09-19 20:39:16Z nevcairiel $
+-- @release $Id: AceSerializer-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 local MAJOR,MINOR = "AceSerializer-3.0", 5
 local AceSerializer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
@@ -40,7 +40,7 @@ local function SerializeStringHelper(ch)	-- Used by SerializeValue for strings
 		return "\126\122"
 	elseif n<=32 then 			-- nonprint + space
 		return "\126"..strchar(n+64)
-	elseif n==94 then		-- value separator 
+	elseif n==94 then		-- value separator
 		return "\126\125"
 	elseif n==126 then		-- our own escape character
 		return "\126\124"
@@ -54,12 +54,12 @@ end
 local function SerializeValue(v, res, nres)
 	-- We use "^" as a value separator, followed by one byte for type indicator
 	local t=type(v)
-	
+
 	if t=="string" then		-- ^S = string (escaped to remove nonprints, "^"s, etc)
 		res[nres+1] = "^S"
 		res[nres+2] = gsub(v,"[%c \94\126\127]", SerializeStringHelper)
 		nres=nres+2
-	
+
 	elseif t=="number" then	-- ^N = number (just tostring()ed) or ^F (float components)
 		local str = tostring(v)
 		if tonumber(str)==v  --[[not in 4.3 or str==serNaN]] then
@@ -79,7 +79,7 @@ local function SerializeValue(v, res, nres)
 			res[nres+4] = tostring(e-53)	-- adjust exponent to counteract mantissa manipulation
 			nres=nres+4
 		end
-	
+
 	elseif t=="table" then	-- ^T...^t = table (list of key,value pairs)
 		nres=nres+1
 		res[nres] = "^T"
@@ -89,7 +89,7 @@ local function SerializeValue(v, res, nres)
 		end
 		nres=nres+1
 		res[nres] = "^t"
-	
+
 	elseif t=="boolean" then	-- ^B = true, ^b = false
 		nres=nres+1
 		if v then
@@ -97,15 +97,15 @@ local function SerializeValue(v, res, nres)
 		else
 			res[nres] = "^b"	-- false
 		end
-	
+
 	elseif t=="nil" then		-- ^Z = nil (zero, "N" was taken :P)
 		nres=nres+1
 		res[nres] = "^Z"
-	
+
 	else
 		error(MAJOR..": Cannot serialize a value of type '"..t.."'")	-- can't produce error on right level, this is wildly recursive
 	end
-	
+
 	return nres
 end
 
@@ -121,14 +121,14 @@ local serializeTbl = { "^1" }	-- "^1" = Hi, I'm data serialized by AceSerializer
 -- @return The data in its serialized form (string)
 function AceSerializer:Serialize(...)
 	local nres = 1
-	
+
 	for i=1,select("#", ...) do
 		local v = select(i, ...)
 		nres = SerializeValue(v, serializeTbl, nres)
 	end
-	
+
 	serializeTbl[nres+1] = "^^"	-- "^^" = End of serialized data
-	
+
 	return tconcat(serializeTbl, "", 1, nres+1)
 end
 
@@ -175,9 +175,9 @@ local function DeserializeValue(iter,single,ctl,data)
 		ctl,data = iter()
 	end
 
-	if not ctl then 
+	if not ctl then
 		error("Supplied data misses AceSerializer terminator ('^^')")
-	end	
+	end
 
 	if ctl=="^^" then
 		-- ignore extraneous data
@@ -185,7 +185,7 @@ local function DeserializeValue(iter,single,ctl,data)
 	end
 
 	local res
-	
+
 	if ctl=="^S" then
 		res = gsub(data, "~.", DeserializeStringHelper)
 	elseif ctl=="^N" then
@@ -218,7 +218,7 @@ local function DeserializeValue(iter,single,ctl,data)
 			ctl,data = iter()
 			if ctl=="^t" then break end	-- ignore ^t's data
 			k = DeserializeValue(iter,true,ctl,data)
-			if k==nil then 
+			if k==nil then
 				error("Invalid AceSerializer table format (no table end marker)")
 			end
 			ctl,data = iter()
@@ -231,7 +231,7 @@ local function DeserializeValue(iter,single,ctl,data)
 	else
 		error("Invalid AceSerializer control code '"..ctl.."'")
 	end
-	
+
 	if not single then
 		return res,DeserializeValue(iter)
 	else
diff --git a/Libs/AceTab-3.0/AceTab-3.0.lua b/Libs/AceTab-3.0/AceTab-3.0.lua
new file mode 100644
index 0000000..aa67ef8
--- /dev/null
+++ b/Libs/AceTab-3.0/AceTab-3.0.lua
@@ -0,0 +1,446 @@
+--- AceTab-3.0 provides support for tab-completion.
+-- Note: This library is not yet finalized.
+-- @class file
+-- @name AceTab-3.0
+-- @release $Id: AceTab-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
+
+local ACETAB_MAJOR, ACETAB_MINOR = 'AceTab-3.0', 9
+local AceTab, oldminor = LibStub:NewLibrary(ACETAB_MAJOR, ACETAB_MINOR)
+
+if not AceTab then return end -- No upgrade needed
+
+AceTab.registry = AceTab.registry or {}
+
+-- local upvalues
+local _G = _G
+local pairs = pairs
+local ipairs = ipairs
+local type = type
+local registry = AceTab.registry
+
+local strfind = string.find
+local strsub = string.sub
+local strlower = string.lower
+local strformat = string.format
+local strmatch = string.match
+
+local function printf(...)
+	DEFAULT_CHAT_FRAME:AddMessage(strformat(...))
+end
+
+local function getTextBeforeCursor(this, start)
+	return strsub(this:GetText(), start or 1, this:GetCursorPosition())
+end
+
+-- Hook OnTabPressed and OnTextChanged for the frame, give it an empty matches table, and set its curMatch to 0, if we haven't done so already.
+local function hookFrame(f)
+	if f.hookedByAceTab3 then return end
+	f.hookedByAceTab3 = true
+	if f == ChatEdit_GetActiveWindow() then
+		local origCTP = ChatEdit_CustomTabPressed
+		function ChatEdit_CustomTabPressed(...)
+			if AceTab:OnTabPressed(f) then
+				return origCTP(...)
+			else
+				return true
+			end
+		end
+	else
+		local origOTP = f:GetScript('OnTabPressed')
+		if type(origOTP) ~= 'function' then
+			origOTP = function() end
+		end
+		f:SetScript('OnTabPressed', function(...)
+			if AceTab:OnTabPressed(f) then
+				return origOTP(...)
+			end
+		end)
+	end
+	f.at3curMatch = 0
+	f.at3matches = {}
+end
+
+local firstPMLength
+
+local fallbacks, notfallbacks = {}, {}  -- classifies completions into those which have preconditions and those which do not.  Those without preconditions are only considered if no other completions have matches.
+local pmolengths = {}  -- holds the number of characters to overwrite according to pmoverwrite and the current prematch
+-- ------------------------------------------------------------------------------
+-- RegisterTabCompletion( descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite )
+-- See http://www.wowace.com/wiki/AceTab-2.0 for detailed API documentation
+--
+-- descriptor	string					Unique identifier for this tab completion set
+--
+-- prematches	string|table|nil		String match(es) AFTER which this tab completion will apply.
+--										AceTab will ignore tabs NOT preceded by the string(s).
+--										If no value is passed, will check all tabs pressed in the specified editframe(s) UNLESS a more-specific tab complete applies.
+--
+-- wordlist		function|table			Function that will be passed a table into which it will insert strings corresponding to all possible completions, or an equivalent table.
+--										The text in the editbox, the position of the start of the word to be completed, and the uncompleted partial word
+--										are passed as second, third, and fourth arguments, to facilitate pre-filtering or conditional formatting, if desired.
+--
+-- usagefunc	function|boolean|nil	Usage statement function.  Defaults to the wordlist, one per line.  A boolean true squelches usage output.
+--
+-- listenframes	string|table|nil		EditFrames to monitor.  Defaults to ChatFrameEditBox.
+--
+-- postfunc		function|nil			Post-processing function.  If supplied, matches will be passed through this function after they've been identified as a match.
+--
+-- pmoverwrite	boolean|number|nil		Offset the beginning of the completion string in the editbox when making a completion.  Passing a boolean true indicates that we want to overwrite
+--										the entire prematch string, and passing a number will overwrite that many characters prior to the cursor.
+--										This is useful when you want to use the prematch as an indicator character, but ultimately do not want it as part of the text, itself.
+--
+-- no return
+-- ------------------------------------------------------------------------------
+function AceTab:RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite)
+	-- Arg checks
+	if type(descriptor) ~= 'string' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'descriptor' - string expected.", 3) end
+	if prematches and type(prematches) ~= 'string' and type(prematches) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'prematches' - string, table, or nil expected.", 3) end
+	if type(wordlist) ~= 'function' and type(wordlist) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'wordlist' - function or table expected.", 3) end
+	if usagefunc and type(usagefunc) ~= 'function' and type(usagefunc) ~= 'boolean' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'usagefunc' - function or boolean expected.", 3) end
+	if listenframes and type(listenframes) ~= 'string' and type(listenframes) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'listenframes' - string or table expected.", 3) end
+	if postfunc and type(postfunc) ~= 'function' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'postfunc' - function expected.", 3) end
+	if pmoverwrite and type(pmoverwrite) ~= 'boolean' and type(pmoverwrite) ~= 'number' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'pmoverwrite' - boolean or number expected.", 3) end
+
+	local pmtable
+
+	if type(prematches) == 'table' then
+		pmtable = prematches
+		notfallbacks[descriptor] = true
+	else
+		pmtable = {}
+		-- Mark this group as a fallback group if no value was passed.
+		if not prematches then
+			pmtable[1] = ""
+			fallbacks[descriptor] = true
+		-- Make prematches into a one-element table if it was passed as a string.
+		elseif type(prematches) == 'string' then
+			pmtable[1] = prematches
+			if prematches == "" then
+				fallbacks[descriptor] = true
+			else
+				notfallbacks[descriptor] = true
+			end
+		end
+	end
+
+	-- Make listenframes into a one-element table if it was not passed a table of frames.
+	if not listenframes then  -- default
+		listenframes = {}
+		for i = 1, NUM_CHAT_WINDOWS do
+			listenframes[i] = _G["ChatFrame"..i.."EditBox"]
+		end
+	elseif type(listenframes) ~= 'table' or type(listenframes[0]) == 'userdata' and type(listenframes.IsObjectType) == 'function' then  -- single frame or framename
+		listenframes = { listenframes }
+	end
+
+	-- Hook each registered listenframe and give it a matches table.
+	for _, f in pairs(listenframes) do
+		if type(f) == 'string' then
+			f = _G[f]
+		end
+		if type(f) ~= 'table' or type(f[0]) ~= 'userdata' or type(f.IsObjectType) ~= 'function' then
+			error(format(ACETAB_MAJOR..": Cannot register frame %q; it does not exist", f:GetName()))
+		end
+		if f then
+			if f:GetObjectType() ~= 'EditBox' then
+				error(format(ACETAB_MAJOR..": Cannot register frame %q; it is not an EditBox", f:GetName()))
+			else
+				hookFrame(f)
+			end
+		end
+	end
+
+	-- Everything checks out; register this completion.
+	if not registry[descriptor] then
+		registry[descriptor] = { prematches = pmtable, wordlist = wordlist, usagefunc = usagefunc, listenframes = listenframes, postfunc = postfunc, pmoverwrite = pmoverwrite }
+	end
+end
+
+function AceTab:IsTabCompletionRegistered(descriptor)
+	return registry and registry[descriptor]
+end
+
+function AceTab:UnregisterTabCompletion(descriptor)
+	registry[descriptor] = nil
+	pmolengths[descriptor] = nil
+	fallbacks[descriptor] = nil
+	notfallbacks[descriptor] = nil
+end
+
+-- ------------------------------------------------------------------------------
+-- gcbs( s1, s2 )
+--
+-- s1		string		First string to be compared
+--
+-- s2		string		Second string to be compared
+--
+-- returns the greatest common substring beginning s1 and s2
+-- ------------------------------------------------------------------------------
+local function gcbs(s1, s2)
+	if not s1 and not s2 then return end
+	if not s1 then s1 = s2 end
+	if not s2 then s2 = s1 end
+	if #s2 < #s1 then
+		s1, s2 = s2, s1
+	end
+	if strfind(strlower(s2), "^"..strlower(s1)) then
+		return s1
+	else
+		return gcbs(strsub(s1, 1, -2), s2)
+	end
+end
+
+local cursor  -- Holds cursor position.  Set in :OnTabPressed().
+-- ------------------------------------------------------------------------------
+-- cycleTab()
+-- For when a tab press has multiple possible completions, we need to allow the user to press tab repeatedly to cycle through them.
+-- If we have multiple possible completions, all tab presses after the first will call this function to cycle through and insert the different possible matches.
+-- This function will stop being called after OnTextChanged() is triggered by something other than AceTab (i.e. the user inputs a character).
+-- ------------------------------------------------------------------------------
+local previousLength, cMatch, matched, postmatch
+local function cycleTab(this)
+	cMatch = 0  -- Counter across all sets.  The pseudo-index relevant to this value and corresponding to the current match is held in this.at3curMatch
+	matched = false
+
+	-- Check each completion group registered to this frame.
+	for desc, compgrp in pairs(this.at3matches) do
+
+		-- Loop through the valid completions for this set.
+		for m, pm in pairs(compgrp) do
+			cMatch = cMatch + 1
+			if cMatch == this.at3curMatch then  -- we're back to where we left off last time through the combined list
+				this.at3lastMatch = m
+				this.at3lastWord = pm
+				this.at3curMatch = cMatch + 1 -- save the new cMatch index
+				matched = true
+				break
+			end
+		end
+		if matched then break end
+	end
+
+	-- If our index is beyond the end of the list, reset the original uncompleted substring and let the cycle start over next time tab is pressed.
+	if not matched then
+		this.at3lastMatch = this.at3origMatch
+		this.at3lastWord = this.at3origWord
+		this.at3curMatch = 1
+	end
+
+	-- Insert the completion.
+	this:HighlightText(this.at3matchStart-1, cursor)
+	this:Insert(this.at3lastWord or '')
+	this.at3_last_precursor = getTextBeforeCursor(this) or ''
+end
+
+local IsSecureCmd = IsSecureCmd
+
+local cands, candUsage = {}, {}
+local numMatches = 0
+local firstMatch, hasNonFallback, allGCBS, setGCBS, usage
+local text_precursor, text_all, text_pmendToCursor
+local matches, usagefunc  -- convenience locals
+
+-- Fill the this.at3matches[descriptor] tables with matching completion pairs for each entry, based on
+-- the partial string preceding the cursor position and using the corresponding registered wordlist.
+--
+-- The entries of the matches tables are of the format raw_match = formatted_match, where raw_match is the plaintext completion and
+-- formatted_match is the match after being formatted/altered/processed by the registered postfunc.
+-- If no postfunc exists, then the formatted and raw matches are the same.
+local pms, pme, pmt, prematchStart, prematchEnd, text_prematch, entry
+local function fillMatches(this, desc, fallback)
+	entry = registry[desc]
+	-- See what frames are registered for this completion group.  If the frame in which we pressed tab is one of them, then we start building matches.
+	for _, f in ipairs(entry.listenframes) do
+		if f == this then
+
+			-- Try each precondition string registered for this completion group.
+			for _, prematch in ipairs(entry.prematches) do
+
+				-- Test if our prematch string is satisfied.
+				-- If it is, then we find its last occurence prior to the cursor, calculate and store its pmoverwrite value (if applicable), and start considering completions.
+				if fallback then prematch = "%s" end
+
+				-- Find the last occurence of the prematch before the cursor.
+				pms, pme, pmt = nil, 1, ''
+				text_prematch, prematchEnd, prematchStart = nil, nil, nil
+				while true do
+					pms, pme, pmt = strfind(text_precursor, "("..prematch..")", pme)
+					if pms then
+						prematchStart, prematchEnd, text_prematch = pms, pme, pmt
+						pme = pme + 1
+					else
+						break
+					end
+				end
+
+				if not prematchStart and fallback then
+					prematchStart, prematchEnd, text_prematch = 0, 0, ''
+				end
+				if prematchStart then
+					-- text_pmendToCursor should be the sub-word/phrase to be completed.
+					text_pmendToCursor = strsub(text_precursor, prematchEnd + 1)
+
+					-- How many characters should we eliminate before the completion before writing it in.
+					pmolengths[desc] = entry.pmoverwrite == true and #text_prematch or entry.pmoverwrite or 0
+
+					-- This is where we will insert completions, taking the prematch overwrite into account.
+					this.at3matchStart = prematchEnd + 1 - (pmolengths[desc] or 0)
+
+					-- We're either a non-fallback set or all completions thus far have been fallback sets, and the precondition matches.
+					-- Create cands from the registered wordlist, filling it with all potential (unfiltered) completion strings.
+					local wordlist = entry.wordlist
+					local cands = type(wordlist) == 'table' and wordlist or {}
+					if type(wordlist) == 'function' then
+						wordlist(cands, text_all, prematchEnd + 1, text_pmendToCursor)
+					end
+					if cands ~= false then
+						matches = this.at3matches[desc] or {}
+						for i in pairs(matches) do matches[i] = nil end
+
+						-- Check each of the entries in cands to see if it completes the word before the cursor.
+						-- Finally, increment our match count and set firstMatch, if appropriate.
+						for _, m in ipairs(cands) do
+							if strfind(strlower(m), strlower(text_pmendToCursor), 1, 1) == 1 then  -- we have a matching completion!
+								hasNonFallback = hasNonFallback or (not fallback)
+								matches[m] = entry.postfunc and entry.postfunc(m, prematchEnd + 1, text_all) or m
+								numMatches = numMatches + 1
+								if numMatches == 1 then
+									firstMatch = matches[m]
+									firstPMLength = pmolengths[desc] or 0
+								end
+							end
+						end
+						this.at3matches[desc] = numMatches > 0 and matches or nil
+					end
+				end
+			end
+		end
+	end
+end
+
+function AceTab:OnTabPressed(this)
+	if this:GetText() == '' then return true end
+
+	-- allow Blizzard to handle slash commands, themselves
+	if this == ChatEdit_GetActiveWindow() then
+		local command = this:GetText()
+		if strfind(command, "^/[%a%d_]+$") then
+			return true
+		end
+		local cmd = strmatch(command, "^/[%a%d_]+")
+		if cmd and IsSecureCmd(cmd) then
+			return true
+		end
+	end
+
+	cursor = this:GetCursorPosition()
+
+	text_all = this:GetText()
+	text_precursor = getTextBeforeCursor(this) or ''
+
+	-- If we've already found some matches and haven't done anything since the last tab press, then (continue) cycling matches.
+	-- Otherwise, reset this frame's matches and proceed to creating our list of possible completions.
+	this.at3lastMatch = this.at3curMatch > 0 and (this.at3lastMatch or this.at3origWord)
+	-- Detects if we've made any edits since the last tab press.  If not, continue cycling completions.
+	if text_precursor == this.at3_last_precursor then
+		return cycleTab(this)
+	else
+		for i in pairs(this.at3matches) do this.at3matches[i] = nil end
+		this.at3curMatch = 0
+		this.at3origWord = nil
+		this.at3origMatch = nil
+		this.at3lastWord = nil
+		this.at3lastMatch = nil
+		this.at3_last_precursor = text_precursor
+	end
+
+	numMatches = 0
+	firstMatch = nil
+	firstPMLength = 0
+	hasNonFallback = false
+	for i in pairs(pmolengths) do pmolengths[i] = nil end
+
+	for desc in pairs(notfallbacks) do
+		fillMatches(this, desc)
+	end
+	if not hasNonFallback then
+		for desc in pairs(fallbacks) do
+			fillMatches(this, desc, true)
+		end
+	end
+
+	if not firstMatch then
+		this.at3_last_precursor = "\0"
+		return true
+	end
+
+	-- We want to replace the entire word with our completion, so highlight it up to the cursor.
+	-- If only one match exists, then stick it in there and append a space.
+	if numMatches == 1 then
+		-- HighlightText takes the value AFTER which the highlighting starts, so we have to subtract 1 to have it start before the first character.
+		this:HighlightText(this.at3matchStart-1, cursor)
+
+		this:Insert(firstMatch)
+		this:Insert(" ")
+	else
+		-- Otherwise, we want to begin cycling through the valid completions.
+		-- Beginning a cycle also causes the usage statement to be printed, if one exists.
+
+		-- Print usage statements for each possible completion (and gather up the GCBS of all matches while we're walking the tables).
+		allGCBS = nil
+		for desc, matches in pairs(this.at3matches) do
+			-- Don't print usage statements for fallback completion groups if we have 'real' completion groups with matches.
+			if hasNonFallback and fallbacks[desc] then break end
+
+			-- Use the group's description as a heading for its usage statements.
+			DEFAULT_CHAT_FRAME:AddMessage(desc..":")
+
+			usagefunc = registry[desc].usagefunc
+			if not usagefunc then
+				-- No special usage processing; just print a list of the (formatted) matches.
+				for m, fm in pairs(matches) do
+					DEFAULT_CHAT_FRAME:AddMessage(fm)
+					allGCBS = gcbs(allGCBS, m)
+				end
+			else
+				-- Print a usage statement based on the corresponding registered usagefunc.
+				-- candUsage is the table passed to usagefunc to be filled with candidate = usage_statement pairs.
+				if type(usagefunc) == 'function' then
+					for i in pairs(candUsage) do candUsage[i] = nil end
+
+					-- usagefunc takes the greatest common substring of valid matches as one of its args, so let's find that now.
+					-- TODO: Make the GCBS function accept a vararg or table, after which we can just pass in the list of matches.
+					setGCBS = nil
+					for m in pairs(matches) do
+						setGCBS = gcbs(setGCBS, m)
+					end
+					allGCBS = gcbs(allGCBS, setGCBS)
+					usage = usagefunc(candUsage, matches, setGCBS, strsub(text_precursor, 1, prematchEnd))
+
+					-- If the usagefunc returns a string, then the entire usage statement has been taken care of by usagefunc, and we need only to print it...
+					if type(usage) == 'string' then
+						DEFAULT_CHAT_FRAME:AddMessage(usage)
+
+					-- ...otherwise, it should have filled candUsage with candidate-usage statement pairs, and we need to print the matching ones.
+					elseif next(candUsage) and numMatches > 0 then
+						for m, fm in pairs(matches) do
+							if candUsage[m] then DEFAULT_CHAT_FRAME:AddMessage(strformat("%s - %s", fm, candUsage[m])) end
+						end
+					end
+				end
+			end
+
+			if next(matches) then
+				-- Replace the original string with the greatest common substring of all valid completions.
+				this.at3curMatch = 1
+				this.at3origWord = strsub(text_precursor, this.at3matchStart, this.at3matchStart + pmolengths[desc] - 1) .. allGCBS or ""
+				this.at3origMatch = allGCBS or ""
+				this.at3lastWord = this.at3origWord
+				this.at3lastMatch = this.at3origMatch
+
+				this:HighlightText(this.at3matchStart-1, cursor)
+				this:Insert(this.at3origWord)
+				this.at3_last_precursor = getTextBeforeCursor(this) or ''
+			end
+		end
+	end
+end
diff --git a/Libs/AceTab-3.0/AceTab-3.0.xml b/Libs/AceTab-3.0/AceTab-3.0.xml
new file mode 100644
index 0000000..2e50904
--- /dev/null
+++ b/Libs/AceTab-3.0/AceTab-3.0.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="AceTab-3.0.lua"/>
+</Ui>
diff --git a/Libs/AceTimer-3.0/AceTimer-3.0.lua b/Libs/AceTimer-3.0/AceTimer-3.0.lua
index 8ba6b3c..33b4da4 100755
--- a/Libs/AceTimer-3.0/AceTimer-3.0.lua
+++ b/Libs/AceTimer-3.0/AceTimer-3.0.lua
@@ -15,7 +15,7 @@
 -- make into AceTimer.
 -- @class file
 -- @name AceTimer-3.0
--- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
+-- @release $Id: AceTimer-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
 
 local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
 local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
@@ -34,18 +34,20 @@ local function new(self, loop, func, delay, ...)
 		delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
 	end
 
-	local timer = {...}
-	timer.object = self
-	timer.func = func
-	timer.looping = loop
-	timer.argsCount = select("#", ...)
-	timer.delay = delay
-	timer.ends = GetTime() + delay
+	local timer = {
+		object = self,
+		func = func,
+		looping = loop,
+		argsCount = select("#", ...),
+		delay = delay,
+		ends = GetTime() + delay,
+		...
+	}
 
 	activeTimers[timer] = timer
 
 	-- Create new timer closure to wrap the "timer" object
-	timer.callback = function() 
+	timer.callback = function()
 		if not timer.cancelled then
 			if type(timer.func) == "string" then
 				-- We manually set the unpack count to prevent issues with an arg set that contains nil and ends with nil
@@ -156,7 +158,7 @@ end
 
 --- Cancels all timers registered to the current addon object ('self')
 function AceTimer:CancelAllTimers()
-	for k,v in pairs(activeTimers) do
+	for k,v in next, activeTimers do
 		if v.object == self then
 			AceTimer.CancelTimer(self, k)
 		end
@@ -187,8 +189,8 @@ if oldminor and oldminor < 10 then
 	AceTimer.frame:SetScript("OnEvent", nil)
 	AceTimer.frame:UnregisterAllEvents()
 	-- convert timers
-	for object,timers in pairs(AceTimer.selfs) do
-		for handle,timer in pairs(timers) do
+	for object,timers in next, AceTimer.selfs do
+		for handle,timer in next, timers do
 			if type(timer) == "table" and timer.callback then
 				local newTimer
 				if timer.delay then
@@ -214,7 +216,7 @@ elseif oldminor and oldminor < 17 then
 	-- Clear old timer table and update upvalue
 	AceTimer.activeTimers = {}
 	activeTimers = AceTimer.activeTimers
-	for handle, timer in pairs(oldTimers) do
+	for handle, timer in next, oldTimers do
 		local newTimer
 		-- Stop the old timer animation
 		local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
@@ -232,7 +234,7 @@ elseif oldminor and oldminor < 17 then
 
 	-- Migrate transitional handles
 	if oldminor < 13 and AceTimer.hashCompatTable then
-		for handle, id in pairs(AceTimer.hashCompatTable) do
+		for handle, id in next, AceTimer.hashCompatTable do
 			local t = activeTimers[id]
 			if t then
 				activeTimers[id] = nil
@@ -257,7 +259,7 @@ local mixins = {
 
 function AceTimer:Embed(target)
 	AceTimer.embeds[target] = true
-	for _,v in pairs(mixins) do
+	for _,v in next, mixins do
 		target[v] = AceTimer[v]
 	end
 	return target
@@ -271,6 +273,6 @@ function AceTimer:OnEmbedDisable(target)
 	target:CancelAllTimers()
 end
 
-for addon in pairs(AceTimer.embeds) do
+for addon in next, AceTimer.embeds do
 	AceTimer:Embed(addon)
 end
diff --git a/Libs/AceTimer-3.0/AceTimer-3.0.xml b/Libs/AceTimer-3.0/AceTimer-3.0.xml
index 38e9021..d5aee81 100755
--- a/Libs/AceTimer-3.0/AceTimer-3.0.xml
+++ b/Libs/AceTimer-3.0/AceTimer-3.0.xml
@@ -1,4 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 	<Script file="AceTimer-3.0.lua"/>
-</Ui>
\ No newline at end of file
+</Ui>
diff --git a/Libs/Bindings.xml b/Libs/Bindings.xml
new file mode 100644
index 0000000..77ab8c8
--- /dev/null
+++ b/Libs/Bindings.xml
@@ -0,0 +1,5 @@
+<Bindings>
+	<Binding name="RELOADUI" description="Reloads the UI." header="ACE3" category="ADDONS">
+		ReloadUI()
+	</Binding>
+</Bindings>
diff --git a/Libs/CHANGES.txt b/Libs/CHANGES.txt
new file mode 100644
index 0000000..075c959
--- /dev/null
+++ b/Libs/CHANGES.txt
@@ -0,0 +1,39 @@
+------------------------------------------------------------------------
+r1258 | nevcairiel | 2022-02-23 09:52:47 +0000 (Wed, 23 Feb 2022) | 1 line
+Changed paths:
+   M /trunk/Ace3.toc
+   M /trunk/changelog.txt
+
+Update TOC and Changelog
+------------------------------------------------------------------------
+r1257 | nevcairiel | 2022-01-10 16:25:37 +0000 (Mon, 10 Jan 2022) | 1 line
+Changed paths:
+   M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
+
+AceGUI-3.0: Dropdown: Fix double click sound on toggling the dropdown (Issue #575)
+------------------------------------------------------------------------
+r1256 | nevcairiel | 2021-11-14 09:17:43 +0000 (Sun, 14 Nov 2021) | 1 line
+Changed paths:
+   M /trunk/changelog.txt
+
+Update Changelog
+------------------------------------------------------------------------
+r1255 | nevcairiel | 2021-11-14 09:14:15 +0000 (Sun, 14 Nov 2021) | 1 line
+Changed paths:
+   M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+
+AceConfigDialog-3.0: Fix width number multiplier on multiselects (Issue #584)
+------------------------------------------------------------------------
+r1254 | funkehdude | 2021-11-12 22:56:59 +0000 (Fri, 12 Nov 2021) | 1 line
+Changed paths:
+   M /trunk/Ace3.toc
+
+bump toc
+------------------------------------------------------------------------
+r1253 | funkehdude | 2021-06-30 11:40:16 +0000 (Wed, 30 Jun 2021) | 1 line
+Changed paths:
+   M /trunk/Ace3.toc
+
+bump toc
+------------------------------------------------------------------------
+
diff --git a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
index 39e265d..a8377fe 100755
--- a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
+++ b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
@@ -1,4 +1,4 @@
---[[ $Id: CallbackHandler-1.0.lua 22 2018-07-21 14:17:22Z nevcairiel $ ]]
+--[[ $Id: CallbackHandler-1.0.lua 1186 2018-07-21 14:19:18Z nevcairiel $ ]]
 local MAJOR, MINOR = "CallbackHandler-1.0", 7
 local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
 
diff --git a/Libs/LICENSE.txt b/Libs/LICENSE.txt
new file mode 100644
index 0000000..866fc34
--- /dev/null
+++ b/Libs/LICENSE.txt
@@ -0,0 +1,29 @@
+Copyright (c) 2007, Ace3 Development Team 
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * Redistribution of a stand alone version is strictly prohibited without 
+      prior written authorization from the Lead of the Ace3 Development Team. 
+    * Neither the name of the Ace3 Development Team nor the names of its contributors 
+      may be used to endorse or promote products derived from this software without 
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Libs/LibQTip-1.0/CHANGES.txt b/Libs/LibQTip-1.0/CHANGES.txt
index 0d6587f..544853b 100755
--- a/Libs/LibQTip-1.0/CHANGES.txt
+++ b/Libs/LibQTip-1.0/CHANGES.txt
@@ -1,668 +1,8 @@
-commit 442326bf0aeebfafde4cf17b18494f949d40ea49
-Author: Elkano <elkano@gmx.de>
-Date:   Thu Oct 15 17:12:00 2020 +0200
-
-    upgrade frameMetatable if old library version was present
-
-commit b11a09ee563e834f5215d953f98b3b22aa17a093
-Author: Elkano <elkano@unknown.unknown>
-Date:   Sat Jul 25 16:33:26 2020 +0000
-
-    - adjusts TOC for 8.3.x
-    - adds compatibility for 9.x's backdrop changes
-
-commit 6879d6b3b10dd495ec00ecc57fcddd0065bb437b
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Jul 21 06:14:41 2018 +0000
-
-    Updating ToC Interface to 80000
-
-commit 6dcaa7eda95eb63eb54a83b4da4d3e1cebe60394
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Jul 21 06:13:54 2018 +0000
-
-    Hard-embed LibStub, to stop the WoW 8.x client from complaining about being unable to load it under a dev environment.
-
-commit 8b44f7eeb2bbd86285e6152a192671e86010a662
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Jul 21 06:13:15 2018 +0000
-
-    Hard-embed LibStub, to stop the WoW 8.x client from complaining about being unable to load it under a dev environment.
-
-commit a0ddbb8e6b09e28fa03f71b83aae0063f2410bc7
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Thu Apr 12 00:31:08 2018 +0000
-
-    Fix regression for custom labelproviders which don't provide a fontString.
-
-commit b6d422353cca7e0a24e3b8d8b7b8cd45a594b044
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Thu Apr 5 18:18:28 2018 +0000
-
-    Fix scrolling which was broken in the previous version.
-
-commit 38e00bb98b2126ce0a51d20eb87fa5d838e40ce9
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Apr 4 09:10:07 2018 +0000
-
-    General cleanups: Reformat code for readability, rename some variables for clarity and to remove shadowing, and upvalue some missing items. Fix leftover colors bleeding into recycled cells from tipPrototype:SetCellTextColor - fixes ticket #38. Update ToC to 70300 and bump library MINOR version.
-
-commit c406c7edf9b5bb991809960e2119bdcd5c79cbdb
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Nov 18 21:08:47 2016 +0000
-
-    Update ToC Interface to 70100
-
-commit 42e5cf3d90fed609a0df4af652aecc7f82065d0b
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Jul 19 07:09:09 2016 +0000
-
-    Bump ToC Interface to 70000
-
-commit c40f6f0fd3f1769076717fb91e9aef4b39209818
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Nov 17 01:27:04 2015 +0000
-
-    ToC bump because I finally have Subversion access again...
-
-commit 086f493e30d3ee11df7e407a7021035ca7f6e6ba
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Feb 25 01:21:15 2015 +0000
-
-    Updated ToC Interface to 60100.
-
-commit 29db19db382e765161e52714aaa06aab36109063
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Feb 4 01:00:41 2015 +0000
-
-    Added releaseHandler parameter to SetAutoHideDelay() to facilitate good housekeeping practices. Must be a function. Addresses ticket #42
-
-commit f35ece0359cd0dafd91745fa974fca3ea6a2141c
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun Nov 16 14:51:42 2014 +0000
-
-    Upped MINOR version.
-
-commit 3dbd0b7f897dbe7a2b8ddbbc9e5c96d3170ef2bd
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun Nov 16 14:51:02 2014 +0000
-
-    Added tooltip:SetHighlightTexture() and tooltip:SetHighlightTexCoord() methods.
-
-commit dd0db22d3441ae323ee1e887a2dfcb3e07fbf6c8
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Oct 25 18:09:58 2014 +0000
-
-    Updated ToC Interface to 60000
-
-commit ccbcb619e2016e47a61449058b71f47f621dd880
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Mar 13 23:47:38 2013 +0000
-
-    Fixes for ticket 37
-
-commit 8bae0d0bd009e4f2bc4c24accb963a388579903c
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Mar 12 22:13:43 2013 +0000
-
-    Fixed incorrect resetting of cell font on release.
-
-commit 34aa98032720be3a7524a11748798391e6f05bd3
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Mar 8 13:18:36 2013 +0000
-
-    Check for nil tooltip before attempting to reset font colors.
-
-commit 6d0f6432f32e035fb4a8e5e67db5b3d8bb18fcef
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Thu Mar 7 17:11:07 2013 +0000
-
-    Added tooltip methods :SetCellTextColor(), :SetColumnTextColor(), and :SetLineTextColor() - also did some minor cleanup.
-
-commit 4a662389130e76a9f8a79da886727889fbe30e07
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Mar 5 11:06:25 2013 +0000
-
-    Bumped ToC version to 50200.
-
-commit 29e03daa5ef17bfa967787d224b2df79db926290
-Author: ArPharazon <arpharazon@unknown.unknown>
-Date:   Wed Dec 19 23:51:12 2012 +0000
-
-    TOC updated for 5.1
-
-commit 8d157635e1fe3c8b7744bf939afa0504034e7360
-Author: ArPharazon <arpharazon@unknown.unknown>
-Date:   Sun Sep 2 01:43:45 2012 +0000
-
-    Updated link to website
-
-commit 1d85ea76d69c76221c64d61d05350d87d1f27f55
-Author: ArPharazon <arpharazon@unknown.unknown>
-Date:   Sun Sep 2 01:37:08 2012 +0000
-
-    Updated ToC version for WoW 5.04
-
-commit e13ae6d1b6be1a7ce918c448d199d247d98e924e
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Aug 17 21:40:16 2012 +0000
-
-    Update ToC Interface to 40300 just to say "Fuck off" to World of Addons. Take my shit off of your goddamn page, you thieving assholes.
-
-commit b62494ffb760748fd674cc9e88d0936ee3c194fb
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Apr 27 08:09:30 2011 +0000
-
-    Updated ToC version for WoW 4.1
-
-commit 4de44d001454eef0aec10f293a70b4c82204fde0
-Author: David Hedbor <david@ookla.com>
-Date:   Sun Nov 28 09:11:14 2010 +0000
-
-    Fixed bug in UpdateScrolling if scale ~= 1.0
-
-commit 37f8268c22abb1455f78996c8930a8ae73fcc814
-Author: David Hedbor <david@ookla.com>
-Date:   Sun Nov 28 05:13:52 2010 +0000
-
-    Added a method :SetScrollSpeed(step) to configure the mouse wheel scroll step value.
-
-commit 8ccfb0c528649e29bcc82376cf0c2681b9a7fc25
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Nov 27 22:39:38 2010 +0000
-
-    In _SetCell(): If the font parameter is nil, set it based on whether or not the line is a header line - whether or not a previous cell exists and, if so, what font it's using should never have mattered - fixes ticket #27.
-    Bumped MINOR version.
-
-commit 31dd938e22ec00345fb1937f6ef985765c647dc5
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Nov 27 22:30:12 2010 +0000
-
-    Added support for strings to look up global font instances, such as "GameFontNormal", since omitting the quotations and simply using the actual FontObject is somehow considered retarded...
-
-commit f1ba4ccd23563e5b6b8eb7bac330dd064dfe2ebb
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Nov 22 02:31:08 2010 +0000
-
-    Mark lines added with :AddHeader() as header lines, so calls to :SetCell() do not require an explicit font argument (the tooltip's header font will automagically be used).
-
-commit dad3fd1f81fdd53469f1b65a3b3eefc3ba535fcc
-Author: David Hedbor <david@ookla.com>
-Date:   Sat Nov 20 22:30:49 2010 +0000
-
-    Added support for OnReceiveDrag.
-
-commit 5e8355e31edd02edde911f50d33ec249b3bb3184
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Nov 1 10:39:15 2010 +0000
-
-    Bumped ToC version.
-
-commit 49b4dc2f9eda7f6951bdc58372f85efef3328507
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Nov 1 10:05:25 2010 +0000
-
-    Added 'enable-nolib-creation: no' to .pkgmeta
-
-commit d2e22a7aa54727c7d3da73f594bf335200d53328
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Aug 3 20:56:32 2010 +0000
-
-    Upped the MINOR version.
-
-commit 739d35f75cf99ba384d23c5919f1c427dc2271b9
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Aug 3 05:39:42 2010 +0000
-
-    In InitializeTooltip(): Store the result of GameTooltip:GetBackdrop() before using it to set the backdrop so tooltip AddOns which set it to nil will not cause an error to be raised.
-
-commit 42782d3c8a5c5f0b9afdb0b7c4d88a3e3b15611b
-Author: Elkano <elkano@unknown.unknown>
-Date:   Tue Jul 27 15:27:08 2010 +0000
-
-    - changed the way colspans resize cols to get enough width
-    - row height is now recalculated when colspans have been resized
-    !WARNING! custom cells need to provide the function cell::getContentHeight() that should return the height of the cell given its current width
-
-commit 975fa7d92c9284f0c7022a65eac02dc214c8505e
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon Apr 12 12:23:26 2010 +0000
-
-    Added a OnRelease callback.
-
-commit a889adeb87e4f5cee995c39420fb71d2133202f0
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon Apr 12 10:03:25 2010 +0000
-
-    Track and remove all tooltip script handlers on release. tooltip:HookScript is not allowed anymore because handlers added by that method cannot be removed.
-
-commit b1df995f996fc84646a509e02224e7be45becb3e
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon Apr 12 09:49:17 2010 +0000
-
-    Added tooltip methods :Release() and :IsAcquiredBy(key).
-
-commit cfb863b667a25f8a29b10a8f104173a6c16ebe3d
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon Apr 12 09:45:02 2010 +0000
-
-    Secured ReleaseTooltip against OnHide scripts that call lib:Release().
-
-commit b45cd419e8cc9e7e9a35005bb6825cd7599740eb
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Feb 8 16:37:07 2010 +0000
-
-    Urk. Forgot to up the MINOR.
-
-commit 0333f1c19139ec1be8fd7d571590dc20612c608c
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Feb 8 15:39:55 2010 +0000
-
-    In AcquireTooltip(): Fixed typo in the name of the parent of scrollChild.
-    New function: tipPrototype:SetCellMarginH() - sets the tooltip's horizontal cell margin. Only usable before adding lines.
-    New function: tipPrototype:SetCellMarginV() - sets the tooltip's vertical cell margin. Only usable before adding lines.
-    Changed some whitespace formatting in the code.
-
-commit 2b4d1845d24c4cb0a57c81ec8dca5e4063c912ed
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat Jan 16 19:03:33 2010 +0000
-
-    In UpdateScrolling(): Changed scale modifiers to work correctly with fractional sizes less than one.
-
-commit f4a0757f5c09ad6c9218a65bc6a67aa66cd3eb54
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Jan 1 11:05:28 2010 +0000
-
-    In tipPrototype:UpdateScrolling() - modified to account for the scale of the tooltip so the function will actually work if the tooltip has been scaled to gigantic proportions.
-    Made the library load-on-demand.
-
-commit 807a04122342bcdd50f4e696dc4b13f3dd194f22
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Dec 9 05:39:19 2009 +0000
-
-    Updated ToC. Changed MouseIsOver(frame) to frame:IsMouseOver()
-
-commit 19a6bc619a584f0ec216d0b8e569b1b3267ebd2a
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Jul 21 03:46:58 2009 +0000
-
-    Removed argument-checking for the tipPrototype methods SetLineColor() and SetColumnColor() - instead, they now check for the existence of their intended target.
-    Added tipPrototype:SetCellColor().
-    In ReleaseCell(): Set the cell's backdrop to nil.
-
-commit 12e939413c8e5bd957424005457f1bb787a5df10
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Jul 10 09:17:08 2009 +0000
-
-    In InitializeTooltip(): Set the alpha level to 1 always, since GameTooltip may be in the middle of fading when we acquire. Lib users can override this themselves by setting their own alpha on the tooltip frame.
-
-commit 5c1a2a51a8d570e659e4bf3beaa14aa8e883fbdf
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Jul 8 06:38:50 2009 +0000
-
-    In labelPrototype:SetupCell(): Replaced the select() massacre with static parameters.
-
-commit ed96812920e1d3a447d19dcb5d6874d4daee1a92
-Author: Elkano <elkano@unknown.unknown>
-Date:   Mon Jul 6 07:42:45 2009 +0000
-
-    moved most of the LibQTipClick functionality into LibQTip itself (though with different code)
-    new API (script is OnEnter/OnLeave/OnMouseDown/OnMouseUp, function will be called as frame:function(argument, ...)):
-    - SetCellScript(line, column, script, function, argument)
-    - SetLineScript(line, script, function, argument)
-    - SetColumnScript(column, script, function, argument)
-
-commit 84b33ce2ffdb97a752adecec3bf2bb8ba228140a
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Jun 22 09:23:30 2009 +0000
+Changes since tag 9.0.1.2
 
-    In labelPrototype:SetupSell(): Set the fontstring's width always, not just when max_width is smaller than width - this should normalize the display when a previous call modified the width.
-
-commit fb3e5606148234593adbe7baa5f81cd4fa3d51f8
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Jun 22 08:17:30 2009 +0000
-
-    In CreateLine(): Make the line's parent be tooltip.scrollChild instead of tooltip, so that separators play nice with scrollable tooltips.
-
-commit fbb2fd643e36861b693464cd21a7079a938954f0
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Thu Jun 11 14:11:35 2009 +0000
-
-    Removed useless .docmeta.
-
-commit 7b35caa05463e8e6eeda01597b8e6b0b57d281c1
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Thu Jun 11 08:55:24 2009 +0000
-
-    In AutoHideTimerFrame_OnUpdate(): Fixed MouseIsOver() check.
-
-commit 7ee9865076b1ebdd18ae1b7962547d5b3fd46408
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Thu Jun 11 06:03:51 2009 +0000
-
-    Fixed AutoHideTimerFrame_OnUpdate logic while keeping CPU usage low.
-
-commit d3044534736914a4a3d535bfb32b578c9eb00ad4
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Jun 10 21:19:43 2009 +0000
-
-    In tipPrototype:SetAutoHideDelay(): Set the tooltip as the value of timerFrame.parent.
-    In AutoHideTimerFrame_OnUpdate(): Revamped to always increment self.elapsed and check against self.delayed _before_ checking whether or not the mouse is over self.parent or self.alternateFrame. Decreased CPU usage from roughly 0.185/sec to roughly 0.045/sec.
-    Upped MINOR to 23.
-
-commit e587066d6a3396b1e278a354b39aa09fe7e2467e
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Jun 3 03:59:55 2009 +0000
-
-    Adjusted ResetTooltipSize() - hopefully this fixes the right-edge clipping issue.
-
-commit 383c493de02ac4836c0a01fb0e338ce7f9887545
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Jun 1 01:06:20 2009 +0000
-
-    Fixed default backdrop colors in tooltip:SetLineColor() and tooltip:SetColumnColor().
-
-commit 2bfa7468ce6e0510ec80cb495d8702519c719dca
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri May 29 03:02:14 2009 +0000
-
-    Upped MINOR to 21
-
-commit 09d9c4182b11567aef3874de77706f1b5b11b063
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri May 29 02:14:42 2009 +0000
-
-    Bah. I knew I was overcomplicating things: Removed GetPosition() and its references in AcquireCell/ReleaseCell - replaced all that with labelPrototype:GetPosition()
-
-commit 674335fad765eec214891caf61fa190d82a0ce18
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri May 29 01:51:30 2009 +0000
-
-    Added local function GetPosition() - assigned to a cell when it's acquired - which returns the cell's line and column.
-    In _SetCell(): Added assignment of line and column data to the affected cell.
-    In AcquireCell(): Added assignment of GetPosition() to the cell.
-    In ReleaseCell(): Remove line, column, and GetPosition() from the cell.
-
-commit ea3d420be2e0315490325cf4022ffcdba997f09e
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue May 26 22:16:06 2009 +0000
-
-    In labelPrototype:SetupCell(): Added optional min_width parameter - verify that max_width is not less than min_width, and set return width value to min_width if it is smaller.
-
-commit ab64aa500acd0a6dab0bb4a1fb8f07276048ebfd
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue May 26 07:43:57 2009 +0000
-
-    Completely removed dangling letter check in favor of simply adding 2 pixels to ResetTooltipSize().
-
-commit 1483939c4171a7de656490d38a2526e0a0502788
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue May 26 07:33:52 2009 +0000
-
-    In labelPrototype:SetupCell(): Commented out dangling-letter check for the time being, and fix a bug with line-wrapping by re-setting the returned height value if max_width is set.
-    In tipPrototype:AddSeparator(): Fixed clipping at the bottom of the tooltip by adding a call to SetTooltipSize().
-
-commit 42c0e411b20c336b580290852234ebd45891efb0
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue May 26 03:16:04 2009 +0000
-
-    Fixed accidental globals and non-working tooltip:SetLineColor() - fucking copy-pasta.
-    Replaced all occurances of "LibQTip" with "lib" for my own sanity.
-    Upvalued "math" and "string.find".
-    Upped MINOR to 20.
-    Some miscellaneous file re-structuring.
-
-commit bdb1309c94a05e4352384631c9f09ad6d5cab1cf
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon May 25 08:56:51 2009 +0000
-
-    Renamed SeparatorBackdrop to GenericBackdrop.
-    Removed deprecated tooltip methods AcquireLine() and AcquireColumn().
-    Added tooltip methods SetColumnColor() and SetLineColor().
-    Set MINOR to 19.
-
-commit 2a1e8349f5e8ca2732fd7c6b665fd08d0223b93c
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon May 25 08:33:58 2009 +0000
-
-    Dished the commented, bugged upgrade code since having spare frames at the time of upgrading is unlikely.
-
-commit 18ec11c2425420c5223830410846e6ed95fdc35a
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon May 25 08:04:45 2009 +0000
-
-    In labelPrototype:InitializeCell(): Removed FontString anchoring.
-    In labelPrototype:SetupCell(): Replaced padding check to a check for l_pad and r_pad, and anchor the FontString using them. SetPoint() is evil - never count on defaults of 0 when you don't specify args!
-
-commit a9dccbc9ad7d08c4b957d380e79b91254f3c2446
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon May 25 07:19:02 2009 +0000
-
-    In labelPrototype:SetupCell(): Check for dangling letters - only add to height if found.
-    In InitializeTooltip(): Set the tooltip's alpha level to that of GameTooltip so tooltip addons can skin it properly.
-
-commit 331c328fa3389ece169980b588ebc36cc800dd3c
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun May 24 16:45:51 2009 +0000
-
-    In ReleaseTooltip(): Remove the tooltip from the layoutCleaner registry.
-
-commit 23154e9b5c422202931fb026eeb396db2ca02cfa
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun May 24 05:43:40 2009 +0000
-
-    Fixed debug substitutions.
-    Placed upgrade code in debug comment block to stop it from breaking addons using older versions of the lib...
-
-commit 32d4c62b88c6b5dbbdcc0d21c19eac7d6885c27e
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun May 24 02:29:54 2009 +0000
-
-    Upvalued AcquireTable and ReleaseTable
-    In lablePrototype:SetupCell(): Added checks for new (optional) parameters passed from SetCell() - padding and maxwidth.
-    If maxwidth is less than the length of the text in the cell, the text will wrap to the next line.
-    Fixed dangling letter clipping (bottoms of g, y, etc being cut off).
-    AcquireTable() and ReleaseTable() are now used for a tooltip's columns, lines, and colspans - less GC!
-    In LayoutColspans(), _SetCell(), and CreateLine(): Renamed "self" parameter to "tooltip".
-    Upped MINOR to 18
-
-commit 59ddd4c6ac79e7c46d8b3527fbf72acb85c52381
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat May 23 04:58:49 2009 +0000
-
-    Added tableHeap, AcquireTable(), ReleaseTable() - at the moment only used in CreateLine() for line.cells
-    In AcquireTooltip(): Renamed the tip variable to tooltip for consistency.
-    In InitializeTooltip(): Renamed the self parameter to tooltip.
-    In tipPrototype:Clear(): Use ReleaseTable() on line.cells, then set line.cells to nil.
-    Hand-merged Elkano's changes to the r77 version:
-    Relocated and grouped related functions and variables.
-    Renamed SetTipSize() to SetTooltipSize() and reworked it to not be a member method of tipPrototype.
-    Renamed FinalizeTooltip() to ReleaseTooltip() and relocated into it some code from tipPrototype:Release().
-    Removed the tooltip parameter from providerPrototype:AcquireCell(), as it was unused.
-    In tipPrototype:Clear(): Check if cell is non-nil before calling ReleaseCell().
-    In AcquireCell(): Rename self parameter to tooltip, set cell._provider as provider parameter.
-    In ReleaseCell(): Remove self parameter and all relevant checks.
-    In _SetCell(): Remove cell._provider assignment, as this is now done in AcquireCell().
-    In CreateLine(): Check for self.lines[lineNum] before acquiring a new line.
-
-commit e6fdf2863060eaf5680308d6a815ce8766cd74cf
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Fri May 22 10:07:58 2009 +0000
-
-    Do not forget oldminor may be nil.
-
-commit 2fa002d40dafad081c3700c1c0b27773bc814072
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Fri May 22 09:07:57 2009 +0000
-
-    Reset auto-hiding on release (so we recycle the timer frame).
-    Properly recycle frame lineHeap and columnHeap when upgrading from version prior to minor 14.
-
-commit 7d9f4306040222ba8ba014634c428e51bafee060
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri May 22 04:31:45 2009 +0000
-
-    Re-instated the frameHeap. The lineHeap and columnHeap are no more.
-    Added tipPrototype:AddSeparator() - allows the addition of a separator line with optional height, r, g, b, and alpha arguments.
-    Reworked tipPrototype:SetAutoHideDelay() to use the frameHeap, and release self.autoHideTimerFrame when done.
-
-commit df322cf36f3878aec135189d341be8eb44c02a54
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Thu May 21 05:21:44 2009 +0000
-
-    In AutoHideTimerFrame_OnUpdate(): Changed behavior from hiding the parent to having the library release the parent.
-
-commit f398d903f3cb5c50aced79a72e1d5faa5a89a19c
-Author: Elkano <elkano@unknown.unknown>
-Date:   Mon May 18 08:15:05 2009 +0000
-
-    ...and pushed minor for that
-
-commit cb0181dea4d5c082b7fd475f483833c0d2508c51
-Author: Elkano <elkano@unknown.unknown>
-Date:   Mon May 18 08:14:40 2009 +0000
-
-    fixed parenting for column and line frames fixing scaling problems
-
-commit 64b5e691df414d3b0fbc54ab28ffec13570d9537
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun May 17 06:11:37 2009 +0000
-
-    Removed tipPrototype:GetTipSize() - completely unnecessary. Not upping library version until I'm ready to tag.
-
-commit b66f6770d5ac4aaffa045216a7b167d5b2ce7bec
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Fri May 15 07:35:38 2009 +0000
-
-    Library minor version has to be manually increased.
-
-commit eaa1d01f7830635ec1ce9b39436d022c71197bbe
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue May 12 21:27:49 2009 +0000
-
-    Added tipPrototype:GetTipSize()
-
-commit 8cea7f938bfdde193dc312019656c9d8d5abf720
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat May 9 07:55:47 2009 +0000
-
-    Updated Author section and added Credits for TOC.
-
-commit 19c190e196a1f23e1614c8bc3faa97ca00c93c82
-Author: aesirrising <aesirrising@unknown.unknown>
-Date:   Sat May 9 02:20:10 2009 +0000
-
-    TOC Interface updated to 30100
-
-commit 9906136f1b2a7c876581b61cf3bcebde0d8bc6de
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sat May 9 01:53:58 2009 +0000
-
-    Merged in Elkano's scrollable branch.
-    Upvalued heavily-used globals.
-    Fixed two accidental globals/bugs in scrollable code. (tip as reference instead of self)
-
-commit 5bb82e3b53a33721317d88759bd35141c4826595
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Mon May 4 06:09:20 2009 +0000
-
-    Added optional auto-hiding feature.
-
-commit 1dab3b62cf52d51ef57ff2947f9af6e521998034
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Sun Mar 22 08:29:36 2009 +0000
-
-    Removed nolib-strip
-
-commit 818069db19b0be776ec922ba00890978305ba4dd
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Mar 17 05:16:57 2009 +0000
-
-    Added lib.xml
-    Removed LibQTip-1.0.lua from the .toc and replaced it with lib.xml
-
-commit 170c999f86170c504feebd243f1cad10079de0b4
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Mar 17 05:09:48 2009 +0000
-
-    Moved LibQTip-1.0.lua into trunk and deleted its subdirectory.
-    Removed hard-embedded LibStub and added it as an external in .pkgmeta
-    Updated LibQTip-1.0.toc to reflect the structural changes.
-
-commit d5bb8dfb8d157d99ad34f3cd2d8f2c15dc295317
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Wed Feb 25 13:40:08 2009 +0000
-
-    Added a global frame that is reponsible for laying out colspans when need be (but at most once per update).
-    Cells are now created as children of UIParent and then "reparented" to the tooltip. This ensures the fontstrings get properly initialized and should fixes the "truncated text on first display" issue (ticket #4).
-
-commit e48defa7465170830cfa7b33d44a69c46bf7ba0d
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Wed Feb 25 12:56:44 2009 +0000
-
-    Moved lineHeap and columnHeap into the library itself. There is no need to duplicate them into each frame now that there are indexed by tooltip key.
-
-commit 7c2116d736f29719a9df661d4ca13c6c3dd9ad3d
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Feb 25 12:10:03 2009 +0000
-
-    Bumped MAJOR.
-
-commit 28bdc330b24037b243433f4464c513f2e46b9441
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Feb 25 08:16:13 2009 +0000
-
-    In ResizeColspans(): Removed line which only allowed the function to run if the tooltip was shown. Fixes ticket #4.
-    In InitializeTooltip(): Removed line which set ResizeColspans() to the tooltip's OnShow(), as this only worked after the tooltip was shown - making it rather useless.
-
-commit e10a7ea23b439c8ec49b05b6a7685cfce62864a9
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Feb 13 01:03:28 2009 +0000
-
-    Added lineHeap[key] and columnHeap[key] to make each heap unique to the specified tooltip. This fixes the issue of setting a column/line's background to a different color which would propagate to another tooltip upon re-use.
-
-commit 6daa7bbd7b65e7e99b9d55c226f697d4f1f2ba88
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Sun Jan 11 09:17:28 2009 +0000
-
-    First try at adding luadoc using .docmeta
-
-commit 1c3d528a549c50f1f6c1b6338ff51e836a9e91f9
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Mon Jan 5 05:03:31 2009 +0000
-
-    Removed bgFrame, as InitializeTooltip() now "inherits" the backdrop/border and initial scale from GameTooltip.
-
-commit 57302ffa86be2543af8a64cc2776f5540dfd962d
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Tue Dec 23 19:26:19 2008 +0000
-
-    Removed frameHeap, as it has been deprecated by the tooltip's lineHeap and columnHeap.
-    Removed needless whitespace (mostly Tabs) at the ends of some lines.
-
-commit 48b5c34621d6f2cc4447ff17511d1255bef9e3fd
-Author: Adirelle <adirelle+github@gmail.com>
-Date:   Tue Dec 23 11:13:19 2008 +0000
-
-    Fixed tickets #6 and #7.
-
-commit e0d12bfe20ee065e9fc2896e303c4c253c80f72b
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Fri Dec 19 19:57:52 2008 +0000
-
-    Moved license text from main Lua file to LICENSE.txt
-    Cleaned up some comments and removed irrelevant ones.
-    Added tipPrototype methods :SetDefaultProvider() and :GetDefaultProvider()
-
-commit a8ce7cbaf90d1097010fbcacdc3ba28297193ad8
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Dec 10 02:33:08 2008 +0000
-
-    Upped MINOR to 5.
-
-commit ef691096d68613fedad0a9531b7f790cd94f0e4e
-Author: James D. Callahan III <darkenelf@gmail.com>
-Date:   Wed Dec 10 01:54:03 2008 +0000
+commit 4c6a3d882373fa0b52c6b71d09acc0b87ec1ae00
+Author: Elkano <elkano@gmx.de>
+Date:   Wed Nov 3 19:49:57 2021 +0100
 
-    In _SetCell(): Replaced non-existent "tooltip" argument with "self" in call to cell:SetupCell()
+    update for WoW 9.1.5's new TooltipBackdropTemplate
 
diff --git a/Libs/LibQTip-1.0/LibQTip-1.0.lua b/Libs/LibQTip-1.0/LibQTip-1.0.lua
index b7c7ce3..137accd 100755
--- a/Libs/LibQTip-1.0/LibQTip-1.0.lua
+++ b/Libs/LibQTip-1.0/LibQTip-1.0.lua
@@ -1,5 +1,5 @@
 local MAJOR = "LibQTip-1.0"
-local MINOR = 48 -- Should be manually increased
+local MINOR = 49 -- Should be manually increased
 local LibStub = _G.LibStub
 
 assert(LibStub, MAJOR .. " requires LibStub")
@@ -7,7 +7,7 @@ assert(LibStub, MAJOR .. " requires LibStub")
 local lib, oldMinor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not lib then
-	return
+    return
 end -- No upgrade needed
 
 ------------------------------------------------------------------------------
@@ -37,12 +37,7 @@ local geterrorhandler = _G.geterrorhandler
 ------------------------------------------------------------------------------
 -- Tables and locals
 ------------------------------------------------------------------------------
-if BackdropTemplateMixin and oldMinor and (oldMinor < 48) and lib.frameMetatable then
-    -- mix new BackdropTemplateMixin into frame metatable
-    Mixin(lib.frameMetatable["__index"], BackdropTemplateMixin)
-else
-    lib.frameMetatable = lib.frameMetatable or {__index = CreateFrame("Frame", nil, nil, BackdropTemplateMixin and "BackdropTemplate")}
-end
+lib.frameMetatable = lib.frameMetatable or {__index = CreateFrame("Frame")}
 
 lib.tipPrototype = lib.tipPrototype or setmetatable({}, lib.frameMetatable)
 lib.tipMetatable = lib.tipMetatable or {__index = lib.tipPrototype}
@@ -121,51 +116,51 @@ local CELL_MARGIN_V = 3
 -- @usage Acquire a tooltip with at least 5 columns, justification : left, center, left, left, left
 -- <pre>local tip = LibStub('LibQTip-1.0'):Acquire('MyFooBarTooltip', 5, "LEFT", "CENTER")</pre>
 function lib:Acquire(key, ...)
-	if key == nil then
-		error("attempt to use a nil key", 2)
-	end
+    if key == nil then
+        error("attempt to use a nil key", 2)
+    end
 
-	local tooltip = activeTooltips[key]
+    local tooltip = activeTooltips[key]
 
-	if not tooltip then
-		tooltip = AcquireTooltip()
-		InitializeTooltip(tooltip, key)
-		activeTooltips[key] = tooltip
-	end
+    if not tooltip then
+        tooltip = AcquireTooltip()
+        InitializeTooltip(tooltip, key)
+        activeTooltips[key] = tooltip
+    end
 
-	if select("#", ...) > 0 then
-		-- Here we catch any error to properly report it for the calling code
-		local ok, msg = pcall(tooltip.SetColumnLayout, tooltip, ...)
+    if select("#", ...) > 0 then
+        -- Here we catch any error to properly report it for the calling code
+        local ok, msg = pcall(tooltip.SetColumnLayout, tooltip, ...)
 
-		if not ok then
-			error(msg, 2)
-		end
-	end
+        if not ok then
+            error(msg, 2)
+        end
+    end
 
-	return tooltip
+    return tooltip
 end
 
 function lib:Release(tooltip)
-	local key = tooltip and tooltip.key
+    local key = tooltip and tooltip.key
 
-	if not key or activeTooltips[key] ~= tooltip then
-		return
-	end
+    if not key or activeTooltips[key] ~= tooltip then
+        return
+    end
 
-	ReleaseTooltip(tooltip)
-	activeTooltips[key] = nil
+    ReleaseTooltip(tooltip)
+    activeTooltips[key] = nil
 end
 
 function lib:IsAcquired(key)
-	if key == nil then
-		error("attempt to use a nil key", 2)
-	end
+    if key == nil then
+        error("attempt to use a nil key", 2)
+    end
 
-	return not (not activeTooltips[key])
+    return not (not activeTooltips[key])
 end
 
 function lib:IterateTooltips()
-	return pairs(activeTooltips)
+    return pairs(activeTooltips)
 end
 
 ------------------------------------------------------------------------------
@@ -174,26 +169,26 @@ end
 local frameHeap = lib.frameHeap
 
 local function AcquireFrame(parent)
-	local frame = tremove(frameHeap) or CreateFrame("Frame", nil, nil, BackdropTemplateMixin and "BackdropTemplate")
-	frame:SetParent(parent)
-	--[===[@debug@
-	usedFrames = usedFrames + 1
-	--@end-debug@]===]
-	return frame
+    local frame = tremove(frameHeap) or CreateFrame("Frame", nil, nil, BackdropTemplateMixin and "BackdropTemplate")
+    frame:SetParent(parent)
+    --[===[@debug@
+    usedFrames = usedFrames + 1
+    --@end-debug@]===]
+    return frame
 end
 
 local function ReleaseFrame(frame)
-	frame:Hide()
-	frame:SetParent(nil)
-	frame:ClearAllPoints()
-	frame:SetBackdrop(nil)
+    frame:Hide()
+    frame:SetParent(nil)
+    frame:ClearAllPoints()
+    frame:SetBackdrop(nil)
 
-	ClearFrameScripts(frame)
+    ClearFrameScripts(frame)
 
-	tinsert(frameHeap, frame)
-	--[===[@debug@
-	usedFrames = usedFrames - 1
-	--@end-debug@]===]
+    tinsert(frameHeap, frame)
+    --[===[@debug@
+    usedFrames = usedFrames - 1
+    --@end-debug@]===]
 end
 
 ------------------------------------------------------------------------------
@@ -202,18 +197,18 @@ end
 local timerHeap = lib.timerHeap
 
 local function AcquireTimer(parent)
-	local frame = tremove(timerHeap) or CreateFrame("Frame")
-	frame:SetParent(parent)
-	return frame
+    local frame = tremove(timerHeap) or CreateFrame("Frame")
+    frame:SetParent(parent)
+    return frame
 end
 
 local function ReleaseTimer(frame)
-	frame:Hide()
-	frame:SetParent(nil)
+    frame:Hide()
+    frame:SetParent(nil)
 
-	ClearFrameScripts(frame)
+    ClearFrameScripts(frame)
 
-	tinsert(timerHeap, frame)
+    tinsert(timerHeap, frame)
 end
 
 ------------------------------------------------------------------------------
@@ -225,18 +220,18 @@ local layoutCleaner = lib.layoutCleaner
 layoutCleaner.registry = layoutCleaner.registry or {}
 
 function layoutCleaner:RegisterForCleanup(tooltip)
-	self.registry[tooltip] = true
-	self:Show()
+    self.registry[tooltip] = true
+    self:Show()
 end
 
 function layoutCleaner:CleanupLayouts()
-	self:Hide()
+    self:Hide()
 
-	for tooltip in pairs(self.registry) do
-		FixCellSizes(tooltip)
-	end
+    for tooltip in pairs(self.registry) do
+        FixCellSizes(tooltip)
+    end
 
-	wipe(self.registry)
+    wipe(self.registry)
 end
 
 layoutCleaner:SetScript("OnUpdate", layoutCleaner.CleanupLayouts)
@@ -245,136 +240,137 @@ layoutCleaner:SetScript("OnUpdate", layoutCleaner.CleanupLayouts)
 -- CellProvider and Cell
 ------------------------------------------------------------------------------
 function providerPrototype:AcquireCell()
-	local cell = tremove(self.heap)
+    local cell = tremove(self.heap)
 
-	if not cell then
-		cell = setmetatable(CreateFrame("Frame", nil, UIParent), self.cellMetatable)
+    if not cell then
+        cell = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate")
+        setmetatable(cell, self.cellMetatable)
 
-		if type(cell.InitializeCell) == "function" then
-			cell:InitializeCell()
-		end
-	end
+        if type(cell.InitializeCell) == "function" then
+            cell:InitializeCell()
+        end
+    end
 
-	self.cells[cell] = true
+    self.cells[cell] = true
 
-	return cell
+    return cell
 end
 
 function providerPrototype:ReleaseCell(cell)
-	if not self.cells[cell] then
-		return
-	end
+    if not self.cells[cell] then
+        return
+    end
 
-	if type(cell.ReleaseCell) == "function" then
-		cell:ReleaseCell()
-	end
+    if type(cell.ReleaseCell) == "function" then
+        cell:ReleaseCell()
+    end
 
-	self.cells[cell] = nil
-	tinsert(self.heap, cell)
+    self.cells[cell] = nil
+    tinsert(self.heap, cell)
 end
 
 function providerPrototype:GetCellPrototype()
-	return self.cellPrototype, self.cellMetatable
+    return self.cellPrototype, self.cellMetatable
 end
 
 function providerPrototype:IterateCells()
-	return pairs(self.cells)
+    return pairs(self.cells)
 end
 
 function lib:CreateCellProvider(baseProvider)
-	local cellBaseMetatable, cellBasePrototype
+    local cellBaseMetatable, cellBasePrototype
 
-	if baseProvider and baseProvider.GetCellPrototype then
-		cellBasePrototype, cellBaseMetatable = baseProvider:GetCellPrototype()
-	else
-		cellBaseMetatable = cellMetatable
-	end
+    if baseProvider and baseProvider.GetCellPrototype then
+        cellBasePrototype, cellBaseMetatable = baseProvider:GetCellPrototype()
+    else
+        cellBaseMetatable = cellMetatable
+    end
 
-	local newCellPrototype = setmetatable({}, cellBaseMetatable)
-	local newCellProvider = setmetatable({}, providerMetatable)
+    local newCellPrototype = setmetatable({}, cellBaseMetatable)
+    local newCellProvider = setmetatable({}, providerMetatable)
 
-	newCellProvider.heap = {}
-	newCellProvider.cells = {}
-	newCellProvider.cellPrototype = newCellPrototype
-	newCellProvider.cellMetatable = {__index = newCellPrototype}
+    newCellProvider.heap = {}
+    newCellProvider.cells = {}
+    newCellProvider.cellPrototype = newCellPrototype
+    newCellProvider.cellMetatable = {__index = newCellPrototype}
 
-	return newCellProvider, newCellPrototype, cellBasePrototype
+    return newCellProvider, newCellPrototype, cellBasePrototype
 end
 
 ------------------------------------------------------------------------------
 -- Basic label provider
 ------------------------------------------------------------------------------
 if not lib.LabelProvider then
-	lib.LabelProvider, lib.LabelPrototype = lib:CreateCellProvider()
+    lib.LabelProvider, lib.LabelPrototype = lib:CreateCellProvider()
 end
 
 local labelProvider = lib.LabelProvider
 local labelPrototype = lib.LabelPrototype
 
 function labelPrototype:InitializeCell()
-	self.fontString = self:CreateFontString()
-	self.fontString:SetFontObject(_G.GameTooltipText)
+    self.fontString = self:CreateFontString()
+    self.fontString:SetFontObject(_G.GameTooltipText)
 end
 
 function labelPrototype:SetupCell(tooltip, value, justification, font, leftPadding, rightPadding, maxWidth, minWidth, ...)
-	local fontString = self.fontString
-	local line = tooltip.lines[self._line]
+    local fontString = self.fontString
+    local line = tooltip.lines[self._line]
 
-	-- detatch fs from cell for size calculations
-	fontString:ClearAllPoints()
-	fontString:SetFontObject(font or (line.is_header and tooltip:GetHeaderFont() or tooltip:GetFont()))
-	fontString:SetJustifyH(justification)
-	fontString:SetText(tostring(value))
+    -- detatch fs from cell for size calculations
+    fontString:ClearAllPoints()
+    fontString:SetFontObject(font or (line.is_header and tooltip:GetHeaderFont() or tooltip:GetFont()))
+    fontString:SetJustifyH(justification)
+    fontString:SetText(tostring(value))
 
-	leftPadding = leftPadding or 0
-	rightPadding = rightPadding or 0
+    leftPadding = leftPadding or 0
+    rightPadding = rightPadding or 0
 
-	local width = fontString:GetStringWidth() + leftPadding + rightPadding
+    local width = fontString:GetStringWidth() + leftPadding + rightPadding
 
-	if maxWidth and minWidth and (maxWidth < minWidth) then
-		error("maximum width cannot be lower than minimum width: " .. tostring(maxWidth) .. " < " .. tostring(minWidth), 2)
-	end
+    if maxWidth and minWidth and (maxWidth < minWidth) then
+        error("maximum width cannot be lower than minimum width: " .. tostring(maxWidth) .. " < " .. tostring(minWidth), 2)
+    end
 
-	if maxWidth and (maxWidth < (leftPadding + rightPadding)) then
-		error("maximum width cannot be lower than the sum of paddings: " .. tostring(maxWidth) .. " < " .. tostring(leftPadding) .. " + " .. tostring(rightPadding), 2)
-	end
+    if maxWidth and (maxWidth < (leftPadding + rightPadding)) then
+        error("maximum width cannot be lower than the sum of paddings: " .. tostring(maxWidth) .. " < " .. tostring(leftPadding) .. " + " .. tostring(rightPadding), 2)
+    end
 
-	if minWidth and width < minWidth then
-		width = minWidth
-	end
+    if minWidth and width < minWidth then
+        width = minWidth
+    end
 
-	if maxWidth and maxWidth < width then
-		width = maxWidth
-	end
+    if maxWidth and maxWidth < width then
+        width = maxWidth
+    end
 
-	fontString:SetWidth(width - (leftPadding + rightPadding))
-	-- Use GetHeight() instead of GetStringHeight() so lines which are longer than width will wrap.
-	local height = fontString:GetHeight()
+    fontString:SetWidth(width - (leftPadding + rightPadding))
+    -- Use GetHeight() instead of GetStringHeight() so lines which are longer than width will wrap.
+    local height = fontString:GetHeight()
 
-	-- reanchor fs to cell
-	fontString:SetWidth(0)
-	fontString:SetPoint("TOPLEFT", self, "TOPLEFT", leftPadding, 0)
-	fontString:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -rightPadding, 0)
-	--~ 	fs:SetPoint("TOPRIGHT", self, "TOPRIGHT", -r_pad, 0)
+    -- reanchor fs to cell
+    fontString:SetWidth(0)
+    fontString:SetPoint("TOPLEFT", self, "TOPLEFT", leftPadding, 0)
+    fontString:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -rightPadding, 0)
+    --~ 	fs:SetPoint("TOPRIGHT", self, "TOPRIGHT", -r_pad, 0)
 
-	self._paddingL = leftPadding
-	self._paddingR = rightPadding
+    self._paddingL = leftPadding
+    self._paddingR = rightPadding
 
-	return width, height
+    return width, height
 end
 
 function labelPrototype:getContentHeight()
-	local fontString = self.fontString
-	fontString:SetWidth(self:GetWidth() - (self._paddingL + self._paddingR))
+    local fontString = self.fontString
+    fontString:SetWidth(self:GetWidth() - (self._paddingL + self._paddingR))
 
-	local height = self.fontString:GetHeight()
-	fontString:SetWidth(0)
+    local height = self.fontString:GetHeight()
+    fontString:SetWidth(0)
 
-	return height
+    return height
 end
 
 function labelPrototype:GetPosition()
-	return self._line, self._column
+    return self._line, self._column
 end
 
 ------------------------------------------------------------------------------
@@ -384,93 +380,102 @@ local tooltipHeap = lib.tooltipHeap
 
 -- Returns a tooltip
 function AcquireTooltip()
-	local tooltip = tremove(tooltipHeap)
+    local tooltip = tremove(tooltipHeap)
 
-	if not tooltip then
-		tooltip = CreateFrame("Frame", nil, UIParent)
+    if not tooltip then
+        local template = (TooltipBackdropTemplateMixin and "TooltipBackdropTemplate") or (BackdropTemplateMixin and "BackdropTemplate")
+        tooltip = CreateFrame("Frame", nil, UIParent, template)
 
-		local scrollFrame = CreateFrame("ScrollFrame", nil, tooltip)
-		scrollFrame:SetPoint("TOP", tooltip, "TOP", 0, -TOOLTIP_PADDING)
-		scrollFrame:SetPoint("BOTTOM", tooltip, "BOTTOM", 0, TOOLTIP_PADDING)
-		scrollFrame:SetPoint("LEFT", tooltip, "LEFT", TOOLTIP_PADDING, 0)
-		scrollFrame:SetPoint("RIGHT", tooltip, "RIGHT", -TOOLTIP_PADDING, 0)
-		tooltip.scrollFrame = scrollFrame
+        local scrollFrame = CreateFrame("ScrollFrame", nil, tooltip)
+        scrollFrame:SetPoint("TOP", tooltip, "TOP", 0, -TOOLTIP_PADDING)
+        scrollFrame:SetPoint("BOTTOM", tooltip, "BOTTOM", 0, TOOLTIP_PADDING)
+        scrollFrame:SetPoint("LEFT", tooltip, "LEFT", TOOLTIP_PADDING, 0)
+        scrollFrame:SetPoint("RIGHT", tooltip, "RIGHT", -TOOLTIP_PADDING, 0)
+        tooltip.scrollFrame = scrollFrame
 
-		local scrollChild = CreateFrame("Frame", nil, tooltip.scrollFrame)
-		scrollFrame:SetScrollChild(scrollChild)
-		tooltip.scrollChild = scrollChild
+        local scrollChild = CreateFrame("Frame", nil, tooltip.scrollFrame)
+        scrollFrame:SetScrollChild(scrollChild)
+        tooltip.scrollChild = scrollChild
 
-		setmetatable(tooltip, tipMetatable)
-	end
+        setmetatable(tooltip, tipMetatable)
+    end
 
-	--[===[@debug@
-	usedTooltips = usedTooltips + 1
-	--@end-debug@]===]
-	return tooltip
+    --[===[@debug@
+    usedTooltips = usedTooltips + 1
+    --@end-debug@]===]
+    return tooltip
 end
 
 -- Cleans the tooltip and stores it in the cache
 function ReleaseTooltip(tooltip)
-	if tooltip.releasing then
-		return
-	end
+    if tooltip.releasing then
+        return
+    end
+
+    tooltip.releasing = true
+    tooltip:Hide()
+
+    local releaseHandler = lib.onReleaseHandlers[tooltip]
 
-	tooltip.releasing = true
-	tooltip:Hide()
+    if releaseHandler then
+        lib.onReleaseHandlers[tooltip] = nil
 
-	local releaseHandler = lib.onReleaseHandlers[tooltip]
+        local success, errorMessage = pcall(releaseHandler, tooltip)
 
-	if releaseHandler then
-		lib.onReleaseHandlers[tooltip] = nil
+        if not success then
+            geterrorhandler()(errorMessage)
+        end
+    elseif tooltip.OnRelease then
+        local success, errorMessage = pcall(tooltip.OnRelease, tooltip)
+        if not success then
+            geterrorhandler()(errorMessage)
+        end
 
-		local success, errorMessage = pcall(releaseHandler, tooltip)
+        tooltip.OnRelease = nil
+    end
 
-		if not success then
-			geterrorhandler()(errorMessage)
-		end
-	elseif tooltip.OnRelease then
-		local success, errorMessage = pcall(tooltip.OnRelease, tooltip)
-		if not success then
-			geterrorhandler()(errorMessage)
-		end
+    tooltip.releasing = nil
+    tooltip.key = nil
+    tooltip.step = nil
 
-		tooltip.OnRelease = nil
-	end
+    ClearTooltipScripts(tooltip)
 
-	tooltip.releasing = nil
-	tooltip.key = nil
-	tooltip.step = nil
+    tooltip:SetAutoHideDelay(nil)
+    tooltip:ClearAllPoints()
+    tooltip:Clear()
 
-	ClearTooltipScripts(tooltip)
+    if tooltip.slider then
+        tooltip.slider:SetValue(0)
+        tooltip.slider:Hide()
+        tooltip.scrollFrame:SetPoint("RIGHT", tooltip, "RIGHT", -TOOLTIP_PADDING, 0)
+        tooltip:EnableMouseWheel(false)
+    end
 
-	tooltip:SetAutoHideDelay(nil)
-	tooltip:ClearAllPoints()
-	tooltip:Clear()
+    for i, column in ipairs(tooltip.columns) do
+        tooltip.columns[i] = ReleaseFrame(column)
+    end
 
-	if tooltip.slider then
-		tooltip.slider:SetValue(0)
-		tooltip.slider:Hide()
-		tooltip.scrollFrame:SetPoint("RIGHT", tooltip, "RIGHT", -TOOLTIP_PADDING, 0)
-		tooltip:EnableMouseWheel(false)
-	end
+    tooltip.columns = ReleaseTable(tooltip.columns)
+    tooltip.lines = ReleaseTable(tooltip.lines)
+    tooltip.colspans = ReleaseTable(tooltip.colspans)
 
-	for i, column in ipairs(tooltip.columns) do
-		tooltip.columns[i] = ReleaseFrame(column)
-	end
+    layoutCleaner.registry[tooltip] = nil
 
-	tooltip.columns = ReleaseTable(tooltip.columns)
-	tooltip.lines = ReleaseTable(tooltip.lines)
-	tooltip.colspans = ReleaseTable(tooltip.colspans)
+    if TooltipBackdropTemplateMixin and not tooltip.NineSlice then
+        -- don't recycle outdated tooltips into heap
+        tooltip = nil
+    end
 
-	layoutCleaner.registry[tooltip] = nil
-	tinsert(tooltipHeap, tooltip)
+    if tooltip then
+        tinsert(tooltipHeap, tooltip)
+    end
 
-	highlightTexture:SetTexture(DEFAULT_HIGHLIGHT_TEXTURE_PATH)
-	highlightTexture:SetTexCoord(0, 1, 0, 1)
+    highlightTexture:SetTexture(DEFAULT_HIGHLIGHT_TEXTURE_PATH)
+    highlightTexture:SetTexCoord(0, 1, 0, 1)
 
-	--[===[@debug@
-	usedTooltips = usedTooltips - 1
-	--@end-debug@]===]
+    --[===[@debug@
+    usedTooltips = usedTooltips - 1
+    --@end-debug@]===]
 end
 
 ------------------------------------------------------------------------------
@@ -478,36 +483,36 @@ end
 ------------------------------------------------------------------------------
 -- Returns a cell for the given tooltip from the given provider
 function AcquireCell(tooltip, provider)
-	local cell = provider:AcquireCell(tooltip)
+    local cell = provider:AcquireCell(tooltip)
 
-	cell:SetParent(tooltip.scrollChild)
-	cell:SetFrameLevel(tooltip.scrollChild:GetFrameLevel() + 3)
-	cell._provider = provider
+    cell:SetParent(tooltip.scrollChild)
+    cell:SetFrameLevel(tooltip.scrollChild:GetFrameLevel() + 3)
+    cell._provider = provider
 
-	return cell
+    return cell
 end
 
 -- Cleans the cell hands it to its provider for storing
 function ReleaseCell(cell)
-	if cell.fontString and cell.r then
-		cell.fontString:SetTextColor(cell.r, cell.g, cell.b, cell.a)
-	end
+    if cell.fontString and cell.r then
+        cell.fontString:SetTextColor(cell.r, cell.g, cell.b, cell.a)
+    end
 
-	cell._font = nil
-	cell._justification = nil
-	cell._colSpan = nil
-	cell._line = nil
-	cell._column = nil
+    cell._font = nil
+    cell._justification = nil
+    cell._colSpan = nil
+    cell._line = nil
+    cell._column = nil
 
-	cell:Hide()
-	cell:ClearAllPoints()
-	cell:SetParent(nil)
-	cell:SetBackdrop(nil)
+    cell:Hide()
+    cell:ClearAllPoints()
+    cell:SetParent(nil)
+    cell:SetBackdrop(nil)
 
-	ClearFrameScripts(cell)
+    ClearFrameScripts(cell)
 
-	cell._provider:ReleaseCell(cell)
-	cell._provider = nil
+    cell._provider:ReleaseCell(cell)
+    cell._provider = nil
 end
 
 ------------------------------------------------------------------------------
@@ -517,144 +522,153 @@ local tableHeap = lib.tableHeap
 
 -- Returns a table
 function AcquireTable()
-	local tbl = tremove(tableHeap) or {}
-	--[===[@debug@
-	usedTables = usedTables + 1
-	--@end-debug@]===]
-	return tbl
+    local tbl = tremove(tableHeap) or {}
+    --[===[@debug@
+    usedTables = usedTables + 1
+    --@end-debug@]===]
+    return tbl
 end
 
 -- Cleans the table and stores it in the cache
 function ReleaseTable(tableInstance)
-	wipe(tableInstance)
-	tinsert(tableHeap, tableInstance)
-	--[===[@debug@
-	usedTables = usedTables - 1
-	--@end-debug@]===]
+    wipe(tableInstance)
+    tinsert(tableHeap, tableInstance)
+    --[===[@debug@
+    usedTables = usedTables - 1
+    --@end-debug@]===]
 end
 
 ------------------------------------------------------------------------------
 -- Tooltip prototype
 ------------------------------------------------------------------------------
 function InitializeTooltip(tooltip, key)
-	----------------------------------------------------------------------
-	-- (Re)set frame settings
-	----------------------------------------------------------------------
-	local backdrop = GameTooltip:GetBackdrop()
-
-	tooltip:SetBackdrop(backdrop)
-
-	if backdrop then
-		tooltip:SetBackdropColor(GameTooltip:GetBackdropColor())
-		tooltip:SetBackdropBorderColor(GameTooltip:GetBackdropBorderColor())
-	end
-
-	tooltip:SetScale(GameTooltip:GetScale())
-	tooltip:SetAlpha(1)
-	tooltip:SetFrameStrata("TOOLTIP")
-	tooltip:SetClampedToScreen(false)
-
-	----------------------------------------------------------------------
-	-- Internal data. Since it's possible to Acquire twice without calling
-	-- release, check for pre-existence.
-	----------------------------------------------------------------------
-	tooltip.key = key
-	tooltip.columns = tooltip.columns or AcquireTable()
-	tooltip.lines = tooltip.lines or AcquireTable()
-	tooltip.colspans = tooltip.colspans or AcquireTable()
-	tooltip.regularFont = _G.GameTooltipText
-	tooltip.headerFont = _G.GameTooltipHeaderText
-	tooltip.labelProvider = labelProvider
-	tooltip.cell_margin_h = tooltip.cell_margin_h or CELL_MARGIN_H
-	tooltip.cell_margin_v = tooltip.cell_margin_v or CELL_MARGIN_V
-
-	----------------------------------------------------------------------
-	-- Finishing procedures
-	----------------------------------------------------------------------
-	tooltip:SetAutoHideDelay(nil)
-	tooltip:Hide()
-	ResetTooltipSize(tooltip)
+    ----------------------------------------------------------------------
+    -- (Re)set frame settings
+    ----------------------------------------------------------------------
+    if TooltipBackdropTemplateMixin then
+        tooltip.layoutType = GameTooltip.layoutType
+        NineSlicePanelMixin.OnLoad(tooltip.NineSlice)
+        if GameTooltip.layoutType then
+            tooltip.NineSlice:SetCenterColor(GameTooltip.NineSlice:GetCenterColor())
+            tooltip.NineSlice:SetBorderColor(GameTooltip.NineSlice:GetBorderColor())
+        end
+    else
+        local backdrop = GameTooltip:GetBackdrop()
+
+        tooltip:SetBackdrop(backdrop)
+
+        if backdrop then
+            tooltip:SetBackdropColor(GameTooltip:GetBackdropColor())
+            tooltip:SetBackdropBorderColor(GameTooltip:GetBackdropBorderColor())
+        end
+    end
+
+    tooltip:SetScale(GameTooltip:GetScale())
+    tooltip:SetAlpha(1)
+    tooltip:SetFrameStrata("TOOLTIP")
+    tooltip:SetClampedToScreen(false)
+
+    ----------------------------------------------------------------------
+    -- Internal data. Since it's possible to Acquire twice without calling
+    -- release, check for pre-existence.
+    ----------------------------------------------------------------------
+    tooltip.key = key
+    tooltip.columns = tooltip.columns or AcquireTable()
+    tooltip.lines = tooltip.lines or AcquireTable()
+    tooltip.colspans = tooltip.colspans or AcquireTable()
+    tooltip.regularFont = _G.GameTooltipText
+    tooltip.headerFont = _G.GameTooltipHeaderText
+    tooltip.labelProvider = labelProvider
+    tooltip.cell_margin_h = tooltip.cell_margin_h or CELL_MARGIN_H
+    tooltip.cell_margin_v = tooltip.cell_margin_v or CELL_MARGIN_V
+
+    ----------------------------------------------------------------------
+    -- Finishing procedures
+    ----------------------------------------------------------------------
+    tooltip:SetAutoHideDelay(nil)
+    tooltip:Hide()
+    ResetTooltipSize(tooltip)
 end
 
 function tipPrototype:SetDefaultProvider(myProvider)
-	if not myProvider then
-		return
-	end
+    if not myProvider then
+        return
+    end
 
-	self.labelProvider = myProvider
+    self.labelProvider = myProvider
 end
 
 function tipPrototype:GetDefaultProvider()
-	return self.labelProvider
+    return self.labelProvider
 end
 
 local function checkJustification(justification, level, silent)
-	if justification ~= "LEFT" and justification ~= "CENTER" and justification ~= "RIGHT" then
-		if silent then
-			return false
-		end
-		error("invalid justification, must one of LEFT, CENTER or RIGHT, not: " .. tostring(justification), level + 1)
-	end
+    if justification ~= "LEFT" and justification ~= "CENTER" and justification ~= "RIGHT" then
+        if silent then
+            return false
+        end
+        error("invalid justification, must one of LEFT, CENTER or RIGHT, not: " .. tostring(justification), level + 1)
+    end
 
-	return true
+    return true
 end
 
 function tipPrototype:SetColumnLayout(numColumns, ...)
-	if type(numColumns) ~= "number" or numColumns < 1 then
-		error("number of columns must be a positive number, not: " .. tostring(numColumns), 2)
-	end
+    if type(numColumns) ~= "number" or numColumns < 1 then
+        error("number of columns must be a positive number, not: " .. tostring(numColumns), 2)
+    end
 
-	for i = 1, numColumns do
-		local justification = select(i, ...) or "LEFT"
+    for i = 1, numColumns do
+        local justification = select(i, ...) or "LEFT"
 
-		checkJustification(justification, 2)
+        checkJustification(justification, 2)
 
-		if self.columns[i] then
-			self.columns[i].justification = justification
-		else
-			self:AddColumn(justification)
-		end
-	end
+        if self.columns[i] then
+            self.columns[i].justification = justification
+        else
+            self:AddColumn(justification)
+        end
+    end
 end
 
 function tipPrototype:AddColumn(justification)
-	justification = justification or "LEFT"
-	checkJustification(justification, 2)
+    justification = justification or "LEFT"
+    checkJustification(justification, 2)
 
-	local colNum = #self.columns + 1
-	local column = self.columns[colNum] or AcquireFrame(self.scrollChild)
+    local colNum = #self.columns + 1
+    local column = self.columns[colNum] or AcquireFrame(self.scrollChild)
 
-	column:SetFrameLevel(self.scrollChild:GetFrameLevel() + 1)
-	column.justification = justification
-	column.width = 0
-	column:SetWidth(1)
-	column:SetPoint("TOP", self.scrollChild)
-	column:SetPoint("BOTTOM", self.scrollChild)
+    column:SetFrameLevel(self.scrollChild:GetFrameLevel() + 1)
+    column.justification = justification
+    column.width = 0
+    column:SetWidth(1)
+    column:SetPoint("TOP", self.scrollChild)
+    column:SetPoint("BOTTOM", self.scrollChild)
 
-	if colNum > 1 then
-		local h_margin = self.cell_margin_h or CELL_MARGIN_H
+    if colNum > 1 then
+        local h_margin = self.cell_margin_h or CELL_MARGIN_H
 
-		column:SetPoint("LEFT", self.columns[colNum - 1], "RIGHT", h_margin, 0)
-		SetTooltipSize(self, self.width + h_margin, self.height)
-	else
-		column:SetPoint("LEFT", self.scrollChild)
-	end
+        column:SetPoint("LEFT", self.columns[colNum - 1], "RIGHT", h_margin, 0)
+        SetTooltipSize(self, self.width + h_margin, self.height)
+    else
+        column:SetPoint("LEFT", self.scrollChild)
+    end
 
-	column:Show()
-	self.columns[colNum] = column
+    column:Show()
+    self.columns[colNum] = column
 
-	return colNum
+    return colNum
 end
 
 ------------------------------------------------------------------------------
 -- Convenient methods
 ------------------------------------------------------------------------------
 function tipPrototype:Release()
-	lib:Release(self)
+    lib:Release(self)
 end
 
 function tipPrototype:IsAcquiredBy(key)
-	return key ~= nil and self.key == key
+    return key ~= nil and self.key == key
 end
 
 ------------------------------------------------------------------------------
@@ -663,774 +677,774 @@ end
 local RawSetScript = lib.frameMetatable.__index.SetScript
 
 function ClearTooltipScripts(tooltip)
-	if tooltip.scripts then
-		for scriptType in pairs(tooltip.scripts) do
-			RawSetScript(tooltip, scriptType, nil)
-		end
+    if tooltip.scripts then
+        for scriptType in pairs(tooltip.scripts) do
+            RawSetScript(tooltip, scriptType, nil)
+        end
 
-		tooltip.scripts = ReleaseTable(tooltip.scripts)
-	end
+        tooltip.scripts = ReleaseTable(tooltip.scripts)
+    end
 end
 
 function tipPrototype:SetScript(scriptType, handler)
-	RawSetScript(self, scriptType, handler)
+    RawSetScript(self, scriptType, handler)
 
-	if handler then
-		if not self.scripts then
-			self.scripts = AcquireTable()
-		end
+    if handler then
+        if not self.scripts then
+            self.scripts = AcquireTable()
+        end
 
-		self.scripts[scriptType] = true
-	elseif self.scripts then
-		self.scripts[scriptType] = nil
-	end
+        self.scripts[scriptType] = true
+    elseif self.scripts then
+        self.scripts[scriptType] = nil
+    end
 end
 
 -- That might break some addons ; those addons were breaking other
 -- addons' tooltip though.
 function tipPrototype:HookScript()
-	geterrorhandler()(":HookScript is not allowed on LibQTip tooltips")
+    geterrorhandler()(":HookScript is not allowed on LibQTip tooltips")
 end
 
 ------------------------------------------------------------------------------
 -- Scrollbar data and functions
 ------------------------------------------------------------------------------
 local BACKDROP_SLIDER_8_8 = BACKDROP_SLIDER_8_8 or {
-	bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
-	edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
-	tile = true,
-	tileEdge = true,
-	tileSize = 8,
-	edgeSize = 8,
-	insets = { left = 3, right = 3, top = 6, bottom = 6 },
+    bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
+    edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
+    tile = true,
+    tileEdge = true,
+    tileSize = 8,
+    edgeSize = 8,
+    insets = { left = 3, right = 3, top = 6, bottom = 6 },
 };
 
 local function slider_OnValueChanged(self)
-	self.scrollFrame:SetVerticalScroll(self:GetValue())
+    self.scrollFrame:SetVerticalScroll(self:GetValue())
 end
 
 local function tooltip_OnMouseWheel(self, delta)
-	local slider = self.slider
-	local currentValue = slider:GetValue()
-	local minValue, maxValue = slider:GetMinMaxValues()
-	local stepValue = self.step or 10
+    local slider = self.slider
+    local currentValue = slider:GetValue()
+    local minValue, maxValue = slider:GetMinMaxValues()
+    local stepValue = self.step or 10
 
-	if delta < 0 and currentValue < maxValue then
-		slider:SetValue(min(maxValue, currentValue + stepValue))
-	elseif delta > 0 and currentValue > minValue then
-		slider:SetValue(max(minValue, currentValue - stepValue))
-	end
+    if delta < 0 and currentValue < maxValue then
+        slider:SetValue(min(maxValue, currentValue + stepValue))
+    elseif delta > 0 and currentValue > minValue then
+        slider:SetValue(max(minValue, currentValue - stepValue))
+    end
 end
 
 -- Set the step size for the scroll bar
 function tipPrototype:SetScrollStep(step)
-	self.step = step
+    self.step = step
 end
 
 -- will resize the tooltip to fit the screen and show a scrollbar if needed
 function tipPrototype:UpdateScrolling(maxheight)
-	self:SetClampedToScreen(false)
+    self:SetClampedToScreen(false)
 
-	-- all data is in the tooltip; fix colspan width and prevent the layout cleaner from messing up the tooltip later
-	FixCellSizes(self)
-	layoutCleaner.registry[self] = nil
+    -- all data is in the tooltip; fix colspan width and prevent the layout cleaner from messing up the tooltip later
+    FixCellSizes(self)
+    layoutCleaner.registry[self] = nil
 
-	local scale = self:GetScale()
-	local topside = self:GetTop()
-	local bottomside = self:GetBottom()
-	local screensize = UIParent:GetHeight() / scale
-	local tipsize = (topside - bottomside)
+    local scale = self:GetScale()
+    local topside = self:GetTop()
+    local bottomside = self:GetBottom()
+    local screensize = UIParent:GetHeight() / scale
+    local tipsize = (topside - bottomside)
 
-	-- if the tooltip would be too high, limit its height and show the slider
-	if bottomside < 0 or topside > screensize or (maxheight and tipsize > maxheight) then
-		local shrink = (bottomside < 0 and (5 - bottomside) or 0) + (topside > screensize and (topside - screensize + 5) or 0)
+    -- if the tooltip would be too high, limit its height and show the slider
+    if bottomside < 0 or topside > screensize or (maxheight and tipsize > maxheight) then
+        local shrink = (bottomside < 0 and (5 - bottomside) or 0) + (topside > screensize and (topside - screensize + 5) or 0)
 
-		if maxheight and tipsize - shrink > maxheight then
-			shrink = tipsize - maxheight
-		end
+        if maxheight and tipsize - shrink > maxheight then
+            shrink = tipsize - maxheight
+        end
 
-		self:SetHeight(2 * TOOLTIP_PADDING + self.height - shrink)
-		self:SetWidth(2 * TOOLTIP_PADDING + self.width + 20)
-		self.scrollFrame:SetPoint("RIGHT", self, "RIGHT", -(TOOLTIP_PADDING + 20), 0)
+        self:SetHeight(2 * TOOLTIP_PADDING + self.height - shrink)
+        self:SetWidth(2 * TOOLTIP_PADDING + self.width + 20)
+        self.scrollFrame:SetPoint("RIGHT", self, "RIGHT", -(TOOLTIP_PADDING + 20), 0)
 
-		if not self.slider then
-			local slider = CreateFrame("Slider", nil, self, BackdropTemplateMixin and "BackdropTemplate")
-			slider.scrollFrame = self.scrollFrame
+        if not self.slider then
+            local slider = CreateFrame("Slider", nil, self, BackdropTemplateMixin and "BackdropTemplate")
+            slider.scrollFrame = self.scrollFrame
 
-			slider:SetOrientation("VERTICAL")
-			slider:SetPoint("TOPRIGHT", self, "TOPRIGHT", -TOOLTIP_PADDING, -TOOLTIP_PADDING)
-			slider:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -TOOLTIP_PADDING, TOOLTIP_PADDING)
-			slider:SetBackdrop(BACKDROP_SLIDER_8_8)
-			slider:SetThumbTexture([[Interface\Buttons\UI-SliderBar-Button-Vertical]])
-			slider:SetMinMaxValues(0, 1)
-			slider:SetValueStep(1)
-			slider:SetWidth(12)
-			slider:SetScript("OnValueChanged", slider_OnValueChanged)
-			slider:SetValue(0)
+            slider:SetOrientation("VERTICAL")
+            slider:SetPoint("TOPRIGHT", self, "TOPRIGHT", -TOOLTIP_PADDING, -TOOLTIP_PADDING)
+            slider:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -TOOLTIP_PADDING, TOOLTIP_PADDING)
+            slider:SetBackdrop(BACKDROP_SLIDER_8_8)
+            slider:SetThumbTexture([[Interface\Buttons\UI-SliderBar-Button-Vertical]])
+            slider:SetMinMaxValues(0, 1)
+            slider:SetValueStep(1)
+            slider:SetWidth(12)
+            slider:SetScript("OnValueChanged", slider_OnValueChanged)
+            slider:SetValue(0)
 
-			self.slider = slider
-		end
+            self.slider = slider
+        end
 
-		self.slider:SetMinMaxValues(0, shrink)
-		self.slider:Show()
+        self.slider:SetMinMaxValues(0, shrink)
+        self.slider:Show()
 
-		self:EnableMouseWheel(true)
-		self:SetScript("OnMouseWheel", tooltip_OnMouseWheel)
-	else
-		self:SetHeight(2 * TOOLTIP_PADDING + self.height)
-		self:SetWidth(2 * TOOLTIP_PADDING + self.width)
+        self:EnableMouseWheel(true)
+        self:SetScript("OnMouseWheel", tooltip_OnMouseWheel)
+    else
+        self:SetHeight(2 * TOOLTIP_PADDING + self.height)
+        self:SetWidth(2 * TOOLTIP_PADDING + self.width)
 
-		self.scrollFrame:SetPoint("RIGHT", self, "RIGHT", -TOOLTIP_PADDING, 0)
+        self.scrollFrame:SetPoint("RIGHT", self, "RIGHT", -TOOLTIP_PADDING, 0)
 
-		if self.slider then
-			self.slider:SetValue(0)
-			self.slider:Hide()
+        if self.slider then
+            self.slider:SetValue(0)
+            self.slider:Hide()
 
-			self:EnableMouseWheel(false)
-			self:SetScript("OnMouseWheel", nil)
-		end
-	end
+            self:EnableMouseWheel(false)
+            self:SetScript("OnMouseWheel", nil)
+        end
+    end
 end
 
 ------------------------------------------------------------------------------
 -- Tooltip methods for changing its contents.
 ------------------------------------------------------------------------------
 function tipPrototype:Clear()
-	for i, line in ipairs(self.lines) do
-		for _, cell in pairs(line.cells) do
-			if cell then
-				ReleaseCell(cell)
-			end
-		end
+    for i, line in ipairs(self.lines) do
+        for _, cell in pairs(line.cells) do
+            if cell then
+                ReleaseCell(cell)
+            end
+        end
 
-		ReleaseTable(line.cells)
+        ReleaseTable(line.cells)
 
-		line.cells = nil
-		line.is_header = nil
+        line.cells = nil
+        line.is_header = nil
 
-		ReleaseFrame(line)
+        ReleaseFrame(line)
 
-		self.lines[i] = nil
-	end
+        self.lines[i] = nil
+    end
 
-	for _, column in ipairs(self.columns) do
-		column.width = 0
-		column:SetWidth(1)
-	end
+    for _, column in ipairs(self.columns) do
+        column.width = 0
+        column:SetWidth(1)
+    end
 
-	wipe(self.colspans)
+    wipe(self.colspans)
 
-	self.cell_margin_h = nil
-	self.cell_margin_v = nil
+    self.cell_margin_h = nil
+    self.cell_margin_v = nil
 
-	ResetTooltipSize(self)
+    ResetTooltipSize(self)
 end
 
 function tipPrototype:SetCellMarginH(size)
-	if #self.lines > 0 then
-		error("Unable to set horizontal margin while the tooltip has lines.", 2)
-	end
+    if #self.lines > 0 then
+        error("Unable to set horizontal margin while the tooltip has lines.", 2)
+    end
 
-	if not size or type(size) ~= "number" or size < 0 then
-		error("Margin size must be a positive number or zero.", 2)
-	end
+    if not size or type(size) ~= "number" or size < 0 then
+        error("Margin size must be a positive number or zero.", 2)
+    end
 
-	self.cell_margin_h = size
+    self.cell_margin_h = size
 end
 
 function tipPrototype:SetCellMarginV(size)
-	if #self.lines > 0 then
-		error("Unable to set vertical margin while the tooltip has lines.", 2)
-	end
+    if #self.lines > 0 then
+        error("Unable to set vertical margin while the tooltip has lines.", 2)
+    end
 
-	if not size or type(size) ~= "number" or size < 0 then
-		error("Margin size must be a positive number or zero.", 2)
-	end
+    if not size or type(size) ~= "number" or size < 0 then
+        error("Margin size must be a positive number or zero.", 2)
+    end
 
-	self.cell_margin_v = size
+    self.cell_margin_v = size
 end
 
 function SetTooltipSize(tooltip, width, height)
-	tooltip.height = height
-	tooltip.width = width
+    tooltip.height = height
+    tooltip.width = width
 
-	tooltip:SetHeight(2 * TOOLTIP_PADDING + height)
-	tooltip:SetWidth(2 * TOOLTIP_PADDING + width)
+    tooltip:SetHeight(2 * TOOLTIP_PADDING + height)
+    tooltip:SetWidth(2 * TOOLTIP_PADDING + width)
 
-	tooltip.scrollChild:SetHeight(height)
-	tooltip.scrollChild:SetWidth(width)
+    tooltip.scrollChild:SetHeight(height)
+    tooltip.scrollChild:SetWidth(width)
 end
 
 -- Add 2 pixels to height so dangling letters (g, y, p, j, etc) are not clipped.
 function ResetTooltipSize(tooltip)
-	local h_margin = tooltip.cell_margin_h or CELL_MARGIN_H
+    local h_margin = tooltip.cell_margin_h or CELL_MARGIN_H
 
-	SetTooltipSize(tooltip, max(0, (h_margin * (#tooltip.columns - 1)) + (h_margin / 2)), 2)
+    SetTooltipSize(tooltip, max(0, (h_margin * (#tooltip.columns - 1)) + (h_margin / 2)), 2)
 end
 
 local function EnlargeColumn(tooltip, column, width)
-	if width > column.width then
-		SetTooltipSize(tooltip, tooltip.width + width - column.width, tooltip.height)
+    if width > column.width then
+        SetTooltipSize(tooltip, tooltip.width + width - column.width, tooltip.height)
 
-		column.width = width
-		column:SetWidth(width)
-	end
+        column.width = width
+        column:SetWidth(width)
+    end
 end
 
 local function ResizeLine(tooltip, line, height)
-	SetTooltipSize(tooltip, tooltip.width, tooltip.height + height - line.height)
+    SetTooltipSize(tooltip, tooltip.width, tooltip.height + height - line.height)
 
-	line.height = height
-	line:SetHeight(height)
+    line.height = height
+    line:SetHeight(height)
 end
 
 function FixCellSizes(tooltip)
-	local columns = tooltip.columns
-	local colspans = tooltip.colspans
-	local lines = tooltip.lines
-	local h_margin = tooltip.cell_margin_h or CELL_MARGIN_H
-
-	-- resize columns to make room for the colspans
-	while next(colspans) do
-		local maxNeedCols
-		local maxNeedWidthPerCol = 0
-
-		-- calculate the colspan with the highest additional width need per column
-		for colRange, width in pairs(colspans) do
-			local left, right = colRange:match("^(%d+)%-(%d+)$")
-
-			left, right = tonumber(left), tonumber(right)
-
-			for col = left, right - 1 do
-				width = width - columns[col].width - h_margin
-			end
-
-			width = width - columns[right].width
-
-			if width <= 0 then
-				colspans[colRange] = nil
-			else
-				width = width / (right - left + 1)
-
-				if width > maxNeedWidthPerCol then
-					maxNeedCols = colRange
-					maxNeedWidthPerCol = width
-				end
-			end
-		end
-
-		-- resize all columns for that colspan
-		if maxNeedCols then
-			local left, right = maxNeedCols:match("^(%d+)%-(%d+)$")
-
-			for col = left, right do
-				EnlargeColumn(tooltip, columns[col], columns[col].width + maxNeedWidthPerCol)
-			end
-
-			colspans[maxNeedCols] = nil
-		end
-	end
-
-	--now that the cell width is set, recalculate the rows' height
-	for _, line in ipairs(lines) do
-		if #(line.cells) > 0 then
-			local lineheight = 0
-
-			for _, cell in pairs(line.cells) do
-				if cell then
-					lineheight = max(lineheight, cell:getContentHeight())
-				end
-			end
-
-			if lineheight > 0 then
-				ResizeLine(tooltip, line, lineheight)
-			end
-		end
-	end
+    local columns = tooltip.columns
+    local colspans = tooltip.colspans
+    local lines = tooltip.lines
+    local h_margin = tooltip.cell_margin_h or CELL_MARGIN_H
+
+    -- resize columns to make room for the colspans
+    while next(colspans) do
+        local maxNeedCols
+        local maxNeedWidthPerCol = 0
+
+        -- calculate the colspan with the highest additional width need per column
+        for colRange, width in pairs(colspans) do
+            local left, right = colRange:match("^(%d+)%-(%d+)$")
+
+            left, right = tonumber(left), tonumber(right)
+
+            for col = left, right - 1 do
+                width = width - columns[col].width - h_margin
+            end
+
+            width = width - columns[right].width
+
+            if width <= 0 then
+                colspans[colRange] = nil
+            else
+                width = width / (right - left + 1)
+
+                if width > maxNeedWidthPerCol then
+                    maxNeedCols = colRange
+                    maxNeedWidthPerCol = width
+                end
+            end
+        end
+
+        -- resize all columns for that colspan
+        if maxNeedCols then
+            local left, right = maxNeedCols:match("^(%d+)%-(%d+)$")
+
+            for col = left, right do
+                EnlargeColumn(tooltip, columns[col], columns[col].width + maxNeedWidthPerCol)
+            end
+
+            colspans[maxNeedCols] = nil
+        end
+    end
+
+    --now that the cell width is set, recalculate the rows' height
+    for _, line in ipairs(lines) do
+        if #(line.cells) > 0 then
+            local lineheight = 0
+
+            for _, cell in pairs(line.cells) do
+                if cell then
+                    lineheight = max(lineheight, cell:getContentHeight())
+                end
+            end
+
+            if lineheight > 0 then
+                ResizeLine(tooltip, line, lineheight)
+            end
+        end
+    end
 end
 
 local function _SetCell(tooltip, lineNum, colNum, value, font, justification, colSpan, provider, ...)
-	local line = tooltip.lines[lineNum]
-	local cells = line.cells
-
-	-- Unset: be quick
-	if value == nil then
-		local cell = cells[colNum]
-
-		if cell then
-			for i = colNum, colNum + cell._colSpan - 1 do
-				cells[i] = nil
-			end
-
-			ReleaseCell(cell)
-		end
-
-		return lineNum, colNum
-	end
-
-	font = font or (line.is_header and tooltip.headerFont or tooltip.regularFont)
-
-	-- Check previous cell
-	local cell
-	local prevCell = cells[colNum]
-
-	if prevCell then
-		-- There is a cell here
-		justification = justification or prevCell._justification
-		colSpan = colSpan or prevCell._colSpan
-
-		-- Clear the currently marked colspan
-		for i = colNum + 1, colNum + prevCell._colSpan - 1 do
-			cells[i] = nil
-		end
-
-		if provider == nil or prevCell._provider == provider then
-			-- Reuse existing cell
-			cell = prevCell
-			provider = cell._provider
-		else
-			-- A new cell is required
-			cells[colNum] = ReleaseCell(prevCell)
-		end
-	elseif prevCell == nil then
-		-- Creating a new cell, using meaningful defaults.
-		provider = provider or tooltip.labelProvider
-		justification = justification or tooltip.columns[colNum].justification or "LEFT"
-		colSpan = colSpan or 1
-	else
-		error("overlapping cells at column " .. colNum, 3)
-	end
-
-	local tooltipWidth = #tooltip.columns
-	local rightColNum
-
-	if colSpan > 0 then
-		rightColNum = colNum + colSpan - 1
-
-		if rightColNum > tooltipWidth then
-			error("ColSpan too big, cell extends beyond right-most column", 3)
-		end
-	else
-		-- Zero or negative: count back from right-most columns
-		rightColNum = max(colNum, tooltipWidth + colSpan)
-		-- Update colspan to its effective value
-		colSpan = 1 + rightColNum - colNum
-	end
-
-	-- Cleanup colspans
-	for i = colNum + 1, rightColNum do
-		local columnCell = cells[i]
-
-		if columnCell then
-			ReleaseCell(columnCell)
-		elseif columnCell == false then
-			error("overlapping cells at column " .. i, 3)
-		end
-
-		cells[i] = false
-	end
-
-	-- Create the cell
-	if not cell then
-		cell = AcquireCell(tooltip, provider)
-		cells[colNum] = cell
-	end
-
-	-- Anchor the cell
-	cell:SetPoint("LEFT", tooltip.columns[colNum])
-	cell:SetPoint("RIGHT", tooltip.columns[rightColNum])
-	cell:SetPoint("TOP", line)
-	cell:SetPoint("BOTTOM", line)
-
-	-- Store the cell settings directly into the cell
-	-- That's a bit risky but is really cheap compared to other ways to do it
-	cell._font, cell._justification, cell._colSpan, cell._line, cell._column = font, justification, colSpan, lineNum, colNum
-
-	-- Setup the cell content
-	local width, height = cell:SetupCell(tooltip, value, justification, font, ...)
-	cell:Show()
-
-	if colSpan > 1 then
-		-- Postpone width changes until the tooltip is shown
-		local colRange = colNum .. "-" .. rightColNum
-
-		tooltip.colspans[colRange] = max(tooltip.colspans[colRange] or 0, width)
-		layoutCleaner:RegisterForCleanup(tooltip)
-	else
-		-- Enlarge the column and tooltip if need be
-		EnlargeColumn(tooltip, tooltip.columns[colNum], width)
-	end
-
-	-- Enlarge the line and tooltip if need be
-	if height > line.height then
-		SetTooltipSize(tooltip, tooltip.width, tooltip.height + height - line.height)
-
-		line.height = height
-		line:SetHeight(height)
-	end
-
-	if rightColNum < tooltipWidth then
-		return lineNum, rightColNum + 1
-	else
-		return lineNum, nil
-	end
+    local line = tooltip.lines[lineNum]
+    local cells = line.cells
+
+    -- Unset: be quick
+    if value == nil then
+        local cell = cells[colNum]
+
+        if cell then
+            for i = colNum, colNum + cell._colSpan - 1 do
+                cells[i] = nil
+            end
+
+            ReleaseCell(cell)
+        end
+
+        return lineNum, colNum
+    end
+
+    font = font or (line.is_header and tooltip.headerFont or tooltip.regularFont)
+
+    -- Check previous cell
+    local cell
+    local prevCell = cells[colNum]
+
+    if prevCell then
+        -- There is a cell here
+        justification = justification or prevCell._justification
+        colSpan = colSpan or prevCell._colSpan
+
+        -- Clear the currently marked colspan
+        for i = colNum + 1, colNum + prevCell._colSpan - 1 do
+            cells[i] = nil
+        end
+
+        if provider == nil or prevCell._provider == provider then
+            -- Reuse existing cell
+            cell = prevCell
+            provider = cell._provider
+        else
+            -- A new cell is required
+            cells[colNum] = ReleaseCell(prevCell)
+        end
+    elseif prevCell == nil then
+        -- Creating a new cell, using meaningful defaults.
+        provider = provider or tooltip.labelProvider
+        justification = justification or tooltip.columns[colNum].justification or "LEFT"
+        colSpan = colSpan or 1
+    else
+        error("overlapping cells at column " .. colNum, 3)
+    end
+
+    local tooltipWidth = #tooltip.columns
+    local rightColNum
+
+    if colSpan > 0 then
+        rightColNum = colNum + colSpan - 1
+
+        if rightColNum > tooltipWidth then
+            error("ColSpan too big, cell extends beyond right-most column", 3)
+        end
+    else
+        -- Zero or negative: count back from right-most columns
+        rightColNum = max(colNum, tooltipWidth + colSpan)
+        -- Update colspan to its effective value
+        colSpan = 1 + rightColNum - colNum
+    end
+
+    -- Cleanup colspans
+    for i = colNum + 1, rightColNum do
+        local columnCell = cells[i]
+
+        if columnCell then
+            ReleaseCell(columnCell)
+        elseif columnCell == false then
+            error("overlapping cells at column " .. i, 3)
+        end
+
+        cells[i] = false
+    end
+
+    -- Create the cell
+    if not cell then
+        cell = AcquireCell(tooltip, provider)
+        cells[colNum] = cell
+    end
+
+    -- Anchor the cell
+    cell:SetPoint("LEFT", tooltip.columns[colNum])
+    cell:SetPoint("RIGHT", tooltip.columns[rightColNum])
+    cell:SetPoint("TOP", line)
+    cell:SetPoint("BOTTOM", line)
+
+    -- Store the cell settings directly into the cell
+    -- That's a bit risky but is really cheap compared to other ways to do it
+    cell._font, cell._justification, cell._colSpan, cell._line, cell._column = font, justification, colSpan, lineNum, colNum
+
+    -- Setup the cell content
+    local width, height = cell:SetupCell(tooltip, value, justification, font, ...)
+    cell:Show()
+
+    if colSpan > 1 then
+        -- Postpone width changes until the tooltip is shown
+        local colRange = colNum .. "-" .. rightColNum
+
+        tooltip.colspans[colRange] = max(tooltip.colspans[colRange] or 0, width)
+        layoutCleaner:RegisterForCleanup(tooltip)
+    else
+        -- Enlarge the column and tooltip if need be
+        EnlargeColumn(tooltip, tooltip.columns[colNum], width)
+    end
+
+    -- Enlarge the line and tooltip if need be
+    if height > line.height then
+        SetTooltipSize(tooltip, tooltip.width, tooltip.height + height - line.height)
+
+        line.height = height
+        line:SetHeight(height)
+    end
+
+    if rightColNum < tooltipWidth then
+        return lineNum, rightColNum + 1
+    else
+        return lineNum, nil
+    end
 end
 
 do
-	local function CreateLine(tooltip, font, ...)
-		if #tooltip.columns == 0 then
-			error("column layout should be defined before adding line", 3)
-		end
+    local function CreateLine(tooltip, font, ...)
+        if #tooltip.columns == 0 then
+            error("column layout should be defined before adding line", 3)
+        end
 
-		local lineNum = #tooltip.lines + 1
-		local line = tooltip.lines[lineNum] or AcquireFrame(tooltip.scrollChild)
+        local lineNum = #tooltip.lines + 1
+        local line = tooltip.lines[lineNum] or AcquireFrame(tooltip.scrollChild)
 
-		line:SetFrameLevel(tooltip.scrollChild:GetFrameLevel() + 2)
-		line:SetPoint("LEFT", tooltip.scrollChild)
-		line:SetPoint("RIGHT", tooltip.scrollChild)
+        line:SetFrameLevel(tooltip.scrollChild:GetFrameLevel() + 2)
+        line:SetPoint("LEFT", tooltip.scrollChild)
+        line:SetPoint("RIGHT", tooltip.scrollChild)
 
-		if lineNum > 1 then
-			local v_margin = tooltip.cell_margin_v or CELL_MARGIN_V
+        if lineNum > 1 then
+            local v_margin = tooltip.cell_margin_v or CELL_MARGIN_V
 
-			line:SetPoint("TOP", tooltip.lines[lineNum - 1], "BOTTOM", 0, -v_margin)
-			SetTooltipSize(tooltip, tooltip.width, tooltip.height + v_margin)
-		else
-			line:SetPoint("TOP", tooltip.scrollChild)
-		end
+            line:SetPoint("TOP", tooltip.lines[lineNum - 1], "BOTTOM", 0, -v_margin)
+            SetTooltipSize(tooltip, tooltip.width, tooltip.height + v_margin)
+        else
+            line:SetPoint("TOP", tooltip.scrollChild)
+        end
 
-		tooltip.lines[lineNum] = line
+        tooltip.lines[lineNum] = line
 
-		line.cells = line.cells or AcquireTable()
-		line.height = 0
-		line:SetHeight(1)
-		line:Show()
+        line.cells = line.cells or AcquireTable()
+        line.height = 0
+        line:SetHeight(1)
+        line:Show()
 
-		local colNum = 1
+        local colNum = 1
 
-		for i = 1, #tooltip.columns do
-			local value = select(i, ...)
+        for i = 1, #tooltip.columns do
+            local value = select(i, ...)
 
-			if value ~= nil then
-				lineNum, colNum = _SetCell(tooltip, lineNum, i, value, font, nil, 1, tooltip.labelProvider)
-			end
-		end
+            if value ~= nil then
+                lineNum, colNum = _SetCell(tooltip, lineNum, i, value, font, nil, 1, tooltip.labelProvider)
+            end
+        end
 
-		return lineNum, colNum
-	end
+        return lineNum, colNum
+    end
 
-	function tipPrototype:AddLine(...)
-		return CreateLine(self, self.regularFont, ...)
-	end
+    function tipPrototype:AddLine(...)
+        return CreateLine(self, self.regularFont, ...)
+    end
 
-	function tipPrototype:AddHeader(...)
-		local line, col = CreateLine(self, self.headerFont, ...)
+    function tipPrototype:AddHeader(...)
+        local line, col = CreateLine(self, self.headerFont, ...)
 
-		self.lines[line].is_header = true
+        self.lines[line].is_header = true
 
-		return line, col
-	end
+        return line, col
+    end
 end -- do-block
 
 local GenericBackdrop = {
-	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background"
+    bgFile = "Interface\\Tooltips\\UI-Tooltip-Background"
 }
 
 function tipPrototype:AddSeparator(height, r, g, b, a)
-	local lineNum, colNum = self:AddLine()
-	local line = self.lines[lineNum]
-	local color = _G.NORMAL_FONT_COLOR
+    local lineNum, colNum = self:AddLine()
+    local line = self.lines[lineNum]
+    local color = _G.NORMAL_FONT_COLOR
 
-	height = height or 1
+    height = height or 1
 
-	SetTooltipSize(self, self.width, self.height + height)
+    SetTooltipSize(self, self.width, self.height + height)
 
-	line.height = height
-	line:SetHeight(height)
-	line:SetBackdrop(GenericBackdrop)
-	line:SetBackdropColor(r or color.r, g or color.g, b or color.b, a or 1)
+    line.height = height
+    line:SetHeight(height)
+    line:SetBackdrop(GenericBackdrop)
+    line:SetBackdropColor(r or color.r, g or color.g, b or color.b, a or 1)
 
-	return lineNum, colNum
+    return lineNum, colNum
 end
 
 function tipPrototype:SetCellColor(lineNum, colNum, r, g, b, a)
-	local cell = self.lines[lineNum].cells[colNum]
+    local cell = self.lines[lineNum].cells[colNum]
 
-	if cell then
-		local sr, sg, sb, sa = self:GetBackdropColor()
+    if cell then
+        local sr, sg, sb, sa = self:GetBackdropColor()
 
-		cell:SetBackdrop(GenericBackdrop)
-		cell:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
-	end
+        cell:SetBackdrop(GenericBackdrop)
+        cell:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
+    end
 end
 
 function tipPrototype:SetColumnColor(colNum, r, g, b, a)
-	local column = self.columns[colNum]
+    local column = self.columns[colNum]
 
-	if column then
-		local sr, sg, sb, sa = self:GetBackdropColor()
-		column:SetBackdrop(GenericBackdrop)
-		column:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
-	end
+    if column then
+        local sr, sg, sb, sa = self:GetBackdropColor()
+        column:SetBackdrop(GenericBackdrop)
+        column:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
+    end
 end
 
 function tipPrototype:SetLineColor(lineNum, r, g, b, a)
-	local line = self.lines[lineNum]
+    local line = self.lines[lineNum]
 
-	if line then
-		local sr, sg, sb, sa = self:GetBackdropColor()
+    if line then
+        local sr, sg, sb, sa = self:GetBackdropColor()
 
-		line:SetBackdrop(GenericBackdrop)
-		line:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
-	end
+        line:SetBackdrop(GenericBackdrop)
+        line:SetBackdropColor(r or sr, g or sg, b or sb, a or sa)
+    end
 end
 
 function tipPrototype:SetCellTextColor(lineNum, colNum, r, g, b, a)
-	local line = self.lines[lineNum]
-	local column = self.columns[colNum]
+    local line = self.lines[lineNum]
+    local column = self.columns[colNum]
 
-	if not line or not column then
-		return
-	end
+    if not line or not column then
+        return
+    end
 
-	local cell = self.lines[lineNum].cells[colNum]
+    local cell = self.lines[lineNum].cells[colNum]
 
-	if cell then
-		if not cell.fontString then
-			error("cell's label provider did not assign a fontString field", 2)
-		end
+    if cell then
+        if not cell.fontString then
+            error("cell's label provider did not assign a fontString field", 2)
+        end
 
-		if not cell.r then
-			cell.r, cell.g, cell.b, cell.a = cell.fontString:GetTextColor()
-		end
+        if not cell.r then
+            cell.r, cell.g, cell.b, cell.a = cell.fontString:GetTextColor()
+        end
 
-		cell.fontString:SetTextColor(r or cell.r, g or cell.g, b or cell.b, a or cell.a)
-	end
+        cell.fontString:SetTextColor(r or cell.r, g or cell.g, b or cell.b, a or cell.a)
+    end
 end
 
 function tipPrototype:SetColumnTextColor(colNum, r, g, b, a)
-	if not self.columns[colNum] then
-		return
-	end
+    if not self.columns[colNum] then
+        return
+    end
 
-	for lineIndex = 1, #self.lines do
-		self:SetCellTextColor(lineIndex, colNum, r, g, b, a)
-	end
+    for lineIndex = 1, #self.lines do
+        self:SetCellTextColor(lineIndex, colNum, r, g, b, a)
+    end
 end
 
 function tipPrototype:SetLineTextColor(lineNum, r, g, b, a)
-	local line = self.lines[lineNum]
+    local line = self.lines[lineNum]
 
-	if not line then
-		return
-	end
+    if not line then
+        return
+    end
 
-	for cellIndex = 1, #line.cells do
-		self:SetCellTextColor(lineNum, line.cells[cellIndex]._column, r, g, b, a)
-	end
+    for cellIndex = 1, #line.cells do
+        self:SetCellTextColor(lineNum, line.cells[cellIndex]._column, r, g, b, a)
+    end
 end
 
 function tipPrototype:SetHighlightTexture(...)
-	return highlightTexture:SetTexture(...)
+    return highlightTexture:SetTexture(...)
 end
 
 function tipPrototype:SetHighlightTexCoord(...)
-	highlightTexture:SetTexCoord(...)
+    highlightTexture:SetTexCoord(...)
 end
 
 do
-	local function checkFont(font, level, silent)
-		local bad = false
-
-		if not font then
-			bad = true
-		elseif type(font) == "string" then
-			local ref = _G[font]
-
-			if not ref or type(ref) ~= "table" or type(ref.IsObjectType) ~= "function" or not ref:IsObjectType("Font") then
-				bad = true
-			end
-		elseif type(font) ~= "table" or type(font.IsObjectType) ~= "function" or not font:IsObjectType("Font") then
-			bad = true
-		end
-
-		if bad then
-			if silent then
-				return false
-			end
-
-			error("font must be a Font instance or a string matching the name of a global Font instance, not: " .. tostring(font), level + 1)
-		end
-		return true
-	end
-
-	function tipPrototype:SetFont(font)
-		local is_string = type(font) == "string"
-
-		checkFont(font, 2)
-		self.regularFont = is_string and _G[font] or font
-	end
-
-	function tipPrototype:SetHeaderFont(font)
-		local is_string = type(font) == "string"
-
-		checkFont(font, 2)
-		self.headerFont = is_string and _G[font] or font
-	end
-
-	-- TODO: fixed argument positions / remove checks for performance?
-	function tipPrototype:SetCell(lineNum, colNum, value, ...)
-		-- Mandatory argument checking
-		if type(lineNum) ~= "number" then
-			error("line number must be a number, not: " .. tostring(lineNum), 2)
-		elseif lineNum < 1 or lineNum > #self.lines then
-			error("line number out of range: " .. tostring(lineNum), 2)
-		elseif type(colNum) ~= "number" then
-			error("column number must be a number, not: " .. tostring(colNum), 2)
-		elseif colNum < 1 or colNum > #self.columns then
-			error("column number out of range: " .. tostring(colNum), 2)
-		end
-
-		-- Variable argument checking
-		local font, justification, colSpan, provider
-		local i, arg = 1, ...
-
-		if arg == nil or checkFont(arg, 2, true) then
-			i, font, arg = 2, ...
-		end
-
-		if arg == nil or checkJustification(arg, 2, true) then
-			i, justification, arg = i + 1, select(i, ...)
-		end
-
-		if arg == nil or type(arg) == "number" then
-			i, colSpan, arg = i + 1, select(i, ...)
-		end
-
-		if arg == nil or type(arg) == "table" and type(arg.AcquireCell) == "function" then
-			i, provider = i + 1, arg
-		end
-
-		return _SetCell(self, lineNum, colNum, value, font, justification, colSpan, provider, select(i, ...))
-	end
+    local function checkFont(font, level, silent)
+        local bad = false
+
+        if not font then
+            bad = true
+        elseif type(font) == "string" then
+            local ref = _G[font]
+
+            if not ref or type(ref) ~= "table" or type(ref.IsObjectType) ~= "function" or not ref:IsObjectType("Font") then
+                bad = true
+            end
+        elseif type(font) ~= "table" or type(font.IsObjectType) ~= "function" or not font:IsObjectType("Font") then
+            bad = true
+        end
+
+        if bad then
+            if silent then
+                return false
+            end
+
+            error("font must be a Font instance or a string matching the name of a global Font instance, not: " .. tostring(font), level + 1)
+        end
+        return true
+    end
+
+    function tipPrototype:SetFont(font)
+        local is_string = type(font) == "string"
+
+        checkFont(font, 2)
+        self.regularFont = is_string and _G[font] or font
+    end
+
+    function tipPrototype:SetHeaderFont(font)
+        local is_string = type(font) == "string"
+
+        checkFont(font, 2)
+        self.headerFont = is_string and _G[font] or font
+    end
+
+    -- TODO: fixed argument positions / remove checks for performance?
+    function tipPrototype:SetCell(lineNum, colNum, value, ...)
+        -- Mandatory argument checking
+        if type(lineNum) ~= "number" then
+            error("line number must be a number, not: " .. tostring(lineNum), 2)
+        elseif lineNum < 1 or lineNum > #self.lines then
+            error("line number out of range: " .. tostring(lineNum), 2)
+        elseif type(colNum) ~= "number" then
+            error("column number must be a number, not: " .. tostring(colNum), 2)
+        elseif colNum < 1 or colNum > #self.columns then
+            error("column number out of range: " .. tostring(colNum), 2)
+        end
+
+        -- Variable argument checking
+        local font, justification, colSpan, provider
+        local i, arg = 1, ...
+
+        if arg == nil or checkFont(arg, 2, true) then
+            i, font, arg = 2, ...
+        end
+
+        if arg == nil or checkJustification(arg, 2, true) then
+            i, justification, arg = i + 1, select(i, ...)
+        end
+
+        if arg == nil or type(arg) == "number" then
+            i, colSpan, arg = i + 1, select(i, ...)
+        end
+
+        if arg == nil or type(arg) == "table" and type(arg.AcquireCell) == "function" then
+            i, provider = i + 1, arg
+        end
+
+        return _SetCell(self, lineNum, colNum, value, font, justification, colSpan, provider, select(i, ...))
+    end
 end -- do-block
 
 function tipPrototype:GetFont()
-	return self.regularFont
+    return self.regularFont
 end
 
 function tipPrototype:GetHeaderFont()
-	return self.headerFont
+    return self.headerFont
 end
 
 function tipPrototype:GetLineCount()
-	return #self.lines
+    return #self.lines
 end
 
 function tipPrototype:GetColumnCount()
-	return #self.columns
+    return #self.columns
 end
 
 ------------------------------------------------------------------------------
 -- Frame Scripts
 ------------------------------------------------------------------------------
 local scripts = {
-	OnEnter = function(frame, ...)
-		highlightFrame:SetParent(frame)
-		highlightFrame:SetAllPoints(frame)
-		highlightFrame:Show()
-
-		if frame._OnEnter_func then
-			frame:_OnEnter_func(frame._OnEnter_arg, ...)
-		end
-	end,
-	OnLeave = function(frame, ...)
-		highlightFrame:Hide()
-		highlightFrame:ClearAllPoints()
-		highlightFrame:SetParent(nil)
-
-		if frame._OnLeave_func then
-			frame:_OnLeave_func(frame._OnLeave_arg, ...)
-		end
-	end,
-	OnMouseDown = function(frame, ...)
-		frame:_OnMouseDown_func(frame._OnMouseDown_arg, ...)
-	end,
-	OnMouseUp = function(frame, ...)
-		frame:_OnMouseUp_func(frame._OnMouseUp_arg, ...)
-	end,
-	OnReceiveDrag = function(frame, ...)
-		frame:_OnReceiveDrag_func(frame._OnReceiveDrag_arg, ...)
-	end
+    OnEnter = function(frame, ...)
+        highlightFrame:SetParent(frame)
+        highlightFrame:SetAllPoints(frame)
+        highlightFrame:Show()
+
+        if frame._OnEnter_func then
+            frame:_OnEnter_func(frame._OnEnter_arg, ...)
+        end
+    end,
+    OnLeave = function(frame, ...)
+        highlightFrame:Hide()
+        highlightFrame:ClearAllPoints()
+        highlightFrame:SetParent(nil)
+
+        if frame._OnLeave_func then
+            frame:_OnLeave_func(frame._OnLeave_arg, ...)
+        end
+    end,
+    OnMouseDown = function(frame, ...)
+        frame:_OnMouseDown_func(frame._OnMouseDown_arg, ...)
+    end,
+    OnMouseUp = function(frame, ...)
+        frame:_OnMouseUp_func(frame._OnMouseUp_arg, ...)
+    end,
+    OnReceiveDrag = function(frame, ...)
+        frame:_OnReceiveDrag_func(frame._OnReceiveDrag_arg, ...)
+    end
 }
 
 function SetFrameScript(frame, script, func, arg)
-	if not scripts[script] then
-		return
-	end
-
-	frame["_" .. script .. "_func"] = func
-	frame["_" .. script .. "_arg"] = arg
-
-	if script == "OnMouseDown" or script == "OnMouseUp" or script == "OnReceiveDrag" then
-		if func then
-			frame:SetScript(script, scripts[script])
-		else
-			frame:SetScript(script, nil)
-		end
-	end
-
-	-- if at least one script is set, set the OnEnter/OnLeave scripts for the highlight
-	if frame._OnEnter_func or frame._OnLeave_func or frame._OnMouseDown_func or frame._OnMouseUp_func or frame._OnReceiveDrag_func then
-		frame:EnableMouse(true)
-		frame:SetScript("OnEnter", scripts.OnEnter)
-		frame:SetScript("OnLeave", scripts.OnLeave)
-	else
-		frame:EnableMouse(false)
-		frame:SetScript("OnEnter", nil)
-		frame:SetScript("OnLeave", nil)
-	end
+    if not scripts[script] then
+        return
+    end
+
+    frame["_" .. script .. "_func"] = func
+    frame["_" .. script .. "_arg"] = arg
+
+    if script == "OnMouseDown" or script == "OnMouseUp" or script == "OnReceiveDrag" then
+        if func then
+            frame:SetScript(script, scripts[script])
+        else
+            frame:SetScript(script, nil)
+        end
+    end
+
+    -- if at least one script is set, set the OnEnter/OnLeave scripts for the highlight
+    if frame._OnEnter_func or frame._OnLeave_func or frame._OnMouseDown_func or frame._OnMouseUp_func or frame._OnReceiveDrag_func then
+        frame:EnableMouse(true)
+        frame:SetScript("OnEnter", scripts.OnEnter)
+        frame:SetScript("OnLeave", scripts.OnLeave)
+    else
+        frame:EnableMouse(false)
+        frame:SetScript("OnEnter", nil)
+        frame:SetScript("OnLeave", nil)
+    end
 end
 
 function ClearFrameScripts(frame)
-	if frame._OnEnter_func or frame._OnLeave_func or frame._OnMouseDown_func or frame._OnMouseUp_func or frame._OnReceiveDrag_func then
-		frame:EnableMouse(false)
+    if frame._OnEnter_func or frame._OnLeave_func or frame._OnMouseDown_func or frame._OnMouseUp_func or frame._OnReceiveDrag_func then
+        frame:EnableMouse(false)
 
-		frame:SetScript("OnEnter", nil)
-		frame._OnEnter_func = nil
-		frame._OnEnter_arg = nil
+        frame:SetScript("OnEnter", nil)
+        frame._OnEnter_func = nil
+        frame._OnEnter_arg = nil
 
-		frame:SetScript("OnLeave", nil)
-		frame._OnLeave_func = nil
-		frame._OnLeave_arg = nil
+        frame:SetScript("OnLeave", nil)
+        frame._OnLeave_func = nil
+        frame._OnLeave_arg = nil
 
-		frame:SetScript("OnReceiveDrag", nil)
-		frame._OnReceiveDrag_func = nil
-		frame._OnReceiveDrag_arg = nil
+        frame:SetScript("OnReceiveDrag", nil)
+        frame._OnReceiveDrag_func = nil
+        frame._OnReceiveDrag_arg = nil
 
-		frame:SetScript("OnMouseDown", nil)
-		frame._OnMouseDown_func = nil
-		frame._OnMouseDown_arg = nil
+        frame:SetScript("OnMouseDown", nil)
+        frame._OnMouseDown_func = nil
+        frame._OnMouseDown_arg = nil
 
-		frame:SetScript("OnMouseUp", nil)
-		frame._OnMouseUp_func = nil
-		frame._OnMouseUp_arg = nil
-	end
+        frame:SetScript("OnMouseUp", nil)
+        frame._OnMouseUp_func = nil
+        frame._OnMouseUp_arg = nil
+    end
 end
 
 function tipPrototype:SetLineScript(lineNum, script, func, arg)
-	SetFrameScript(self.lines[lineNum], script, func, arg)
+    SetFrameScript(self.lines[lineNum], script, func, arg)
 end
 
 function tipPrototype:SetColumnScript(colNum, script, func, arg)
-	SetFrameScript(self.columns[colNum], script, func, arg)
+    SetFrameScript(self.columns[colNum], script, func, arg)
 end
 
 function tipPrototype:SetCellScript(lineNum, colNum, script, func, arg)
-	local cell = self.lines[lineNum].cells[colNum]
+    local cell = self.lines[lineNum].cells[colNum]
 
-	if cell then
-		SetFrameScript(cell, script, func, arg)
-	end
+    if cell then
+        SetFrameScript(cell, script, func, arg)
+    end
 end
 
 ------------------------------------------------------------------------------
@@ -1439,21 +1453,21 @@ end
 
 -- Script of the auto-hiding child frame
 local function AutoHideTimerFrame_OnUpdate(self, elapsed)
-	self.checkElapsed = self.checkElapsed + elapsed
+    self.checkElapsed = self.checkElapsed + elapsed
 
-	if self.checkElapsed > 0.1 then
-		if self.parent:IsMouseOver() or (self.alternateFrame and self.alternateFrame:IsMouseOver()) then
-			self.elapsed = 0
-		else
-			self.elapsed = self.elapsed + self.checkElapsed
+    if self.checkElapsed > 0.1 then
+        if self.parent:IsMouseOver() or (self.alternateFrame and self.alternateFrame:IsMouseOver()) then
+            self.elapsed = 0
+        else
+            self.elapsed = self.elapsed + self.checkElapsed
 
-			if self.elapsed >= self.delay then
-				lib:Release(self.parent)
-			end
-		end
+            if self.elapsed >= self.delay then
+                lib:Release(self.parent)
+            end
+        end
 
-		self.checkElapsed = 0
-	end
+        self.checkElapsed = 0
+    end
 end
 
 -- Usage:
@@ -1461,65 +1475,65 @@ end
 -- :SetAutoHideDelay(0.25, someFrame) => hides after 0.25sec outside of both the tooltip and someFrame
 -- :SetAutoHideDelay() => disable auto-hiding (default)
 function tipPrototype:SetAutoHideDelay(delay, alternateFrame, releaseHandler)
-	local timerFrame = self.autoHideTimerFrame
-	delay = tonumber(delay) or 0
+    local timerFrame = self.autoHideTimerFrame
+    delay = tonumber(delay) or 0
 
-	if releaseHandler then
-		if type(releaseHandler) ~= "function" then
-			error("releaseHandler must be a function", 2)
-		end
+    if releaseHandler then
+        if type(releaseHandler) ~= "function" then
+            error("releaseHandler must be a function", 2)
+        end
 
-		lib.onReleaseHandlers[self] = releaseHandler
-	end
+        lib.onReleaseHandlers[self] = releaseHandler
+    end
 
-	if delay > 0 then
-		if not timerFrame then
-			timerFrame = AcquireTimer(self)
-			timerFrame:SetScript("OnUpdate", AutoHideTimerFrame_OnUpdate)
+    if delay > 0 then
+        if not timerFrame then
+            timerFrame = AcquireTimer(self)
+            timerFrame:SetScript("OnUpdate", AutoHideTimerFrame_OnUpdate)
 
-			self.autoHideTimerFrame = timerFrame
-		end
+            self.autoHideTimerFrame = timerFrame
+        end
 
-		timerFrame.parent = self
-		timerFrame.checkElapsed = 0
-		timerFrame.elapsed = 0
-		timerFrame.delay = delay
-		timerFrame.alternateFrame = alternateFrame
-		timerFrame:Show()
-	elseif timerFrame then
-		self.autoHideTimerFrame = nil
+        timerFrame.parent = self
+        timerFrame.checkElapsed = 0
+        timerFrame.elapsed = 0
+        timerFrame.delay = delay
+        timerFrame.alternateFrame = alternateFrame
+        timerFrame:Show()
+    elseif timerFrame then
+        self.autoHideTimerFrame = nil
 
-		timerFrame.alternateFrame = nil
-		timerFrame:SetScript("OnUpdate", nil)
+        timerFrame.alternateFrame = nil
+        timerFrame:SetScript("OnUpdate", nil)
 
-		ReleaseTimer(timerFrame)
-	end
+        ReleaseTimer(timerFrame)
+    end
 end
 
 ------------------------------------------------------------------------------
 -- "Smart" Anchoring
 ------------------------------------------------------------------------------
 local function GetTipAnchor(frame)
-	local x, y = frame:GetCenter()
+    local x, y = frame:GetCenter()
 
-	if not x or not y then
-		return "TOPLEFT", "BOTTOMLEFT"
-	end
+    if not x or not y then
+        return "TOPLEFT", "BOTTOMLEFT"
+    end
 
-	local hhalf = (x > UIParent:GetWidth() * 2 / 3) and "RIGHT" or (x < UIParent:GetWidth() / 3) and "LEFT" or ""
-	local vhalf = (y > UIParent:GetHeight() / 2) and "TOP" or "BOTTOM"
+    local hhalf = (x > UIParent:GetWidth() * 2 / 3) and "RIGHT" or (x < UIParent:GetWidth() / 3) and "LEFT" or ""
+    local vhalf = (y > UIParent:GetHeight() / 2) and "TOP" or "BOTTOM"
 
-	return vhalf .. hhalf, frame, (vhalf == "TOP" and "BOTTOM" or "TOP") .. hhalf
+    return vhalf .. hhalf, frame, (vhalf == "TOP" and "BOTTOM" or "TOP") .. hhalf
 end
 
 function tipPrototype:SmartAnchorTo(frame)
-	if not frame then
-		error("Invalid frame provided.", 2)
-	end
+    if not frame then
+        error("Invalid frame provided.", 2)
+    end
 
-	self:ClearAllPoints()
-	self:SetClampedToScreen(true)
-	self:SetPoint(GetTipAnchor(frame))
+    self:ClearAllPoints()
+    self:SetClampedToScreen(true)
+    self:SetPoint(GetTipAnchor(frame))
 end
 
 ------------------------------------------------------------------------------
@@ -1528,22 +1542,22 @@ end
 -- @debug @
 local print = print
 local function PrintStats()
-	local tipCache = tostring(#tooltipHeap)
-	local frameCache = tostring(#frameHeap)
-	local tableCache = tostring(#tableHeap)
-	local header = false
-
-	print("Tooltips used: " .. usedTooltips .. ", Cached: " .. tipCache .. ", Total: " .. tipCache + usedTooltips)
-	print("Frames used: " .. usedFrames .. ", Cached: " .. frameCache .. ", Total: " .. frameCache + usedFrames)
-	print("Tables used: " .. usedTables .. ", Cached: " .. tableCache .. ", Total: " .. tableCache + usedTables)
-
-	for k in pairs(activeTooltips) do
-		if not header then
-			print("Active tooltips:")
-			header = true
-		end
-		print("- " .. k)
-	end
+    local tipCache = tostring(#tooltipHeap)
+    local frameCache = tostring(#frameHeap)
+    local tableCache = tostring(#tableHeap)
+    local header = false
+
+    print("Tooltips used: " .. usedTooltips .. ", Cached: " .. tipCache .. ", Total: " .. tipCache + usedTooltips)
+    print("Frames used: " .. usedFrames .. ", Cached: " .. frameCache .. ", Total: " .. frameCache + usedFrames)
+    print("Tables used: " .. usedTables .. ", Cached: " .. tableCache .. ", Total: " .. tableCache + usedTables)
+
+    for k in pairs(activeTooltips) do
+        if not header then
+            print("Active tooltips:")
+            header = true
+        end
+        print("- " .. k)
+    end
 end
 
 SLASH_LibQTip1 = "/qtip"
diff --git a/Libs/LibQTip-1.0/LibQTip-1.0.toc b/Libs/LibQTip-1.0/LibQTip-1.0.toc
index 765ab9d..b3f3152 100755
--- a/Libs/LibQTip-1.0/LibQTip-1.0.toc
+++ b/Libs/LibQTip-1.0/LibQTip-1.0.toc
@@ -1,10 +1,10 @@
-## Interface: 90000
+## Interface: 90105
 ## Title: Lib: QTip-1.0
 ## Notes: Library providing multi-column tooltips.
 ## Author: Torhal, Adirelle, Elkano, Tristanian
-## Version: 442326b
+## Version: 9.0.1.2-1-g4c6a3d8
 ## LoadOnDemand: 1
-## X-Date: 2020-10-15T15:12:00Z
+## X-Date: 2021-11-03T18:49:57Z
 ## X-Credits: Kaelten (input on initial design)
 ## X-Category: Library, Tooltip
 ## X-License: Ace3 BSD-like license
diff --git a/Libs/LibStub/LibStub.lua b/Libs/LibStub/LibStub.lua
index ae1900e..0a41ac0 100755
--- a/Libs/LibStub/LibStub.lua
+++ b/Libs/LibStub/LibStub.lua
@@ -1,22 +1,13 @@
--- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $
 -- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
--- LibStub is hereby placed in the Public Domain
--- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
+-- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
 local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
 local LibStub = _G[LIBSTUB_MAJOR]
 
--- Check to see is this version of the stub is obsolete
 if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 	LibStub = LibStub or {libs = {}, minors = {} }
 	_G[LIBSTUB_MAJOR] = LibStub
 	LibStub.minor = LIBSTUB_MINOR
 	
-	-- LibStub:NewLibrary(major, minor)
-	-- major (string) - the major version of the library
-	-- minor (string or number ) - the minor version of the library
-	-- 
-	-- returns nil if a newer or same version of the lib is already present
-	-- returns empty library object or old library object if upgrade is needed
 	function LibStub:NewLibrary(major, minor)
 		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
 		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
@@ -27,12 +18,6 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 		return self.libs[major], oldminor
 	end
 	
-	-- LibStub:GetLibrary(major, [silent])
-	-- major (string) - the major version of the library
-	-- silent (boolean) - if true, library is optional, silently return nil if its not found
-	--
-	-- throws an error if the library can not be found (except silent is set)
-	-- returns the library object if found
 	function LibStub:GetLibrary(major, silent)
 		if not self.libs[major] and not silent then
 			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
@@ -40,12 +25,6 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
 		return self.libs[major], self.minors[major]
 	end
 	
-	-- LibStub:IterateLibraries()
-	-- 
-	-- Returns an iterator for the currently registered libraries
-	function LibStub:IterateLibraries() 
-		return pairs(self.libs) 
-	end
-	
+	function LibStub:IterateLibraries() return pairs(self.libs) end
 	setmetatable(LibStub, { __call = LibStub.GetLibrary })
 end
diff --git a/Libs/changelog.txt b/Libs/changelog.txt
new file mode 100644
index 0000000..690299d
--- /dev/null
+++ b/Libs/changelog.txt
@@ -0,0 +1,446 @@
+Ace3 Release - Revision r1259 (May 17th, 2021)
+--------------------------------------------------
+- AceGUI-3.0: Dropdown: Fix double click sound on toggling the dropdown (Issue #575)
+- AceConfigDialog-3.0: Fix width number multiplier on multiselects (Issue #584)
+
+Ace3 Release - Revision r1252 (May 17th, 2021)
+--------------------------------------------------
+- AceConfigDialog-3.0: Increased the frame level of dialogs to allow other addons to draw below them.
+- AceConfigDialog-3.0: The validation/confirmation popup is now opaque and not click-through, to avoid accidentally activating options below it.
+- AceHook-3.0: Allow UnhookAll to be used without embedding (Fixes #558)
+
+Ace3 Release - Revision r1241 (October 13th, 2020)
+--------------------------------------------------
+- AceAddon-3.0: Suppress more Blizzard addon load events from activating Ace3 addons "too early", causing loading issues.
+- AceGUI-3.0: Updated for Backdrop changes in WoW 9.0
+- AceGUI-3.0: Re-structured widget releasing to avoid recursive release in some circumstances
+- AceGUI-3.0: Label: Anchors are being refreshed when the font is changed (Ticket #540)
+- AceGUI-3.0: Dropdown: Initialize the widget with an empty list so that AddItem can be used on a fresh dropdown (Ticket #542)
+
+Ace3 Release - Revision r1227 (August 12th, 2019)
+-------------------------------------------------
+- AceConfigDialog-3.0: Fixed an issue with a missing template on WoW Classic (Ticket #517)
+
+Ace3 Release - Revision r1224 (August 1st, 2019)
+------------------------------------------------
+- AceConfigDialog-3.0: Replace use of StaticPopup with a custom frame to minimize taint
+- AceGUI-3.0: Ensure the OnLeave callback on various widgets still fires when its being released while visible (Ticket #505)
+- AceGUI-3.0: Various fixes for anchoring problems in WoW 8.2 (Ticket #512, and other reports)
+
+Ace3 Release - Revision r1214 (June 26th, 2019)
+-----------------------------------------------
+- AceConfigDialog-3.0: Exposed "select" type sorting control through a new "sorting" config table member
+- AceConfigDialog-3.0: Clear existing anchors on the GameTooltip before re-anchoring it for 8.2 compatibility
+- AceConfigDialog-3.0: Improved options table sorting algorithm to produce a stable result in certain edge cases (Ticket #501)
+- AceConfigRegistry-3.0: Added missing custom controls entries for all types added in the last release (Ticket  #494)
+- AceGUI-3.0: ColorPicker: Removed usage of Show/HideUIPanel for WoW 8.2 compatibiliy
+- AceGUI-3.0: DropDown: Improved dropdown sorting algorithm to support tables with mixed string and numeric keys
+
+Ace3 Release - Revision r1200 (January 24th, 2019)
+--------------------------------------------------
+- Cleanup for WoW 8.0 improvements
+- AceGUI-3.0: Worked around various quirks in the WoW 8.0/8.1 API
+- AceGUI-3.0: ColorPicker: Store references to the background/checkers textures (Ticket #473)
+- AceConfigDialog-3.0: Allow custom controls for almost all option types (Ticket #475)
+
+Ace3 Release - Revision r1182 (July 17th, 2018)
+-----------------------------------------------
+- AceComm-3.0: Support numeric targets for custom channels (Ticket #419)
+- AceComm-3.0/ChatThrottleLib: Updated for WoW 8.0 API changes
+- AceConfig-3.0: Allow number values for the "width" parameter, which acts as a multiplier of the default width
+- AceConfigDialog-3.0: Enable iconCoords for the main level of a tree group (Ticket #417)
+- AceGUI-3.0: Implement a Table Layout (#442)
+- AceGUI-3.0: EditBox: Only try to handle dragging if a valid object is being dragged into the text box
+- AceGUI-3.0: Various fixes and work-arounds for WoW 8.0 changes
+
+Ace3 Release - Revision r1166 (August 29th, 2017)
+-------------------------------------------------
+- Updated any use of PlaySound to the new numeric constants (Fix for WoW 7.3)
+- AceConfigDialog-3.0: implement fallback validation feedback in a StaticPopup (Ticket #2)
+
+Ace3 Release - Revision r1158 (March 28th, 2017)
+------------------------------------------------
+- AceGUI-3.0: Fire OnShow events from Frame and Windows containers (Ticket #396)
+- AceGUI-3.0: Add SetJustifyV/H API to the Label/InteractiveLabel widgets (Ticket #397)
+
+Ace3 Release - Revision r1151 (July 18th, 2016)
+-----------------------------------------------
+- AceConfig-3.0: Allow specifying images using the numeric fileID (Ticket #389)
+- AceGUI-3.0: Use SetColorTexture in WoW 7.0
+- AceGUI-3.0: Expose the HighlightText API for EditBox and MultiLineEditBox Widgets (Ticket #378)
+- AceGUI-3.0: Keybinding: Support MouseWheel Up/Down bindings (Ticket #372)
+- AceGUI-3.0: TreeGroup: Refresh the tree in an OnUpdate once after Acquire, not only after creation (Fixes missing tree in WoW 7.0)
+- AceSerializer-3.0: Create consistent tokens for infinity, independent of the clients platform
+
+Ace3 Release - Revision r1134 (June 23rd, 2015)
+-----------------------------------------------
+- AceGUI-3.0: TreeGroup: Prevent Word Wrap in tree elements
+
+Ace3 Release - Revision r1128 (February 24th, 2015)
+---------------------------------------------------
+- AceGUI-3.0: Fixed an error in GameTooltip handling causing wrong formatting in some cases
+
+Ace3 Release - Revision r1122 (October 14th, 2014)
+--------------------------------------------------
+- AceDB-3.0: Now using the GetCurrentRegion() API to determine region-based profile keys (fix for WoW 6.0)
+- AceComm-3.0: Update ChatThrottleLib to v23
+- AceConfigDialog-3.0: Show a more meaningful title on Blizzard Options Groups (Ticket #353)
+- AceGUI-3.0: ColorPicker: Frame Level is automatically increased to ensure the color picker frame is above the option panel
+- AceGUI-3.0: DropDown: Properly disable all clickable areas when the dropdown is disabled (Ticket #360)
+- AceHook-3.0: Always use HookScript when hooking scripts in a secure fashion (Ticket #338)
+- AceTimer-3.0: New timer implementation based on C_Timer.After
+
+Ace3 Release - Revision r1109 (February 19th, 2014)
+---------------------------------------------------
+- AceComm-3.0: Ambiguate addon comm messages to restore behavior to be identical to pre-5.4.7
+- AceConfigRegistry-3.0: Added an option to skip options table validation on registering
+
+Ace3 Release - Revision r1104 (October 31st, 2013)
+--------------------------------------------------
+- AceGUI-3.0: Flow Layout: Added a safeguard to prevent an infinite loop in the layout engine
+- AceGUI-3.0: DropDown: Adjust its style slightly to closer resemble the Blizzard DropDown Widget
+- AceGUI-3.0: DropDown: API enhancements to specify the width of the pullout and be notified when its opened
+
+Ace3 Release - Revision r1098 (September 13th, 2013)
+----------------------------------------------------
+- AceDB-3.0: Switch characters to the default profile if their active profile is deleted (Ticket #324)
+- AceConfigDialog-3.0: Try to prevent static popup taint (Ticket #322)
+- AceGUI-3.0: Button: Add a new "Auto Width" option (Ticket #310)
+- AceGUI-3.0: DropDown: Make the entire DropDown widget clickable (Ticket #339)
+- AceGUI-3.0: EditBox: Allow dragging macros to the editbox (which will then contain the macros name) (Ticket #337)
+- AceGUI-3.0: Slider: Add a workaround for the broken slider steps in WoW 5.4 (Ticket #346)
+- AceGUI-3.0: TreeGroup: Fix an issue introduced by 5.4 broken scrollbars (Ticket #345)
+- AceHook-3.0: Allow hooking of AnimationGroup scripts (Ticket #314)
+
+Ace3 Release - Revision r1086 (May 21st, 2013)
+----------------------------------------------
+- AceAddon-3.0: Improved behavior when loading modules during game startup, ensures proper loading order
+
+Ace3 Release - Revision r1083 (March 4th, 2013)
+-----------------------------------------------
+- AceTimer-3.0: Fixed an issue that caused the parameter list passed to the callback to be cut off at nil values
+- AceGUI-3.0: InlineGroup: The title attribute is properly reset for recycled objects
+
+Ace3 Release - Revision r1078 (February 10th, 2013)
+---------------------------------------------------
+- AceTimer-3.0: Re-write based on AnimationTimers
+- AceHook-3.0: Improved checks/error messages when trying to hook a script on a "nil" frame
+- AceDBOptions-3.0: Added Italian locale
+- AceGUI-3.0: BlizOptionsGroup: Fixed the "default" button callback
+- AceGUI-3.0: Colorpicker: The colorpicker is now clamped to the screen
+
+Ace3 Release - Revision r1061 (August 27th, 2012)
+-------------------------------------------------
+- AceConfigDialog-3.0: Try to avoid potential taints in static popup dialogs
+- AceConfigDialog-3.0: Sort multiselects with "radio" style
+- AceGUI-3.0: Support for WoW 5.0
+- AceGUI-3.0: MultiLineEditBox: Support shift-click'ing items/spells/etc. into the editbox
+- AceGUI-3.0: Label: Fix text alignment (Ticket #301)
+- AceGUI-3.0: Checkbox: Description text on a disable checkbox should look disabled (Ticket #304)
+- AceGUI-3.0: Keybinding: Ensure the Keybinding popup is on the top level (Ticket #305)
+
+Ace3 Release - Revision r1041 (November 29th, 2011)
+---------------------------------------------------
+- AceDB-3.0: Added locale and factionrealmregion profile keys
+- AceSerializer-3.0: Removed support for NaN, as WoW 4.3 does no longer allow it.
+- AceGUI-3.0: Frame: Add :EnableResize (Ticket #214)
+
+Ace3 Release - Revision r1032 (June 29th, 2011)
+-----------------------------------------------
+- AceTab-3.0: Improvements to Match handling (Ticket #255 and #256)
+- AceGUI-3.0: DropDown layout fix with hidden labels (Ticket #234)
+
+Ace3 Release - Revision r1025 (April 27th, 2011)
+------------------------------------------------
+- AceComm-3.0: Updated for 4.1 changes - now handles RegisterAddonMessagePrefix internally for you.
+- AceGUI-3.0: TabGroup: Fixed width of tabs in 4.1(Ticket #243)
+
+Ace3 Release - Revision r1009 (February 9th, 2011)
+--------------------------------------------------
+- AceLocale-3.0: Fix erronous assumption that the default locale is always the first to be registered for the :NewLocale() "silent" flag. The flag must now be set on the FIRST locale to be registered.
+- AceLocale-3.0: The :NewLocale() "silent" flag may now be set to the string "raw", meaning nils are returned for unknown translations.
+- AceGUI-3.0: Fix the disabled state of Icon widgets
+- AceGUI-3.0: The header of the Frame widget now dynamically changes size to fit the text (Ticket #171)
+- AceGUI-3.0: Its now possible to define a custom order the elements in a dropdown widget
+- AceGUI-3.0: Improved widget focus behaviour across the board (Ticket #192, #193)
+- AceGUI-3.0: Fixed a bug that made it impossible to block the tree widget from being user resizable (Ticket #163)
+- AceGUI-3.0: Fixed a bug that caused TreeGroups to become unresponsive under certain conditions (Ticket #189, #202)
+- AceGUI-3.0: Enhanced the DropDown widget to allow it to be reused more easily.
+- AceConfigDialog-3.0: Select Groups now have the proper order in the dropdown (Ticket #184)
+- AceConfigDialog-3.0: Implemented "radio" style select boxes (Ticket #149)
+
+Ace3 Release - Revision r981 (October 27th, 2010)
+-------------------------------------------------
+- AceAddon-3.0: Fixed a library upgrading issue
+- AceAddon-3.0: Modules are now enabled in loading order
+- AceGUI-3.0: Keybinding: The widget will no longer steal keybindings even when inactive (Ticket #169)
+- AceGUI-3.0: EditBox: Fixed spell drag'n'drop
+
+
+Ace3 Release - Revision r971 (October 12th, 2010)
+-------------------------------------------------
+- Small fixes and adjustments for the 4.0 Content Patch.
+- AceGUI-3.0: ScrollFrame: Allow for a small margin of error when determining if the scroll bar should be shown.
+- AceGUI-3.0: Added new widget APIs: GetText for EditBox and DisableButton for MultiLineEditBox
+
+Ace3 Release - Revision r960 (July 20th, 2010)
+----------------------------------------------
+- AceGUI-3.0: Label: Reset Image Size and TexCoords on Acquire (Ticket #110)
+- AceGUI-3.0: CheckBox: Re-apply the disabled state after setting a value, so the visuals are correct in either case. (Ticket #107)
+- AceGUI-3.0: Icon: Fix the vertical size. It'll now properly scale with the image size, and not be fixed to about 110px. (Ticket #104)
+- AceGUI-3.0: External Containers (Frame, Window) should always start in a visible state. (Ticket #121)
+- AceGUI-3.0: Added Blizzard sounds to widgets (Ticket #120)
+- AceGUI-3.0: CheckBox: check for self.desc:GetText() being nil as well as "" to prevent setting the wrong height on the checkbox causing bouncing checkboxes.
+- AceGUI-3.0: Rewrite of the MultiLineEditBox (Ticket #68)
+- AceGUI-3.0: CheckBox: Fix alignment of the text in OnMouseDown when an image is set. (Ticket #142)
+- AceGUI-3.0: Add SetMaxLetters APIs to EB and MLEB (Ticket #135)
+- AceGUI-3.0: Frame: Add events for OnEnter/OnLeave of the statusbar (Ticket #139)
+- AceGUI-3.0: Major cleanups and refactoring in nearly all widgets and containers.
+- AceConfigDialog-3.0: Always obey the min/max values on range-type widgets (Ticket #114)
+- AceConfigDialog-3.0: Pass iconCoords set on groups in the options table to the tree widget (Ticket #111)
+- AceConfigDialog-3.0: Implement "softMin" and "softMax", allowing for a UI-specific minimum/maximum for range controls, while allowing manual input of values in the old min/max range. (Ticket #123)
+- AceConfigDialog-3.0: Don't close frames in CloseAll that are being opened after the CloseAll event was dispatched. (Ticket #132).
+- AceSerializer-3.0: Fix encoding & decoding of \030. (Ticket #115)
+- AceDB-3.0: Remove empty sections on logout, keeping the SV clean of more useless informations.
+- AceDBOptions-3.0.lua: Fix a string typo (Ticket #141)
+
+Ace3 Release - Revision r907 (December 16th, 2009)
+---------------------------------------------------
+- AceGUI-3.0: Frame: Properly save the width in the status table.
+- AceConfigCmd-3.0: Properly handle help output of inline groups with a different handler. (Ticket #101)
+- AceConfigDialog-3.0: Don't bail out and error when a dialogControl was invalid, instead show the error and fallback to the default control for that type.
+- AceConfigDialog-3.0: Fix a hickup with the OnUpdate script not getting upgraded properly in some situations.
+
+Ace3 Release - Revision r900 (December 8th, 2009)
+--------------------------------------------------
+- AceGUI-3.0: Alot of visual fixes regarding margins and general widget styles.
+- AceGUI-3.0: Ability to accept links for EditBox Widget (Ticket #21)
+- AceGUI-3.0: ScrollFrame: Hide the scrollbar when there is no overflowing content, and allow the Layout functions to use that space for widgets.
+- AceGUI-3.0: DropDown: Added a GetValue() API to the Widget (Ticket #69)
+- AceGUI-3.0: Button: Pass the arguments of the OnClick handler to the OnClick callback (Ticket #57)
+- AceGUI-3.0: add a Window container, basically a plain window with close button
+- AceGUI-3.0: Add support for inline descriptions to the checkbox widget.
+- AceGUI-3.0: Added an API to the Window container to disable the user-resizing of the same. (Ticket #80)
+- AceGUI-3.0: TreeGroup: Allow iconCoords to be passed for the tree elements. (Ticket #59)
+- AceGUI-3.0: Slider: Add a more visible backdrop/border around the manual input area (Ticket #98, #46)
+- AceGUI-3.0: Allow displaying a image in front of the checkbox label. (Ticket #82)
+- AceConfig-3.0: Added an experimental "descStyle" member to all option table nodes that allows you to control the way the description is presented.
+                 Supported values are "tooltip" for the old behaviour, and "inline" for a inline display of the description, pending support in AceGUI-3.0 widgets.
+- AceConfigCmd-3.0: Properly parse functions and methods supplied for the "hidden" option table member. (Ticket #96)
+- AceConfigDialog-3.0: Fix the unpacking of the basepath arguments when internally calling :Open (Ticket #90)
+- AceConfigDialog-3.0: Properly refresh BlizOptions Windows which are registered with a path on NotifyChange. (Ticket #93)
+- AceConfigDialog-3.0: Allow image/imageCoords on toogle elements (Note that the width/height of the image on the toggle cannot be changed) (Ticket #82)
+- AceConfigDialog-3.0: Pass the groups "name" tag to DropDownGroups as the title. (Ticket #79)
+- AceDB-3.0: Remove the metatable from the DB before removing defaults, so we don't accidentally invoke it in the process. (Ticket #66)
+- AceDB-3.0: Don't save the profileKeys for namespaces, since we use the profile of the parent DB anyway. This will cut down on SV complexity when using alot of namespaces.
+- AceDB-3.0: Don't fire the OnProfileReset callback when copying a profile.
+- AceDBOptions-3.0: Show the current profile on the dialog. (Ticket #56)
+- AceComm-3.0: Add callbacks for message chunks going out the wire (via CTL). Useful for displaying progress for very large messages.
+- AceConsole-3.0: Add :Printf() so you don't have to do Print(format())
+
+Ace3 Beta - Revision 820 (August 7th, 2009)
+--------------------------------------------
+- AceComm-3.0: Updated ChatThrottleLib to v21
+- AceGUI-3.0: Fixed a glitch in the TabGroup code that caused tabs to be unresponsive under rare conditions. (Ticket #38)
+- AceGUI-3.0: Consistent "disabled" behaviour of all widgets. (Ticket #47)
+- AceGUI-3.0: Changed the way widgets are handled on release to avoid a crash in the game client. (Ticket #49)
+- AceGUI-3.0: Fixed a glitch in the button graphics. (Ticket #58)
+- AceGUI-3.0: Localized the "Close" Text on the Frame widget.
+
+Ace3 Beta - Revision 803 (April 14th, 2009)
+--------------------------------------------
+- AceConfig-3.0: Allow spaces in the keys of config tables. Spaces will be changed on the fly to underscores in AceConfigCmd-3.0 - there is no collision check in place, yet.
+- AceConfig-3.0: Support a "fontSize" attribute to the description type. Possible values are "small" (default), "medium" and "large".
+- AceConfigDialog-3.0: Fixed an error that would occur when calling InterfaceOptionsFrame_OpenToCategory from within an event handler in a Blizzard Options integrated frame. (Ticket #33)
+- AceConfigDialog-3.0: The "execute" type does now recognize the "image" attributes, and will display a clickable icon instead of the button when an image is supplied. (Ticket #35)
+- AceConfigDialog-3.0: Pass icons defined in the option table to the TreeGroup widget (Ticket #20)
+- AceConfigDialog-3.0: Fixed a bug that caused an empty group widget to be drawn if all groups were hidden.
+- AceConfigCmd-3.0: Improved the behaviour of select and multiselect elements. (Ticket #26)
+- AceDB-3.0: Add a GetNamespace function to the DB Objects which returns an existing namespace from the DB object.
+- AceGUI-3.0 Slider Widget: Properly show percentage values as min/max if isPercent is true. (Ticket #32)
+- AceGUI-3.0: Fixed an error in the TreeGroup Widget that caused execution to stop if no name was provided.
+- AceGUI-3.0: Fixed the behaviour of the MultiLineEditbox Widget (Accept button not clickable). (Ticket #28)
+- AceGUI-3.0: TabGroup: Set a maximum width for tabs based on the size of the widget. (Ticket #34)
+- AceGUI-3.0: Added a new InteractiveLabel with OnEnter/OnLeave/OnClick callbacks and a highlight texture
+- AceGUI-3.0: Add SetFont and SetFontObject functions to the Label widget (and the new InteractiveLabel)
+- AceGUI-3.0: Support icons in the TreeGroup display. (Ticket #20)
+- AceGUI-3.0: Added a new :SetRelativeWidth Widget-API that allows you to set the width of widgets relative to their container.
+- AceGUI-3.0: Alot of fixes, tweaks and consistency changes.
+
+Ace3 Beta - Revision 741 (Feb 15th, 2009)
+--------------------------------------------
+- AceDBOptions-3.0: Disable the "Copy From" and "Delete" dropdowns if there are no profiles to choose from. (Ticket #19)
+- AceGUI-3.0: Improve TabGroup visual style - only stretch them to the full width if they would use more then 75% of the exisiting space.
+- AceGUI-3.0: Added a third optional argument to <container>:AddChild() to specify the position for the new widget. (Ticket #22)
+- AceConfigCmd-3.0: Improve help output when viewing groups.
+- AceConfigDialog-3.0: Refresh the Options Panel after a confirmation is canceled to reset the value to its previous value. (Ticket #23)
+- AceDB-3.0: Fix a data inconsistency when using false as a table key. (Ticket #25)
+
+Ace3 Beta - Revision 722 (Jan 4th, 2009)
+--------------------------------------------
+- AceHook-3.0: Fix :SecureHookScript to not fail on previously empty scripts since frame:HookScript does nothing at all in that case. (Ticket #16)
+- AceLocale-3.0: Implement 'silent' option for :NewLocale to disable the warnings on unknown entrys (Ticket #18)
+- AceTimer-3.0: Implement :TimeLeft(handle) function (Ticket #10)
+- AceGUI-3.0: Fix TabGroup tab resizing to be consistent
+- AceGUI-3.0: Fixed EditBox alignment when the label is disabled (Ticket #13)
+- AceDB-3.0: Implement OnProfileShutdown callback (Ticket #7)
+- AceDBOptions-3.0: Updated esES and ruRU locale
+
+Ace3 Beta - Revision 706 (Oct 18th, 2008)
+--------------------------------------------
+- First Beta release after WoWAce move
+- Removed WoW 2.4.x compat layer
+- AceGUI-3.0: Fix disabling of the Multiline Editbox
+- AceGUI-3.0: Improvements to the Keybinding Widget
+
+Ace3 Beta - Revision 81437 (Sept 6th, 2008)
+--------------------------------------------
+- AceConfigDialog-3.0: the confirm callback will now receive the new value that is being set (same signature as the validate callback)
+- AceConfigDialog-3.0: :Close and :CloseAll are now safe to call from within callbacks.
+- AceGUI-3.0: Added new methods to the widget base table, see ACE-205 for full reference
+- AceGUI-3.0: Various fixes to Widgets and recycling process
+- Now compatible with WoW 3.0 (compat layer is to be removed upon 3.0 release)
+
+
+Ace3 Beta - Revision 76325 (June 9th, 2008)
+--------------------------------------------
+- AceGUI-3.0: Finish Multiselect support for the Dropdown widget (nargiddley)
+- AceGUI-3.0: Re-write TabGroup layouting (nargiddley)
+- AceGUI-3.0: TreeGroup: Add :EnableButtonTooltips(enable) to make the default tooltips on the tree optional, enabled by default. (nargiddley)
+- AceGUI-3.0: TabGroup: Add OnTabEnter and OnTabLeave Callbacks  (nargiddley)
+- AceConfigDialog-3.0: Add :SelectGroup(appName, ...) - Selects the group given by the path specified then refreshes open windows. (nargiddley)
+- AceConfigDialog-3.0: :Open now accepts an optional path, when given will open the window with only the given group and its children visible (nargiddley)
+- AceConfigDialog-3.0: :AddToBlizOptions now accepts an optional path, this will add the config page to display the specified group and its children only. (nargiddley)
+- AceConfigDialog-3.0: ACE-189: allow multiselect to be shown as a dropdown by setting dialogControl = "Dropdown" (nargiddley)
+- AceConfigDialog-3.0: Add Custom tooltips to the TreeGroup and TabGroup, shows both name and desc for the group. (nargiddley)
+- AceConfigCmd-3.0: ACE-195: Remove unneeded references to .confirm, will no longer error when .confirm is a boolean (nargiddley)
+- AceAddon-3.0: Allow for an optional first argument to NewAddon to be a table to be used as the base for the addon. (ammo)
+
+Ace3 Beta - Revision 74633 (May 19th, 2008)
+--------------------------------------------
+- AceTimer-3.0: ACE-173: don't error on nil handle for CancelTimer(), just bail out early. (ammo)
+- AceGUI-3.0: ACE-161, ACE-180, ACE-181: New and improved DropDown widget (originally coded by Borlox) (nargiddley,nevcairiel)
+- AceGUI-3.0: AceGUI will call OnWidthSet and OnHeightSet as frames resize (nargiddley)
+- AceGUI-3.0: TabGroup: Use OptionsFrameTabButtonTemplate for tabs (nargiddley)
+- AceGUI-3.0: TabGroup: Tabs now span multiple lines when there are too many to fit in the width of the frame (nargiddley)
+- AceGUI-3.0: TreeGroup: Tree is now sizable by dragging, orig patch by yssaril (nargiddley)
+- AceGUI-3.0: Flow layout will now reduce widgets width to fit rather than leaving them sticking out the side of container widgets (nargiddley)
+- AceGUI-3.0: Dropdowns will no longer be left open in the background when the frame is clicked or other widgets are activated (nargiddley)
+- AceGUI-3.0: ACE-159: Rename Release to OnRelease and Acquire to OnAcquire for widgets. (nargiddley)
+- AceGUI-3.0: ACE-171: add IsVisible and IsShown methods to the widget metatable (nargiddley)
+- AceGUI-3.0: ACE-164: add tooltips to tree to show full text of childs that got clipped (ammo)
+- AceGUI-3.0: ACE-174: make buttons in AceGUI-3.0 locale independant (ammo)
+- AceGUI-3.0: ACE-166: fix treegroup visual bug (ammo)
+- AceGUI-3.0: ACE-184: make numeric entry for slider more intuitive (ammo)
+- AceConfigCmd-3.0: ACE-172 - ignore description in cmd (ammo)
+- AceConsole-3.0:  nolonger check for existance of slashcommands, overwrite where needed. Last one wins, this enables AddonLoader to X-LoadOn-Slash and override the slashcommand from AddonLoader slashcommand with an Ace3 one. (Ammo)
+
+Ace3 Beta - Revision 69509 (April 13th, 2008)
+---------------------------------------------
+- AceComm-3.0: turn off error messages when receiving invalid multi-part messages (its happening on login etc) (nevcairiel)
+- AceDBOptions-3.0: shorten info text at top to prevent scrollbars. (nevcairiel)
+- AceHook-3.0: ACE-162: fix unhooking of objects that were not actually hooked (nevcairiel)
+- AceDB-3.0: fire the DB callbacks after the namespaces changed their profile as well (nevcairiel)
+- AceDB-3.0: namespaces can now be individually reset using :ResetProfile() on the namespace directly (nevcairiel)
+- AceDB-3.0: added a optional argument to :ResetProfile to not populate the reset to all namespaces (so the main profile can reset individually without reseting all namespaces too)  (nevcairiel)
+
+Ace3 Beta - Revision 66329 (March 27th, 2008)
+---------------------------------------------
+- Overall 2.4 clean ups - removing 2.4 checks and work arounds (nevcairiel)
+- AceBucket-3.0: clear the timer reference when unregistering a bucket to prevent a error when unregistering a bucket that was never fired (nevcairiel)
+- AceAddon-3.0: Bugfix when enabling/disabling modules from the parents OnEnable after disabling / enabling the parent addon. (ammo)
+- AceGUI-3.0: Don't parent the BlizOptionsGroup widget to UIParent and Hide it by default. Fixes stray controls on the screen. (nargiddley)
+- AceConfigDialog-3.0: Config windows without a default size won't incorrectly get a default size from a previously open window. (nargiddley)
+- AceDBOptions-3.0: added zhCN and zhTW locale (nevcairiel)
+
+Ace3 Beta - Revision 65665 (March 25th, 2008)
+---------------------------------------------
+- AceGUI-3.0: ACE-139: Changed all Widgets to resemble the Blizzard 2.4 Options Style (nevcairiel)
+- AceGUI-3.0: Fixed "List"-Layout not reporting new width to "fill"-mode widgets (mikk)
+- AceGUI-3.0: added :SetColor to the Label widget (nevcairiel)
+- AceGUI-3.0: ACE-132: ColorPicker: added checkers texture for better alpha channel display, and fixed "white"-texture bug (nevcairiel,nargiddley,ammo)
+- AceConfig-3.0: ACE-113: Added uiName, uiType, handler, option, type to the info table (nevcairiel,nargiddley)
+- AceConfigDialog-3.0: ACE-139: Adjusted for 2.4 options panels (nevcairiel)
+- AceConfigDialog-3.0: Use "width" parameter for the description widget (if present) (nevcairiel)
+- AceConfigDialog-3.0: ACE-135: Add support for specifying a rowcount for multiline editboxes (nargiddley)
+- AceConfigDialog-3.0: :AddToBlizOptions will return the frame registered so you can use it in InterfaceOptionsFrame_OpenToFrame (nevcairiel)
+- AceConfigCmd-3.0: handle "hidden" in help-output (nevcairiel)
+- AceHook-3.0: fix unhooking of secure hooks (nevcairiel)
+- AceDBOptions-3.0: add optional argument to GetOptionsTable(db[, noDefaultProfiles]) - if set to true will not show the default profiles in the profile selection (nevcairiel)
+- AceDBOptions-3.0: added koKR locale (nevcairiel)
+- Ace3 Standalone: Removed the "Ace3" Category from the 2.4 options panel (nevcairiel)
+
+Ace3 Beta - Revision 64176 (March 10th, 2008)
+---------------------------------------------
+- AceGUI-3.0: Improve Alpha handling for the ColorPicker widget, ColorPicker widget closes the ColorPickerFrame before opening to prevent values getting carried over (nargiddley)
+- AceGUI-3.0: The Slider widget will only react to the mousewheel after it has been clicked (anywhere including the label) to prevent accidental changes to the value when trying to scroll the container it is in (nargiddley)
+- AceGUI-3.0: The TreeGroup widget is scrollable with the mousewheel (nargiddley)
+- AceGUI-3.0: ACE-154: Fix frame levels in more cases to prevent widgets ending up behind their containers (nargiddley)
+- AceConfigDialog: Color picker obeys hasAlpha on the color type (nargiddley)
+- AceConfigDialog-3.0: ACE-155: Make sure that the selected group is type='group' when checking if it exists (nargiddley)
+- AceDBOptions-3.0: added frFR locale (nevcairiel)
+
+Ace3 Beta - Revision 63886 (March 8th, 2008)
+---------------------------------------------
+- AceDBOptions-3.0: new library to provide a Ace3Options table to control the AceDB-3.0 profiles (nevcairiel)
+- AceDB-3.0: add "silent" option to DeleteProfile and CopyProfile when we deal with namespaces (nevcairiel)
+- AceDB-3.0: implement library upgrade path (nevcairiel)
+- AceDB-3.0: ACE-146: fix problem with non-table values overruling ['*']-type defaults (nevcairiel)
+- AceConsole-3.0: treat |T|t texture links similar to |H|h|h links. (ammo)
+- AceGUI-3.0: Use Blizzard Templates for the EditBox and DropDown widget (nevcairiel)
+- AceBucket-3.0: ACE-150: callback is now optional, if not supplied will use the eventname as method name (only possible if one event is supplied, and not a event table) (nevcairiel)
+- tests: adjust tests for AceGUI and AceConsole changes (nevcairiel)
+
+Ace3 Beta - Revision 63220 (Feb 29th, 2008)
+---------------------------------------------
+- AceTimer-3.0: CancelAllTimers() now cancels silent (elkano)
+- AceConfigDialog: Add :SetDefaultSize(appName, width, height), sets the size the dialog will open to. Does not effect already open windows.  (nargiddley)
+- AceConfigDialog: Fix typo in type check for range values (nargiddley)
+- AceGUI: ColorPicker widget will correctly fire OnValueChanged for the cancel event of the colorpicker popup.  Reset ColorPicker's color on Acquire.  (nargiddley)
+- AceGUI: Fix Spelling of Aquire -> Acquire for widgets, all custom widgets will need to be updated.  A warning will be printed for widgets not upgraded yet.  (nargiddley)
+- AceConfigCmd-3.0: add simple coloring to slashcommand output. (ammo)
+- AceConsole-3.0: add some color to :Print (ammo)
+- AceAddon-3.0: set error level on library embedding to point to the :NewAddon call (nevcairiel)
+
+Ace3 Beta - Revision 62182 (Feb 20th, 2008)
+---------------------------------------------
+- Ace3 StandAlone: Add a page to the Blizzard 2.4 Interface Options with icons to open dialogs for configs registered when installed standalone (nargiddley)
+- AceConfigDialog: type = 'description' now uses the fields image and imageCoords instead of icon and iconCoords, add imageWidth and imageHeight (nargiddley)
+- AceConfigDialog: Add :AddToBlizzardOptions(appName, name), this will add the specified config to the Blizzard Options pane new in 2.4.  This will only be available if running on the 2.4 PTR (nargiddley)
+- AceDB: fix GetProfiles() when setting the same profile twice (nevcairiel)
+- AceDB: bail out of :SetProfile early when trying to set to the same profile (nevcairiel)
+- AceDB: add nil checks to metatable handling (nevcairiel)
+- AceDB: clear tables that are empty after defaults removal (nevcairiel)
+- AceGUI: Fix a couple of layout bugs causing the width of groups to be wrong (nargiddley)
+- AceGUI: Add Icon widget (nargiddley)
+- AceGUI: Allow room for the border in the BlizOptionsGroup widget (nargiddley)
+- AceGUI: Button and Keybinding use UIPanelButtonTemplate2 (nargiddley)
+- AceConsole-3.0: Fix bug where no table for [self] was created when registering weak commands (ammo)
+- AceTimer-3.0: add missing :OnEmbedDisable (ammo)
+- AceAddon-3.0: added :GetName() that will always return the "real" name of a addon or module object without any prefixes (nevcairiel)
+
+Ace3 Beta - Revision 60697 (Feb 9th, 2008)
+---------------------------------------------
+- CallbackHandler-1.0: remove unnecessary table creation if a event is fired thats not registered (nevcairiel)
+- AceAddon-3.0: fixed a bug with recursive addon loading (nevcairiel)
+- AceGUI: Update TabGroup's tablist format, tabs are selected by value not index (nargiddley)
+- AceGUI: Add MultiLineEditBox widget (nargiddley, originally by bam)
+- AceGUI: Small fix to the flow layout preventing controls overlapping in some cases (nargiddley)
+- AceConfigDialog: Implement control and dialogControl for types 'input' and 'select' (nargiddley)
+- AceConfigDialog: Add support for multiline = true on type = 'input' (nargiddley)
+- AceConfigDialog: Fix an error when all groups are hidden in a group with childGroups = 'select' (nargiddley)
+- AceConfigDialog: type = 'description' will now show .icon as an image with its text (nargiddley)
+- AceConfigDialog: multiline inputs are no longer forced to width = "full" (nargiddley)
+- AceConfigDialog: bug fix when loading without AceConsole present (nevcairiel)
+
+Ace3 Beta - Revision 60545 (Feb 7th, 2008)
+---------------------------------------------
+- AceGUI: SetToplevel(true) for the Frame widget, multiple open windows should play nice together now (nargiddley)
+- AceGUI: Move Frames to the FULLSCREEN_DIALOG strata (nargiddley)
+- AceGUI: Dropdown, Editbox and Keybinding labels grey out when disabled (nargiddley)
+- AceGUI: Add OnClick callback to the TreeGroup widget (nargiddley)
+- AceConfigDialog: Confirm popups will be above the config window (nargiddley)
+
+Ace3 Beta - Revision 60163 (Feb 3rd, 2008)
+---------------------------------------------
+- Initial Beta release
diff --git a/WorldBossStatus.toc b/WorldBossStatus.toc
index 617e765..6df5799 100755
--- a/WorldBossStatus.toc
+++ b/WorldBossStatus.toc
@@ -1,4 +1,4 @@
-## Interface: 90005
+## Interface: 90200
 ## Title: World Boss Status
 ## Version: @project-version@
 ## Author: Ludius of Caelestrasz-US
diff --git a/embeds.xml b/embeds.xml
index 5efd888..c101530 100755
--- a/embeds.xml
+++ b/embeds.xml
@@ -6,11 +6,11 @@
   <Script file="Libs\LibStub\LibStub.lua"/>
   <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
   <Include file="Libs\AceComm-3.0\AceComm-3.0.xml"/>
+  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
   <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
   <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
   <Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
   <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml"/>
-  <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
   <Include file="libs\AceLocale-3.0\AceLocale-3.0.xml" />
   <Include file="Libs\AceSerializer-3.0\AceSerializer-3.0.xml"/>
   <Include file="Libs\AceTimer-3.0\AceTimer-3.0.xml"/>