From 99536d7b04733ab140dbfdff97b328b0554d9336 Mon Sep 17 00:00:00 2001
From: pschifferer <dm@critical-failure.org>
Date: Thu, 22 Jan 2009 15:53:05 +0000
Subject: [PATCH] Removed Libs directory, since it gets packaged automatically
 on CurseForge.

---
 Cauldron/CauldronMain.lua                          |    2 +-
 Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.lua        |  448 -----
 Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.xml        |    4 -
 Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.lua      |   43 -
 Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.xml      |    8 -
 .../AceConfigCmd-3.0/AceConfigCmd-3.0.lua          |  729 --------
 .../AceConfigCmd-3.0/AceConfigCmd-3.0.xml          |    4 -
 .../AceConfigDialog-3.0/AceConfigDialog-3.0.lua    | 1755 --------------------
 .../AceConfigDialog-3.0/AceConfigDialog-3.0.xml    |    4 -
 .../AceConfigRegistry-3.0.lua                      |  352 ----
 .../AceConfigRegistry-3.0.xml                      |    4 -
 Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.lua    |  221 ---
 Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.xml    |    4 -
 Cauldron/Libs/AceDB-3.0/AceDB-3.0.lua              |  626 -------
 Cauldron/Libs/AceDB-3.0/AceDB-3.0.xml              |    4 -
 Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.lua        |   76 -
 Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.xml        |    4 -
 Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.lua            |  703 --------
 Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.xml            |   24 -
 .../widgets/AceGUIWidget-BlizOptionsGroup.lua      |  150 --
 .../AceGUI-3.0/widgets/AceGUIWidget-Button.lua     |   81 -
 .../AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua   |  217 ---
 .../widgets/AceGUIWidget-ColorPicker.lua           |  170 --
 .../widgets/AceGUIWidget-DropDown-Items.lua        |  453 -----
 .../AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua   |  684 --------
 .../widgets/AceGUIWidget-DropDownGroup.lua         |  157 --
 .../AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua    |  204 ---
 .../Libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua |  299 ----
 .../AceGUI-3.0/widgets/AceGUIWidget-Heading.lua    |   71 -
 .../Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua  |   99 --
 .../widgets/AceGUIWidget-InlineGroup.lua           |  135 --
 .../AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua |  217 ---
 .../Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua |  132 --
 .../widgets/AceGUIWidget-MultiLineEditBox.lua      |  307 ----
 .../widgets/AceGUIWidget-ScrollFrame.lua           |  225 ---
 .../widgets/AceGUIWidget-SimpleGroup.lua           |   96 --
 .../AceGUI-3.0/widgets/AceGUIWidget-Slider.lua     |  240 ---
 .../AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua   |  338 ----
 .../AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua  |  696 --------
 Cauldron/Libs/AceHook-3.0/AceHook-3.0.lua          |  372 -----
 Cauldron/Libs/AceHook-3.0/AceHook-3.0.xml          |    4 -
 Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.lua      |  103 --
 Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.xml      |    4 -
 Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.lua        |  414 -----
 Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.xml        |    4 -
 .../CallbackHandler-1.0/CallbackHandler-1.0.lua    |  239 ---
 .../CallbackHandler-1.0/CallbackHandler-1.0.xml    |    4 -
 .../Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua   |   90 -
 Cauldron/Libs/LibDataBroker-1.1/README.textile     |   13 -
 Cauldron/Libs/LibLogger-1.0/LibLogger-1.0.lua      |  143 --
 Cauldron/Libs/LibLogger-1.0/lib.xml                |    9 -
 Cauldron/Libs/LibStub/LibStub.lua                  |   30 -
 Cauldron/Libs/LibStub/LibStub.toc                  |    9 -
 53 files changed, 1 insertion(+), 11423 deletions(-)
 delete mode 100644 Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.lua
 delete mode 100644 Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.xml
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.lua
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.xml
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
 delete mode 100644 Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
 delete mode 100644 Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.lua
 delete mode 100644 Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.xml
 delete mode 100644 Cauldron/Libs/AceDB-3.0/AceDB-3.0.lua
 delete mode 100644 Cauldron/Libs/AceDB-3.0/AceDB-3.0.xml
 delete mode 100644 Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.lua
 delete mode 100644 Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.xml
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.xml
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua
 delete mode 100644 Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua
 delete mode 100644 Cauldron/Libs/AceHook-3.0/AceHook-3.0.lua
 delete mode 100644 Cauldron/Libs/AceHook-3.0/AceHook-3.0.xml
 delete mode 100644 Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.lua
 delete mode 100644 Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.xml
 delete mode 100644 Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.lua
 delete mode 100644 Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.xml
 delete mode 100644 Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
 delete mode 100644 Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
 delete mode 100644 Cauldron/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua
 delete mode 100644 Cauldron/Libs/LibDataBroker-1.1/README.textile
 delete mode 100644 Cauldron/Libs/LibLogger-1.0/LibLogger-1.0.lua
 delete mode 100644 Cauldron/Libs/LibLogger-1.0/lib.xml
 delete mode 100644 Cauldron/Libs/LibStub/LibStub.lua
 delete mode 100644 Cauldron/Libs/LibStub/LibStub.toc

diff --git a/Cauldron/CauldronMain.lua b/Cauldron/CauldronMain.lua
index cd6cc6e..e44255e 100644
--- a/Cauldron/CauldronMain.lua
+++ b/Cauldron/CauldronMain.lua
@@ -4,7 +4,7 @@
 Cauldron = LibStub("AceAddon-3.0"):NewAddon("Cauldron", "AceEvent-3.0", "AceTimer-3.0", "AceConsole-3.0", "AceHook-3.0", "LibLogger-1.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("Cauldron")
 
-Cauldron.version = "0.9.4." .. string.sub("$Revision$", 12, -3);
+Cauldron.version = "0.9.5." .. string.sub("$Revision$", 12, -3);
 Cauldron.date = string.sub("$Date$", 8, 17);
 
 -- key binding names
diff --git a/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.lua b/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.lua
deleted file mode 100644
index 4df67a9..0000000
--- a/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.lua
+++ /dev/null
@@ -1,448 +0,0 @@
---[[ $Id: AceAddon-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
-local MAJOR, MINOR = "AceAddon-3.0", 5
-local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceAddon then return end -- No Upgrade needed.
-
-AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame
-AceAddon.addons = AceAddon.addons or {} -- addons in general
-AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon.
-AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized
-AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled
-AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon
-
-local tinsert, tconcat = table.insert, table.concat
-local fmt = string.format
-local pairs, next, type = pairs, next, type
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-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, ...)
-	end
-end
-
--- local functions that will be implemented further down
-local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype
-
--- used in the addon metatable
-local function addontostring( self ) return self.name end 
-
--- AceAddon:NewAddon( [object, ]name, [lib, lib, lib, ...] ) 
--- [object] (table) - table to use as the base for the addon
--- name (string) - unique addon object name
--- [lib] (string) - optional libs to embed in the addon object
---
--- returns the addon object when succesful
-function AceAddon:NewAddon(objectorname, ...)
-	local object,name
-	local i=1
-	if type(objectorname)=="table" then
-		object=objectorname
-		name=...
-		i=2
-	else
-		name=objectorname
-	end
-	if type(name)~="string" then
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2)
-	end
-	if self.addons[name] then 
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2)
-	end
-	
-	object = object or {}
-	object.name = name
-
-	local addonmeta = {}
-	local oldmeta = getmetatable(object)
-	if oldmeta then
-		for k, v in pairs(oldmeta) do addonmeta[k] = v end
-	end
-	addonmeta.__tostring = addontostring
-	
-	setmetatable( object, addonmeta )
-	self.addons[name] = object
-	object.modules = {}
-	object.defaultModuleLibraries = {}
-	Embed( object ) -- embed NewModule, GetModule methods
-	self:EmbedLibraries(object, select(i,...))
-	
-	-- add to queue of addons to be initialized upon ADDON_LOADED
-	tinsert(self.initializequeue, object)
-	return object
-end
-
-
--- AceAddon:GetAddon( name, [silent])
--- name (string) - unique addon object name
--- silent (boolean) - if true, addon is optional, silently return nil if its not found
---
--- throws an error if the addon object can not be found (except silent is set)
--- returns the addon object if found
-function AceAddon:GetAddon(name, silent)
-	if not silent and not self.addons[name] then
-		error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2)
-	end
-	return self.addons[name]
-end
-
--- AceAddon:EmbedLibraries( addon, [lib, lib, lib, ...] )
--- addon (object) - addon to embed the libs in
--- [lib] (string) - optional libs to embed
-function AceAddon:EmbedLibraries(addon, ...)
-	for i=1,select("#", ... ) do
-		local libname = select(i, ...)
-		self:EmbedLibrary(addon, libname, false, 4)
-	end
-end
-
--- AceAddon:EmbedLibrary( addon, libname, silent, offset )
--- addon (object) - addon to embed the libs in
--- libname (string) - lib to embed
--- [silent] (boolean) - optional, marks an embed to fail silently if the library doesn't exist.
--- [offset] (number) - will push the error messages back to said offset defaults to 2
-function AceAddon:EmbedLibrary(addon, libname, silent, offset)
-	local lib = LibStub:GetLibrary(libname, true)
-	if not lib and not silent then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2)
-	elseif lib and type(lib.Embed) == "function" then
-		lib:Embed(addon)
-		tinsert(self.embeds[addon], libname)
-		return true
-	elseif lib then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2)
-	end
-end
-
--- addon:GetModule( name, [silent])
--- name (string) - unique module object name
--- silent (boolean) - if true, module is optional, silently return nil if its not found
---
--- throws an error if the addon object can not be found (except silent is set)
--- returns the module object if found
-function GetModule(self, name, silent)
-	if not self.modules[name] and not silent then
-		error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2)
-	end
-	return self.modules[name]
-end
-
-local function IsModuleTrue(self) return true end
-
--- addon:NewModule( name, [prototype, [lib, lib, lib, ...] )
--- name (string) - unique module object name for this addon
--- prototype (object) - object to derive this module from, methods and values from this table will be mixed into the module, if a string is passed a lib is assumed
--- [lib] (string) - optional libs to embed in the addon object
---
--- returns the addon object when succesful
-function NewModule(self, name, prototype, ...)
-	if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end
-	if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end
-	
-	if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end
-	
-	-- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well.
-	-- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is.
-	local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name))
-	
-	module.IsModule = IsModuleTrue
-	module:SetEnabledState(self.defaultModuleState)
-	module.moduleName = name
-
-	if type(prototype) == "string" then
-		AceAddon:EmbedLibraries(module, prototype, ...)
-	else
-		AceAddon:EmbedLibraries(module, ...)
-	end
-	AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries))
-
-	if not prototype or type(prototype) == "string" then
-		prototype = self.defaultModulePrototype or nil
-	end
-	
-	if type(prototype) == "table" then
-		local mt = getmetatable(module)
-		mt.__index = prototype
-		setmetatable(module, mt)  -- More of a Base class type feel.
-	end
-	
-	safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy.
-	self.modules[name] = module
-	
-	return module
-end
-
---addon:GetName()
--- Returns the real name of the addon or module, without any prefix
-function GetName(self)
-	return self.moduleName or self.name
-end
-
---addon:Enable()
--- Enables the Addon if possible, return true or false depending on success
-function Enable(self)
-	self:SetEnabledState(true)
-	return AceAddon:EnableAddon(self)
-end
-
---addon:Disable()
--- Disables the Addon if possible, return true or false depending on success
-function Disable(self)
-	self:SetEnabledState(false)
-	return AceAddon:DisableAddon(self)
-end
-
--- addon:EnableModule( name )
--- name (string) - unique module object name
---
--- Enables the Module if possible, return true or false depending on success
-function EnableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Enable()
-end
-
--- addon:DisableModule( name )
--- name (string) - unique module object name
---
--- Disables the Module if possible, return true or false depending on success
-function DisableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Disable()
-end
-
--- addon:SetDefaultModuleLibraries( [lib, lib, lib, ...]  )
--- [lib] (string) - libs to embed in every module
-function SetDefaultModuleLibraries(self, ...)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleLibraries = {...}
-end
-
--- addon:SetDefaultModuleState( state )
--- state (boolean) - default state for new modules (enabled=true, disabled=false)
-function SetDefaultModuleState(self, state)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleState = state
-end
-
--- addon:SetDefaultModulePrototype( prototype )
--- prototype (string or table) - the default prototype to use if none is specified on module creation
-function SetDefaultModulePrototype(self, prototype)
-	if next(self.modules) then
-		error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2)
-	end
-	if type(prototype) ~= "table" then
-		error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2)
-	end
-	self.defaultModulePrototype = prototype
-end
-
--- addon:SetEnabledState ( state )
--- state ( boolean ) - set the state of an addon or module  (enabled=true, disabled=false)
---
--- should only be called before any Enabling actually happend, aka in OnInitialize
-function SetEnabledState(self, state)
-	self.enabledState = state
-end
-
-
-local function IterateModules(self) return pairs(self.modules) end
-local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end
-local function IsEnabled(self) return self.enabledState end
-local mixins = {
-	NewModule = NewModule,
-	GetModule = GetModule,
-	Enable = Enable,
-	Disable = Disable,
-	EnableModule = EnableModule,
-	DisableModule = DisableModule,
-	IsEnabled = IsEnabled,
-	SetDefaultModuleLibraries = SetDefaultModuleLibraries,
-	SetDefaultModuleState = SetDefaultModuleState,
-	SetDefaultModulePrototype = SetDefaultModulePrototype,
-	SetEnabledState = SetEnabledState,
-	IterateModules = IterateModules,
-	IterateEmbeds = IterateEmbeds,
-	GetName = GetName,
-}
-local function IsModule(self) return false end
-local pmixins = {
-	defaultModuleState = true,
-	enabledState = true,
-	IsModule = IsModule,
-}
--- Embed( target )
--- target (object) - target object to embed aceaddon in
---
--- this is a local function specifically since it's meant to be only called internally
-function Embed(target)
-	for k, v in pairs(mixins) do
-		target[k] = v
-	end
-	for k, v in pairs(pmixins) do
-		target[k] = target[k] or v
-	end
-end
-
-
--- AceAddon:IntializeAddon( addon )
--- addon (object) - addon to intialize
---
--- calls OnInitialize on the addon object if available
--- calls OnEmbedInitialize on embedded libs in the addon object if available
-function AceAddon:InitializeAddon(addon)
-	safecall(addon.OnInitialize, addon)
-	
-	local embeds = self.embeds[addon]
-	for i = 1, #embeds do
-		local lib = LibStub:GetLibrary(embeds[i], true)
-		if lib then safecall(lib.OnEmbedInitialize, lib, addon) end
-	end
-	
-	-- we don't call InitializeAddon on modules specifically, this is handled
-	-- from the event handler and only done _once_
-end
-
--- AceAddon:EnableAddon( addon )
--- addon (object) - addon to enable
---
--- calls OnEnable on the addon object if available
--- calls OnEmbedEnable on embedded libs in the addon object if available
-function AceAddon:EnableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if self.statuses[addon.name] or not addon.enabledState then return false end
-	
-	-- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable.
-	self.statuses[addon.name] = true
-	
-	-- TODO: handle 'first'? Or let addons do it on their own?
-	safecall(addon.OnEnable, addon)
-	
-	-- make sure we're still enabled before continueing
-	if self.statuses[addon.name] then
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedEnable, lib, addon) end
-		end
-	
-		-- enable possible modules.
-		for name, module in pairs(addon.modules) do
-			self:EnableAddon(module)
-		end
-	end
-	return self.statuses[addon.name] -- return true if we're disabled
-end
-
--- AceAddon:DisableAddon( addon )
--- addon (object|string) - addon to disable
---
--- calls OnDisable on the addon object if available
--- calls OnEmbedDisable on embedded libs in the addon object if available
-function AceAddon:DisableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if not self.statuses[addon.name] then return false end
-	
-	-- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable.
-	self.statuses[addon.name] = false
-	
-	safecall( addon.OnDisable, addon )
-	
-	-- make sure we're still disabling...
-	if not self.statuses[addon.name] then 
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedDisable, lib, addon) end
-		end
-		-- disable possible modules.
-		for name, module in pairs(addon.modules) do
-			self:DisableAddon(module)
-		end
-	end
-	
-	return not self.statuses[addon.name] -- return true if we're disabled
-end
-
---The next few funcs are just because no one should be reaching into the internal registries
---Thoughts?
-function AceAddon:IterateAddons() return pairs(self.addons) end
-function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
-function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
-function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
-
--- Event Handling
-local function onEvent(this, event, arg1)
-	if event == "ADDON_LOADED" 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)
-			-- this might be an issue with recursion - TODO: validate
-			if event == "ADDON_LOADED" then addon.baseName = arg1 end
-			AceAddon:InitializeAddon(addon)
-			tinsert(AceAddon.enablequeue, addon)
-		end
-		
-		if IsLoggedIn() then
-			while(#AceAddon.enablequeue > 0) do
-				local addon = tremove(AceAddon.enablequeue, 1)
-				AceAddon:EnableAddon(addon)
-			end
-		end
-	end
-end
-
-AceAddon.frame:RegisterEvent("ADDON_LOADED")
-AceAddon.frame:RegisterEvent("PLAYER_LOGIN")
-AceAddon.frame:SetScript("OnEvent", onEvent)
-
--- upgrade embeded
-for name, addon in pairs(AceAddon.addons) do
-	Embed(addon)
-end
diff --git a/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.xml b/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.xml
deleted file mode 100644
index e6ad639..0000000
--- a/Cauldron/Libs/AceAddon-3.0/AceAddon-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.lua b/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.lua
deleted file mode 100644
index b5bc08a..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.lua
+++ /dev/null
@@ -1,43 +0,0 @@
---[[ $Id: AceConfig-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
---[[
-AceConfig-3.0
-
-Very light wrapper library that combines all the AceConfig subcomponents into one more easily used whole.
-
-Also automatically adds "config", "enable" and "disable" commands to options table as appropriate.
-
-]]
-
-local MAJOR, MINOR = "AceConfig-3.0", 2
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local cfgcmd = LibStub("AceConfigCmd-3.0")
-local cfgdlg = LibStub("AceConfigDialog-3.0")
---TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0")
-
-
----------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options, slashcmd, persist)
---
--- - appName - (string) application name
--- - options - table or function ref, see AceConfigRegistry
--- - slashcmd - slash command (string) or table with commands, or nil to NOT create a slash command
-
-function lib: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
-				cfgcmd:CreateChatCommand(cmd, appName)
-			end
-		else
-			cfgcmd:CreateChatCommand(slashcmd, appName)
-		end
-	end
-end
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.xml b/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.xml
deleted file mode 100644
index 87972ad..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfig-3.0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<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">
-	<Include file="AceConfigRegistry-3.0\AceConfigRegistry-3.0.xml"/>
-	<Include file="AceConfigCmd-3.0\AceConfigCmd-3.0.xml"/>
-	<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
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
deleted file mode 100644
index d52742e..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
+++ /dev/null
@@ -1,729 +0,0 @@
-
---[[
-AceConfigCmd-3.0
-
-Handles commandline optionstable access
-
-REQUIRES: AceConsole-3.0 for command registration (loaded on demand)
-
-]]
-
--- TODO: handle disabled / hidden
--- TODO: implement handlers for all types
--- TODO: plugin args
-
-
-local MAJOR, MINOR = "AceConfigCmd-3.0", 6
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-lib.commands = lib.commands or {}
-local commands = lib.commands
-
-local cfgreg = LibStub("AceConfigRegistry-3.0")
-local AceConsole -- LoD
-local AceConsoleName = "AceConsole-3.0"
-
-
-local L = setmetatable({}, {	-- TODO: replace with proper locale
-	__index = function(self,k) return k end
-})
-
-
-
-local function print(msg)
-	(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
-end
-
-
--- pickfirstset() - picks the first non-nil value and returns it
-
-local function pickfirstset(...)	
-	for i=1,select("#",...) do
-		if select(i,...)~=nil then
-			return select(i,...)
-		end
-	end
-end
-
-
--- err() - produce real error() regarding malformed options tables etc
-
-local function err(info,inputpos,msg )
-	local cmdstr=" "..strsub(info.input, 1, inputpos-1)
-	error(MAJOR..": /" ..info[0] ..cmdstr ..": "..(msg or "malformed options table"), 2)
-end
-
-
--- usererr() - produce chatframe message regarding bad slash syntax etc
-
-local function usererr(info,inputpos,msg )
-	local cmdstr=strsub(info.input, 1, inputpos-1);
-	print("/" ..info[0] .. " "..cmdstr ..": "..(msg or "malformed options table"))
-end
-
-
--- callmethod() - call a given named method (e.g. "get", "set") with given arguments
-
-local function callmethod(info, inputpos, tab, methodtype, ...)
-	local method = info[methodtype]
-	if not method then
-		err(info, inputpos, "'"..methodtype.."': not set")
-	end
-
-	info.arg = tab.arg
-	info.option = tab
-	info.type = tab.type
-
-	if type(method)=="function" then
-		return method(info, ...)
-	elseif type(method)=="string" then
-		if type(info.handler[method])~="function" then
-			err(info, inputpos, "'"..methodtype.."': '"..method.."' is not a member function of "..tostring(info.handler))
-		end
-		return info.handler[method](info.handler, info, ...)
-	else
-		assert(false)	-- type should have already been checked on read
-	end
-end
-
--- callfunction() - call a given named function (e.g. "name", "desc") with given arguments
-
-local function callfunction(info, tab, methodtype, ...)
-	local method = tab[methodtype]
-
-	info.arg = tab.arg
-	info.option = tab
-	info.type = tab.type
-	
-	if type(method)=="function" then
-		return method(info, ...)
-	else
-		assert(false) -- type should have already been checked on read
-	end
-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 
-		local res = callmethod(info,inputpos,tab,"validate",...)
-		if type(res)=="string" then
-			usererr(info, inputpos, "'"..strsub(info.input, inputpos).."' - "..res)
-			return
-		end
-	end
-	-- console ignores .confirm
-	
-	callmethod(info,inputpos,tab,methodtype, ...)
-end
-
-
--- getparam() - used by handle() to retreive and store "handler", "get", "set", etc
-
-local function getparam(info, inputpos, tab, depth, paramname, types, errormsg)
-	local old,oldat = info[paramname], info[paramname.."_at"]
-	local val=tab[paramname]
-	if val~=nil then
-		if val==false then
-			val=nil
-		elseif not types[type(val)] then 
-			err(info, inputpos, "'" .. paramname.. "' - "..errormsg) 
-		end
-		info[paramname] = val
-		info[paramname.."_at"] = depth
-	end
-	return old,oldat
-end
-
-
--- iterateargs(tab) - custom iterator that iterates both t.args and t.plugins.*
-local dummytable={}
-
-local function iterateargs(tab)
-	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)
-			if k then return k,v end
-			if argtab==tab.args then
-				argtab=nil
-			else
-				argtabkey,argtab = next(tab.plugins, argtabkey)
-				if not argtabkey then
-					argtab=tab.args
-				end
-			end
-		end
-	end
-end
-
-local function showhelp(info, inputpos, tab, 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
-			table.insert(sortTbl, k)
-			refTbl[k] = v
-		end
-	end
-	
-	table.sort(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
-			info.order = o1
-			info[#info+1] = one
-			o1 = callmethod(info, inputpos, refTbl[one], "order")
-			info[#info] = nil
-			info.order = nil
-		end
-		if type(o2) == "function" or type(o1) == "string" then
-			info.order = o2
-			info[#info+1] = two
-			o2 = callmethod(info, inputpos, refTbl[two], "order")
-			info[#info] = nil
-			info.order = nil
-		end
-		if o1<0 and o2<0 then return o1<o2 end
-		if o2<0 then return true end
-		if o1<0 then return false end
-		if o1==o2 then return tostring(one)<tostring(two) end   -- compare names
-		return o1<o2
-	end)
-	
-	for _,k in ipairs(sortTbl) do
-		local v = refTbl[k]
-		if not pickfirstset(v.cmdHidden, v.hidden, false) then
-			-- recursively show all inline groups
-			local name, desc = v.name, v.desc
-			if type(name) == "function" then
-				name = callfunction(info, v, 'name')
-			end
-			if type(desc) == "function" then
-				desc = callfunction(info, v, 'desc')
-			end
-			if v.type == "group" and pickfirstset(v.cmdInline, v.inline, false) then
-				print("  "..(desc or name)..":")
-				showhelp(info, inputpos, v, true)
-			else
-				print("  |cffffff78"..k.."|r - "..(desc or name or ""))
-			end
-		end
-	end
-end
-
-
-local function keybindingValidateFunc(text)
-	if text == nil or text == "NONE" then
-		return nil
-	end
-	text = text:upper()
-	local shift, ctrl, alt
-	local modifier
-	while true do
-		if text == "-" then
-			break
-		end
-		modifier, text = strsplit('-', text, 2)
-		if text then
-			if modifier ~= "SHIFT" and modifier ~= "CTRL" and modifier ~= "ALT" then
-				return false
-			end
-			if modifier == "SHIFT" then
-				if shift then
-					return false
-				end
-				shift = true
-			end
-			if modifier == "CTRL" then
-				if ctrl then
-					return false
-				end
-				ctrl = true
-			end
-			if modifier == "ALT" then
-				if alt then
-					return false
-				end
-				alt = true
-			end
-		else
-			text = modifier
-			break
-		end
-	end
-	if text == "" then
-		return false
-	end
-	if not text:find("^F%d+$") and text ~= "CAPSLOCK" and text:len() ~= 1 and (text:byte() < 128 or text:len() > 4) and not _G["KEY_" .. text] then
-		return false
-	end
-	local s = text
-	if shift then
-		s = "SHIFT-" .. s
-	end
-	if ctrl then
-		s = "CTRL-" .. s
-	end
-	if alt then
-		s = "ALT-" .. s
-	end
-	return s
-end
-
--- constants used by getparam() calls below
-
-local handlertypes = {["table"]=true}
-local handlermsg = "expected a table"
-
-local functypes = {["function"]=true, ["string"]=true}
-local funcmsg = "expected function or member name"
-
--- 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)
-
-local function handle(info, inputpos, tab, depth, retfalse)
-
-	if not(type(tab)=="table" and type(tab.type)=="string") then err(info,inputpos) end
-
-	-------------------------------------------------------------------
-	-- Grab hold of handler,set,get,func,etc if set (and remember old ones)
-	-- Note that we do NOT validate if method names are correct at this stage,
-	-- the handler may change before they're actually used!
-
-	local oldhandler,oldhandler_at = getparam(info,inputpos,tab,depth,"handler",handlertypes,handlermsg)
-	local oldset,oldset_at = getparam(info,inputpos,tab,depth,"set",functypes,funcmsg)
-	local oldget,oldget_at = getparam(info,inputpos,tab,depth,"get",functypes,funcmsg)
-	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 = string.find(info.input, " *([^ ]+) *", inputpos)
-		if not arg then
-			showhelp(info, inputpos, tab)
-			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
-				if handle(info, inputpos, v, depth+1, true)==false then
-					info[depth+1] = nil
-					-- wasn't found in there, but that's ok, we just keep looking down here
-				else
-					return	-- done, name was found in inline group
-				end
-			-- matching name and not a inline group
-			elseif strlower(arg)==strlower(k) then
-				info[depth+1] = k
-				return handle(info,nextpos,v,depth+1)
-			end
-		end
-			
-		-- no match 
-		if retfalse then
-			-- restore old infotable members and return false to indicate failure
-			info.handler,info.handler_at = oldhandler,oldhandler_at
-			info.set,info.set_at = oldset,oldset_at
-			info.get,info.get_at = oldget,oldget_at
-			info.func,info.func_at = oldfunc,oldfunc_at
-			info.validate,info.validate_at = oldvalidate,oldvalidate_at
-			--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
-			if not strmatch(str, tab.pattern) then
-				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
-				return
-			end
-		end
-		
-		do_final(info, inputpos, tab, "set", str)
-		
-
-	
-	elseif tab.type=="toggle" then
-		------------ toggle --------------------------------------------
-		local b
-		local str = strtrim(strlower(str))
-		if str=="" then
-			b = callmethod(info, inputpos, tab, "get")
-
-			if tab.tristate then
-				--cycle in true, nil, false order
-				if b then
-					b = nil
-				elseif b == nil then
-					b = false
-				else
-					b = true
-				end
-			else
-				b = not b
-			end
-			
-		elseif str==L["on"] then
-			b = true
-		elseif str==L["off"] then
-			b = false
-		elseif tab.tristate and str==L["default"] then
-			b = nil
-		else
-			if tab.tristate then
-				usererr(info, inputpos, format(L["'%s' - expected 'on', 'off' or 'default', or no argument to toggle."], str))
-			else
-				usererr(info, inputpos, format(L["'%s' - expected 'on' or 'off', or no argument to toggle."], str))
-			end
-			return
-		end
-		
-		do_final(info, inputpos, tab, "set", b)
-		
-
-	elseif tab.type=="range" then
-		------------ range --------------------------------------------
-		local val = tonumber(str)
-		if not val then
-			usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
-			return
-		end
-		if type(info.step)=="number" then
-			val = val- (val % info.step)
-		end
-		if type(info.min)=="number" and val<info.min then
-			usererr(info, inputpos, val.." - "..format(L["must be equal to or higher than %s"], tostring(info.min)) )
-			return
-		end
-		if type(info.max)=="number" and val>info.max then
-			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))
-		if str == "" then
-			--TODO: Show current selection and possible values
-			return
-		end
-		
-		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
-
-		local ok
-		for k,v in pairs(values) do 
-			if strlower(k)==str then
-				str = k	-- overwrite with key (in case of case mismatches)
-				ok = true
-				break
-			end
-		end
-		if not ok then
-			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))
-		if str == "" then
-			--TODO: Show current values
-			return
-		end
-		
-		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		
-		
-		--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
-		local sels = {}
-		for v in string.gmatch(str, "[^ ]+") do
-			--parse option=on etc
-			local opt, val = string.match(v,'(.+)=(.+)')
-			--get option if toggling
-			if not opt then 
-				opt = v 
-			end
-			
-			--check that the opt is valid
-			local ok
-			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
-					--val is valid insert it
-					sels[opt] = val
-				else
-					if tab.tristate then
-						usererr(info, inputpos, format(L["'%s' '%s' - expected 'on', 'off' or 'default', or no argument to toggle."], v, val))
-					else
-						usererr(info, inputpos, format(L["'%s' '%s' - expected 'on' or 'off', or no argument to toggle."], v, val))
-					end
-					return
-				end
-			else
-				-- no val supplied, toggle
-				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
-						b = nil
-					elseif b == nil then
-						b = false
-					else
-						b = true
-					end
-				else
-					b = not b
-				end
-				newval = b
-			else
-				--set the option as specified
-				if val==L["on"] then
-					newval = true
-				elseif val==L["off"] then
-					newval = false
-				elseif val==L["default"] then
-					newval = nil
-				end
-			end
-			
-			do_final(info, inputpos, tab, "set", opt, newval)
-		end
-					
-		
-	elseif tab.type=="color" then
-		------------ color --------------------------------------------
-		local str = strtrim(strlower(str))
-		if str == "" then
-			--TODO: Show current value
-			return
-		end
-		
-		local r, g, b, a
-		
-		if tab.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
-			else
-				--parse seperate values
-				r,g,b,a = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+) ([%d%.]+)$")
-				r,g,b,a = tonumber(r), tonumber(g), tonumber(b), tonumber(a)
-			end
-			if not (r and g and b and a) then
-				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
-				--values are valid 0..255, convert to 0..1
-				r = r / 255
-				g = g / 255
-				b = b / 255
-				a = a / 255
-			else
-				--values are invalid
-				usererr(info, inputpos, format(L["'%s' - values must all be either in the range 0..1 or 0..255."], str))
-			end
-		else
-			a = 1.0
-			if str:len() == 6 and str:find("^%x*$") then
-				--parse a hex string
-				r,g,b = tonumber(str:sub(1, 2), 16) / 255, tonumber(str:sub(3, 4), 16) / 255, tonumber(str:sub(5, 6), 16) / 255
-			else
-				--parse seperate values
-				r,g,b = str:match("^([%d%.]+) ([%d%.]+) ([%d%.]+)$")
-				r,g,b = tonumber(r), tonumber(g), tonumber(b)
-			end
-			if not (r and g and b) then
-				usererr(info, inputpos, format(L["'%s' - expected 'RRGGBB' or 'r g b'."], 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 then
-				--values are valid
-			elseif r >= 0 and r <= 255 and g >= 0 and g <= 255 and b >= 0 and b <= 255 then
-				--values are valid 0..255, convert to 0..1
-				r = r / 255
-				g = g / 255
-				b = b / 255
-			else
-				--values are invalid
-				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
-		------------ keybinding --------------------------------------------
-		local str = strtrim(strlower(str))
-		if str == "" then
-			--TODO: Show current value
-			return
-		end
-		local value = keybindingValidateFunc(str:upper())
-		if value == false then
-			usererr(info, inputpos, format(L["'%s' - Invalid Keybinding."], str))
-			return
-		end
-
-		do_final(info, inputpos, tab, "set", value)
-
-	elseif tab.type=="description" then
-		------------ description --------------------
-		-- ignore description, GUI config only
-	else
-		err(info, inputpos, "unknown options table item type '"..tostring(tab.type).."'")
-	end
-end
-
-
------------------------------------------------------------------------
--- HandleCommand(slashcmd, appName, input)
---
--- Call this from a chat command handler to parse the command input as operations on an aceoptions table
--- 
--- slashcmd (string) - the slash command WITHOUT leading slash (only used for error output)
--- appName (string) - the application name as given to AceConfigRegistry:RegisterOptionsTable()
--- input (string) -- the commandline input (as given by the WoW handler, i.e. without the command itself)
-
-function lib:HandleCommand(slashcmd, appName, input)
-
-	local optgetter = cfgreg:GetOptionsTable(appName)
-	if not optgetter then
-		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,
-		options = options,
-		input = input,
-		self = self,
-		handler = self,
-		uiType = "cmd",
-		uiName = MAJOR,
-	}
-	
-	handle(info, 1, options, 0)  -- (info, inputpos, table, depth)
-end
-
-
-
------------------------------------------------------------------------
--- CreateChatCommand(slashcmd, appName)
---
--- Utility function to create a slash command handler.
--- Also registers tab completion with AceTab
--- 
--- slashcmd (string) - the slash command WITHOUT leading slash (only used for error output)
--- appName (string) - the application name as given to AceConfigRegistry:RegisterOptionsTable()
-
-function lib:CreateChatCommand(slashcmd, appName)
-	if not AceConsole then
-		AceConsole = LibStub(AceConsoleName)
-	end
-	if AceConsole.RegisterChatCommand(self, slashcmd, function(input)
-				lib.HandleCommand(self, slashcmd, appName, input)	-- upgradable
-		end,
-	true) then -- succesfully registered so lets get the command -> app table in
-		commands[slashcmd] = appName
-	end
-end
-
--- GetChatCommandOptions(slashcmd)
--- 
--- Utility function that returns the options table that belongs to a slashcommand
--- mainly used by AceTab
-
-function lib:GetChatCommandOptions(slashcmd)
-	return commands[slashcmd]
-end
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml b/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
deleted file mode 100644
index 188d354..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
deleted file mode 100644
index 626e062..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+++ /dev/null
@@ -1,1755 +0,0 @@
---[[
-AceConfigDialog-3.0
-
-]]
-local LibStub = LibStub
-local MAJOR, MINOR = "AceConfigDialog-3.0", 25
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-lib.OpenFrames = lib.OpenFrames or {}
-lib.Status = lib.Status or {}
-lib.frame = lib.frame or CreateFrame("Frame")
-
-lib.frame.apps = lib.frame.apps or {}
-lib.frame.closing = lib.frame.closing or {}
-
-local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
-
-local select = select
-local pairs = pairs
-local type = type
-local assert = assert
-local tinsert = tinsert
-local tremove = tremove
-local error = error
-local table = table
-local unpack = unpack
-local string = string
-local next = next
-local math = math
-local _
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-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", table.concat(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, ...)
-end
-
-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
-
-  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
-
-  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
-
-]]
-
--- Recycling functions
-local new, del, copy
---newcount, delcount,createdcount,cached = 0,0,0
-do
-	local pool = setmetatable({},{__mode='k'})
-	function new()
-		--newcount = newcount + 1
-		local t = next(pool)
-		if t then
-			pool[t] = nil
-			return t
-		else
-			--createdcount = createdcount + 1
-			return {}
-		end
-	end
-	function copy(t)
-		local c = new()
-		for k, v in pairs(t) do
-			c[k] = v
-		end
-		return c
-	end
-	function del(t)
-		--delcount = delcount + 1
-		for k in pairs(t) do
-			t[k] = nil
-		end
-		pool[t] = true
-	end
---	function cached()
---		local n = 0
---		for k in pairs(pool) do
---			n = n + 1
---		end
---		return n
---	end
-end
-
--- picks the first non-nil value and returns it
-local function pickfirstset(...)
-  for i=1,select("#",...) do
-    if select(i,...)~=nil then
-      return select(i,...)
-    end
-  end
-end
-
---gets an option from a given group, checking plugins
-local function GetSubOption(group, key)
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			if t[key] then
-				return t[key]
-			end
-		end
-	end
-
-	return group.args[key]
-end
-
---Option member type definitions, used to decide how to access it
-
---Is the member Inherited from parent options
-local isInherited = {
-	set = true,
-	get = true,
-	func = true,
-	confirm = true,
-	validate = true,
-	disabled = true,
-	hidden = true
-}
-
---Does a string type mean a literal value, instead of the default of a method of the handler
-local stringIsLiteral = {
-	name = true,
-	desc = true,
-	icon = true,
-	usage = true,
-	width = true,
-	image = true,
-}
-
---Is Never a function or method
-local allIsLiteral = {
-	type = true,
-	imageWidth = true,
-	imageHeight = true,
-}
-
---gets the value for a member that could be a function
---function refs are called with an info arg
---every other type is returned
-local function GetOptionsMemberValue(membername, option, options, path, appName, ...)
-	--get definition for the member
-	local inherits = isInherited[membername]
-	
-
-	--get the member of the option, traversing the tree if it can be inherited
-	local member
-	
-	if inherits then
-		local group = options
-		if group[membername] ~= nil then
-			member = group[membername]
-		end
-		for i = 1, #path do
-			group = GetSubOption(group, path[i])
-			if group[membername] ~= nil then
-				member = group[membername]
-			end
-		end
-	else
-		member = option[membername]
-	end
-	
-	--check if we need to call a functon, or if we have a literal value
-	if ( not allIsLiteral[membername] ) and ( type(member) == "function" or ((not stringIsLiteral[membername]) and type(member) == "string") ) then
-		--We have a function to call
-		local info = new()
-		--traverse the options table, picking up the handler and filling the info with the path
-		local handler
-		local group = options
-		handler = group.handler or handler
-		
-		for i = 1, #path do
-			group = GetSubOption(group, path[i])
-			info[i] = path[i]
-			handler = group.handler or handler
-		end
-		
-		info.options = options
-		info.appName = appName
-		info[0] = appName
-		info.arg = option.arg
-		info.handler = handler
-		info.option = option
-		info.type = option.type
-		info.uiType = 'dialog'
-		info.uiName = MAJOR
-	
-		local a, b, c ,d 
-		--using 4 returns for the get of a color type, increase if a type needs more
-		if type(member) == "function" then
-			--Call the function
-			a,b,c,d = member(info, ...)
-		else
-			--Call the method
-			if handler and handler[member] then
-				a,b,c,d = handler[member](handler, info, ...)
-			else
-				error(string.format("Method %s doesn't exist in handler for type %s", member, membername))
-			end
-		end
-		del(info)
-		return a,b,c,d
-	else
-		--The value isnt a function to call, return it
-		return member	
-	end	
-end
-
---[[calls an options function that could be inherited, method name or function ref
-local function CallOptionsFunction(funcname ,option, options, path, appName, ...)
-	local info = new()
-
-	local func
-	local group = options
-	local handler
-
-	--build the info table containing the path
-	-- pick up functions while traversing the tree
-	if group[funcname] ~= nil then
-		func = group[funcname]
-	end
-	handler = group.handler or handler
-
-	for i, v in ipairs(path) do
-		group = GetSubOption(group, v)
-		info[i] = v
-		if group[funcname] ~= nil then
-			func =  group[funcname]
-		end
-		handler = group.handler or handler
-	end
-
-	info.options = options
-	info[0] = appName
-	info.arg = option.arg
-
-	local a, b, c ,d
-	if type(func) == "string" then
-		if handler and handler[func] then
-			a,b,c,d = handler[func](handler, info, ...)
-		else
-			error(string.format("Method %s doesn't exist in handler for type func", func))
-		end
-	elseif type(func) == "function" then
-		a,b,c,d = func(info, ...)
-	end
-	del(info)
-	return a,b,c,d
-end
---]]
-
---tables to hold orders and names for options being sorted, will be created with new()
---prevents needing to call functions repeatedly while sorting
-local tempOrders
-local tempNames
-
-local function compareOptions(a,b)
-	if not a then
-		return true
-	end
-	if not b then
-		return false
-	end
-	local OrderA, OrderB = tempOrders[a] or 100, tempOrders[b] or 100
-	if OrderA == OrderB then
-		local NameA = (type(tempNames[a] == "string") and tempNames[a]) or ""
-		local NameB = (type(tempNames[b] == "string") and tempNames[b]) or ""
-		return NameA:upper() < NameB:upper()
-	end
-	if OrderA < 0 then
-		if OrderB > 0 then
-			return false
-		end
-	else
-		if OrderB < 0 then
-			return true
-		end
-	end
-	return OrderA < OrderB
-end
-
-
-
---builds 2 tables out of an options group
--- keySort, sorted keys
--- opts, combined options from .plugins and args
-local function BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-	tempOrders = new()
-	tempNames = new()
-	
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			for k, v in pairs(t) do
-				if not opts[k] then
-					tinsert(keySort, k)
-					opts[k] = v
-
-					path[#path+1] = k
-					tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName)
-					tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName)
-					path[#path] = nil
-				end
-			end
-		end
-	end
-	
-	for k, v in pairs(group.args) do
-		if not opts[k] then
-			tinsert(keySort, k)
-			opts[k] = v
-
-			path[#path+1] = k
-			tempOrders[k] = GetOptionsMemberValue("order", v, options, path, appName)
-			tempNames[k] = GetOptionsMemberValue("name", v, options, path, appName)
-			path[#path] = nil
-		end
-	end
-
-	table.sort(keySort, compareOptions)
-
-	del(tempOrders)
-	del(tempNames)
-end
-
-local function DelTree(tree)
-	if tree.children then
-		local childs = tree.children
-		for i = 1, #childs do
-			DelTree(childs[i])
-			del(childs[i])
-		end
-		del(childs)
-	end
-end
-
-local function CleanUserData(widget, event)
-	
-	local user = widget:GetUserDataTable()
-
-	if user.path then
-		del(user.path)
-	end
-
-	if widget.type == "TreeGroup" then
-		local tree = user.tree
-		widget:SetTree(nil)
-		if tree then
-			for i = 1, #tree do
-				DelTree(tree[i])
-				del(tree[i])
-			end
-			del(tree)
-		end
-	end
-
-	if widget.type == "TabGroup" then
-		widget:SetTabs(nil)
-		if user.tablist then
-			del(user.tablist)
-		end
-	end
-
-	if widget.type == "DropdownGroup" then
-		widget:SetGroupList(nil)
-		if user.grouplist then
-			del(user.grouplist)
-		end
-	end
-end
-
---[[
-	Gets a status table for the given appname and options path
-]]
-function lib:GetStatusTable(appName, path)
-	local status = self.Status
-
-	if not status[appName] then
-		status[appName] = {}
-		status[appName].status = {}
-		status[appName].children = {}
-	end
-
-	status = status[appName]
-
-	if path then
-		for i = 1, #path do
-			local v = path[i]
-			if not status.children[v] then
-				status.children[v] = {}
-				status.children[v].status = {}
-				status.children[v].children = {}
-			end
-			status = status.children[v]
-		end
-	end
-
-	return status.status
-end
-
---[[
-	Sets the given path to be selected
-]]
-function lib:SelectGroup(appName, ...)
-	local path = new()
-
-	
-	local app = reg:GetOptionsTable(appName)
-	if not app then
-		error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2)
-	end
-	local options = app("dialog", MAJOR)
-	local group = options
-	local status = self:GetStatusTable(appName, path)
-	if not status.groups then
-		status.groups = {}
-	end
-	status = status.groups
-	local treevalue 
-	local treestatus 
-	
-	for n = 1, select('#',...) do
-		local key = select(n, ...)
-
-		if group.childGroups == "tab" or group.childGroups == "select" then
-			--if this is a tab or select group, select the group
-			status.selected = key
-			--children of this group are no longer extra levels of a tree
-			treevalue = nil
-		else
-			--tree group by default
-			if treevalue then
-				--this is an extra level of a tree group, build a uniquevalue for it
-				treevalue = treevalue.."\001"..key
-			else
-				--this is the top level of a tree group, the uniquevalue is the same as the key
-				treevalue = key
-				if not status.groups then
-					status.groups = {}
-				end
-				--save this trees status table for any extra levels or groups
-				treestatus = status
-			end
-			--make sure that the tree entry is open, and select it.
-			--the selected group will be overwritten if a child is the final target but still needs to be open
-			treestatus.selected = treevalue
-			treestatus.groups[treevalue] = true
-			
-		end
-		
-		--move to the next group in the path
-		group = GetSubOption(group, key)
-		if not group then 
-			break
-		end
-		tinsert(path, key)
-		status = self:GetStatusTable(appName, path)
-		if not status.groups then
-			status.groups = {}
-		end
-		status = status.groups
-	end
-	
-	del(path)
-	reg:NotifyChange(appName)
-end	
-
-local function OptionOnMouseOver(widget, event)
-	--show a tooltip/set the status bar to the desc text
-	local user = widget:GetUserDataTable()
-	local opt = user.option
-	local options = user.options
-	local path = user.path
-	local appName = user.appName
-
-	GameTooltip: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)
-	
-	GameTooltip:SetText(name, 1, .82, 0, 1)
-	
-	if opt.type == 'multiselect' then
-		GameTooltip:AddLine(user.text,0.5, 0.5, 0.8, 1)
-	end	
-	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, 1)
-	end
-	if type(usage) == "string" then
-		GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, 1)
-	end
-
-	GameTooltip:Show()
-end
-
-local function OptionOnMouseLeave(widget, event)
-	GameTooltip:Hide()
-end
-
-local function GetFuncName(option)
-	local type = option.type
-	if type == 'execute' then
-		return 'func'
-	else
-		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)
-		end
-		lib:Open(appName, rootframe, basepath and unpack(basepath))
-		del(info)
-	end
-	t.OnCancel = function()
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
-		del(info)
-	end
-	for i = 1, select('#', ...) do
-		t[i] = select(i, ...) or false
-	end
-	t.timeout = 0
-	t.whileDead = 1
-	t.hideOnEscape = 1
-
-	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
-	if dialog then
-		oldstrata = dialog:GetFrameStrata()
-		dialog:SetFrameStrata("TOOLTIP")
-	end
-end
-
-local function ActivateControl(widget, event, ...)
-	--This function will call the set / execute handler for the widget
-	--widget:GetUserDataTable() contains the needed info
-	local user = widget:GetUserDataTable()
-	local option = user.option
-	local options = user.options
-	local path = user.path
-	local info = new()
-
-	local func
-	local group = options
-	local funcname = GetFuncName(option)
-	local handler
-	local confirm
-	local validate
-	--build the info table containing the path
-	-- pick up functions while traversing the tree
-	if group[funcname] ~= nil then
-		func =  group[funcname]
-	end
-	handler = group.handler or handler
-	confirm = group.confirm
-	validate = group.validate
-	for i = 1, #path do
-		local v = path[i]
-		group = GetSubOption(group, v)
-		info[i] = v
-		if group[funcname] ~= nil then
-			func =  group[funcname]
-		end
-		handler = group.handler or handler
-		if group.confirm ~= nil then
-			confirm = group.confirm
-		end
-		if group.validate ~= nil then
-			validate = group.validate
-		end
-	end
-
-	info.options = options
-	info.appName = user.appName
-	info.arg = option.arg
-	info.handler = handler
-	info.option = option
-	info.type = option.type
-	info.uiType = 'dialog'
-	info.uiName = MAJOR
-
-	local name
-	if type(option.name) == "function" then
-		name = option.name(info)
-	elseif type(option.name) == "string" then
-		name = option.name
-	else
-		name = ""
-	end
-	local usage = option.usage
-	local pattern = option.pattern
-
-	local validated = true
-
-	if option.type == "input" then
-		if type(pattern)=="string" then
-			if not strmatch(..., pattern) then
-				validated = false
-			end
-		end
-	end
-	
-	local success
-	if validated and option.type ~= "execute" then
-		if type(validate) == "string" then
-			if handler and handler[validate] then
-				success, validated = safecall(handler[validate], handler, info, ...)
-				if not success then validated = false end
-			else
-				error(string.format("Method %s doesn't exist in handler for type execute", validate))
-			end
-		elseif type(validate) == "function" then
-			success, validated = safecall(validate, info, ...)
-			if not success then validated = false end
-		end
-	end
-	
-	local rootframe = user.rootframe
-	if type(validated) == "string" then
-		--validate function returned a message to display
-		if rootframe.SetStatusText then
-			rootframe:SetStatusText(validated)
-		end
-		PlaySound("igPlayerInviteDecline")
-		del(info)
-		return true
-	elseif not validated then
-		--validate returned false	
-		if rootframe.SetStatusText then
-			if usage then
-				rootframe:SetStatusText(name..": "..usage)
-			else
-				if pattern then
-					rootframe:SetStatusText(name..": Expected "..pattern)
-				else
-					rootframe:SetStatusText(name..": Invalid Value")
-				end
-			end
-		end
-		PlaySound("igPlayerInviteDecline")
-		del(info)
-		return true
-	else
-		
-		local confirmText = option.confirmText
-		--call confirm func/method
-		if type(confirm) == "string" then
-			if handler and handler[confirm] then
-				success, confirm = safecall(handler[confirm], handler, info, ...)
-				if success and type(confirm) == "string" then
-					confirmText = confirm
-					confirm = true
-				elseif not success then
-					confirm = false
-				end
-			else
-				error(string.format("Method %s doesn't exist in handler for type confirm", confirm))
-			end
-		elseif type(confirm) == "function" then
-			success, confirm = safecall(confirm, info, ...)
-			if success and type(confirm) == "string" then
-				confirmText = confirm
-				confirm = true
-			elseif not success then
-				confirm = false
-			end
-		end
-
-		--confirm if needed
-		if type(confirm) == "boolean" then
-			if confirm then
-				if not confirmText then
-					local name, desc = option.name, option.desc
-					if type(name) == "function" then
-						name = name(info)
-					end
-					if type(desc) == "function" then
-						desc = desc(info)
-					end
-					confirmText = name
-					if desc then
-						confirmText = confirmText.." - "..desc
-					end
-				end
-				
-				local iscustom = user.rootframe:GetUserData('iscustom')
-				local rootframe
-				
-				if iscustom then
-					rootframe = user.rootframe
-				end
-				local basepath = user.rootframe:GetUserData('basepath')
-				if type(func) == "string" then
-					if handler and handler[func] then
-						confirmPopup(user.appName, rootframe, basepath, info, confirmText, handler[func], handler, info, ...)
-					else
-						error(string.format("Method %s doesn't exist in handler for type func", func))
-					end
-				elseif type(func) == "function" then
-					confirmPopup(user.appName, rootframe, basepath, info, confirmText, func, info, ...)
-				end
-				--func will be called and info deleted when the confirm dialog is responded to
-				return
-			end
-		end
-
-		--call the function
-		if type(func) == "string" then
-			if handler and handler[func] then
-				safecall(handler[func],handler, info, ...)
-			else
-				error(string.format("Method %s doesn't exist in handler for type func", func))
-			end
-		elseif type(func) == "function" then
-			safecall(func,info, ...)
-		end
-
-
-
-		local iscustom = user.rootframe:GetUserData('iscustom')
-		local basepath = user.rootframe:GetUserData('basepath')
-		--full refresh of the frame, some controls dont cause this on all events
-		if option.type == "color" then
-			if event == "OnValueConfirmed" then
-				
-				if iscustom then
-					lib:Open(user.appName, user.rootframe, basepath and unpack(basepath))
-				else
-					lib:Open(user.appName, basepath and unpack(basepath))
-				end
-			end
-		elseif option.type == "range" then
-			if event == "OnMouseUp" then
-				if iscustom then
-					lib:Open(user.appName, user.rootframe, basepath and unpack(basepath))
-				else
-					lib:Open(user.appName, basepath and unpack(basepath))
-				end
-			end
-		--multiselects don't cause a refresh on 'OnValueChanged' only 'OnClosed'
-		elseif option.type == "multiselect" then
-			user.valuechanged = true
-		else
-			if iscustom then
-				lib:Open(user.appName, user.rootframe, basepath and unpack(basepath))
-			else
-				lib:Open(user.appName, basepath and unpack(basepath))
-			end
-		end
-
-	end
-	del(info)
-end
-
-local function ActivateSlider(widget, event, value)
-	local option = widget:GetUserData('option')
-	local min, max, step = option.min or 0, option.max or 100, option.step
-	if step then
-		value = math.floor((value - min) / step + 0.5) * step + min
-	else
-		value = math.max(math.min(value,max),min)
-	end
-	ActivateControl(widget,event,value)
-end
-
---called from a checkbox that is part of an internally created multiselect group
---this type is safe to refresh on activation of one control
-local function ActivateMultiControl(widget, event, ...)
-	ActivateControl(widget, event, widget:GetUserData('value'), ...)
-	local user = widget:GetUserDataTable()
-	local iscustom = user.rootframe:GetUserData('iscustom')
-	local basepath = user.rootframe:GetUserData('basepath')
-	if iscustom then
-		lib:Open(user.appName, user.rootframe, basepath and unpack(basepath))
-	else
-		lib:Open(user.appName, basepath and unpack(basepath))
-	end
-end
-
-local function MultiControlOnClosed(widget, event, ...)
-	local user = widget:GetUserDataTable()
-	if user.valuechanged then
-		local iscustom = user.rootframe:GetUserData('iscustom')
-		local basepath = user.rootframe:GetUserData('basepath')
-		if iscustom then
-			lib:Open(user.appName, user.rootframe, basepath and unpack(basepath))
-		else
-			lib:Open(user.appName, basepath and unpack(basepath))
-		end
-	end
-end
-
-local function FrameOnClose(widget, event)
-	local appName = widget:GetUserData('appName')
-	lib.OpenFrames[appName] = nil
-	gui:Release(widget)
-end
-
-local function CheckOptionHidden(option, options, path, appName)
-	--check for a specific boolean option
-	local hidden = pickfirstset(option.dialogHidden,option.guiHidden)
-	if hidden ~= nil then
-		return hidden
-	end
-
-	return GetOptionsMemberValue("hidden", option, options, path, appName)
-end
-
-local function CheckOptionDisabled(option, options, path, appName)
-	--check for a specific boolean option
-	local disabled = pickfirstset(option.dialogDisabled,option.guiDisabled)
-	if disabled ~= nil then
-		return disabled
-	end
-
-	return GetOptionsMemberValue("disabled", option, options, path, appName)
-end
---[[
-local function BuildTabs(group, options, path, appName)
-	local tabs = new()
-	local text = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				tinsert(tabs, k)
-				text[k] = GetOptionsMemberValue("name", v, options, path, appName)
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(keySort)
-	del(opts)
-
-	return tabs, text
-end
-]]
-local function BuildSelect(group, options, path, appName)
-	local groups = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				groups[k] = GetOptionsMemberValue("name", v, options, path, appName)
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(keySort)
-	del(opts)
-
-	return groups
-end
-
-local function BuildSubGroups(group, tree, options, path, appName)
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				local entry = new()
-				entry.value = k
-				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
-				entry.disabled = CheckOptionDisabled(v, options, path, appName)
-				if not tree.children then tree.children = new() end
-				tinsert(tree.children,entry)
-				if (v.childGroups or "tree") == "tree" then
-					BuildSubGroups(v,entry, options, path, appName)
-				end
-			end
-			path[#path] = nil
-		end
-	end
-
-	del(keySort)
-	del(opts)
-end
-
-local function BuildGroups(group, options, path, appName, recurse)
-	local tree = new()
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		if v.type == "group" then
-			path[#path+1] = k
-			local inline = pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-			local hidden = CheckOptionHidden(v, options, path, appName)
-			if not inline and not hidden then
-				local entry = new()
-				entry.value = k
-				entry.text = GetOptionsMemberValue("name", v, options, path, appName)
-				entry.disabled = CheckOptionDisabled(v, options, path, appName)
-				tinsert(tree,entry)
-				if recurse and (v.childGroups or "tree") == "tree" then
-					BuildSubGroups(v,entry, options, path, appName)
-				end
-			end
-			path[#path] = nil
-		end
-	end
-	del(keySort)
-	del(opts)
-	return tree
-end
-
-local function InjectInfo(control, options, option, path, rootframe, appName)
-	local user = control:GetUserDataTable()
-	for i = 1, #path do
-		user[i] = path[i]
-	end
-	user.rootframe = rootframe
-	user.option = option
-	user.options = options
-	user.path = copy(path)
-	user.appName = appName
-	control:SetCallback("OnRelease", CleanUserData)
-	control:SetCallback("OnLeave", OptionOnMouseLeave)
-	control:SetCallback("OnEnter", OptionOnMouseOver)
-end
-
-
---[[
-	options - root of the options table being fed
-	container - widget that controls will be placed in
-	rootframe - Frame object the options are in
-	path - table with the keys to get to the group being fed
---]]
-
-local function FeedOptions(appName, options,container,rootframe,path,group,inline)
-	local keySort = new()
-	local opts = new()
-
-	BuildSortedOptionsTable(group, keySort, opts, options, path, appName)
-
-	for i = 1, #keySort do
-		local k = keySort[i]
-		local v = opts[k]
-		tinsert(path, k)
-		local hidden = CheckOptionHidden(v, options, path, appName)
-		local name = GetOptionsMemberValue("name", v, options, path, appName)
-		if not hidden then
-			if v.type == "group" then
-				if inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then
-					--Inline group
-					local GroupContainer
-					if name and name ~= "" then
-						GroupContainer = gui:Create("InlineGroup")
-						GroupContainer:SetTitle(name or "")
-					else
-						GroupContainer = gui:Create("SimpleGroup")
-					end
-					
-					GroupContainer.width = "fill"
-					GroupContainer:SetLayout("flow")
-					container:AddChild(GroupContainer)
-					FeedOptions(appName,options,GroupContainer,rootframe,path,v,true)
-				end
-			else
-				--Control to feed
-				local control
-				
-				local name = GetOptionsMemberValue("name", v, options, path, appName)
-				
-				if v.type == "execute" then
-					control = gui:Create("Button")
-					control:SetText(name)
-					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
-						error(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-					end
-					
-					if v.multiline then
-						local lines = 4
-						if type(v.multiline) == "number" then
-							lines = v.multiline
-						end
-						control:SetHeight(60 + (14*lines))
-					end
-					control:SetLabel(name)
-					control:SetCallback("OnEnterPressed",ActivateControl)
-					local text = GetOptionsMemberValue("get",v, options, path, appName)
-					if type(text) ~= "string" then
-						text = ""
-					end
-					control:SetText(text)
-
-				elseif v.type == "toggle" then
-					control = gui:Create("CheckBox")
-					control:SetLabel(name)
-					control:SetTriState(v.tristate)
-					local value = GetOptionsMemberValue("get",v, options, path, appName)
-					control:SetValue(value)
-					control:SetCallback("OnValueChanged",ActivateControl)
-
-				elseif v.type == "range" then
-					control = gui:Create("Slider")
-					control:SetLabel(name)
-					control:SetSliderValues(v.min or 0,v.max or 100, v.bigStep or v.step or 0)
-					control:SetIsPercent(v.isPercent)
-					local value = GetOptionsMemberValue("get",v, options, path, appName)
-					if type(value) ~= "number" then
-						value = 0
-					end
-					control:SetValue(value)
-					control:SetCallback("OnValueChanged",ActivateSlider)
-					control:SetCallback("OnMouseUp",ActivateSlider)
-
-				elseif v.type == "select" then
-					local values = GetOptionsMemberValue("values", v, options, path, appName)
-					local controlType = v.dialogControl or v.control or "Dropdown"
-					control = gui:Create(controlType)
-					if not control then
-						error(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-					end
-					control:SetLabel(name)
-					control:SetList(values)
-					local value = GetOptionsMemberValue("get",v, options, path, appName)
-					if not values[value] then
-						value = nil
-					end
-					control:SetValue(value)
-					control:SetCallback("OnValueChanged",ActivateControl)
-
-				elseif v.type == "multiselect" then
-					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
-							tinsert(valuesort, value)
-						end
-					end
-					table.sort(valuesort)	
-						
-					if controlType then
-						control = gui:Create(controlType)
-						if not control then
-							error(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						end
-						control:SetMultiselect(true)
-						control:SetLabel(name)
-						control:SetList(values)
-						control:SetDisabled(disabled)
-						control:SetCallback("OnValueChanged",ActivateControl)
-						control:SetCallback("OnClosed", MultiControlOnClosed)
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						if width == "double" then
-							control:SetWidth(width_multiplier * 2)
-						elseif width == "half" then
-							control:SetWidth(width_multiplier / 2)
-						elseif width == "full" then
-							control.width = "fill"
-						else
-							control:SetWidth(width_multiplier)
-						end
-						--check:SetTriState(v.tristate)
-						for i = 1, #valuesort do
-							local key = valuesort[i]
-							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
-							control:SetItemValue(key,value)
-						end
-					else
-						control = gui:Create("InlineGroup")
-						control:SetLayout("Flow")
-						control:SetTitle(name)
-						control.width = "fill"
-
-						control:PauseLayout()
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						for i = 1, #valuesort do
-							local value = valuesort[i]
-							local text = values[value]
-							local check = gui:Create("CheckBox")
-							check:SetLabel(text)
-							check:SetUserData('value', value)
-							check:SetUserData('text', text)
-							check:SetDisabled(disabled)
-							check:SetTriState(v.tristate)
-							check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value))
-							check:SetCallback("OnValueChanged",ActivateMultiControl)
-							InjectInfo(check, options, v, path, rootframe, appName)
-							control:AddChild(check)
-							if width == "double" then
-								check:SetWidth(width_multiplier * 2)
-							elseif width == "half" then
-								check:SetWidth(width_multiplier / 2)
-							elseif width == "full" then
-								check.width = "fill"
-							else
-								check:SetWidth(width_multiplier)
-							end
-						end
-						control:ResumeLayout()
-						control:DoLayout()
-
-						
-					end
-					
-					del(valuesort)
-
-				elseif v.type == "color" then
-					control = gui:Create("ColorPicker")
-					control:SetLabel(name)
-					control:SetHasAlpha(v.hasAlpha)
-					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:SetLabel(name)
-					control:SetKey(GetOptionsMemberValue("get",v, options, path, appName))
-					control:SetCallback("OnKeyChanged",ActivateControl)
-
-				elseif v.type == "header" then
-					control = gui:Create("Heading")
-					control:SetText(name)
-					control.width = "fill"
-
-				elseif v.type == "description" then
-					control = gui:Create("Label")
-					control:SetText(name)
-					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
-					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
-					
-					if type(image) == 'string' then
-						if not width then
-							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
-						end
-						if not height then
-							height = GetOptionsMemberValue("imageHeight",v, options, path, appName)
-						end
-						if type(imageCoords) == 'table' then
-							control:SetImage(image, unpack(imageCoords))
-						else
-							control:SetImage(image)
-						end
-						if type(width) ~= "number" then
-							width = 32
-						end
-						if type(height) ~= "number" then
-							height = 32
-						end
-						control:SetImageSize(width, height)
-					end
-					local width = GetOptionsMemberValue("width",v,options,path,appName)
-					control.width = not width and "fill"
-				end
-
-				--Common Init
-				if control then
-					if control.width ~= "fill" then
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
-						if width == "double" then
-							control:SetWidth(width_multiplier * 2)
-						elseif width == "half" then
-							control:SetWidth(width_multiplier / 2)
-						elseif width == "full" then
-							control.width = "fill"
-						else
-							control:SetWidth(width_multiplier)
-						end
-					end
-					if control.SetDisabled then
-						local disabled = CheckOptionDisabled(v, options, path, appName)
-						control:SetDisabled(disabled)
-					end
-
-					InjectInfo(control, options, v, path, rootframe, appName)
-					container:AddChild(control)
-				end
-				
-			end
-		end
-		tremove(path)
-	end
-	container:ResumeLayout()
-	container:DoLayout()
-	del(keySort)
-	del(opts)
-end
-
-local function BuildPath(path, ...)
-	for i = 1, select('#',...)  do
-		tinsert(path, (select(i,...)))
-	end
-end
-
-
-local function TreeOnButtonEnter(widget, event, uniquevalue, button)
-	local user = widget:GetUserDataTable()
-	if not user then return end
-	local options = user.options
-	local option = user.option
-	local path = user.path
-	local appName = user.appName
-	
-	local feedpath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-
-	BuildPath(feedpath, string.split("\001", uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		if not group then return end
-		group = GetSubOption(group, feedpath[i])
-	end
-
-	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
-	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
-	
-	GameTooltip:SetOwner(button, "ANCHOR_NONE")
-	if widget.type == "TabGroup" then
-		GameTooltip:SetPoint("BOTTOM",button,"TOP")	
-	else
-		GameTooltip:SetPoint("LEFT",button,"RIGHT")	
-	end
-
-	GameTooltip:SetText(name, 1, .82, 0, 1)
-	
-	if type(desc) == "string" then
-		GameTooltip:AddLine(desc, 1, 1, 1, 1)
-	end
-	
-	GameTooltip:Show()
-end
-
-local function TreeOnButtonLeave(widget, event, value, button)
-	GameTooltip:Hide()
-end
-
-
-local function GroupExists(appName, options, path, uniquevalue)
-	if not uniquevalue then return false end
-	
-	local feedpath = new()
-	local temppath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-	
-	BuildPath(feedpath, string.split("\001", uniquevalue))
-	
-	local group = options
-	for i = 1, #feedpath do
-		local v = feedpath[i]
-		temppath[i] = v
-		group = GetSubOption(group, v)
-		
-		if not group or group.type ~= "group" or CheckOptionHidden(group, options, temppath, appName) then 
-			del(feedpath)
-			del(temppath)
-			return false 
-		end
-	end
-	del(feedpath)
-	del(temppath)
-	return true
-end
-
-local function GroupSelected(widget, event, uniquevalue)
-
-	local user = widget:GetUserDataTable()
-
-	local options = user.options
-	local option = user.option
-	local path = user.path
-	local rootframe = user.rootframe
-
-	local feedpath = new()
-	for i = 1, #path do
-		feedpath[i] = path[i]
-	end
-
-	BuildPath(feedpath, string.split("\001", uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		group = GetSubOption(group, feedpath[i])
-	end
-	widget:ReleaseChildren()
-	lib:FeedGroup(user.appName,options,widget,rootframe,feedpath)
-
-	del(feedpath)
-end
-
-
-
---[[
-This function will feed one group, and any inline child groups into the given container
-Select Groups will only have the selection control (tree, tabs, dropdown) fed in
-and have a group selected, this event will trigger the feeding of child groups
-
-Rules:
-	If the group is Inline, FeedOptions
-	If the group has no child groups, FeedOptions
-
-	If the group is a tab or select group, FeedOptions then add the Group Control
-	If the group is a tree group FeedOptions then
-		its parent isnt a tree group:  then add the tree control containing this and all child tree groups
-		if its parent is a tree group, its already a node on a tree
---]]
-
-function lib:FeedGroup(appName,options,container,rootframe,path, isRoot)
-	local group = options
-	--follow the path to get to the curent group
-	local inline
-	local grouptype, parenttype = options.childGroups, "none"
-
-
-	--temp path table to pass to callbacks as we traverse the tree
-	local temppath = new()
-	for i = 1, #path do
-		local v = path[i]
-		temppath[i] = v
-		group = GetSubOption(group, v)
-		inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-		parenttype = grouptype
-		grouptype = group.childGroups
-	end
-	del(temppath)
-
-	if not parenttype then
-		parenttype = "tree"
-	end
-
-	--check if the group has child groups
-	local hasChildGroups
-	for k, v in pairs(group.args) do
-		if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then
-			hasChildGroups = true
-		end
-	end
-	if group.plugins then
-		for plugin, t in pairs(group.plugins) do
-			for k, v in pairs(t) do
-				if v.type == "group" and not pickfirstset(v.dialogInline,v.guiInline,v.inline, false) then
-					hasChildGroups = true
-				end
-			end
-		end
-	end
-
-	container:SetLayout("flow")
-	local scroll
-
-	--Add a scrollframe if we are not going to add a group control, this is the inverse of the conditions for that later on
-	if (not (hasChildGroups and not inline)) or (grouptype ~= "tab" and grouptype ~= "select" and (parenttype == "tree" and not isRoot)) then
-		if container.type ~= "InlineGroup" then
-			scroll = gui:Create("ScrollFrame")
-			scroll:SetLayout("flow")
-			scroll.width = "fill"
-			scroll.height = "fill"
-			container:SetLayout("fill")
-			container:AddChild(scroll)
-			container = scroll
-		end
-	end
-
-	FeedOptions(appName,options,container,rootframe,path,group,nil)
-
-	if scroll then
-		container:PerformLayout()
-		local status = self:GetStatusTable(appName, path)
-		if not status.scroll then
-			status.scroll = {}
-		end
-		scroll:SetStatusTable(status.scroll)
-	end
-
-	if hasChildGroups and not inline then
-
-		if grouptype == "tab" then
-
-			local tab = gui:Create("TabGroup")
-			InjectInfo(tab, options, group, path, rootframe, appName)
-			tab:SetCallback("OnGroupSelected", GroupSelected)
-			tab:SetCallback("OnTabEnter", TreeOnButtonEnter)
-			tab:SetCallback("OnTabLeave", TreeOnButtonLeave)
-			
-			local status = lib:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			tab:SetStatusTable(status.groups)
-			tab.width = "fill"
-			tab.height = "fill"
-
-			local tabs = BuildGroups(group, options, path, appName)
-			tab:SetTabs(tabs)
-			tab:SetUserData("tablist", tabs)
-
-			for i = 1, #tabs do
-				local entry = tabs[i]
-				if not entry.disabled then
-					tab:SelectTab((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value)
-					break
-				end
-			end
-			
-			container:AddChild(tab)
-
-		elseif grouptype == "select" then
-
-			local select = gui:Create("DropdownGroup")
-			InjectInfo(select, options, group, path, rootframe, appName)
-			select:SetCallback("OnGroupSelected", GroupSelected)
-			local status = lib:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			select:SetStatusTable(status.groups)
-			local grouplist = BuildSelect(group, options, path, appName)
-			select:SetGroupList(grouplist)
-			select:SetUserData("grouplist", grouplist)
-			local firstgroup
-			for k, v in pairs(grouplist) do
-				if not firstgroup or k < firstgroup then
-					firstgroup = k
-				end
-			end
-			
-			if firstgroup then
-				select:SetGroup( (GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
-			end
-			
-			select.width = "fill"
-			select.height = "fill"
-
-			container:AddChild(select)
-
-		--assume tree group by default
-		--if parenttype is tree then this group is already a node on that tree
-		elseif (parenttype ~= "tree") or isRoot then
-			local tree = gui:Create("TreeGroup")
-			InjectInfo(tree, options, group, path, rootframe, appName)
-			tree:EnableButtonTooltips(false)
-			
-			tree.width = "fill"
-			tree.height = "fill"
-
-			tree:SetCallback("OnGroupSelected", GroupSelected)
-			tree:SetCallback("OnButtonEnter", TreeOnButtonEnter)
-			tree:SetCallback("OnButtonLeave", TreeOnButtonLeave)
-			
-			local status = lib:GetStatusTable(appName, path)
-			if not status.groups then
-				status.groups = {}
-			end
-			local treedefinition = BuildGroups(group, options, path, appName, true)
-			tree:SetStatusTable(status.groups)
-
-			tree:SetTree(treedefinition)
-			tree:SetUserData("tree",treedefinition)
-
-			for i = 1, #treedefinition do
-				local entry = treedefinition[i]
-				if not entry.disabled then
-					tree:SelectByValue((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or entry.value)
-					break
-				end
-			end
-
-			container:AddChild(tree)
-		end
-	end
-end
-
-local old_CloseSpecialWindows
-
-
-local function RefreshOnUpdate(this)
-	for appName in pairs(this.closing) do
-		if lib.OpenFrames[appName] then
-			lib.OpenFrames[appName]:Hide()
-		end
-		this.closing[appName] = nil
-	end
-	
-	if this.closeAll then
-		for k, v in pairs(lib.OpenFrames) do
-			v:Hide()
-		end
-		this.closeAll = nil
-	end
-	
-	for appName in pairs(this.apps) do
-		if lib.OpenFrames[appName] then
-			local user = lib.OpenFrames[appName]:GetUserDataTable()
-			lib:Open(appName, user.basepath and unpack(user.basepath))
-		end
-		if lib.BlizOptions and lib.BlizOptions[appName] then
-			local widget = lib.BlizOptions[appName]
-			local user = widget:GetUserDataTable()
-			if widget:IsVisible() then
-				lib:Open(widget:GetUserData('appName'), widget, user.basepath and unpack(user.basepath))
-			end
-		end
-		this.apps[appName] = nil
-	end
-	this:SetScript("OnUpdate", nil)
-end
-
-function lib:CloseAll()
-	lib.frame.closeAll = true
-	lib.frame:SetScript("OnUpdate", RefreshOnUpdate)
-	if next(self.OpenFrames) then
-		return true
-	end
-end
-
-function lib:Close(appName)
-	if self.OpenFrames[appName] then
-		lib.frame.closing[appName] = true
-		lib.frame:SetScript("OnUpdate", RefreshOnUpdate)
-		return true
-	end
-end
-
-function lib:ConfigTableChanged(event, appName)
-	lib.frame.apps[appName] = true
-	lib.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
-reg.RegisterCallback(lib, "ConfigTableChange", "ConfigTableChanged")
-
-function lib:SetDefaultSize(appName, width, height)
-	local status = lib:GetStatusTable(appName)
-	if type(width) == "number" and type(height) == "number" then
-		status.width = width
-		status.height = height
-	end
-end
-
--- :Open(appName, [container], [path ...])
-function lib:Open(appName, container, ...)
-	if not old_CloseSpecialWindows then
-		old_CloseSpecialWindows = CloseSpecialWindows
-		CloseSpecialWindows = function()
-			local found = old_CloseSpecialWindows()
-			return self:CloseAll() or found
-		end
-	end
-	local app = reg:GetOptionsTable(appName)
-	if not app then
-		error(("%s isn't registed with AceConfigRegistry, unable to open config"):format(appName), 2)
-	end
-	local options = app("dialog", MAJOR)
-
-	local f
-	
-	local path = new()
-	local name = GetOptionsMemberValue("name", options, options, path, appName)
-	
-	--If an optional path is specified add it to the path table before feeding the options
-	--as container is optional as well it may contain the first element of the path
-	if type(container) == "string" then
-		tinsert(path, container)
-		container = nil
-	end
-	for n = 1, select('#',...) do
-		tinsert(path, (select(n, ...)))
-	end
-	
-	--if a container is given feed into that
-	if container then
-		f = container
-		f:ReleaseChildren()
-		f:SetUserData('appName', appName)
-		f:SetUserData('iscustom', true)
-		if #path > 0 then
-			f:SetUserData('basepath', copy(path))
-		end
-		local status = lib:GetStatusTable(appName)
-		if not status.width then
-			status.width =  700
-		end
-		if not status.height then
-			status.height = 500
-		end
-		if f.SetStatusTable then
-			f:SetStatusTable(status)
-		end
-	else
-		if not self.OpenFrames[appName] then
-			f = gui:Create("Frame")
-			self.OpenFrames[appName] = f
-		else
-			f = self.OpenFrames[appName]
-		end
-		f:ReleaseChildren()
-		f:SetCallback("OnClose", FrameOnClose)
-		f:SetUserData('appName', appName)
-		if #path > 0 then
-			f:SetUserData('basepath', copy(path))
-		end
-		f:SetTitle(name or "")
-		local status = lib:GetStatusTable(appName)
-		f:SetStatusTable(status)
-	end
-
-	self:FeedGroup(appName,options,f,f,path,true)
-	if f.Show then
-		f:Show()
-	end
-	del(path)
-end
-
-lib.BlizOptions = lib.BlizOptions or {}
-
-local function FeedToBlizPanel(widget, event)
-	local path = widget:GetUserData('path')
-	lib:Open(widget:GetUserData('appName'), widget, path and unpack(path))
-end
-
-local function ClearBlizPanel(widget, event)
-	widget:ReleaseChildren()
-end
-
-function lib:AddToBlizOptions(appName, name, parent, ...)
-	local BlizOptions = lib.BlizOptions
-	
-	local key = appName
-	for n = 1, select('#', ...) do
-		key = key..'\001'..select(n, ...)
-	end
-	
-	if not BlizOptions[key] then
-		local group = gui:Create("BlizOptionsGroup")
-		BlizOptions[key] = group
-		group:SetName(name or appName, parent)
-
-		group:SetTitle(name or appName)
-		group:SetUserData('appName', appName)
-		if select('#', ...) > 0 then
-			local path = {}
-			for n = 1, select('#',...) do
-				tinsert(path, (select(n, ...)))
-			end
-			group:SetUserData('path', path)
-		end
-		group:SetCallback("OnShow", FeedToBlizPanel)
-		group:SetCallback("OnHide", ClearBlizPanel)
-		InterfaceOptions_AddCategory(group.frame)
-		return group.frame
-	else
-		error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
-	end
-end
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml b/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
deleted file mode 100644
index 86ce057..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
deleted file mode 100644
index 3d41dc9..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
+++ /dev/null
@@ -1,352 +0,0 @@
---[[
-AceConfigRegistry-3.0:
-
-Handle central registration of options tables in use by addons and modules. Do nothing else.
-
-Options tables can be registered as raw tables, or as function refs that return a table.
-These functions receive two arguments: "uiType" and "uiName". 
-- 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.
-
-:IterateOptionsTables() and :GetOptionsTable() always return a function reference that the requesting config handling addon must call with the above arguments.
-]]
-
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 6
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-lib.tables = lib.tables or {}
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-if not lib.callbacks then
-	lib.callbacks = CallbackHandler:New(lib)
-end
-
------------------------------------------------------------------------
--- Validating options table consistency:
-
-
-lib.validated = {
-	-- list of options table names ran through :ValidateOptionsTable automatically. 
-	-- CLEARED ON PURPOSE, since newer versions may have newer validators
-	cmd = {},
-	dropdown = {},
-	dialog = {},
-}
-
-
-
-local function err(msg, errlvl, ...)
-	local t = {}
-	for i=select("#",...),1,-1 do
-		tinsert(t, (select(i, ...)))
-	end
-	error(MAJOR..":ValidateOptionsTable(): "..table.concat(t,".")..msg, errlvl+2)
-end
-
-
-local isstring={["string"]=true, _="string"}
-local isstringfunc={["string"]=true,["function"]=true, _="string or funcref"}
-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 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"}
-local optmethodbool={["nil"]=true,["string"]=true,["function"]=true,["boolean"]=true,  _="methodname, funcref or 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 basekeys={
-	type=isstring,
-	name=isstringfunc,
-	desc=optstringfunc,
-	order=optmethodnumber,
-	validate=optmethodfalse,
-	confirm=optmethodbool,
-	confirmText=optstring,
-	disabled=optmethodbool,
-	hidden=optmethodbool,
-		guiHidden=optmethodbool,
-		dialogHidden=optmethodbool,
-		dropdownHidden=optmethodbool,
-	cmdHidden=optmethodbool,
-	icon=optstringfunc,
-	iconCoords=optmethodtable,
-	handler=opttable,
-	get=optmethodfalse,
-	set=optmethodfalse,
-	func=optmethodfalse,
-	arg={["*"]=true},
-	width=optstring,
-}
-
-local typedkeys={
-	header={},
-	description={
-		image=optstringfunc,
-		imageCoords=optmethodtable,
-		imageHeight=optnumber,
-		imageWidth=optnumber,
-	},
-	group={
-		args=istable,
-		plugins=opttable,
-		inline=optbool,
-			cmdInline=optbool,
-			guiInline=optbool,
-			dropdownInline=optbool,
-			dialogInline=optbool,
-		childGroups=optstring,
-	},
-	execute={
---		func={
---			["function"]=true,
---			["string"]=true, 
---			_="methodname or funcref"
---		},
-	},
-	input={
-		pattern=optstring,
-		usage=optstring,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-		multiline=optboolnumber,
-	},
-	toggle={
-		tristate=optbool,
-	},
-	tristate={
-	},
-	range={
-		min=optnumber,
-		max=optnumber,
-		step=optnumber,
-		bigStep=optnumber,
-		isPercent=optbool,
-	},
-	select={
-		values=ismethodtable,
-		style={
-			["nil"]=true, 
-			["string"]={dropdown=true,radio=true}, 
-			_="string: 'dropdown' or 'radio'"
-		},
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-	},
-	multiselect={
-		values=ismethodtable,
-		style=optstring,
-		tristate=optbool,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-	},
-	color={
-		hasAlpha=optbool,
-	},
-	keybinding={
-		-- TODO
-	},
-}
-
-local function validateKey(k,errlvl,...)
-	errlvl=(errlvl or 0)+1
-	if type(k)~="string" then
-		err("["..tostring(k).."] - key is not a string", errlvl,...)
-	end
-	if strfind(k, "[%c \127]") then
-		err("["..tostring(k).."] - key name contained spaces (or control characters)", errlvl,...)
-	end
-end
-
-local function validateVal(v, oktypes, errlvl,...)
-	errlvl=(errlvl or 0)+1
-	local isok=oktypes[type(v)] or oktypes["*"]
-
-	if not isok then
-		err(": expected a "..oktypes._..", got '"..tostring(v).."'", errlvl,...)
-	end
-	if type(isok)=="table" then		-- isok was a table containing specific values to be tested for!
-		if not isok[v] then
-			err(": did not expect "..type(v).." value '"..tostring(v).."'", errlvl,...)
-		end
-	end
-end
-
-local function validate(options,errlvl,...)
-	errlvl=(errlvl or 0)+1
-	-- basic consistency
-	if type(options)~="table" then
-		err(": expected a table, got a "..type(options), errlvl,...)
-	end
-	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
-			err(": unknown parameter", errlvl,tostring(k),...)
-		end
-	end
-
-	-- verify that required params are there, and that everything is the right type
-	for k,oktypes in pairs(basekeys) do
-		validateVal(options[k], oktypes, errlvl,k,...)
-	end
-	for k,oktypes in pairs(tk) do
-		validateVal(options[k], oktypes, errlvl,k,...)
-	end
-
-	-- extra logic for groups
-	if options.type=="group" then
-		for k,v in pairs(options.args) do
-			validateKey(k,errlvl,"args",...)
-			validate(v, errlvl,k,"args",...)
-		end
-		if options.plugins then
-			for plugname,plugin in pairs(options.plugins) do
-				if type(plugin)~="table" then
-					err(": expected a table, got '"..tostring(plugin).."'", errlvl,tostring(plugname),"plugins",...)
-				end
-				for k,v in pairs(plugin) do
-					validateKey(k,errlvl,tostring(plugname),"plugins",...)
-					validate(v, errlvl,k,tostring(plugname),"plugins",...)
-				end
-			end
-		end
-	end
-end
-
----------------------------------------------------------------------
--- :ValidateOptionsTable(options,name,errlvl)
--- - options - the table
--- - name    - (string) name of table, used in error reports
--- - errlvl  - (optional number) error level offset, default 0
---
--- Validates basic structure and integrity of an options table
--- Does NOT verify that get/set etc actually exist, since they can be defined at any depth
-
-function lib:ValidateOptionsTable(options,name,errlvl)
-	errlvl=(errlvl or 0)+1
-	name = name or "Optionstable"
-	if not options.name then
-		options.name=name	-- bit of a hack, the root level doesn't really need a .name :-/
-	end
-	validate(options,errlvl,name)
-end
-
-------------------------------
--- :NotifyChange(appName)
--- - appName - string identifying the addon
---
--- Fires a ConfigTableChange callback for those listening in on it, allowing config GUIs to refresh
-------------------------------
-
-function lib:NotifyChange(appName)
-	if not lib.tables[appName] then return end
-	lib.callbacks:Fire("ConfigTableChange", appName)
-end
-
----------------------------------------------------------------------
--- Registering and retreiving options tables:
-
-
--- validateGetterArgs: helper function for :GetOptionsTable (or, rather, the getter functions returned by it)
-
-local function validateGetterArgs(uiType, uiName, errlvl)
-	errlvl=(errlvl or 0)+2
-	if uiType~="cmd" and uiType~="dropdown" and uiType~="dialog" then
-		error(MAJOR..": Requesting options table: 'uiType' - invalid configuration UI type, expected 'cmd', 'dropdown' or 'dialog'", errlvl)
-	end
-	if not strmatch(uiName, "[A-Za-z]%-[0-9]") then	-- Expecting e.g. "MyLib-1.2"
-		error(MAJOR..": Requesting options table: 'uiName' - badly formatted or missing version number. Expected e.g. 'MyLib-1.2'", errlvl)
-	end
-end
-
-
----------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options)
--- - appName - string identifying the addon
--- - options - table or function reference
-
-function lib:RegisterOptionsTable(appName, options)
-	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)
-		end
-		lib.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			if not lib.validated[uiType][appName] then
-				lib:ValidateOptionsTable(options, appName, errlvl)	-- upgradable
-				lib.validated[uiType][appName] = true
-			end
-			return options 
-		end
-	elseif type(options)=="function" then
-		lib.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			local tab = assert(options(uiType, uiName))
-			if not lib.validated[uiType][appName] then
-				lib:ValidateOptionsTable(tab, appName, errlvl)	-- upgradable
-				lib.validated[uiType][appName] = true
-			end
-			return tab
-		end
-	else
-		error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - expected table or function reference", 2)
-	end
-end
-
-
----------------------------------------------------------------------
--- :IterateOptionsTables()
---
--- Returns an iterator of ["appName"]=funcref pairs
-
-function lib:IterateOptionsTables()
-	return pairs(lib.tables)
-end
-
-
----------------------------------------------------------------------
--- :GetOptionsTable(appName)
--- - appName - which addon to retreive the options table of
--- Optional:
--- - uiType - "cmd", "dropdown", "dialog"
--- - uiName - e.g. "MyLib-1.0"
---
--- If only appName is given, a function is returned which you
--- can call with (uiType,uiName) to get the table.
--- If uiType&uiName are given, the table is returned.
-
-function lib:GetOptionsTable(appName, uiType, uiName)
-	local f = lib.tables[appName]
-	if not f then
-		return nil
-	end
-	
-	if uiType then
-		return f(uiType,uiName,1)	-- get the table for us
-	else
-		return f	-- return the function
-	end
-end
diff --git a/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml b/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
deleted file mode 100644
index 101bfda..0000000
--- a/Cauldron/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.lua b/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.lua
deleted file mode 100644
index 78b34db..0000000
--- a/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.lua
+++ /dev/null
@@ -1,221 +0,0 @@
---[[ $Id: AceConsole-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
-local MAJOR,MINOR = "AceConsole-3.0", 6
-
-local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConsole then return end -- No upgrade needed
-
-AceConsole.embeds = AceConsole.embeds or {} -- table containing objects AceConsole is embedded in.
-AceConsole.commands = AceConsole.commands or {} -- table containing commands registered
-AceConsole.weakcommands = AceConsole.weakcommands or {} -- table containing self, command => func references for weak commands that don't persist through enable/disable
-
--- local upvalues
-local _G = _G
-local pairs = pairs
-local select = select
-local type = type
-local tostring = tostring
-local strfind = string.find
-local strsub = string.sub
-local max = math.max
-
--- AceConsole:Print( [chatframe,] ... )
---
--- Print to DEFAULT_CHAT_FRAME or given chatframe (anything with an .AddMessage member)
-function AceConsole:Print(...)
-	local text = ""
-	if self ~= AceConsole then
-		text = "|cff33ff99"..tostring( self ).."|r: "
-	end
-
-	local frame = select(1, ...)
-	if not ( type(frame) == "table" and frame.AddMessage ) then	-- Is first argument something with an .AddMessage member?
-		frame=nil
-	end
-	
-	for i=(frame and 2 or 1), select("#", ...) do
-		text = text .. tostring( select( i, ...) ) .." "
-	end
-	(frame or DEFAULT_CHAT_FRAME):AddMessage( text )
-end
-
-
--- AceConsole:RegisterChatCommand(. command, func, persist )
---
--- command (string) - chat command to be registered WITHOUT leading "/"
--- func (function|membername) - function to call, or self[membername](self, ...) call
--- persist (boolean) - false: the command will be soft disabled/enabled when aceconsole is used as a mixin (default: true)
---
--- Register a simple chat command
-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)
-		end
-	else
-		SlashCmdList[name] = func
-	end
-	_G["SLASH_"..name.."1"] = "/"..command:lower()
-	AceConsole.commands[command] = name
-	-- non-persisting commands are registered for enabling disabling
-	if not persist then
-		if not AceConsole.weakcommands[self] then AceConsole.weakcommands[self] = {} end
-		AceConsole.weakcommands[self][command] = func
-	end
-	return true
-end
-
-
--- AceConsole:UnregisterChatCommand( command )
--- 
--- Unregister a chatcommand
-function AceConsole:UnregisterChatCommand( command )
-	local name = AceConsole.commands[command]
-	if name then
-		SlashCmdList[name] = nil
-		_G["SLASH_" .. name .. "1"] = nil
-		hash_SlashCmdList["/" .. command:upper()] = nil
-		AceConsole.commands[command] = nil
-	end
-end
-
-function AceConsole:IterateChatCommands() return pairs(AceConsole.commands) end
-
-
-local function nils(n, ...)
-	if n>1 then
-		return nil, nils(n-1, ...)
-	elseif n==1 then
-		return nil, ...
-	else
-		return ...
-	end
-end
-	
-
--- AceConsole:GetArgs(string, numargs, startpos)
---
--- Retreive one or more space-separated arguments from a string. 
--- Treats quoted strings and itemlinks as non-spaced.
---
---   string   - The raw argument string
---   numargs  - How many arguments to get (default 1)
---   startpos - Where in the string to start scanning (default  1)
---
--- Returns arg1, arg2, ..., nextposition
--- Missing arguments will be returned as nils. 'nextposition' is returned as 1e9 at the end of the string.
-
-function AceConsole:GetArgs(str, numargs, startpos)
-	numargs = numargs or 1
-	startpos = max(startpos or 1, 1)
-	
-	local pos=startpos
-
-	-- find start of new arg
-	pos = strfind(str, "[^ ]", pos)
-	if not pos then	-- whoops, end of string
-		return nils(numargs, 1e9)
-	end
-
-	if numargs<1 then
-		return pos
-	end
-
-	-- quoted or space separated? find out which pattern to use
-	local delim_or_pipe
-	local ch = strsub(str, pos, pos)
-	if ch=='"' then
-		pos = pos + 1
-		delim_or_pipe='([|"])'
-	elseif ch=="'" then
-		pos = pos + 1
-		delim_or_pipe="([|'])"
-	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
-				-- It's a |T....|t  texture
-				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
-
-
---- embedding and embed handling
-
-local mixins = {
-	"Print",
-	"RegisterChatCommand", 
-	"UnregisterChatCommand",
-	"GetArgs",
-} 
-
--- AceConsole:Embed( target )
--- target (object) - target object to embed AceBucket in
---
--- Embeds AceConsole into the target object making the functions from the mixins list available on target:..
-function AceConsole:Embed( target )
-	for k, v in pairs( mixins ) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
-function AceConsole:OnEmbedEnable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:RegisterChatCommand( command, func, false, true ) -- nonpersisting and silent registry
-		end
-	end
-end
-
-function AceConsole:OnEmbedDisable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:UnregisterChatCommand( command ) -- TODO: this could potentially unregister a command from another application in case of command conflicts. Do we care?
-		end
-	end
-end
-
-for addon in pairs(AceConsole.embeds) do
-	AceConsole:Embed(addon)
-end
diff --git a/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.xml b/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.xml
deleted file mode 100644
index be9f47c..0000000
--- a/Cauldron/Libs/AceConsole-3.0/AceConsole-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceDB-3.0/AceDB-3.0.lua b/Cauldron/Libs/AceDB-3.0/AceDB-3.0.lua
deleted file mode 100644
index bc494f0..0000000
--- a/Cauldron/Libs/AceDB-3.0/AceDB-3.0.lua
+++ /dev/null
@@ -1,626 +0,0 @@
---[[ $Id: AceDB-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 8
-local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
-
-if not AceDB then return end -- No upgrade needed
-
-local type = type
-local pairs, next = pairs, next
-local rawget, rawset = rawget, rawset
-local setmetatable = setmetatable
-
-AceDB.db_registry = AceDB.db_registry or {}
-AceDB.frame = AceDB.frame or CreateFrame("Frame")
-
-local CallbackHandler
-local CallbackDummy = { Fire = function() end }
-
-local DBObjectLib = {}
-
---[[-------------------------------------------------------------------------
-	AceDB Utility Functions
----------------------------------------------------------------------------]]
-
--- Simple shallow copy for copying defaults
-local function copyTable(src, dest)
-	if type(dest) ~= "table" then dest = {} end
-	if type(src) == "table" then
-		for k,v in pairs(src) do
-			if type(v) == "table" then
-				-- try to index the key first so that the metatable creates the defaults, if set, and use that table
-				v = copyTable(v, dest[k])
-			end
-			dest[k] = v
-		end
-	end
-	return dest
-end
-
--- Called to add defaults to a section of the database
---
--- When a ["*"] default section is indexed with a new key, a table is returned
--- and set in the host table.  These tables must be cleaned up by removeDefaults
--- in order to ensure we don't write empty default tables.
-local function copyDefaults(dest, src)
-	-- this happens if some value in the SV overwrites our default value with a non-table
-	--if type(dest) ~= "table" then return end
-	for k, v in pairs(src) do
-		if k == "*" or k == "**" then
-			if type(v) == "table" then
-				-- This is a metatable used for table defaults
-				local mt = {
-					-- This handles the lookup and creation of new subtables
-					__index = function(t,k)
-							if k == nil then return nil end
-							local tbl = {}
-							copyDefaults(tbl, v)
-							rawset(t, k, tbl)
-							return tbl
-						end,
-				}
-				setmetatable(dest, mt)
-				-- handle already existing tables in the SV
-				for dk, dv in pairs(dest) do
-					if not rawget(src, dk) and type(dv) == "table" then
-						copyDefaults(dv, v)
-					end
-				end
-			else
-				-- Values are not tables, so this is just a simple return
-				local mt = {__index = function(t,k) return k~=nil and v or nil end}
-				setmetatable(dest, mt)
-			end
-		elseif type(v) == "table" then
-			if not rawget(dest, k) then rawset(dest, k, {}) end
-			if type(dest[k]) == "table" then
-				copyDefaults(dest[k], v)
-				if src['**'] then
-					copyDefaults(dest[k], src['**'])
-				end
-			end
-		else
-			if rawget(dest, k) == nil then
-				rawset(dest, k, v)
-			end
-		end
-	end
-end
-
--- Called to remove all defaults in the default table from the database
-local function removeDefaults(db, defaults, blocker)
-	for k,v in pairs(defaults) do
-		if k == "*" or k == "**" then
-			if type(v) == "table" then
-				-- Loop through all the actual k,v pairs and remove
-				for key, value in pairs(db) do
-					if type(value) == "table" then
-						-- if the key was not explicitly specified in the defaults table, just strip everything from * and ** tables
-						if defaults[key] == nil and (not blocker or blocker[key] == nil) then
-							removeDefaults(value, v)
-							-- if the table is empty afterwards, remove it
-							if not next(value) then
-								db[key] = nil
-							end
-						-- if it was specified, only strip ** content, but block values which were set in the key table
-						elseif k == "**" then 
-							removeDefaults(value, v, defaults[key])
-						end
-					end
-				end
-			elseif k == "*" then
-				-- check for non-table default
-				for key, value in pairs(db) do
-					if defaults[key] == nil and v == value then
-						db[key] = nil
-					end
-				end
-			end
-		elseif type(v) == "table" and type(db[k]) == "table" then
-			-- if a blocker was set, dive into it, to allow multi-level defaults
-			removeDefaults(db[k], v, blocker and blocker[k])
-			if not next(db[k]) then
-				db[k] = nil
-			end
-		else
-			-- check if the current value matches the default, and that its not blocked by another defaults table
-			if db[k] == defaults[k] and (not blocker or blocker[k] == nil) then
-				db[k] = nil
-			end
-		end
-	end
-	-- remove all metatables from the db
-	setmetatable(db, nil)
-end
-
--- This is called when a table section is first accessed, to set up the defaults
-local function initSection(db, section, svstore, key, defaults)
-	local sv = rawget(db, "sv")
-	
-	local tableCreated
-	if not sv[svstore] then sv[svstore] = {} end
-	if not sv[svstore][key] then
-		sv[svstore][key] = {}
-		tableCreated = true
-	end
-	
-	local tbl = sv[svstore][key]
-	
-	if defaults then
-		copyDefaults(tbl, defaults)
-	end
-	rawset(db, section, tbl)
-	
-	return tableCreated, tbl
-end
-
--- Metatable to handle the dynamic creation of sections and copying of sections.
-local dbmt = {
-	__index = function(t, section)
-			local keys = rawget(t, "keys")
-			local key = keys[section]
-			if key then
-				local defaultTbl = rawget(t, "defaults")
-				local defaults = defaultTbl and defaultTbl[section]
-				
-				if section == "profile" then
-					local new = initSection(t, section, "profiles", key, defaults)
-					if new then
-						-- Callback: OnNewProfile, database, newProfileKey
-						t.callbacks:Fire("OnNewProfile", t, key)
-					end
-				elseif section == "profiles" then
-					local sv = rawget(t, "sv")
-					if not sv.profiles then sv.profiles = {} end
-					rawset(t, "profiles", sv.profiles)
-				elseif section == "global" then
-					local sv = rawget(t, "sv")
-					if not sv.global then sv.global = {} end
-					if defaults then
-						copyDefaults(sv.global, defaults)
-					end
-					rawset(t, section, sv.global)
-				else
-					initSection(t, section, section, key, defaults)
-				end
-			end
-			
-			return rawget(t, section)
-		end
-}
-
-local function validateDefaults(defaults, keyTbl, offset)
-	if not defaults then return end
-	offset = offset or 0
-	for k in pairs(defaults) do
-		if not keyTbl[k] or k == "profiles" then
-			error(("Usage: AceDBObject:RegisterDefaults(defaults): '%s' is not a valid datatype."):format(k), 3 + offset)
-		end
-	end
-end
-
-local preserve_keys = {
-	["callbacks"] = true,
-	["RegisterCallback"] = true,
-	["UnregisterCallback"] = true,
-	["UnregisterAllCallbacks"] = true,
-	["children"] = true,
-}
-
-local realmKey = GetRealmName()
-local charKey = UnitName("player") .. " - " .. realmKey
-local _, classKey = UnitClass("player")
-local _, raceKey = UnitRace("player")
-local factionKey = UnitFactionGroup("player")
-local factionrealmKey = factionKey .. " - " .. realmKey
--- Actual database initialization function
-local function initdb(sv, defaults, defaultProfile, olddb, parent)
-	-- Generate the database keys for each section
-	
-	-- Make a container for profile keys
-	if not sv.profileKeys then sv.profileKeys = {} end
-	
-	-- Try to get the profile selected from the char db
-	local profileKey = sv.profileKeys[charKey] or defaultProfile or charKey
-	sv.profileKeys[charKey] = profileKey
-	
-	-- This table contains keys that enable the dynamic creation 
-	-- of each section of the table.  The 'global' and 'profiles'
-	-- have a key of true, since they are handled in a special case
-	local keyTbl= {
-		["char"] = charKey,
-		["realm"] = realmKey,
-		["class"] = classKey,
-		["race"] = raceKey,
-		["faction"] = factionKey,
-		["factionrealm"] = factionrealmKey,
-		["profile"] = profileKey,
-		["global"] = true,
-		["profiles"] = true,
-	}
-	
-	validateDefaults(defaults, keyTbl, 1)
-	
-	-- This allows us to use this function to reset an entire database
-	-- Clear out the old database
-	if olddb then
-		for k,v in pairs(olddb) do if not preserve_keys[k] then olddb[k] = nil end end
-	end
-	
-	-- Give this database the metatable so it initializes dynamically
-	local db = setmetatable(olddb or {}, dbmt)
-	
-	if not rawget(db, "callbacks") then 
-		-- try to load CallbackHandler-1.0 if it loaded after our library
-		if not CallbackHandler then CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0", true) end
-		db.callbacks = CallbackHandler and CallbackHandler:New(db) or CallbackDummy
-	end
-	
-	-- Copy methods locally into the database object, to avoid hitting
-	-- the metatable when calling methods
-	
-	if not parent then
-		for name, func in pairs(DBObjectLib) do
-			db[name] = func
-		end
-	else
-		-- hack this one in
-		db.RegisterDefaults = DBObjectLib.RegisterDefaults
-		db.ResetProfile = DBObjectLib.ResetProfile
-	end
-	
-	-- Set some properties in the database object
-	db.profiles = sv.profiles
-	db.keys = keyTbl
-	db.sv = sv
-	--db.sv_name = name
-	db.defaults = defaults
-	db.parent = parent
-	
-	-- store the DB in the registry
-	AceDB.db_registry[db] = true
-	
-	return db
-end
-
--- handle PLAYER_LOGOUT
--- strip all defaults from all databases
-local function logoutHandler(frame, event)
-	if event == "PLAYER_LOGOUT" then
-		for db in pairs(AceDB.db_registry) do
-			db.callbacks:Fire("OnDatabaseShutdown", db)
-			for section, key in pairs(db.keys) do
-				if db.defaults and db.defaults[section] and rawget(db, section) then
-					removeDefaults(db[section], db.defaults[section])
-				end
-			end
-		end
-	end
-end
-
-AceDB.frame:RegisterEvent("PLAYER_LOGOUT")
-AceDB.frame:SetScript("OnEvent", logoutHandler)
-
-
---[[-------------------------------------------------------------------------
-	AceDB Object Method Definitions
----------------------------------------------------------------------------]]
-
--- DBObject:RegisterDefaults(defaults)
--- defaults (table) - A table of defaults for this database
---
--- Sets the defaults table for the given database object by clearing any
--- that are currently set, and then setting the new defaults.
-function DBObjectLib:RegisterDefaults(defaults)
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
-	end
-	
-	validateDefaults(defaults, self.keys)
-	
-	-- Remove any currently set defaults
-	if self.defaults then
-		for section,key in pairs(self.keys) do
-			if self.defaults[section] and rawget(self, section) then
-				removeDefaults(self[section], self.defaults[section])
-			end
-		end
-	end
-	
-	-- Set the DBObject.defaults table
-	self.defaults = defaults
-	
-	-- Copy in any defaults, only touching those sections already created
-	if defaults then
-		for section,key in pairs(self.keys) do
-			if defaults[section] and rawget(self, section) then
-				copyDefaults(self[section], defaults[section])
-			end
-		end
-	end
-end
-
--- DBObject:SetProfile(name)
--- name (string) - The name of the profile to set as the current profile
---
--- Changes the profile of the database and all of it's namespaces to the
--- supplied named profile
-function DBObjectLib:SetProfile(name)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
-	end
-	
-	-- changing to the same profile, dont do anything
-	if name == self.keys.profile then return end
-	
-	local oldProfile = self.profile
-	local defaults = self.defaults and self.defaults.profile
-	
-	if oldProfile and defaults then
-		-- Remove the defaults from the old profile
-		removeDefaults(oldProfile, defaults)
-	end
-	
-	self.profile = nil
-	self.keys["profile"] = name
-	self.sv.profileKeys[charKey] = name
-
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.SetProfile(db, name)
-		end
-	end
-	
-	-- Callback: OnProfileChanged, database, newProfileKey
-	self.callbacks:Fire("OnProfileChanged", self, name)
-end
-
--- DBObject:GetProfiles(tbl)
--- tbl (table) - A table to store the profile names in (optional)
---
--- Returns a table with the names of the existing profiles in the database.
--- You can optionally supply a table to re-use for this purpose.
-function DBObjectLib:GetProfiles(tbl)
-	if tbl and type(tbl) ~= "table" then
-		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
-	end
-
-	-- Clear the container table
-	if tbl then
-		for k,v in pairs(tbl) do tbl[k] = nil end
-	else
-		tbl = {}
-	end
-
-	local curProfile = self.keys.profile
-	
-	local i = 0
-	for profileKey in pairs(self.profiles) do
-		i = i + 1
-		tbl[i] = profileKey
-		if curProfile and profileKey == curProfile then curProfile = nil end
-	end
-
-	-- Add the current profile, if it hasn't been created yet
-	if curProfile then
-		i = i + 1
-		tbl[i] = curProfile
-	end
-	
-	return tbl, i
-end
-
--- DBObject:GetCurrentProfile()
---
--- Returns the current profile name used by the database
-function DBObjectLib:GetCurrentProfile()
-	return self.keys.profile
-end
-
--- DBObject:DeleteProfile(name)
--- name (string) - The name of the profile to be deleted
---
--- Deletes a named profile.  This profile must not be the active profile.
-function DBObjectLib:DeleteProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
-	end
-	
-	if self.keys.profile == name then
-		error("Cannot delete the active profile in an AceDBObject.", 2)
-	end
-	
-	if not rawget(self.sv.profiles, name) and not silent then
-		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
-	end
-	
-	self.sv.profiles[name] = nil
-	
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.DeleteProfile(db, name, true)
-		end
-	end
-	
-	-- Callback: OnProfileDeleted, database, profileKey
-	self.callbacks:Fire("OnProfileDeleted", self, name)
-end
-
--- DBObject:CopyProfile(name)
--- name (string) - The name of the profile to be copied into the current profile
---
--- Copies a named profile into the current profile, overwriting any conflicting
--- settings.
-function DBObjectLib:CopyProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
-	end
-	
-	if name == self.keys.profile then
-		error("Cannot have the same source and destination profiles.", 2)
-	end
-	
-	if not rawget(self.sv.profiles, name) and not silent then
-		error("Cannot copy profile '" .. name .. "'. It does not exist.", 2)
-	end
-	
-	-- Reset the profile before copying
-	DBObjectLib.ResetProfile(self)
-	
-	local profile = self.profile
-	local source = self.sv.profiles[name]
-	
-	copyTable(source, profile)
-	
-	-- populate to child namespaces
-	if self.children then
-		for _, db in pairs(self.children) do
-			DBObjectLib.CopyProfile(db, name, true)
-		end
-	end
-	
-	-- Callback: OnProfileCopied, database, sourceProfileKey
-	self.callbacks:Fire("OnProfileCopied", self, name)
-end
-
--- DBObject:ResetProfile()
--- noChildren (boolean) - if set to true, the reset will not be populated to the child namespaces of this DB object
---
--- Resets the current profile
-function DBObjectLib:ResetProfile(noChildren)
-	local profile = self.profile
-	
-	for k,v in pairs(profile) do
-		profile[k] = nil
-	end
-	
-	local defaults = self.defaults and self.defaults.profile
-	if defaults then
-		copyDefaults(profile, defaults)
-	end
-	
-	-- populate to child namespaces
-	if self.children and not noChildren then
-		for _, db in pairs(self.children) do
-			DBObjectLib.ResetProfile(db)
-		end
-	end
-	
-	-- Callback: OnProfileReset, database
-	self.callbacks:Fire("OnProfileReset", self)
-end
-
--- DBObject:ResetDB(defaultProfile)
--- defaultProfile (string) - The profile name to use as the default
---
--- Resets the entire database, using the string defaultProfile as the default
--- profile.
-function DBObjectLib:ResetDB(defaultProfile)
-	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
-	end
-	
-	local sv = self.sv
-	for k,v in pairs(sv) do
-		sv[k] = nil
-	end
-	
-	local parent = self.parent
-	
-	initdb(sv, self.defaults, defaultProfile, self)
-	
-	-- fix the child namespaces
-	if self.children then
-		if not sv.namespaces then sv.namespaces = {} end
-		for name, db in pairs(self.children) do
-			if not sv.namespaces[name] then sv.namespaces[name] = {} end
-			initdb(sv.namespaces[name], db.defaults, self.keys.profile, db, self)
-		end
-	end
-	
-		-- Callback: OnDatabaseReset, database
-	self.callbacks:Fire("OnDatabaseReset", self)
-	-- Callback: OnProfileChanged, database, profileKey
-	self.callbacks:Fire("OnProfileChanged", self, self.keys["profile"])
-	
-	return self
-end
-
--- DBObject:RegisterNamespace(name [, defaults])
--- name (string) - The name of the new namespace
--- defaults (table) - A table of values to use as defaults
---
--- Creates a new database namespace, directly tied to the database.  This
--- is a full scale database in it's own rights other than the fact that
--- it cannot control its profile individually
-function DBObjectLib:RegisterNamespace(name, defaults)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
-	end
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'defaults' - table or nil expected.", 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)
-	end
-	
-	local sv = self.sv
-	if not sv.namespaces then sv.namespaces = {} end
-	if not sv.namespaces[name] then
-		sv.namespaces[name] = {}
-	end
-	
-	local newDB = initdb(sv.namespaces[name], defaults, self.keys.profile, nil, self)
-	
-	if not self.children then self.children = {} end
-	self.children[name] = newDB
-	return newDB
-end
-
---[[-------------------------------------------------------------------------
-	AceDB Exposed Methods
----------------------------------------------------------------------------]]
-
--- AceDB:New(name, defaults, defaultProfile)
--- name (table or string) - The name of variable, or table to use for the database
--- defaults (table) - A table of database defaults
--- defaultProfile (string) - The name of the default profile
---
--- Creates a new database object that can be used to handle database settings
--- and profiles.
-function AceDB:New(tbl, defaults, defaultProfile)
-	if type(tbl) == "string" then
-		local name = tbl
-		tbl = getglobal(name)
-		if not tbl then
-			tbl = {}
-			setglobal(name, tbl)
-		end
-	end
-	
-	if type(tbl) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'tbl' - table expected.", 2)
-	end
-	
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaults' - table expected.", 2)
-	end
-	
-	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string expected.", 2)
-	end
-	
-	return initdb(tbl, defaults, defaultProfile)
-end
-
--- upgrade existing databases
-for db in pairs(AceDB.db_registry) do
-	if not db.parent then
-		for name,func in pairs(DBObjectLib) do
-			db[name] = func
-		end
-	else
-		db.RegisterDefaults = DBObjectLib.RegisterDefaults
-	end
-end
diff --git a/Cauldron/Libs/AceDB-3.0/AceDB-3.0.xml b/Cauldron/Libs/AceDB-3.0/AceDB-3.0.xml
deleted file mode 100644
index 46b20ba..0000000
--- a/Cauldron/Libs/AceDB-3.0/AceDB-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.lua b/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.lua
deleted file mode 100644
index 2952531..0000000
--- a/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.lua
+++ /dev/null
@@ -1,76 +0,0 @@
---[[ $Id: AceEvent-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
-local MAJOR, MINOR = "AceEvent-3.0", 3
-local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceEvent then return end
-
-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, 
-		"RegisterEvent", "UnregisterEvent", "UnregisterAllEvents")
-end
-
-function AceEvent.events:OnUsed(target, eventname) 
-	AceEvent.frame:RegisterEvent(eventname)
-end
-
-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, 
-		"RegisterMessage", "UnregisterMessage", "UnregisterAllMessages"
-	)
-	AceEvent.SendMessage = AceEvent.messages.Fire
-end
-
---- embedding and embed handling
-local mixins = {
-	"RegisterEvent", "UnregisterEvent",
-	"RegisterMessage", "UnregisterMessage",
-	"SendMessage",
-	"UnregisterAllEvents", "UnregisterAllMessages",
-} 
-
--- AceEvent:Embed( target )
--- target (object) - target object to embed AceEvent in
---
--- Embeds AceEvent into the target object making the functions from the mixins list available on target:..
-function AceEvent:Embed(target)
-	for k, v in pairs(mixins) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
--- AceEvent:OnEmbedDisable( target )
--- target (object) - target object that is being disabled
---
--- Unregister all events messages etc when the target disables.
--- this method should be called by the target manually or by an addon framework
-function AceEvent:OnEmbedDisable(target)
-	target:UnregisterAllEvents()
-	target:UnregisterAllMessages()
-end
-
--- Script to fire blizzard events into the event listeners
-local events = AceEvent.events
-AceEvent.frame:SetScript("OnEvent", function(this, event, ...)
-	events:Fire(event, ...)
-end)
-
---- Finally: upgrade our old embeds
-for target, v in pairs(AceEvent.embeds) do
-	AceEvent:Embed(target)
-end
diff --git a/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.xml b/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.xml
deleted file mode 100644
index 313ef4d..0000000
--- a/Cauldron/Libs/AceEvent-3.0/AceEvent-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.lua b/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.lua
deleted file mode 100644
index 983bcca..0000000
--- a/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.lua
+++ /dev/null
@@ -1,703 +0,0 @@
---[[ $Id: AceGUI-3.0.lua,v 1.2 2009/01/18 03:14:51 cipher Exp $ ]]
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 16
-local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
-
-if not AceGUI then return end -- No upgrade needed
-
---local con = LibStub("AceConsole-3.0",true)
-
-AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {}
-AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
-AceGUI.WidgetBase = AceGUI.WidgetBase or {}
-AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {}
-AceGUI.WidgetVersions = AceGUI.WidgetVersions or {}
- 
--- local upvalues
-local WidgetRegistry = AceGUI.WidgetRegistry
-local LayoutRegistry = AceGUI.LayoutRegistry
-local WidgetVersions = AceGUI.WidgetVersions
-
-local pcall = pcall
-local select = select
-local pairs = pairs
-local ipairs = ipairs
-local type = type
-local assert = assert
-local tinsert = tinsert
-local tremove = tremove
-local CreateFrame = CreateFrame
-local UIParent = UIParent
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-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", table.concat(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, ...)
-end
-
--- Recycling functions
-local new, del
-do
-	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
-	function new(type,constructor,...)
-		if not type then
-			type = "table"
-		end
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-		local newObj = tremove(objPools[type])
-		if not newObj then
-			newObj = constructor and constructor(...) or {}
-		end
-		return newObj
-	end
-	-- Releases an instance to the Pool
-	function del(obj,type)
-		if not type then
-			type = "table"
-		end
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-		for i,v in ipairs(objPools[type]) do
-			if v == obj then
-				error("Attempt to Release Widget that is already released")
-				return
-			end
-		end
-		tinsert(objPools[type],obj)
-	end
-end
-
-
--------------------
--- API Functions --
--------------------
-
--- Gets a widget Object
-
-function AceGUI:Create(type)
-	local reg = WidgetRegistry
-	if reg[type] then
-		local widget = new(type,reg[type])
-
-		if rawget(widget,'Acquire') then
-			widget.OnAcquire = widget.Acquire
-			widget.Acquire = nil
-		elseif rawget(widget,'Aquire') then
-			widget.OnAcquire = widget.Aquire
-			widget.Aquire = nil
-		end
-		
-		if rawget(widget,'Release') then
-			widget.OnRelease = rawget(widget,'Release') 
-			widget.Release = nil
-		end
-		
-		if widget.OnAcquire then
-			widget:OnAcquire()
-		else
-			error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
-		end		
-		safecall(widget.ResumeLayout, widget)
-		return widget
-	end
-end
-
--- Releases a widget Object
-function AceGUI:Release(widget)
-	safecall( widget.PauseLayout, widget )
-	widget:Fire("OnRelease")
-	safecall( widget.ReleaseChildren, widget )
-
-	if widget.OnRelease then
-		widget:OnRelease()
-	else
-		error(("Widget type %s doesn't supply an OnRelease Function"):format(type))
-	end
-	for k in pairs(widget.userdata) do
-		widget.userdata[k] = nil
-	end
-	for k in pairs(widget.events) do
-		widget.events[k] = nil
-	end
-	widget.width = nil	
-	--widget.frame:SetParent(nil)
-	widget.frame:ClearAllPoints()
-	widget.frame:Hide()
-	widget.frame:SetParent(nil)
-	if widget.content then
-		widget.content.width = nil
-		widget.content.height = nil
-	end
-	del(widget,widget.type)
-end
-
------------
--- Focus --
------------
-
------
--- Called when a widget has taken focus
--- e.g. Dropdowns opening, Editboxes gaining kb focus
------
-function AceGUI:SetFocus(widget)
-	if self.FocusedWidget and self.FocusedWidget ~= widget then
-		safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget)
-	end
-	self.FocusedWidget = widget
-end
-
------
--- Called when something has happened that could cause widgets with focus to drop it
--- e.g. titlebar of a frame being clicked
------
-function AceGUI:ClearFocus()
-	if self.FocusedWidget then
-		safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget)
-		self.FocusedWidget = nil
-	end
-end
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		OnAcquire() - Called when the object is acquired, should set everything to a default hidden state
-		OnRelease() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-		:OnWidthSet(width) - Called when the width of the widget is changed
-		:OnHeightSet(height) - Called when the height of the widget is changed
-			Widgets should not use the OnSizeChanged events of thier frame or content members, use these methods instead
-			AceGUI already sets a handler to the event
-		:OnLayoutFinished(width, height) - called after a layout has finished, the width and height will be the width and height of the
-			area used for controls. These can be nil if the layout used the existing size to layout the controls.
-
-]]
-
---------------------------
--- Widget Base Template --
---------------------------
-do
-	local function fixlevels(parent,...)
-		local i = 1
-		local child = select(i, ...)
-		while child do
-			child:SetFrameLevel(parent:GetFrameLevel()+1)
-			fixlevels(child, child:GetChildren())
-			i = i + 1
-			child = select(i, ...)
-		end
-	end
-	
-	local WidgetBase = AceGUI.WidgetBase 
-	
-	WidgetBase.SetParent = function(self, parent)
-		local frame = self.frame
-		frame:SetParent(nil)
-		frame:SetParent(parent.content)
-		self.parent = parent
-		fixlevels(parent.frame,parent.frame:GetChildren())
-	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, ...)
-			if success then
-				return ret
-			end
-		end
-	end
-	
-	WidgetBase.SetWidth = function(self, width)
-		self.frame:SetWidth(width)
-		self.frame.width = width
-		if self.OnWidthSet then
-			self:OnWidthSet(width)
-		end
-	end
-	
-	WidgetBase.SetHeight = function(self, height)
-		self.frame:SetHeight(height)
-		self.frame.height = height
-		if self.OnHeightSet then
-			self:OnHeightSet(height)
-		end
-	end
-
-	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.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	
-	
-	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"
-		else
-			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"
-		else
-			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()
---		if not self.parent then
---			self.frame:SetScript("OnUpdate", LayoutOnUpdate)
---		end
-	end
-	
-	WidgetContainerBase.AddChild = function(self, child)
-		tinsert(self.children,child)
-		child:SetParent(self)
-		child.frame:Show()
-		self:DoLayout()
-	end
-	
-	WidgetContainerBase.ReleaseChildren = function(self)
-		local children = self.children
-		for i in ipairs(children) do
-			AceGUI:Release(children[i])
-			children[i] = nil
-		end
-	end
-	
-	WidgetContainerBase.SetLayout = function(self, Layout)
-		self.LayoutFunc = AceGUI:GetLayout(Layout)
-	end
-
-	local function FrameResize(this)
-		local self = this.obj
-		if this:GetWidth() and this:GetHeight() then
-			if self.OnWidthSet then
-				self:OnWidthSet(this:GetWidth())
-			end
-			if self.OnHeightSet then
-				self:OnHeightSet(this:GetHeight())
-			end
-		end
-	end
-	
-	local function ContentResize(this)
-		if this:GetWidth() and this:GetHeight() then
-			this.width = this:GetWidth()
-			this.height = this:GetHeight()
-			this.obj:DoLayout()
-		end
-	end
-
-	setmetatable(WidgetContainerBase,{__index=WidgetBase})
-
-	--One of these function should be called on each Widget Instance as part of its creation process
-	function AceGUI:RegisterAsContainer(widget)
-		widget.children = {}
-		widget.userdata = {}
-		widget.events = {}
-		widget.base = WidgetContainerBase
-		widget.content.obj = widget
-		widget.frame.obj = widget
-		widget.content:SetScript("OnSizeChanged",ContentResize)
-		widget.frame:SetScript("OnSizeChanged",FrameResize)
-		setmetatable(widget,{__index=WidgetContainerBase})
-		widget:SetLayout("List")
-	end
-	
-	function AceGUI:RegisterAsWidget(widget)
-		widget.userdata = {}
-		widget.events = {}
-		widget.base = WidgetBase
-		widget.frame.obj = widget
-		widget.frame:SetScript("OnSizeChanged",FrameResize)
-		setmetatable(widget,{__index=WidgetBase})
-	end
-end
-
-
-
-
-------------------
--- Widget API   --
-------------------
--- Registers a widget Constructor, this function returns a new instance of the Widget
-function AceGUI:RegisterWidgetType(Name, Constructor, Version)
-	assert(type(Constructor) == "function")
-	assert(type(Version) == "number") 
-	
-	local oldVersion = WidgetVersions[Name]
-	if oldVersion and oldVersion >= Version then return end
-	
-	WidgetVersions[Name] = Version
-	WidgetRegistry[Name] = Constructor
-end
-
--- Registers a Layout Function
-function AceGUI:RegisterLayout(Name, LayoutFunc)
-	assert(type(LayoutFunc) == "function")
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	LayoutRegistry[Name] = LayoutFunc
-end
-
-function AceGUI:GetLayout(Name)
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	return LayoutRegistry[Name]
-end
-
-AceGUI.counts = AceGUI.counts or {}
-
-function AceGUI:GetNextWidgetNum(type)
-	if not self.counts[type] then
-		self.counts[type] = 0
-	end
-	self.counts[type] = self.counts[type] + 1
-	return self.counts[type]
-end
-
---[[ Widget Template
-
---------------------------
--- Widget Name		  --
---------------------------
-do
-	local Type = "Type"
-	
-	local function OnAcquire(self)
-
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.frame = frame
-		frame.obj = self
-
-		--Container Support
-		--local content = CreateFrame("Frame",nil,frame)
-		--self.content = content
-		
-		--AceGUI:RegisterAsContainer(self)
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor)
-end
-
-
-]]
-
--------------
--- Layouts --
--------------
-
---[[
-	A Layout is a func that takes 2 parameters
-		content - the frame that widgets will be placed inside
-		children - a table containing the widgets to layout
-
-]]
-
--- Very simple Layout, Children are stacked on top of each other down the left side
-AceGUI:RegisterLayout("List",
-	 function(content, children)
-	 
-	 	local height = 0
-	 	local width = content.width or content:GetWidth() or 0
-		for i, child in ipairs(children) do
-			
-			
-			local frame = child.frame
-			frame:ClearAllPoints()
-			frame:Show()
-			if i == 1 then
-				frame:SetPoint("TOPLEFT",content,"TOPLEFT",0,0)
-			else
-				frame:SetPoint("TOPLEFT",children[i-1].frame,"BOTTOMLEFT",0,0)
-			end
-			
-			if child.width == "fill" then
-				child:SetWidth(width)
-				frame:SetPoint("RIGHT",content,"RIGHT")
-				if child.OnWidthSet then
-					child:OnWidthSet(content.width or content:GetWidth())
-				end
-				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 )
-	 end
-	)
-	
--- A single control fills the whole content area
-AceGUI:RegisterLayout("Fill",
-	 function(content, children)
-		if children[1] then
-			children[1]:SetWidth(content:GetWidth() or 0)
-			children[1]:SetHeight(content:GetHeight() or 0)
-			children[1].frame:SetAllPoints(content)
-			children[1].frame:Show()
-			safecall( content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight() )
-		end
-	 end
-	)
-	
-AceGUI:RegisterLayout("Flow",
-	 function(content, children)
-	 	--used height so far
-	 	local height = 0
-	 	--width used in the current row
-	 	local usedwidth = 0
-	 	--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 
-		for i, child in ipairs(children) do
-			oversize = nil
-			local frame = child.frame
-			local frameheight = frame.height or frame:GetHeight() or 0
-			local framewidth = frame.width or frame:GetWidth() or 0
-			lastframeoffset = frameoffset
-			frameoffset = child.alignoffset or (frameheight / 2)
-			
-			frame:Show()
-			frame:ClearAllPoints()
-			if i == 1 then
-				-- anchor the first control to the top left
-				--frame:SetPoint("TOPLEFT",content,"TOPLEFT",0,0)
-				rowheight = frameheight
-				rowoffset = frameoffset
-				rowstart = frame
-				rowstartoffset = frameoffset
-				usedwidth = framewidth
-				if usedwidth > width then
-					oversize = true
-				end
-			else
-				-- if there isn't available width for the control start a new row
-				-- if a control is "fill" it will be on a row of its own full width
-				if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then
-					--anchor the previous row, we will now know its height and offset
-					rowstart:SetPoint("TOPLEFT",content,"TOPLEFT",0,-(height+(rowoffset-rowstartoffset)+3))
-					height = height + rowheight + 3
-					--save this as the rowstart so we can anchor it after the row is complete and we have the max height and offset of controls in it
-					rowstart = frame
-					rowstartoffset = frameoffset
-					rowheight = frameheight
-					rowoffset = frameoffset
-					usedwidth = frame.width or frame:GetWidth()
-					if usedwidth > width then
-						oversize = true
-					end
-				-- put the control on the current row, adding it to the width and checking if the height needs to be increased
-				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)
-				frame:SetPoint("RIGHT",content,"RIGHT",0,0)
-				
-				usedwidth = 0
-				rowstart = frame
-				rowstartoffset = frameoffset
-				
-				if child.DoLayout then
-					child:DoLayout()
-				end
-				rowheight = frame.height or frame:GetHeight() or 0
-				rowoffset = child.alignoffset or (rowheight / 2)
-				rowstartoffset = rowoffset
-			elseif oversize then
-				if width > 1 then
-					frame:SetPoint("RIGHT",content,"RIGHT",0,0)
-				end
-			end
-			
-			if child.height == "fill" then
-				frame:SetPoint("BOTTOM",content,"BOTTOM")
-				isfullheight = true
-				break
-			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
-	)
diff --git a/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.xml b/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.xml
deleted file mode 100644
index b5e2379..0000000
--- a/Cauldron/Libs/AceGUI-3.0/AceGUI-3.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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="AceGUI-3.0.lua"/>
-	<Script file="widgets\AceGUIWidget-Button.lua"/>
-	<Script file="widgets\AceGUIWidget-CheckBox.lua"/>
-	<Script file="widgets\AceGUIWidget-ColorPicker.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDownGroup.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown-Items.lua"/>
-	<Script file="widgets\AceGUIWidget-EditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-Frame.lua"/>
-	<Script file="widgets\AceGUIWidget-Heading.lua"/>	
-	<Script file="widgets\AceGUIWidget-InlineGroup.lua"/>	
-	<Script file="widgets\AceGUIWidget-Keybinding.lua"/>	
-	<Script file="widgets\AceGUIWidget-ScrollFrame.lua"/>
-	<Script file="widgets\AceGUIWidget-SimpleGroup.lua"/>	
-	<Script file="widgets\AceGUIWidget-Slider.lua"/>	
-	<Script file="widgets\AceGUIWidget-TabGroup.lua"/>	
-	<Script file="widgets\AceGUIWidget-TreeGroup.lua"/>
-	<Script file="widgets\AceGUIWidget-Label.lua"/>
-	<Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-BlizOptionsGroup.lua"/>
-	<Script file="widgets\AceGUIWidget-Icon.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua
deleted file mode 100644
index 6a41f2d..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-BlizOptionsGroup.lua
+++ /dev/null
@@ -1,150 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		Acquire() - Called when the object is aquired, should set everything to a default hidden state
-		Release() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-
-
-]]
-
-----------------------------------
--- Blizzard Options Group	    --
-----------------------------------
---[[
-	Group Designed to be added to the bliz interface options panel
-]]
-
-do
-	local Type = "BlizOptionsGroup"
-	local Version = 6
-	
-	local function OnAcquire(self)
-
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self:SetName()
-	end
-	
-	local function okay(this)
-		this.obj:Fire("okay")
-	end
-	
-	local function cancel(this)
-		this.obj:Fire("cancel")
-	end
-	
-	local function defaults(this)
-		this.obj:Fire("defaults")
-	end
-	
-	local function SetName(self, name, parent)
-		self.frame.name = name
-		self.frame.parent = parent
-	end
-	
-	local function OnShow(this)
-		this.obj:Fire("OnShow")
-	end
-	
-	local function OnHide(this)
-		this.obj:Fire("OnHide")
-	end
-		
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 63
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 26
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-	local function SetTitle(self, title)
-		local content = self.content
-		content:ClearAllPoints()
-		if not title or title == "" then
-			content:SetPoint("TOPLEFT",self.frame,"TOPLEFT",15,-10)
-			self.label:SetText("")
-		else
-			content:SetPoint("TOPLEFT",self.frame,"TOPLEFT",15,-40)
-			self.label:SetText(title)
-		end
-		content:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",-10,10)
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame")
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.frame = frame
-		self.SetName = SetName
-		
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		self.SetTitle = SetTitle
-		
-		frame.obj = self
-		frame.okay = okay
-		frame.cancel = cancel
-		frame.defaults = defaults
-		
-		frame:Hide()
-		frame:SetScript("OnHide",OnHide)
-		frame:SetScript("OnShow",OnShow)
-		
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalLarge")
-		self.label = label
-		label:SetPoint("TOPLEFT", frame, "TOPLEFT", 15, -15)
-		label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45)
-		label:SetJustifyH("LEFT")
-		label:SetJustifyV("TOP")
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,frame)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",frame,"TOPLEFT",15,-10)
-		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-10,10)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
deleted file mode 100644
index 68de408..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
+++ /dev/null
@@ -1,81 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Button		        --
---------------------------
-do
-	local Type = "Button"
-	local Version = 7
-	
-	local function OnAcquire(self)
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self:SetDisabled(false)
-	end
-	
-	local function Button_OnClick(this)
-		this.obj:Fire("OnClick")
-		AceGUI:ClearFocus()
-	end
-	
-	local function Button_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-	
-	local function Button_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-	
-	local function SetText(self, text)
-		self.text:SetText(text or "")
-	end
-	
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-	
-	local function Constructor()
-		local num  = AceGUI:GetNextWidgetNum(Type)
-		local frame = CreateFrame("Button","AceGUI30Button"..num,UIParent,"UIPanelButtonTemplate2")
-		local self = {}
-		self.num = num
-		self.type = Type
-		self.frame = frame
-
-		local text = frame:GetFontString()
-		self.text = text
-		text:SetPoint("LEFT",frame,"LEFT",15,0)
-		text:SetPoint("RIGHT",frame,"RIGHT",-15,0)
-
-		frame:SetScript("OnClick",Button_OnClick)
-		frame:SetScript("OnEnter",Button_OnEnter)
-		frame:SetScript("OnLeave",Button_OnLeave)
-
-		self.SetText = SetText
-		self.SetDisabled = SetDisabled
-		
-		frame:EnableMouse(true)
-
-		frame:SetHeight(24)
-		frame:SetWidth(200)
-	
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.frame = frame
-		frame.obj = self
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
deleted file mode 100644
index 8074c8a..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
+++ /dev/null
@@ -1,217 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Check Box			--
---------------------------
---[[
-	Events :
-		OnValueChanged
-
-]]
-do
-	local Type = "CheckBox"
-	local Version = 4
-	
-	local function OnAcquire(self)
-		self:SetValue(false)
-		self.tristate = nil
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.check:Hide()
-		self.highlight:Hide()
-		self.down = nil
-		self.checked = nil
-		self:SetType()
-		self:SetDisabled(false)
-	end
-  
-	local function CheckBox_OnEnter(this)
-		local self = this.obj
-		if not self.disabled then
-			self.highlight:Show()
-		end
-		self:Fire("OnEnter")
-	end
-	
-	local function CheckBox_OnLeave(this)
-		local self = this.obj
-		if not self.down then
-			self.highlight:Hide()
-		end
-		self:Fire("OnLeave")
-	end
-	
-	local function CheckBox_OnMouseUp(this)
-		local self = this.obj
-		if not self.disabled then
-			self:ToggleChecked()
-			self:Fire("OnValueChanged",self.checked)
-			self.text:SetPoint("LEFT",self.check,"RIGHT",0,0)
-		end
-		self.down = nil
-	end
-	
-	local function CheckBox_OnMouseDown(this)
-		local self = this.obj
-		if not self.disabled then
-			self.text:SetPoint("LEFT",self.check,"RIGHT",1,-1)
-			self.down = true
-		end
-		AceGUI:ClearFocus()
-	end
-
-	local function SetDisabled(self,disabled)
-		self.disabled = disabled
-		if disabled then
-			self.text:SetTextColor(0.5,0.5,0.5)
-			SetDesaturation(self.check, true)
-		else
-			self.text:SetTextColor(1,1,1)
-			if self.tristate and self.checked == nil then
-				SetDesaturation(self.check, true)
-			else
-				SetDesaturation(self.check, false)
-			end
-		end
-	end
-	
-	local function SetValue(self,value)
-		local check = self.check
-		self.checked = value
-		if value then
-			SetDesaturation(self.check, false)
-			check:SetWidth(24)
-			check:SetHeight(24)
-			self.check:Show()
-		else
-			--Nil is the unknown tristate value
-			if self.tristate and value == nil then
-				SetDesaturation(self.check, true)
-				check:SetWidth(20)
-				check:SetHeight(20)
-				self.check:Show()
-			else
-				SetDesaturation(self.check, false)
-				check:SetWidth(24)
-				check:SetHeight(24)
-				self.check:Hide()
-			end
-		end
-	end
-	
-	local function SetTriState(self, enabled)
-		self.tristate = enabled
-		self:SetValue(self:GetValue())
-	end
-	
-	local function GetValue(self)
-		return self.checked
-	end
-	
-	local function SetType(self, type)
-		local checkbg = self.checkbg
-		local check = self.check
-		local highlight = self.highlight
-	
-		if type == "radio" then
-			checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			checkbg:SetTexCoord(0,0.25,0,1)
-			check:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			check:SetTexCoord(0.5,0.75,0,1)
-			check:SetBlendMode("ADD")
-			highlight:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			highlight:SetTexCoord(0.5,0.75,0,1)
-		else
-			checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
-			checkbg:SetTexCoord(0,1,0,1)
-			check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-			check:SetTexCoord(0,1,0,1)
-			check:SetBlendMode("BLEND")
-			highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
-			highlight:SetTexCoord(0,1,0,1)
-		end
-	end
-	
-	local function ToggleChecked(self)
-		local value = self:GetValue()
-		if self.tristate then
-			--cycle in true, nil, false order
-			if value then
-				self:SetValue(nil)
-			elseif value == nil then
-				self:SetValue(false)
-			else
-				self:SetValue(true)
-			end
-		else
-			self:SetValue(not self:GetValue())
-		end
-	end
-	
-	local function SetLabel(self, label)
-		self.text:SetText(label)
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Button",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		self.SetDisabled = SetDisabled
-		self.SetType = SetType
-		self.ToggleChecked = ToggleChecked
-		self.SetLabel = SetLabel
-		self.SetTriState = SetTriState
-		
-		self.frame = frame
-		frame.obj = self
-	
-		local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight")
-		self.text = text
-	
-		frame:SetScript("OnEnter",CheckBox_OnEnter)
-		frame:SetScript("OnLeave",CheckBox_OnLeave)
-		frame:SetScript("OnMouseUp",CheckBox_OnMouseUp)
-		frame:SetScript("OnMouseDown",CheckBox_OnMouseDown)
-		frame:EnableMouse()
-		local checkbg = frame:CreateTexture(nil,"ARTWORK")
-		self.checkbg = checkbg
-		checkbg:SetWidth(24)
-		checkbg:SetHeight(24)
-		checkbg:SetPoint("LEFT",frame,"LEFT",0,0)
-		checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
-		local check = frame:CreateTexture(nil,"OVERLAY")
-		self.check = check
-		check:SetWidth(24)
-		check:SetHeight(24)
-		check:SetPoint("CENTER",checkbg,"CENTER",0,0)
-		check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-	
-		local highlight = frame:CreateTexture(nil, "BACKGROUND")
-		self.highlight = highlight
-		highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
-		highlight:SetBlendMode("ADD")
-		highlight:SetAllPoints(checkbg)
-		highlight:Hide()
-		
-		text:SetJustifyH("LEFT")
-		frame:SetHeight(24)
-		frame:SetWidth(200)
-		text:SetHeight(18)
-		text:SetPoint("LEFT",check,"RIGHT",0,0)
-		text:SetPoint("RIGHT",frame,"RIGHT",0,0)
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
deleted file mode 100644
index c5cce81..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
+++ /dev/null
@@ -1,170 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- ColorPicker		  --
---------------------------
-do
-	local Type = "ColorPicker"
-	local Version = 9
-	
-	local function OnAcquire(self)
-		self.HasAlpha = false
-		self:SetColor(0,0,0,1)
-	end
-	
-	local function SetLabel(self, text)
-		self.text:SetText(text)
-	end
-
-	local function SetColor(self,r,g,b,a)
-		self.r = r
-		self.g = g
-		self.b = b
-		self.a = a or 1
-		self.colorSwatch:SetVertexColor(r,g,b,a)
-	end
-
-	local function Control_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Control_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-	
-	local function SetHasAlpha(self, HasAlpha)
-		self.HasAlpha = HasAlpha
-	end
-
-	local function ColorCallback(self,r,g,b,a,isAlpha)
-		if not self.HasAlpha then
-			a = 1
-		end
-		self:SetColor(r,g,b,a)
-		if ColorPickerFrame:IsVisible() then
-			--colorpicker is still open
-
-			self:Fire("OnValueChanged",r,g,b,a)
-		else
-			--colorpicker is closed, color callback is first, ignore it,
-			--alpha callback is the final call after it closes so confirm now
-			if isAlpha then
-				self:Fire("OnValueConfirmed",r,g,b,a)
-			end
-		end
-	end
-	
-	local function ColorSwatch_OnClick(this)
-		HideUIPanel(ColorPickerFrame)
-		local self = this.obj
-		if not self.disabled then
-			ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG")
-			
-			ColorPickerFrame.func = function()
-				local r,g,b = ColorPickerFrame:GetColorRGB()
-				local a = 1 - OpacitySliderFrame:GetValue()
-				ColorCallback(self,r,g,b,a)
-			end
-			
-			ColorPickerFrame.hasOpacity = self.HasAlpha
-			ColorPickerFrame.opacityFunc = function()
-				local r,g,b = ColorPickerFrame:GetColorRGB()
-				local a = 1 - OpacitySliderFrame:GetValue()
-				ColorCallback(self,r,g,b,a,true)
-			end
-			local r, g, b, a = self.r, self.g, self.b, self.a
-			if self.HasAlpha then
-				ColorPickerFrame.opacity = 1 - (a or 0)
-			end
-			ColorPickerFrame:SetColorRGB(r, g, b)
-			
-			ColorPickerFrame.cancelFunc = function()
-				ColorCallback(self,r,g,b,a,true)
-			end
-			ShowUIPanel(ColorPickerFrame)
-		end
-		AceGUI:ClearFocus()
-	end
-
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if self.disabled then
-			self.text:SetTextColor(0.5,0.5,0.5)
-		else
-			self.text:SetTextColor(1,1,1)
-		end
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Button",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.SetLabel = SetLabel
-		self.SetColor = SetColor
-		self.SetDisabled = SetDisabled
-		self.SetHasAlpha = SetHasAlpha
-		
-		self.frame = frame
-		frame.obj = self
-		
-		local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight")
-		self.text = text
-		text:SetJustifyH("LEFT")
-		text:SetTextColor(1,1,1)
-		frame:SetHeight(24)
-		frame:SetWidth(200)
-		text:SetHeight(24)
-		frame:SetScript("OnClick", ColorSwatch_OnClick)
-		frame:SetScript("OnEnter",Control_OnEnter)
-		frame:SetScript("OnLeave",Control_OnLeave)
-	
-		local colorSwatch = frame:CreateTexture(nil, "OVERLAY")
-		self.colorSwatch = colorSwatch
-		colorSwatch:SetWidth(19)
-		colorSwatch:SetHeight(19)
-		colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch")
-		local texture = frame:CreateTexture(nil, "BACKGROUND")
-		colorSwatch.texture = texture
-		texture:SetWidth(16)
-		texture:SetHeight(16)
-		texture:SetTexture(1,1,1)
-		texture:Show()
-		
-		local checkers = frame:CreateTexture(nil, "BACKGROUND")
-		colorSwatch.checkers = checkers
-		checkers:SetTexture("Tileset\\Generic\\Checkers")
-		checkers:SetDesaturated(true)
-		checkers:SetVertexColor(1,1,1,0.75)
-		checkers:SetTexCoord(.25,0,0.5,.25)
-		checkers:SetWidth(14)
-		checkers:SetHeight(14)
-		checkers:Show()
-	
-		local highlight = frame:CreateTexture(nil, "BACKGROUND")
-		self.highlight = highlight
-		highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
-		highlight:SetBlendMode("ADD")
-		highlight:SetAllPoints(frame)
-		highlight:Hide()
-	
-		texture:SetPoint("CENTER", colorSwatch, "CENTER")
-		checkers:SetPoint("CENTER", colorSwatch, "CENTER")
-		colorSwatch:SetPoint("LEFT", frame, "LEFT", 0, 0)
-		text:SetPoint("LEFT",colorSwatch,"RIGHT",2,0)
-		text:SetPoint("RIGHT",frame,"RIGHT")
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
deleted file mode 100644
index 1cbb2b3..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
+++ /dev/null
@@ -1,453 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]--
-
-local AceGUI = LibStub("AceGUI-3.0")
-
-local function fixlevels(parent,...)
-	local i = 1
-	local child = select(i, ...)
-	while child do
-		child:SetFrameLevel(parent:GetFrameLevel()+1)
-		fixlevels(child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-local function fixstrata(strata, parent, ...)
-	local i = 1
-	local child = select(i, ...)
-	parent:SetFrameStrata(strata)
-	while child do
-		fixstrata(strata, child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
--- ItemBase is the base "class" for all dropdown items.
--- Each item has to use ItemBase.Create(widgetType) to
--- create an initial 'self' value. 
--- ItemBase will add common functions and ui event handlers.
--- Be sure to keep basic usage when you override functions.
-
-local ItemBase = {
-	-- NOTE: The ItemBase version is added to each item's version number
-	--       to ensure proper updates on ItemBase changes.
-	--       Use at least 1000er steps.
-	version = 1000,
-	counter = 0,
-}
-
-function ItemBase.Frame_OnEnter(this)
-	local self = this.obj
-
-	if self.useHighlight then
-		self.highlight:Show()
-	end
-	self:Fire("OnEnter")
-	
-	if self.specialOnEnter then
-		self.specialOnEnter(self)
-	end
-end
-
-function ItemBase.Frame_OnLeave(this)
-	local self = this.obj
-	
-	self.highlight:Hide()
-	self:Fire("OnLeave")
-	
-	if self.specialOnLeave then
-		self.specialOnLeave(self)
-	end
-end
-
--- exported, AceGUI callback
-function ItemBase.OnAcquire(self)
-	self.frame:SetToplevel(true)
-	self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-end
-
--- exported, AceGUI callback
-function ItemBase.OnRelease(self)
-	self:SetDisabled(false)
-	self.pullout = nil
-	self.frame:SetParent(nil)
-	self.frame:ClearAllPoints()
-	self.frame:Hide()
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       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
-	fixlevels(pullout.itemFrame, pullout.itemFrame:GetChildren())
-end
-
--- exported
-function ItemBase.SetText(self, text)
-	self.text:SetText(text or "")
-end
-
--- exported
-function ItemBase.GetText(self)
-	return self.text:GetText()
-end
-
--- exported
-function ItemBase.SetPoint(self, ...)
-	self.frame:SetPoint(...)
-end
-
--- exported
-function ItemBase.Show(self)
-	self.frame:Show()
-end
-
--- exported
-function ItemBase.Hide(self)
-	self.frame:Hide()
-end
-
--- exported
-function ItemBase.SetDisabled(self, disabled)
-	self.disabled = disabled
-	if disabled then
-		self.useHighlight = false
-		self.text:SetTextColor(.5, .5, .5)
-	else
-		self.useHighlight = true
-		self.text:SetTextColor(1, 1, 1)
-	end
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       Do not call this method directly
-function ItemBase.SetOnLeave(self, func)
-	self.specialOnLeave = func
-end
-
--- exported
--- NOTE: this is called by a Dropdown-Pullout.
---       Do not call this method directly
-function ItemBase.SetOnEnter(self, func)
-	self.specialOnEnter = func
-end
-
-function ItemBase.Create(type)
-	-- NOTE: Most of the following code is copied from AceGUI-3.0/Dropdown widget
-	local count = AceGUI:GetNextWidgetNum(type)
-	local frame = CreateFrame("Button", "AceGUI30DropDownItem"..count)
-	local self = {}
-	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")
-	text:SetPoint("TOPLEFT",frame,"TOPLEFT",18,0)
-	text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-8,0)
-	self.text = text
-
-	local highlight = frame:CreateTexture(nil, "OVERLAY")
-	highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
-	highlight:SetBlendMode("ADD")
-	highlight:SetHeight(14)
-	highlight:ClearAllPoints()
-	highlight:SetPoint("RIGHT",frame,"RIGHT",-3,0)
-	highlight:SetPoint("LEFT",frame,"LEFT",5,0)
-	highlight:Hide()
-	self.highlight = highlight
-
-	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:Hide()
-	self.check = check
-
-	local sub = frame:CreateTexture("OVERLAY")
-	sub:SetWidth(16)
-	sub:SetHeight(16)
-	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
-	sub:SetTexture("Interface\\ChatFrame\\ChatFrameExpandArrow")
-	sub:Hide()
-	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
-
---[[
-	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
---]]
-
--- Item: Header
--- A single text entry.
--- Special: Different text color and no highlight
-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)
-		if not disabled then
-			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
-
--- Item: Execute
--- A simple button
-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
-		self:Fire("OnClick")
-		if self.pullout then
-			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
-
--- Item: Toggle
--- Some sort of checkbox for dropdown menus.
--- Does not close the pullout on click.
-do
-	local widgetType = "Dropdown-Item-Toggle"
-	local widgetVersion = 2
-	
-	local function UpdateToggle(self)
-		if self.value then
-			self.check:Show()
-		else
-			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
-		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
-
--- Item: Menu
--- Shows a submenu on mouse over
--- Does not close the pullout on click
-do
-	local widgetType = "Dropdown-Item-Menu"
-	local widgetVersion = 1
-	
-	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
-	function SetMenu(self, menu)
-		assert(menu.type == "Dropdown-Pullout")
-		self.submenu = menu
-	end
-		
-	-- exported
-	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
-
--- Item: Separator
--- A single line to separate items
-do
-	local widgetType = "Dropdown-Item-Separator"
-	local widgetVersion = 1
-	
-	-- 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: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/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
deleted file mode 100644
index 4ea49c8..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
+++ /dev/null
@@ -1,684 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]--
-local min, max, floor = math.min, math.max, math.floor
-
-local AceGUI = LibStub("AceGUI-3.0")
-
-local function fixlevels(parent,...)
-	local i = 1
-	local child = select(i, ...)
-	while child do
-		child:SetFrameLevel(parent:GetFrameLevel()+1)
-		fixlevels(child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-local function fixstrata(strata, parent, ...)
-	local i = 1
-	local child = select(i, ...)
-	parent:SetFrameStrata(strata)
-	while child do
-		fixstrata(strata, child, child:GetChildren())
-		i = i + 1
-		child = select(i, ...)
-	end
-end
-
-do
-	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 2
-	
-	--[[ Static data ]]--
-	
-	local backdrop = {
-		bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background",
-		edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
-		edgeSize = 32,
-		tileSize = 32,
-		tile = true,
-		insets = { left = 11, right = 12, top = 12, bottom = 11 },
-	}
-	local sliderBackdrop  = {
-		bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
-		edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
-		tile = true, tileSize = 8, edgeSize = 8,
-		insets = { left = 3, right = 3, top = 3, bottom = 3 }
-	}
-
-	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
-	local function OnEnter(item)
-		local self = item.pullout
-		for k, v in ipairs(self.items) do
-			if v.CloseMenu and v ~= item then
-				v:CloseMenu()
-			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
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-
-		local offset
-		if height > viewheight then
-			offset = 0
-		else
-			offset = floor((viewheight - height) / 1000 * value)
-		end
-		child:ClearAllPoints()
-		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		
-	end
-	
-	-- exported
-	local function MoveScroll(self, value)
-		local status = self.scrollStatus
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-
-		if height > viewheight then
-			self.slider:Hide()
-		else
-			self.slider:Show()
-			local diff = height - viewheight
-			local delta = 1
-			if value < 0 then
-				delta = -1
-			end
-			self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
-		end
-	end
-	
-	-- exported
-	local function FixScroll(self)
-		local status = self.scrollStatus
-		local frame, child = self.scrollFrame, self.itemFrame
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-		local offset = status.offset or 0
-
-		if viewheight < height then
-			self.slider:Hide()
-			child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset)
-			self.slider:SetValue(0)
-		else
-			self.slider:Show()			
-			local value = (offset / (viewheight - height) * 1000)
-			if value > 1000 then value = 1000 end
-			self.slider:SetValue(value)
-			self:SetScroll(value)
-			if value < 1000 then
-				child:ClearAllPoints()
-				child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
-				child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset)
-				status.offset = offset
-			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 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:Show()
-			
-			height = height + 16
-		end
-		itemFrame:SetHeight(height)
-		fixstrata("TOOLTIP", frame, frame:GetChildren())
-		frame:Show()
-		self:Fire("OnOpen")
-	end	
-	
-	-- exported
-	local function Close(self)
-		self.frame:Hide()
-		self:Fire("OnClose")
-	end	
-	
-	-- exported
-	local function Clear(self)
-		local items = self.items
-		for i, item in pairs(items) do
-			AceGUI:Release(item)
-			items[i] = nil
-		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
-		if self.frame:GetHeight() > height then
-			self.frame:SetHeight(height)
-		elseif (self.itemFrame:GetHeight() + 34) < height then
-			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 self = {}
-		self.count = count
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		
-		self.OnAcquire = OnAcquire
-		self.OnRelease = OnRelease
-
-		self.AddItem = AddItem
-		self.Open    = Open
-		self.Close   = Close
-		self.Clear   = Clear
-		self.IterateItems = IterateItems
-		self.SetHideOnLeave = SetHideOnLeave
-
-		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: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)
-		slider:SetOrientation("VERTICAL")
-		slider:SetHitRectInsets(0, 0, -10, 0)
-		slider:SetBackdrop(sliderBackdrop)
-		slider:SetWidth(8)
-		slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Vertical")
-		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)
-		scrollFrame:EnableMouseWheel(true)
-		scrollFrame:SetScript("OnMouseWheel", OnMouseWheel)
-		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 = 18
-	
-	--[[ Static data ]]--
-	
-	--[[ UI event handler ]]--
-	
-	local function Control_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-	
-	local function Control_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Dropdown_OnHide(this)
-		local self = this.obj
-		if self.open then
-			self.pullout:Close()
-		end
-	end
-	
-	local function Dropdown_TogglePullout(this)
-		local self = this.obj
-		if self.open then
-			self.open = nil
-			self.pullout:Close()
-			AceGUI:ClearFocus()
-		else
-			self.open = true
-			self.pullout:SetWidth(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
-	end
-
-	local function OnPulloutClose(this)
-		local self = this.userdata.obj
-		self.open = nil
-		self:Fire("OnClosed")
-	end
-	
-	local function ShowMultiText(self)
-		local text
-		for i, widget in self.pullout:IterateItems() do
-			if widget.type == "Dropdown-Item-Toggle" then
-				if widget:GetValue() then
-					if text then
-						text = text..", "..widget:GetText()
-					else
-						text = widget:GetText()
-					end
-				end
-			end
-		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)
-		else
-			if checked then
-				self:SetValue(this.userdata.value)
-				self:Fire("OnValueChanged", this.userdata.value)
-			else
-				this:SetValue(true)
-			end
-			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")
-		self.pullout = pullout
-		pullout.userdata.obj = self
-		pullout:SetCallback("OnClose", OnPulloutClose)
-		pullout:SetCallback("OnOpen", OnPulloutOpen)
-		self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1)
-		fixlevels(self.pullout.frame, self.pullout.frame:GetChildren())
-	end
-	
-	-- exported, AceGUI callback
-	local function OnRelease(self)
-		if self.open then
-			self.pullout:Close()
-		end
-		AceGUI:Release(self.pullout)
-		
-		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.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.button: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)
-		else
-			self.label:SetText("")
-			self.label:Hide()
-			self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0)
-			self.frame:SetHeight(26)
-		end
-	end
-	
-	-- exported
-	local function SetValue(self, value)
-		if self.list then
-			self:SetText(self.list[value] or "")
-		end
-		self.value = value
-	end
-	
-	-- exported
-	local function SetItemValue(self, item, value)
-		if not self.multiselect then return end
-		for i, widget in self.pullout:IterateItems() do
-			if widget.userdata.value == item then
-				if widget.SetValue then
-					widget:SetValue(value)
-				end
-			end
-		end
-		ShowMultiText(self)
-	end
-	
-	-- exported
-	local function SetItemDisabled(self, item, disabled)
-		for i, widget in self.pullout:IterateItems() do
-			if widget.userdata.value == item then
-				widget:SetDisabled(disabled)
-			end
-		end
-	end
-	
-	local function AddListItem(self, value, text)
-		local item = AceGUI:Create("Dropdown-Item-Toggle")
-		item:SetText(text)
-		item.userdata.obj = self
-		item.userdata.value = value
-		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")
-			close:SetText(CLOSE)
-			self.pullout:AddItem(close)
-			self.hasClose = true		
-		end
-	end
-	
-	-- exported
-	local sortlist = {}
-	local function SetList(self, list)
-		self.list = list
-		self.pullout:Clear()
-		self.hasClose = nil
-		if not list then return end
-		
-		for v in pairs(list) do
-			sortlist[#sortlist + 1] = v
-		end
-		table.sort(sortlist)
-		
-		for i, value in pairs(sortlist) do
-			AddListItem(self, value, list[value])
-			sortlist[i] = nil
-		end
-		if self.multiselect then
-			ShowMultiText(self)
-			AddCloseButton(self)
-		end
-	end
-	
-	-- exported
-	local function AddItem(self, value, text)
-		if self.list then
-			self.list[value] = text
-			AddListItem(self, value, text)
-		end
-	end
-	
-	-- exported
-	local function SetMultiselect(self, multi)
-		self.multiselect = multi
-		if multi then
-			ShowMultiText(self)
-			AddCloseButton(self)
-		end
-	end
-	
-	-- exported
-	local function GetMultiselect(self)
-		return self.multiselect
-	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
-		self.dropdown = dropdown
-		self.count = count
-		frame.obj = self
-		dropdown.obj = self
-		
-		self.OnRelease   = OnRelease
-		self.OnAcquire   = OnAcquire
-		
-		self.ClearFocus  = ClearFocus
-
-		self.SetText     = SetText
-		self.SetValue    = SetValue
-		self.SetList     = SetList
-		self.SetLabel    = SetLabel
-		self.SetDisabled = SetDisabled
-		self.AddItem     = AddItem
-		self.SetMultiselect = SetMultiselect
-		self.GetMultiselect = GetMultiselect
-		self.SetItemValue = SetItemValue
-		self.SetItemDisabled = SetItemDisabled
-		
-		self.alignoffset = 31
-		
-		frame:SetHeight(44)
-		frame:SetWidth(200)
-		frame:SetScript("OnHide",Dropdown_OnHide)
-
-		dropdown:ClearAllPoints()
-		dropdown:SetPoint("TOPLEFT",frame,"TOPLEFT",-15,0)
-		dropdown:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",17,0)
-		dropdown:SetScript("OnHide", nil)
-
-		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)
-
-		local button = _G[dropdown:GetName() .. "Button"]
-		self.button = button
-		button.obj = self
-		button:SetScript("OnEnter",Control_OnEnter)
-		button:SetScript("OnLeave",Control_OnLeave)
-		button: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)
-		label:SetJustifyH("LEFT")
-		label:SetHeight(18)
-		label:Hide()
-		self.label = label
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-end	
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua
deleted file mode 100644
index 9ce8f0e..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDownGroup.lua
+++ /dev/null
@@ -1,157 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---[[
-	Selection Group controls all have an interface to select a group for thier contents
-	None of them will auto size to thier contents, and should usually be used with a scrollframe
-	unless you know that the controls will fit inside
-]]
-
---------------------------
--- Dropdown Group		--
---------------------------
---[[
-	Events :
-		OnGroupSelected
-
-]]
-do
-	local Type = "DropdownGroup"
-	local Version = 9
-	
-	local function OnAcquire(self)
-		self.dropdown:SetText("")
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.dropdown.list = nil
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end
-
-	local PaneBackdrop  = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 5, bottom = 3 }
-	}
-	
-	local function SetTitle(self,title)
-		self.titletext:SetText(title)
-	end
-	
-
-	local function SelectedGroup(self,event,value)
-		local group = self.parentgroup
-		local status = group.status or group.localstatus
-		status.selected = value
-		self.parentgroup:Fire("OnGroupSelected", value)
-	end
-	
-	local function SetGroupList(self,list)
-		self.dropdown:SetList(list)
-	end
-	
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end
-	
-	local function SetGroup(self,group)
-		self.dropdown:SetValue(group)
-		local status = self.status or self.localstatus
-		status.selected = group
-		self:Fire("OnGroupSelected", group)
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 26
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 63
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame")
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.SetTitle = SetTitle
-		self.SetGroupList = SetGroupList
-		self.SetGroup = SetGroup
-		self.SetStatusTable = SetStatusTable
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		
-		self.localstatus = {}
-
-		self.frame = frame
-		frame.obj = self
-		
-		
-		frame:SetHeight(100)
-		frame:SetWidth(100)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		titletext:SetPoint("TOPLEFT",frame,"TOPLEFT",14,0)
-		titletext:SetPoint("TOPRIGHT",frame,"TOPRIGHT",-14,0)
-		titletext:SetJustifyH("LEFT")
-		titletext:SetHeight(18)
-		
-		
-		self.titletext = titletext	
-		
-		local dropdown = AceGUI:Create("Dropdown")
-		self.dropdown = dropdown
-		dropdown.frame:SetParent(frame)
-		dropdown.parentgroup = self
-		dropdown:SetCallback("OnValueChanged",SelectedGroup)
-		
-		dropdown.frame:SetPoint("TOPLEFT",titletext,"BOTTOMLEFT",-7,3)
-		dropdown.frame:Show()
-		dropdown:SetLabel("")
-		
-		local border = CreateFrame("Frame",nil,frame)
-		self.border = border
-		border:SetPoint("TOPLEFT",frame,"TOPLEFT",3,-40)
-		border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-3,3)
-		
-		border:SetBackdrop(PaneBackdrop)
-		border:SetBackdropColor(0.1,0.1,0.1,0.5)
-		border:SetBackdropBorderColor(0.4,0.4,0.4)
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,border)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10)
-		content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
deleted file mode 100644
index b53a41d..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
+++ /dev/null
@@ -1,204 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Edit box			 --
---------------------------
---[[
-	Events :
-		OnTextChanged
-		OnEnterPressed
-
-]]
-do
-	local Type = "EditBox"
-	local Version = 8
-
-	local function OnAcquire(self)
-		self:SetDisabled(false)
-		self.showbutton = true
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self:SetDisabled(false)
-	end
-	
-	local function Control_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-	
-	local function Control_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-	
-	local function EditBox_OnEscapePressed(this)
-		this:ClearFocus()
-	end
-	
-	local function ShowButton(self)
-		if self.showbutton then
-			self.button:Show()
-			self.editbox:SetTextInsets(0,20,3,3)
-		end
-	end
-	
-	local function HideButton(self)
-		self.button:Hide()
-		self.editbox:SetTextInsets(0,0,3,3)
-	end
-	
-	local function EditBox_OnEnterPressed(this)
-		local self = this.obj
-		local value = this:GetText()
-		local cancel = self:Fire("OnEnterPressed",value)
-		if not cancel then
-			HideButton(self)
-		end
-	end
-	
-	local function Button_OnClick(this)
-		local editbox = this.obj.editbox
-		editbox:ClearFocus()
-		EditBox_OnEnterPressed(editbox)
-	end
-	
-	local function EditBox_OnReceiveDrag(this)
-		local self = this.obj
-		local type, id, info = GetCursorInfo()
-		if type == "item" then
-			self:SetText(info)
-			self:Fire("OnEnterPressed",info)
-			ClearCursor()
-		elseif type == "spell" then
-			local name, rank = GetSpellName(id, info)
-			if rank and rank:match("%d") then
-				name = name.."("..rank..")"
-			end
-			self:SetText(name)
-			self:Fire("OnEnterPressed",name)
-			ClearCursor()
-		end
-		HideButton(self)
-		AceGUI:ClearFocus()
-	end
-	
-	local function EditBox_OnTextChanged(this)
-		local self = this.obj
-		local value = this:GetText()
-		if value ~= self.lasttext then
-			self:Fire("OnTextChanged",value)
-			self.lasttext = value
-			ShowButton(self)
-		end
-	end
-	
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.editbox:EnableMouse(false)
-			self.editbox:ClearFocus()
-			self.editbox:SetTextColor(0.5,0.5,0.5)
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.editbox:EnableMouse(true)
-			self.editbox:SetTextColor(1,1,1)
-			self.label:SetTextColor(1,.82,0)
-		end
-	end
-	
-	local function SetText(self, text)
-		self.lasttext = text or ""
-		self.editbox:SetText(text or "")
-		self.editbox:SetCursorPosition(0)
-		HideButton(self)
-	end
-	
-	local function SetWidth(self, width)
-		self.frame:SetWidth(width)
-	end
-	
-	local function SetLabel(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			self.label:Show()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18)
-			self.frame:SetHeight(44)
-		else
-			self.label:SetText("")
-			self.label:Hide()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0)
-			self.frame:SetHeight(26)
-		end
-	end
-	
-
-	local function Constructor()
-		local num  = AceGUI:GetNextWidgetNum(Type)
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local editbox = CreateFrame("EditBox","AceGUI-3.0EditBox"..num,frame,"InputBoxTemplate")
-		
-		local self = {}
-		self.type = Type
-		self.num = num
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-
-		self.SetDisabled = SetDisabled
-		self.SetText = SetText
-		self.SetWidth = SetWidth
-		self.SetLabel = SetLabel
-		
-		self.frame = frame
-		frame.obj = self
-		self.editbox = editbox
-		editbox.obj = self
-		
-		self.alignoffset = 30
-		
-		frame:SetHeight(44)
-		frame:SetWidth(200)
-
-		editbox:SetScript("OnEnter",Control_OnEnter)
-		editbox:SetScript("OnLeave",Control_OnLeave)
-		
-		editbox:SetAutoFocus(false)
-		editbox:SetFontObject(ChatFontNormal)
-		editbox:SetScript("OnEscapePressed",EditBox_OnEscapePressed)
-		editbox:SetScript("OnEnterPressed",EditBox_OnEnterPressed)
-		editbox:SetScript("OnTextChanged",EditBox_OnTextChanged)
-		editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag)
-		editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag)
-
-		editbox:SetTextInsets(0,0,3,3)
-		editbox:SetMaxLetters(256)
-		
-		editbox:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",6,0)
-		editbox:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		editbox:SetHeight(19)
-		
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-2)
-		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,-2)
-		label:SetJustifyH("LEFT")
-		label:SetHeight(18)
-		self.label = label
-		
-		local button = CreateFrame("Button",nil,editbox,"UIPanelButtonTemplate")
-		button:SetWidth(40)
-		button:SetHeight(20)
-		button:SetPoint("RIGHT",editbox,"RIGHT",-2,0)
-		button:SetText(OKAY)
-		button:SetScript("OnClick", Button_OnClick)
-		button:Hide()
-		
-		self.button = button
-		button.obj = self
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua
deleted file mode 100644
index 748583e..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Frame.lua
+++ /dev/null
@@ -1,299 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
-----------------
--- Main Frame --
-----------------
---[[
-	Events :
-		OnClose
-
-]]
-do
-	local Type = "Frame"
-	local Version = 7
-
-	local FrameBackdrop = {
-		bgFile="Interface\\DialogFrame\\UI-DialogBox-Background",
-		edgeFile="Interface\\DialogFrame\\UI-DialogBox-Border", 
-		tile = true, tileSize = 32, edgeSize = 32, 
-		insets = { left = 8, right = 8, top = 8, bottom = 8 }
-	}
-
-	local PaneBackdrop  = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 5, bottom = 3 }
-	}
-
-	local function frameOnClose(this)
-		this.obj:Fire("OnClose")
-	end
-	
-	local function closeOnClick(this)
-		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()
-		local self = frame.obj
-		local status = self.status or self.localstatus
-		status.width = frame:GetWidth()
-		status.height = frame:GetHeight()
-		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
-
-	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")
-		self:ApplyStatus()
-	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
-		self:SetWidth(status.width or 700)
-		self:SetHeight(status.height or 500)
-		if status.top and status.left then
-			frame:SetPoint("TOP",UIParent,"BOTTOM",0,status.top)
-			frame:SetPoint("LEFT",UIParent,"LEFT",status.left,0)
-		else
-			frame:SetPoint("CENTER",UIParent,"CENTER")
-		end
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 34
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 57
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = "Frame"
-		
-		self.Hide = Hide
-		self.Show = Show
-		self.SetTitle =  SetTitle
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetStatusText = SetStatusText
-		self.SetStatusTable = SetStatusTable
-		self.ApplyStatus = ApplyStatus
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		
-		self.localstatus = {}
-		
-		self.frame = frame
-		frame.obj = self
-		frame:SetWidth(700)
-		frame:SetHeight(500)
-		frame:SetPoint("CENTER",UIParent,"CENTER",0,0)
-		frame:EnableMouse()
-		frame:SetMovable(true)
-		frame:SetResizable(true)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		frame:SetScript("OnMouseDown", frameOnMouseDown)
-		
-		frame:SetBackdrop(FrameBackdrop)
-		frame:SetBackdropColor(0,0,0,1)
-		frame:SetScript("OnHide",frameOnClose)
-		frame:SetMinResize(400,200)
-		frame:SetToplevel(true)
-		
-		local closebutton = CreateFrame("Button",nil,frame,"UIPanelButtonTemplate")
-		closebutton:SetScript("OnClick", closeOnClick)
-		closebutton:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-27,17)
-		closebutton:SetHeight(20)
-		closebutton:SetWidth(100)
-		closebutton:SetText("Close")
-		
-		self.closebutton = closebutton
-		closebutton.obj = self
-		
-		local statusbg = CreateFrame("Frame",nil,frame)
-		statusbg:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",15,15)
-		statusbg:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-132,15)
-		statusbg:SetHeight(24)
-		statusbg:SetBackdrop(PaneBackdrop)
-		statusbg:SetBackdropColor(0.1,0.1,0.1)
-		statusbg:SetBackdropBorderColor(0.4,0.4,0.4)
-		self.statusbg = statusbg
-		
-		local statustext = statusbg:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		self.statustext = statustext
-		statustext:SetPoint("TOPLEFT",statusbg,"TOPLEFT",7,-2)
-		statustext:SetPoint("BOTTOMRIGHT",statusbg,"BOTTOMRIGHT",-7,2)
-		statustext:SetHeight(20)
-		statustext:SetJustifyH("LEFT")
-		statustext:SetText("")
-		
-		local title = CreateFrame("Frame",nil,frame)
-		self.title = title
-		title:EnableMouse()
-		title:SetScript("OnMouseDown",titleOnMouseDown)
-		title:SetScript("OnMouseUp", frameOnMouseUp)
-		
-		
-		local titlebg = frame:CreateTexture(nil,"OVERLAY")
-		titlebg:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-		titlebg:SetTexCoord(0.31,0.67,0,0.63)
-		titlebg:SetPoint("TOP",frame,"TOP",0,12)
-		titlebg:SetWidth(100)
-		titlebg:SetHeight(40)
-
-		local titlebg_l = frame:CreateTexture(nil,"OVERLAY")
-		titlebg_l:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-		titlebg_l:SetTexCoord(0.21,0.31,0,0.63)
-		titlebg_l:SetPoint("RIGHT",titlebg,"LEFT",0,0)
-		titlebg_l:SetWidth(30)
-		titlebg_l:SetHeight(40)
-		
-		local titlebg_right = frame:CreateTexture(nil,"OVERLAY")
-		titlebg_right:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-		titlebg_right:SetTexCoord(0.67,0.77,0,0.63)
-		titlebg_right:SetPoint("LEFT",titlebg,"RIGHT",0,0)
-		titlebg_right:SetWidth(30)
-		titlebg_right:SetHeight(40)
-		
-		title:SetAllPoints(titlebg)			
-		local titletext = title:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		titletext:SetPoint("TOP",titlebg,"TOP",0,-14)
-	
-		self.titletext = titletext	
-		
-		local sizer_se = CreateFrame("Frame",nil,frame)
-		sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		sizer_se:SetWidth(25)
-		sizer_se:SetHeight(25)
-		sizer_se:EnableMouse()
-		sizer_se:SetScript("OnMouseDown",sizerseOnMouseDown)
-		sizer_se:SetScript("OnMouseUp", sizerOnMouseUp)
-		self.sizer_se = sizer_se
-
-		local line1 = sizer_se:CreateTexture(nil, "BACKGROUND")
-		self.line1 = line1
-		line1:SetWidth(14)
-		line1:SetHeight(14)
-		line1:SetPoint("BOTTOMRIGHT", -8, 8)
-		line1:SetTexture("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)
-
-		local line2 = sizer_se:CreateTexture(nil, "BACKGROUND")
-		self.line2 = line2
-		line2:SetWidth(8)
-		line2:SetHeight(8)
-		line2:SetPoint("BOTTOMRIGHT", -8, 8)
-		line2:SetTexture("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)
-
-		local sizer_s = CreateFrame("Frame",nil,frame)
-		sizer_s:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-25,0)
-		sizer_s:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0)
-		sizer_s:SetHeight(25)
-		sizer_s:EnableMouse()
-		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)
-		sizer_e:SetWidth(25)
-		sizer_e:EnableMouse()
-		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",17,-27)
-		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-17,40)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self	
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
deleted file mode 100644
index 87d0ba1..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Heading 	 			--
---------------------------
-do
-	local Type = "Heading"
-	local Version = 3
-	
-	local function OnAcquire(self)
-		self:SetText("")
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-	local function SetText(self, text)
-		self.label:SetText(text or "")
-		if (text or "") == "" then
-			self.left:SetPoint("RIGHT",self.frame,"RIGHT",-3,0)
-			self.right:Hide()
-		else
-			self.left:SetPoint("RIGHT",self.label,"LEFT",-5,0)
-			self.right:Show()
-		end
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-		
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetText = SetText
-		self.frame = frame
-		frame.obj = self
-		
-		frame:SetHeight(18)
-		
-		local label = frame:CreateFontString(nil,"BACKGROUND","GameFontNormal")
-		label:SetPoint("TOP",frame,"TOP",0,0)
-		label:SetPoint("BOTTOM",frame,"BOTTOM",0,0)
-		label:SetJustifyH("CENTER")
-		label:SetHeight(18)
-		self.label = label
-		
-		local left = frame:CreateTexture(nil, "BACKGROUND")
-		self.left = left
-		left:SetHeight(8)
-		left:SetPoint("LEFT",frame,"LEFT",3,0)
-		left:SetPoint("RIGHT",label,"LEFT",-5,0)
-		left:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-		left:SetTexCoord(0.81, 0.94, 0.5, 1)
-
-		local right = frame:CreateTexture(nil, "BACKGROUND")
-		self.right = right
-		right:SetHeight(8)
-		right:SetPoint("RIGHT",frame,"RIGHT",-3,0)
-		right:SetPoint("LEFT",label,"RIGHT",5,0)
-		right:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-		right:SetTexCoord(0.81, 0.94, 0.5, 1)
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
deleted file mode 100644
index a8b69ea..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
+++ /dev/null
@@ -1,99 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Label 	 			--
---------------------------
-do
-	local Type = "Icon"
-	local Version = 4
-	
-	local function OnAcquire(self)
-		self:SetText("")
-		self:SetImage(nil)
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-	local function SetText(self, text)
-		self.label:SetText(text or "")
-	end
-	
-	local function SetImage(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-		
-		if image:GetTexture() then
-			self.imageshown = true
-			local n = select('#', ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			end
-		else
-			self.imageshown = nil
-		end
-	end
-	
-	local function OnClick(this)
-		this.obj:Fire("OnClick")
-		AceGUI:ClearFocus()
-	end
-	
-	local function OnEnter(this)
-		this.obj.highlight:Show()
-	end
-	
-	local function OnLeave(this)
-		this.obj.highlight:Hide()
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Button",nil,UIParent)
-		local self = {}
-		self.type = Type
-		
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetText = SetText
-		self.frame = frame
-		self.SetImage = SetImage
-
-		frame.obj = self
-		
-		frame:SetHeight(110)
-		frame:SetWidth(110)
-		frame:EnableMouse(true)
-		frame:SetScript("OnClick", OnClick)
-		frame:SetScript("OnLeave", OnLeave)
-		frame:SetScript("OnEnter", OnEnter)
-		local label = frame:CreateFontString(nil,"BACKGROUND","GameFontHighlight")
-		label:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,10)
-		label:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,10)
-		label:SetJustifyH("CENTER")
-		label:SetJustifyV("TOP")
-		label:SetHeight(18)
-		self.label = label
-		
-		local image = frame:CreateTexture(nil,"BACKGROUND")
-		self.image = image
-		image:SetWidth(64)
-		image:SetHeight(64)
-		image:SetPoint("TOP",frame,"TOP",0,-10)
-		
-		local highlight = frame:CreateTexture(nil,"OVERLAY")
-		self.highlight = highlight
-		highlight:SetAllPoints(image)
-		highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight")
-		highlight:SetTexCoord(0,1,0.23,0.77)
-		highlight:SetBlendMode("ADD")
-		highlight:Hide()
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
-
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua
deleted file mode 100644
index 809bf83..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-InlineGroup.lua
+++ /dev/null
@@ -1,135 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		Acquire() - Called when the object is aquired, should set everything to a default hidden state
-		Release() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-
-
-]]
-
---------------------------
--- Inline Group		 --
---------------------------
---[[
-	This is a simple grouping container, no selection
-	It will resize automatically to the height of the controls added to it
-]]
-
-do
-	local Type = "InlineGroup"
-	local Version = 4
-	
-	local function OnAcquire(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local PaneBackdrop  = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 5, bottom = 3 }
-	}
-	
-	local function SetTitle(self,title)
-		self.titletext:SetText(title)
-	end
-
-
-	local function LayoutFinished(self, width, height)
-		self:SetHeight((height or 0) + 40)
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 20
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetTitle = SetTitle
-		self.frame = frame
-		self.LayoutFinished = LayoutFinished
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		
-		frame.obj = self
-		
-		frame:SetHeight(100)
-		frame:SetWidth(100)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		titletext:SetPoint("TOPLEFT",frame,"TOPLEFT",14,0)
-		titletext:SetPoint("TOPRIGHT",frame,"TOPRIGHT",-14,0)
-		titletext:SetJustifyH("LEFT")
-		titletext:SetHeight(18)
-		
-		self.titletext = titletext	
-		
-		local border = CreateFrame("Frame",nil,frame)
-		self.border = border
-		border:SetPoint("TOPLEFT",frame,"TOPLEFT",3,-17)
-		border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-3,3)
-		
-		border:SetBackdrop(PaneBackdrop)
-		border:SetBackdropColor(0.1,0.1,0.1,0.5)
-		border:SetBackdropBorderColor(0.4,0.4,0.4)
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,border)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10)
-		content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
deleted file mode 100644
index 3caec44..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
+++ /dev/null
@@ -1,217 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Keybinding  		    --
---------------------------
-
-do
-	local Type = "Keybinding"
-	local Version = 11
-
-	local ControlBackdrop  = {
-		bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 3, bottom = 3 }
-	}
-
-	local function Control_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Control_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-	
-	local function keybindingMsgFixWidth(this)
-		this:SetWidth(this.msg:GetWidth()+10)
-		this:SetScript("OnUpdate",nil)
-	end
-
-	local function Keybinding_OnClick(this, button)
-		if button == "LeftButton" or button == "RightButton" then
-			local self = this.obj
-			if self.waitingForKey then
-				this:EnableKeyboard(false)
-				self.msgframe:Hide()
-				this:UnlockHighlight()
-				self.waitingForKey = nil
-			else
-				this:EnableKeyboard(true)
-				self.msgframe:Show()
-				this:LockHighlight()
-				self.waitingForKey = true
-			end
-		end
-		AceGUI:ClearFocus()
-	end
-
-	local ignoreKeys = nil
-	local function Keybinding_OnKeyDown(this, key)
-		local self = this.obj
-		if self.waitingForKey then
-			local keyPressed = key
-			if keyPressed == "ESCAPE" then
-				keyPressed = ""
-			else
-				if not ignoreKeys then
-					ignoreKeys = {
-						["BUTTON1"] = true, ["BUTTON2"] = true,
-						["UNKNOWN"] = true,
-						["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true,
-						["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true,
-					}
-				end
-				if ignoreKeys[keyPressed] then return end
-				if IsShiftKeyDown() then
-					keyPressed = "SHIFT-"..keyPressed
-				end
-				if IsControlKeyDown() then
-					keyPressed = "CTRL-"..keyPressed
-				end
-				if IsAltKeyDown() then
-					keyPressed = "ALT-"..keyPressed
-				end
-			end
-	
-			this:EnableKeyboard(false)
-			self.msgframe:Hide()
-			this:UnlockHighlight()
-			self.waitingForKey = nil	
-			
-			if not self.disabled then
-				self:SetKey(keyPressed)
-				self:Fire("OnKeyChanged",keyPressed)
-			end
-		end
-	end
-	
-	local function Keybinding_OnMouseDown(this, button)
-		if button == "LeftButton" or button == "RightButton" then
-			return
-		elseif button == "MiddleButton" then
-			button = "BUTTON3"
-		elseif button == "Button4" then
-			button = "BUTTON4"
-		elseif button == "Button5" then
-			button = "BUTTON5"
-		end
-		Keybinding_OnKeyDown(this, button)
-	end
-	
-	local function OnAcquire(self)
-		self:SetLabel("")
-		self:SetKey("")
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.waitingForKey = nil
-		self.msgframe:Hide()
-	end
-	
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.button:Disable()
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.button:Enable()
-			self.label:SetTextColor(1,1,1)
-		end
-	end
-	
-	local function SetKey(self, key)
-		if (key or "") == "" then
-			self.button:SetText(NOT_BOUND)
-			self.button:SetNormalFontObject("GameFontNormal")
-		else
-			self.button:SetText(key)
-			self.button:SetNormalFontObject("GameFontHighlight")
-		end
-	end
-	
-	local function SetLabel(self, label)
-		self.label:SetText(label or "")
-		if (label or "") == "" then
-			self.alignoffset = nil
-			self:SetHeight(24)
-		else
-			self.alignoffset = 30
-			self:SetHeight(44)
-		end
-	end
-
-	local function Constructor()
-		local num  = AceGUI:GetNextWidgetNum(Type)
-		local frame = CreateFrame("Frame",nil,UIParent)
-		
-		local button = CreateFrame("Button","AceGUI-3.0 KeybindingButton"..num,frame,"UIPanelButtonTemplate2")
-		
-		local self = {}
-		self.type = Type
-		self.num = num
-
-		local text = button:GetFontString()
-		text:SetPoint("LEFT",button,"LEFT",7,0)
-		text:SetPoint("RIGHT",button,"RIGHT",-7,0)
-	
-		button:SetScript("OnClick",Keybinding_OnClick)
-		button:SetScript("OnKeyDown",Keybinding_OnKeyDown)
-		button:SetScript("OnEnter",Control_OnEnter)
-		button:SetScript("OnLeave",Control_OnLeave)
-		button:SetScript("OnMouseDown",Keybinding_OnMouseDown)
-		button:RegisterForClicks("AnyDown")
-		button:EnableMouse()
-	
-		button:SetHeight(24)
-		button:SetWidth(200)
-		button:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0)
-		button:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		
-		frame:SetWidth(200)
-		frame:SetHeight(44)
-		
-		self.alignoffset = 30
-		
-		self.button = button
-		
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
-		label:SetJustifyH("CENTER")
-		label:SetHeight(18)
-		self.label = label
-		
-		local msgframe = CreateFrame("Frame",nil,UIParent)
-		msgframe:SetHeight(30)
-		msgframe:SetBackdrop(ControlBackdrop)
-		msgframe:SetBackdropColor(0,0,0)
-		msgframe:SetFrameStrata("FULLSCREEN_DIALOG")
-		msgframe:SetFrameLevel(1000)
-		self.msgframe = msgframe
-		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")
-		msgframe.msg = msg
-		msg:SetPoint("TOPLEFT",msgframe,"TOPLEFT",5,-5)
-		msgframe:SetScript("OnUpdate", keybindingMsgFixWidth)
-		msgframe:SetPoint("BOTTOM",button,"TOP",0,0)
-		msgframe:Hide()
-	
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetLabel = SetLabel
-		self.SetDisabled = SetDisabled
-		self.SetKey = SetKey
-		
-		self.frame = frame
-		frame.obj = self
-		button.obj = self
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
deleted file mode 100644
index 94306e3..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
+++ /dev/null
@@ -1,132 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Label 	 			--
---------------------------
-do
-	local Type = "Label"
-	local Version = 8
-	
-	local function OnAcquire(self)
-		self:SetText("")
-		self:SetImage(nil)
-		self:SetColor()
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-	
-	local function UpdateImageAnchor(self)
-		local width = self.frame.width or self.frame:GetWidth() or 0
-		local image = self.image
-		local label = self.label
-		local frame = self.frame
-		local height
-		
-		label:ClearAllPoints()
-		image:ClearAllPoints()
-		
-		if self.imageshown then
-			local imagewidth = image:GetWidth()
-			if (width - imagewidth) < 200 or (label:GetText() or "") == "" then
-				--image goes on top centered when less than 200 width for the text, or if there is no text
-				image:SetPoint("TOP",frame,"TOP",0,0)
-				label:SetPoint("TOP",image,"BOTTOM",0,0)
-				label:SetPoint("LEFT",frame,"LEFT",0,0)
-				label:SetWidth(width)
-				height = image:GetHeight() + label:GetHeight()
-			else
-				--image on the left
-				image:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-				label:SetPoint("TOPLEFT",image,"TOPRIGHT",0,0)
-				label:SetWidth(width - imagewidth)
-				height = math.max(image:GetHeight(), label:GetHeight())
-			end
-		else
-			--no image shown
-			label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-			label:SetWidth(width)
-			height = self.label:GetHeight()
-		end
-		
-		self.resizing = true
-		self.frame:SetHeight(height)
-		self.frame.height = height
-		self.resizing = nil
-	end
-	
-	local function SetText(self, text)
-		self.label:SetText(text or "")
-		UpdateImageAnchor(self)
-	end
-	
-	local function SetColor(self, r, g, b)
-		if not (r and g and b) then
-			r, g, b = 1, 1, 1
-		end
-		self.label:SetVertexColor(r, g, b)
-	end
-	
-	local function OnWidthSet(self, width)
-		if self.resizing then return end
-		UpdateImageAnchor(self)
-	end
-	
-	local function SetImage(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-		
-		if image:GetTexture() then
-			self.imageshown = true
-			local n = select('#', ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			end
-		else
-			self.imageshown = nil
-		end
-		UpdateImageAnchor(self)
-	end
-	
-	local function SetImageSize(self, width, height)
-		self.image:SetWidth(width)
-		self.image:SetHeight(height)
-		UpdateImageAnchor(self)
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-		
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetText = SetText
-		self.SetColor = SetColor
-		self.frame = frame
-		self.OnWidthSet = OnWidthSet
-		self.SetImage = SetImage
-		self.SetImageSize = SetImageSize
-		frame.obj = self
-		
-		frame:SetHeight(18)
-		frame:SetWidth(200)
-		local label = frame:CreateFontString(nil,"BACKGROUND","GameFontHighlightSmall")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		label:SetWidth(200)
-		label:SetJustifyH("LEFT")
-		label:SetJustifyV("TOP")
-		self.label = label
-		
-		local image = frame:CreateTexture(nil,"BACKGROUND")
-		self.image = image
-		
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
-
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
deleted file mode 100644
index a5074ea..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
+++ /dev/null
@@ -1,307 +0,0 @@
-
---[[
---Multiline Editbox Widget, Originally by bam
-
---]]
-local assert, error, ipairs, next, pairs, select, tonumber, tostring, type, unpack, pcall, xpcall =
-		assert, error, ipairs, next, pairs, select, tonumber, tostring, type, unpack, pcall, xpcall
-local getmetatable, setmetatable, rawequal, rawget, rawset, getfenv, setfenv, loadstring, debugstack =
-		getmetatable, setmetatable, rawequal, rawget, rawset, getfenv, setfenv, loadstring, debugstack
-local math, string, table = math, string, table
-local find, format, gmatch, gsub, tolower, match, toupper, join, split, trim =
-		string.find, string.format, string.gmatch, string.gsub, string.lower, string.match, string.upper, string.join, string.split, string.trim
-local concat, insert, maxn, remove, sort = table.concat, table.insert, table.maxn, table.remove, table.sort
-local max, min, abs, ceil, floor = math.max, math.min, math.abs, math.ceil, math.floor
-
-local LibStub = assert(LibStub)
-
-local ChatFontNormal = ChatFontNormal
-local ClearCursor = ClearCursor
-local CreateFrame = CreateFrame
-local GetCursorInfo = GetCursorInfo
-local GetSpellName = GetSpellName
-local UIParent = UIParent
-local UISpecialFrames = UISpecialFrames
-
--- No global variables after this!
-
-local _G = getfenv()
-
-local AceGUI = LibStub("AceGUI-3.0")
-
-local Version = 7
----------------------
--- Common Elements --
----------------------
-
-local FrameBackdrop = {
-	bgFile="Interface\\DialogFrame\\UI-DialogBox-Background",
-	edgeFile="Interface\\DialogFrame\\UI-DialogBox-Border",
-	tile = true, tileSize = 32, edgeSize = 32,
-	insets = { left = 8, right = 8, top = 8, bottom = 8 }
-}
-
-local PaneBackdrop	= {
-
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 5, bottom = 3 }
-}
-
-local ControlBackdrop	 = {
-	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true, tileSize = 16, edgeSize = 16,
-	insets = { left = 3, right = 3, top = 3, bottom = 3 }
-}
-
---------------------------
--- Edit box		 --
---------------------------
---[[
-	Events :
-	OnTextChanged
-	OnEnterPressed
-
-]]
-do
-	local Type = "MultiLineEditBox"
-
-	local MultiLineEditBox = {}
-
-	local function EditBox_OnEnterPressed(this)
-		local self = this.obj
-		local value = this:GetText()
-		local cancel = self:Fire("OnEnterPressed",value)
-		if not cancel then
-			self.button:Disable()
-		end
-	end
-	
-	local function Button_OnClick(this)
-		local editbox = this.obj.editbox
-		editbox:ClearFocus()
-		EditBox_OnEnterPressed(editbox)
-	end
-	
-	local function EditBox_OnReceiveDrag(this)
-		local self = this.obj
-		local type, id, info = GetCursorInfo()
-		if type == "item" then
-			self:SetText(info)
-			self:Fire("OnEnterPressed",info)
-			ClearCursor()
-		elseif type == "spell" then
-			local name, rank = GetSpellName(id, info)
-			if rank and rank:match("%d") then
-				name = name.."("..rank..")"
-			end
-			self:SetText(name)
-			self:Fire("OnEnterPressed",name)
-			ClearCursor()
-		end
-		self.button:Disable()
-		AceGUI:ClearFocus()
-	end
-	
-	function MultiLineEditBox:OnAcquire()
-		self:SetDisabled(false)
-		self:ShowButton(true)
-	end
-	
-	function MultiLineEditBox:OnRelease()
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self:SetDisabled(false)
-	end
-	
-	function MultiLineEditBox:SetDisabled(disabled)
-		self.disabled = disabled
-		if disabled then
-			self.editbox:EnableMouse(false)
-			self.scrollframe:EnableMouse(false)
-			self.editbox:ClearFocus()
-			self.editbox:SetTextColor(0.5, 0.5, 0.5)
-			self.label:SetTextColor(0.5,0.5,0.5)
-		else
-			self.editbox:EnableMouse(true)
-			self.scrollframe:EnableMouse(true)
-			self.editbox:SetTextColor(1, 1, 1)
-			self.label:SetTextColor(1,.82,0)
-		end
-	end
-
-	function MultiLineEditBox:SetText(text)
-		text = text or ""
-		local editbox = self.editbox
-		local oldText = editbox:GetText()
-		local dummy = format(" %s", text)
-		self.lasttext = dummy -- prevents OnTextChanged from firing
-		editbox:SetText(dummy)
-		editbox:HighlightText(0, 1)
-		self.lasttext = oldText
-		editbox:Insert("")
-	end
-	
-	function MultiLineEditBox:SetLabel(text)
-		if (text or "") == "" then
-			self.backdrop:SetPoint("TOPLEFT",self.frame,"TOPLEFT",0,0)
-			self.label:Hide()
-			self.label:SetText("")
-		else
-			self.backdrop:SetPoint("TOPLEFT",self.frame,"TOPLEFT",0,-20)
-			self.label:Show()
-			self.label:SetText(text)
-		end
-	end
-
-	function MultiLineEditBox:GetText()
-		return self.editbox:GetText()
-	end
-	
-	function MultiLineEditBox:ShowButton(show)
-		if show then
-			self.backdrop:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,22)
-			self.button:Show()
-		else
-			self.backdrop:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,0)
-			self.button:Hide()
-		end
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Frame", nil, UIParent)
-		local backdrop = CreateFrame("Frame", nil, frame)
-		local self = {}
-		for k, v in pairs(MultiLineEditBox) do self[k] = v end
-		self.type = Type
-		self.frame = frame
-		self.backdrop = backdrop
-		frame.obj = self
-
-		backdrop:SetBackdrop(ControlBackdrop)
-		backdrop:SetBackdropColor(0, 0, 0)
-		backdrop:SetBackdropBorderColor(0.4, 0.4, 0.4)
-	
-		backdrop:SetPoint("TOPLEFT",frame,"TOPLEFT",0, -20)
-		backdrop:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,22)
-		
-		local scrollframe = CreateFrame("ScrollFrame", format("%s@%s@%s", Type, "ScrollFrame", tostring(self)), backdrop, "UIPanelScrollFrameTemplate")
-		scrollframe:SetPoint("TOPLEFT", 5, -6)
-		scrollframe:SetPoint("BOTTOMRIGHT", -28, 6)
-		scrollframe.obj = self
-		self.scrollframe = scrollframe
-		
-		local scrollchild = CreateFrame("Frame", nil, scrollframe)
-		scrollframe:SetScrollChild(scrollchild)
-		scrollchild:SetHeight(2)
-		scrollchild:SetWidth(2)
-	
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,-2)
-		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,-2)
-		label:SetJustifyH("LEFT")
-		label:SetHeight(18)
-		self.label = label
-			
-		local editbox = CreateFrame("EditBox", nil, scrollchild)
-		self.editbox = editbox
-		editbox.obj = self
-		editbox:SetPoint("TOPLEFT")
-		editbox:SetHeight(50)
-		editbox:SetWidth(50)
-		editbox:SetMultiLine(true)
-		-- editbox:SetMaxLetters(7500)
-		editbox:SetTextInsets(5, 5, 3, 3)
-		editbox:EnableMouse(true)
-		editbox:SetAutoFocus(false)
-		editbox:SetFontObject(ChatFontNormal)
-
-		local button = CreateFrame("Button",nil,scrollframe,"UIPanelButtonTemplate")
-		button:SetWidth(80)
-		button:SetHeight(20)
-		button:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,2)
-		button:SetText(ACCEPT)
-		button:SetScript("OnClick", Button_OnClick)
-		button:Disable()
-		button:Hide()
-		self.button = button
-		button.obj = self
-		
-		scrollframe:EnableMouse(true)
-		scrollframe:SetScript("OnMouseUp", function() editbox:SetFocus() end)
-		scrollframe:SetScript("OnEnter", function(this) this.obj:Fire("OnEnter") end)
-		scrollframe:SetScript("OnLeave", function(this) this.obj:Fire("OnLeave") end)
-		
-		editbox:SetScript("OnEnter", function(this) this.obj:Fire("OnEnter") end)
-		editbox:SetScript("OnLeave", function(this) this.obj:Fire("OnLeave") end)
-		
-		local function FixSize()
-			scrollchild:SetHeight(scrollframe:GetHeight())
-			scrollchild:SetWidth(scrollframe:GetWidth())
-			editbox:SetWidth(scrollframe:GetWidth())
-		end
-		scrollframe:SetScript("OnShow", FixSize)
-		scrollframe:SetScript("OnSizeChanged", FixSize)
-	
-		editbox:SetScript("OnEscapePressed", editbox.ClearFocus)
-		editbox:SetScript("OnTextChanged", function(_, ...)
-			scrollframe:UpdateScrollChildRect()
-			local value = editbox:GetText()
-			if value ~= self.lasttext then
-			self:Fire("OnTextChanged", value)
-			self.lasttext = value
-			self.button:Enable()
-			end
-		end)
-	
-		editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag)
-		editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag)
-		
-		do
-			local cursorOffset, cursorHeight
-			local idleTime
-			local function FixScroll(_, elapsed)
-			if cursorOffset and cursorHeight then
-				idleTime = 0
-				local height = scrollframe:GetHeight()
-				local range = scrollframe:GetVerticalScrollRange()
-				local scroll = scrollframe:GetVerticalScroll()
-				local size = height + range
-				cursorOffset = -cursorOffset
-				while cursorOffset < scroll do
-				scroll = scroll - (height / 2)
-				if scroll < 0 then scroll = 0 end
-				scrollframe:SetVerticalScroll(scroll)
-				end
-				while cursorOffset + cursorHeight > scroll + height and scroll < range do
-				scroll = scroll + (height / 2)
-				if scroll > range then scroll = range end
-				scrollframe:SetVerticalScroll(scroll)
-				end
-			elseif not idleTime or idleTime > 2 then
-				frame:SetScript("OnUpdate", nil)
-				idleTime = nil
-			else
-				idleTime = idleTime + elapsed
-			end
-			cursorOffset = nil
-			end
-			editbox:SetScript("OnCursorChanged", function(_, x, y, w, h)
-			cursorOffset, cursorHeight = y, h
-			if not idleTime then
-				frame:SetScript("OnUpdate", FixScroll)
-			end
-			end)
-		end
-	
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(Type, Constructor, Version)
-end
-
-
-
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua
deleted file mode 100644
index 844e637..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-ScrollFrame.lua
+++ /dev/null
@@ -1,225 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		Acquire() - Called when the object is aquired, should set everything to a default hidden state
-		Release() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-
-
-]]
-
---------------------------
--- Scroll Frame		    --
---------------------------
-do
-	local Type = "ScrollFrame"
-	local Version = 3
-	
-	local function OnAcquire(self)
-
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end
-	
-	local function SetScroll(self, value)
-		
-		local status = self.status or self.localstatus
-		
-		local frame, child = self.scrollframe, self.content
-		local viewheight = frame:GetHeight()
-		local height = child:GetHeight()
-		local offset
-		if viewheight > height then
-			offset = 0
-		else
-			offset = floor((height - viewheight) / 1000.0 * value)
-		end
-		child:ClearAllPoints()
-		child:SetPoint("TOPLEFT",frame,"TOPLEFT",0,offset)
-		child:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,offset)
-		status.offset = offset
-		status.scrollvalue = value
-	end
-	
-	local function MoveScroll(self, value)
-		local status = self.status or self.localstatus
-		local frame, child = self.scrollframe, self.content
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-		if height > viewheight then
-			self.scrollbar:Hide()
-		else
-			self.scrollbar:Show()
-			local diff = height - viewheight
-			local delta = 1
-			if value < 0 then
-				delta = -1
-			end
-			self.scrollbar:SetValue(math.min(math.max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
-		end
-	end
-	
-	
-	local function FixScroll(self)
-		local status = self.status or self.localstatus
-		local frame, child = self.scrollframe, self.content
-		local height, viewheight = frame:GetHeight(), child:GetHeight()
-		local offset = status.offset
-		if not offset then
-			offset = 0
-		end
-		local curvalue = self.scrollbar:GetValue()
-		if viewheight < height then
-			self.scrollbar:Hide()
-			self.scrollbar:SetValue(0)
-			--self.scrollframe:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",0,0)
-		else
-			self.scrollbar:Show()
-			--self.scrollframe:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",-16,0)
-			local value = (offset / (viewheight - height) * 1000)
-			if value > 1000 then value = 1000 end
-			self.scrollbar:SetValue(value)
-			self:SetScroll(value)
-			if value < 1000 then
-				child:ClearAllPoints()
-				child:SetPoint("TOPLEFT",frame,"TOPLEFT",0,offset)
-				child:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,offset)
-				status.offset = offset
-			end
-		end
-	end
-
-	local function OnMouseWheel(this,value)
-		this.obj:MoveScroll(value)
-	end
-
-	local function OnScrollValueChanged(this, value)
-		this.obj:SetScroll(value)
-	end
-	
-	local function FixScrollOnUpdate(this)
-		this:SetScript("OnUpdate", nil)
-		this.obj:FixScroll()
-	end
-	local function OnSizeChanged(this)
-		--this:SetScript("OnUpdate", FixScrollOnUpdate)
-		this.obj:FixScroll()
-	end
-	
-	local function LayoutFinished(self,width,height)
-		self.content:SetHeight(height or 0 + 20)
-		self:FixScroll()
-	end
-	
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		if not status.scrollvalue then
-			status.scrollvalue = 0
-		end
-	end
-	
-	
-	local createdcount = 0
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		content.width = width
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		content.height = height
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-	
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.MoveScroll = MoveScroll
-		self.FixScroll = FixScroll
-		self.SetScroll = SetScroll
-		self.LayoutFinished = LayoutFinished
-		self.SetStatusTable = SetStatusTable
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		
-		self.localstatus = {} 	
-		self.frame = frame
-		frame.obj = self
-
-		--Container Support
-		local scrollframe = CreateFrame("ScrollFrame",nil,frame)
-		local content = CreateFrame("Frame",nil,scrollframe)
-		createdcount = createdcount + 1
-		local scrollbar = CreateFrame("Slider",("AceConfigDialogScrollFrame%dScrollBar"):format(createdcount),scrollframe,"UIPanelScrollBarTemplate")
-		local scrollbg = scrollbar:CreateTexture(nil,"BACKGROUND")
-		scrollbg:SetAllPoints(scrollbar)
-		scrollbg:SetTexture(0,0,0,0.4)
-		self.scrollframe = scrollframe
-		self.content = content
-		self.scrollbar = scrollbar
-		
-		scrollbar.obj = self
-		scrollframe.obj = self
-		content.obj = self
-		
-		scrollframe:SetScrollChild(content)
-		scrollframe:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		scrollframe:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT",-16,0)
-		scrollframe:EnableMouseWheel(true)
-		scrollframe:SetScript("OnMouseWheel", OnMouseWheel)
-		scrollframe:SetScript("OnSizeChanged", OnSizeChanged)
-		
-		
-		content:SetPoint("TOPLEFT",scrollframe,"TOPLEFT",0,0)
-		content:SetPoint("TOPRIGHT",scrollframe,"TOPRIGHT",0,0)
-		content:SetHeight(400)
-		
-		scrollbar:SetPoint("TOPLEFT",scrollframe,"TOPRIGHT",0,-16)
-		scrollbar:SetPoint("BOTTOMLEFT",scrollframe,"BOTTOMRIGHT",0,16)
-		scrollbar:SetScript("OnValueChanged", OnScrollValueChanged)
-		scrollbar:SetMinMaxValues(0,1000)
-		scrollbar:SetValueStep(1)
-		scrollbar:SetValue(0)
-		scrollbar:SetWidth(16)
-		
-		self.localstatus.scrollvalue = 0
-		
-
-		self:FixScroll()
-		AceGUI:RegisterAsContainer(self)
-		--AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua
deleted file mode 100644
index bc38f9f..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-SimpleGroup.lua
+++ /dev/null
@@ -1,96 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		Acquire() - Called when the object is aquired, should set everything to a default hidden state
-		Release() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-
-
-]]
-
---------------------------
--- Simple Group		    --
---------------------------
---[[
-	This is a simple grouping container, no selection, no borders
-	It will resize automatically to the height of the controls added to it
-]]
-
-do
-	local Type = "SimpleGroup"
-	local Version = 4
-	
-	local function OnAcquire(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function LayoutFinished(self, width, height)
-		self:SetHeight(height or 0)
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		content:SetWidth(width)
-		content.width = width
-	end
-
-	local function OnHeightSet(self, height)
-		local content = self.content
-		content:SetHeight(height)
-		content.height = height
-	end
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.frame = frame
-		self.LayoutFinished = LayoutFinished
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		
-		frame.obj = self
-		
-		frame:SetHeight(100)
-		frame:SetWidth(100)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,frame)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
deleted file mode 100644
index db33ce2..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
+++ /dev/null
@@ -1,240 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
---------------------------
--- Slider  	            --
---------------------------
-do
-	local Type = "Slider"
-	local Version = 5
-	
-	local function OnAcquire(self)
-		self:SetDisabled(false)
-		self:SetSliderValues(0,100,1)
-		self:SetIsPercent(nil)
-		self:SetValue(0)
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.slider:EnableMouseWheel(false)
-		self:SetDisabled(false)
-	end
-
-	local function Control_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-	
-	local function Control_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-	
-	local function UpdateText(self)
-		if self.ispercent then
-			self.editbox:SetText((math.floor(self.value*1000+0.5)/10)..'%')
-		else
-			self.editbox:SetText(math.floor(self.value*100+0.5)/100)
-		end
-	end
-	
-	local function Slider_OnValueChanged(this)
-		local self = this.obj
-		if not this.setup then
-			local newvalue
-			newvalue = this:GetValue()
-			if newvalue ~= self.value and not self.disabled then
-				self.value = newvalue
-				self:Fire("OnValueChanged", newvalue)
-			end
-			if self.value then
-				local value = self.value
-				UpdateText(self)
-			end
-		end
-	end
-	
-	local function Slider_OnMouseUp(this)
-		local self = this.obj
-		self:Fire("OnMouseUp",this:GetValue())
-	end
-	
-	local function Slider_OnMouseWheel(this, v)
-		local self = this.obj
-		if not self.disabled then
-			local value = self.value
-			if v > 0 then
-				value = math.min(value + (self.step or 1),self.max)
-			else
-				value = math.max(value - (self.step or 1), self.min)
-			end
-			self.slider:SetValue(value)
-		end
-	end
-	
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.slider:EnableMouse(false)
-			self.label:SetTextColor(.5,.5,.5)
-			self.hightext:SetTextColor(.5,.5,.5)
-			self.lowtext:SetTextColor(.5,.5,.5)
-			--self.valuetext:SetTextColor(.5,.5,.5)
-			self.editbox:SetTextColor(.5,.5,.5)
-			self.editbox:EnableMouse(false)
-			self.editbox:ClearFocus()
-		else
-			self.slider:EnableMouse(true)
-			self.label:SetTextColor(1,.82,0)
-			self.hightext:SetTextColor(1,1,1)
-			self.lowtext:SetTextColor(1,1,1)
-			--self.valuetext:SetTextColor(1,1,1)
-			self.editbox:SetTextColor(1,1,1)
-			self.editbox:EnableMouse(true)
-		end
-	end
-	
-	local function SetValue(self, value)
-		self.slider.setup = true
-		self.slider:SetValue(value)
-		self.value = value
-		UpdateText(self)
-		self.slider.setup = nil
-	end
-	
-	local function SetLabel(self, text)
-		self.label:SetText(text)
-	end
-	
-	local function SetSliderValues(self,min, max, step)
-		local frame = self.slider
-		frame.setup = true
-		self.min = min
-		self.max = max
-		self.step = step
-		frame:SetMinMaxValues(min or 0,max or 100)
-		self.lowtext:SetText(min or 0)
-		self.hightext:SetText(max or 100)
-		frame:SetValueStep(step or 1)
-		frame.setup = nil
-	end
-	
-	local function EditBox_OnEscapePressed(this)
-		this:ClearFocus()
-	end
-	
-	local function EditBox_OnEnterPressed(this)
-		local self = this.obj
-		local value = this:GetText()
-		if self.ispercent then
-			value = value:gsub('%%','')
-			value = tonumber(value) / 100
-		else
-			value = tonumber(value)
-		end
-		
-		if value then
-			self:Fire("OnMouseUp",value)
-		end
-	end
-	
-	local function SetIsPercent(self, value)
-		self.ispercent = value
-	end
-	
-	local function FrameOnMouseDown(this)
-		this.obj.slider:EnableMouseWheel(true)
-		AceGUI:ClearFocus()
-	end
-	
-	local SliderBackdrop  = {
-		bgFile = "Interface\\Buttons\\UI-SliderBar-Background",
-		edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
-		tile = true, tileSize = 8, edgeSize = 8,
-		insets = { left = 3, right = 3, top = 6, bottom = 6 }
-	}
-	
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.frame = frame
-		frame.obj = self
-		
-		self.SetDisabled = SetDisabled
-		self.SetValue = SetValue
-		self.SetSliderValues = SetSliderValues
-		self.SetLabel = SetLabel
-		self.SetIsPercent = SetIsPercent
-		
-		self.alignoffset = 25
-		
-		frame:EnableMouse(true)
-		frame:SetScript("OnMouseDown",FrameOnMouseDown)
-		self.slider = CreateFrame("Slider",nil,frame)
-		local slider = self.slider
-		slider:SetScript("OnEnter",Control_OnEnter)
-		slider:SetScript("OnLeave",Control_OnLeave)
-		slider:SetScript("OnMouseUp", Slider_OnMouseUp)
-		slider.obj = self
-		slider:SetOrientation("HORIZONTAL")
-		slider:SetHeight(15)
-		slider:SetHitRectInsets(0,0,-10,0)
-		slider:SetBackdrop(SliderBackdrop)
-		--slider:EnableMouseWheel(true)
-		slider:SetScript("OnMouseWheel", Slider_OnMouseWheel)
-			
-		local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0)
-		label:SetJustifyH("CENTER")
-		label:SetHeight(15)
-		self.label = label
-	
-		self.lowtext = slider:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall")
-		self.lowtext:SetPoint("TOPLEFT",slider,"BOTTOMLEFT",2,3)
-	
-		self.hightext = slider:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall")
-		self.hightext:SetPoint("TOPRIGHT",slider,"BOTTOMRIGHT",-2,3)
-	
-	
-		local editbox = CreateFrame("EditBox",nil,frame)
-		editbox:SetAutoFocus(false)
-		editbox:SetFontObject(GameFontHighlightSmall)
-		editbox:SetPoint("TOP",slider,"BOTTOM",0,0)
-		editbox:SetHeight(14)
-		editbox:SetWidth(70)
-		editbox:SetJustifyH("CENTER")
-		editbox:EnableMouse(true)
-		editbox:SetScript("OnEscapePressed",EditBox_OnEscapePressed)
-		editbox:SetScript("OnEnterPressed",EditBox_OnEnterPressed)
-		self.editbox = editbox
-		editbox.obj = self
-		
-		local bg = editbox:CreateTexture(nil,"BACKGROUND")
-		editbox.bg = bg
-		bg:SetTexture("Interface\\ChatFrame\\ChatFrameBackground")
-		bg:SetVertexColor(0,0,0,0.25)
-		bg:SetAllPoints(editbox)
-		
-		slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal")
-	
-		frame:SetWidth(200)
-		frame:SetHeight(44)
-		slider:SetPoint("TOP",label,"BOTTOM",0,0)
-		slider:SetPoint("LEFT",frame,"LEFT",3,0)
-		slider:SetPoint("RIGHT",frame,"RIGHT",-3,0)
-	
-
-		slider:SetValue(self.value or 0)
-		slider:SetScript("OnValueChanged",Slider_OnValueChanged)
-	
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua
deleted file mode 100644
index 9a30ede..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TabGroup.lua
+++ /dev/null
@@ -1,338 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
--------------
--- Widgets --
--------------
---[[
-	Widgets must provide the following functions
-		Acquire() - Called when the object is aquired, should set everything to a default hidden state
-		Release() - Called when the object is Released, should remove any anchors and hide the Widget
-		
-	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
-
-
-]]
-
---------------------------
--- Tab Group            --
---------------------------
-
-do
-	local Type = "TabGroup"
-	local Version = 15
-
-	local PaneBackdrop  = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 5, bottom = 3 }
-	}
-	
-	local function OnAcquire(self)
-
-	end
-	
-	local function OnRelease(self)
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-		self.tablist = nil
-	end
-	
-	local function Tab_SetText(self, text)
-		self:_SetText(text)
-		PanelTemplates_TabResize(self, 0)
-	end
-	
-	local function UpdateTabLook(self)
-		if self.disabled then
-			PanelTemplates_SetDisabledTabState(self)
-		elseif self.selected then
-			PanelTemplates_SelectTab(self)
-		else
-			PanelTemplates_DeselectTab(self)
-		end
-	end
-	
-	local function Tab_SetSelected(self, selected)
-		self.selected = selected
-		UpdateTabLook(self)
-	end
-	
-	local function Tab_OnClick(self)
-		if not (self.selected or self.disabled) then
-			self.obj:SelectTab(self.value)
-		end
-	end
-	
-	local function Tab_SetDisabled(self, disabled)
-		self.disabled = disabled
-		UpdateTabLook(self)
-	end
-	
-	local function Tab_OnEnter(this)
-		local self = this.obj
-		self:Fire("OnTabEnter", self.tabs[this.id].value, this)
-	end
-	
-	local function Tab_OnLeave(this)
-		local self = this.obj
-		self:Fire("OnTabLeave", self.tabs[this.id].value, this)
-	end
-	
-	local function CreateTab(self, id)
-		local tabname = "AceGUITabGroup"..self.num.."Tab"..id
-		local tab = CreateFrame("Button",tabname,self.border,"OptionsFrameTabButtonTemplate")
-		tab.obj = self
-		tab.id = id
-		
-		tab:SetScript("OnClick",Tab_OnClick)
-		tab:SetScript("OnEnter",Tab_OnEnter)
-		tab:SetScript("OnLeave",Tab_OnLeave)
-		
-		tab._SetText = tab.SetText
-		tab.SetText = Tab_SetText
-		tab.SetSelected = Tab_SetSelected
-		tab.SetDisabled = Tab_SetDisabled
-		
-		return tab
-	end
-	
-	local function SetTitle(self, text)
-		self.titletext:SetText(text or "")
-	end
-	
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end
-	
-	local function SelectTab(self, value)
-		local status = self.status or self.localstatus
-
-		local found
-		for i, v in ipairs(self.tabs) do
-			if v.value == value then
-				v:SetSelected(true)
-				found = true
-			else
-				v:SetSelected(false)	
-			end
-		end
-		status.selected = value
-		if found then
-			self:Fire("OnGroupSelected",value)
-		end
-	end
-		
-	local function SetTabs(self, tabs)
-		self.tablist = tabs
-		self:BuildTabs()
-	end
-	
-
-	local widths = {}
-	local rowwidths = {}
-	local rowends = {}		
-	local function BuildTabs(self)
-		local status = self.status or self.localstatus
-		local tablist = self.tablist
-		
-		local tabs = self.tabs
-		
-		for i, v in ipairs(tabs) do
-			v:Hide()
-		end
-		if not tablist then return end
-
-		
-		local width = self.frame.width or self.frame:GetWidth() or 0
-		
-		for i = #widths, 1, -1 do 
-			widths[i] = nil 
-		end
-		for i = #rowwidths, 1, -1 do
-			rowwidths[i] = nil 
-		end
-		for i = #rowends, 1, -1 do 
-			rowends[i] = nil 
-		end
-		
-		--Place Text into tabs and get thier initial width
-		for i, v in ipairs(tablist) do
-			local tab = tabs[i]
-			if not tab then
-				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() - 10 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing
-		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
-		local usedwidth = 0
-
-		for i = 1, #tablist do
-			--If this is not the first tab of a row and there isn't room for it
-			if usedwidth ~= 0 and (width - usedwidth - widths[i]) < 0 then
-				rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px
-				rowends[numrows] = i - 1
-				numrows = numrows + 1
-				usedwidth = 0		
-			end
-			usedwidth = usedwidth + widths[i]
-		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
-			if rowends[numrows-1] == numtabs-1 then
-				--if there are more than 2 tabs in the 2nd last row
-				if (numrows == 2 and rowends[numrows-1] > 2) or (rowends[numrows] - rowends[numrows-1] > 2) then
-					--move 1 tab from the second last row to the last
-					rowends[numrows-1] = rowends[numrows-1] - 1
-					rowwidths[numrows] = rowwidths[numrows] + widths[numtabs-1]
-					rowwidths[numrows-1] = rowwidths[numrows-1] - widths[numtabs-1]
-				end
-			end
-		end
-
-		--anchor the rows as defined and resize tabs to fill thier row
-		local starttab = 1
-		for row, endtab in ipairs(rowends) do
-			local first = true
-			for tabno = starttab, endtab do
-				local tab = tabs[tabno]
-				tab:ClearAllPoints()
-				if first then
-					tab:SetPoint("TOPLEFT",self.frame,"TOPLEFT",0,-7-(row-1)*20 )
-					first = false
-				else
-					tab:SetPoint("LEFT",tabs[tabno-1],"RIGHT",-10,0)
-				end
-			end
-			--equal padding for each tab to fill the available width
-			local padding = (width - rowwidths[row]) / (endtab - starttab+1)
-			for i = starttab, endtab do
-				PanelTemplates_TabResize(tabs[i], padding)
-			end
-			starttab = endtab + 1
-		end
-		
-		self.borderoffset = 10+((numrows)*20)
-		self.border:SetPoint("TOPLEFT",self.frame,"TOPLEFT",3,-self.borderoffset)
-	end
-	
-	local function BuildTabsOnUpdate(this)
-		BuildTabs(this.obj)
-		this:SetScript("OnUpdate", nil)
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local contentwidth = width - 60
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-		BuildTabs(self)
-		self.frame:SetScript("OnUpdate", BuildTabsOnUpdate)
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - (self.borderoffset + 23)
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-		
-		self.num = AceGUI:GetNextWidgetNum(Type)
-
-		self.localstatus = {}
-		
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetTitle = SetTitle
-		self.CreateTab = CreateTab
-		self.SelectTab = SelectTab
-		self.BuildTabs = BuildTabs
-		self.SetStatusTable = SetStatusTable
-		self.SetTabs = SetTabs
-		self.frame = frame
-		
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-
-		frame.obj = self
-		
-		frame:SetHeight(100)
-		frame:SetWidth(100)
-		frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		
-		local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-		titletext:SetPoint("TOPLEFT",frame,"TOPLEFT",14,0)
-		titletext:SetPoint("TOPRIGHT",frame,"TOPRIGHT",-14,0)
-		titletext:SetJustifyH("LEFT")
-		titletext:SetHeight(18)
-		
-		self.titletext = titletext	
-		
-		local border = CreateFrame("Frame",nil,frame)
-		self.border = border
-		self.borderoffset = 27
-		border:SetPoint("TOPLEFT",frame,"TOPLEFT",3,-27)
-		border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-3,3)
-		
-		border:SetBackdrop(PaneBackdrop)
-		border:SetBackdropColor(0.1,0.1,0.1,0.5)
-		border:SetBackdropBorderColor(0.4,0.4,0.4)
-		
-		self.tabs = {}
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,border)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10)
-		content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10)
-		
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua b/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua
deleted file mode 100644
index 975e874..0000000
--- a/Cauldron/Libs/AceGUI-3.0/widgets/AceGUIWidget-TreeGroup.lua
+++ /dev/null
@@ -1,696 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Recycling functions
-local new, del
-do
-	local pool = setmetatable({},{__mode='k'})
-	function new()
-		local t = next(pool)
-		if t then
-			pool[t] = nil
-			return t
-		else
-			return {}
-		end
-	end
-	function del(t)
-		for k in pairs(t) do
-			t[k] = nil
-		end	
-		pool[t] = true
-	end
-end
-
---------------
--- TreeView --
---------------
-
-do
-	local Type = "TreeGroup"
-	local Version = 17
-	
-	local DEFAULT_TREE_WIDTH = 175
-	local DEFAULT_TREE_SIZABLE = true
-
-	local PaneBackdrop  = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 3, right = 3, top = 5, bottom = 3 }
-	}
-
-    local DraggerBackdrop  = {
-		bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-		edgeFile = nil,
-		tile = true, tileSize = 16, edgeSize = 0,
-		insets = { left = 3, right = 3, top = 7, bottom = 7 }
-	}
-    
-	local function OnAcquire(self)
-		self:SetTreeWidth(DEFAULT_TREE_WIDTH,DEFAULT_TREE_SIZABLE)
-		self:EnableButtonTooltips(true)
-	end
-	
-	local function OnRelease(self)
-        
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-		self.status = nil
-		for k, v in pairs(self.localstatus) do
-			if k == "groups" then
-				for k2 in pairs(v) do
-					v[k2] = nil
-				end
-			else
-				self.localstatus[k] = nil
-			end
-		end
-		self.localstatus.scrollvalue = 0
-		self.localstatus.treewidth = DEFAULT_TREE_WIDTH
-		self.localstatus.treesizable = DEFAULT_TREE_SIZABLE
-	end
-	
-	local function GetButtonParents(line)
-		local parent = line.parent
-		if parent and parent.value then
-			return parent.value, GetButtonParents(parent)
-		end
-	end
-	
-	local function GetButtonUniqueValue(line)
-		local parent = line.parent
-		if parent and parent.value then
-			return GetButtonUniqueValue(parent).."\001"..line.value
-		else
-			return line.value
-		end		
-	end
-	
-	local function ButtonOnClick(this)
-		local self = this.obj
-		self:Fire("OnClick",this.uniquevalue, this.selected)
-		if not this.selected then
-			self:SetSelected(this.uniquevalue)
-			this.selected = true
-			this:LockHighlight()
-			self:RefreshTree()
-		end
-		AceGUI:ClearFocus()
-	end
-	
-	local function ExpandOnClick(this)
-		local button = this.button
-		local self = button.obj
-		local status = (self.status or self.localstatus).groups
-		status[button.uniquevalue] = not status[button.uniquevalue]
-		self:RefreshTree()
-	end
-	
-	local function ButtonOnDoubleClick(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()
-	end
-    
-    local function EnableButtonTooltips(self, enable)
-    	self.enabletooltips = enable
-    end
-    
-    local function Button_OnEnter(this)
-    	local self = this.obj
-    	self:Fire("OnButtonEnter", this.uniquevalue, this)
-    	
-    	if self.enabletooltips then
-	        GameTooltip:SetOwner(this, "ANCHOR_NONE")
-	        GameTooltip:SetPoint("LEFT",this,"RIGHT")
-	        GameTooltip:SetText(this.text:GetText(), 1, .82, 0, 1)
-	    
-			GameTooltip:Show()
-		end
-	end
-	
-	local function Button_OnLeave(this)
-		local self = this.obj
-		self:Fire("OnButtonLeave", this.uniquevalue, this)
-		
-		if self.enabletooltips then
-			GameTooltip:Hide()
-		end
-	end
-    
-    
-	local buttoncount = 1
-	local function CreateButton(self)
-		local button = CreateFrame("Button",("AceGUI30TreeButton%d"):format(buttoncount),self.treeframe, "OptionsListButtonTemplate")
-		buttoncount = buttoncount + 1
-		button.obj = self
-
-		button:SetScript("OnClick",ButtonOnClick)
-		button:SetScript("OnDoubleClick", ButtonOnDoubleClick)
-		button:SetScript("OnEnter",Button_OnEnter)
-		button:SetScript("OnLeave",Button_OnLeave)
-
-		button.toggle.button = button
-		button.toggle:SetScript("OnClick",ExpandOnClick)
-		
-		return button
-	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 level = treeline.level
-		local value = treeline.value
-		local uniquevalue = treeline.uniquevalue
-		local disabled = treeline.disabled
-		
-		button.treeline = treeline
-		button.value = value
-		button.uniquevalue = uniquevalue
-		if selected then
-			button:LockHighlight()
-			button.selected = true
-		else
-			button:UnlockHighlight()
-			button.selected = false
-		end
-		local normalText = button.text
-		local normalTexture = button:GetNormalTexture()
-		local line = button.line
-		button.level = level
-		if ( level == 1 ) then
-			button:SetNormalFontObject("GameFontNormal")
-			button:SetHighlightFontObject("GameFontHighlight")
-			button.text:SetPoint("LEFT", 8, 2)
-		else
-			button:SetNormalFontObject("GameFontHighlightSmall")
-			button:SetHighlightFontObject("GameFontHighlightSmall")
-			button.text:SetPoint("LEFT", 8 * level, 2)
-		end
-		
-		if disabled then
-			button:EnableMouse(false)
-			button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE)
-		else
-			button.text:SetText(text)
-			button:EnableMouse(true)
-		end
-		
-		if canExpand then
-			if not isExpanded then
-				toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP")
-				toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN")
-			else
-				toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-UP")
-				toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-DOWN")
-			end
-			toggle:Show()
-		else
-			toggle:Hide()
-		end
-	end
-
-	
-	local function OnScrollValueChanged(this, value)
-		if this.obj.noupdate then return end
-		local self = this.obj
-		local status = self.status or self.localstatus
-		status.scrollvalue = value
-		self:RefreshTree()
-		AceGUI:ClearFocus()
-	end
-	
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		if not status.groups then
-			status.groups = {}
-		end
-		if not status.scrollvalue then
-			status.scrollvalue = 0
-		end
-		if not status.treewidth then
-			status.treewidth = DEFAULT_TREE_WIDTH
-		end
-		if not status.treesizable then
-			status.treesizable = DEFAULT_TREE_SIZABLE
-		end
-		self:SetTreeWidth(status.treewidth,status.treesizable)
-		self:RefreshTree()
-	end
-
-	--sets the tree to be displayed
-	--[[
-		example tree
-		
-		Alpha
-		Bravo
-		  -Charlie
-		  -Delta
-			-Echo
-		Foxtrot
-		
-		tree = { 
-			{ 
-				value = "A",
-				text = "Alpha"
-			},
-			{
-				value = "B",
-				text = "Bravo",
-				children = {
-					{ 
-						value = "C", 
-						text = "Charlie"
-					},
-					{
-						value = "D",	
-						text = "Delta"
-						children = { 
-							{ 
-								value = "E",
-								text = "Echo"
-							} 
-						} 
-					}
-				}
-			},
-			{ 
-				value = "F", 
-				text = "Foxtrot" 
-			},
-		}
-	]]
-	local function SetTree(self, tree, filter)
-		self.filter = filter
-		if tree then 
-			assert(type(tree) == "table") 
-		end
-		self.tree = tree
-		self:RefreshTree()
-	end
-	
-	local function ShouldDisplayLevel(tree)
-		local result = false
-		for k, v in ipairs(tree) do
-			if v.children == nil and v.visible ~= false then
-				result = true
-			elseif v.children then
-				result = result or ShouldDisplayLevel(v.children)
-			end
-			if result then return result end
-		end
-		return false
-	end
-	
-	local function addLine(self, v, tree, level, parent)
-		local line = new()
-		line.value = v.value
-		line.text = v.text
-		line.disabled = v.disabled
-		line.tree = tree
-		line.level = level
-		line.parent = parent
-		line.visible = v.visible
-		line.uniquevalue = GetButtonUniqueValue(line)
-		if v.children then
-			line.hasChildren = true
-		else
-			line.hasChildren = nil
-		end		
-		self.lines[#self.lines+1] = line
-		return line
-	end
-	
-	local function BuildLevel(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
-					local line = addLine(self, v, tree, level, parent)
-					if groups[line.uniquevalue] then
-						self:BuildLevel(v.children, level+1, line)
-					end
-				end
-			elseif v.visible ~= false or not self.filter then
-				addLine(self, v, tree, level, parent)
-			end
-		end
-	end
-	
-	--fire an update after one frame to catch the treeframes height
-	local function FirstFrameUpdate(this)
-		local self = this.obj
-		this:SetScript("OnUpdate",nil)
-		self:RefreshTree()
-	end
-	
-	local function ResizeUpdate(this)
-		this.obj:RefreshTree()
-	end
-	
-	local function RefreshTree(self)
-		local buttons = self.buttons 
-		local lines = self.lines
-		
-		for i, v in ipairs(buttons) do
-			v:Hide()
-		end
-		while lines[1] do
-			local t = tremove(lines)
-			for k in pairs(t) do
-				t[k] = nil
-			end
-			del(t)
-		end		
-		
-		if not self.tree then return end
-		--Build the list of visible entries from the tree and status tables
-		local status = self.status or self.localstatus
-		local groupstatus = status.groups
-		local tree = self.tree
-
-		local treeframe = self.treeframe
-
-		self:BuildLevel(tree, 1)
-		
-		local numlines = #lines
-		
-		local maxlines = (math.floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
-		
-		local first, last
-		
-		if numlines <= maxlines then
-			--the whole tree fits in the frame
-			status.scrollvalue = 0
-			self:ShowScroll(false)
-			first, last = 1, numlines
-		else
-			self:ShowScroll(true)
-			--scrolling will be needed
-			self.noupdate = true
-			self.scrollbar:SetMinMaxValues(0, numlines - maxlines)
-			--check if we are scrolled down too far
-			if numlines - status.scrollvalue < maxlines then
-				status.scrollvalue = numlines - maxlines
-				self.scrollbar:SetValue(status.scrollvalue)
-			end
-			self.noupdate = nil
-			first, last = status.scrollvalue+1, status.scrollvalue + maxlines
-		end
-		
-		local buttonnum = 1
-		for i = first, last do
-			local line = lines[i]
-			local button = buttons[buttonnum]
-			if not button then
-				button = self:CreateButton()
-
-				buttons[buttonnum] = button
-				button:SetParent(treeframe)
-				button:SetFrameLevel(treeframe:GetFrameLevel()+1)
-				button:ClearAllPoints()
-				if i == 1 then
-					if self.showscroll then
-						button:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10)
-						button:SetPoint("TOPLEFT", self.treeframe, "TOPLEFT", 0, -10)
-					else
-						button:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10)
-						button:SetPoint("TOPLEFT", self.treeframe, "TOPLEFT", 0, -10)
-					end
-				else
-					button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0)
-					button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0)
-				end
-			end
-
-			UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] )
-			button:Show()
-			buttonnum = buttonnum + 1
-		end
-
-	end
-	
-	local function SetSelected(self, value)
-		local status = self.status or self.localstatus
-		if status.selected ~= value then
-			status.selected = value
-			self:Fire("OnGroupSelected", value)
-		end
-	end
-	
-	local function BuildUniqueValue(...)
-		local n = select('#', ...)
-		if n == 1 then
-			return ...
-		else
-			return (...).."\001"..BuildUniqueValue(select(2,...))
-		end
-	end
-	
-	local function Select(self, uniquevalue, ...)
-		self.filter = false
-		local status = self.status or self.localstatus
-		local groups = status.groups
-		for i = 1, select('#', ...) do
-			groups[BuildUniqueValue(select(i, ...))] = true
-		end
-		status.selected = uniquevalue
-		self:RefreshTree()
-		self:Fire("OnGroupSelected", uniquevalue)
-	end
-	
-	local function SelectByPath(self, ...)
-		 self:Select(BuildUniqueValue(...), ...)
-	end
-	
-	--Selects a tree node by UniqueValue
-	local function SelectByValue(self, uniquevalue)
-		self:Select(uniquevalue,string.split("\001", uniquevalue))
-	end
-	
-
-	local function ShowScroll(self, show)
-		self.showscroll = show
-		if show then
-			self.scrollbar:Show()
-			if self.buttons[1] then
-				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10)
-			end
-		else
-			self.scrollbar:Hide()
-			if self.buttons[1] then
-				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10)
-			end
-		end
-	end
-	
-	local function OnWidthSet(self, width)
-		local content = self.content
-		local treeframe = self.treeframe
-		local status = self.status or self.localstatus
-		
-		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
-		treeframe:SetMaxResize(maxtreewidth,1600)
-	end
-	
-	
-	local function OnHeightSet(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-	
-
-	local function TreeOnMouseWheel(this, delta)
-		local self = this.obj
-		if self.showscroll then
-			local scrollbar = self.scrollbar
-			local min, max = scrollbar:GetMinMaxValues()
-			local value = scrollbar:GetValue()
-			local newvalue = math.min(max,math.max(min,value - delta))
-			if value ~= newvalue then
-				scrollbar:SetValue(newvalue)
-			end
-		end
-	end
-	
-	local function SetTreeWidth(self, treewidth, resizable)
-		if not resizable then
-			if type(treewidth) == 'number' then
-				resizable = false
-			elseif type(treewidth) == 'boolean' then
-				resizable = treewidth
-				treewidth = DEFAULT_TREE_WIDTH
-			else
-				resizable = false
-				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
-	end
-	
-	local function draggerLeave(this)
-		this:SetBackdropColor(1, 1, 1, 0)
-	end
-	
-	local function draggerEnter(this)
-		this:SetBackdropColor(1, 1, 1, 0.8)
-	end
-	
-	local function draggerDown(this)
-		local treeframe = this:GetParent()
-		treeframe:StartSizing("RIGHT")
-	end
-	
-	local function draggerUp(this)
-		local treeframe = this:GetParent()
-		local self = treeframe.obj
-		local frame = 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.obj:Fire("OnTreeResize",treeframe:GetWidth())
-		
-		local status = self.status or self.localstatus
-		status.treewidth = treeframe:GetWidth()
-	end
-
-	local createdcount = 0
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = Type
-		self.lines = {}
-		self.levels = {}
-		self.buttons = {}
-		self.hasChildren = {}
-		self.localstatus = {}
-		self.localstatus.groups = {}
-		self.filter = false
-		
-		local treeframe = CreateFrame("Frame",nil,frame)
-		treeframe.obj = self
-		treeframe:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0)
-		treeframe:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0)
-		treeframe:SetWidth(DEFAULT_TREE_WIDTH)
-		treeframe:SetScript("OnUpdate",FirstFrameUpdate)
-		treeframe:SetScript("OnSizeChanged",ResizeUpdate)
-		
-		treeframe:EnableMouseWheel(true)
-		treeframe:SetScript("OnMouseWheel", TreeOnMouseWheel)
-		treeframe:SetBackdrop(PaneBackdrop)
-		treeframe:SetBackdropColor(0.1,0.1,0.1,0.5)
-		treeframe:SetBackdropBorderColor(0.4,0.4,0.4)
-		
-		treeframe:SetResizable(true)
-		treeframe:SetMinResize(100, 1)
-		treeframe:SetMaxResize(400,1600)
-		local dragger = CreateFrame("Frame", nil, treeframe)
-		dragger:SetWidth(8)
-		dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
-		dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
-		dragger:SetBackdrop(DraggerBackdrop)
-		dragger:SetBackdropColor(1, 1, 1, 0)
-		dragger:SetScript("OnMouseDown", draggerDown)
-		dragger:SetScript("OnMouseUp", draggerUp)
-		dragger:SetScript("OnEnter", draggerEnter)
-		dragger:SetScript("OnLeave", draggerLeave)
-		
-		self.dragger = dragger
-		self.treeframe = treeframe
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		
-		self.SetTree = SetTree
-		self.SetTreeWidth = SetTreeWidth
-		self.RefreshTree = RefreshTree
-		self.SetStatusTable = SetStatusTable
-		self.BuildLevel = BuildLevel
-		self.CreateButton = CreateButton
-		self.SetSelected = SetSelected
-		self.ShowScroll = ShowScroll
-		self.SetStatusTable = SetStatusTable
-		self.Select = Select
-		self.SelectByValue = SelectByValue
-		self.SelectByPath = SelectByPath
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet		
-		self.EnableButtonTooltips = EnableButtonTooltips
-		self.Filter = Filter
-		
-		self.frame = frame
-		frame.obj = self
-
-		createdcount = createdcount + 1
-		local scrollbar = CreateFrame("Slider",("AceConfigDialogTreeGroup%dScrollBar"):format(createdcount),treeframe,"UIPanelScrollBarTemplate")
-		self.scrollbar = scrollbar
-		local scrollbg = scrollbar:CreateTexture(nil,"BACKGROUND")
-		scrollbg:SetAllPoints(scrollbar)
-		scrollbg:SetTexture(0,0,0,0.4)
-		scrollbar.obj = self
-		self.noupdate = true
-		scrollbar:SetPoint("TOPRIGHT",treeframe,"TOPRIGHT",-10,-26)
-		scrollbar:SetPoint("BOTTOMRIGHT",treeframe,"BOTTOMRIGHT",-10,26)
-		scrollbar:SetScript("OnValueChanged", OnScrollValueChanged)
-		scrollbar:SetMinMaxValues(0,0)
-		self.localstatus.scrollvalue = 0
-		scrollbar:SetValueStep(1)
-		scrollbar:SetValue(0)
-		scrollbar:SetWidth(16)
-		self.noupdate = nil
-
-		local border = CreateFrame("Frame",nil,frame)
-		self.border = border
-		border:SetPoint("TOPLEFT",treeframe,"TOPRIGHT", 0,0)
-		border:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		
-		border:SetBackdrop(PaneBackdrop)
-		border:SetBackdropColor(0.1,0.1,0.1,0.5)
-		border:SetBackdropBorderColor(0.4,0.4,0.4)
-		
-		--Container Support
-		local content = CreateFrame("Frame",nil,border)
-		self.content = content
-		content.obj = self
-		content:SetPoint("TOPLEFT",border,"TOPLEFT",10,-10)
-		content:SetPoint("BOTTOMRIGHT",border,"BOTTOMRIGHT",-10,10)
-		
-		AceGUI:RegisterAsContainer(self)
-		--AceGUI:RegisterAsWidget(self)
-		return self
-	end
-	
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Cauldron/Libs/AceHook-3.0/AceHook-3.0.lua b/Cauldron/Libs/AceHook-3.0/AceHook-3.0.lua
deleted file mode 100644
index 471e7ad..0000000
--- a/Cauldron/Libs/AceHook-3.0/AceHook-3.0.lua
+++ /dev/null
@@ -1,372 +0,0 @@
---[[ $Id: AceHook-3.0.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]
-local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 4
-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
-
-local _G = _G
-local format = string.format
-local next = next
-local pairs = pairs
-local type = type
-
--- 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 secure and obj:IsProtected() and protectedScripts[method] then
-			error(format("Cannot hook secure script %q; Use SecureHookScript(obj, method, [handler]) instead.", method), 3)
-		end
-		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
-	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
-			if script then
-				obj:SetScript(method, uid)
-			else
-				obj[method] = uid
-			end
-			self.hooks[obj][method] = orig
-		else
-			if script then
-				obj:HookScript(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
-
--- ("function" [, handler] [, hookSecure]) or (object, "method" [, handler] [, hookSecure])
-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
-
--- ("function" [, handler] [, hookSecure]) or (object, "method" [, handler] [, hookSecure])
-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
-
--- ("function", handler) or (object, "method", handler)
-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
-
-function AceHook:HookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, false, false, false,  "Usage: HookScript(object, method, [handler])")
-end
-
-function AceHook:RawHookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, false, true, false, "Usage: RawHookScript(object, method, [handler])")
-end
-
-function AceHook:SecureHookScript(frame, script, handler)
-	hook(self, frame, script, handler, true, true, false, false, "Usage: SecureHookScript(object, method, [handler])")
-end
-
--- ("function") or (object, "method")
-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
-
-function AceHook:UnhookAll()
-	for key, value in pairs(registry[self]) do
-		if type(key) == "table" then
-			for method in pairs(value) do
-				self:Unhook(key, method)
-			end
-		else
-			self:Unhook(key)
-		end
-	end
-end
-
--- ("function") or (object, "method")
-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/Cauldron/Libs/AceHook-3.0/AceHook-3.0.xml b/Cauldron/Libs/AceHook-3.0/AceHook-3.0.xml
deleted file mode 100644
index add0f26..0000000
--- a/Cauldron/Libs/AceHook-3.0/AceHook-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.lua b/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.lua
deleted file mode 100644
index a035e80..0000000
--- a/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.lua
+++ /dev/null
@@ -1,103 +0,0 @@
---[[ $Id: AceLocale-3.0.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]
-local MAJOR,MINOR = "AceLocale-3.0", 1
-
-local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceLocale then return end -- no upgrade needed
-
-local gameLocale = GetLocale()
-if gameLocale == "enGB" then
-	gameLocale = "enUS"
-end
-
-AceLocale.apps = AceLocale.apps or {}          -- array of ["AppName"]=localetableref
-AceLocale.appnames = AceLocale.appnames or {}  -- array of [localetableref]="AppName"
-
--- This metatable is used on all tables returned from GetLocale
-local readmeta = {
-	__index = function(self, key)	-- requesting totally unknown entries: fire off a nonbreaking error and return key
-		geterrorhandler()(MAJOR..": "..tostring(AceLocale.appnames[self])..": Missing entry for '"..tostring(key).."'")
-		rawset(self, key, key)	-- only need to see the warning once, really
-		return key
-	end
-}
-
--- Remember the locale table being registered right now (it gets set by :NewLocale())
-local registering
-
--- local assert false function
-local assertfalse = function() assert(false) end
-
--- This metatable proxy is used when registering nondefault locales
-local writeproxy = setmetatable({}, {
-	__newindex = function(self, key, value)
-		rawset(registering, key, value == true and key or value) -- assigning values: replace 'true' with key string
-	end,
-	__index = assertfalse
-})
-
--- 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 
---           loaded has a translation for the current locale, the translation
---           doesn't get overwritten.
---
-local writedefaultproxy = setmetatable({}, {
-	__newindex = function(self, key, value)
-		if not rawget(registering, key) then
-			rawset(registering, key, value == true and key or value)
-		end
-	end,
-	__index = assertfalse
-})
-
--- AceLocale:NewLocale(application, locale, isDefault)
---
---  application (string)  - unique name of addon / module
---  locale (string)       - name of locale to register, e.g. "enUS", "deDE", etc...
---  isDefault (string)    - if this is the default locale being registered
---
--- Returns a table where localizations can be filled out, or nil if the locale is not needed
-function AceLocale:NewLocale(application, locale, isDefault)
-
-	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
-	-- Ammo: I still think this is a bad idea, for instance an addon that checks for some ingame string will fail, just because some other addon
-	-- gives the user the illusion that they can run in a different locale? Ditch this whole thing or allow a setting per 'application'. I'm of the
-	-- opinion to remove this.
-	local gameLocale = GAME_LOCALE or gameLocale
-
-	if locale ~= gameLocale and not isDefault then
-		return -- nop, we don't need these translations
-	end
-	
-	local app = AceLocale.apps[application]
-	
-	if not app then
-		app = setmetatable({}, readmeta)
-		AceLocale.apps[application] = app
-		AceLocale.appnames[app] = application
-	end
-
-	registering = app	-- remember globally for writeproxy and writedefaultproxy
-	
-	if isDefault then
-		return writedefaultproxy
-	end
-
-	return writeproxy
-end
-
--- AceLocale:GetLocale(application [, silent])
---
---  application (string) - unique name of addon
---  silent (boolean)     - if true, the locale is optional, silently return nil if it's not found 
---
--- Returns localizations for the current locale (or default locale if translations are missing)
--- Errors if nothing is registered (spank developer, not just a missing translation)
-function AceLocale:GetLocale(application, silent)
-	if not silent and not AceLocale.apps[application] then
-		error("Usage: GetLocale(application[, silent]): 'application' - No locales registered for '"..tostring(application).."'", 2)
-	end
-	return AceLocale.apps[application]
-end
diff --git a/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.xml b/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.xml
deleted file mode 100644
index e017af0..0000000
--- a/Cauldron/Libs/AceLocale-3.0/AceLocale-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.lua b/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.lua
deleted file mode 100644
index 466a48a..0000000
--- a/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.lua
+++ /dev/null
@@ -1,414 +0,0 @@
---[[ $Id: AceTimer-3.0.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]
---[[
-	Basic assumptions:
-	* In a typical system, we do more re-scheduling per second than there are timer pulses per second
-	* Regardless of timer implementation, we cannot guarantee timely delivery due to FPS restriction (may be as low as 10)
-
-	This implementation:
-		CON: The smallest timer interval is constrained by HZ (currently 1/10s).
-		PRO: It will still correctly fire any timer slower than HZ over a length of time, e.g. 0.11s interval -> 90 times over 10 seconds
-		PRO: In lag bursts, the system simly skips missed timer intervals to decrease load
-		CON: Algorithms depending on a timer firing "N times per minute" will fail
-		PRO: (Re-)scheduling is O(1) with a VERY small constant. It's a simple linked list insertion in a hash bucket.
-		CAUTION: The BUCKETS constant constrains how many timers can be efficiently handled. With too many hash collisions, performance will decrease.
-		
-	Major assumptions upheld:
-	- ALLOWS scheduling multiple timers with the same funcref/method
-	- ALLOWS scheduling more timers during OnUpdate processing
-	- ALLOWS unscheduling ANY timer (including the current running one) at any time, including during OnUpdate processing
-]]
-
-local MAJOR, MINOR = "AceTimer-3.0", 4
-local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceTimer then return end -- No upgrade needed
-
-AceTimer.hash = AceTimer.hash or {}         -- Array of [0..BUCKET-1] = linked list of timers (using .next member)
-                                            -- Linked list gets around ACE-88 and ACE-90.
-AceTimer.selfs = AceTimer.selfs or {}       -- Array of [self]={[handle]=timerobj, [handle2]=timerobj2, ...}
-AceTimer.frame = AceTimer.frame or CreateFrame("Frame", "AceTimer30Frame")
-
-local type = type
-local next = next
-local pairs = pairs
-local select = select
-local tostring = tostring
-local floor = floor
-local max = max
-
--- Simple ONE-SHOT timer cache. Much more efficient than a full compost for our purposes.
-local timerCache = nil
-
---[[
-	Timers will not be fired more often than HZ-1 times per second. 
-	Keep at intended speed PLUS ONE or we get bitten by floating point rounding errors (n.5 + 0.1 can be n.599999)
-	If this is ever LOWERED, all existing timers need to be enforced to have a delay >= 1/HZ on lib upgrade.
-	If this number is ever changed, all entries need to be rehashed on lib upgrade.
-	]]
-local HZ = 11
-
---[[
-	Prime for good distribution
-	If this number is ever changed, all entries need to be rehashed on lib upgrade.
-]]
-local BUCKETS = 131
-
-local hash = AceTimer.hash
-for i=1,BUCKETS do
-	hash[i] = hash[i] or false	-- make it an integer-indexed array; it's faster than hashes
-end
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...	-- our arguments are received as unnamed values in "..." since we don't have a proper function declaration
-		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", table.concat(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, ...)
-end
-
-local lastint = floor(GetTime() * HZ)
-
-----------------------------------------------------------------------
--- OnUpdate handler
---
--- traverse buckets, always chasing "now", and fire timers that have expired
-
-local function OnUpdate()
-	local now = GetTime()
-	local nowint = floor(now * HZ)
-	
-	-- Have we passed into a new hash bucket?
-	if nowint == lastint then return end
-	
-	local soon = now + 1 -- +1 is safe as long as 1 < HZ < BUCKETS/2
-	
-	-- Pass through each bucket at most once
-	-- Happens on e.g. instance loads, but COULD happen on high local load situations also
-	for curint = (max(lastint, nowint - BUCKETS) + 1), nowint do -- loop until we catch up with "now", usually only 1 iteration
-		local curbucket = (curint % BUCKETS)+1
-		-- Yank the list of timers out of the bucket and empty it. This allows reinsertion in the currently-processed bucket from callbacks.
-		local nexttimer = hash[curbucket]
-		hash[curbucket] = false	-- false rather than nil to prevent the array from becoming a hash
-
-		while nexttimer do
-			local timer = nexttimer
-			nexttimer = timer.next
-			local when = timer.when
-			
-			if when < soon then
-				-- Call the timer func, either as a method on given object, or a straight function ref
-				local callback = timer.callback
-				if type(callback) == "string" then
-					safecall(timer.object[callback], timer.object, timer.arg)
-				elseif callback then
-					safecall(callback, timer.arg)
-				else
-					-- probably nilled out by CancelTimer
-					timer.delay = nil -- don't reschedule it
-				end
-
-				local delay = timer.delay	-- NOW make a local copy, can't do it earlier in case the timer cancelled itself in the callback
-				
-				if not delay then
-					-- single-shot timer (or cancelled)
-					AceTimer.selfs[timer.object][tostring(timer)] = nil
-					timerCache = timer
-				else
-					-- repeating timer
-					local newtime = when + delay
-					if newtime < now then -- Keep lag from making us firing a timer unnecessarily. (Note that this still won't catch too-short-delay timers though.)
-						newtime = now + delay
-					end
-					timer.when = newtime
-					
-					-- add next timer execution to the correct bucket
-					local bucket = (floor(newtime * HZ) % BUCKETS) + 1
-					timer.next = hash[bucket]
-					hash[bucket] = timer
-				end
-			else -- if when>=soon 
-				-- reinsert (yeah, somewhat expensive, but shouldn't be happening too often either due to hash distribution)
-				timer.next = hash[curbucket]
-				hash[curbucket] = timer
-			end -- if when<soon ... else
-		end -- while nexttimer do
-	end -- for curint=lastint,nowint
-	
-	lastint = nowint
-end
-
------------------------------------------------------------------------
--- Reg( callback, delay, arg, repeating )
---
--- callback( function or string ) - direct function ref or method name in our object for the callback
--- delay(int) - delay for the timer
--- arg(variant) - any argument to be passed to the callback function
--- repeating(boolean) - repeating timer, or oneshot
---
--- returns the handle of the timer for later processing (canceling etc)
-local function Reg(self, callback, delay, arg, repeating)
-	if type(callback) ~= "string" and type(callback) ~= "function" then 
-		local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer"
-		error(MAJOR..": " .. error_origin .. "(callback, delay, arg): 'callback' - function or method name expected.", 3)
-	end
-	if type(callback) == "string" then
-		if type(self)~="table" then
-			local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer"
-			error(MAJOR..": " .. error_origin .. "(\"methodName\", delay, arg): 'self' - must be a table.", 3)
-		end
-		if type(self[callback]) ~= "function" then 
-			local error_origin = repeating and "ScheduleRepeatingTimer" or "ScheduleTimer"
-			error(MAJOR..": " .. error_origin .. "(\"methodName\", delay, arg): 'methodName' - method not found on target object.", 3)
-		end
-	end
-	
-	if delay < (1 / (HZ - 1)) then
-		delay = 1 / (HZ - 1)
-	end
-	
-	-- Create and stuff timer in the correct hash bucket
-	local now = GetTime()
-	
-	local timer = timerCache or {}	-- Get new timer object (from cache if available)
-	timerCache = nil
-	
-	timer.object = self
-	timer.callback = callback
-	timer.delay = (repeating and delay)
-	timer.arg = arg
-	timer.when = now + delay
-
-	local bucket = (floor((now+delay)*HZ) % BUCKETS) + 1
-	timer.next = hash[bucket]
-	hash[bucket] = timer
-	
-	-- Insert timer in our self->handle->timer registry
-	local handle = tostring(timer)
-	
-	local selftimers = AceTimer.selfs[self]
-	if not selftimers then
-		selftimers = {}
-		AceTimer.selfs[self] = selftimers
-	end
-	selftimers[handle] = timer
-	selftimers.__ops = (selftimers.__ops or 0) + 1
-	
-	return handle
-end
-
-
------------------------------------------------------------------------
--- AceTimer:ScheduleTimer( callback, delay, arg )
--- AceTimer:ScheduleRepeatingTimer( callback, delay, arg )
---
--- callback( function or string ) - direct function ref or method name in our object for the callback
--- delay(int) - delay for the timer
--- arg(variant) - any argument to be passed to the callback function
---
--- returns a handle to the timer, which is used for cancelling it
-function AceTimer:ScheduleTimer(callback, delay, arg)
-	return Reg(self, callback, delay, arg)
-end
-
-function AceTimer:ScheduleRepeatingTimer(callback, delay, arg)
-	return Reg(self, callback, delay, arg, true)
-end
-
-
------------------------------------------------------------------------
--- AceTimer:CancelTimer(handle)
---
--- handle - Opaque object given by ScheduleTimer
--- silent - true: Do not error if the timer does not exist / is already cancelled. Default: false
---
--- Cancels a timer with the given handle, registered by the same 'self' as given in ScheduleTimer
---
--- Returns true if a timer was cancelled
-
-function AceTimer:CancelTimer(handle, silent)
-	if not handle then return end -- nil handle -> bail out without erroring
-	if type(handle)~="string" then
-		error(MAJOR..": CancelTimer(handle): 'handle' - expected a string", 2)	-- for now, anyway
-	end
-	local selftimers = AceTimer.selfs[self]
-	local timer = selftimers and selftimers[handle]
-	if silent then
-		if timer then
-			timer.callback = nil	-- don't run it again
-			timer.delay = nil		-- if this is the currently-executing one: don't even reschedule 
-			-- The timer object is removed in the OnUpdate loop
-		end
-		return not not timer	-- might return "true" even if we double-cancel. we'll live.
-	else
-		if not timer then
-			geterrorhandler()(MAJOR..": CancelTimer(handle[, silent]): '"..tostring(handle).."' - no such timer registered")
-			return false
-		end
-		if not timer.callback then 
-			geterrorhandler()(MAJOR..": CancelTimer(handle[, silent]): '"..tostring(handle).."' - timer already cancelled or expired")
-			return false
-		end
-		timer.callback = nil	-- don't run it again
-		timer.delay = nil		-- if this is the currently-executing one: don't even reschedule 
-		return true
-	end
-end
-
-
------------------------------------------------------------------------
--- AceTimer:CancelAllTimers()
---
--- Cancels all timers registered to given 'self'
-function AceTimer:CancelAllTimers()
-	if not(type(self)=="string" or type(self)=="table") then
-		error(MAJOR..": CancelAllTimers(): 'self' - must be a string or a table",2)
-	end
-	if self==AceTimer then
-		error(MAJOR..": CancelAllTimers(): supply a meaningful 'self'", 2)
-	end
-	
-	local selftimers = AceTimer.selfs[self]
-	if selftimers then
-		for handle,v in pairs(selftimers) do
-			if type(v)=="table" then	-- avoid __ops, etc
-				AceTimer.CancelTimer(self, handle, true)
-			end
-		end
-	end
-end
-
-
-
------------------------------------------------------------------------
--- PLAYER_REGEN_ENABLED: Run through our .selfs[] array step by step
--- and clean it out - otherwise the table indices can grow indefinitely
--- if an addon starts and stops a lot of timers. AceBucket does this!
---
--- See ACE-94 and tests/AceTimer-3.0-ACE-94.lua
-
-local lastCleaned = nil
-
-local function OnEvent(this, event)
-	if event~="PLAYER_REGEN_ENABLED" then
-		return
-	end
-	
-	-- Get the next 'self' to process
-	local selfs = AceTimer.selfs
-	local self = next(selfs, lastCleaned)
-	if not self then
-		self = next(selfs)
-	end
-	lastCleaned = self
-	if not self then	-- should only happen if .selfs[] is empty
-		return
-	end
-	
-	-- Time to clean it out?
-	local list = selfs[self]
-	if (list.__ops or 0) < 250 then	-- 250 slosh indices = ~10KB wasted (max!). For one 'self'.
-		return
-	end
-	
-	-- Create a new table and copy all members over
-	local newlist = {}
-	local n=0
-	for k,v in pairs(list) do
-		newlist[k] = v
-		n=n+1
-	end
-	newlist.__ops = 0	-- Reset operation count
-	
-	-- And since we now have a count of the number of live timers, check that it's reasonable. Emit a warning if not.
-	if n>BUCKETS then
-		DEFAULT_CHAT_FRAME:AddMessage(MAJOR..": Warning: The addon/module '"..tostring(self).."' has "..n.." live timers. Surely that's not intended?")
-	end
-	
-	selfs[self] = newlist
-end
-
------------------------------------------------------------------------
--- Embed handling
-
-AceTimer.embeds = AceTimer.embeds or {}
-
-local mixins = {
-	"ScheduleTimer", "ScheduleRepeatingTimer", 
-	"CancelTimer", "CancelAllTimers"
-}
-
-function AceTimer:Embed(target)
-	AceTimer.embeds[target] = true
-	for _,v in pairs(mixins) do
-		target[v] = AceTimer[v]
-	end
-	return target
-end
-
---AceTimer:OnEmbedDisable( target )
--- target (object) - target object that AceTimer is embedded in.
---
--- cancel all timers registered for the object
-function AceTimer:OnEmbedDisable( target )
-	target:CancelAllTimers()
-end
-
-
-for addon in pairs(AceTimer.embeds) do
-	AceTimer:Embed(addon)
-end
-
------------------------------------------------------------------------
--- Debug tools (expose copies of internals to test suites)
-AceTimer.debug = AceTimer.debug or {}
-AceTimer.debug.HZ = HZ
-AceTimer.debug.BUCKETS = BUCKETS
-
------------------------------------------------------------------------
--- Finishing touchups
-
-AceTimer.frame:SetScript("OnUpdate", OnUpdate)
-AceTimer.frame:SetScript("OnEvent", OnEvent)
-AceTimer.frame:RegisterEvent("PLAYER_REGEN_ENABLED")
-
--- In theory, we should hide&show the frame based on there being timers or not.
--- However, this job is fairly expensive, and the chance that there will 
--- actually be zero timers running is diminuitive to say the lest.
diff --git a/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.xml b/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.xml
deleted file mode 100644
index 38e9021..0000000
--- a/Cauldron/Libs/AceTimer-3.0/AceTimer-3.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
diff --git a/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua b/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
deleted file mode 100644
index 65a1a3a..0000000
--- a/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
+++ /dev/null
@@ -1,239 +0,0 @@
---[[ $Id: CallbackHandler-1.0.lua,v 1.2 2009/01/18 03:14:52 cipher Exp $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 3
-local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not CallbackHandler then return end -- No upgrade needed
-
-local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
-
-local type = type
-local pcall = pcall
-local pairs = pairs
-local assert = assert
-local concat = table.concat
-local loadstring = loadstring
-local next = next
-local select = select
-local type = type
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-	local next, xpcall, eh = ...
-
-	local method, ARGS
-	local function call() method(ARGS) end
-
-	local function dispatch(handlers, ...)
-		local index
-		index, method = next(handlers)
-		if not method then return end
-		local OLD_ARGS = ARGS
-		ARGS = ...
-		repeat
-			xpcall(call, eh)
-			index, method = next(handlers, index)
-		until not method
-		ARGS = OLD_ARGS
-	end
-
-	return dispatch
-	]]
-
-	local ARGS, OLD_ARGS = {}, {}
-	for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end
-	code = code:gsub("OLD_ARGS", concat(OLD_ARGS, ", ")):gsub("ARGS", concat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-
---------------------------------------------------------------------------
--- CallbackHandler:New
---
---   target            - target object to embed public APIs in
---   RegisterName      - name of the callback registration API, default "RegisterCallback"
---   UnregisterName    - name of the callback unregistration API, default "UnregisterCallback"
---   UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
-
-function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName, OnUsed, OnUnused)
-	-- TODO: Remove this after beta has gone out
-	assert(not OnUsed and not OnUnused, "ACE-80: OnUsed/OnUnused are deprecated. Callbacks are now done to registry.OnUsed and registry.OnUnused")
-
-	RegisterName = RegisterName or "RegisterCallback"
-	UnregisterName = UnregisterName or "UnregisterCallback"
-	if UnregisterAllName==nil then	-- false is used to indicate "don't want this method"
-		UnregisterAllName = "UnregisterAllCallbacks"
-	end
-
-	-- we declare all objects and exported APIs inside this closure to quickly gain access
-	-- to e.g. function names, the "target" parameter, etc
-
-
-	-- Create the registry object
-	local events = setmetatable({}, meta)
-	local registry = { recurse=0, events=events }
-
-	-- registry:Fire() - fires the given event/message into the registry
-	function registry:Fire(eventname, ...)
-		if not rawget(events, eventname) or not next(events[eventname]) then return end
-		local oldrecurse = registry.recurse
-		registry.recurse = oldrecurse + 1
-
-		Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...)
-
-		registry.recurse = oldrecurse
-
-		if registry.insertQueue and oldrecurse==0 then
-			-- Something in one of our callbacks wanted to register more callbacks; they got queued
-			for eventname,callbacks in pairs(registry.insertQueue) do
-				local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-				for self,func in pairs(callbacks) do
-					events[eventname][self] = func
-					-- fire OnUsed callback?
-					if first and registry.OnUsed then
-						registry.OnUsed(registry, target, eventname)
-						first = nil
-					end
-				end
-			end
-			registry.insertQueue = nil
-		end
-	end
-
-	-- Registration of a callback, handles:
-	--   self["method"], leads to self["method"](self, ...)
-	--   self with function ref, leads to functionref(...)
-	--   "addonId" (instead of self) with function ref, leads to functionref(...)
-	-- all with an optional arg, which, if present, gets passed as first argument (after self if present)
-	target[RegisterName] = function(self, eventname, method, ... --[[actually just a single arg]])
-		if type(eventname) ~= "string" then
-			error("Usage: "..RegisterName.."(eventname, method[, arg]): 'eventname' - string expected.", 2)
-		end
-
-		method = method or eventname
-
-		local first = not rawget(events, eventname) or not next(events[eventname])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-
-		if type(method) ~= "string" and type(method) ~= "function" then
-			error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - string or function expected.", 2)
-		end
-
-		local regfunc
-
-		if type(method) == "string" then
-			-- self["method"] calling style
-			if type(self) ~= "table" then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): self was not a table?", 2)
-			elseif self==target then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): do not use Library:"..RegisterName.."(), use your own 'self'", 2)
-			elseif type(self[method]) ~= "function" then
-				error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2)
-			end
-
-			if select("#",...)>=1 then	-- this is not the same as testing for arg==nil!
-				local arg=select(1,...)
-				regfunc = function(...) self[method](self,arg,...) end
-			else
-				regfunc = function(...) self[method](self,...) end
-			end
-		else
-			-- function ref with self=object or self="addonId"
-			if type(self)~="table" and type(self)~="string" then
-				error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string expected.", 2)
-			end
-
-			if select("#",...)>=1 then	-- this is not the same as testing for arg==nil!
-				local arg=select(1,...)
-				regfunc = function(...) method(arg,...) end
-			else
-				regfunc = method
-			end
-		end
-
-
-		if events[eventname][self] or registry.recurse<1 then
-		-- if registry.recurse<1 then
-			-- we're overwriting an existing entry, or not currently recursing. just set it.
-			events[eventname][self] = regfunc
-			-- fire OnUsed callback?
-			if registry.OnUsed and first then
-				registry.OnUsed(registry, target, eventname)
-			end
-		else
-			-- we're currently processing a callback in this registry, so delay the registration of this new entry!
-			-- yes, we're a bit wasteful on garbage, but this is a fringe case, so we're picking low implementation overhead over garbage efficiency
-			registry.insertQueue = registry.insertQueue or setmetatable({},meta)
-			registry.insertQueue[eventname][self] = regfunc
-		end
-	end
-
-	-- Unregister a callback
-	target[UnregisterName] = function(self, eventname)
-		if not self or self==target then
-			error("Usage: "..UnregisterName.."(eventname): bad 'self'", 2)
-		end
-		if type(eventname) ~= "string" then
-			error("Usage: "..UnregisterName.."(eventname): 'eventname' - string expected.", 2)
-		end
-		if rawget(events, eventname) and events[eventname][self] then
-			events[eventname][self] = nil
-			-- Fire OnUnused callback?
-			if registry.OnUnused and not next(events[eventname]) then
-				registry.OnUnused(registry, target, eventname)
-			end
-		end
-		if registry.insertQueue and rawget(registry.insertQueue, eventname) and registry.insertQueue[eventname][self] then
-			registry.insertQueue[eventname][self] = nil
-		end
-	end
-
-	-- OPTIONAL: Unregister all callbacks for given selfs/addonIds
-	if UnregisterAllName then
-		target[UnregisterAllName] = function(...)
-			if select("#",...)<1 then
-				error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2)
-			end
-			if select("#",...)==1 and ...==target then
-				error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2)
-			end
-
-
-			for i=1,select("#",...) do
-				local self = select(i,...)
-				if registry.insertQueue then
-					for eventname, callbacks in pairs(registry.insertQueue) do
-						if callbacks[self] then
-							callbacks[self] = nil
-						end
-					end
-				end
-				for eventname, callbacks in pairs(events) do
-					if callbacks[self] then
-						callbacks[self] = nil
-						-- Fire OnUnused callback?
-						if registry.OnUnused and not next(callbacks) then
-							registry.OnUnused(registry, target, eventname)
-						end
-					end
-				end
-			end
-		end
-	end
-
-	return registry
-end
-
-
--- CallbackHandler purposefully does NOT do explicit embedding. Nor does it
--- try to upgrade old implicit embeds since the system is selfcontained and
--- relies on closures to work.
-
diff --git a/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml b/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
deleted file mode 100644
index 876df83..0000000
--- a/Cauldron/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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="CallbackHandler-1.0.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/Cauldron/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua b/Cauldron/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua
deleted file mode 100644
index f47c0cd..0000000
--- a/Cauldron/Libs/LibDataBroker-1.1/LibDataBroker-1.1.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-
-assert(LibStub, "LibDataBroker-1.1 requires LibStub")
-assert(LibStub:GetLibrary("CallbackHandler-1.0", true), "LibDataBroker-1.1 requires CallbackHandler-1.0")
-
-local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 4)
-if not lib then return end
-oldminor = oldminor or 0
-
-
-lib.callbacks = lib.callbacks or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
-lib.attributestorage, lib.namestorage, lib.proxystorage = lib.attributestorage or {}, lib.namestorage or {}, lib.proxystorage or {}
-local attributestorage, namestorage, callbacks = lib.attributestorage, lib.namestorage, lib.callbacks
-
-if oldminor < 2 then
-	lib.domt = {
-		__metatable = "access denied",
-		__index = function(self, key) return attributestorage[self] and attributestorage[self][key] end,
-	}
-end
-
-if oldminor < 3 then
-	lib.domt.__newindex = function(self, key, value)
-		if not attributestorage[self] then attributestorage[self] = {} end
-		if attributestorage[self][key] == value then return end
-		attributestorage[self][key] = value
-		local name = namestorage[self]
-		if not name then return end
-		callbacks:Fire("LibDataBroker_AttributeChanged", name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name.."_"..key, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged__"..key, name, key, value, self)
-	end
-end
-
-if oldminor < 2 then
-	function lib:NewDataObject(name, dataobj)
-		if self.proxystorage[name] then return end
-
-		if dataobj then
-			assert(type(dataobj) == "table", "Invalid dataobj, must be nil or a table")
-			self.attributestorage[dataobj] = {}
-			for i,v in pairs(dataobj) do
-				self.attributestorage[dataobj][i] = v
-				dataobj[i] = nil
-			end
-		end
-		dataobj = setmetatable(dataobj or {}, self.domt)
-		self.proxystorage[name], self.namestorage[dataobj] = dataobj, name
-		self.callbacks:Fire("LibDataBroker_DataObjectCreated", name, dataobj)
-		return dataobj
-	end
-end
-
-if oldminor < 1 then
-	function lib:DataObjectIterator()
-		return pairs(self.proxystorage)
-	end
-
-	function lib:GetDataObjectByName(dataobjectname)
-		return self.proxystorage[dataobjectname]
-	end
-
-	function lib:GetNameByDataObject(dataobject)
-		return self.namestorage[dataobject]
-	end
-end
-
-if oldminor < 4 then
-	local next = pairs(attributestorage)
-	function lib:pairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:pairs('dataobjectname') or ldb:pairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return next, attributestorage[dataobj], nil
-	end
-
-	local ipairs_iter = ipairs(attributestorage)
-	function lib:ipairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:ipairs('dataobjectname') or ldb:ipairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return ipairs_iter, attributestorage[dataobj], 0
-	end
-end
diff --git a/Cauldron/Libs/LibDataBroker-1.1/README.textile b/Cauldron/Libs/LibDataBroker-1.1/README.textile
deleted file mode 100644
index ef16fed..0000000
--- a/Cauldron/Libs/LibDataBroker-1.1/README.textile
+++ /dev/null
@@ -1,13 +0,0 @@
-LibDataBroker is a small WoW addon library designed to provide a "MVC":http://en.wikipedia.org/wiki/Model-view-controller interface for use in various addons.
-LDB's primary goal is to "detach" plugins for TitanPanel and FuBar from the display addon.
-Plugins can provide data into a simple table, and display addons can receive callbacks to refresh their display of this data.
-LDB also provides a place for addons to register "quicklaunch" functions, removing the need for authors to embed many large libraries to create minimap buttons.
-Users who do not wish to be "plagued" by these buttons simply do not install an addon to render them.
-
-Due to it's simple generic design, LDB can be used for any design where you wish to have an addon notified of changes to a table.
-
-h2. Links
-
-* "API documentation":http://github.com/tekkub/libdatabroker-1-1/wikis/api
-* "Data specifications":http://github.com/tekkub/libdatabroker-1-1/wikis/data-specifications
-* "Addons using LDB":http://github.com/tekkub/libdatabroker-1-1/wikis/addons-using-ldb
diff --git a/Cauldron/Libs/LibLogger-1.0/LibLogger-1.0.lua b/Cauldron/Libs/LibLogger-1.0/LibLogger-1.0.lua
deleted file mode 100644
index bc2ab6a..0000000
--- a/Cauldron/Libs/LibLogger-1.0/LibLogger-1.0.lua
+++ /dev/null
@@ -1,143 +0,0 @@
---[[
-**********************************************************************
-LibLogger is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-LibLogger is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with LibLogger.  If not, see <http://www.gnu.org/licenses/>.
-**********************************************************************
-
-To use this addon, embed it in your addon using the normal Ace-method
-or manually like this:
-
-  LibStub("LibLogger-1.0"):Embed(MyAddon)
-
-After embedding you will be able to use the following methods:
-
-  MyAddon:error( args )
-  MyAddon:warn ( args )
-  MyAddon:info ( args )
-  MyAddon:debug( args ) 
-  MyAddon:trace( args )
-  MyAddon:spam ( args ) 
-
-  Args is either a string or a format string with subsequent arguments
-  being used in the formatting. for example:
-
-
-  MyAddon:trace("Setting parameter %s to %d.", paramname, value)
-
-  You can set the log level using this method:
-
-  MyAddon:SetLogLevel(level)
-
-  Available levels will be defined in MyAddon.logLevels and are:
-
-    NONE, ERROR, WARN, INFO, DEBUG, TRACE and SPAM
-
-  I.e: MyAddon:SetLogLevel(MyAddons.logLevels.INFO).
-
-  You can return the current log level with:
-
-  level = MyAddon:GetLogLevel()
-
-  There is also an optional performance mode that undefine the logger
-  methods you don't need for the current log level:
-
-
-  Logging Optimization:
-
-  For best performance, especially if you do calculations or evaluations in your log statement,
-  enclose it with an if statement like this:
-
-  if log.hasTrace then log.trace("Trace Message") end
-
-  The reason for using this optimization mode is that it allows you to
-  do calculations in debug messages without having to worry about the
-  execution costs (i.e the code is only evaluated when it's actually
-  needed).  This is also cleaner than doing a comparision against the
-  logging level.
-
-]]
-
--- This file handles logging of variable levels
-
-
-local logPrefix = {
-   "|cffff0000ERROR:|r ", 
-   "|cffffff00WARN:|r ", 
-   "", 
-   "|cffd9d919DEBUG:|r ", 
-   "|cffd9d5fFTRACE:|r ",
-   "|cffff5050SPAM:|r ",
-}
-
-local MAJOR = "LibLogger-1.0"
-local MINOR = tonumber(("$Revision: 1.1 $"):match("(%d+)")) + 90000
-
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-lib.logLevels = { NONE = 0, ERROR = 1, WARN = 2, INFO = 3, DEBUG = 4, TRACE = 5, SPAM = 6 }
-
-local logLevels = lib.logLevels
-
-local function LogMessage(level,addon,...)
-   if level <= addon.logLevel then
-      if  addon.Print then 
-	 addon:Print(logPrefix[level]..string.format(...))
-      else
-	 DEFAULT_CHAT_FRAME:AddMessage("|cff33ff99Logger|r: "..logPrefix[level]..string.format(...) )
-      end
-   end
-end
-
-local function debug(...) LogMessage(logLevels.DEBUG, ...) end
-local function error(...) LogMessage(logLevels.ERROR, ...) end
-local function warn(...) LogMessage(logLevels.WARN,  ...) end
-local function info(...) LogMessage(logLevels.INFO,  ...) end
-local function trace(...) LogMessage(logLevels.TRACE, ...) end
-local function spam(...) LogMessage(logLevels.SPAM, ...) end
-
-function lib:SetLogLevel(level)
-   local logLevel = tonumber(level)
-   if logLevel >= logLevels.ERROR then self.hasError = error else self.hasError = nil end
-   if logLevel >= logLevels.WARN  then self.hasWarn = warn else self.hasWarn = nil end
-   if logLevel >= logLevels.INFO  then self.hasInfo = info else self.hasInfo = nil end
-   if logLevel >= logLevels.DEBUG then self.hasDebug = debug else self.hasDebug = nil end
-   if logLevel >= logLevels.TRACE then self.hasTrace = trace else self.hasTrace = nil end
-   if logLevel >= logLevels.SPAM  then self.hasSpam = spam else self.hasSpam = nil end
-   self.logLevel = logLevel
-end
-
-function lib:GetLogLevel() return self.logLevel end
-
-function lib:SetPerformanceMode(val)
-end
-
-local embeddables = { "GetLogLevel", "SetLogLevel", "logLevels", "SetPerformanceMode" }
-
-function lib:Embed(addon)
-   for _,key in ipairs(embeddables) do
-      addon[key] = lib[key]
-      addon.error = error
-      addon.warn = warn 
-      addon.info = info
-      addon.debug = debug 
-      addon.trace = trace
-      addon.spam = spam 
-   end
-   if not addon.logLevel then
-      addon:SetLogLevel(logLevels.INFO)
-   end
-end
-
-
diff --git a/Cauldron/Libs/LibLogger-1.0/lib.xml b/Cauldron/Libs/LibLogger-1.0/lib.xml
deleted file mode 100644
index 9793748..0000000
--- a/Cauldron/Libs/LibLogger-1.0/lib.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="LibLogger-1.0.lua"/>
-
-</Ui>
-
diff --git a/Cauldron/Libs/LibStub/LibStub.lua b/Cauldron/Libs/LibStub/LibStub.lua
deleted file mode 100644
index 0a41ac0..0000000
--- a/Cauldron/Libs/LibStub/LibStub.lua
+++ /dev/null
@@ -1,30 +0,0 @@
--- 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
-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]
-
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	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.")
-		
-		local oldminor = self.minors[major]
-		if oldminor and oldminor >= minor then return nil end
-		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
-		return self.libs[major], oldminor
-	end
-	
-	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)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	function LibStub:IterateLibraries() return pairs(self.libs) end
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
diff --git a/Cauldron/Libs/LibStub/LibStub.toc b/Cauldron/Libs/LibStub/LibStub.toc
deleted file mode 100644
index 4d9130c..0000000
--- a/Cauldron/Libs/LibStub/LibStub.toc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Interface: 20400
-## Title: Lib: LibStub
-## Notes: Universal Library Stub
-## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel
-## X-Website: http://jira.wowace.com/browse/LS
-## X-Category: Library
-## X-License: Public Domain	
-
-LibStub.lua
-- 
1.7.9.5