Quantcast

Removed DockingStation

Daedhir [05-14-11 - 03:27]
Removed DockingStation
Filename
Interface/AddOns/DockingStation/Config.lua
Interface/AddOns/DockingStation/Convert.lua
Interface/AddOns/DockingStation/Core.lua
Interface/AddOns/DockingStation/DockingStation.toc
Interface/AddOns/DockingStation/FontStrings.lua
Interface/AddOns/DockingStation/Groups.lua
Interface/AddOns/DockingStation/Libs/AceDB-3.0.lua
Interface/AddOns/DockingStation/Libs/AceEvent-3.0.lua
Interface/AddOns/DockingStation/Libs/CallbackHandler-1.0.lua
Interface/AddOns/DockingStation/Libs/LibDataBroker-1.1.lua
Interface/AddOns/DockingStation/Libs/LibDisplayAssist-1.2.lua
Interface/AddOns/DockingStation/Libs/LibJostle-3.0.lua
Interface/AddOns/DockingStation/Libs/LibOptionsAssist-1.0.lua
Interface/AddOns/DockingStation/Libs/LibSharedMedia-3.0.lua
Interface/AddOns/DockingStation/Libs/LibStateDriver-1.1.lua
Interface/AddOns/DockingStation/Libs/LibStub.lua
Interface/AddOns/DockingStation/Locales/deDE.lua
Interface/AddOns/DockingStation/Media/Gloss.tga
Interface/AddOns/DockingStation/Media/Icon.tga
Interface/AddOns/DockingStation/Media/Line, Gradient (Center).tga
Interface/AddOns/DockingStation/Media/Line, Gradient.tga
Interface/AddOns/DockingStation/Media/Line, Solid.tga
Interface/AddOns/DockingStation/Media/None.tga
Interface/AddOns/DockingStation/Panels.lua
Interface/AddOns/DockingStation/Plugins.lua
Interface/AddOns/DockingStation/Settings.lua
Interface/AddOns/DockingStation/Textures.lua
Interface/AddOns/DockingStation_Config/Core.lua
Interface/AddOns/DockingStation_Config/DockingStation_Config.toc
Interface/AddOns/DockingStation_Config/Libs/AceConfigDialog-3.0.lua
Interface/AddOns/DockingStation_Config/Libs/AceConfigRegistry-3.0.lua
Interface/AddOns/DockingStation_Config/Libs/AceDBOptions-3.0.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/prototypes.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/widget.xml
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.xml
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
Interface/AddOns/DockingStation_Config/Libs/LibMenuAssist-1.0.lua
Interface/AddOns/DockingStation_Config/Locales/deDE.lua
Interface/AddOns/DockingStation_Config/SideBar.lua
Interface/AddOns/DockingStation_Config/SideBarMenu.lua
Interface/AddOns/DockingStation_Config/Widget-StatusbarOverlay.lua
diff --git a/Interface/AddOns/DockingStation/Config.lua b/Interface/AddOns/DockingStation/Config.lua
deleted file mode 100644
index eaaed7a..0000000
--- a/Interface/AddOns/DockingStation/Config.lua
+++ /dev/null
@@ -1,92 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-CONFIG_IS_OPEN = false
-PanelList = { Add = DoNothing, Delete = DoNothing, Refresh = DoNothing, Select = DoNothing }
-PluginList = PanelList																				-- Will assign a seperate table when needed
-
---[[-----------------------------------------------------------------------------
-Config mode support
--------------------------------------------------------------------------------]]
-GetSubTable(_G, 'CONFIGMODE_CALLBACKS')[addonName] = function(action)
-	local lock
-	if action == 'ON' then
-		lock = false
-	elseif action == 'OFF' then
-		lock = true
-	else
-		return
-	end
-	settings.lockPanel = lock
-	for _, settings in pairs(settings.panels) do
-		settings.lockPanel = nil
-	end
-	AllPanels(lock and "Lock" or "Unlock")
-	UpdateConfig(nil, true)
-end
-
---[[-----------------------------------------------------------------------------
-LoD support
--------------------------------------------------------------------------------]]
-local LOA = LibStub('LibOptionsAssist-1.0', true)
-if not (LOA and select(2, GetAddOnInfo(addonName .. '_Config'))) then return end	-- Make sure config support exists
-
-local function LoadOnDemand()
-	local config = addonName .. '_Config'
-	addon.addonName, _G[config], PluginList = addonName, addon, { }					-- PanelList and PluginList are shared while they are dummies
-	LibStub('LibOptionsAssist-1.0'):LoadModule(config)
-	addon.addonName, _G[config] = nil, nil
-	for index = 0, #ConfigFrames do
-		ConfigFrames[index]:FlagAsLoaded()
-	end
-end
-
-ConfigFrames = {
-	[0] = LOA:AddEntry(addonName, nil, LoadOnDemand),
-	[1] = LOA:AddEntry(L["Panels"], addonName, LoadOnDemand),
-	[2] = LOA:AddEntry(L["Plugins"], addonName, LoadOnDemand),
-	[3] = LOA:AddEntry(L["Profiles"], addonName, LoadOnDemand)
-}
-
-function OpenConfig()
-	local open = 0
-	for index = 0, #ConfigFrames do
-		if ConfigFrames[index]:IsShown() then
-			open = ConfigFrames[index]:IsVisible() and index + 1 or index
-			break
-		end
-	end
-	ConfigFrames[open % (#ConfigFrames + 1)]()
-end
-
---[[-----------------------------------------------------------------------------
-Quicklauncher
--------------------------------------------------------------------------------]]
-LibStub('LibDataBroker-1.1'):NewDataObject(addonName, {
-	type = 'launcher',
-	icon = [[Interface\AddOns\]] .. addonName .. [[\Media\Icon]],
-	iconCoords = { 2/64, 61/64, 3/64, 61/64 },
-	label = addonName,
-	OnClick = function()
-		local open = 0
-		for index = 0, #ConfigFrames do
-			if ConfigFrames[index]:IsShown() then
-				open = ConfigFrames[index]:IsVisible() and index + 1 or index
-				break
-			end
-		end
-		ConfigFrames[open % (#ConfigFrames + 1)]()
-	end,
-	OnTooltipShow = function(tooltip)
-		tooltip:SetText(addonName, 1, 1, 1)
-		tooltip:AddLine(L["Click to open the configuration panel."], NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
-	end
-})
-
---[[-----------------------------------------------------------------------------
-Slash command
--------------------------------------------------------------------------------]]
-_G['SLASH_' .. addonName .. 1] = '/' .. addonName
-_G['SLASH_' .. addonName .. 2] = '/' .. addonName:lower()
-_G['SLASH_' .. addonName .. 3] = '/' .. addonName:upper()
-SlashCmdList[addonName] = ConfigFrames[0]
diff --git a/Interface/AddOns/DockingStation/Convert.lua b/Interface/AddOns/DockingStation/Convert.lua
deleted file mode 100644
index 39ccb29..0000000
--- a/Interface/AddOns/DockingStation/Convert.lua
+++ /dev/null
@@ -1,195 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local format, pairs_iter, pcall, select = string.format, pairs(addon), pcall, select
-
-local function Relocate(table, oldKey, newKey, newTable)
-	if table[oldKey] ~= nil then
-		if (newTable or table)[newKey] == nil then
-			(newTable or table)[newKey] = table[oldKey]
-		end
-		table[oldKey] = nil
-	end
-end
-
-local function Update(settings, ConvertProfile, ConvertPanel, ConvertPlugin, UpdatePanels, UpdatePlugins)
-	for name, settings in pairs_iter, settings.profiles, nil do
-		if settings.plugins then
-			if UpdatePlugins then
-				UpdatePlugins(settings.plugins, settings)
-			end
-			for name, settings in pairs_iter, settings.plugins, nil do
-				ConvertPlugin(settings, name)
-			end
-		end
-		if settings.panels then
-			if UpdatePanels then
-				UpdatePanels(settings.panels, settings)
-			end
-			for id, settings in pairs_iter, settings.panels, nil do
-				ConvertPanel(settings, id)
-			end
-		end
-		ConvertProfile(settings, name)
-	end
-end
-
-local function Void(table, ...)
-	for index = 1, select('#', ...) do
-		table[select(index, ...)] = nil
-	end
-end
-
-function Convert(settings)
-	local major, minor, revision = tostring(settings.version):match("([0-9]*)%.?([0-9]*)%.?([0-9]*)")
-	local version = (tonumber(major) or 0) * 1000000 + (tonumber(minor) or 0) * 1000 + (tonumber(revision) or 0)
-
-	--[[--------------------------------------------------------------------------
-	Update settings to version 0.3
-	----------------------------------------------------------------------------]]
-	if version < 3000 then
-		local function ConvertPlugin(settings)
-			if settings.tooltipDefaults == false then
-				if settings.tooltipHideCombat == nil then
-					if settings.tooltipHide ~= nil then
-						settings.tooltipHideCombat, settings.tooltipHideNoCombat = settings.tooltipHide, settings.tooltipHide
-					elseif settings.tooltipRestrict ~= nil then
-						settings.tooltipHideCombat, settings.tooltipHideNoCombat = settings.tooltipRestrict, false
-					end
-				end
-				if settings.tooltipNoScale ~= nil then
-					settings.tooltipScale = 1
-				end
-			end
-			Void(settings, "tooltipHide", "tooltipNoScale", "tooltipRestrict")
-		end
-
-		local function ConvertPanel(settings)
-			if settings.template ~= nil then
-				local ok, result = pcall(format, settings.template, "$id", "$#")
-				if ok then
-					settings.template = result
-				else
-					settings.template = nil
-				end
-			end
-			ConvertPlugin(settings)
-		end
-
-		Update(settings, ConvertPanel, ConvertPanel, ConvertPlugin)
-	end
-
-	--[[--------------------------------------------------------------------------
-	Update settings to version 0.4
-	----------------------------------------------------------------------------]]
-	if version < 4000 then
-		local pluginAlias, pluginType = settings.pluginAlias, settings.pluginType
-		local function ConvertPlugin(settings, name)
-			if name then
-				if settings.label ~= name then
-					Relocate(settings, 'label', name, pluginAlias)
-				end
-				Relocate(settings, 'type', name, pluginType)
-			end
-			if settings.iconDefaults == false then
-				settings.iconFlip, settings.iconTrim, settings.iconVertAdj = false, true, 0
-			end
-			if settings.tooltipHideCombat then
-				if settings.tooltipHideNoCombat then
-					settings.tooltipParameters = "hide"
-				else
-					settings.tooltipParameters = "[combat] hide"
-				end
-			elseif settings.tooltipHideNoCombat then
-				settings.tooltipParameters = "[nocombat] hide"
-			elseif settings.tooltipDefaults == false then
-				settings.tooltipParameters = ""
-			end
-			Void(settings, "iconDefaults", "labelDefaults", "suffixDefaults", "textDefaults", "tooltipDefaults")
-			Void(settings, "labelColorA", "labelColorB", "labelColorG", "labelColorR", "labelEffect", "labelFont", "labelHide", "labelOverride", "labelSize", "labelUseText", "labelVertAdj")
-			Void(settings, "suffixColorA", "suffixColorB", "suffixColorG", "suffixColorR", "suffixEffect", "suffixFont", "suffixHide", "suffixOverride", "suffixSize", "suffixUseText", "suffixVertAdj")
-			Void(settings, "textColorA", "textColorB", "textColorG", "textColorR", "textEffect", "textFixed", "textFont", "textHide", "textOverride", "textSize", "textVertAdj")
-			Void(settings, "tooltipAllowScaling", "tooltipHideCombat", "tooltipHideNoCombat")
-		end
-
-		local function ConvertPanel(settings)
-			if settings.alphaCombat then
-				settings.alphaParameters = "[combat] " .. settings.alphaFaded
-			elseif settings.alphaDefaults == false then
-				settings.alphaParameters = ""
-			end
-			Relocate(settings, "bgOverlay", "overlayTexture")
-			Relocate(settings, "bgOverlayColorA", "overlayColorA")
-			Relocate(settings, "bgOverlayColorB", "overlayColorB")
-			Relocate(settings, "bgOverlayColorG", "overlayColorG")
-			Relocate(settings, "bgOverlayColorR", "overlayColorR")
-			Relocate(settings, "bgOverlayFlip", "overlayFlip")
-			Relocate(settings, "bgOverlayFlop", "overlayFlop")
-			Void(settings, "alphaDefaults", "appearanceDefaults", "bgDefaults", "borderDefaults", "positionDefaults", "spacingDefaults")
-			Void(settings, "alphaCombat", "alphaFaded", "template")
-			Void(settings, "spacingCenter", "spacingLeft", "spacingLeftEdge", "spacingRight", "spacingRightEdge")
-			ConvertPlugin(settings)
-		end
-
-		local function ConvertProfile(settings)
-			Void(settings, "centerConfig", "panelOrder", "report")
-			ConvertPanel(settings)
-		end
-
-		local function UpdatePanels(panels, profile)
-			local numPanels, settings = #panels
-			for id = numPanels, 1, -1 do
-				settings = panels[id]
-				settings.alias = (settings.template or profile.template or "Panel $id"):gsub("$id", id):gsub("$#", numPanels)
-				panels[id], panels[GenerateUniqueKey()] = nil, settings
-			end
-		end
-
-		local configName = addonName .. "_Config"
-		local function UpdatePlugins(plugins, profile)
-			if plugins[configName] then
-				if not plugins[addonName] then
-					plugins[addonName] = plugins[configName]
-					if profile.panels then
-						addon.settings = profile
-						local id, section, index = GetPluginLocation(configName)
-						if id then
-							profile.panels[id][section][index] = addonName
-						end
-					end
-				end
-				plugins[configName] = nil
-			end
-		end
-
-		Update(settings, ConvertProfile, ConvertPanel, ConvertPlugin, UpdatePanels, UpdatePlugins)
-	end
-
-	--[[--------------------------------------------------------------------------
-	Update settings to version 0.4.2
-	----------------------------------------------------------------------------]]
-	if version < 4002 then
-		local function ConvertPlugin(settings)
-			if settings.iconZoom and settings.iconZoom < 0 then
-				settings.iconZoom = 0
-			end
-		end
-
-		Update(settings, ConvertPlugin, ConvertPlugin, ConvertPlugin)
-	end
-
-	--[[--------------------------------------------------------------------------
-	Update settings to version 0.4.5
-	----------------------------------------------------------------------------]]
-	if version < 4005 then
-		local function ConvertPlugin(settings)
-			if settings.labelHide ~= nil then
-				settings.labelUseName = false
-			end
-		end
-
-		Update(settings, ConvertPlugin, ConvertPlugin, ConvertPlugin)
-	end
-
-	settings.version = GetAddOnMetadata(addonName, 'Version')
-end
diff --git a/Interface/AddOns/DockingStation/Core.lua b/Interface/AddOns/DockingStation/Core.lua
deleted file mode 100644
index 4d7a5e7..0000000
--- a/Interface/AddOns/DockingStation/Core.lua
+++ /dev/null
@@ -1,267 +0,0 @@
-local addonName, addon = ...
-setmetatable(addon, { __index = _G })
-setfenv(1, addon)
-
-LibStub('AceEvent-3.0'):Embed(addon)
-
-local gsub, pairs_iter, pcall, tostring, type = gsub, pairs(addon), pcall, tostring, type
-
-local GetObjectType = UIParent.GetObjectType
-
-local LDB = LibStub('LibDataBroker-1.1')
-
-settings = false																						-- To avoid issues with a global named 'settings' (it's happened)
-
---[[-----------------------------------------------------------------------------
-Helper functions
--------------------------------------------------------------------------------]]
-local function UpdateProfile()
-	AllPanels("Recycle")
-	settings = GetSettings()
-	for id, settings in pairs_iter, settings.panels, nil do
-		if settings.enable then
-			CreatePanel(id)
-		end
-	end
-	PanelList:Refresh()
-	PluginList:Refresh()
-end
-
-RESOLUTION_HEIGHT, RESOLUTION_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH = 768, 1024, 768, 1024
-SCREEN_HEIGHT_MIDDLE, SCREEN_WIDTH_MIDDLE = SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2
-local function UpdateResolution(event, screenWidth, screenHeight, resolutionWidth, resolutionHeight)
-	RESOLUTION_HEIGHT, RESOLUTION_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH = resolutionHeight, resolutionWidth, screenHeight, screenWidth
-	SCREEN_HEIGHT_MIDDLE, SCREEN_WIDTH_MIDDLE = screenHeight / 2, screenWidth / 2
-	UpdateConfig()
-end
-
-local function UpdateSharedMedia(event, type)
-	if type == 'border' or type == 'font' or type == 'statusbar' or type == 'statusbar_overlay' then
-		addon:QueueMethod("UpdateConfig")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-LSM, PHI = LibStub('LibSharedMedia-3.0'), 2 / (sqrt(5) + 1)
-LDB_RegisterCallback, LDB_UnregisterCallback = LDB.RegisterCallback, LDB.UnregisterCallback
-hideConditions , sectionTypes = { hide = 0, Hide = 0, HIDE = 0, ["0"] = 0 }, { Center = "Center", Left = "Left", Right = "Right" }
-dataObj, panels, plugins = { }, { }, { }
-
-L = setmetatable({ }, { __index = function(self, key)
-	self[key] = key
-	return key
-end })
-
-mt_subtables = {
-	__index = function(self, key)
-		self[key] = { }
-		return self[key]
-	end
-}
-
-function safecall(...)
-	local ok, result = pcall(...)
-	if ok then
-		return result
-	elseif not settings.hideErrors then
-		geterrorhandler()(result)
-	end
-end
-
-function tremove_byVal(table, value)
-	for index = 1, #table do
-		if table[index] == value then
-			tremove(table, index)
-			return true
-		end
-	end
-end
-
-function AllPanels(method, ...)
-	for index = #addon, 1, -1 do																	-- Reversed order so that panel:Recycle() will work properly
-		addon[index][method](addon[index], ...)
-	end
-end
-
-function ConnectTooltip(frame, tooltip, scale)
-	if tooltip.SetOwner then
-		safecall(tooltip.SetOwner, tooltip, frame, 'ANCHOR_NONE')
-	end
-	safecall(tooltip.SetPoint, tooltip, GetAnchorInfo(frame))
-	local oldScale = safecall(tooltip.GetScale, tooltip)
-	if oldScale then
-		safecall(tooltip.SetScale, tooltip, scale or frame.settings.tooltipScale)
-		return oldScale
-	end
-end
-
-function DoNothing()
-end
-
-function GetAnchorInfo(frame)
-	local _, y = frame:GetCenter()
-	if y >= SCREEN_HEIGHT_MIDDLE then
-		return 'TOP', frame, 'BOTTOM', 0, 0
-	end
-	return 'BOTTOM', frame, 'TOP', 0, 0
-end
-
-function GetSubTable(table, key, ...)
-	local tableKey = table[key]
-	if type(tableKey) ~= 'table' then
-		tableKey = { }
-		local field, value
-		for index = 1, select('#', ...), 2 do
-			field, value = select(index, ...)
-			tableKey[field] = value
-		end
-		table[key] = tableKey
-	end
-	return tableKey
-end
-
-function IsFrame(object)
-	return pcall(GetObjectType, object)
-end
-
-function RemoveColorCodes(string)
-	local type = type(string)
-	if type == 'string' then
-		return gsub(gsub(string, "\|[Rr]", ""), "\|[Cc]%x%x%x%x%x%x%x%x", "")
-	elseif type == 'number' then
-		return tostring(string)
-	end
-	return ""
-end
-
-function UpdateConfig(self, noRefresh)
-	if noRefresh then return end
-	AllPanels("Refresh")
-end
-
---[[-----------------------------------------------------------------------------
-Key Generator
--------------------------------------------------------------------------------]]
-do
-	local digit, base, chrono = {
-		'#', '$', '%', '&', '*', '+', '-', '.', '0', '1', '2', '3', '4', '5', '6',
-		'7', '8', '9', ':', '=', '?', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-		'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-		'X', 'Y', 'Z', '^', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
-		'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
-	}
-	base, chrono, digit[0] = #digit + 1, 0, '!'
-
-	function GenerateUniqueKey()
-		local key, time = "", time() - 1262325600												-- Epoch: 2010 Jan 01 00:00:00
-		if chrono >= time then
-			time = chrono + 1
-		end
-		chrono = time
-		while time >= base do
-			time, key = floor(time / base), digit[time % base] .. key
-		end
-		if time > 0 or key == "" then
-			key = digit[time] .. key
-		end
-		return key
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Queue - delays a method until the next OnUpdate, used to throttle stuff
--------------------------------------------------------------------------------]]
-do
-	local caller, shown = CreateFrame('Frame')
-	caller:Hide()
-
-	local process, queue = setmetatable({ }, mt_subtables), setmetatable({ }, mt_subtables)
-
-	caller:SetScript('OnUpdate', function(self)
-		self:Hide()
-		process, queue, shown = queue, process, nil											-- Fix for a queued method triggering a call to QueueMethod
-		for object, methods in pairs_iter, process, nil do
-			for method, arg in pairs_iter, methods, nil do
-				object[method](object, arg)
-				methods[method] = nil
-			end
-		end
-	end)
-
-	function PurgeQueue(object, method)
-		if method then
-			queue[object][method] = nil
-			if not pairs_iter(queue[object]) then
-				process[object], queue[object] = nil, nil
-			end
-		else
-			process[object], queue[object] = nil, nil
-		end
-	end
-
-	function QueueMethod(object, method, arg)
-		queue[object][method] = arg or false
-		if not shown then
-			shown = true
-			caller:Show()
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Data Objects
--------------------------------------------------------------------------------]]
-local ValidateDataObject
-
-do
-	local function DetectType(_, name, _, _, data)
-		ValidateDataObject(_, name, data)
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_type')
-	end
-
-	function ValidateDataObject(_, name, data)
-		local type = data.type
-		if type == nil then																			-- Just in case type == false
-			LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_type', DetectType)
-		elseif (type == 'data source' or type == 'launcher') and not dataObj[name] then
-			dataObj[name], pluginType[name] = data, type
-			if GetPluginSettings(name).enable then
-				CreatePlugin(name)
-			else
-				PluginList:Add(name)
-			end
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Initialize display/media
--------------------------------------------------------------------------------]]
-LibStub('LibDisplayAssist-1.2'):Register(addon, function(...)							-- Runs on first frame update to ensure proper sizing
-	LibStub('LibDisplayAssist-1.2'):Register(addon, UpdateResolution)
-	UpdateResolution(...)																			-- Refreshes panels/plugins
-	UpdateProfile()
-	for name, data in LDB:DataObjectIterator() do											-- Check for plugins
-		ValidateDataObject(nil, name, data)
-	end
-	addon.db.RegisterCallback(addon, 'OnProfileChanged', UpdateProfile)
-	addon.db.RegisterCallback(addon, 'OnProfileCopied', UpdateProfile)
-	addon.db.RegisterCallback(addon, 'OnProfileReset', UpdateProfile)
-	LDB_RegisterCallback(addon, 'LibDataBroker_DataObjectCreated', ValidateDataObject)
-	LSM.RegisterCallback(addon, 'LibSharedMedia_Registered', UpdateSharedMedia)
-	LSM.RegisterCallback(addon, 'LibSharedMedia_SetGlobal', UpdateSharedMedia)
-end)
-
-LSM:Register('statusbar', "Blizzard Gradient", [[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
-LSM:Register('statusbar', "Empty", [[Interface\AddOns\]] .. addonName .. [[\Media\None]])
-LSM:Register('statusbar', "Solid", [[Interface\BUTTONS\WHITE8X8]])
-
-LSM:Register('statusbar_overlay', "Line, Gradient", [[Interface\AddOns\]] .. addonName .. [[\Media\Line, Gradient]])
-LSM:Register('statusbar_overlay', "Line, Gradient (Center)", [[Interface\AddOns\]] .. addonName .. [[\Media\Line, Gradient (Center)]])
-LSM:Register('statusbar_overlay', "Line, Solid", [[Interface\AddOns\]] .. addonName .. [[\Media\Line, Solid]])
-LSM:Register('statusbar_overlay', "Gloss", [[Interface\AddOns\]] .. addonName .. [[\Media\Gloss]])
-LSM:Register('statusbar_overlay', "None", [[Interface\AddOns\]] .. addonName .. [[\Media\None]])
-
-LSM:SetDefault('statusbar_overlay', "None")
diff --git a/Interface/AddOns/DockingStation/DockingStation.toc b/Interface/AddOns/DockingStation/DockingStation.toc
deleted file mode 100644
index 5214686..0000000
--- a/Interface/AddOns/DockingStation/DockingStation.toc
+++ /dev/null
@@ -1,32 +0,0 @@
-## Interface: 40000
-## Author: Vrul
-## Version: 0.4.6 (Beta)
-## Title: DockingStation
-## Notes: A display platform for LibDataBroker (LDB) based plug-ins.
-## OptionalDeps: Ace3, CallbackHandler-1.0, LibDataBroker-1.1, LibDisplayAssist-1.2, LibJostle-3.0, LibOptionsAssist-1.0, LibSharedMedia-3.0, LibStateDriver-1.1, LibStub
-## SavedVariables: DockingStationSettings
-## X-WoWI-ID: 11831
-
-Libs\LibStub.lua
-Libs\CallbackHandler-1.0.lua
-Libs\AceDB-3.0.lua
-Libs\AceEvent-3.0.lua
-Libs\LibJostle-3.0.lua
-Libs\LibSharedMedia-3.0.lua
-Libs\LibDataBroker-1.1.lua
-Libs\LibDisplayAssist-1.2.lua
-Libs\LibOptionsAssist-1.0.lua
-Libs\LibStateDriver-1.1.lua
-
-Core.lua
-
-Locales\deDE.lua
-
-Panels.lua
-Plugins.lua
-Groups.lua
-FontStrings.lua
-Textures.lua
-Settings.lua
-Config.lua
-Convert.lua
diff --git a/Interface/AddOns/DockingStation/FontStrings.lua b/Interface/AddOns/DockingStation/FontStrings.lua
deleted file mode 100644
index da87d33..0000000
--- a/Interface/AddOns/DockingStation/FontStrings.lua
+++ /dev/null
@@ -1,171 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local strtrim = strtrim
-
-local mt = getmetatable(InterfaceOptionsFrameHeaderText)
-
-local SetText = mt.__index.SetText
-
-local LDB_RegisterCallback, LDB_UnregisterCallback = LDB_RegisterCallback, LDB_UnregisterCallback
-
-local plugins, safecall, QueueMethod = plugins, safecall, QueueMethod
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local recycled = { }
-
-local function CleanString(value)
-	if value then
-		value = safecall(strtrim, value)
-		if value and value ~= "" then
-			return value
-		end
-	end
-end
-
-local function DetectString(_, name, field, value, data)
-	if CleanString(value) then
-		PurgeQueue(plugins[name], "UpdateWidth")
-		QueueMethod(plugins[name], "UpdateChildren")
-	end
-end
-
-local function UpdateString(_, name, field, value, data)
-	value = CleanString(value)
-	if value then
-		plugins[name][field]:SetText(value)
-	else
-		PurgeQueue(plugins[name], "UpdateWidth")
-		QueueMethod(plugins[name], "UpdateChildren")
-	end
-end
-
-local Update = {
-	['label'] = function(_, name, field, value, data)
-		local plugin = plugins[name]
-		if not plugin.settings[field .. "UseName"] then
-			value = CleanString(value)
-		else
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field)
-			value = nil
-		end
-		if not value then
-			value = pluginAlias[name] or strtrim(name)
-		end
-		if plugin.text or plugin.value then
-			value = value .. ": "
-		end
-		plugin[field]:SetText(value)
-	end,
-
-	['suffix'] = function(_, name, field, value, data)
-		value = CleanString(value)
-		if value then
-			plugins[name][field]:SetText(" " .. value)
-		else
-			PurgeQueue(plugins[name], "UpdateWidth")
-			QueueMethod(plugins[name], "UpdateChildren")
-		end
-	end,
-
-	['text'] = UpdateString,
-	['value'] = UpdateString
-}
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["Recycle"] = function(self)
-		self:Hide()
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. self.plugin.name .. '_' .. self.field)
-		self.plugin[self.field] = nil
-		PurgeQueue(self)
-		self[0], self = self[0], wipe(self)
-		recycled[#recycled + 1] = self
-	end,
-
-	["Refresh"] = function(self)
-		local field, settings = self._field, self.settings
-		local shadow, outline = settings[field .. "Effect"] or 0
-		if shadow > 2 then
-			shadow = shadow - 2
-		elseif shadow == 1 then
-			outline, shadow = 'OUTLINE', 0
-		elseif shadow == 2 then
-			outline, shadow = 'THICKOUTLINE', 0
-		end
-		self:SetFont(LSM:Fetch('font', settings[field .. "Font"]), settings[field .. "Size"] * self.plugin.size, outline)
-		self:SetTextColor(settings[field .. "ColorR"], settings[field .. "ColorG"], settings[field .. "ColorB"], settings[field .. "ColorA"])
-		self:SetShadowOffset(shadow, -shadow)
-
---		self:SetHeight(0)
-		self.size = self:GetStringHeight()
-		self:SetHeight(self.size)
-		self:SetWidth(0)
-		if settings[field .. "Fixed"] then
-			local value = self:GetText()
-			SetText(self, "...")
-			local minWidth = self:GetStringWidth()
-			SetText(self, settings[field .. "Fixed"])
-			self:SetWidth(max(minWidth, self:GetStringWidth()))
-			SetText(self, value)
-		end
-	end,
-
-	['SetText'] = function(self, text)
-		if self.settings[self._field .. "Override"] then
-			text = RemoveColorCodes(text)
-		end
-		SetText(self, text)
-		QueueMethod(self.plugin, "UpdateWidth")
-	end,
-
-	['GetLeft'] = mt.__index.GetLeft,
-	['GetRight'] = mt.__index.GetRight
-}
-
-mt = { __index = setmetatable(methods, mt), __metatable = addonName }
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function CreateFontString(field, plugin, alias)
-	local name = plugin.name
-	local data = dataObj[name]
-
-	if field ~= 'label' and not CleanString(data[field]) then
-		LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field, DetectString)
-		return
-	end
-
-	local self = recycled[#recycled]
-	if self then
-		recycled[#recycled] = nil
-		self:SetParent(plugin)
-		self:ClearAllPoints()
-		self:Show()
-	else
-		self = plugin:CreateFontString(nil, 'ARTWORK')
-		self:SetFont([[Fonts\FRIZQT__.TTF]], 12)
-		self:SetJustifyH('LEFT')
-		self:SetJustifyV('MIDDLE')
-		self:SetNonSpaceWrap(false)
-		self:SetShadowColor(0, 0, 0, 0.5)
-		self:SetText(" ")
-		setmetatable(self, mt)
-	end
-	plugin[field], self.field, self.plugin, self.settings = self, field, plugin, plugin.settings
-	self._field = alias or field
-
-	self:SetHeight(1)
-	self:SetWidth(1)
-	self.size = 1
-
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field, Update[field])
-	Update[field](nil, name, field, data[field], data)
-	self:Refresh()
-	return self
-end
diff --git a/Interface/AddOns/DockingStation/Groups.lua b/Interface/AddOns/DockingStation/Groups.lua
deleted file mode 100644
index 04ca5c1..0000000
--- a/Interface/AddOns/DockingStation/Groups.lua
+++ /dev/null
@@ -1,93 +0,0 @@
-local addonName, addon = ...
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local recycled = { }
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["Recycle"] = function(self)
-		local name, panel = self.name, self.panel
-		self:Hide()
-		for index = #self, 1, -1 do
-			self[index]:Recycle()
-		end
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_icon')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_label')
-		if pluginType[name] == 'data source' then
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_suffix')
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_text')
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_value')
-		end
-		if panel and tremove_byVal(panel[self.section], self) then
-			panel:AnchorChildren(self.section)
-			panel[self] = nil
-		end
-		PurgeQueue(self)
-		plugins[name] = nil
-		self[0], self = self[0], wipe(self)
-		recycled[#recycled + 1] = self
-	end,
-
-	["SetState"] = function(self)
-		local id, section, index = GetPluginLocation(self.name)
-		SetInheritance(self.name, id)
-		local panel = panels[id]
-		if panel then
-			if self.settings.enable then
-				self.panel, self.section, self.index = panel, section, index
-
-				local children = panel[section]
-				tremove_byVal(children, self)
-				self:SetParent(panel)
-				self:SetFrameStrata(panel:GetFrameStrata())
-				self:SetFrameLevel(panel:GetFrameLevel() + 1)
-
-				local insertPoint
-				for i = 1, #children do
-					if index <= children[i].index then
-						insertPoint = i
-						break
-					end
-				end
-				tinsert(children, insertPoint or #children + 1, self)
-				panel:AnchorChildren(section)
-				panel[self] = true
-				self:Refresh()
-				self:Show()
-				return
-			end
-		elseif not id then
-			self.settings.enable = false
-		end
-		self:Recycle()
-	end,
-
-	["UpdateChildren"] = function(self)
-		UpdateChildren(self)
-		self:AnchorChildren()
-	end,
-
-	["UpdateWidth"] = function(self)
-		self:SetWidth(self[#self]:GetRight() - self[1]:GetLeft() + 1)
-		if self.section == "Center" and not self.moving then
-			QueueMethod(self.panel, "UpdateCenterWidth")
-		end
-	end,
-
-	["AnchorChildren"] = DoNothing,
-	['AttachFrame'] = DoNothing,
-	['DetachFrame'] = DoNothing,
-	['EnableMouseWheel'] = DoNothing,
-	['GetLeft'] = DoNothing,
-	['GetName'] = DoNothing,
-	['GetRight'] = DoNothing,
-	['GetScript'] = DoNothing,
-	["Refresh"] = DoNothing,
-	['SetScript'] = DoNothing
-}
-
-mt = { __index = setmetatable(methods, mt), __metatable = addonName }
diff --git a/Interface/AddOns/DockingStation/Libs/AceDB-3.0.lua b/Interface/AddOns/DockingStation/Libs/AceDB-3.0.lua
deleted file mode 100644
index 7a29450..0000000
--- a/Interface/AddOns/DockingStation/Libs/AceDB-3.0.lua
+++ /dev/null
@@ -1,728 +0,0 @@
---- **AceDB-3.0** manages the SavedVariables of your addon.
--- It offers profile management, smart defaults and namespaces for modules.\\
--- Data can be saved in different data-types, depending on its intended usage.
--- The most common data-type is the `profile` type, which allows the user to choose
--- the active profile, and manage the profiles of all of his characters.\\
--- The following data types are available:
--- * **char** Character-specific data. Every character has its own database.
--- * **realm** Realm-specific data. All of the players characters on the same realm share this database.
--- * **class** Class-specific data. All of the players characters of the same class share this database.
--- * **race** Race-specific data. All of the players characters of the same race share this database.
--- * **faction** Faction-specific data. All of the players characters of the same faction share this database.
--- * **factionrealm** Faction and realm specific data. All of the players characters on the same realm and of the same faction share this database.
--- * **global** Global Data. All characters on the same account share this database.
--- * **profile** Profile-specific data. All characters using the same profile share this database. The user can control which profile should be used.
---
--- Creating a new Database using the `:New` function will return a new DBObject. A database will inherit all functions
--- of the DBObjectLib listed here. \\
--- If you create a new namespaced child-database (`:RegisterNamespace`), you'll get a DBObject as well, but note
--- that the child-databases cannot individually change their profile, and are linked to their parents profile - and because of that,
--- the profile related APIs are not available. Only `:RegisterDefaults` and `:ResetProfile` are available on child-databases.
---
--- For more details on how to use AceDB-3.0, see the [[AceDB-3.0 Tutorial]].
---
--- You may also be interested in [[libdualspec-1-0|LibDualSpec-1.0]] to do profile switching automatically when switching specs.
---
--- @usage
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("DBExample")
---
--- -- declare defaults to be used in the DB
--- local defaults = {
---   profile = {
---     setting = true,
---   }
--- }
---
--- function MyAddon:OnInitialize()
---   -- Assuming the .toc says ## SavedVariables: MyAddonDB
---   self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true)
--- end
--- @class file
--- @name AceDB-3.0.lua
--- @release $Id: AceDB-3.0.lua 940 2010-06-19 08:01:47Z nevcairiel $
-local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 21
-local AceDB, oldminor = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
-
-if not AceDB then return end -- No upgrade needed
-
--- Lua APIs
-local type, pairs, next, error = type, pairs, next, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-
--- WoW APIs
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub
-
-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)
-	-- remove all metatables from the db, so we don't accidentally create new sub-tables through them
-	setmetatable(db, nil)
-	-- loop through the defaults and remove their content
-	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 next(value) == nil 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 next(db[k]) == nil 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
-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
-
-	-- map "true" to our "Default" profile
-	if defaultProfile == true then defaultProfile = "Default" end
-
-	local profileKey
-	if not parent then
-		-- Make a container for profile keys
-		if not sv.profileKeys then sv.profileKeys = {} end
-
-		-- Try to get the profile selected from the char db
-		profileKey = sv.profileKeys[charKey] or defaultProfile or charKey
-
-		-- save the selected profile for later
-		sv.profileKeys[charKey] = profileKey
-	else
-		-- Use the profile of the parents DB
-		profileKey = parent.keys.profile or defaultProfile or charKey
-
-		-- clear the profileKeys in the DB, namespaces don't need to store them
-		sv.profileKeys = nil
-	end
-
-	-- 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
--- and cleans up empty sections
-local function logoutHandler(frame, event)
-	if event == "PLAYER_LOGOUT" then
-		for db in pairs(AceDB.db_registry) do
-			db.callbacks:Fire("OnDatabaseShutdown", db)
-			db:RegisterDefaults(nil)
-
-			-- cleanup sections that are empty without defaults
-			local sv = rawget(db, "sv")
-			for section in pairs(db.keys) do
-				if rawget(sv, section) then
-					-- global is special, all other sections have sub-entrys
-					-- also don't delete empty profiles on main dbs, only on namespaces
-					if section ~= "global" and (section ~= "profiles" or rawget(db, "parent")) then
-						for key in pairs(sv[section]) do
-							if not next(sv[section][key]) then
-								sv[section][key] = nil
-							end
-						end
-					end
-					if not next(sv[section]) then
-						sv[section] = nil
-					end
-				end
-			end
-		end
-	end
-end
-
-AceDB.frame:RegisterEvent("PLAYER_LOGOUT")
-AceDB.frame:SetScript("OnEvent", logoutHandler)
-
-
---[[-------------------------------------------------------------------------
-	AceDB Object Method Definitions
----------------------------------------------------------------------------]]
-
---- Sets the defaults table for the given database object by clearing any
--- that are currently set, and then setting the new defaults.
--- @param defaults A table of defaults for this database
-function DBObjectLib:RegisterDefaults(defaults)
-	if defaults and type(defaults) ~= "table" then
-		error("Usage: AceDBObject:RegisterDefaults(defaults): 'defaults' - table or nil expected.", 2)
-	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
-
---- Changes the profile of the database and all of it's namespaces to the
--- supplied named profile
--- @param name The name of the profile to set as the current profile
-function DBObjectLib:SetProfile(name)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:SetProfile(name): 'name' - string expected.", 2)
-	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
-
-	-- Callback: OnProfileShutdown, database
-	self.callbacks:Fire("OnProfileShutdown", self)
-
-	if oldProfile and defaults then
-		-- Remove the defaults from the old profile
-		removeDefaults(oldProfile, defaults)
-	end
-
-	self.profile = nil
-	self.keys["profile"] = name
-
-	-- if the storage exists, save the new profile
-	-- this won't exist on namespaces.
-	if self.sv.profileKeys then
-		self.sv.profileKeys[charKey] = name
-	end
-
-	-- 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
-
---- 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.
--- @param tbl A table to store the profile names in (optional)
-function DBObjectLib:GetProfiles(tbl)
-	if tbl and type(tbl) ~= "table" then
-		error("Usage: AceDBObject:GetProfiles(tbl): 'tbl' - table or nil expected.", 2)
-	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
-
---- Returns the current profile name used by the database
-function DBObjectLib:GetCurrentProfile()
-	return self.keys.profile
-end
-
---- Deletes a named profile.  This profile must not be the active profile.
--- @param name The name of the profile to be deleted
--- @param silent If true, do not raise an error when the profile does not exist
-function DBObjectLib:DeleteProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:DeleteProfile(name): 'name' - string expected.", 2)
-	end
-
-	if self.keys.profile == name then
-		error("Cannot delete the active profile in an AceDBObject.", 2)
-	end
-
-	if not rawget(self.profiles, name) and not silent then
-		error("Cannot delete profile '" .. name .. "'. It does not exist.", 2)
-	end
-
-	self.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
-
---- Copies a named profile into the current profile, overwriting any conflicting
--- settings.
--- @param name The name of the profile to be copied into the current profile
--- @param silent If true, do not raise an error when the profile does not exist
-function DBObjectLib:CopyProfile(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:CopyProfile(name): 'name' - string expected.", 2)
-	end
-
-	if name == self.keys.profile then
-		error("Cannot have the same source and destination profiles.", 2)
-	end
-
-	if not rawget(self.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, nil, true)
-
-	local profile = self.profile
-	local source = self.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
-
---- Resets the current profile to the default values (if specified).
--- @param noChildren if set to true, the reset will not be populated to the child namespaces of this DB object
--- @param noCallbacks if set to true, won't fire the OnProfileReset callback
-function DBObjectLib:ResetProfile(noChildren, noCallbacks)
-	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, nil, noCallbacks)
-		end
-	end
-
-	-- Callback: OnProfileReset, database
-	if not noCallbacks then
-		self.callbacks:Fire("OnProfileReset", self)
-	end
-end
-
---- Resets the entire database, using the string defaultProfile as the new default
--- profile.
--- @param defaultProfile The profile name to use as the default
-function DBObjectLib:ResetDB(defaultProfile)
-	if defaultProfile and type(defaultProfile) ~= "string" then
-		error("Usage: AceDBObject:ResetDB(defaultProfile): 'defaultProfile' - string or nil expected.", 2)
-	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
-
---- 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
--- @param name The name of the new namespace
--- @param defaults A table of values to use as defaults
-function DBObjectLib:RegisterNamespace(name, defaults)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:RegisterNamespace(name, defaults): 'name' - string expected.", 2)
-	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
-
---- Returns an already existing namespace from the database object.
--- @param name The name of the new namespace
--- @param silent if true, the addon is optional, silently return nil if its not found
--- @usage
--- local namespace = self.db:GetNamespace('namespace')
--- @return the namespace object if found
-function DBObjectLib:GetNamespace(name, silent)
-	if type(name) ~= "string" then
-		error("Usage: AceDBObject:GetNamespace(name): 'name' - string expected.", 2)
-	end
-	if not silent and not (self.children and self.children[name]) then
-		error ("Usage: AceDBObject:GetNamespace(name): 'name' - namespace does not exist.", 2)
-	end
-	if not self.children then self.children = {} end
-	return self.children[name]
-end
-
---[[-------------------------------------------------------------------------
-	AceDB Exposed Methods
----------------------------------------------------------------------------]]
-
---- Creates a new database object that can be used to handle database settings and profiles.
--- By default, an empty DB is created, using a character specific profile.
---
--- You can override the default profile used by passing any profile name as the third argument,
--- or by passing //true// as the third argument to use a globally shared profile called "Default".
---
--- Note that there is no token replacement in the default profile name, passing a defaultProfile as "char"
--- will use a profile named "char", and not a character-specific profile.
--- @param tbl The name of variable, or table to use for the database
--- @param defaults A table of database defaults
--- @param defaultProfile The name of the default profile. If not set, a character specific profile will be used as the default.
--- You can also pass //true// to use a shared global profile called "Default".
--- @usage
--- -- Create an empty DB using a character-specific default profile.
--- self.db = LibStub("AceDB-3.0"):New("MyAddonDB")
--- @usage
--- -- Create a DB using defaults and using a shared default profile
--- self.db = LibStub("AceDB-3.0"):New("MyAddonDB", defaults, true)
-function AceDB:New(tbl, defaults, defaultProfile)
-	if type(tbl) == "string" then
-		local name = tbl
-		tbl = _G[name]
-		if not tbl then
-			tbl = {}
-			_G[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" and defaultProfile ~= true then
-		error("Usage: AceDB:New(tbl, defaults, defaultProfile): 'defaultProfile' - string or true 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
-		db.ResetProfile = DBObjectLib.ResetProfile
-	end
-end
diff --git a/Interface/AddOns/DockingStation/Libs/AceEvent-3.0.lua b/Interface/AddOns/DockingStation/Libs/AceEvent-3.0.lua
deleted file mode 100644
index e9b18b1..0000000
--- a/Interface/AddOns/DockingStation/Libs/AceEvent-3.0.lua
+++ /dev/null
@@ -1,126 +0,0 @@
---- AceEvent-3.0 provides event registration and secure dispatching.
--- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around
--- CallbackHandler, and dispatches all game events or addon message to the registrees.
---
--- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceEvent itself.\\
--- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceEvent.
--- @class file
--- @name AceEvent-3.0
--- @release $Id: AceEvent-3.0.lua 877 2009-11-02 15:56:50Z nevcairiel $
-local MAJOR, MINOR = "AceEvent-3.0", 3
-local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceEvent then return end
-
--- Lua APIs
-local pairs = pairs
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
-AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib
-
--- APIs and registry for blizzard events, using CallbackHandler lib
-if not AceEvent.events then
-	AceEvent.events = CallbackHandler:New(AceEvent,
-		"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",
-}
-
---- Register for a Blizzard Event.
--- The callback will always be called with the event as the first argument, and if supplied, the `arg` as second argument.
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterEvent
--- @class function
--- @paramsig event[, callback [, arg]]
--- @param event The event to register for
--- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister an event.
--- @name AceEvent:UnregisterEvent
--- @class function
--- @paramsig event
--- @param event The event to unregister
-
---- Register for a custom AceEvent-internal message.
--- The callback will always be called with the event as the first argument, and if supplied, the `arg` as second argument.
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterMessage
--- @class function
--- @paramsig message[, callback [, arg]]
--- @param message The message to register for
--- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister a message
--- @name AceEvent:UnregisterMessage
--- @class function
--- @paramsig message
--- @param message The message to unregister
-
---- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message.
--- @name AceEvent:SendMessage
--- @class function
--- @paramsig message, ...
--- @param message The message to send
--- @param ... Any arguments to the message
-
-
--- Embeds AceEvent into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceEvent in
-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/Interface/AddOns/DockingStation/Libs/CallbackHandler-1.0.lua b/Interface/AddOns/DockingStation/Libs/CallbackHandler-1.0.lua
deleted file mode 100644
index a127301..0000000
--- a/Interface/AddOns/DockingStation/Libs/CallbackHandler-1.0.lua
+++ /dev/null
@@ -1,240 +0,0 @@
---[[ $Id: CallbackHandler-1.0.lua 965 2010-08-09 00:47:52Z mikk $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 6
-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}
-
--- Lua APIs
-local tconcat = table.concat
-local assert, error, loadstring = assert, error, loadstring
-local setmetatable, rawset, rawget = setmetatable, rawset, rawget
-local next, select, pairs, type, tostring = next, select, pairs, type, tostring
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler
-
-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", tconcat(OLD_ARGS, ", ")):gsub("ARGS", tconcat(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" or self=thread
-			if type(self)~="table" and type(self)~="string" and type(self)~="thread" then
-				error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string or thread 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/Interface/AddOns/DockingStation/Libs/LibDataBroker-1.1.lua b/Interface/AddOns/DockingStation/Libs/LibDataBroker-1.1.lua
deleted file mode 100644
index f47c0cd..0000000
--- a/Interface/AddOns/DockingStation/Libs/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/Interface/AddOns/DockingStation/Libs/LibDisplayAssist-1.2.lua b/Interface/AddOns/DockingStation/Libs/LibDisplayAssist-1.2.lua
deleted file mode 100644
index a76cf04..0000000
--- a/Interface/AddOns/DockingStation/Libs/LibDisplayAssist-1.2.lua
+++ /dev/null
@@ -1,229 +0,0 @@
-local LIB, REVISION = "LibDisplayAssist-1.2", 1
-if not (LibStub and LibStub('CallbackHandler-1.0', true)) then
-	error(LIB .. " requires LibStub and CallbackHandler-1.0", 0)
-end
-
-local lib, oldRevision = LibStub:NewLibrary(LIB, REVISION)
-if not lib then
-	return
-elseif not oldRevision then
-	oldRevision = -1
-end
-
-local strsplit, tonumber, type = strsplit, tonumber, type
-
-local GetCVar, GetRect = GetCVar, UIParent.GetRect
-
---[[-----------------------------------------------------------------------------
-Internal support
--------------------------------------------------------------------------------]]
-if oldRevision < 0 then
-	lib.CBH = LibStub('CallbackHandler-1.0'):New(lib, nil, nil, false)
-end
-
-if oldRevision < 0 then
-	lib.CVars = { gxMaximize = true, gxWindow = true, uiscale = true, useUiScale = true }
-end
-
-if oldRevision < 0 then
-	lib.frame = CreateFrame('Frame', nil, UIParent)
-
-	lib.frame:SetScript('OnUpdate', function(self)											-- Always runs upon start/reload
-		lib.resolution = GetCVar('gxResolution')
-		lib.CBH:Fire("Update", UIParent:GetWidth(), UIParent:GetHeight(), lib:GetResolutionInfo())
-		self:Hide()
-	end)
-
-	hooksecurefunc('SetCVar', function(name, value)											-- Monitor CVar changes during normal play
-		if not lib.CVars[name] then return end
-		lib.frame:Show()
-	end)
-
-	hooksecurefunc('SetScreenResolution', function(value)									-- In case a setting combo doesn't trigger a CVar change
-		if lib.resolution == GetCVar('gxResolution') then return end
-		lib.frame:Show()
-	end)
-end
-
-lib.resolution = lib.resolution or GetCVar('gxResolution')
-
-if oldRevision < 1 then
-	lib.mt = { __newindex = function() end }
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB.AnchorPoints
-
-	The anchor points used for frames, as a dictionary.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 1 then
-	lib.AnchorPoints = setmetatable({ BOTTOM = 'BOTTOM', BOTTOMLEFT = 'BOTTOMLEFT', BOTTOMRIGHT = 'BOTTOMRIGHT', CENTER = 'CENTER', LEFT = 'LEFT', RIGHT = 'RIGHT', TOP = 'TOP', TOPLEFT = 'TOPLEFT', TOPRIGHT = 'TOPRIGHT' }, lib.mt)
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB.StrataLayers
-
-	The non-tooltip strata layers generally used by addons, as an array, from
-	lowest to highest.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 1 then
-	lib.StrataLayers = setmetatable({ 'BACKGROUND', 'LOW', 'MEDIUM', 'HIGH', 'DIALOG', 'FULLSCREEN', 'FULLSCREEN_DIALOG' }, lib.mt)
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB:GetOffsets(frame [, point [, relFrame [, relPoint]]])
-
-	Get the X and Y offsets of a frame relative to another frame.
-
-Input:
-
-	frame			(table)	 	The frame to get the offsets for.
-
-	point			(string)		The point on frame to get the offsets for.  Defaults
-									to 'CENTER' if nil.
-
-	relFrame		(table)	 	The frame to get the offsets relative to.  Defaults to
-									frame's parent if nil or to UIParent if frame has no
-									parent.
-
-	relPoint		(string)		The point on relFrame to get the offsets relative to.
-									Defaults to point if nil.
-
-Returns:
-
-	x				(number)		The horizontal offset.
-
-	y				(number)		The vertical offset.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 1 then
-	local function get_offsets(frame, point)
-		local left, bottom, width, height = GetRect(frame)
-		if point == 'TOP' then
-			return (left + left + width - 1) * 0.5, bottom + height - 1
-		elseif point == 'BOTTOM' then
-			return (left + left + width - 1) * 0.5, bottom
-		elseif point == 'LEFT' then
-			return left, (bottom + bottom + height - 1) * 0.5
-		elseif point == 'RIGHT' then
-			return left + width - 1, (bottom + bottom + height - 1) * 0.5
-		elseif point == 'TOPLEFT' then
-			return left, bottom + height - 1
-		elseif point == 'TOPRIGHT' then
-			return left + width - 1, bottom + height - 1
-		elseif point == 'BOTTOMLEFT' then
-			return left, bottom
-		elseif point == 'BOTTOMRIGHT' then
-			return left + width - 1, bottom
-		else
-			return (left + left + width - 1) * 0.5, (bottom + bottom + height - 1) * 0.5
-		end
-	end
-
-	function lib.GetOffsets(frame, point, relFrame, relPoint)
-		if type(frame) ~= 'table' then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'frame' expected table, got " .. type(frame), 2)
-		elseif relFrame == nil then
-			relFrame = frame:GetParent() or UIParent
-		elseif type(relFrame) ~= 'table' then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'relFrame' expected table, got " .. type(relFrame), 2)
-		end
-		if point == nil then
-			point = 'CENTER'
-		elseif type(point) ~= 'string' then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'point' expected string or nil, got " .. type(point), 2)
-		elseif not lib.AnchorPoints[point] then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'point' has an invalid value of '" .. point .. "'", 2)
-		end
-		if relPoint == nil then
-			relPoint = point
-		elseif type(relPoint) ~= 'string' then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'relPoint' expected string or nil, got " .. type(relPoint), 2)
-		elseif not lib.AnchorPoints[relPoint] then
-			error(LIB .. ":GetOffsets(frame, point, relFrame, relPoint) - 'relPoint' has an invalid value of '" .. relPoint .. "'", 2)
-		end
-		local frameX, frameY = get_offsets(frame, point)
-		local relX, relY = get_offsets(relFrame, relPoint)
-		return frameX - relX, frameY - relY
-	end
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB:GetResolutionInfo(resolution)
-
-	Take a string representing a screen resolution and break it down into useful
-	information.
-
-Input:
-
-	resolution	(string) 	The resolution to break down or nil to use the current
-									resolution.  Example: 1024x768
-
-Returns:
-
-	width			(number)		The resolution width.
-
-	height		(number)		The resolution height.
-
-	isWide		(boolean)	Whether or not the resolution is wide-screen.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 0 then
-	function lib:GetResolutionInfo(resolution)
-		resolution = resolution or lib.resolution
-		if type(resolution) ~= 'string' then
-			error(LIB .. ":GetResolutionInfo(resolution) - 'resolution' expected string or nil, got " .. type(resolution), 2)
-		end
-		local width, height = strsplit('x', resolution)
-		width, height = tonumber(width), tonumber(height)
-		if not (width and height) then
-			error(LIB .. ":GetResolutionInfo(resolution) - 'resolution' is not in the proper format", 2)
-		end
-		return width, height, height / width < 0.75
-	end
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB:Register(nameSpace, func [, arg])
-
-	Register for a callback on the "Update" event.
-
-Input:
-
-	nameSpace	(table)		The addon that will be receiving the callback.
-
-	func			(function)	A function reference or method name within nameSpace.
-					(string)
-
-	arg			(any)			An optional arguement to pass during the callback.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 0 then
-	function lib:Register(nameSpace, ...)
-		self.RegisterCallback(nameSpace, "Update", ...)
-	end
-end
-
---[=[----------------------------------------------------------------------------
-
-LIB:Unregister(nameSpace)
-
-	Unregister for the callback on the "Update" event.
-
-Input:
-
-	nameSpace	(table)		The addon that was receiving the callback.
-
-------------------------------------------------------------------------------]=]
-if oldRevision < 0 then
-	function lib:Unregister(nameSpace)
-		self.UnregisterCallback(nameSpace, "Update")
-	end
-end
diff --git a/Interface/AddOns/DockingStation/Libs/LibJostle-3.0.lua b/Interface/AddOns/DockingStation/Libs/LibJostle-3.0.lua
deleted file mode 100644
index 80763a9..0000000
--- a/Interface/AddOns/DockingStation/Libs/LibJostle-3.0.lua
+++ /dev/null
@@ -1,555 +0,0 @@
---[[
-Name: LibJostle-3.0
-Revision: $Rev: 52 $
-Author(s): ckknight (ckknight@gmail.com)
-Website: http://ckknight.wowinterface.com/
-Documentation: http://www.wowace.com/addons/libjostle-3-0/
-SVN: svn://svn.wowace.com/wow/libjostle-3-0/mainline/trunk
-Description: A library to handle rearrangement of blizzards frames when bars are added to the sides of the screen.
-License: LGPL v2.1
---]]
-
-local MAJOR_VERSION = "LibJostle-3.0"
-local MINOR_VERSION = tonumber(("$Revision: 52 $"):match("(%d+)")) + 90000
-
-if not LibStub then error(MAJOR_VERSION .. " requires LibStub") end
-
-local oldLib = LibStub:GetLibrary(MAJOR_VERSION, true)
-local Jostle = LibStub:NewLibrary(MAJOR_VERSION, MINOR_VERSION)
-if not Jostle then
-	return
-end
-
-local blizzardFrames = {
-	'PlayerFrame',
-	'TargetFrame',
-	'MinimapCluster',
-	'PartyMemberFrame1',
-	'TicketStatusFrame',
-	'WorldStateAlwaysUpFrame',
-	'MainMenuBar',
-	'MultiBarRight',
-	'CT_PlayerFrame_Drag',
-	'CT_TargetFrame_Drag',
-	'Gypsy_PlayerFrameCapsule',
-	'Gypsy_TargetFrameCapsule',
-	'ConsolidatedBuffs',
-	'BuffFrame',
-	'DEFAULT_CHAT_FRAME',
-	'ChatFrame2',
-	'GroupLootFrame1',
-	'TutorialFrameParent',
-	'FramerateLabel',
-	'DurabilityFrame',
-	'CastingBarFrame',
-}
-local blizzardFramesData = {}
-
-local _G = _G
-
-Jostle.hooks = oldLib and oldLib.hooks or {}
-Jostle.topFrames = oldLib and oldLib.topFrames or {}
-Jostle.bottomFrames = oldLib and oldLib.bottomFrames or {}
-Jostle.topAdjust = oldLib and oldLib.topAdjust
-Jostle.bottomAdjust = oldLib and oldLib.bottomAdjust
-if Jostle.topAdjust == nil then
-	Jostle.topAdjust = true
-end
-if Jostle.bottomAdjust == nil then
-	Jostle.bottomAdjust = true
-end
-
-if not Jostle.hooks.WorldMapFrame_Hide then
-	Jostle.hooks.WorldMapFrame_Hide = true
-	hooksecurefunc(WorldMapFrame, "Hide", function()
-		if Jostle.WorldMapFrame_Hide then
-			Jostle:WorldMapFrame_Hide()
-		end
-	end)
-end
-
-if not Jostle.hooks.TicketStatusFrame_OnEvent then
-	Jostle.hooks.TicketStatusFrame_OnEvent = true
-	hooksecurefunc("TicketStatusFrame_OnEvent", function()
-		if Jostle.TicketStatusFrame_OnEvent then
-			Jostle:TicketStatusFrame_OnEvent()
-		end
-	end)
-end
-
-if not Jostle.hooks.FCF_UpdateDockPosition then
-	Jostle.hooks.FCF_UpdateDockPosition = true
-	hooksecurefunc("FCF_UpdateDockPosition", function()
-		if Jostle.FCF_UpdateDockPosition then
-			Jostle:FCF_UpdateDockPosition()
-		end
-	end)
-end
-
-if FCF_UpdateCombatLogPosition and not Jostle.hooks.FCF_UpdateCombatLogPosition then
-	Jostle.hooks.FCF_UpdateCombatLogPosition = true
-	hooksecurefunc("FCF_UpdateCombatLogPosition", function()
-		if Jostle.FCF_UpdateCombatLogPosition then
-			Jostle:FCF_UpdateCombatLogPosition()
-		end
-	end)
-end
-
-if not Jostle.hooks.UIParent_ManageFramePositions then
-	Jostle.hooks.UIParent_ManageFramePositions = true
-	hooksecurefunc("UIParent_ManageFramePositions", function()
-		if Jostle.UIParent_ManageFramePositions then
-			Jostle:UIParent_ManageFramePositions()
-		end
-	end)
-end
-
-if not Jostle.hooks.PlayerFrame_SequenceFinished then
-	Jostle.hooks.PlayerFrame_SequenceFinished = true
-	hooksecurefunc("PlayerFrame_SequenceFinished", function()
-		if Jostle.PlayerFrame_SequenceFinished then
-			Jostle:PlayerFrame_SequenceFinished()
-		end
-	end)
-end
-
-Jostle.frame = oldLib and oldLib.frame or CreateFrame("Frame")
-local JostleFrame = Jostle.frame
-local start = GetTime()
-local nextTime = 0
-local fullyInitted = false
-JostleFrame:SetScript("OnUpdate", function(this, elapsed)
-	local now = GetTime()
-	if now - start >= 3 then
-		fullyInitted = true
-		for k,v in pairs(blizzardFramesData) do
-			blizzardFramesData[k] = nil
-		end
-		this:SetScript("OnUpdate", function(this, elapsed)
-			if GetTime() >= nextTime then
-				Jostle:Refresh()
-				this:Hide()
-			end
-		end)
-	end
-end)
-function JostleFrame:Schedule(time)
-	time = time or 0
-	nextTime = GetTime() + time
-	self:Show()
-end
-JostleFrame:UnregisterAllEvents()
-JostleFrame:SetScript("OnEvent", function(this, event, ...)
-	return Jostle[event](Jostle, ...)
-end)
-JostleFrame:RegisterEvent("PLAYER_AURAS_CHANGED")
-JostleFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
-JostleFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
-JostleFrame:RegisterEvent("PLAYER_CONTROL_GAINED")
-
-function Jostle:PLAYER_AURAS_CHANGED()
-	JostleFrame:Schedule()
-end
-
-function Jostle:WorldMapFrame_Hide()
-	JostleFrame:Schedule()
-end
-
-function Jostle:TicketStatusFrame_OnEvent()
-	self:Refresh(TicketStatusFrame, ConsolidatedBuffs)
-end
-
-function Jostle:FCF_UpdateDockPosition()
-	self:Refresh(DEFAULT_CHAT_FRAME)
-end
-
-function Jostle:FCF_UpdateCombatLogPosition()
-	self:Refresh(ChatFrame2)
-end
-
-function Jostle:UIParent_ManageFramePositions()
-	self:Refresh(GroupLootFrame1, TutorialFrameParent, FramerateLabel, DurabilityFrame)
-end
-
-function Jostle:PlayerFrame_SequenceFinished()
-	self:Refresh(PlayerFrame)
-end
-
-function Jostle:GetScreenTop()
-	local bottom = GetScreenHeight()
-	for _,frame in ipairs(self.topFrames) do
-		if frame.IsShown and frame:IsShown() and frame.GetBottom and frame:GetBottom() and frame:GetBottom() < bottom then
-			bottom = frame:GetBottom()
-		end
-	end
-	return bottom
-end
-
-function Jostle:GetScreenBottom()
-	local top = 0
-	for _,frame in ipairs(self.bottomFrames) do
-		if frame.IsShown and frame:IsShown() and frame.GetTop and frame:GetTop() and frame:GetTop() > top then
-			top = frame:GetTop()
-		end
-	end
-	return top
-end
-
-function Jostle:RegisterTop(frame)
-	for k,f in ipairs(self.bottomFrames) do
-		if f == frame then
-			table.remove(self.bottomFrames, k)
-			break
-		end
-	end
-	for _,f in ipairs(self.topFrames) do
-		if f == frame then
-			return
-		end
-	end
-	table.insert(self.topFrames, frame)
-	JostleFrame:Schedule()
-	return true
-end
-
-function Jostle:RegisterBottom(frame)
-	for k,f in ipairs(self.topFrames) do
-		if f == frame then
-			table.remove(self.topFrames, k)
-			break
-		end
-	end
-	for _,f in ipairs(self.bottomFrames) do
-		if f == frame then
-			return
-		end
-	end
-	table.insert(self.bottomFrames, frame)
-	JostleFrame:Schedule()
-	return true
-end
-
-function Jostle:Unregister(frame)
-	for k,f in ipairs(self.topFrames) do
-		if f == frame then
-			table.remove(self.topFrames, k)
-			JostleFrame:Schedule()
-			return true
-		end
-	end
-	for k,f in ipairs(self.bottomFrames) do
-		if f == frame then
-			table.remove(self.bottomFrames, k)
-			JostleFrame:Schedule()
-			return true
-		end
-	end
-end
-
-function Jostle:IsTopAdjusting()
-	return self.topAdjust
-end
-
-function Jostle:EnableTopAdjusting()
-	if not self.topAdjust then
-		self.topAdjust = not self.topAdjust
-		JostleFrame:Schedule()
-	end
-end
-
-function Jostle:DisableTopAdjusting()
-	if self.topAdjust then
-		self.topAdjust = not self.topAdjust
-		JostleFrame:Schedule()
-	end
-end
-
-function Jostle:IsBottomAdjusting()
-	return self.bottomAdjust
-end
-
-function Jostle:EnableBottomAdjusting()
-	if not self.bottomAdjust then
-		self.bottomAdjust = not self.bottomAdjust
-		JostleFrame:Schedule()
-	end
-end
-
-function Jostle:DisableBottomAdjusting()
-	if self.bottomAdjust then
-		self.bottomAdjust = not self.bottomAdjust
-		JostleFrame:Schedule()
-	end
-end
-
-local tmp = {}
-local queue = {}
-local inCombat = false
-function Jostle:ProcessQueue()
-	if not inCombat and HasFullControl() then
-		for k in pairs(queue) do
-			self:Refresh(k)
-			queue[k] = nil
-		end
-	end
-end
-function Jostle:PLAYER_CONTROL_GAINED()
-	self:ProcessQueue()
-end
-
-function Jostle:PLAYER_REGEN_ENABLED()
-	inCombat = false
-	self:ProcessQueue()
-end
-
-function Jostle:PLAYER_REGEN_DISABLED()
-	inCombat = true
-end
-
-local function isClose(alpha, bravo)
-	return math.abs(alpha - bravo) < 0.1
-end
-
-function Jostle:Refresh(...)
-	if not fullyInitted then
-		return
-	end
-
-	local screenHeight = GetScreenHeight()
-	local topOffset = self:IsTopAdjusting() and self:GetScreenTop() or screenHeight
-	local bottomOffset = self:IsBottomAdjusting() and self:GetScreenBottom() or 0
-	if topOffset ~= screenHeight or bottomOffset ~= 0 then
-		JostleFrame:Schedule(10)
-	end
-
-	local frames
-	if select('#', ...) >= 1 then
-		for k in pairs(tmp) do
-			tmp[k] = nil
-		end
-		for i = 1, select('#', ...) do
-			tmp[i] = select(i, ...)
-		end
-		frames = tmp
-	else
-		frames = blizzardFrames
-	end
-
-	if inCombat or not HasFullControl() and not UnitHasVehicleUI("player") then
-		for _,frame in ipairs(frames) do
-			if type(frame) == "string" then
-				frame = _G[frame]
-			end
-			if frame then
-				queue[frame] = true
-			end
-		end
-		return
-	end
-
-	local screenHeight = GetScreenHeight()
-	for _,frame in ipairs(frames) do
-		if type(frame) == "string" then
-			frame = _G[frame]
-		end
-
-		local framescale = frame and frame.GetScale and frame:GetScale() or 1
-
-		if frame and not blizzardFramesData[frame] and frame.GetTop and frame:GetCenter() and select(2, frame:GetCenter()) then
-			if select(2, frame:GetCenter()) <= screenHeight / 2 or frame == MultiBarRight then
-				blizzardFramesData[frame] = {y = frame:GetBottom(), top = false}
-			else
-				blizzardFramesData[frame] = {y = frame:GetTop() - screenHeight / framescale, top = true}
-			end
-			if frame == MinimapCluster then
-				blizzardFramesData[frame].lastX = GetScreenWidth() - MinimapCluster:GetWidth()
-				blizzardFramesData[frame].lastY = GetScreenHeight()
-				blizzardFramesData[frame].lastScale = 1
-			end
-		end
-	end
-
-	for _,frame in ipairs(frames) do
-		if type(frame) == "string" then
-			frame = _G[frame]
-		end
-
-		local framescale = frame and frame.GetScale and frame:GetScale() or 1
-
-		if ((frame and frame.IsUserPlaced and not frame:IsUserPlaced()) or ((frame == DEFAULT_CHAT_FRAME or frame == ChatFrame2) and SIMPLE_CHAT == "1") or frame == FramerateLabel) and (frame ~= ChatFrame2 or SIMPLE_CHAT == "1") then
-			local frameData = blizzardFramesData[frame]
-			if (select(2, frame:GetPoint(1)) ~= UIParent and select(2, frame:GetPoint(1)) ~= WorldFrame) then
-				-- do nothing
-			elseif frame == PlayerFrame and (CT_PlayerFrame_Drag or Gypsy_PlayerFrameCapsule) then
-				-- do nothing
-			elseif frame == TargetFrame and (CT_TargetFrame_Drag or Gypsy_TargetFrameCapsule) then
-				-- do nothing
-			elseif frame == PartyMemberFrame1 and (CT_MovableParty1_Drag or Gypsy_PartyFrameCapsule) then
-				-- do nothing
-			elseif frame == MainMenuBar and Gypsy_HotBarCapsule then
-				-- do nothing
-			elseif frame == MinimapCluster and select(3, frame:GetPoint(1)) ~= "TOPRIGHT" then
-				-- do nothing
-			elseif frame == DurabilityFrame and DurabilityFrame:IsShown() and (DurabilityFrame:GetLeft() > GetScreenWidth() or DurabilityFrame:GetRight() < 0 or DurabilityFrame:GetBottom() > GetScreenHeight() or DurabilityFrame:GetTop() < 0) then
-				DurabilityFrame:Hide()
-			elseif frame == FramerateLabel and ((frameData.lastX and not isClose(frameData.lastX, frame:GetLeft())) or not isClose(WorldFrame:GetHeight() * WorldFrame:GetScale(), UIParent:GetHeight() * UIParent:GetScale()))  then
-				-- do nothing
-			elseif frame == PlayerFrame or frame == MainMenuBar or frame == ConsolidatedBuffs or frame == CastingBarFrame or frame == TutorialFrameParent or frame == FramerateLabel or frame == DurabilityFrame or frame == WatchFrame or not (frameData.lastScale and frame.GetScale and frameData.lastScale == frame:GetScale()) or not (frameData.lastX and frameData.lastY and (not isClose(frameData.lastX, frame:GetLeft()) or not isClose(frameData.lastY, frame:GetTop()))) then
-				local anchor
-				local anchorAlt
-				local width, height = GetScreenWidth(), GetScreenHeight()
-				local x
-
-				if frame:GetRight() and frame:GetLeft() then
-					local anchorFrame = UIParent
-					if frame == MainMenuBar or frame == GroupLootFrame1 or frame == FramerateLabel then
-						x = 0
-						anchor = ""
-					elseif frame:GetRight() / framescale <= width / 2 then
-						x = frame:GetLeft() / framescale
-						anchor = "LEFT"
-					else
-						x = frame:GetRight() - width / framescale
-						anchor = "RIGHT"
-					end
-					local y = blizzardFramesData[frame].y
-					local offset = 0
-					if blizzardFramesData[frame].top then
-						anchor = "TOP" .. anchor
-						offset = ( topOffset - height ) / framescale
-					else
-						anchor = "BOTTOM" .. anchor
-						offset = bottomOffset / framescale
-					end
-					if frame == MinimapCluster and not MinimapBorderTop:IsShown() then
-						offset = offset + MinimapBorderTop:GetHeight() * 3/5
-					elseif frame == ConsolidatedBuffs and TicketStatusFrame:IsShown() then
-						offset = offset - TicketStatusFrame:GetHeight() * TicketStatusFrame:GetScale()
-					elseif frame == DEFAULT_CHAT_FRAME then
-						y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
-						if PetActionBarFrame:IsShown() or ShapeshiftBarFrame:IsShown() then
-							offset = offset + ShapeshiftBarFrame:GetHeight() * ShapeshiftBarFrame:GetScale()
-						end
-						if MultiBarBottomLeft:IsShown() then
-							offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale() - 21
-						end
-					elseif frame == ChatFrame2 then
-						y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
-						if MultiBarBottomRight:IsShown() then
-							offset = offset + MultiBarBottomRight:GetHeight() * MultiBarBottomRight:GetScale() - 21
-						end
-					elseif frame == CastingBarFrame then
-						y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 17
-						if PetActionBarFrame:IsShown() or ShapeshiftBarFrame:IsShown() then
-							offset = offset + ShapeshiftBarFrame:GetHeight() * ShapeshiftBarFrame:GetScale()
-						end
-						if MultiBarBottomLeft:IsShown() or MultiBarBottomRight:IsShown() then
-							offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale()
-						end
-					elseif frame == GroupLootFrame1 or frame == TutorialFrameParent or frame == FramerateLabel then
-						if MultiBarBottomLeft:IsShown() or MultiBarBottomRight:IsShown() then
-							offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale()
-						end
-					elseif frame == DurabilityFrame or frame == WatchFrame then
-						anchorFrame = MinimapCluster
-						x = 0
-						y = 0
-						offset = 0
-						if frame == WatchFrame and DurabilityFrame:IsShown() then
-							y = y - DurabilityFrame:GetHeight() * DurabilityFrame:GetScale()
-						end
-						if frame == DurabilityFrame then
-							x = -20
-						end
-						anchor = "TOPRIGHT"
-						anchorAlt = "BOTTOMRIGHT"
-						if MultiBarRight:IsShown() then
-							x = x - MultiBarRight:GetWidth() * MultiBarRight:GetScale()
-							if MultiBarLeft:IsShown() then
-								x = x - MultiBarLeft:GetWidth() * MultiBarLeft:GetScale()
-							end
-						end
-					end
-					if frame == FramerateLabel then
-						anchorFrame = WorldFrame
-					end
-					frame:ClearAllPoints()
-					frame:SetPoint(anchor, anchorFrame, anchorAlt or anchor, x, y + offset)
-					blizzardFramesData[frame].lastX = frame:GetLeft()
-					blizzardFramesData[frame].lastY = frame:GetTop()
-					blizzardFramesData[frame].lastScale = framescale
-				end
-			end
-		end
-	end
-end
-
-local function compat()
-	local Jostle20 = {}
-	function Jostle20:RegisterTop(...)
-		Jostle:RegisterTop(...)
-	end
-	function Jostle20:RegisterBottom(...)
-		Jostle:RegisterBottom(...)
-	end
-	function Jostle20:GetScreenTop(...)
-		Jostle:GetScreenTop(...)
-	end
-	function Jostle20:GetScreenBottom(...)
-		Jostle:GetScreenBottom(...)
-	end
-	function Jostle20:Unregister(...)
-		Jostle:Unregister(...)
-	end
-	function Jostle20:IsTopAdjusting(...)
-		Jostle:IsTopAdjusting(...)
-	end
-	function Jostle20:EnableTopAdjusting(...)
-		Jostle:EnableTopAdjusting(...)
-	end
-	function Jostle20:DisableTopAdjusting(...)
-		Jostle:DisableTopAdjusting(...)
-	end
-	function Jostle20:IsBottomAdjusting(...)
-		Jostle:IsBottomAdjusting(...)
-	end
-	function Jostle20:EnableBottomAdjusting(...)
-		Jostle:EnableBottomAdjusting(...)
-	end
-	function Jostle20:DisableBottomAdjusting(...)
-		Jostle:DisableBottomAdjusting(...)
-	end
-	function Jostle20:Refresh(...)
-		Jostle:Refresh(...)
-	end
-	local function activate(self, oldLib)
-		Jostle20 = self
-		if oldLib and oldLib.topFrames and oldLib.bottomFrames then
-			for i,v in ipairs(oldLib.topFrames) do
-				Jostle:RegisterTop(v)
-			end
-			for i,v in ipairs(oldLib.bottomFrames) do
-				Jostle:RegisterBottom(v)
-			end
-		end
-	end
-	local function external(self, instance, major)
-		if major == "AceEvent-2.0" then
-			instance:embed(self)
-
-			self:UnregisterAllEvents()
-			self:CancelAllScheduledEvents()
-		end
-	end
-	AceLibrary:Register(Jostle20, "Jostle-2.0", MINOR_VERSION*1000, activate, external)
-	Jostle20 = AceLibrary("Jostle-2.0")
-end
-if AceLibrary then
-	compat()
-elseif Rock then
-	function Jostle:OnLibraryLoad(major, version)
-		if major == "AceLibrary" then
-			compat()
-		end
-	end
-end
diff --git a/Interface/AddOns/DockingStation/Libs/LibOptionsAssist-1.0.lua b/Interface/AddOns/DockingStation/Libs/LibOptionsAssist-1.0.lua
deleted file mode 100644
index 2e49cbe..0000000
--- a/Interface/AddOns/DockingStation/Libs/LibOptionsAssist-1.0.lua
+++ /dev/null
@@ -1,442 +0,0 @@
-local LIB, REVISION = "LibOptionsAssist-1.0", 3
-if not LibStub then error(LIB .. " requires LibStub", 0) end
-
-local lib, oldRevision = LibStub:NewLibrary(LIB, REVISION)
-if not lib then return end
-
---[[-----------------------------------------------------------------------------
-Version bridge
--------------------------------------------------------------------------------]]
-local content, desc, frame, fsDesc, fsInfo, fsTitle, info, mt, name, path, showing, title, widget, LOD, OnHide, OnShow
-
-if oldRevision then
-	if oldRevision < 2 then
-		desc, info, name, path, title, LOD, OnHide, OnShow = { }, lib._info, lib._name, lib._path, lib._title, lib._LOD, lib._OnHide, lib._OnShow
-		content, frame, fsInfo, fsTitle = lib.content, lib.frame, lib.info, lib.title
-		mt, showing, widget = lib.emulate_mt, lib.showing, lib.widget
-		fsDesc = frame:CreateFontString(nil, 'ARTWORK', 'GameFontHighlightSmall')
-		fsInfo:SetParent(frame)
-		fsTitle:SetParent(frame)
-		lib.title_bar:Hide()
-		wipe(lib)
-		wipe(mt)
-	else
-		content, desc, frame, fsDesc, fsInfo, fsTitle, info, mt, name, path, showing, title, widget, LOD, OnHide, OnShow = lib.__void()
-	end
-else
-	desc, info, mt, name, path, title, LOD, OnHide, OnShow = { }, { }, { }, { }, { }, { }, { }, { }, { }
-	frame = CreateFrame('Frame', nil, UIParent)
-	content = CreateFrame('Frame', nil, frame)
-	fsDesc = frame:CreateFontString(nil, 'ARTWORK', 'GameFontHighlightSmall')
-	fsInfo = frame:CreateFontString(nil, 'ARTWORK', 'GameFontNormalSmall')
-	fsTitle = frame:CreateFontString(nil, 'OVERLAY', 'GameFontNormalLarge')
-	frame:Hide()
-end
-
---[[-----------------------------------------------------------------------------
-Initialize frames and font strings
--------------------------------------------------------------------------------]]
-frame:SetScript('OnHide', function(self)
-	if OnHide[showing] then
-		local ok, err = pcall(OnHide[showing], showing)
-		if not ok then
-			geterrorhandler()(err)
-		end
-	end
-end)
-
-frame:SetScript('OnShow', function(self)
-	if showing then
-		if OnShow[showing] then
-			local ok, err = pcall(OnShow[showing], showing)
-			if not ok then
-				geterrorhandler()(err)
-			end
-		end
-		showing:Refresh()
-	end
-end)
-
-frame:SetScript('OnUpdate', function(self)													-- Keep the width of fontString[DESC] set correctly
-	self:SetScript('OnUpdate', nil)
-	fsDesc:SetWidth(self:GetWidth() - 25)
-	self:SetScript('OnSizeChanged', function(self, width)
-		fsDesc:SetWidth(width - 25)
-	end)
-end)
-
-content:SetPoint('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -10, 10)
-
-fsDesc:ClearAllPoints()
-fsDesc:SetJustifyH('LEFT')
-fsDesc:SetJustifyV('TOP')
-fsDesc:SetNonSpaceWrap(true)
-fsDesc:SetText(" ")
-fsDesc:Hide()
-fsDesc.shown = false
-
-fsInfo:ClearAllPoints()
-fsInfo:SetAlpha(0.75)
-fsInfo:SetJustifyH('RIGHT')
-fsInfo:SetJustifyV('MIDDLE')
-fsInfo:SetPoint('TOPLEFT', frame, 'TOPLEFT', 15, -15)
-fsInfo:SetPoint('TOPRIGHT', frame, 'TOPRIGHT', -10, -15)
-fsInfo:SetText(" ")
-fsInfo:Hide()
-fsInfo.shown = false
-
-fsTitle:ClearAllPoints()
-fsTitle:SetJustifyH('LEFT')
-fsTitle:SetJustifyV('TOP')
-fsTitle:SetPoint('TOPLEFT', frame, 'TOPLEFT', 15, -15)
-fsTitle:SetPoint('TOPRIGHT', frame, 'TOPRIGHT', -10, -15)
-fsTitle:SetText(" ")
-fsTitle:SetHeight(fsTitle:GetStringHeight())
-fsTitle:Hide()
-fsTitle.shown = false
-
---[[-----------------------------------------------------------------------------
-LoD library support
--------------------------------------------------------------------------------]]
-local ACD, ACR = LibStub('AceConfigDialog-3.0', true), LibStub('AceConfigRegistry-3.0', true)
-
-if ACD and ACR and widget then
-	frame:UnregisterEvent('ADDON_LOADED')
-	frame:SetScript('OnEvent', nil)
-else
-	frame:RegisterEvent('ADDON_LOADED')
-	frame:SetScript('OnEvent', function(self)
-		if not ACD then
-			ACD = LibStub('AceConfigDialog-3.0', true)
-		end
-		if not ACR then
-			ACR = LibStub('AceConfigRegistry-3.0', true)
-		end
-		if not (ACD and ACR and LibStub('AceGUI-3.0', true)) then return end
-		self:UnregisterEvent('ADDON_LOADED')
-		self:SetScript('OnEvent', nil)
-		widget = {
-			content = content,
-			frame = frame,
-			type = LIB
-		}
-		LibStub('AceGUI-3.0'):RegisterAsContainer(widget)
-		if showing then
-			showing:Refresh()
-		end
-	end)
-end
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function AnchorContent()
-	local anchor = fsTitle.shown and fsTitle
-	if fsInfo.shown then
-		if anchor then
-			fsInfo:SetHeight(fsTitle:GetStringHeight())
-		else
-			fsInfo:SetHeight(fsInfo:GetStringHeight())
-			anchor = fsInfo
-		end
-	end
-	if fsDesc.shown then
-		if anchor then
-			fsDesc:SetPoint('TOPLEFT', anchor, 'BOTTOMLEFT', 0, -11)
-		else
-			fsDesc:SetPoint('TOPLEFT', fsTitle, 'TOPLEFT')
-		end
-		content:SetPoint('TOPLEFT', fsDesc, 'BOTTOMLEFT', 0, -10)
-	elseif anchor then
-		content:SetPoint('TOPLEFT', anchor, 'BOTTOMLEFT', 0, -8)
-	else
-		content:SetPoint('TOPLEFT', fsTitle, 'TOPLEFT')
-	end
-end
-AnchorContent()
-
-local function DoNothing()
-end
-
-local function Update(fs, text)
-	if text then
-		fs:SetText(text)
-		if not fs.shown then
-			fs.shown = true
-			fs:Show()
-			AnchorContent()
-		end
-	elseif fs.shown then
-		fs.shown = false
-		fs:Hide()
-		AnchorContent()
-	end
-end
-
-local function Set(entry, text, fs, variable)
-	if type(text) ~= 'string' and text ~= nil then
-		error(LIB .. ": <object>:Set" .. (fs == fsDesc and "Desc") or (fs == fsInfo and "Info") or "Title" .. "(text) - 'text' expected string or nil, got " .. type(text), 3)
-	end
-	if text then
-		text = strtrim(text)
-		if text == "" then
-			text = nil
-		end
-	end
-	variable[entry] = text
-	if showing == entry then
-		Update(fs, text)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Instead of creating a new set of frames and font strings for each Blizzard
-options panel entry, one set will be shared between them all.  To facilitate
-this, a metatable will be used to emulate the needed methods.
--------------------------------------------------------------------------------]]
-mt.__call = function(self)
-	InterfaceOptionsFrame_OpenToCategory(self)
-end
-
-mt.__index = {
-	cancel = DoNothing,
-	defaults = DoNothing,
-	okay = DoNothing,
-	refresh = DoNothing,
-
-	["AssignOptions"] = function(self, optName, ...)
-		if optName == nil then
-			name[self], path[self] = nil, nil
-		else
-			name[self] = optName
-			if select('#', ...) > 0 then
-				path[self] = { ... }
-			else
-				path[self] = nil
-			end
-		end
-		self:Refresh()
-	end,
-
-	['ClearAllPoints'] = function(self)															-- Required
-		if (showing or self) == self then
-			frame:ClearAllPoints()
-		end
-	end,
-
-	["FlagAsLoaded"] = function(self)
-		LOD[self] = nil
-	end,
-
-	["GetDesc"] = function(self)
-		return desc[self]
-	end,
-
-	["GetInfo"] = function(self)
-		return info[self]
-	end,
-
-	['GetScript'] = function(self, script)
-		if script == 'OnHide' then
-			return OnHide[self]
-		elseif script == 'OnShow' then
-			return OnShow[self]
-		else
-			error(LIB .. ": <object>:GetScript(script) - '" .. tostring(script) .. "' is not a valid script for this object", 2)
-		end
-	end,
-
-	["GetTitle"] = function(self)
-		return title[self]
-	end,
-
-	['HasScript'] = function(self, script)
-		return script == 'OnHide' or script == 'OnShow'
-	end,
-
-	['Hide'] = function(self)																		-- Required
-		if showing == self then
-			content:Hide()
-			if widget then
-				widget:PauseLayout()
-				widget:ReleaseChildren()
-			end
-			frame:Hide()
-			showing = nil
-		end
-	end,
-
-	['IsShown'] = function(self)
-		return showing == self
-	end,
-
-	['IsVisible'] = function(self)
-		return showing == self and frame:IsVisible()
-	end,
-
-	["Refresh"] = function(self)
-		if showing == self then
-			Update(fsDesc, desc[self])
-			Update(fsInfo, info[self])
-			Update(fsTitle, title[self])
-			if widget then
-				content:Hide()
-				local name = name[self]
-				if name and ACR:GetOptionsTable(name) then
-					widget:ResumeLayout()
-					if not path[self] then
-						ACD:Open(name, widget)
-					else
-						ACD:Open(name, widget, unpack(path[self]))
-					end
-					content:Show()
-				end
-			end
-		end
-	end,
-
-	['SetAllPoints'] = function(self, ...)
-		if (showing or self) == self then
-			frame:SetAllPoints(...)
-		end
-	end,
-
-	["SetDesc"] = function(self, text)
-		Set(self, text, fsDesc, desc)
-	end,
-
-	["SetInfo"] = function(self, text)
-		Set(self, text, fsInfo, info)
-	end,
-
-	['SetParent'] = function(self, ...)															-- Required
-		if (showing or self) == self then
-			frame:SetParent(...)
-		end
-	end,
-
-	['SetPoint'] = function(self, ...)															-- Required
-		if (showing or self) == self then
-			frame:SetPoint(...)
-		end
-	end,
-
-	['SetScript'] = function(self, script, func)
-		if type(func) ~= 'function' and func ~= nil then
-			error(LIB .. ": <object>:SetScript(script, func) - 'func' expected function or nil, got " .. type(func), 2)
-		elseif script == 'OnHide' then
-			OnHide[self] = func
-		elseif script == 'OnShow' then
-			OnShow[self] = func
-		else
-			error(LIB .. ": <object>:SetScript(script, func) - '" .. tostring(script) .. "' is not a valid script for this object", 2)
-		end
-	end,
-
-	["SetTitle"] = function(self, text)
-		Set(self, text, fsTitle, title)
-	end,
-
-	['Show'] = function(self)																		-- Required
-		if showing then
-			if showing == self then
-				return self:Refresh()
-			end
-			showing:Hide()
-		elseif LOD[self] then																		-- Do this before showing to avoid potential LoD issues
-			local lod = LOD[self]
-			LOD[self] = nil
-			if type(lod) == 'function' then
-				local ok, name = pcall(lod, self)
-				lod = ok and name
-			end
-			if type(lod) == 'string' then
-				lib:LoadModule(lod)
-			end
-		end
-		showing = self
-		frame:Show()
-	end
-}
-
-mt.__metatable = LIB
-
-if showing then
-	showing:Refresh()
-end
-
---[[-----------------------------------------------------------------------------
-Private API
--------------------------------------------------------------------------------]]
-function lib.__void()
-	wipe(lib)
-	wipe(mt)
-	return content, desc, frame, fsDesc, fsInfo, fsTitle, info, mt, name, path, showing, title, widget, LOD, OnHide, OnShow
-end
-
---[[-----------------------------------------------------------------------------
-Public API
--------------------------------------------------------------------------------]]
-function lib:AddEntry(name, parent, loadOnDemand)
-	if type(name) ~= 'string' then
-		error(LIB .. ":AddEntry(name, parent, loadOnDemand) - 'name' expected string, got " .. type(name), 2)
-	elseif type(parent) ~= 'string' and parent ~= nil then
-		error(LIB .. ":AddEntry(name, parent, loadOnDemand) - 'parent' expected string or nil, got " .. type(parent), 2)
-	elseif parent and not self:HasEntry(parent) then
-		error(LIB .. ":AddEntry(name, parent, loadOnDemand) - 'parent' (" .. parent .. ") must exist before adding a child", 2)
-	elseif type(loadOnDemand) ~= 'string' and type(loadOnDemand) ~= 'function' and loadOnDemand ~= nil then
-		error(LIB .. ":AddEntry(name, parent, loadOnDemand) - 'loadOnDemand' expected function or string or nil, got " .. type(loadOnDemand), 2)
-	end
-	local entry = setmetatable({
-		name = name,
-		parent = parent
-	}, mt)
-	title[entry], LOD[entry] = name, loadOnDemand
-	InterfaceOptions_AddCategory(entry)
-	return entry
-end
-
-function lib:HasEntry(name, parent)
-	if type(name) ~= 'string' or (parent and type(parent) ~= 'string') then return end
-	for index, entry in self:IterateEntries(parent) do
-		if entry.name == name then
-			return index
-		end
-	end
-end
-
-do
-	local entries = INTERFACEOPTIONS_ADDONCATEGORIES
-
-	local function iterator(parent, index)
-		for index = (index or 0) + 1, #entries do
-			if entries[index].parent == parent then
-				return index, entries[index]
-			end
-		end
-	end
-
-	function lib:IterateEntries(parent)
-		return iterator, type(parent) == 'string' and parent or nil, 0
-	end
-end
-
-function lib:LoadModule(name)
-	if type(name) ~= 'string' then
-		error(LIB .. ":LoadModule(name) - 'name' expected string, got " .. type(name), 2)
-	end
-	local loaded, reason, _, title, _, enabled = nil, 'MISSING', GetAddOnInfo(name)
-	if title then
-		loaded = IsAddOnLoaded(name)
-		if not loaded then
-			if not enabled then
-				EnableAddOn(name)
-			end
-			loaded, reason = LoadAddOn(name)
-			if not enabled then
-				DisableAddOn(name)
-			end
-		end
-	end
-	return loaded, reason
-end
diff --git a/Interface/AddOns/DockingStation/Libs/LibSharedMedia-3.0.lua b/Interface/AddOns/DockingStation/Libs/LibSharedMedia-3.0.lua
deleted file mode 100644
index 44f6c09..0000000
--- a/Interface/AddOns/DockingStation/Libs/LibSharedMedia-3.0.lua
+++ /dev/null
@@ -1,230 +0,0 @@
---[[
-Name: LibSharedMedia-3.0
-Revision: $Revision: 58 $
-Author: Elkano (elkano@gmx.de)
-Inspired By: SurfaceLib by Haste/Otravi (troeks@gmail.com)
-Website: http://www.wowace.com/projects/libsharedmedia-3-0/
-Description: Shared handling of media data (fonts, sounds, textures, ...) between addons.
-Dependencies: LibStub, CallbackHandler-1.0
-License: LGPL v2.1
-]]
-
-local MAJOR, MINOR = "LibSharedMedia-3.0", 90000 + tonumber(("$Revision: 58 $"):match("(%d+)"))
-local lib = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not lib then return end
-
-local _G = getfenv(0)
-
-local pairs		= _G.pairs
-local type		= _G.type
-
-local band			= _G.bit.band
-
-local table_insert	= _G.table.insert
-local table_sort	= _G.table.sort
-
-local locale = GetLocale()
-local locale_is_western
-local LOCALE_MASK = 0
-lib.LOCALE_BIT_koKR		= 1
-lib.LOCALE_BIT_ruRU		= 2
-lib.LOCALE_BIT_zhCN		= 4
-lib.LOCALE_BIT_zhTW		= 8
-lib.LOCALE_BIT_western	= 128
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-lib.callbacks		= lib.callbacks			or CallbackHandler:New(lib)
-
-lib.DefaultMedia	= lib.DefaultMedia		or {}
-lib.MediaList		= lib.MediaList			or {}
-lib.MediaTable		= lib.MediaTable		or {}
-lib.MediaType		= lib.MediaType			or {}
-lib.OverrideMedia	= lib.OverrideMedia		or {}
-
-local defaultMedia = lib.DefaultMedia
-local mediaList = lib.MediaList
-local mediaTable = lib.MediaTable
-local overrideMedia = lib.OverrideMedia
-
-
--- create mediatype constants
-lib.MediaType.BACKGROUND	= "background"			-- background textures
-lib.MediaType.BORDER		= "border"				-- border textures
-lib.MediaType.FONT			= "font"				-- fonts
-lib.MediaType.STATUSBAR		= "statusbar"			-- statusbar textures
-lib.MediaType.SOUND			= "sound"				-- sound files
-
--- populate lib with default Blizzard data
--- BACKGROUND
-if not lib.MediaTable.background then lib.MediaTable.background = {} end
-lib.MediaTable.background["Blizzard Dialog Background"]		= [[Interface\DialogFrame\UI-DialogBox-Background]]
-lib.MediaTable.background["Blizzard Low Health"]			= [[Interface\FullScreenTextures\LowHealth]]
-lib.MediaTable.background["Blizzard Out of Control"]		= [[Interface\FullScreenTextures\OutOfControl]]
-lib.MediaTable.background["Blizzard Parchment"]				= [[Interface\AchievementFrame\UI-Achievement-Parchment-Horizontal]]
-lib.MediaTable.background["Blizzard Parchment 2"]			= [[Interface\AchievementFrame\UI-Achievement-Parchment]]
-lib.MediaTable.background["Blizzard Tabard Background"]		= [[Interface\TabardFrame\TabardFrameBackground]]
-lib.MediaTable.background["Blizzard Tooltip"]				= [[Interface\Tooltips\UI-Tooltip-Background]]
-lib.MediaTable.background["Solid"]							= [[Interface\Buttons\WHITE8X8]]
-
--- BORDER
-if not lib.MediaTable.border then lib.MediaTable.border = {} end
-lib.MediaTable.border["None"]								= [[Interface\None]]
-lib.MediaTable.border["Blizzard Achievement Wood"]			= [[Interface\AchievementFrame\UI-Achievement-WoodBorder]]
-lib.MediaTable.border["Blizzard Chat Bubble"]				= [[Interface\Tooltips\ChatBubble-Backdrop]]
-lib.MediaTable.border["Blizzard Dialog"]					= [[Interface\DialogFrame\UI-DialogBox-Border]]
-lib.MediaTable.border["Blizzard Dialog Gold"]				= [[Interface\DialogFrame\UI-DialogBox-Gold-Border]]
-lib.MediaTable.border["Blizzard Party"]						= [[Interface\CHARACTERFRAME\UI-Party-Border]]
-lib.MediaTable.border["Blizzard Tooltip"]					= [[Interface\Tooltips\UI-Tooltip-Border]]
-
--- FONT
-if not lib.MediaTable.font then lib.MediaTable.font = {} end
-local SML_MT_font = lib.MediaTable.font
-if locale == "koKR" then
-	LOCALE_MASK = lib.LOCALE_BIT_koKR
---
-	SML_MT_font["굵은 글꼴"]		= [[Fonts\2002B.TTF]]
-	SML_MT_font["기본 글꼴"]		= [[Fonts\2002.TTF]]
-	SML_MT_font["데미지 글꼴"]		= [[Fonts\K_Damage.TTF]]
-	SML_MT_font["퀘스트 글꼴"]		= [[Fonts\K_Pagetext.TTF]]
---
-	lib.DefaultMedia["font"] = "기본 글꼴" -- someone from koKR please adjust if needed
---
-elseif locale == "zhCN" then
-	LOCALE_MASK = lib.LOCALE_BIT_zhCN
---
-	SML_MT_font["伤害数字"]		= [[Fonts\ZYKai_C.ttf]]
-	SML_MT_font["默认"]			= [[Fonts\ZYKai_T.ttf]]
-	SML_MT_font["聊天"]			= [[Fonts\ZYHei.ttf]]
---
-	lib.DefaultMedia["font"] = "默认" -- someone from zhCN please adjust if needed
---
-elseif locale == "zhTW" then
-	LOCALE_MASK = lib.LOCALE_BIT_zhTW
---
-	SML_MT_font["提示訊息"]		= [[Fonts\bHEI00M.ttf]]
-	SML_MT_font["聊天"]			= [[Fonts\bHEI01B.ttf]]
-	SML_MT_font["傷害數字"]		= [[Fonts\bKAI00M.ttf]]
-	SML_MT_font["預設"]			= [[Fonts\bLEI00D.ttf]]
---
-	lib.DefaultMedia["font"] = "預設" -- someone from zhTW please adjust if needed
-
-elseif locale == "ruRU" then
-	LOCALE_MASK = lib.LOCALE_BIT_ruRU
---
-	SML_MT_font["Arial Narrow"]			= [[Fonts\ARIALN.TTF]]
-	SML_MT_font["Friz Quadrata TT"]		= [[Fonts\FRIZQT__.TTF]]
-	SML_MT_font["Morpheus"]				= [[Fonts\MORPHEUS.TTF]]
-	SML_MT_font["Nimrod MT"]			= [[Fonts\NIM_____.ttf]]
-	SML_MT_font["Skurri"]				= [[Fonts\SKURRI.TTF]]
---
-	lib.DefaultMedia.font = "Friz Quadrata TT"
---
-else
-	LOCALE_MASK = lib.LOCALE_BIT_western
-	locale_is_western = true
---
-	SML_MT_font["Arial Narrow"]			= [[Fonts\ARIALN.TTF]]
-	SML_MT_font["Friz Quadrata TT"]		= [[Fonts\FRIZQT__.TTF]]
-	SML_MT_font["Morpheus"]				= [[Fonts\MORPHEUS.TTF]]
-	SML_MT_font["Skurri"]				= [[Fonts\SKURRI.TTF]]
---
-	lib.DefaultMedia.font = "Friz Quadrata TT"
---
-end
-
--- STATUSBAR
-if not lib.MediaTable.statusbar then lib.MediaTable.statusbar = {} end
-lib.MediaTable.statusbar["Blizzard"]						= [[Interface\TargetingFrame\UI-StatusBar]]
-lib.DefaultMedia.statusbar = "Blizzard"
-
--- SOUND
-if not lib.MediaTable.sound then lib.MediaTable.sound = {} end
-lib.MediaTable.sound["None"]								= [[Interface\Quiet.mp3]]	-- Relies on the fact that PlaySound[File] doesn't error on non-existing input.
-lib.DefaultMedia.sound = "None"
-
-local function rebuildMediaList(mediatype)
-	local mtable = mediaTable[mediatype]
-	if not mtable then return end
-	if not mediaList[mediatype] then mediaList[mediatype] = {} end
-	local mlist = mediaList[mediatype]
-	-- list can only get larger, so simply overwrite it
-	local i = 0
-	for k in pairs(mtable) do
-		i = i + 1
-		mlist[i] = k
-	end
-	table_sort(mlist)
-end
-
-function lib:Register(mediatype, key, data, langmask)
-	if type(mediatype) ~= "string" then
-		error(MAJOR..":Register(mediatype, key, data, langmask) - mediatype must be string, got "..type(mediatype))
-	end
-	if type(key) ~= "string" then
-		error(MAJOR..":Register(mediatype, key, data, langmask) - key must be string, got "..type(key))
-	end
-	if mediatype == lib.MediaType.FONT  and ((langmask and band(langmask, LOCALE_MASK) == 0) or not (langmask or locale_is_western)) then return false end
-	mediatype = mediatype:lower()
-	if not mediaTable[mediatype] then mediaTable[mediatype] = {} end
-	local mtable = mediaTable[mediatype]
-	if mtable[key] then return false end
-
-	mtable[key] = data
-	rebuildMediaList(mediatype)
-	self.callbacks:Fire("LibSharedMedia_Registered", mediatype, key)
-	return true
-end
-
-function lib:Fetch(mediatype, key, noDefault)
-	local mtt = mediaTable[mediatype]
-	local overridekey = overrideMedia[mediatype]
-	local result = mtt and ((overridekey and mtt[overridekey] or mtt[key]) or (not noDefault and defaultMedia[mediatype] and mtt[defaultMedia[mediatype]])) or nil
-
-	return result
-end
-
-function lib:IsValid(mediatype, key)
-	return mediaTable[mediatype] and (not key or mediaTable[mediatype][key]) and true or false
-end
-
-function lib:HashTable(mediatype)
-	return mediaTable[mediatype]
-end
-
-function lib:List(mediatype)
-	if not mediaTable[mediatype] then
-		return nil
-	end
-	if not mediaList[mediatype] then
-		rebuildMediaList(mediatype)
-	end
-	return mediaList[mediatype]
-end
-
-function lib:GetGlobal(mediatype)
-	return overrideMedia[mediatype]
-end
-
-function lib:SetGlobal(mediatype, key)
-	if not mediaTable[mediatype] then
-		return false
-	end
-	overrideMedia[mediatype] = (key and mediaTable[mediatype][key]) and key or nil
-	self.callbacks:Fire("LibSharedMedia_SetGlobal", mediatype, overrideMedia[mediatype])
-	return true
-end
-
-function lib:GetDefault(mediatype)
-	return defaultMedia[mediatype]
-end
-
-function lib:SetDefault(mediatype, key)
-	if mediaTable[mediatype] and mediaTable[mediatype][key] and not defaultMedia[mediatype] then
-		defaultMedia[mediatype] = key
-		return true
-	else
-		return false
-	end
-end
diff --git a/Interface/AddOns/DockingStation/Libs/LibStateDriver-1.1.lua b/Interface/AddOns/DockingStation/Libs/LibStateDriver-1.1.lua
deleted file mode 100644
index bc7fb2e..0000000
--- a/Interface/AddOns/DockingStation/Libs/LibStateDriver-1.1.lua
+++ /dev/null
@@ -1,377 +0,0 @@
-local LIB, REVISION = "LibStateDriver-1.1", 2
-if not LibStub then error(LIB .. " requires LibStub", 0) end
-
-local lib, oldRevision = LibStub:NewLibrary(LIB, REVISION)
-if not lib then return end
-
-local gmatch, pcall, select, setmetatable, tremove = string.gmatch, pcall, select, setmetatable, table.remove
-local SecureCmdOptionParse, AND, OR, XOR = SecureCmdOptionParse, bit.band, bit.bor, bit.bxor
-
---[[-----------------------------------------------------------------------------
-Version bridge
--------------------------------------------------------------------------------]]
-local activeMonitor, callback, enabled, eventCount, eventMonitor, modMonitor, mt, object, parameters, state, status
-
-if oldRevision then
-	activeMonitor, callback, enabled, eventCount, eventMonitor, modMonitor, mt, object, parameters, state, status = lib.__void()
-else
-	callback, enabled, modMonitor, mt, object, parameters, state, status = { }, { }, { }, { }, { }, { }, { }, { }
-	eventCount = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-	activeMonitor, eventMonitor = CreateFrame('Frame'), CreateFrame('Frame')
-	activeMonitor:Hide()
-	eventMonitor:Hide()
-end
-
---[[-----------------------------------------------------------------------------
-Defaults
--------------------------------------------------------------------------------]]
-local function DoNothing() end
-
-setmetatable(callback, { __index = function() return DoNothing end })
-
-setmetatable(object, { __index = function(_, index) return index end })
-
-setmetatable(parameters, { __index = function() return "" end })
-
---[[-----------------------------------------------------------------------------
-Constants
--------------------------------------------------------------------------------]]
-local ACTIVE_FLAG, MOD_FLAG, STATIC = 0x80000000, 0x40000000, 0x00000000
-local ACTIVE_MASK = OR(ACTIVE_FLAG, MOD_FLAG)
-local EVENT_MASK = bit.bnot(ACTIVE_MASK)
-
-local conditionMask = {
-	['actionbar']	= 0x00000010,		['noactionbar']	= 0x00000010,
-	['bar']			= 0x00000010,		['nobar']			= 0x00000010,
-	['bonusbar']	= 0x00000020,		['nobonusbar']		= 0x00000020,
-	['combat']		= 0x00000003,		['nocombat']		= 0x00000003,
-	['equipped']	= 0x00000200,		['noequipped']		= 0x00000200,
-	['form']			= 0x00000020,		['noform']			= 0x00000020,
-	['group']		= 0x0000000C,		['nogroup']			= 0x0000000C,
-	['mod']			= MOD_FLAG,			['nomod']			= MOD_FLAG,
-	['modifier']	= MOD_FLAG,			['nomodifier']		= MOD_FLAG,
-	['pet']			= 0x00000100,		['nopet']			= 0x00000100,
-	['spec']			= 0x00000080,		['nospec']			= 0x00000080,
-	['stance']		= 0x00000020,		['nostance']		= 0x00000020,
-	['stealth']		= 0x00000040,		['nostealth']		= 0x00000040,
-	['worn']			= 0x00000200,		['noworn']			= 0x00000200
-}
-
-local eventMask = {
-	0x00000001, 0x00000002, 0x00000004, 0x00000008,
-	0x00000010, 0x00000020, 0x00000040, 0x00000080,
-	0x00000100, 0x00000200
-}
-
-local eventName = {
-	'PLAYER_REGEN_DISABLED', 'PLAYER_REGEN_ENABLED', 'PARTY_MEMBERS_CHANGED', 'RAID_ROSTER_UPDATE',
-	'ACTIONBAR_PAGE_CHANGED', 'UPDATE_BONUS_ACTIONBAR', 'UPDATE_STEALTH', 'ACTIVE_TALENT_GROUP_CHANGED',
-	'UNIT_PET', 'UNIT_INVENTORY_CHANGED'
-}
-
-local NUM_EVENTS = #eventName
-
---[[-----------------------------------------------------------------------------
-Set status flags for parameters: status[parameters] = flags
--------------------------------------------------------------------------------]]
-setmetatable(status, { __index = function(self, index)
-	local status, temp = STATIC, STATIC
-	for parameter in gmatch(index, "[^;]+") do
-		for conditions in gmatch(parameter, "%[%s*(.-)%s*%]") do
-			if conditions ~= "" then
-				for condition in gmatch(conditions, "%s*([%a@]+)[^%a,]*[^,]*") do
-					temp = OR(temp, conditionMask[condition] or ACTIVE_FLAG)
-				end
-			else
-				self[index] = AND(status, ACTIVE_FLAG) == 0 and status or AND(status, ACTIVE_MASK)
-				return self[index]
-			end
-		end
-		status, temp = OR(status, temp), STATIC
-	end
-	self[index] = AND(status, ACTIVE_FLAG) == 0 and status or AND(status, ACTIVE_MASK)
-	return self[index]
-end })
-
---[[-----------------------------------------------------------------------------
-Active Monitor / Modifier Monitor
--------------------------------------------------------------------------------]]
-local numActive, numMod = #activeMonitor, #modMonitor
-
-activeMonitor:SetScript('OnEvent', function(self)
-	local driver, err, ok, result
-	for index = numMod, 1, -1 do
-		driver = modMonitor[index]
-		result = SecureCmdOptionParse(parameters[driver])
-		if state[driver] ~= result then
-			state[driver] = result
-			ok, err = pcall(callback[driver], object[driver], result)
-			if not ok then
-				geterrorhandler()(err)
-			end
-		end
-	end
-end)
-
-do
-	local timer = 0
-
-	activeMonitor:SetScript('OnUpdate', function(self, elapsed)
-		timer = timer + elapsed
-		if timer < 0.2 then return end
-		timer = 0
-		local driver, err, ok, result
-		for index = numActive, 1, -1 do
-			driver = self[index]
-			result = SecureCmdOptionParse(parameters[driver])
-			if state[driver] ~= result then
-				state[driver] = result
-				ok, err = pcall(callback[driver], object[driver], result)
-				if not ok then
-					geterrorhandler()(err)
-				end
-			end
-		end
-	end)
-end
-
---[[-----------------------------------------------------------------------------
-Event Monitor
--------------------------------------------------------------------------------]]
-local numEvent = #eventMonitor
-
-eventMonitor:SetScript('OnEvent', function(self, event, unit)
-	if (event == 'UNIT_INVENTORY_CHANGED' or event == 'UNIT_PET') and unit ~= 'player' then return end
-	self:Show()
-end)
-
-eventMonitor:SetScript('OnUpdate', function(self)
-	self:Hide()
-	local driver, err, ok, result
-	for index = numEvent, 1, -1 do
-		driver = self[index]
-		result = SecureCmdOptionParse(parameters[driver])
-		if state[driver] ~= result then
-			state[driver] = result
-			ok, err = pcall(callback[driver], object[driver], result)
-			if not ok then
-				geterrorhandler()(err)
-			end
-		end
-	end
-end)
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function Disable(driver, status)
-	if AND(status, EVENT_MASK) ~= 0 then
-		for index = 1, numEvent do
-			if eventMonitor[index] == driver then
-				tremove(eventMonitor, index)
-				numEvent = numEvent - 1
-				for index = 1, NUM_EVENTS do
-					if AND(status, eventMask[index]) ~= 0 then
-						eventCount[index] = eventCount[index] - 1
-						if eventCount[index] == 0 then
-							eventMonitor:UnregisterEvent(eventName[index])
-						end
-					end
-				end
-				break
-			end
-		end
-	elseif AND(status, ACTIVE_FLAG) ~= 0 then
-		for index = 1, numActive do
-			if activeMonitor[index] == driver then
-				tremove(activeMonitor, index)
-				if numActive > 1 then
-					numActive = numActive - 1
-				else
-					numActive = 0
-					activeMonitor:Hide()
-				end
-				break
-			end
-		end
-	end
-	if AND(status, MOD_FLAG) ~= 0 then
-		for index = 1, numMod do
-			if modMonitor[index] == driver then
-				tremove(modMonitor, index)
-				if numMod > 1 then
-					numMod = numMod - 1
-				else
-					numMod = 0
-					activeMonitor:UnregisterEvent('MODIFIER_STATE_CHANGED')
-				end
-				break
-			end
-		end
-	end
-end
-
-local function Enable(driver, status)
-	if AND(status, EVENT_MASK) ~= 0 then
-		numEvent = numEvent + 1
-		eventMonitor[numEvent] = driver
-		for index = 1, NUM_EVENTS do
-			if AND(status, eventMask[index]) ~= 0 then
-				eventCount[index] = eventCount[index] + 1
-				if eventCount[index] == 1 then
-					eventMonitor:RegisterEvent(eventName[index])
-				end
-			end
-		end
-	elseif AND(status, ACTIVE_FLAG) ~= 0 then
-		if numActive > 0 then
-			numActive = numActive + 1
-		else
-			numActive = 1
-			activeMonitor:Show()
-		end
-		activeMonitor[numActive] = driver
-	end
-	if AND(status, MOD_FLAG) ~= 0 then
-		if numMod > 0 then
-			numMod = numMod + 1
-		else
-			numMod = 1
-			activeMonitor:RegisterEvent('MODIFIER_STATE_CHANGED')
-		end
-		modMonitor[numMod] = driver
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-mt.__call = function(self, force)																-- Trigger a state update and callback
-	state[self] = SecureCmdOptionParse(parameters[self])
-	if enabled[self] or force then
-		local ok, err = pcall(callback[self], object[self], state[self])
-		if ok then return end
-		geterrorhandler()(err)
-	end
-end
-
-mt.__index = {
-	["Disable"] = function(self)
-		if enabled[self] then
-			enabled[self] = nil
-			Disable(self, status[parameters[self]])
-		end
-	end,
-
-	["Enable"] = function(self)
-		if not enabled[self] then
-			enabled[self] = true
-			Enable(self, status[parameters[self]])
-			self()
-		end
-	end,
-
-	["GetCallback"] = function(self)
-		return rawget(callback, self)
-	end,
-
-	["GetObject"] = function(self)
-		return object[self]
-	end,
-
-	["GetParameters"] = function(self)
-		return parameters[self]
-	end,
-
-	["GetState"] = function(self)
-		return state[self]
-	end,
-
-	["IsEnabled"] = function(self)
-		return enabled[self]
-	end,
-
-	["Pack"] = function(self, ...)
-		local num = select('#', ...)
-		for index = 1, num do
-			self[index] = select(index, ...)
-		end
-		for index = #self, num + 1, -1 do
-			self[index] = nil
-		end
-	end,
-
-	["Recycle"] = function(self)
-		self:Disable()
-		callback[self], object[self], parameters[self], state[self] = nil, nil, nil, nil
-		mt.__metatable = nil
-		setmetatable(self, nil)
-		mt.__metatable = LIB
-	end,
-
-	["SetCallback"] = function(self, value)
-		if type(value) ~= 'function' and value ~= nil then
-			error(LIB .. ": <object>:SetCallback(value) - 'value' expected function or nil, got " .. type(value), 2)
-		end
-		callback[self] = value
-	end,
-
-	["SetObject"] = function(self, value)
-		if value == self then
-			value = nil
-		end
-		object[self] = value
-	end,
-
-	["SetParameters"] = function(self, value)
-		if type(value) == 'string' then
-			value = strtrim(value)
-		elseif value == nil then
-			value = ""
-		else
-			error(LIB .. ": <object>:SetParameters(value) - 'value' expected string or nil, got " .. type(value), 2)
-		end
-		if parameters[self] ~= value then
-			if enabled[self] then
-				local newStatus, oldStatus, result = status[value], status[parameters[self]], SecureCmdOptionParse(value)
-				if oldStatus ~= newStatus then
-					local deltaStatus = XOR(oldStatus, newStatus)
-					Disable(self, AND(deltaStatus, oldStatus))
-					Enable(self, AND(deltaStatus, newStatus))
-				end
-			end
-			parameters[self] = value ~= "" and value or nil
-			self()
-		end
-	end,
-
-	["Toggle"] = function(self)
-		if enabled[self] then
-			self:Disable()
-		else
-			self:Enable()
-		end
-	end
-}
-
-mt.__metatable = LIB
-
---[[-----------------------------------------------------------------------------
-Private API
--------------------------------------------------------------------------------]]
-function lib.__void()
-	wipe(lib)
-	wipe(mt)
-	return activeMonitor, callback, enabled, eventCount, eventMonitor, modMonitor, mt, object, parameters, state, status
-end
-
---[[-----------------------------------------------------------------------------
-Public API
--------------------------------------------------------------------------------]]
-function lib:New(enable)
-	local driver = setmetatable({ }, mt)
-	if enable then
-		driver:Enable()
-	end
-	return driver
-end
diff --git a/Interface/AddOns/DockingStation/Libs/LibStub.lua b/Interface/AddOns/DockingStation/Libs/LibStub.lua
deleted file mode 100644
index 0a41ac0..0000000
--- a/Interface/AddOns/DockingStation/Libs/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/Interface/AddOns/DockingStation/Locales/deDE.lua b/Interface/AddOns/DockingStation/Locales/deDE.lua
deleted file mode 100644
index 432260a..0000000
--- a/Interface/AddOns/DockingStation/Locales/deDE.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-if GetLocale() ~= 'deDE' then return end
-
-local L = select(2, ...).L
-
-L["Click to open the configuration panel."] = "Click to open the configuration panel."
-L["Left click and hold to move this panel."] = "Left click and hold to move this panel."
-L["Panel"] = "Panel"
-L["Panels"] = "Panels"
-L["Plugins"] = "Plugins"
-L["Profiles"] = "Profiles"
-L["Right click to change this panel's settings."] = "Right click to change this panel's settings."
-L["Unlocked"] = "Unlocked"
diff --git a/Interface/AddOns/DockingStation/Media/Gloss.tga b/Interface/AddOns/DockingStation/Media/Gloss.tga
deleted file mode 100644
index b508f3a..0000000
Binary files a/Interface/AddOns/DockingStation/Media/Gloss.tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Media/Icon.tga b/Interface/AddOns/DockingStation/Media/Icon.tga
deleted file mode 100644
index a23bf24..0000000
Binary files a/Interface/AddOns/DockingStation/Media/Icon.tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Media/Line, Gradient (Center).tga b/Interface/AddOns/DockingStation/Media/Line, Gradient (Center).tga
deleted file mode 100644
index 96d69bd..0000000
Binary files a/Interface/AddOns/DockingStation/Media/Line, Gradient (Center).tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Media/Line, Gradient.tga b/Interface/AddOns/DockingStation/Media/Line, Gradient.tga
deleted file mode 100644
index 430a27d..0000000
Binary files a/Interface/AddOns/DockingStation/Media/Line, Gradient.tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Media/Line, Solid.tga b/Interface/AddOns/DockingStation/Media/Line, Solid.tga
deleted file mode 100644
index 5600ac4..0000000
Binary files a/Interface/AddOns/DockingStation/Media/Line, Solid.tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Media/None.tga b/Interface/AddOns/DockingStation/Media/None.tga
deleted file mode 100644
index 95b5127..0000000
Binary files a/Interface/AddOns/DockingStation/Media/None.tga and /dev/null differ
diff --git a/Interface/AddOns/DockingStation/Panels.lua b/Interface/AddOns/DockingStation/Panels.lua
deleted file mode 100644
index 13f40dd..0000000
--- a/Interface/AddOns/DockingStation/Panels.lua
+++ /dev/null
@@ -1,479 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local min, pairs_iter, tonumber, GetMouseFocus = min, pairs(addon), tonumber, GetMouseFocus
-
-local mt = getmetatable(InterfaceOptionsFrame)
-
-local SetFrameLevel, SetFrameStrata = mt.__index.SetFrameLevel, mt.__index.SetFrameStrata
-
-local panels, strataLayers = panels, LibStub('LibDisplayAssist-1.2').StrataLayers
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local anchors, backdropInsets = { Center = 'LEFT', Left = 'LEFT', Right = 'RIGHT' }, { left = 0, right = 0, top = 0, bottom = 0 }
-local backdrop = { bgFile = "", tile = false, tileSize = 0, edgeFile = "", edgeSize = 0, insets = backdropInsets }
-local connections, directions = { LEFT = 'RIGHT', RIGHT = 'LEFT' }, { Center = 1, Left = 1, Right = -1 }
-local recycled = { }
-
-local auxFrame, auxString, centerFrame, overlayFrame, stateDriver = { }, { }, { }, { }, { }
-
-local LJ = LibStub('LibJostle-3.0')
-
-local function UpdateAlpha(panel, alpha)
-	alpha = hideConditions[alpha] or tonumber(alpha) or panel.settings.alphaNormal
-	if alpha <= 0 then
-		panel:Hide()
-	else
-		panel:Show()
-		panel:SetAlpha(alpha)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function OnLeave(self, motion)
-	self:HideTooltip(motion)
-	if self.settings.alphaMouse and not self:HasMouseFocus() then
-		self:Unreveal()
-	end
-end
-
-local function OnMouseDown(self, button)
-	if button == 'LeftButton' and self.unlocked then
-		self.x, self.y = self:GetCenter()
-		self:HideTooltip()
-		self:SetFrameStrata('TOOLTIP')
-		self:StartMoving()
-		self.moving = true
-	end
-end
-
-local function OnMouseUp(self, button)
-	if button == 'LeftButton' then
-		if self.moving then
-			self.moving = nil
-			self:StopMovingOrSizing()
-			self:SetFrameStrata(strataLayers[self.settings.strata])
-			self:SaveOffset()
-			self:ShowTooltip()
-		end
-	elseif button == 'RightButton' and ConfigFrames and self.settings.rightClickConfig and GetMouseFocus() == self then
-		ConfigFrames[1]()																				-- Do it this way to force loading of config module
-		PanelList:Select(self.id)
-		self:ShowTooltip()
-	end
-end
-
-local function OnEnter_AuxFrame(self)
-	self.parent:Reveal()
---	self:EnableMouse(false)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["AllChildren"] = function(self, method, ...)
-		local children
-		for section in pairs_iter, sectionTypes, nil do
-			children = self[section]
-			for index = #children, 1, -1 do
-				children[index][method](children[index], ...)
-			end
-		end
-	end,
-
-	["AnchorChildren"] = function(self, section)
-		local children = self[section]
-		if children[1] then
-			local anchor, frame, offset = anchors[section]
-			local anchorTo = connections[anchor]
-			if section ~= "Center" then
-				frame, offset = self, self.settings["spacing" .. section .. "Edge"] * directions[section] * self.size
-			else
-				frame, offset = centerFrame[self], 0
-			end
-
-			plugin = children[1]
-			plugin:ClearAllPoints()
-			plugin:SetPoint(anchor, frame, anchor, offset, 0)
-			frame, offset = plugin, self.settings["spacing" .. section] * directions[section] * self.size
-
-			for index = 2, #children do
-				plugin = children[index]
-				plugin:ClearAllPoints()
-				plugin:SetPoint(anchor, frame, anchorTo, offset, 0)
-				frame = plugin
-			end
-
-			if section == "Center" then
-				QueueMethod(self, "UpdateCenterWidth")
-			end
-		end
-	end,
-
-	['GetName'] = function(self)
-		if self.settings.allowGlobals then
-			return GetPanelName(self.id)
-		end
-	end,
-
-	["GetOffset"] = function(self)
-		local anchor, x, y = self.anchor
-		local L1, B1, W1, H1 = UIParent:GetRect()
-		local L2, B2, W2, H2 = self:GetRect()
-		if anchor == 'TOP' then
---			x, y = (L2 + L2 + W2 - L1 - L1 - W1) * 0.5, B2 + H2 - B1 - H1
-			x, y = L2 - L1 + (W2 - W1) * 0.5, B2 + H2 - B1 - H1
-		elseif anchor == 'BOTTOM' then
---			x, y = (L2 + L2 + W2 - L1 - L1 - W1) * 0.5, B2 - B1
-			x, y = L2 - L1 + (W2 - W1) * 0.5, B2 - B1
-		elseif anchor == 'LEFT' then
---			x, y = L2 - L1, (B2 + B2 + H2 - B1 - B1 - H1) * 0.5
-			x, y = L2 - L1, B2 - B1 + (H2 - H1) * 0.5
-		elseif anchor == 'RIGHT' then
---			x, y = L2 + W2 - L1 - W1, (B2 + B2 + H2 - B1 - B1 - H1) * 0.5
-			x, y = L2 + W2 - L1 - W1, B2 - B1 + (H2 - H1) * 0.5
-		elseif anchor == 'TOPLEFT' then
-			x, y = L2 - L1, B2 + H2 - B1 - H1
-		elseif anchor == 'TOPRIGHT' then
-			x, y = L2 + W2 - L1 - W1, B2 + H2 - B1 - H1
-		elseif anchor == 'BOTTOMLEFT' then
-			x, y = L2 - L1, B2 - B1
-		elseif anchor == 'BOTTOMRIGHT' then
-			x, y = L2 + W2 - L1 - W1, B2 - B1
-		else
---			x, y = (L2 + L2 + W2 - L1 - L1 - W1) * 0.5, (B2 + B2 + H2 - B1 - B1 - H1) * 0.5
-			x, y = L2 - L1 + (W2 - W1) * 0.5, B2 - B1 + (H2 - H1) * 0.5
-		end
-		return x / SCREEN_WIDTH, y / SCREEN_HEIGHT
-	end,
-
-	["HasMouseFocus"] = function(self)
-		return self[GetMouseFocus()]
-	end,
-
-	["HideTooltip"] = function(self, motion)
-		if not (motion and CONFIG_IS_OPEN and GetMouseFocus() == self) then
-			GameTooltip:Hide()
-			if self.tooltipScale then
-				GameTooltip:SetScale(self.tooltipScale)
-				self.tooltipScale = nil
-			end
-		end
-	end,
-
-	["Recycle"] = function(self)
-		if self.jostle then
-			LJ:Unregister(auxFrame[self])
-		end
-		stateDriver[self]:Recycle()
-		self:Hide()
-		self:AllChildren("Recycle")
-		PurgeQueue(self)
-		auxFrame[self]:EnableMouse(false)
-		auxFrame[self]:Hide()
-		tremove_byVal(addon, self)
-		_G[GetPanelName(self.id)] = nil
-		panels[self.id], stateDriver[self] = nil, nil
-		self[0], self = self[0], wipe(self)
-		recycled[#recycled + 1] = self
-	end,
-
-	["Refresh"] = function(self)
-		local settings = self.settings
-
-		local height, width = settings.height * SCREEN_HEIGHT, settings.width * SCREEN_WIDTH
-		self.anchor, self.size = settings.anchor, height
-
-		local level, strata = settings.level, strataLayers[settings.strata]
-		self:SetFrameStrata(strata)
-		self:SetFrameLevel(level)
-
-		local stateDriver = stateDriver[self]
-		if stateDriver:IsEnabled() then
-			auxFrame[self]:EnableMouse(not self:HasMouseFocus() and settings.alphaMouse)
-		end
-		stateDriver:SetParameters(settings.alphaParameters)
-		stateDriver()
-
-		local clamp, x, y = settings.screenClamp, self:GetOffset()
-		self:SetClampedToScreen(false)
-		self:SetClampRectInsets(clamp, -clamp, -clamp, clamp)
-		self:SetHeight(height)
-		self:SetWidth(width)
-		self:SetClampedToScreen(true)
-		self:SetOffset(x, y)
-
-		local fontSize, string = min(height * PHI, width / PHI / 10), auxString[self]
-		if fontSize < 1 then
-			fontSize = 1
-		elseif fontSize > 34 then
-			fontSize = 34
-		end
-		string:SetHeight(0)
-		string:SetWidth(0)
-		string:SetFont([[Fonts\FRIZQT__.TTF]], fontSize)
-		string:SetHeight(string:GetStringHeight())
-		string:SetWidth(min(width, string:GetStringWidth()))
-		self:AllChildren("Refresh")
-
-		local bgInset = settings.bgInset
-		backdrop.bgFile = LSM:Fetch('statusbar', settings.bgTexture)
-		backdrop.edgeFile = LSM:Fetch('border', settings.borderTexture) or LSM:Fetch('border', "None")
-		backdrop.edgeSize = settings.borderSize
-		for inset in pairs_iter, backdropInsets, nil do
-			backdropInsets[inset] = bgInset
-		end
-		self:SetBackdrop(backdrop)
-		self:SetBackdropColor(settings.bgColorR, settings.bgColorG, settings.bgColorB, settings.bgColorA)
-		self:SetBackdropBorderColor(settings.borderColorR, settings.borderColorG, settings.borderColorB, settings.borderColorA)
-
-		local overlay = overlayFrame[self]
-		overlay:SetTexture(LSM:Fetch('statusbar_overlay', settings.overlayTexture))
-		if settings.overlayFlip then
-			if settings.overlayFlop then
-				overlay:SetTexCoord(1, 0, 1, 0)
-			else
-				overlay:SetTexCoord(1, 0, 0, 1)
-			end
-		else
-			if settings.overlayFlop then
-				overlay:SetTexCoord(0, 1, 1, 0)
-			else
-				overlay:SetTexCoord(0, 1, 0, 1)
-			end
-		end
-		overlay:SetVertexColor(settings.overlayColorR, settings.overlayColorG, settings.overlayColorB, settings.overlayColorA)
-
-		for section in pairs_iter, sectionTypes, nil do
-			self:AnchorChildren(section)
-		end
-	end,
-
-	["SaveOffset"] = function(self)
-		local settings = self.settings
-		settings.offsetX, settings.offsetY = self:GetOffset()
-		if settings.moveBlizzard then
-			local region = self.anchor:sub(1, 1)
-			if region ~= 'T' and region ~= 'B' then
-				local _, y = self:GetCenter()
-				region = y < SCREEN_HEIGHT_MIDDLE and 'B' or 'T'
-			end
-			if region ~= self.jostle then
-				LJ[region == 'T' and 'RegisterTop' or 'RegisterBottom'](LJ, auxFrame[self])
-				self.jostle = region
-			else
-				LJ:Refresh()
-			end
-		elseif self.jostle then
-			LJ:Unregister(auxFrame[self])
-			self.jostle = nil
-		end
-	end,
-
-	['SetFrameLevel'] = function(self, value)
-		SetFrameLevel(self, value)
-		SetFrameLevel(auxFrame[self], value + 3)
-		self:AllChildren("SetFrameLevel", value + 1)
-	end,
-
-	['SetFrameStrata'] = function(self, value)
-		SetFrameStrata(self, value)
-		SetFrameStrata(auxFrame[self], value)
-		self:AllChildren("SetFrameStrata", value)
-	end,
-
-	["SetOffset"] = function(self, x, y)
-		self:ClearAllPoints()
-		self:SetPoint(self.anchor, UIParent, self.anchor, x * SCREEN_WIDTH, y * SCREEN_HEIGHT)
-		self:SaveOffset()
-	end,
-
-	["ShowTooltip"] = function(self, motion)
-		if self.unlocked or CONFIG_IS_OPEN then
-			local settings, tooltip = self.settings, GameTooltip
-			if not self.tooltipScale then															-- In case of multiple shows before a hide
-				self.tooltipScale = ConnectTooltip(self, tooltip, 0.8)
-			end
-			tooltip:SetText(addonName .. " - " .. (settings.alias or L["Panel"]), 1, 1, 1)
-			if self.unlocked then
-				tooltip:AddLine(L["Left click and hold to move this panel."])
-			end
-			if settings.rightClickConfig and (CONFIG_IS_OPEN ~= ConfigFrames[1] or PanelList.selection ~= self.id) then
-				tooltip:AddLine(L["Right click to change this panel's settings."])
-			end
-			tooltip:Show()
-		end
-	end,
-
-	["UpdateCenterWidth"] = function(self)
-		local center = self.Center
-		centerFrame[self]:SetWidth(center[#center]:GetRight() - center[1]:GetLeft() + 1)
-	end,
-
-	["UpdateOrder"] = function(self)
-		local settings = self.settings
-		local order = (#strataLayers - settings.strata) * 1000 + (127 - settings.level)
-		if self.order ~= order then
-			self.order = order
-			tremove_byVal(addon, self)
-			local insertPoint
-			for index = 1, #addon do
-				if order <= addon[index].order then
-					insertPoint = index
-					break
-				end
-			end
-			tinsert(addon, insertPoint or #addon + 1, self)
-		end
-	end,
-
--- WIP
-
-	["Lock"] = function(self)
-		if self.unlocked ~= false then
-			self.unlocked = false
-			auxFrame[self]:SetAlpha(0)
-			self:Unreveal()
-		end
-	end,
-
-	["Reveal"] = function(self)
-		if self.revealed == 0 then
-			self.revealed = 1
-			stateDriver[self]:Disable()
-			auxFrame[self]:EnableMouse(false)
-			self:SetAlpha(1)
-			self:Show()
-		else
-			self.revealed = self.revealed + 1
-		end
-	end,
-
-	["Unlock"] = function(self)
-		if self.unlocked ~= true then
-			self.unlocked = true
-			auxFrame[self]:SetAlpha(1)
-			self:Reveal()
-		end
-	end,
-
-	["Unreveal"] = function(self)
-		local revealed = self.revealed
-		if revealed == 1 and self.unlocked ~= true then
-			self.revealed = 0
-			stateDriver[self]:Enable()
-			auxFrame[self]:EnableMouse(self.settings.alphaMouse)
-		elseif revealed > 1 then
-			self.revealed = revealed - 1
-		end
-	end,
-
-	['EnableMouse'] = mt.__index.EnableMouse,
-	['Hide'] = mt.__index.Hide,
-	['SetAlpha'] = mt.__index.SetAlpha,
-	['Show'] = mt.__index.Show
-}
-
-mt = { __index = setmetatable(methods, mt), __metatable = addonName }
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function GetPanelName(id)
-	return addonName .. L["Panel"] .. "[" .. id .. "]"
-end
-
-function CreatePanel(id)
-	if not id then
-		id = GenerateUniqueKey()
-	end
-	local self = recycled[#recycled]
-	if self then
-		recycled[#recycled] = nil
-		self:SetClampedToScreen(false)
-		auxFrame[self]:Show()
-		self:Show()
-	else
-		self = CreateFrame('Frame', nil, UIParent)
-		self:EnableMouse(true)
-		self:SetMovable(true)
-		self:SetScript('OnEnter', methods.ShowTooltip)
-		self:SetScript('OnLeave', OnLeave)
-		self:SetScript('OnMouseDown', OnMouseDown)
-		self:SetScript('OnMouseUp', OnMouseUp)
-
-		local frame = CreateFrame('Frame', nil, UIParent)
-		frame:SetAllPoints(self)
-		frame:SetScript('OnEnter', OnEnter_AuxFrame)
-
-		local texture = frame:CreateTexture(nil, 'BACKGROUND')
-		texture:SetAllPoints()
-		texture:SetTexture([[Interface\BUTTONS\WHITE8X8]])
-		texture:SetVertexColor(0, 0.05, 1, 1 - PHI)
-
-		local string = frame:CreateFontString(nil, 'ARTWORK')
-		string:SetPoint('CENTER')
-		string:SetFont([[Fonts\FRIZQT__.TTF]], 12)
-		string:SetJustifyH('CENTER')
-		string:SetJustifyV('MIDDLE')
-		string:SetNonSpaceWrap(false)
-		string:SetShadowColor(0, 0, 0, 0.5)
-		string:SetShadowOffset(1, -1)
-		string:SetText(L["Unlocked"])
-		string:SetTextColor(0.85, 0.85, 0.85)
-
-		local overlay = self:CreateTexture(nil, 'OVERLAY')
-		overlay:SetAllPoints()
-
-		local center = CreateFrame('Frame', nil, self)
-		center:SetPoint('CENTER')
-		center:SetHeight(1)
-		center:SetWidth(1)
-
-		auxFrame[self], auxString[self], centerFrame[self], frame.parent, overlayFrame[self] = frame, string, center, self, overlay
-		setmetatable(self, mt)
-	end
-	panels[id], self.id, self.Center, self.Left, self.Right = self, id, { }, { }, { }
-
-	self:SetHeight(1)
-	self:SetWidth(1)
-
-	local driver = LibStub('LibStateDriver-1.1'):New()
-	driver:SetObject(self)
-	driver:SetCallback(UpdateAlpha)
-	stateDriver[self] = driver
-
-	local settings = GetPanelSettings(id)
-	self.anchor, self.settings = settings.anchor, settings
-	self:SetOffset(settings.offsetX, settings.offsetY)
-
-	self:UpdateOrder()
-	if settings.lockPanel then
-		self.revealed = 1
-		self:Lock()
-	else
-		self.revealed = 0
-		self:Unlock()
-	end
-	self:Refresh()
-	_G[GetPanelName(id)] = settings.allowGlobals and self or nil
-
-	local pluginSettings, children, name = settings.plugins
-	for section in pairs_iter, sectionTypes, nil do
-		children = settings[section]
-		for index = 1, #children do
-			name = children[index]
-			if dataObj[name] and pluginSettings[name].enable and not plugins[name] then
-				CreatePlugin(name, dataObj[name])
-			end
-		end
-	end
-
-	PanelList:Add(id)
-	return self
-end
diff --git a/Interface/AddOns/DockingStation/Plugins.lua b/Interface/AddOns/DockingStation/Plugins.lua
deleted file mode 100644
index bbf9661..0000000
--- a/Interface/AddOns/DockingStation/Plugins.lua
+++ /dev/null
@@ -1,524 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local pairs_iter, type = pairs(addon), type
-
-local mt = getmetatable(InterfaceOptionsFrameOkay)
-
-local EnableMouseWheel, SetScript = mt.__index.EnableMouseWheel, mt.__index.SetScript
-
-local LDB_UnregisterCallback = LDB_UnregisterCallback
-
-local dataObj, plugins, QueueMethod = dataObj, plugins, QueueMethod
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local components = { ['data source'] = { 'icon', 'label', 'text', 'value', 'suffix' }, ['launcher'] = { 'icon', 'label' } }
-local scriptHandlers = { OnClick = { }, OnEnter = { }, OnLeave = { }, OnMouseWheel = { }, OnReceiveDrag = { } }
-local recycled = { }
-
-local BUFFER_FACTOR = PHI * PHI * 0.1
-
-local function FixPluginLocation(children)
-	local plugin
-	for index = 1, #children do
-		plugin = plugins[children[index]]
-		if plugin then
-			plugin.index = index
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["AnchorChildren"] = function(self)
-		local child, settings, size = self[1], self.settings, self.size
-		local frame, offsetY, vertAdj = child, settings[child._field .. "VertAdj"] or 0
-		if offsetY ~= 0 then
-			offsetY = offsetY * (size - child.size) * 0.5
-		end
-		child:ClearAllPoints()
-		child:SetPoint('LEFT', self, 'LEFT', 0, offsetY)
-		local deltaZero = -offsetY
-		for index = 2, #self do
-			child = self[index]
-			vertAdj = settings[child._field .. "VertAdj"] or 0
-			if vertAdj == 0 then
-				offsetY = deltaZero
-			else
-				offsetY = vertAdj * (size - child.size) * 0.5 + deltaZero
-			end
-			child:ClearAllPoints()
-			child:SetPoint('LEFT', frame, 'RIGHT', (child.size + frame.size) * BUFFER_FACTOR, offsetY)
-			deltaZero, frame = deltaZero - offsetY, child
-		end
-	end,
-
-	['AttachFrame'] = function(self, frame)
-		if IsFrame(frame) then
-			if self.attached then
-				self:DetachFrame()
-			end
-			self.attached, self.attachedScale = frame, ConnectTooltip(self, frame, self.settings.tooltipScale)
-		end
-	end,
-
-	['DetachFrame'] = function(self)
-		local frame = self.attached
-		if frame then
-			self.attached = nil
-			if self.attachedScale then
-				safecall(frame.SetScale, frame, self.attachedScale)
-				self.attachedScale = nil
-			end
-			safecall(frame.ClearAllPoints, frame)
-		end
-	end,
-
-	['EnableMouseWheel'] = DoNothing,
-
-	['GetName'] = function(self)
-		return self:GetParent():GetName()
-	end,
-
-	['GetScript'] = function(self, script)														-- Stop plugins from directly hooking in and bypassing settings
-		if scriptHandlers[script] then
-			return scriptHandlers[script][self]
-		end
-	end,
-
-	["Recycle"] = function(self)
-		local name, panel = self.name, self.panel
-		self:Hide()
-		for index = #self, 1, -1 do
-			self[index]:Recycle()
-		end
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_icon')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_label')
-		if pluginType[name] == 'data source' then
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_suffix')
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_text')
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_value')
-		end
-		if panel and tremove_byVal(panel[self.section], self) then
-			panel:AnchorChildren(self.section)
-			panel[self] = nil
-		end
-		PurgeQueue(self)
-		plugins[name] = nil
-		self[0], self = self[0], wipe(self)
-		recycled[#recycled + 1] = self
-	end,
-
-	["Refresh"] = function(self)
-		self.size = self.panel.size
-		self:SetHeight(self.size)
-		self:UpdateChildren()
-	end,
-
-	['SetScript'] = function(self, script, handler)											-- Stop plugins from directly hooking in and bypassing settings
-		if scriptHandlers[script] and (type(handler) == 'function' or handler == nil) then
-			scriptHandlers[script][self] = handler
-			if script ~= 'OnMouseWheel' then return end
-			EnableMouseWheel(self, handler)
-		end
-	end,
-
-	["SetState"] = function(self)
-		local id, section, index = GetPluginLocation(self.name)
-		SetInheritance(self.name, id)
-		local panel = panels[id]
-		if panel then
-			if self.settings.enable then
-				self.panel, self.section, self.index = panel, section, index
-
-				local children = panel[section]
-				tremove_byVal(children, self)
-				self:SetParent(panel)
-				self:SetFrameStrata(panel:GetFrameStrata())
-				self:SetFrameLevel(panel:GetFrameLevel() + 1)
-
-				local insertPoint
-				for i = 1, #children do
-					if index <= children[i].index then
-						insertPoint = i
-						break
-					end
-				end
-				tinsert(children, insertPoint or #children + 1, self)
-				panel:AnchorChildren(section)
-				panel[self] = true
-				self:Refresh()
-				self:Show()
-				return
-			end
-		elseif not id then
-			self.settings.enable = false
-		end
-		self:Recycle()
-	end,
-
-	["UpdateChildren"] = function(self)
-		local count, name, settings = 0, self.name, self.settings
-		local type = pluginType[name]
-		local components = components[type]
-		for index = #self, 1, -1 do
-			self[index]:Recycle()
-			self[index] = nil
-		end
-		for index = 1, #components do
-			LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. components[index])
-		end
-		if type == 'data source' then
-			if not settings.textHide then
-				if CreateFontString('value', self, 'text') then
-					if not settings.suffixHide then
-						CreateFontString('suffix', self)
-					end
-				else
-					CreateFontString('text', self)
-				end
-			end
-		end
-		if not settings.iconHide then
-			CreateTexture('icon', self)
-		end
-		if not settings.labelHide then
-			CreateFontString('label', self)
-		end
-		for index = 1, #components do
-			if self[components[index]] then
-				count = count + 1
-				self[count] = self[components[index]]
-			end
-		end
-		if count > 1 then
-			if self.icon and settings.iconFlip then
-				self[count] = tremove(self, 1)
-			end
-		elseif count == 0 then
-			self[1] = CreateFontString('label', self)
-		end
-		self:AnchorChildren()
-	end,
-
-	["UpdateWidth"] = function(self)
-		self:SetWidth(self[#self]:GetRight() - self[1]:GetLeft() + 1)
-		if self.section == "Center" and not self.moving then
-			QueueMethod(self.panel, "UpdateCenterWidth")
-		end
-	end,
-
-	['GetLeft'] = mt.__index.GetLeft,
-	['GetRight'] = mt.__index.GetRight
-}
-
-mt = { __index = setmetatable(methods, mt), __metatable = addonName }
-
---[[-----------------------------------------------------------------------------
-Tooltip visibility support
--------------------------------------------------------------------------------]]
-local OnEnter, OnLeave
-do
-	local tooltipDriver = LibStub('LibStateDriver-1.1'):New()
-
-	local function HideTooltip(self, motion)
-		local data = dataObj[self.name]
-		tooltipDriver.shown = nil
-		if data.tooltip then
-			local tooltip = data.tooltip
-			self:DetachFrame(tooltip)
-			safecall(tooltip.Hide, tooltip)
-		else
-			local handler = scriptHandlers.OnLeave[self] or data.OnLeave
-			if type(handler) == 'function' then
-				safecall(handler, self, motion)
-			else
-				self:DetachFrame(GameTooltip)
-				GameTooltip:Hide()
-			end
-		end
-	end
-
-	tooltipDriver:SetCallback(function(self, state)
-		local data = dataObj[self.name]
-		if hideConditions[state] then
-			if tooltipDriver.shown then
-				HideTooltip(self)
-			end
-		elseif not tooltipDriver.shown then														-- ShowTooltip: tooltip > OnEnter > OnTooltipShow > tooltiptext
-			tooltipDriver.shown = true
-			local tooltip = data.tooltip
-			if tooltip then
-				self:AttachFrame(tooltip)
-				safecall(tooltip.Show, tooltip)
-			else
-				local handler = scriptHandlers.OnEnter[self] or data.OnEnter
-				if type(handler) == 'function' then
-					safecall(handler, self)
-				else
-					tooltip = GameTooltip
-					self:AttachFrame(tooltip)
-					if type(data.OnTooltipShow) == 'function' then
-						safecall(data.OnTooltipShow, tooltip)
-					else
-						tooltip:SetText(pluginAlias[self.name] or strtrim(self.name), 1, 1, 1)
-						if data.keybind then
-							local keyBind = pcall(GetBindingKey, data.keybind)
-							if keyBind then
-								tooltip:AppendText(("%s (%s)|r"):format(NORMAL_FONT_COLOR_CODE, keyBind))
-							end
-						end
-						if data.tooltiptext then
-							tooltip:AddLine(data.tooltiptext, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
-						end
-					end
-					tooltip:Show()
-				end
-			end
-		end
-	end)
-
-	function OnEnter(self)
-		tooltipDriver:SetObject(self)
-		tooltipDriver:SetParameters(self.settings.tooltipParameters)
-		tooltipDriver:Enable()
-	end
-
-	function OnLeave(self, motion)
-		tooltipDriver:Disable()
-		HideTooltip(self, motion)
-		if not self.drag then
-			local panel = self.panel
-			if panel.settings.alphaMouse and not panel:HasMouseFocus() then
-				panel:Unreveal()
-			end
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Drag-and-drop support
--------------------------------------------------------------------------------]]
-local function ActiveIndexToRealIndex(panel, section, activeIndex)
-	local activeCount, lastActive, settings, plugin = 0, 0, panel.settings[section]
-	for realIndex = 1, #settings do
-		plugin = plugins[settings[realIndex]]
-		if plugin then
-			activeCount, lastActive = activeCount + 1, realIndex
-			if activeCount == activeIndex then
-				return panel.id, section, realIndex
-			end
-		end
-	end
-	return panel.id, section, lastActive + 1
-end
-
-local function GetActiveIndex(panel, section, x, y, reversed)
-	local children = panel[section]
-	if not reversed then
-		for index = 1, #children do
-			if x <= children[index]:GetCenter() then
-				return ActiveIndexToRealIndex(panel, section, index)
-			end
-		end
-	else
-		for index = 1, #children do
-			if x > children[index]:GetCenter() then
-				return ActiveIndexToRealIndex(panel, section, index)
-			end
-		end
-	end
-	return ActiveIndexToRealIndex(panel, section, #children + 1)
-end
-
-local function GetLocation(self)
-	local x, y, bottom, height, left, panel, width = self:GetCenter()
-	for index = 1, #addon do
-		panel = addon[index]
-		left, bottom, width, height = panel:GetRect()
-		if y >= bottom and left <= x and bottom + height >= y and x <= left + width then
-			local Center, Left, Right = panel.Center, panel.Left, panel.Right
-			if x < ((Left[1] and Left[#Left]:GetRight() or left) + (Center[1] and Center[1]:GetLeft() or left + width * 0.5)) * 0.5 then
-				return GetActiveIndex(panel, "Left", x, y)
-			elseif x < ((Center[1] and Center[#Center]:GetRight() or left + width * 0.5) + (Right[1] and Right[#Right]:GetLeft() or left + width)) * 0.5 then
-				return GetActiveIndex(panel, "Center", x, y)
-			else
-				return GetActiveIndex(panel, "Right", x, y, true)
-			end
-		end
-	end
-	return self.panel.id, self.section, self.index
-end
-
-local function OnDragStart(self)
-	if self.drag then
-		SetScript(self, 'OnEnter', nil)
-		OnLeave(self)
-
---		if not dataObj[self.name].group then
-			AllPanels("Reveal")
---		end
-
-		local x, y = self:GetCenter()
-		self:ClearAllPoints()
-		self:SetPoint('CENTER', UIParent, 'BOTTOMLEFT', x, y)
-
-		VoidPluginLocation(self.name)
-
-		local hClamp, vClamp = (self:GetWidth() - 1) / 2, (self.size - 1) / 2
-		self:SetClampedToScreen(true)
-		self:SetClampRectInsets(hClamp, -hClamp, -vClamp, vClamp)
-		self:SetFrameStrata('TOOLTIP')
-		self:StartMoving()
-		self.moving = true
-	end
-end
-
-local function OnDragStop(self)
-	if self.drag then
-		self:StopMovingOrSizing()
-		self:SetClampedToScreen(false)
-		self.moving = nil
-
-		local panel = self.panel
-		SetPluginLocation(self.name, GetLocation(self))
-
---		if not dataObj[self.name].group then
-			AllPanels("Unreveal")
---		end
-		self.drag = nil
-
-		if panel.settings.alphaMouse and not panel:HasMouseFocus() then
-			panel:Unreveal()
-		end
-		SetScript(self, 'OnEnter', OnEnter)
-		if GetMouseFocus() == self then
-			OnEnter(self)
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function OnClick(self, button, down, ...)
-	if button == 'LeftButton' then
-		if down then
-			if not self.settings.lockPlugin then
-				self.drag = true
-			end
-			return
-		elseif self.drag then
-			self.drag = nil
-		end
-	end
-	local handler = scriptHandlers.OnClick[self] or dataObj[self.name].OnClick
-	if type(handler) == 'function' then
-		safecall(handler, self, button, down, ...)
-	end
-end
-
-local function OnMouseWheel(self, ...)
-	local handler = scriptHandlers.OnMouseWheel[self] or dataObj[self.name].OnMouseWheel
-	if type(handler) == 'function' then
-		safecall(handler, self, ...)
-	end
-end
-
-local function OnReceiveDrag(self, ...)
-	local handler = scriptHandlers.OnReceiveDrag[self] or dataObj[self.name].OnReceiveDrag
-	if type(handler) == 'function' then
-		safecall(handler, self, ...)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function GetPluginLocation(name)
-	local children
-	for id, settings in pairs_iter, settings.panels, nil do
-		for section in pairs_iter, sectionTypes, nil do
-			children = settings[section]
-			for index = 1, #children do
-				if children[index] == name then
-					return id, section, index
-				end
-			end
-		end
-	end
-end
-
-function SetPluginLocation(name, id, section, index)
-	VoidPluginLocation(name)
-	if not id then
-		id = settings.defaultPanel
-	end
-	local children = settings.panels[id][section or settings.defaultSection]
-	if not index or index > #children then
-		index = #children + 1
-	end
-	tinsert(children, index, name)
-	if panels[id] then
-		FixPluginLocation(children)
-	end
-	if plugins[name] then
-		plugins[name]:SetState()
-	else
-		SetInheritance(name, id)
-	end
-	UpdateConfig(nil, true)
-end
-
-function VoidPluginLocation(name)
-	local id, section, index = GetPluginLocation(name)
-	if id then
-		local children = settings.panels[id][section]
-		tremove(children, index)
-		local panel = panels[id]
-		if panel then
-			local plugin = plugins[name]
-			if plugin and tremove_byVal(panel[section], plugin) then
-				panel:AnchorChildren(section)
-				panel[plugin] = nil
-			end
-			FixPluginLocation(children)
-		end
-	end
-end
-
-function CreatePlugin(name)
-	local self = recycled[#recycled]
-	if self then
-		recycled[#recycled] = nil
-		self:Show()
-	else
-		self = CreateFrame('Button', nil, UIParent)											-- Need the 'OnClick' handler (fix for CastSpellByName)
-		self:EnableMouse(true)
-		self:SetMovable(true)
-		self:RegisterForClicks('AnyUp', 'LeftButtonDown')
-		self:RegisterForDrag('LeftButton')
-		self:SetScript('OnClick', OnClick)
-		self:SetScript('OnDragStart', OnDragStart)
-		self:SetScript('OnDragStop', OnDragStop)
-		self:SetScript('OnEnter', OnEnter)
-		self:SetScript('OnLeave', OnLeave)
-		self:SetScript('OnMouseWheel', OnMouseWheel)
-		self:SetScript('OnReceiveDrag', OnReceiveDrag)
-		setmetatable(self, mt)
-	end
-	plugins[name], self.name = self, name
-
-	self:SetHeight(1)
-	self:SetWidth(1)
-	self.size = 1
-
-	self.settings = GetPluginSettings(name)
-	self:SetState()
-	PluginList:Add(name)
-	return self
-end
diff --git a/Interface/AddOns/DockingStation/Settings.lua b/Interface/AddOns/DockingStation/Settings.lua
deleted file mode 100644
index 0b0eda7..0000000
--- a/Interface/AddOns/DockingStation/Settings.lua
+++ /dev/null
@@ -1,255 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local pairs_iter = pairs(addon)
-
---[[-----------------------------------------------------------------------------
-Local to module
--------------------------------------------------------------------------------]]
-local CheckStringDefaults
-do
-	local default = { "labelColorA", "labelColorB", "labelColorG", "labelColorR", "labelEffect", "labelFont", "labelOverride", "labelSize", "labelVertAdj" }
-	local watched = {
-		suffixColorA	= -1,		textColorA		= 1,
-		suffixColorB	= -2,		textColorB		= 2,
-		suffixColorG	= -3,		textColorG		= 3,
-		suffixColorR	= -4,		textColorR		= 4,
-		suffixEffect	= -5,		textEffect		= 5,
-		suffixFont		= -6,		textFont			= 6,
-		suffixOverride	= -7,		textOverride	= 7,
-		suffixSize		= -8,		textSize			= 8,
-		suffixVertAdj	= -9,		textVertAdj		= 9
-	}
-	CheckStringDefaults = function(self, key)
-		key = watched[key]
-		if key then
-			if key > 0 then
-				if self["textUseLabel"] then
-					return self[default[key]]
-				end
-			else
-				if self["suffixUseLabel"] then
-					return self[default[-key]]
-				end
-			end
-		end
-	end
-end
-
-local DEFAULT_SETTINGS = {
-	allowGlobals		= false,
-	alphaMouse			= false,
-	alphaNormal			= 1,
-	alphaParameters	= "",
-	anchor				= 'CENTER',
-	bgColorA				= 1,
-	bgColorB				= 0,
-	bgColorG				= 0,
-	bgColorR				= 0,
-	bgInset				= 0,
-	bgTexture			= 'Solid',
-	borderColorA		= 1,
-	borderColorB		= 0.85,
-	borderColorG		= 0.85,
-	borderColorR		= 0.85,
-	borderSize			= 11,
-	borderTexture		= 'None',
-	defaultPanel		= false,
-	defaultSection		= "Left",
-	height				= 20 / 768,
-	hideErrors			= true,
-	iconFlip				= false,
-	iconHide				= false,
-	iconSize				= 0.85,
-	iconTrim				= true,
-	iconVertAdj			= 0,
-	iconZoom				= 0,
-	labelColorA			= 1,
-	labelColorB			= 1,
-	labelColorG			= 1,
-	labelColorR			= 1,
-	labelEffect			= 0,
-	labelFont			= 'Friz Quadrata TT',
-	labelHide			= false,
-	labelOverride		= false,
-	labelSize			= 0.55,
-	labelUseName		= false,
-	labelVertAdj		= 0,
-	level					= 32,
-	lockPanel			= true,
-	lockPlugin			= false,
-	moveBlizzard		= false,
-	overlayColorA		= 1,
-	overlayColorB		= 1,
-	overlayColorG		= 1,
-	overlayColorR		= 1,
-	overlayFlip			= false,
-	overlayFlop			= false,
-	overlayTexture		= "None",
-	rightClickConfig	= true,
-	scaleSideBar		= 0.85,
-	screenClamp			= 0,
-	spacingCenter		= 0.5,
-	spacingLeft			= 0.5,
-	spacingLeftEdge	= 0.25,
-	spacingRight		= 0.5,
-	spacingRightEdge	= 0.25,
-	strata				= 4,
-	suffixColorA		= 1,
-	suffixColorB		= 1,
-	suffixColorG		= 1,
-	suffixColorR		= 1,
-	suffixEffect		= 0,
-	suffixFont			= 'Friz Quadrata TT',
-	suffixHide			= false,
-	suffixOverride		= false,
-	suffixSize			= 0.55,
-	suffixUseLabel		= true,
-	suffixVertAdj		= 0,
-	textColorA			= 1,
-	textColorB			= 1,
-	textColorG			= 1,
-	textColorR			= 1,
-	textEffect			= 0,
-	textFixed			= false,
-	textFont				= 'Friz Quadrata TT',
-	textHide				= false,
-	textOverride		= false,
-	textSize				= 0.55,
-	textUseLabel		= true,
-	textVertAdj			= 0,
-	tooltipParameters	= "",
-	tooltipScale		= 0.8,
-	width					= 1
-}
-
-local function GetDefaultPanelSettings()
-	return {
-		enable = true,
-		lockPanel = false,
-		offsetX = 0,
-		offsetY = 0,
-		Center = { },
-		Left = { },
-		Right = { }
-	}
-end
-
-local function GetDefaultPluginSettings()
-	return {
-		enable = false
-	}
-end
-
-local function GetSettingsMT(defaults)
-	return { __index = function(value, index)
-		value = CheckStringDefaults(value, index)
-		if value == nil then
-			return defaults[index]
-		end
-		return value
-	end }
-end
-
-local mt_defaults, mt_panels, mt_settings = GetSettingsMT(DEFAULT_SETTINGS), { }
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function GetSettings()
-	settings = setmetatable(addon.db.profile, mt_defaults)
-	mt_panels, mt_settings = wipe(mt_panels), GetSettingsMT(settings)
-	if not sectionTypes[settings.defaultSection] then
-		settings.defaultSection = nil
-	end
-
-	local panels = GetSubTable(settings, "panels")
-	if not next(panels) then
-		local id = GenerateUniqueKey()
-		panels[id] = GetDefaultPanelSettings()
-		panels[id][settings.defaultSection][1] = addonName
-		settings.defaultPanel = id
-	elseif not panels[settings.defaultPanel] then
-		settings.defaultPanel = next(panels)
-	end
-	for id in pairs_iter, panels, nil do
-		GetPanelSettings(id)
-	end
-
-	local plugins = GetSubTable(settings, "plugins")
-	if not plugins[addonName] then
-		plugins[addonName] = GetDefaultPluginSettings()
-		plugins[addonName].enable = true
-	end
-	for name in pairs_iter, plugins, nil do
-		GetPluginSettings(name)
-	end
-
-	return settings
-end
-
-function GetPanelSettings(id)
-	if not settings.panels[id] then
-		settings.panels[id] = GetDefaultPanelSettings()
-	end
-	return setmetatable(settings.panels[id], mt_settings)
-end
-
-function GetPluginSettings(name)
-	if not settings.plugins[name] then
-		settings.plugins[name] = GetDefaultPluginSettings()
-	end
-	return SetInheritance(name, GetPluginLocation(name))
-end
-
-function SetInheritance(name, id)
-	if id then
-		if not mt_panels[id] then
-			mt_panels[id] = GetSettingsMT(settings.panels[id])
-		end
-		return setmetatable(settings.plugins[name], mt_panels[id])
-	else
-		return setmetatable(settings.plugins[name], mt_settings)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Initialize on load
--------------------------------------------------------------------------------]]
-addon:RegisterEvent('ADDON_LOADED', function(_, name)
-	if name ~= addonName then return end
-	addon:UnregisterEvent('ADDON_LOADED')
-
-	local settings = GetSubTable(_G, addonName .. "Settings")
-	pluginAlias = GetSubTable(settings, "pluginAlias")
-	pluginType = GetSubTable(settings, "pluginType")
-	GetSubTable(settings, 'profileKeys')
-	GetSubTable(settings, 'profiles')
-
-	if addon.Convert then																			-- Convert.lua may be deleted after it has run once
-		Convert(settings)
-		Convert = nil
-	end
-	addon.db = LibStub('AceDB-3.0'):New(addonName .. "Settings", nil, 'Default')
-end)
-
---[[-----------------------------------------------------------------------------
-Clean up on log out
--------------------------------------------------------------------------------]]
-addon:RegisterEvent('PLAYER_LOGOUT', function()
-	local remove = { }
-	for name in pairs_iter, pluginType, nil do
-		remove[name] = true
-	end
-	for _, settings in pairs_iter, _G[addonName .. "Settings"].profiles, nil do
-		settings = settings.plugins
-		for name in pairs_iter, remove, nil do
-			if settings[name] then
-				remove[name] = nil
-			end
-		end
-	end
-	for name in pairs_iter, remove, nil do
-		pluginAlias[name], pluginType[name] = nil, nil
-	end
-end)
diff --git a/Interface/AddOns/DockingStation/Textures.lua b/Interface/AddOns/DockingStation/Textures.lua
deleted file mode 100644
index c8399bb..0000000
--- a/Interface/AddOns/DockingStation/Textures.lua
+++ /dev/null
@@ -1,185 +0,0 @@
-local addonName, addon = ...
-setfenv(1, addon)
-
-local tonumber, type = tonumber, type
-
-local mt = getmetatable(InterfaceOptionsFrameHeader)
-
-local LDB_RegisterCallback, LDB_UnregisterCallback = LDB_RegisterCallback, LDB_UnregisterCallback
-
-local plugins, QueueMethod = plugins, QueueMethod
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local fields, recycled = { }, { }
-
-local proxy = UIParent:CreateTexture(nil, 'ARTWORK')
-proxy:Hide()
-
-local function topercent(value, default)
-	value = tonumber(value) or default
-	if value >= 1 then
-		return 1
-	elseif value <= 0 then
-		return 0
-	end
-	return value
-end
-
-local function DetectTexture(_, name, field, value, data)
-	if type(value) == 'string' then
-		PurgeQueue(plugins[name], "UpdateWidth")
-		QueueMethod(plugins[name], "UpdateChildren")
-	end
-end
-
-local function UpdateColors(_, name, field, value, data)
-	QueueMethod(plugins[name][fields[field]], "RefreshColors")
-end
-
-local function UpdateCoords(_, name, field, value, data)
-	field = fields[field]
-	local self = plugins[name][field]
-	local zoom = self.settings[field .. "Zoom"]
-	if type(value) == 'table' then
-		if #value == 4 then
-			local L, R, T, B = topercent(value[1], 0), topercent(value[2], 1), topercent(value[3], 0), topercent(value[4], 1)
-			local zX, zY = (R - L) * zoom, (B - T) * zoom
-			self:SetTexCoord(L + zX, R - zX, T + zY, B - zY)
-		else
-			local ULx, ULy, LLx, LLy, URx, URy, LRx, LRy = topercent(value[1], 0), topercent(value[2], 0), topercent(value[3], 0), topercent(value[4], 1), topercent(value[5], 1), topercent(value[6], 0), topercent(value[7], 1), topercent(value[8], 1)
-			local zXT, zXB, zYL, zYR = (URx - ULx) * zoom, (LRx - LLx) * zoom, (LLy - ULy) * zoom, (LRy - URy) * zoom
-			self:SetTexCoord(ULx + zXT, ULy + zYL, LLx + zXB, LLy - zYL, URx - zXT, URy + zYR, LRx - zXB, LRy - zYR)
-		end
-	elseif self.blizIcon and self.settings[field .. "Trim"] then
-		zoom = zoom * 0.86
-		self:SetTexCoord(0.07 + zoom, 0.93 - zoom, 0.07 + zoom, 0.93 - zoom)
-	else
-		self:SetTexCoord(zoom, 1 - zoom, zoom, 1 - zoom)
-	end
-end
-
-local function UpdateRatio(_, name, field, value, data)
-	field = fields[field]
-	local plugin = plugins[name]
-	local self = plugin[field]
-	self.size = self.settings[field .. "Size"] * plugin.size
-	value = tonumber(value) or 1
-	if value >= 1 then
-		self:SetWidth(self.size)
-	elseif value <= 0.2 then
-		self:SetWidth(self.size * 0.2)
-	else
-		self:SetWidth(self.size * value)
-	end
-	self:SetHeight(self.size)
-	QueueMethod(plugin, "UpdateWidth")
-end
-
-local function UpdateTexture(_, name, field, value, data)
-	local self = plugins[name][field]
-	if type(value) == 'string' and self:SetTexture(value) then
-		self.blizIcon = value:find([[^[Ii][Nn][Tt][Ee][Rr][Ff][Aa][Cc][Ee]\[Ii][Cc][Oo][Nn][Ss]\.+$]])
-		UpdateCoords(nil, name, field, data[field .. 'Coords'], data)
-	else
-		PurgeQueue(self.plugin, "UpdateWidth")
-		QueueMethod(self.plugin, "UpdateChildren")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["Recycle"] = function(self)
-		local field, name = self.field, self.plugin.name
-		self:Hide()
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field)
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'B')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'Coords')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'G')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'R')
-		LDB_UnregisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'Ratio')
-		plugins[name][field] = nil
-		PurgeQueue(self)
-		self[0], self = self[0], wipe(self)
-		recycled[#recycled + 1] = self
-	end,
-
-	["Refresh"] = function(self)
-		local field, name = self.field, self.plugin.name
-		local data = dataObj[name]
-		UpdateRatio(nil, name, field, data[field .. 'Ratio'], data)
-		UpdateTexture(nil, name, field, data[field], data)									-- Also updates coords
-		self:RefreshColors()
-	end,
-
-	["RefreshColors"] = function(self)
-		local data, field = dataObj[self.plugin.name], self.field
-		local blue, green, red = data[field .. 'B'], data[field .. 'G'], data[field .. 'R']
-		if blue or green or red then
-			self:SetVertexColor(topercent(red, 0), topercent(green, 0), topercent(blue, 0))
-		else
-			self:SetVertexColor(1, 1, 1)
-		end
-	end,
-
-	['GetLeft'] = mt.__index.GetLeft,
-	['GetRight'] = mt.__index.GetRight,
-	['SetHeight'] = mt.__index.SetHeight,
-	['SetTexCoord'] = mt.__index.SetTexCoord,
-	['SetTexture'] = mt.__index.SetTexture,
-	['SetVertexColor'] = mt.__index.SetVertexColor,
-	['SetWidth'] = mt.__index.SetWidth
-}
-
-mt = { __index = setmetatable(methods, mt), __metatable = addonName }
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function CreateTexture(field, plugin)
-	local name = plugin.name
-
-	local value = dataObj[name][field]
-	if type(value) ~= 'string' or not proxy:SetTexture(value) then
-		LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field, DetectTexture)
-		return
-	end
-
-	local self = recycled[#recycled]
-	if self then
-		recycled[#recycled] = nil
-		self:SetParent(plugin)
-		self:ClearAllPoints()
-		self:Show()
-	else
-		self = plugin:CreateTexture(nil, 'ARTWORK')
-		setmetatable(self, mt)
-	end
-	plugin[field], self.field, self.plugin, self.settings = self, field, plugin, plugin.settings
-	self._field = field
-
-	self:SetHeight(1)
-	self:SetWidth(1)
-	self.size = 1
-
-	if not fields[field] then
-		fields[field] = field
-		fields[field .. 'B'] = field
-		fields[field .. 'Coords'] = field
-		fields[field .. 'G'] = field
-		fields[field .. 'R'] = field
-		fields[field .. 'Ratio'] = field
-	end
-
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field, UpdateTexture)
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'B', UpdateColors)
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'Coords', UpdateCoords)
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'G', UpdateColors)
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'R', UpdateColors)
-	LDB_RegisterCallback(addon, 'LibDataBroker_AttributeChanged_' .. name .. '_' .. field .. 'Ratio', UpdateRatio)
-	self:Refresh()
-	return self
-end
diff --git a/Interface/AddOns/DockingStation_Config/Core.lua b/Interface/AddOns/DockingStation_Config/Core.lua
deleted file mode 100644
index 395cd1a..0000000
--- a/Interface/AddOns/DockingStation_Config/Core.lua
+++ /dev/null
@@ -1,1147 +0,0 @@
-if not _G[...] then return end
-local addon = _G[...]
-local addonName = addon.addonName
-setfenv(1, addon)
-
-local max, min, pairs_iter, rawget = max, min, pairs(addon), rawget
-
-local L = L
-
---[[-----------------------------------------------------------------------------
-Helpers
--------------------------------------------------------------------------------]]
-local MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH = RESOLUTION_HEIGHT / 16, RESOLUTION_WIDTH, RESOLUTION_HEIGHT / 64, RESOLUTION_WIDTH / 64
-local panels, plugins, PanelList, PluginList = panels, plugins, PanelList, PluginList
-local panelIDs, panelList = { }, { }
-
-function update_panel_list()																		-- Global to addon for use in SideBarMenu
-	wipe(panelIDs)
-	wipe(panelList)
-	for index = 1, #PanelList do
-		panelIDs[index], panelList[index] = PanelList[index].key, PanelList[index].label
-	end
-end
-update_panel_list()
-
---[[-----------------------------------------------------------------------------
-Common for all options
--------------------------------------------------------------------------------]]
-local _branch, _object, _selection, _settings												-- Set via UpdateConfigVariables()
-
-local function DisableIfDefault(info)
-	return info.type ~= 'group' and rawget(_settings, info[#info]) == nil
-end
-
-local function DisableIfDefaultColor(info)
-	return rawget(_settings, info[#info] .. "R") == nil
-end
-
-local function Get(info)
-	return _settings[info[#info]]
-end
-
-local function GetColor(info)
-	local field = info[#info]
-	return _settings[field .. "R"], _settings[field .. "G"], _settings[field .. "B"], _settings[field .. "A"]
-end
-
-local function GetDefaultStatus(info)
-	if info.arg[1] ~= true then
-		return rawget(_settings, info.arg[1]) == nil
-	else
-		return rawget(_settings, info[#info - 1] .. info.arg[2]) == nil
-	end
-end
-
-local function GetTriState(info)
-	if _branch then
-		return _settings[info[#info]] or false
-	end
-	local field, set, unset = info[#info]
-	for _, settings in pairs_iter, settings.panels, nil do
-		if settings[field] then
-			if unset then return end
-			set = true
-		else
-			if set then return end
-			unset = true
-		end
-	end
-	return set and true or false
-end
-
-local function HideDualPosition(info)
-	return #info == 1
-end
-
-local function IsLauncher()
-	return _branch == "Plugins" and pluginType[_selection] == 'launcher'
-end
-
-local function MassClear(info, fields)
-	if fields[1] ~= true then
-		for index = 1, #fields do
-			_settings[fields[index]] = nil
-		end
-	else
-		local category = info[#info - 1]
-		for index = 2, #fields do
-			_settings[category .. fields[index]] = nil
-		end
-	end
-end
-
-local function MassLoad(info, fields)
-	if fields[1] ~= true then
-		for index = 1, #fields do
-			_settings[fields[index]] = _settings[fields[index]]
-		end
-	else
-		local category, field = info[#info - 1]
-		for index = 2, #fields do
-			field = category .. fields[index]
-			_settings[field] = _settings[field]
-		end
-	end
-end
-
-local function RefreshSettings()
-	if _branch then
-		if _object then
-			_object:Refresh()
-		end
-	else
-		AllPanels("Refresh")
-	end
-end
-
-local function Set(info, value)
-	if not info.arg then
-		_settings[info[#info]] = value or false
-		if not _branch and info.option.tristate then
-			local field = info[#info]
-			for _, settings in pairs_iter, settings.panels, nil do
-				settings[field] = nil
-			end
-		end
-	elseif value then
-		MassClear(info, info.arg)
-	else
-		MassLoad(info, info.arg)
-	end
-end
-
-local function SetColor(info, red, green, blue, alpha)
-	local field = info[#info]
-	_settings[field .. "R"], _settings[field .. "G"], _settings[field .. "B"], _settings[field .. "A"] = red, green, blue, alpha
-	RefreshSettings()
-end
-
-local function SetWithRefresh(info, value)
-	Set(info, value)
-	RefreshSettings()
-end
-
---[[-----------------------------------------------------------------------------
-String Options
--------------------------------------------------------------------------------]]
-local baseArg = { true, "Hide", "Fixed", "UseLabel", "UseName" }
-local sharedArg = { true, "ColorA", "ColorB", "ColorG", "ColorR", "Effect", "Font", "Override", "Size", "VertAdj" }
-
-local function DisableIfDefaultString(info)
-	return info.type ~= 'group' and rawget(_settings, info[#info - 1] .. info[#info]) == nil
-end
-
-local function GetString(info)
-	return _settings[info[#info - 1] .. info[#info]]
-end
-
-local function SetString(info, value)
-	_settings[info[#info - 1] .. info[#info]] = value
-	RefreshSettings()
-end
-
-local stringArgs = {
-	defaults = {
-		type = 'toggle',
-		order = 1,
-		name = L["Defaults"],
-		desc = L["Use defaults for these settings."],
-		width = 'half',
-		disabled = false,
-		arg = baseArg,
-		get = GetDefaultStatus,
-		set = function(info, value)
-			if value then
-				MassClear(info, baseArg)
-				MassClear(info, sharedArg)
-			else
-				MassLoad(info, baseArg)
-				if not _settings[info[#info - 1] .. "UseLabel"] then
-					MassLoad(info, sharedArg)
-				end
-			end
-			RefreshSettings()
-		end
-	},
-	Hide = {
-		type = 'toggle',
-		order = 2,
-		name = L["Hide"],
-		desc = L["Determines if this component should be hidden."],
-		width = 'half'
-	},
-	UseLabel = {
-		type = 'toggle',
-		order = 3,
-		name = L["Same as Label"],
-		desc = L["Use the same settings as for the label."],
-		hidden = function(info)
-			return info[#info - 1] == 'label'
-		end,
-		set = function(info, value)
-			if value then
-				MassClear(info, sharedArg)
-			else
-				MassLoad(info, sharedArg)
-			end
-			_settings[info[#info - 1] .. "UseLabel"] = value
-			RefreshSettings()
-		end
-	},
-	UseName = {
-		type = 'toggle',
-		order = 3.5,
-		name = L["Use Name"],
-		desc = L["Determines if the name of the plugin, as it appears in the selection window, should replace any provided label."],
-		hidden = function(info)
-			return info[#info - 1] ~= 'label'
-		end
-	},
-	Font = {
-		type = 'select', control = 'LSM30_Font',
-		order = 4,
-		name = L["Font"],
-		desc = L["Choose a font to use."],
-		values = AceGUIWidgetLSMlists.font
-	},
-	Effect = {
-		type = 'select',
-		order = 5,
-		name = L["Effect"],
-		desc = L["Choose an effect to apply to the font."],
-		values = { [0] = L["None"], [1] = L["Outline"], [2] = L["Outline, Thick"], [3] = L["Shadow"], [4] = L["Shadow, Distinct"] }
-	},
-	Size = {
-		type = 'range', isPercent = true,
-		order = 6,
-		name = L["Size"],
-		desc = L["Set the size of the font."],
-		min = 0.2, max = 1, step = 0.01
-	},
-	VertAdj = {
-		type = 'range', isPercent = true,
-		order = 7,
-		name = L["Vertical Adjust"],
-		desc = L["Align the font vertically."],
-		min = -1, max = 1, step = 0.01
-	},
-	Color = {
-		type = 'color',
-		order = 8,
-		name = L["Color"],
-		desc = L["Change the color of the font."],
-		width = 'half',
-		disabled = function(info)
-			return rawget(_settings, info[#info - 1] .. "ColorR") == nil
-		end,
-		get = function(info)
-			local category = info[#info - 1]
-			return _settings[category .. "ColorR"], _settings[category .. "ColorG"], _settings[category .. "ColorB"], _settings[category .. "ColorA"]
-		end,
-		set = function(info, red, green, blue, alpha)
-			local category = info[#info - 1]
-			_settings[category .. "ColorR"], _settings[category .. "ColorG"], _settings[category .. "ColorB"], _settings[category .. "ColorA"] = red, green, blue, alpha
-			RefreshSettings()
-		end
-	},
-	Override = {
-		type = 'toggle',
-		order = 9,
-		name = L["Override"],
-		desc = L["Ignore native plugin font coloring."],
-		width = 'half'
-	},
-	Fixed = {
-		type = 'input',
-		order = 10,
-		name = L["Fixed Width"],
-		desc = L["Enter a value that best represents the width to be maintained.\n\nExample: 8888.88 DPS"],
-		hidden = function(info)
-			return info[#info - 1] ~= 'text'
-		end,
-		set = function(info, value)
-			value = strtrim(value)
-			if value == "" then
-				value = false
-			end
-			SetString(info, value)
-		end
-	}
-}
-
---[[-----------------------------------------------------------------------------
-Plugin Options
--------------------------------------------------------------------------------]]
-local function HidePanelAndSectionOption(info)
-	return _branch == "Panels" or #info == 1
-end
-
-local panel = {
-	type = 'select',
-	order = -2,
-	name = L["Panel"],
-	desc = function(info)
-		if _branch then
-			return L["Choose which panel should display this plugin."]
-		end
-		return L["Choose which panel should be the default display for plugins."]
-	end,
-	values = panelList,
-	disabled = false,
-	hidden = HidePanelAndSectionOption,
-	get = function(info)
-		local id = _branch and GetPluginLocation(_selection) or settings.defaultPanel
-		for index = 1, #panelIDs do
-			if panelIDs[index] == id then
-				return index
-			end
-		end
-	end,
-	set = function(info, value)
-		if _branch then
-			local id, sectionType = GetPluginLocation(_selection)
-			if id ~= panelIDs[value] then
-				SetPluginLocation(_selection, panelIDs[value], sectionType)
-			end
-		else
-			settings.defaultPanel = panelIDs[value]
-		end
-	end
-}
-
-local section = {
-	type = 'select',
-	order = -1,
-	name = L["Section"],
-	desc = function(info)
-		if _branch then
-			return L["Choose the section of a panel to display this plugin."]
-		end
-		return L["Choose the default section of panels to display plugins."]
-	end,
-	values = sectionTypes,
-	disabled = false,
-	hidden = HidePanelAndSectionOption,
-	get = function(info)
-		if _branch then
-			local _, section = GetPluginLocation(_selection)
-			return section or settings.defaultSection
-		end
-		return settings.defaultSection
-	end,
-	set = function(info, value)
-		if _branch then
-			local id, section = GetPluginLocation(_selection)
-			if section ~= value then
-				SetPluginLocation(_selection, id, value)
-			end
-		else
-			settings.defaultSection = value
-		end
-	end
-}
-
-local pluginOptions = {
-	type = 'group',
-	order = -1,
-	name = L["Plugin Defaults"],
-	desc = function(info)
-		if info[1] == "Panels" then
-			return L["Set the default behavior for plugins in this panel."]
-		end
-		return L["Set the default behavior for plugins."]
-	end,
-	disabled = DisableIfDefault,
-	hidden = function(info)
-		return info[1] == "panels"
-	end,
-	get = Get,
-	set = SetWithRefresh,
-	args = {
-		lockPlugin = {
-			type = 'toggle', tristate = true,
-			order = 1,
-			name = L["Lock"],
-			width = 'half',
-			desc = function(info)
-				if info[1] == "Panels" then
-					return L["Determines whether or not the plugins in this panel can be dragged by the mouse."]
-				end
-				return L["Determines whether or not plugins can be dragged by the mouse."]
-			end,
-			disabled = false,
-			hidden = function(info)
-				return #info == 1
-			end,
-			get = GetTriState,
-			set = Set
-		},
-		panel = panel,
-		section = section,
-		general = {
-			type = 'group',
-			order = 1,
-			name = L["General"],
-			desc = L["General settings."],
-			disabled = false,
-			hidden = function(info)
-				return info[1] ~= "general"
-			end,
-			args = {
-				enable = {
-					type = 'toggle',
-					order = 1,
-					name = L["Enable"],
-					desc = L["Determines if this plugin should be shown or not."],
-					width = 'half',
---					disabled = false,
-					set = function(info, value)
-						Set(info, value)
-						if value then
-							local id = GetPluginLocation(_selection)
-							if not id then
-								SetPluginLocation(_selection)
-							end
-							if not _object then
-								_object = CreatePlugin(_selection)
-							end
-						elseif _object then
-							_object:SetState()
-							_object = nil
-						end
-					end
-				},
-				panel = panel,
-				section = section
-			}
-		},
-		icon = {
-			type = 'group',
-			name = L["Icon"],
-			desc = L["Icon related settings."],
-			args = {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "iconFlip", "iconHide", "iconSize", "iconTrim", "iconVertAdj", "iconZoom" },
-					get = GetDefaultStatus
-				},
-				iconHide = {
-					type = 'toggle',
-					order = 2,
-					name = L["Hide"],
-					desc = L["Determines if the icon should be hidden."],
-					width = 'half'
-				},
-				iconSize = {
-					type = 'range', isPercent = true,
-					order = 3,
-					name = L["Size"],
-					desc = L["Set the size of the icon."],
-					min = 0.2, max = 1, step = 0.01
-				},
-				iconVertAdj = {
-					type = 'range', isPercent = true,
-					order = 4,
-					name = L["Vertical Adjust"],
-					desc = L["Align the icon vertically."],
-					min = -1, max = 1, step = 0.01
-				},
-				iconZoom = {
-					type = 'range', isPercent = true,
-					order = 5,
-					name = L["Zoom"],
-					desc = L["Set how much to zoom in on the icon by."],
-					min = 0, max = 1, step = 0.01,
-					get = function(info)
-						return _settings[info[#info]] * 2
-					end,
-					set = function(info, value)
-						_settings[info[#info]] = value * 0.5
-						RefreshSettings()
-					end
-				},
-				iconFlip = {
-					type = 'toggle',
-					order = 6,
-					name = L["Flip"],
-					desc = L["Determines if the icon should be placed on the far end of the plugin."],
-					width = 'half'
-				},
-				iconTrim = {
-					type = 'toggle',
-					order = 7,
-					name = L["Trim"],
-					desc = L["Automatically remove the border from stock icons."],
-					width = 'half'
-				}
-			}
-		},
-		label = {
-			type = 'group',
-			name = L["Label"],
-			desc = L["Label related settings."],
-			disabled = DisableIfDefaultString,
-			get = GetString,
-			set = SetString,
-			args = stringArgs
-		},
-		suffix = {
-			type = 'group',
-			name = L["Suffix"],
-			desc = L["Suffix related settings."],
-			disabled = DisableIfDefaultString,
-			hidden = IsLauncher,
-			get = GetString,
-			set = SetString,
-			args = stringArgs
-		},
-		text = {
-			type = 'group',
-			name = L["Text"],
-			desc = L["Text related settings."],
-			disabled = DisableIfDefaultString,
-			hidden = IsLauncher,
-			get = GetString,
-			set = SetString,
-			args = stringArgs
-		},
-		tooltip = {
-			type = 'group',
-			name = L["Tooltip"],
-			desc = L["Tooltip related settings."],
-			args = {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "tooltipParameters" , "tooltipScale" },
-					get = GetDefaultStatus,
-					set = Set
-				},
-				tooltipParameters = {
-					type = 'input', multiline = 5,
-					order = 2,
-					name = L["Visibility, Parameters"],
-					desc = L["Enter parameters that will be evaluated to determine if the tooltip will be shown or hidden.\n\nExample: [combat] hide; show"],
-					width = 'full'
-				},
-				tooltipScale = {
-					type = 'range', isPercent = true,
-					order = 3,
-					name = L["Scale"],
-					desc = L["Set the scale of the tooltip.\n\nMay not work for some plugins."],
-					min = 0.5, max = 1.5, step = 0.01
-				}
-			}
-		}
-	}
-}
-
---[[-----------------------------------------------------------------------------
-Panel Options
--------------------------------------------------------------------------------]]
-local function HideForNonPanels(info)
-	return info[1] == "panels"
-end
-
-local allowGlobals = {
-	type = 'toggle', tristate = true,
-	order = 4,
-	name = L["Global"],
-	desc = function(info)
-		if info[1] == "Panels" then
-			return L["Allow a global reference to this panel for compatibility with other addons."]
-		end
-		return L["Allow global references to panels for compatibility with other addons."]
-	end,
-	width = 'half',
-	disabled = false,
-	hidden = HideDualPosition,
-	get = GetTriState,
-	set = function(info, value)
-		Set(info, value)
-		if _branch == "Panels" then
-			_G[GetPanelName(_selection)] = value and _object or nil
-		else
-			for id, settings in pairs_iter, settings.panels, nil do
-				_G[GetPanelName(id)] = value and panels[id] or nil
-			end
-		end
-	end
-}
-
-local newPanel = {
-	type = 'execute',
-	order = 1,
-	name = L["Create New Panel"],
-	desc = L["Create a new panel and switch to it's options."],
-	disabled = false,
-	hidden = HideDualPosition,
-	func = function()
-		PanelList:Select(CreatePanel().id)
-		update_panel_list()
-		ConfigFrames[1]()
-	end
-}
-
-local rightClickConfig = {
-	type = 'toggle', tristate = true,
-	order = 3,
-	name = L["Config"],
-	desc = function(info)
-		if info[1] == "Panels" then
-			return L["Determines if this panel will open it's configuration panel on a right click."]
-		end
-		return L["Determines if panels will open their configuration panel on a right click."]
-	end,
-	width = 'half',
-	disabled = false,
-	hidden = HideDualPosition,
-	get = GetTriState,
-	set = Set
-}
-
-local panelOptions = {
-	type = 'group',
-	order = -1,
-	name = L["Panel Options"],
-	desc = L["Set the default behavior for panels."],
-	disabled = DisableIfDefault,
-	hidden = function(info)
-		return info[#info] == "plugins"
-	end,
-	get = Get,
-	set = SetWithRefresh,
-	args = {
-		newPanel = newPanel,
-		allowGlobals = allowGlobals,
-		rightClickConfig = rightClickConfig,
-		general = {
-			type = 'group',
-			order = 1,
-			name = L["General"],
-			desc = L["General settings."],
-			disabled = false,
-			hidden = HideForNonPanels,
-			args = {
-				newPanel = newPanel,
-				enable = {
-					type = 'toggle',
-					order = 2,
-					name = L["Enable"],
-					desc = L["Determines if this panel is active or not."],
-					width = 'half',
-					disabled = false,
-					set = function(info, value)
-						Set(info, value)
-						if value then
-							_object = CreatePanel(_selection)
-						elseif _object then
-							_object:Recycle()
-							_object = nil
-						end
-					end
-				},
-				allowGlobals = allowGlobals,
-				rightClickConfig = rightClickConfig
-			}
-		},
-		bg = {
-			type = 'group',
-			name = L["Background"],
-			desc = L["Background related settings."],
-			args = {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "bgColorA", "bgColorB", "bgColorG", "bgColorR", "bgInset", "bgTexture" },
-					get = GetDefaultStatus
-				},
-				bgColor = {
-					type = 'color', hasAlpha = true,
-					order = 2,
-					name = L["Color"],
-					desc = L["Change the color and transparency of the background."],
-					width = 'half',
-					disabled = DisableIfDefaultColor,
-					get = GetColor,
-					set = SetColor
-				},
-				bgTexture = {
-					type = 'select', control = 'LSM30_Statusbar',
-					order = 3,
-					name = L["Texture"],
-					desc = L["Choose a texture to use for the background."],
-					values = AceGUIWidgetLSMlists.statusbar
-				},
-				bgInset = {
-					type = 'range',
-					order = 4,
-					name = L["Inset"],
-					desc = L["Set the distance inside the panel before the background begins."],
-					min = -1, max = 8, step = 1
-				}
-			}
-		},
-		border = {
-			type = 'group',
-			name = L["Border"],
-			desc = L["Border related settings."],
-			args = {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "borderColorA", "borderColorB", "borderColorG", "borderColorR", "borderSize", "borderTexture" },
-					get = GetDefaultStatus
-				},
-				borderColor = {
-					type = 'color', hasAlpha = true,
-					order = 2,
-					name = L["Color"],
-					desc = L["Change the color and transparency of the border."],
-					width = 'half',
-					disabled = DisableIfDefaultColor,
-					get = GetColor,
-					set = SetColor
-				},
-				borderTexture = {
-					type = 'select', control = 'LSM30_Border',
-					order = 3,
-					name = L["Texture"],
-					desc = L["Choose a texture to use for the border."],
-					values = AceGUIWidgetLSMlists.border
-				},
-				borderSize = {
-					type = 'range',
-					order = 4,
-					name = L["Size"],
-					desc = L["Set how thick the border will be."],
-					min = 1, max = 16, step = 1
-				}
-			}
-		},
-		overlay = {
-			type = 'group',
-			name = L["Overlay"],
-			desc = L["Overlay related settings."],
-			args = {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "overlayColorA", "overlayColorB", "overlayColorG", "overlayColorR", "overlayFlip", "overlayFlop", "overlayTexture" },
-					get = GetDefaultStatus
-				},
-				overlayColor = {
-					type = 'color', hasAlpha = true,
-					order = 2,
-					name = L["Color"],
-					desc = L["Change the color and transparency of the overlay."],
-					width = 'half',
-					disabled = DisableIfDefaultColor,
-					get = GetColor,
-					set = SetColor
-				},
-				overlayTexture = {
-					type = 'select', control = 'LSM30_Statusbar_Overlay',
-					order = 3,
-					name = L["Texture"],
-					desc = L["Choose a texture to apply as an overlay to the panel."],
-					values = AceGUIWidgetLSMlists.statusbar_overlay
-				},
-				overlayFlip = {
-					type = 'toggle',
-					order = 4,
-					name = L["Flip"],
-					desc = L["Reverse the texture horizontally."],
-					width = 'half'
-				},
-				overlayFlop = {
-					type = 'toggle',
-					order = 5,
-					name = L["Flop"],
-					desc = L["Reverse the texture vertically."],
-					width = 'half'
-				}
-			}
-		},
-		position = {
-			type = 'group',
-			name = L["Position"],
-			desc = L["Position related settings."],
-			args= {
-				reset = {
-					type = 'execute',
-					order = 1,
-					name = L["Reset Position"],
-					desc = L["Reset position to the current anchor."],
-					disabled = false,
-					hidden = HideForNonPanels,
-					func = function(info)
-						if _object then
-							_object:SetOffset(0, 0)
-						else
-							_settings.offsetX, _settings.offsetY = 0, 0
-						end
-					end
-				},
-				lockPanel = {
-					type = 'toggle', tristate = true,
-					order = 2,
-					name = L["Lock"],
-					desc = function(info)
-						if info[1] == "Panels" then
-							return L["Determines whether or not this panel can be dragged by the mouse."]
-						end
-						return L["Determines whether or not panels can be dragged by the mouse."]
-					end,
-					width = 'half',
-					disabled = false,
-					get = GetTriState,
-					set = function(info, value)
-						Set(info, value)
-						if _branch == "Panels" then
-							if _object then
-								_object[value and "Lock" or "Unlock"](_object)
-							end
-						else
-							AllPanels(value and "Lock" or "Unlock")
-						end
-					end
-				},
-				defaults = {
-					type = 'toggle',
-					order = 3,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					width = 'half',
-					disabled = false,
-					arg = { "anchor", "level", "moveBlizzard", "screenClamp", "strata" },
-					get = GetDefaultStatus
-				},
-				anchor = {
-					type = 'select',
-					order = 4,
-					name = L["Anchor"],
-					desc = L["Choose the screen region for positioning to be relative to."],
-					values = LibStub('LibDisplayAssist-1.2').AnchorPoints
-				},
-				screenClamp = {
-					type = 'range',
-					order = 5,
-					name = L["Screen Clamp"],
-					desc = L["Set how much off-screen movement to allow."],
-					min = 0, max = 5, step = 1
-				},
-				strata = {
-					type = 'select',
-					order = 6,
-					name = L["Strata"],
-					desc = L["Set the frame strata layer."],
-					values = LibStub('LibDisplayAssist-1.2').StrataLayers
-				},
-				level = {
-					type = 'range',
-					order = 7,
-					name = L["Level"],
-					desc = L["Set the frame level."],
-					min = 1, max = 127, step = 1
-				},
-				moveBlizzard = {
-					type = 'toggle',
-					order = 8,
-					name = L["Move Blizzard Frames"],
-					desc = L["Determines if the default Blizzard frames should be moved."]
-				}
-			}
-		},
-		size = {
-			type = 'group',
-			name = L["Size"],
-			desc = L["Size related settings."],
-			args= {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					disabled = false,
-					arg = { "height", "width" },
-					get = GetDefaultStatus
-				},
-				height = {
-					type = 'range',
-					order = 2,
-					name = L["Height"],
-					desc = L["Set the height."],
-					min = MIN_HEIGHT, max = MAX_HEIGHT, step = 0.01,
-					get = function(info)
-						return _settings[info[#info]] * RESOLUTION_HEIGHT
-					end,
-					set = function(info, value)
-						_settings[info[#info]] = max(min(value, MAX_HEIGHT), MIN_HEIGHT) / RESOLUTION_HEIGHT
-						RefreshSettings()
-					end
-				},
-				width = {
-					type = 'range',
-					order = 3,
-					name = L["Width"],
-					desc = L["Set the width."],
-					min = MIN_WIDTH, max = MAX_WIDTH, step = 0.01,
-					get = function(info)
-						return _settings[info[#info]] * RESOLUTION_WIDTH
-					end,
-					set = function(info, value)
-						_settings[info[#info]] = max(min(value, MAX_WIDTH), MIN_WIDTH) / RESOLUTION_WIDTH
-						RefreshSettings()
-					end
-				}
-			}
-		},
-		spacing = {
-			type = 'group',
-			name = L["Spacing"],
-			desc = L["Spacing related settings."],
-			args= {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					disabled = false,
-					arg = { "spacingCenter", "spacingLeft", "spacingLeftEdge", "spacingRight", "spacingRightEdge" },
-					get = GetDefaultStatus
-				},
-				spacingLeftEdge = {
-					type = 'range', isPercent = true,
-					order = 2,
-					name = L["Left Edge"],
-					desc = L["Set how much distance to place between the left panel edge and the first left-side plugin."],
-					min = 0, max = 3, step = 0.01
-				},
-				spacingRightEdge = {
-					type = 'range', isPercent = true,
-					order = 3,
-					name = L["Right Edge"],
-					desc = L["Set how much distance to place between the right panel edge and the first right-side plugin."],
-					min = 0, max = 3, step = 0.01
-				},
-				spacingCenter = {
-					type = 'range', isPercent = true,
-					order = 4,
-					name = L["Center Plugins"],
-					desc = L["Set how much distance to place between the center plugins."],
-					min = 0, max = 3, step = 0.01
-				},
-				spacingLeft = {
-					type = 'range', isPercent = true,
-					order = 5,
-					name = L["Left Plugins"],
-					desc = L["Set how much distance to place between the left-side plugins."],
-					min = 0, max = 3, step = 0.01
-				},
-				spacingRight = {
-					type = 'range', isPercent = true,
-					order = 6,
-					name = L["Right Plugins"],
-					desc = L["Set how much distance to place between the right-side plugins."],
-					min = 0, max = 3, step = 0.01
-				}
-			}
-		},
-		alpha = {
-			type = 'group',
-			name = L["Visibility"],
-			desc = L["Visibility related settings."],
-			args= {
-				defaults = {
-					type = 'toggle',
-					order = 1,
-					name = L["Defaults"],
-					desc = L["Use defaults for these settings."],
-					disabled = false,
-					arg = { "alphaMouse", "alphaNormal", "alphaParameters" },
-					get = GetDefaultStatus
-				},
-				alphaNormal = {
-					type = 'range',
-					order = 2,
-					name = L["Alpha, Base"],
-					desc = L["Set the base alpha level to use for the panel."],
-					min = 0, max = 1, step = 0.01
-				},
-				alphaParameters = {
-					type = 'input', multiline = 5,
-					order = 3,
-					name = L["Alpha, Parameters"],
-					desc = L["Enter parameters that will be evaluated to set the alpha level of the panel, falling back to the base alpha as needed.\n\nExample: [group:raid] 0; [combat] 0.5"],
-					width = 'full'
-				},
-				alphaMouse = {
-					type = 'toggle',
-					order = 4,
-					name = L["Mouse Reveal"],
-					desc = L["Determines if the panel should be set to full visibility if it has the focus of the mouse."],
-				}
-			}
-		},
-		plugins = pluginOptions
-	}
-}
-
---[[-----------------------------------------------------------------------------
-Base Options
--------------------------------------------------------------------------------]]
-local baseOptions = {
-	type = 'group',
-	get = Get,
-	set = Set,
-	args = {
-		general = {
-			type = 'group',
-			name = L["General"],
-			desc = L["General settings."],
-			args = {
-				hideErrors = {
-					type = 'toggle',
-					order = 1,
-					name = L["Hide Errors"],
-					desc = L["Suppress errors generated by plugins."]
-				},
-				scaleSideBar = {
-					type = 'range',
-					order = 2,
-					name = L["Side Bar Scale"],
-					desc = L["Set the scale of the panel and plugin selection window."],
-					min = 0.5, max = 1, step = 0.01,
-					set = function(info, value)
-						Set(info, value)
-						SideBar:ShowScale(value)
-					end
-				}
-			}
-		},
-		panels = panelOptions,
-		plugins = pluginOptions
-	}
-}
-
---[[-----------------------------------------------------------------------------
-Global to addon
--------------------------------------------------------------------------------]]
-function UpdateConfig(self, noRefresh)
-	MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH = RESOLUTION_HEIGHT / 16, RESOLUTION_WIDTH, RESOLUTION_HEIGHT / 64, RESOLUTION_WIDTH / 64
-	local sizeArgs = panelOptions.args.size.args
-	sizeArgs.height.max, sizeArgs.height.min = MAX_HEIGHT, MIN_HEIGHT
-	sizeArgs.width.max, sizeArgs.width.min = MAX_WIDTH, MIN_WIDTH
-	if CONFIG_IS_OPEN then
-		CONFIG_IS_OPEN:Refresh()
-	end
-	if noRefresh then return end
-	AllPanels("Refresh")
-end
-
-function UpdateConfigVariables()
-	if CONFIG_IS_OPEN == ConfigFrames[2] then
-		_selection = PluginList.selection
-		_object, _branch, _settings = plugins[_selection], "Plugins", settings.plugins[_selection]
-	elseif CONFIG_IS_OPEN == ConfigFrames[1] then
-		_selection = PanelList.selection
-		_object, _branch, _settings = panels[_selection], "Panels", settings.panels[_selection]
-	else
-		_object, _branch, _selection, _settings = nil, nil, nil, settings
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Initialize
--------------------------------------------------------------------------------]]
-local ACR = LibStub('AceConfigRegistry-3.0')
-
-ACR:RegisterOptionsTable(addonName, baseOptions)
-ACR:RegisterOptionsTable(addonName .. "Panels", panelOptions)
-ACR:RegisterOptionsTable(addonName .. "Plugins", pluginOptions)
-ACR:RegisterOptionsTable(addonName .. "Profiles", LibStub('AceDBOptions-3.0'):GetOptionsTable(addon.db))
-
-ConfigFrames[0]:AssignOptions(addonName)
-ConfigFrames[1]:AssignOptions(addonName .. "Panels")
-ConfigFrames[2]:AssignOptions(addonName .. "Plugins")
-ConfigFrames[3]:AssignOptions(addonName .. "Profiles")
-
-ConfigFrames[0]:SetDesc(L["These options allow you to change the appearance and behavior of %s."]:format(addonName))
-ConfigFrames[1]:SetDesc(L["These options allow you to change the appearance and behavior of each panel individually."])
-ConfigFrames[2]:SetDesc(L["These options allow you to change the appearance and behavior of each plugin individually."])
-
-ConfigFrames[0]:SetInfo(L["Version: %s"]:format(GetAddOnMetadata(addonName, 'Version')))
-
-local function OnHide()
-	CONFIG_IS_OPEN = false
-	SideBar:Hide()
-	local frame = GetMouseFocus()
-	for index = 1, #addon do
-		if addon[index] == frame then
-			frame:HideTooltip(true)
-			return frame:ShowTooltip()
-		end
-	end
-end
-
-local function OnShow(self)
-	CONFIG_IS_OPEN = self
-	UpdateConfigVariables()
-	if ConfigFrames[1] == self or ConfigFrames[2] == self then
-		SideBar:Show()
-	end
-	local frame = GetMouseFocus()
-	for index = 1, #addon do
-		if addon[index] == frame then
-			return frame:ShowTooltip()
-		end
-	end
-end
-
-for index = 0, #ConfigFrames do
-	ConfigFrames[index]:SetScript('OnHide', OnHide)
-	ConfigFrames[index]:SetScript('OnShow', OnShow)
-end
diff --git a/Interface/AddOns/DockingStation_Config/DockingStation_Config.toc b/Interface/AddOns/DockingStation_Config/DockingStation_Config.toc
deleted file mode 100644
index 9c19aa9..0000000
--- a/Interface/AddOns/DockingStation_Config/DockingStation_Config.toc
+++ /dev/null
@@ -1,24 +0,0 @@
-## Interface: 40000
-## Author: Vrul
-## Title: DockingStation_Config
-## Notes: Configuration support for DockingStation.
-## LoadOnDemand: 1
-## Dependencies: DockingStation
-## OptionalDeps: AceGUI-3.0-SharedMediaWidgets, LibMenuAssist-1.0
-## DefaultState: Disabled
-## X-Child-Of: DockingStation
-
-Libs\AceConfigRegistry-3.0.lua
-Libs\AceGUI-3.0\AceGUI-3.0.xml
-Libs\AceConfigDialog-3.0.lua
-Libs\AceDBOptions-3.0.lua
-Libs\AceGUI-3.0-SharedMediaWidgets\widget.xml
-Libs\LibMenuAssist-1.0.lua
-
-Widget-StatusbarOverlay.lua
-
-Locales\deDE.lua
-
-SideBar.lua
-SideBarMenu.lua
-Core.lua
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceConfigDialog-3.0.lua b/Interface/AddOns/DockingStation_Config/Libs/AceConfigDialog-3.0.lua
deleted file mode 100644
index 36b0356..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceConfigDialog-3.0.lua
+++ /dev/null
@@ -1,1901 +0,0 @@
---- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
--- @class file
--- @name AceConfigDialog-3.0
--- @release $Id: AceConfigDialog-3.0.lua 967 2010-09-25 08:20:55Z nevcairiel $
-
-local LibStub = LibStub
-local MAJOR, MINOR = "AceConfigDialog-3.0", 50
-local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfigDialog then return end
-
-AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
-AceConfigDialog.Status = AceConfigDialog.Status or {}
-AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
-
-AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
-AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
-AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
-
-local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
-
--- Lua APIs
-local tconcat, tinsert, tsort, tremove = table.concat, table.insert, table.sort, table.remove
-local strmatch, format = string.match, string.format
-local assert, loadstring, error = assert, loadstring, error
-local pairs, next, select, type, unpack, wipe = pairs, next, select, type, unpack, wipe
-local rawset, tostring, tonumber = rawset, tostring, tonumber
-local math_min, math_max, math_floor = math.min, math.max, math.floor
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
--- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
--- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
-
-local emptyTbl = {}
-
---[[
-	 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, ...)
-	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,
-	fontSize = true,
-}
-
---Is Never a function or method
-local allIsLiteral = {
-	type = true,
-	descStyle = 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(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
-
-	tsort(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.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param path The path to the options (a table with all group keys)
--- @return
-function AceConfigDialog: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
-
---- Selects the specified path in the options window.
--- The path specified has to match the keys of the groups in the table.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param ... The path to the key that should be selected
-function AceConfigDialog: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)
-	local descStyle = opt.descStyle
-
-	if descStyle and descStyle ~= "tooltip" then return end
-
-	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
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		del(info)
-	end
-	t.OnCancel = function()
-		if dialog and oldstrata then
-			dialog:SetFrameStrata(oldstrata)
-		end
-		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		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(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)
-		else
-			-- TODO: do something else.
-		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
-		else
-			-- TODO: do something else
-		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(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(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(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") or emptyTbl
-		--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
-					AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-				else
-					AceConfigDialog:Open(user.appName, unpack(basepath))
-				end
-			end
-		elseif option.type == "range" then
-			if event == "OnMouseUp" then
-				if iscustom then
-					AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-				else
-					AceConfigDialog:Open(user.appName, 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
-				AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-			else
-				AceConfigDialog:Open(user.appName, 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 (not option.softMin and 0 or nil), option.max or (not option.softMax and 100 or nil), option.step
-	if min then
-		if step then
-			value = math_floor((value - min) / step + 0.5) * step + min
-		end
-		value = math_max(value, min)
-	end
-	if max then
-		value = math_min(value, max)
-	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") or emptyTbl
-	if iscustom then
-		AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-	else
-		AceConfigDialog:Open(user.appName, 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") or emptyTbl
-		if iscustom then
-			AceConfigDialog:Open(user.appName, user.rootframe, unpack(basepath))
-		else
-			AceConfigDialog:Open(user.appName, unpack(basepath))
-		end
-	end
-end
-
-local function FrameOnClose(widget, event)
-	local appName = widget:GetUserData("appName")
-	AceConfigDialog.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.icon = GetOptionsMemberValue("icon", v, options, path, appName)
-				entry.iconCoords = GetOptionsMemberValue("iconCoords", 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.icon = GetOptionsMemberValue("icon", 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
-
-					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
-					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
-
-					if type(image) == "string" then
-						control = gui:Create("Icon")
-						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)
-						control:SetLabel(name)
-					else
-						control = gui:Create("Button")
-						control:SetText(name)
-					end
-					control:SetCallback("OnClick",ActivateControl)
-
-				elseif v.type == "input" then
-					local controlType = v.dialogControl or v.control or (v.multiline and "MultiLineEditBox") or "EditBox"
-					control = gui:Create(controlType)
-					if not control then
-						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						control = gui:Create(v.multiline and "MultiLineEditBox" or "EditBox")
-					end
-
-					if v.multiline and control.SetNumLines then
-						control:SetNumLines(tonumber(v.multiline) or 4)
-					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)
-
-					if v.descStyle == "inline" then
-						local desc = GetOptionsMemberValue("desc", v, options, path, appName)
-						control:SetDescription(desc)
-					end
-
-					local image = GetOptionsMemberValue("image", v, options, path, appName)
-					local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName)
-
-					if type(image) == "string" then
-						if type(imageCoords) == "table" then
-							control:SetImage(image, unpack(imageCoords))
-						else
-							control:SetImage(image)
-						end
-					end
-				elseif v.type == "range" then
-					control = gui:Create("Slider")
-					control:SetLabel(name)
-					control:SetSliderValues(v.softMin or v.min or 0, v.softMax or v.max or 100, v.bigStep or v.step or 0)
-					control:SetIsPercent(v.isPercent)
-					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
-						geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						control = gui:Create("Dropdown")
-					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
-					tsort(valuesort)
-
-					if controlType then
-						control = gui:Create(controlType)
-						if not control then
-							geterrorhandler()(("Invalid Custom Control Type - %s"):format(tostring(controlType)))
-						end
-					end
-					if control then
-						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 fontSize = GetOptionsMemberValue("fontSize",v, options, path, appName)
-					if fontSize == "medium" then
-						control:SetFontObject(GameFontHighlight)
-					elseif fontSize == "large" then
-						control:SetFontObject(GameFontHighlightLarge)
-					else -- small or invalid
-						control:SetFontObject(GameFontHighlightSmall)
-					end
-
-					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, ("\001"):split(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, ("\001"):split(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, ("\001"):split(uniquevalue))
-	local group = options
-	for i = 1, #feedpath do
-		group = GetSubOption(group, feedpath[i])
-	end
-	widget:ReleaseChildren()
-	AceConfigDialog:FeedGroup(user.appName,options,widget,rootframe,feedpath)
-
-	del(feedpath)
-end
-
-
-
---[[
--- INTERNAL --
-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 AceConfigDialog: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"
-
-
-	for i = 1, #path do
-		local v = path[i]
-		group = GetSubOption(group, v)
-		inline = inline or pickfirstset(v.dialogInline,v.guiInline,v.inline, false)
-		parenttype = grouptype
-		grouptype = group.childGroups
-	end
-
-	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) and not CheckOptionHidden(v, options, path, appName) 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) and not CheckOptionHidden(v, options, path, appName) 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" and container.type ~= "SimpleGroup" 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
-		local name = GetOptionsMemberValue("name", group, options, path, appName)
-		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 = AceConfigDialog: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")
-			select:SetTitle(name)
-			InjectInfo(select, options, group, path, rootframe, appName)
-			select:SetCallback("OnGroupSelected", GroupSelected)
-			local status = AceConfigDialog: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 = AceConfigDialog: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 AceConfigDialog.OpenFrames[appName] then
-			AceConfigDialog.OpenFrames[appName]:Hide()
-		end
-		if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then
-			for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do
-				if not widget:IsVisible() then
-					widget:ReleaseChildren()
-				end
-			end
-		end
-		this.closing[appName] = nil
-	end
-
-	if this.closeAll then
-		for k, v in pairs(AceConfigDialog.OpenFrames) do
-			if not this.closeAllOverride[k] then
-				v:Hide()
-			end
-		end
-		this.closeAll = nil
-		wipe(this.closeAllOverride)
-	end
-
-	for appName in pairs(this.apps) do
-		if AceConfigDialog.OpenFrames[appName] then
-			local user = AceConfigDialog.OpenFrames[appName]:GetUserDataTable()
-			AceConfigDialog:Open(appName, unpack(user.basepath or emptyTbl))
-		end
-		if AceConfigDialog.BlizOptions and AceConfigDialog.BlizOptions[appName] then
-			for key, widget in pairs(AceConfigDialog.BlizOptions[appName]) do
-				local user = widget:GetUserDataTable()
-				if widget:IsVisible() then
-					AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(user.basepath or emptyTbl))
-				end
-			end
-		end
-		this.apps[appName] = nil
-	end
-	this:SetScript("OnUpdate", nil)
-end
-
--- Upgrade the OnUpdate script as well, if needed.
-if AceConfigDialog.frame:GetScript("OnUpdate") then
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
---- Close all open options windows
-function AceConfigDialog:CloseAll()
-	AceConfigDialog.frame.closeAll = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-	if next(self.OpenFrames) then
-		return true
-	end
-end
-
---- Close a specific options window.
--- @param appName The application name as given to `:RegisterOptionsTable()`
-function AceConfigDialog:Close(appName)
-	if self.OpenFrames[appName] then
-		AceConfigDialog.frame.closing[appName] = true
-		AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-		return true
-	end
-end
-
--- Internal -- Called by AceConfigRegistry
-function AceConfigDialog:ConfigTableChanged(event, appName)
-	AceConfigDialog.frame.apps[appName] = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
-reg.RegisterCallback(AceConfigDialog, "ConfigTableChange", "ConfigTableChanged")
-
---- Sets the default size of the options window for a specific application.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param width The default width
--- @param height The default height
-function AceConfigDialog:SetDefaultSize(appName, width, height)
-	local status = AceConfigDialog:GetStatusTable(appName)
-	if type(width) == "number" and type(height) == "number" then
-		status.width = width
-		status.height = height
-	end
-end
-
---- Open an option window at the specified path (if any).
--- This function can optionally feed the group into a pre-created container
--- instead of creating a new container frame.
--- @paramsig appName [, container][, ...]
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param container An optional container frame to feed the options into
--- @param ... The path to open after creating the options window (see `:SelectGroup` for details)
-function AceConfigDialog: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 = AceConfigDialog: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
-		if f.SetTitle then
-			f:SetTitle(name or "")
-		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 = AceConfigDialog:GetStatusTable(appName)
-		f:SetStatusTable(status)
-	end
-
-	self:FeedGroup(appName,options,f,f,path,true)
-	if f.Show then
-		f:Show()
-	end
-	del(path)
-
-	if AceConfigDialog.frame.closeAll then
-		-- close all is set, but thats not good, since we're just opening here, so force it
-		AceConfigDialog.frame.closeAllOverride[appName] = true
-	end
-end
-
--- convert pre-39 BlizOptions structure to the new format
-if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
-	local old = AceConfigDialog.BlizOptions
-	local new = {}
-	for key, widget in pairs(old) do
-		local appName = widget:GetUserData("appName")
-		if not new[appName] then new[appName] = {} end
-		new[appName][key] = widget
-	end
-	AceConfigDialog.BlizOptions = new
-else
-	AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
-end
-
-local function FeedToBlizPanel(widget, event)
-	local path = widget:GetUserData("path")
-	AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl))
-end
-
-local function ClearBlizPanel(widget, event)
-	local appName = widget:GetUserData("appName")
-	AceConfigDialog.frame.closing[appName] = true
-	AceConfigDialog.frame:SetScript("OnUpdate", RefreshOnUpdate)
-end
-
---- Add an option table into the Blizzard Interface Options panel.
--- You can optionally supply a descriptive name to use and a parent frame to use,
--- as well as a path in the options table.\\
--- If no name is specified, the appName will be used instead.
---
--- If you specify a proper `parent` (by name), the interface options will generate a
--- tree layout. Note that only one level of children is supported, so the parent always
--- has to be a head-level note.
---
--- This function returns a reference to the container frame registered with the Interface
--- Options. You can use this reference to open the options with the API function
--- `InterfaceOptionsFrame_OpenToCategory`.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param name A descriptive name to display in the options tree (defaults to appName)
--- @param parent The parent to use in the interface options tree.
--- @param ... The path in the options table to feed into the interface options panel.
--- @return The reference to the frame registered into the Interface Options.
-function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
-	local BlizOptions = AceConfigDialog.BlizOptions
-
-	local key = appName
-	for n = 1, select("#", ...) do
-		key = key.."\001"..select(n, ...)
-	end
-
-	if not BlizOptions[appName] then
-		BlizOptions[appName] = {}
-	end
-
-	if not BlizOptions[appName][key] then
-		local group = gui:Create("BlizOptionsGroup")
-		BlizOptions[appName][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/Interface/AddOns/DockingStation_Config/Libs/AceConfigRegistry-3.0.lua b/Interface/AddOns/DockingStation_Config/Libs/AceConfigRegistry-3.0.lua
deleted file mode 100644
index d98c020..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceConfigRegistry-3.0.lua
+++ /dev/null
@@ -1,346 +0,0 @@
---- AceConfigRegistry-3.0 handles central registration of options tables in use by addons and modules.\\
--- Options tables can be registered as raw tables, OR as function refs that return a table.\\
--- Such functions receive three arguments: "uiType", "uiName", "appName". \\
--- * Valid **uiTypes**: "cmd", "dropdown", "dialog". This is verified by the library at call time. \\
--- * The **uiName** field is expected to contain the full name of the calling addon, including version, e.g. "FooBar-1.0". This is verified by the library at call time.\\
--- * The **appName** field is the options table name as given at registration time \\
---
--- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
--- @class file
--- @name AceConfigRegistry-3.0
--- @release $Id: AceConfigRegistry-3.0.lua 921 2010-05-09 15:49:14Z nevcairiel $
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 12
-local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConfigRegistry then return end
-
-AceConfigRegistry.tables = AceConfigRegistry.tables or {}
-
-local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0")
-
-if not AceConfigRegistry.callbacks then
-	AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry)
-end
-
--- Lua APIs
-local tinsert, tconcat = table.insert, table.concat
-local strfind, strmatch = string.find, string.match
-local type, tostring, select, pairs = type, tostring, select, pairs
-local error, assert = error, assert
-
------------------------------------------------------------------------
--- Validating options table consistency:
-
-
-AceConfigRegistry.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(): "..tconcat(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,
-	descStyle=optstring,
-	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,
-		fontSize=optstringfunc,
-	},
-	group={
-		args=istable,
-		plugins=opttable,
-		inline=optbool,
-			cmdInline=optbool,
-			guiInline=optbool,
-			dropdownInline=optbool,
-			dialogInline=optbool,
-		childGroups=optstring,
-	},
-	execute={
-		image=optstringfunc,
-		imageCoords=optmethodtable,
-		imageHeight=optnumber,
-		imageWidth=optnumber,
-	},
-	input={
-		pattern=optstring,
-		usage=optstring,
-		control=optstring,
-		dialogControl=optstring,
-		dropdownControl=optstring,
-		multiline=optboolnumber,
-	},
-	toggle={
-		tristate=optbool,
-		image=optstringfunc,
-		imageCoords=optmethodtable,
-	},
-	tristate={
-	},
-	range={
-		min=optnumber,
-		softMin=optnumber,
-		max=optnumber,
-		softMax=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 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
-
-
---- 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
--- @param options The table to be validated
--- @param name The name of the table to be validated (shown in any error message)
--- @param errlvl (optional number) error level offset, default 0 (=errors point to the function calling :ValidateOptionsTable)
-function AceConfigRegistry: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
-
---- Fires a "ConfigTableChange" callback for those listening in on it, allowing config GUIs to refresh.
--- You should call this function if your options table changed from any outside event, like a game event
--- or a timer.
--- @param appName The application name as given to `:RegisterOptionsTable()`
-function AceConfigRegistry:NotifyChange(appName)
-	if not AceConfigRegistry.tables[appName] then return end
-	AceConfigRegistry.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
-
---- Register an options table with the config registry.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param options The options table, OR a function reference that generates it on demand. \\
--- See the top of the page for info on arguments passed to such functions.
-function AceConfigRegistry:RegisterOptionsTable(appName, options)
-	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
-		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			if not AceConfigRegistry.validated[uiType][appName] then
-				AceConfigRegistry:ValidateOptionsTable(options, appName, errlvl)	-- upgradable
-				AceConfigRegistry.validated[uiType][appName] = true
-			end
-			return options
-		end
-	elseif type(options)=="function" then
-		AceConfigRegistry.tables[appName] = function(uiType, uiName, errlvl)
-			errlvl=(errlvl or 0)+1
-			validateGetterArgs(uiType, uiName, errlvl)
-			local tab = assert(options(uiType, uiName, appName))
-			if not AceConfigRegistry.validated[uiType][appName] then
-				AceConfigRegistry:ValidateOptionsTable(tab, appName, errlvl)	-- upgradable
-				AceConfigRegistry.validated[uiType][appName] = true
-			end
-			return tab
-		end
-	else
-		error(MAJOR..": RegisterOptionsTable(appName, options): 'options' - expected table or function reference", 2)
-	end
-end
-
---- Returns an iterator of ["appName"]=funcref pairs
-function AceConfigRegistry:IterateOptionsTables()
-	return pairs(AceConfigRegistry.tables)
-end
-
-
-
-
---- Query the registry for a specific options table.
--- 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.
--- @param appName The application name as given to `:RegisterOptionsTable()`
--- @param uiType The type of UI to get the table for, one of "cmd", "dropdown", "dialog"
--- @param uiName The name of the library/addon querying for the table, e.g. "MyLib-1.0"
-function AceConfigRegistry:GetOptionsTable(appName, uiType, uiName)
-	local f = AceConfigRegistry.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/Interface/AddOns/DockingStation_Config/Libs/AceDBOptions-3.0.lua b/Interface/AddOns/DockingStation_Config/Libs/AceDBOptions-3.0.lua
deleted file mode 100644
index bc56106..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceDBOptions-3.0.lua
+++ /dev/null
@@ -1,420 +0,0 @@
---- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
--- @class file
--- @name AceDBOptions-3.0
--- @release $Id: AceDBOptions-3.0.lua 938 2010-06-13 07:21:38Z nevcairiel $
-local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 12
-local AceDBOptions, oldminor = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
-
-if not AceDBOptions then return end -- No upgrade needed
-
--- Lua APIs
-local pairs, next = pairs, next
-
--- WoW APIs
-local UnitClass = UnitClass
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
-
-AceDBOptions.optionTables = AceDBOptions.optionTables or {}
-AceDBOptions.handlers = AceDBOptions.handlers or {}
-
---[[
-	Localization of AceDBOptions-3.0
-]]
-
-local L = {
-	default = "Default",
-	intro = "You can change the active database profile, so you can have different settings for every character.",
-	reset_desc = "Reset the current profile back to its default values, in case your configuration is broken, or you simply want to start over.",
-	reset = "Reset Profile",
-	reset_sub = "Reset the current profile to the default",
-	choose_desc = "You can either create a new profile by entering a name in the editbox, or choose one of the already existing profiles.",
-	new = "New",
-	new_sub = "Create a new empty profile.",
-	choose = "Existing Profiles",
-	choose_sub = "Select one of your currently available profiles.",
-	copy_desc = "Copy the settings from one existing profile into the currently active profile.",
-	copy = "Copy From",
-	delete_desc = "Delete existing and unused profiles from the database to save space, and cleanup the SavedVariables file.",
-	delete = "Delete a Profile",
-	delete_sub = "Deletes a profile from the database.",
-	delete_confirm = "Are you sure you want to delete the selected profile?",
-	profiles = "Profiles",
-	profiles_sub = "Manage Profiles",
-	current = "Current Profile:",
-}
-
-local LOCALE = GetLocale()
-if LOCALE == "deDE" then
-	L["default"] = "Standard"
-	L["intro"] = "Hier kannst du das aktive Datenbankprofile \195\164ndern, damit du verschiedene Einstellungen f\195\188r jeden Charakter erstellen kannst, wodurch eine sehr flexible Konfiguration m\195\182glich wird."
-	L["reset_desc"] = "Setzt das momentane Profil auf Standardwerte zur\195\188ck, f\195\188r den Fall das mit der Konfiguration etwas schief lief oder weil du einfach neu starten willst."
-	L["reset"] = "Profil zur\195\188cksetzen"
-	L["reset_sub"] = "Das aktuelle Profil auf Standard zur\195\188cksetzen."
-	L["choose_desc"] = "Du kannst ein neues Profil erstellen, indem du einen neuen Namen in der Eingabebox 'Neu' eingibst, oder w\195\164hle eines der vorhandenen Profile aus."
-	L["new"] = "Neu"
-	L["new_sub"] = "Ein neues Profil erstellen."
-	L["choose"] = "Vorhandene Profile"
-	L["choose_sub"] = "W\195\164hlt ein bereits vorhandenes Profil aus."
-	L["copy_desc"] = "Kopiere die Einstellungen von einem vorhandenen Profil in das aktive Profil."
-	L["copy"] = "Kopieren von..."
-	L["delete_desc"] = "L\195\182sche vorhandene oder unbenutzte Profile aus der Datenbank um Platz zu sparen und um die SavedVariables Datei 'sauber' zu halten."
-	L["delete"] = "Profil l\195\182schen"
-	L["delete_sub"] = "L\195\182scht ein Profil aus der Datenbank."
-	L["delete_confirm"] = "Willst du das ausgew\195\164hlte Profil wirklich l\195\182schen?"
-	L["profiles"] = "Profile"
-	L["profiles_sub"] = "Profile verwalten"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "frFR" then
-	L["default"] = "D\195\169faut"
-	L["intro"] = "Vous pouvez changer le profil actuel afin d'avoir des param\195\168tres diff\195\169rents pour chaque personnage, permettant ainsi d'avoir une configuration tr\195\168s flexible."
-	L["reset_desc"] = "R\195\169initialise le profil actuel au cas o\195\185 votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
-	L["reset"] = "R\195\169initialiser le profil"
-	L["reset_sub"] = "R\195\169initialise le profil actuel avec les param\195\168tres par d\195\169faut."
-	L["choose_desc"] = "Vous pouvez cr\195\169er un nouveau profil en entrant un nouveau nom dans la bo\195\174te de saisie, ou en choississant un des profils d\195\169j\195\160 existants."
-	L["new"] = "Nouveau"
-	L["new_sub"] = "Cr\195\169\195\169e un nouveau profil vierge."
-	L["choose"] = "Profils existants"
-	L["choose_sub"] = "Permet de choisir un des profils d\195\169j\195\160 disponibles."
-	L["copy_desc"] = "Copie les param\195\168tres d'un profil d\195\169j\195\160 existant dans le profil actuellement actif."
-	L["copy"] = "Copier \195\160 partir de"
-	L["delete_desc"] = "Supprime les profils existants inutilis\195\169s de la base de donn\195\169es afin de gagner de la place et de nettoyer le fichier SavedVariables."
-	L["delete"] = "Supprimer un profil"
-	L["delete_sub"] = "Supprime un profil de la base de donn\195\169es."
-	L["delete_confirm"] = "Etes-vous s\195\187r de vouloir supprimer le profil s\195\169lectionn\195\169 ?"
-	L["profiles"] = "Profils"
-	L["profiles_sub"] = "Gestion des profils"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "koKR" then
-	L["default"] = "기본값"
-	L["intro"] = "모든 캐릭터의 다양한 설정과 사용중인 데이터베이스 프로필, 어느것이던지 매우 다루기 쉽게 바꿀수 있습니다."
-	L["reset_desc"] = "단순히 다시 새롭게 구성을 원하는 경우, 현재 프로필을 기본값으로 초기화 합니다."
-	L["reset"] = "프로필 초기화"
-	L["reset_sub"] = "현재의 프로필을 기본값으로 초기화 합니다"
-	L["choose_desc"] = "새로운 이름을 입력하거나, 이미 있는 프로필중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
-	L["new"] = "새로운 프로필"
-	L["new_sub"] = "새로운 프로필을 만듭니다."
-	L["choose"] = "프로필 선택"
-	L["choose_sub"] = "당신이 현재 이용할수 있는 프로필을 선택합니다."
-	L["copy_desc"] = "현재 사용중인 프로필에, 선택한 프로필의 설정을 복사합니다."
-	L["copy"] = "복사"
-	L["delete_desc"] = "데이터베이스에 사용중이거나 저장된 프로파일 삭제로 SavedVariables 파일의 정리와 공간 절약이 됩니다."
-	L["delete"] = "프로필 삭제"
-	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
-	L["delete_confirm"] = "정말로 선택한 프로필의 삭제를 원하십니까?"
-	L["profiles"] = "프로필"
-	L["profiles_sub"] = "프로필 설정"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "esES" or LOCALE == "esMX" then
-	L["default"] = "Por defecto"
-	L["intro"] = "Puedes cambiar el perfil activo de tal manera que cada personaje tenga diferentes configuraciones."
-	L["reset_desc"] = "Reinicia el perfil actual a los valores por defectos, en caso de que se haya estropeado la configuración o quieras volver a empezar de nuevo."
-	L["reset"] = "Reiniciar Perfil"
-	L["reset_sub"] = "Reinicar el perfil actual al de por defecto"
-	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
-	L["new"] = "Nuevo"
-	L["new_sub"] = "Crear un nuevo perfil vacio."
-	L["choose"] = "Perfiles existentes"
-	L["choose_sub"] = "Selecciona uno de los perfiles disponibles."
-	L["copy_desc"] = "Copia los ajustes de un perfil existente al perfil actual."
-	L["copy"] = "Copiar de"
-	L["delete_desc"] = "Borra los perfiles existentes y sin uso de la base de datos para ganar espacio y limpiar el archivo SavedVariables."
-	L["delete"] = "Borrar un Perfil"
-	L["delete_sub"] = "Borra un perfil de la base de datos."
-	L["delete_confirm"] = "¿Estas seguro que quieres borrar el perfil seleccionado?"
-	L["profiles"] = "Perfiles"
-	L["profiles_sub"] = "Manejar Perfiles"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "zhTW" then
-	L["default"] = "預設"
-	L["intro"] = "你可以選擇一個活動的資料設定檔,這樣你的每個角色就可以擁有不同的設定值,可以給你的插件設定帶來極大的靈活性。"
-	L["reset_desc"] = "將當前的設定檔恢復到它的預設值,用於你的設定檔損壞,或者你只是想重來的情況。"
-	L["reset"] = "重置設定檔"
-	L["reset_sub"] = "將當前的設定檔恢復為預設值"
-	L["choose_desc"] = "你可以通過在文本框內輸入一個名字創立一個新的設定檔,也可以選擇一個已經存在的設定檔。"
-	L["new"] = "新建"
-	L["new_sub"] = "新建一個空的設定檔。"
-	L["choose"] = "現有的設定檔"
-	L["choose_sub"] = "從當前可用的設定檔裏面選擇一個。"
-	L["copy_desc"] = "從當前某個已保存的設定檔複製到當前正使用的設定檔。"
-	L["copy"] = "複製自"
-	L["delete_desc"] = "從資料庫裏刪除不再使用的設定檔,以節省空間,並且清理SavedVariables檔。"
-	L["delete"] = "刪除一個設定檔"
-	L["delete_sub"] = "從資料庫裏刪除一個設定檔。"
-	L["delete_confirm"] = "你確定要刪除所選擇的設定檔嗎?"
-	L["profiles"] = "設定檔"
-	L["profiles_sub"] = "管理設定檔"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "zhCN" then
-	L["default"] = "默认"
-	L["intro"] = "你可以选择一个活动的数据配置文件,这样你的每个角色就可以拥有不同的设置值,可以给你的插件配置带来极大的灵活性。"
-	L["reset_desc"] = "将当前的配置文件恢复到它的默认值,用于你的配置文件损坏,或者你只是想重来的情况。"
-	L["reset"] = "重置配置文件"
-	L["reset_sub"] = "将当前的配置文件恢复为默认值"
-	L["choose_desc"] = "你可以通过在文本框内输入一个名字创立一个新的配置文件,也可以选择一个已经存在的配置文件。"
-	L["new"] = "新建"
-	L["new_sub"] = "新建一个空的配置文件。"
-	L["choose"] = "现有的配置文件"
-	L["choose_sub"] = "从当前可用的配置文件里面选择一个。"
-	L["copy_desc"] = "从当前某个已保存的配置文件复制到当前正使用的配置文件。"
-	L["copy"] = "复制自"
-	L["delete_desc"] = "从数据库里删除不再使用的配置文件,以节省空间,并且清理SavedVariables文件。"
-	L["delete"] = "删除一个配置文件"
-	L["delete_sub"] = "从数据库里删除一个配置文件。"
-	L["delete_confirm"] = "你确定要删除所选择的配置文件么?"
-	L["profiles"] = "配置文件"
-	L["profiles_sub"] = "管理配置文件"
-	--L["current"] = "Current Profile:"
-elseif LOCALE == "ruRU" then
-	L["default"] = "По умолчанию"
-	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
-	L["reset_desc"] = "Если ваша конфигурации испорчена или если вы хотите настроить всё заново - сбросьте текущий профиль на стандартные значения."
-	L["reset"] = "Сброс профиля"
-	L["reset_sub"] = "Сброс текущего профиля на стандартный"
-	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
-	L["new"] = "Новый"
-	L["new_sub"] = "Создать новый чистый профиль"
-	L["choose"] = "Существующие профили"
-	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
-	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
-	L["copy"] = "Скопировать из"
-	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
-	L["delete"] = "Удалить профиль"
-	L["delete_sub"] = "Удаление профиля из БД"
-	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
-	L["profiles"] = "Профили"
-	L["profiles_sub"] = "Управление профилями"
-	--L["current"] = "Current Profile:"
-end
-
-local defaultProfiles
-local tmpprofiles = {}
-
--- Get a list of available profiles for the specified database.
--- You can specify which profiles to include/exclude in the list using the two boolean parameters listed below.
--- @param db The db object to retrieve the profiles from
--- @param common If true, getProfileList will add the default profiles to the return list, even if they have not been created yet
--- @param nocurrent If true, then getProfileList will not display the current profile in the list
--- @return Hashtable of all profiles with the internal name as keys and the display name as value.
-local function getProfileList(db, common, nocurrent)
-	local profiles = {}
-
-	-- copy existing profiles into the table
-	local currentProfile = db:GetCurrentProfile()
-	for i,v in pairs(db:GetProfiles(tmpprofiles)) do
-		if not (nocurrent and v == currentProfile) then
-			profiles[v] = v
-		end
-	end
-
-	-- add our default profiles to choose from ( or rename existing profiles)
-	for k,v in pairs(defaultProfiles) do
-		if (common or profiles[k]) and not (nocurrent and k == currentProfile) then
-			profiles[k] = v
-		end
-	end
-
-	return profiles
-end
-
---[[
-	OptionsHandlerPrototype
-	prototype class for handling the options in a sane way
-]]
-local OptionsHandlerPrototype = {}
-
---[[ Reset the profile ]]
-function OptionsHandlerPrototype:Reset()
-	self.db:ResetProfile()
-end
-
---[[ Set the profile to value ]]
-function OptionsHandlerPrototype:SetProfile(info, value)
-	self.db:SetProfile(value)
-end
-
---[[ returns the currently active profile ]]
-function OptionsHandlerPrototype:GetCurrentProfile()
-	return self.db:GetCurrentProfile()
-end
-
---[[
-	List all active profiles
-	you can control the output with the .arg variable
-	currently four modes are supported
-
-	(empty) - return all available profiles
-	"nocurrent" - returns all available profiles except the currently active profile
-	"common" - returns all avaialble profiles + some commonly used profiles ("char - realm", "realm", "class", "Default")
-	"both" - common except the active profile
-]]
-function OptionsHandlerPrototype:ListProfiles(info)
-	local arg = info.arg
-	local profiles
-	if arg == "common" and not self.noDefaultProfiles then
-		profiles = getProfileList(self.db, true, nil)
-	elseif arg == "nocurrent" then
-		profiles = getProfileList(self.db, nil, true)
-	elseif arg == "both" then -- currently not used
-		profiles = getProfileList(self.db, (not self.noDefaultProfiles) and true, true)
-	else
-		profiles = getProfileList(self.db)
-	end
-
-	return profiles
-end
-
-function OptionsHandlerPrototype:HasNoProfiles(info)
-	local profiles = self:ListProfiles(info)
-	return ((not next(profiles)) and true or false)
-end
-
---[[ Copy a profile ]]
-function OptionsHandlerPrototype:CopyProfile(info, value)
-	self.db:CopyProfile(value)
-end
-
---[[ Delete a profile from the db ]]
-function OptionsHandlerPrototype:DeleteProfile(info, value)
-	self.db:DeleteProfile(value)
-end
-
---[[ fill defaultProfiles with some generic values ]]
-local function generateDefaultProfiles(db)
-	defaultProfiles = {
-		["Default"] = L["default"],
-		[db.keys.char] = db.keys.char,
-		[db.keys.realm] = db.keys.realm,
-		[db.keys.class] = UnitClass("player")
-	}
-end
-
---[[ create and return a handler object for the db, or upgrade it if it already existed ]]
-local function getOptionsHandler(db, noDefaultProfiles)
-	if not defaultProfiles then
-		generateDefaultProfiles(db)
-	end
-
-	local handler = AceDBOptions.handlers[db] or { db = db, noDefaultProfiles = noDefaultProfiles }
-
-	for k,v in pairs(OptionsHandlerPrototype) do
-		handler[k] = v
-	end
-
-	AceDBOptions.handlers[db] = handler
-	return handler
-end
-
---[[
-	the real options table
-]]
-local optionsTable = {
-	desc = {
-		order = 1,
-		type = "description",
-		name = L["intro"] .. "\n",
-	},
-	descreset = {
-		order = 9,
-		type = "description",
-		name = L["reset_desc"],
-	},
-	reset = {
-		order = 10,
-		type = "execute",
-		name = L["reset"],
-		desc = L["reset_sub"],
-		func = "Reset",
-	},
-	current = {
-		order = 11,
-		type = "description",
-		name = function(info) return L["current"] .. " " .. NORMAL_FONT_COLOR_CODE .. info.handler:GetCurrentProfile() .. FONT_COLOR_CODE_CLOSE end,
-		width = "default",
-	},
-	choosedesc = {
-		order = 20,
-		type = "description",
-		name = "\n" .. L["choose_desc"],
-	},
-	new = {
-		name = L["new"],
-		desc = L["new_sub"],
-		type = "input",
-		order = 30,
-		get = false,
-		set = "SetProfile",
-	},
-	choose = {
-		name = L["choose"],
-		desc = L["choose_sub"],
-		type = "select",
-		order = 40,
-		get = "GetCurrentProfile",
-		set = "SetProfile",
-		values = "ListProfiles",
-		arg = "common",
-	},
-	copydesc = {
-		order = 50,
-		type = "description",
-		name = "\n" .. L["copy_desc"],
-	},
-	copyfrom = {
-		order = 60,
-		type = "select",
-		name = L["copy"],
-		desc = L["copy_desc"],
-		get = false,
-		set = "CopyProfile",
-		values = "ListProfiles",
-		disabled = "HasNoProfiles",
-		arg = "nocurrent",
-	},
-	deldesc = {
-		order = 70,
-		type = "description",
-		name = "\n" .. L["delete_desc"],
-	},
-	delete = {
-		order = 80,
-		type = "select",
-		name = L["delete"],
-		desc = L["delete_sub"],
-		get = false,
-		set = "DeleteProfile",
-		values = "ListProfiles",
-		disabled = "HasNoProfiles",
-		arg = "nocurrent",
-		confirm = true,
-		confirmText = L["delete_confirm"],
-	},
-}
-
---- Get/Create a option table that you can use in your addon to control the profiles of AceDB-3.0.
--- @param db The database object to create the options table for.
--- @return The options table to be used in AceConfig-3.0
--- @usage
--- -- Assuming `options` is your top-level options table and `self.db` is your database:
--- options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db)
-function AceDBOptions:GetOptionsTable(db, noDefaultProfiles)
-	local tbl = AceDBOptions.optionTables[db] or {
-			type = "group",
-			name = L["profiles"],
-			desc = L["profiles_sub"],
-		}
-
-	tbl.handler = getOptionsHandler(db, noDefaultProfiles)
-	tbl.args = optionsTable
-
-	AceDBOptions.optionTables[db] = tbl
-	return tbl
-end
-
--- upgrade existing tables
-for db,tbl in pairs(AceDBOptions.optionTables) do
-	tbl.handler = getOptionsHandler(db)
-	tbl.args = optionsTable
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua
deleted file mode 100644
index 32a67ec..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua
+++ /dev/null
@@ -1,231 +0,0 @@
--- Widget is based on the AceGUIWidget-DropDown.lua supplied with AceGUI-3.0
--- Widget created by Yssaril
-
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
-
-do
-	local widgetType = "LSM30_Background"
-	local widgetVersion = 9
-
-	local contentFrameCache = {}
-	local function ReturnSelf(self)
-		self:ClearAllPoints()
-		self:Hide()
-		self.check:Hide()
-		table.insert(contentFrameCache, self)
-	end
-
-	local function ContentOnClick(this, button)
-		local self = this.obj
-		self:Fire("OnValueChanged", this.text:GetText())
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function ContentOnEnter(this, button)
-		local self = this.obj
-		local text = this.text:GetText()
-		local background = self.list[text] ~= text and self.list[text] or Media:Fetch('background',text)
-		self.dropdown.bgTex:SetTexture(background)
-	end
-
-	local function GetContentLine()
-		local frame
-		if next(contentFrameCache) then
-			frame = table.remove(contentFrameCache)
-		else
-			frame = CreateFrame("Button", nil, UIParent)
-				--frame:SetWidth(200)
-				frame:SetHeight(18)
-				frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
-				frame:SetScript("OnClick", ContentOnClick)
-				frame:SetScript("OnEnter", ContentOnEnter)
-			local check = frame:CreateTexture("OVERLAY")
-				check:SetWidth(16)
-				check:SetHeight(16)
-				check:SetPoint("LEFT",frame,"LEFT",1,-1)
-				check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-				check:Hide()
-			frame.check = check
-			local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
-
-				local font, size = text:GetFont()
-				text:SetFont(font,size,"OUTLINE")
-
-				text:SetPoint("LEFT", check, "RIGHT", 1, 0)
-				text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
-				text:SetJustifyH("LEFT")
-				text:SetText("Test Test Test Test Test Test Test")
-			frame.text = text
-			frame.ReturnSelf = ReturnSelf
-		end
-		frame:Show()
-		return frame
-	end
-
-	local function OnAcquire(self)
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	local function OnRelease(self)
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetValue(self, value) -- Set the value to an item in the List.
-		if self.list then
-			self:SetText(value or "")
-		end
-		self.value = value
-	end
-
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function SetList(self, list) -- Set the list of values for the dropdown (key => value pairs)
-		self.list = list or Media:HashTable("background")
-	end
-
-
-	local function SetText(self, text) -- Set the text displayed in the box.
-		self.frame.text:SetText(text or "")
-		local background = self.list[text] ~= text and self.list[text] or Media:Fetch('background',text)
-
-		self.frame.displayButton:SetBackdrop({bgFile = background,
-			edgeFile = "Interface/Tooltips/UI-Tooltip-Border",
-			edgeSize = 16,
-			insets = { left = 4, right = 4, top = 4, bottom = 4 }})
-	end
-
-	local function SetLabel(self, text) -- Set the text for the label.
-		self.frame.label:SetText(text or "")
-	end
-
-	local function AddItem(self, key, value) -- Add an item to the list.
-		self.list = self.list or {}
-		self.list[key] = value
-	end
-	local SetItemValue = AddItem -- Set the value of a item in the list. <<same as adding a new item>>
-
-	local function SetMultiselect(self, flag) end -- Toggle multi-selecting. <<Dummy function to stay inline with the dropdown API>>
-	local function GetMultiselect() return false end-- Query the multi-select flag. <<Dummy function to stay inline with the dropdown API>>
-	local function SetItemDisabled(self, key) end-- Disable one item in the list. <<Dummy function to stay inline with the dropdown API>>
-
-	local function SetDisabled(self, disabled) -- Disable the widget.
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.frame.displayButton:SetBackdropColor(.2,.2,.2,1)
-		else
-			self.frame:Enable()
-			self.frame.displayButton:SetBackdropColor(1,1,1,1)
-		end
-	end
-
-	local function textSort(a,b)
-		return string.upper(a) < string.upper(b)
-	end
-
-	local sortedlist = {}
-	local function ToggleDrop(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-			AceGUI:ClearFocus()
-		else
-			AceGUI:SetFocus(self)
-			self.dropdown = AGSMW:GetDropDownFrame()
-			self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
-			for k, v in pairs(self.list) do
-				sortedlist[#sortedlist+1] = k
-			end
-			table.sort(sortedlist, textSort)
-			for i, k in ipairs(sortedlist) do
-				local f = GetContentLine()
-				f.text:SetText(k)
-				--print(k)
-				if k == self.value then
-					f.check:Show()
-				end
-				f.obj = self
-				f.dropdown = self.dropdown
-				self.dropdown:AddFrame(f)
-			end
-			wipe(sortedlist)
-		end
-	end
-
-	local function ClearFocus(self)
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function Drop_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Drop_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Constructor()
-		local frame = AGSMW:GetBaseFrameWithWindow()
-		local self = {}
-
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		frame.dropButton.obj = self
-		frame.dropButton:SetScript("OnEnter", Drop_OnEnter)
-		frame.dropButton:SetScript("OnLeave", Drop_OnLeave)
-		frame.dropButton:SetScript("OnClick",ToggleDrop)
-		frame:SetScript("OnHide", OnHide)
-
-		self.alignoffset = 31
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.ClearFocus = ClearFocus
-		self.SetText = SetText
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		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.ToggleDrop = ToggleDrop
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua
deleted file mode 100644
index 8d3864a..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua
+++ /dev/null
@@ -1,228 +0,0 @@
--- Widget is based on the AceGUIWidget-DropDown.lua supplied with AceGUI-3.0
--- Widget created by Yssaril
-
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
-
-do
-	local widgetType = "LSM30_Border"
-	local widgetVersion = 9
-
-	local contentFrameCache = {}
-	local function ReturnSelf(self)
-		self:ClearAllPoints()
-		self:Hide()
-		self.check:Hide()
-		table.insert(contentFrameCache, self)
-	end
-
-	local function ContentOnClick(this, button)
-		local self = this.obj
-		self:Fire("OnValueChanged", this.text:GetText())
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function ContentOnEnter(this, button)
-		local self = this.obj
-		local text = this.text:GetText()
-		local border = self.list[text] ~= text and self.list[text] or Media:Fetch('border',text)
-		this.dropdown:SetBackdrop({edgeFile = border,
-			bgFile=[[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
-			tile = true, tileSize = 16, edgeSize = 16,
-			insets = { left = 4, right = 4, top = 4, bottom = 4 }})
-	end
-
-	local function GetContentLine()
-		local frame
-		if next(contentFrameCache) then
-			frame = table.remove(contentFrameCache)
-		else
-			frame = CreateFrame("Button", nil, UIParent)
-				--frame:SetWidth(200)
-				frame:SetHeight(18)
-				frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
-				frame:SetScript("OnClick", ContentOnClick)
-				frame:SetScript("OnEnter", ContentOnEnter)
-			local check = frame:CreateTexture("OVERLAY")
-				check:SetWidth(16)
-				check:SetHeight(16)
-				check:SetPoint("LEFT",frame,"LEFT",1,-1)
-				check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-				check:Hide()
-			frame.check = check
-			local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
-				text:SetPoint("LEFT", check, "RIGHT", 1, 0)
-				text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
-				text:SetJustifyH("LEFT")
-				text:SetText("Test Test Test Test Test Test Test")
-			frame.text = text
-			frame.ReturnSelf = ReturnSelf
-		end
-		frame:Show()
-		return frame
-	end
-
-	local function OnAcquire(self)
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	local function OnRelease(self)
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetValue(self, value) -- Set the value to an item in the List.
-		if self.list then
-			self:SetText(value or "")
-		end
-		self.value = value
-	end
-
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function SetList(self, list) -- Set the list of values for the dropdown (key => value pairs)
-		self.list = list or Media:HashTable("border")
-	end
-
-
-	local function SetText(self, text) -- Set the text displayed in the box.
-		self.frame.text:SetText(text or "")
-		local border = self.list[text] ~= text and self.list[text] or Media:Fetch('border',text)
-
-		self.frame.displayButton:SetBackdrop({edgeFile = border,
-			bgFile=[[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
-			tile = true, tileSize = 16, edgeSize = 16,
-			insets = { left = 4, right = 4, top = 4, bottom = 4 }})
-	end
-
-	local function SetLabel(self, text) -- Set the text for the label.
-		self.frame.label:SetText(text or "")
-	end
-
-	local function AddItem(self, key, value) -- Add an item to the list.
-		self.list = self.list or {}
-		self.list[key] = value
-	end
-	local SetItemValue = AddItem -- Set the value of a item in the list. <<same as adding a new item>>
-
-	local function SetMultiselect(self, flag) end -- Toggle multi-selecting. <<Dummy function to stay inline with the dropdown API>>
-	local function GetMultiselect() return false end-- Query the multi-select flag. <<Dummy function to stay inline with the dropdown API>>
-	local function SetItemDisabled(self, key) end-- Disable one item in the list. <<Dummy function to stay inline with the dropdown API>>
-
-	local function SetDisabled(self, disabled) -- Disable the widget.
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-
-	local function textSort(a,b)
-		return string.upper(a) < string.upper(b)
-	end
-
-	local sortedlist = {}
-	local function ToggleDrop(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-			AceGUI:ClearFocus()
-		else
-			AceGUI:SetFocus(self)
-			self.dropdown = AGSMW:GetDropDownFrame()
-			self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
-			for k, v in pairs(self.list) do
-				sortedlist[#sortedlist+1] = k
-			end
-			table.sort(sortedlist, textSort)
-			for i, k in ipairs(sortedlist) do
-				local f = GetContentLine()
-				f.text:SetText(k)
-				--print(k)
-				if k == self.value then
-					f.check:Show()
-				end
-				f.obj = self
-				f.dropdown = self.dropdown
-				self.dropdown:AddFrame(f)
-			end
-			wipe(sortedlist)
-		end
-	end
-
-	local function ClearFocus(self)
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function Drop_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Drop_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Constructor()
-		local frame = AGSMW:GetBaseFrameWithWindow()
-		local self = {}
-
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		frame.dropButton.obj = self
-		frame.dropButton:SetScript("OnEnter", Drop_OnEnter)
-		frame.dropButton:SetScript("OnLeave", Drop_OnLeave)
-		frame.dropButton:SetScript("OnClick",ToggleDrop)
-		frame:SetScript("OnHide", OnHide)
-
-		self.alignoffset = 31
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.ClearFocus = ClearFocus
-		self.SetText = SetText
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		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.ToggleDrop = ToggleDrop
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua
deleted file mode 100644
index d26f621..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua
+++ /dev/null
@@ -1,214 +0,0 @@
--- Widget is based on the AceGUIWidget-DropDown.lua supplied with AceGUI-3.0
--- Widget created by Yssaril
-
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
-
-do
-	local widgetType = "LSM30_Font"
-	local widgetVersion = 9
-
-	local contentFrameCache = {}
-	local function ReturnSelf(self)
-		self:ClearAllPoints()
-		self:Hide()
-		self.check:Hide()
-		table.insert(contentFrameCache, self)
-	end
-
-	local function ContentOnClick(this, button)
-		local self = this.obj
-		self:Fire("OnValueChanged", this.text:GetText())
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function GetContentLine()
-		local frame
-		if next(contentFrameCache) then
-			frame = table.remove(contentFrameCache)
-		else
-			frame = CreateFrame("Button", nil, UIParent)
-				--frame:SetWidth(200)
-				frame:SetHeight(18)
-				frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
-				frame:SetScript("OnClick", ContentOnClick)
-			local check = frame:CreateTexture("OVERLAY")
-				check:SetWidth(16)
-				check:SetHeight(16)
-				check:SetPoint("LEFT",frame,"LEFT",1,-1)
-				check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-				check:Hide()
-			frame.check = check
-			local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
-				text:SetPoint("LEFT", check, "RIGHT", 1, 0)
-				text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
-				text:SetJustifyH("LEFT")
-				text:SetText("Test Test Test Test Test Test Test")
-			frame.text = text
-			frame.ReturnSelf = ReturnSelf
-		end
-		frame:Show()
-		return frame
-	end
-
-	local function OnAcquire(self)
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	local function OnRelease(self)
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetValue(self, value) -- Set the value to an item in the List.
-		if self.list then
-			self:SetText(value or "")
-		end
-		self.value = value
-	end
-
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function SetList(self, list) -- Set the list of values for the dropdown (key => value pairs)
-		self.list = list or Media:HashTable("font")
-	end
-
-	local function SetText(self, text) -- Set the text displayed in the box.
-		self.frame.text:SetText(text or "")
-		local font = self.list[text] ~= text and self.list[text] or Media:Fetch('font',text)
-		local _, size, outline= self.frame.text:GetFont()
-		self.frame.text:SetFont(font,size,outline)
-	end
-
-	local function SetLabel(self, text) -- Set the text for the label.
-		self.frame.label:SetText(text or "")
-	end
-
-	local function AddItem(self, key, value) -- Add an item to the list.
-		self.list = self.list or {}
-		self.list[key] = value
-	end
-	local SetItemValue = AddItem -- Set the value of a item in the list. <<same as adding a new item>>
-
-	local function SetMultiselect(self, flag) end -- Toggle multi-selecting. <<Dummy function to stay inline with the dropdown API>>
-	local function GetMultiselect() return false end-- Query the multi-select flag. <<Dummy function to stay inline with the dropdown API>>
-	local function SetItemDisabled(self, key) end-- Disable one item in the list. <<Dummy function to stay inline with the dropdown API>>
-
-	local function SetDisabled(self, disabled) -- Disable the widget.
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-
-	local function textSort(a,b)
-		return string.upper(a) < string.upper(b)
-	end
-
-	local sortedlist = {}
-	local function ToggleDrop(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-			AceGUI:ClearFocus()
-		else
-			AceGUI:SetFocus(self)
-			self.dropdown = AGSMW:GetDropDownFrame()
-			self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
-			for k, v in pairs(self.list) do
-				sortedlist[#sortedlist+1] = k
-			end
-			table.sort(sortedlist, textSort)
-			for i, k in ipairs(sortedlist) do
-				local f = GetContentLine()
-				local _, size, outline= f.text:GetFont()
-				local font = self.list[k] ~= k and self.list[k] or Media:Fetch('font',k)
-				f.text:SetFont(font,size,outline)
-				f.text:SetText(k)
-				if k == self.value then
-					f.check:Show()
-				end
-				f.obj = self
-				self.dropdown:AddFrame(f)
-			end
-			wipe(sortedlist)
-		end
-	end
-
-	local function ClearFocus(self)
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function Drop_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Drop_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Constructor()
-		local frame = AGSMW:GetBaseFrame()
-		local self = {}
-
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		frame.dropButton.obj = self
-		frame.dropButton:SetScript("OnEnter", Drop_OnEnter)
-		frame.dropButton:SetScript("OnLeave", Drop_OnLeave)
-		frame.dropButton:SetScript("OnClick",ToggleDrop)
-		frame:SetScript("OnHide", OnHide)
-
-		self.alignoffset = 31
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.ClearFocus = ClearFocus
-		self.SetText = SetText
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		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.ToggleDrop = ToggleDrop
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua
deleted file mode 100644
index 8c67936..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua
+++ /dev/null
@@ -1,262 +0,0 @@
--- Widget is based on the AceGUIWidget-DropDown.lua supplied with AceGUI-3.0
--- Widget created by Yssaril
-
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
-
-do
-	local widgetType = "LSM30_Sound"
-	local widgetVersion = 9
-
-	local contentFrameCache = {}
-	local function ReturnSelf(self)
-		self:ClearAllPoints()
-		self:Hide()
-		self.check:Hide()
-		table.insert(contentFrameCache, self)
-	end
-
-	local function ContentOnClick(this, button)
-		local self = this.obj
-		self:Fire("OnValueChanged", this.text:GetText())
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function ContentSpeakerOnClick(this, button)
-		local self = this.frame.obj
-		local sound = this.frame.text:GetText()
-		PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound))
-	end
-
-	local function GetContentLine()
-		local frame
-		if next(contentFrameCache) then
-			frame = table.remove(contentFrameCache)
-		else
-			frame = CreateFrame("Button", nil, UIParent)
-				--frame:SetWidth(200)
-				frame:SetHeight(18)
-				frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
-				frame:SetScript("OnClick", ContentOnClick)
-			local check = frame:CreateTexture("OVERLAY")
-				check:SetWidth(16)
-				check:SetHeight(16)
-				check:SetPoint("LEFT",frame,"LEFT",1,-1)
-				check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-				check:Hide()
-			frame.check = check
-
-			local soundbutton = CreateFrame("Button", nil, frame)
-				soundbutton:SetWidth(16)
-				soundbutton:SetHeight(16)
-				soundbutton:SetPoint("RIGHT",frame,"RIGHT",-1,0)
-				soundbutton.frame = frame
-				soundbutton:SetScript("OnClick", ContentSpeakerOnClick)
-			frame.soundbutton = soundbutton
-
-			local speaker = soundbutton:CreateTexture(nil, "BACKGROUND")
-				speaker:SetTexture("Interface\\Common\\VoiceChat-Speaker")
-				speaker:SetAllPoints(soundbutton)
-			frame.speaker = speaker
-			local speakeron = soundbutton:CreateTexture(nil, "HIGHLIGHT")
-				speakeron:SetTexture("Interface\\Common\\VoiceChat-On")
-				speakeron:SetAllPoints(soundbutton)
-			frame.speakeron = speakeron
-
-			local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
-				text:SetPoint("LEFT", check, "RIGHT", 1, 0)
-				text:SetPoint("RIGHT", soundbutton, "LEFT", -2, 0)
-				text:SetJustifyH("LEFT")
-				text:SetText("Test Test Test Test Test Test Test")
-			frame.text = text
-			frame.ReturnSelf = ReturnSelf
-		end
-		frame:Show()
-		return frame
-	end
-
-	local function OnAcquire(self)
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	local function OnRelease(self)
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetValue(self, value) -- Set the value to an item in the List.
-		if self.list then
-			self:SetText(value or "")
-		end
-		self.value = value
-	end
-
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function SetList(self, list) -- Set the list of values for the dropdown (key => value pairs)
-		self.list = list or Media:HashTable("sound")
-	end
-
-	local function SetText(self, text) -- Set the text displayed in the box.
-		self.frame.text:SetText(text or "")
-	end
-
-	local function SetLabel(self, text) -- Set the text for the label.
-		self.frame.label:SetText(text or "")
-	end
-
-	local function AddItem(self, key, value) -- Add an item to the list.
-		self.list = self.list or {}
-		self.list[key] = value
-	end
-	local SetItemValue = AddItem -- Set the value of a item in the list. <<same as adding a new item>>
-
-	local function SetMultiselect(self, flag) end -- Toggle multi-selecting. <<Dummy function to stay inline with the dropdown API>>
-	local function GetMultiselect() return false end-- Query the multi-select flag. <<Dummy function to stay inline with the dropdown API>>
-	local function SetItemDisabled(self, key) end-- Disable one item in the list. <<Dummy function to stay inline with the dropdown API>>
-
-	local function SetDisabled(self, disabled) -- Disable the widget.
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.speaker:SetDesaturated(true)
-			self.speakeron:SetDesaturated(true)
-		else
-			self.frame:Enable()
-			self.speaker:SetDesaturated(false)
-			self.speakeron:SetDesaturated(false)
-		end
-	end
-
-	local function textSort(a,b)
-		return string.upper(a) < string.upper(b)
-	end
-
-	local sortedlist = {}
-	local function ToggleDrop(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-			AceGUI:ClearFocus()
-		else
-			AceGUI:SetFocus(self)
-			self.dropdown = AGSMW:GetDropDownFrame()
-			self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
-			for k, v in pairs(self.list) do
-				sortedlist[#sortedlist+1] = k
-			end
-			table.sort(sortedlist, textSort)
-			for i, k in ipairs(sortedlist) do
-				local f = GetContentLine()
-				f.text:SetText(k)
-				if k == self.value then
-					f.check:Show()
-				end
-				f.obj = self
-				self.dropdown:AddFrame(f)
-			end
-			wipe(sortedlist)
-		end
-	end
-
-	local function ClearFocus(self)
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function Drop_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Drop_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function WidgetPlaySound(this)
-		local self = this.obj
-		local sound = self.frame.text:GetText()
-		PlaySoundFile(self.list[sound] ~= sound and self.list[sound] or Media:Fetch('sound',sound))
-	end
-
-	local function Constructor()
-		local frame = AGSMW:GetBaseFrame()
-		local self = {}
-
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		frame.dropButton.obj = self
-		frame.dropButton:SetScript("OnEnter", Drop_OnEnter)
-		frame.dropButton:SetScript("OnLeave", Drop_OnLeave)
-		frame.dropButton:SetScript("OnClick",ToggleDrop)
-		frame:SetScript("OnHide", OnHide)
-
-
-		local soundbutton = CreateFrame("Button", nil, frame)
-			soundbutton:SetWidth(16)
-			soundbutton:SetHeight(16)
-			soundbutton:SetPoint("LEFT",frame.DLeft,"LEFT",26,1)
-			soundbutton:SetScript("OnClick", WidgetPlaySound)
-			soundbutton.obj = self
-		self.soundbutton = soundbutton
-		frame.text:SetPoint("LEFT",soundbutton,"RIGHT",2,0)
-
-
-		local speaker = soundbutton:CreateTexture(nil, "BACKGROUND")
-			speaker:SetTexture("Interface\\Common\\VoiceChat-Speaker")
-			speaker:SetAllPoints(soundbutton)
-		self.speaker = speaker
-		local speakeron = soundbutton:CreateTexture(nil, "HIGHLIGHT")
-			speakeron:SetTexture("Interface\\Common\\VoiceChat-On")
-			speakeron:SetAllPoints(soundbutton)
-		self.speakeron = speakeron
-
-		self.alignoffset = 31
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.ClearFocus = ClearFocus
-		self.SetText = SetText
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		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.ToggleDrop = ToggleDrop
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua
deleted file mode 100644
index 8abbd4a..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua
+++ /dev/null
@@ -1,230 +0,0 @@
--- Widget is based on the AceGUIWidget-DropDown.lua supplied with AceGUI-3.0
--- Widget created by Yssaril
-
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-local AGSMW = LibStub("AceGUISharedMediaWidgets-1.0")
-
-do
-	local widgetType = "LSM30_Statusbar"
-	local widgetVersion = 9
-
-	local contentFrameCache = {}
-	local function ReturnSelf(self)
-		self:ClearAllPoints()
-		self:Hide()
-		self.check:Hide()
-		table.insert(contentFrameCache, self)
-	end
-
-	local function ContentOnClick(this, button)
-		local self = this.obj
-		self:Fire("OnValueChanged", this.text:GetText())
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function GetContentLine()
-		local frame
-		if next(contentFrameCache) then
-			frame = table.remove(contentFrameCache)
-		else
-			frame = CreateFrame("Button", nil, UIParent)
-				--frame:SetWidth(200)
-				frame:SetHeight(18)
-				frame:SetHighlightTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]], "ADD")
-				frame:SetScript("OnClick", ContentOnClick)
-			local check = frame:CreateTexture("OVERLAY")
-				check:SetWidth(16)
-				check:SetHeight(16)
-				check:SetPoint("LEFT",frame,"LEFT",1,-1)
-				check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-				check:Hide()
-			frame.check = check
-			local bar = frame:CreateTexture("ARTWORK")
-				bar:SetHeight(16)
-				bar:SetPoint("LEFT",check,"RIGHT",1,0)
-				bar:SetPoint("RIGHT",frame,"RIGHT",-1,0)
-			frame.bar = bar
-			local text = frame:CreateFontString(nil,"OVERLAY","GameFontWhite")
-
-				local font, size = text:GetFont()
-				text:SetFont(font,size,"OUTLINE")
-
-				text:SetPoint("LEFT", check, "RIGHT", 3, 0)
-				text:SetPoint("RIGHT", frame, "RIGHT", -2, 0)
-				text:SetJustifyH("LEFT")
-				text:SetText("Test Test Test Test Test Test Test")
-			frame.text = text
-			frame.ReturnSelf = ReturnSelf
-		end
-		frame:Show()
-		return frame
-	end
-
-	local function OnAcquire(self)
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	local function OnRelease(self)
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	local function SetValue(self, value) -- Set the value to an item in the List.
-		if self.list then
-			self:SetText(value or "")
-		end
-		self.value = value
-	end
-
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function SetList(self, list) -- Set the list of values for the dropdown (key => value pairs)
-		self.list = list or Media:HashTable("statusbar")
-	end
-
-
-	local function SetText(self, text) -- Set the text displayed in the box.
-		self.frame.text:SetText(text or "")
-		local statusbar = self.list[text] ~= text and self.list[text] or Media:Fetch('statusbar',text)
-		self.bar:SetTexture(statusbar)
-	end
-
-	local function SetLabel(self, text) -- Set the text for the label.
-		self.frame.label:SetText(text or "")
-	end
-
-	local function AddItem(self, key, value) -- Add an item to the list.
-		self.list = self.list or {}
-		self.list[key] = value
-	end
-	local SetItemValue = AddItem -- Set the value of a item in the list. <<same as adding a new item>>
-
-	local function SetMultiselect(self, flag) end -- Toggle multi-selecting. <<Dummy function to stay inline with the dropdown API>>
-	local function GetMultiselect() return false end-- Query the multi-select flag. <<Dummy function to stay inline with the dropdown API>>
-	local function SetItemDisabled(self, key) end-- Disable one item in the list. <<Dummy function to stay inline with the dropdown API>>
-
-	local function SetDisabled(self, disabled) -- Disable the widget.
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-
-	local function textSort(a,b)
-		return string.upper(a) < string.upper(b)
-	end
-
-	local sortedlist = {}
-	local function ToggleDrop(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-			AceGUI:ClearFocus()
-		else
-			AceGUI:SetFocus(self)
-			self.dropdown = AGSMW:GetDropDownFrame()
-			self.dropdown:SetPoint("TOPLEFT", self.frame, "BOTTOMLEFT")
-			for k, v in pairs(self.list) do
-				sortedlist[#sortedlist+1] = k
-			end
-			table.sort(sortedlist, textSort)
-			for i, k in ipairs(sortedlist) do
-				local f = GetContentLine()
-				f.text:SetText(k)
-				--print(k)
-				if k == self.value then
-					f.check:Show()
-				end
-
-				local statusbar = self.list[k] ~= k and self.list[k] or Media:Fetch('statusbar',k)
-				f.bar:SetTexture(statusbar)
-				f.obj = self
-				f.dropdown = self.dropdown
-				self.dropdown:AddFrame(f)
-			end
-			wipe(sortedlist)
-		end
-	end
-
-	local function ClearFocus(self)
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.dropdown then
-			self.dropdown = AGSMW:ReturnDropDownFrame(self.dropdown)
-		end
-	end
-
-	local function Drop_OnEnter(this)
-		this.obj:Fire("OnEnter")
-	end
-
-	local function Drop_OnLeave(this)
-		this.obj:Fire("OnLeave")
-	end
-
-	local function Constructor()
-		local frame = AGSMW:GetBaseFrame()
-		local self = {}
-
-		self.type = widgetType
-		self.frame = frame
-		frame.obj = self
-		frame.dropButton.obj = self
-		frame.dropButton:SetScript("OnEnter", Drop_OnEnter)
-		frame.dropButton:SetScript("OnLeave", Drop_OnLeave)
-		frame.dropButton:SetScript("OnClick",ToggleDrop)
-		frame:SetScript("OnHide", OnHide)
-
-		local bar = frame:CreateTexture(nil, "ARTWORK")
-			bar:SetPoint("TOPLEFT", frame,"TOPLEFT",6,-25)
-			bar:SetPoint("BOTTOMRIGHT", frame,"BOTTOMRIGHT", -21, 5)
-		self.bar = bar
-
-		self.alignoffset = 31
-
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.ClearFocus = ClearFocus
-		self.SetText = SetText
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		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.ToggleDrop = ToggleDrop
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion)
-
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/prototypes.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/prototypes.lua
deleted file mode 100644
index ddd3a20..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/prototypes.lua
+++ /dev/null
@@ -1,267 +0,0 @@
--- Widget created by Yssaril
---[===[@debug@
-local DataVersion = 9001 -- dev version always overwrites everything else :)
---@end-debug@]===]
---@non-debug@
-local DataVersion = 37
---@end-non-debug@
-local AGSMW = LibStub:NewLibrary("AceGUISharedMediaWidgets-1.0", DataVersion)
-
-if not AGSMW then
-  return	-- already loaded and no upgrade necessary
-end
-
-LoadAddOn("LibSharedMedia-3.0")
-local AceGUI = LibStub("AceGUI-3.0")
-local Media = LibStub("LibSharedMedia-3.0")
-
-AGSMW = AGSMW or {}
-
-AceGUIWidgetLSMlists = {
-	['font'] = Media:HashTable("font"),
-	['sound'] = Media:HashTable("sound"),
-	['statusbar'] = Media:HashTable("statusbar"),
-	['border'] = Media:HashTable("border"),
-	['background'] = Media:HashTable("background"),
-}
-
-do
-	local function disable(frame)
-		frame.label:SetTextColor(.5,.5,.5)
-		frame.text:SetTextColor(.5,.5,.5)
-		frame.dropButton:Disable()
-		if frame.displayButtonFont then
-			frame.displayButtonFont:SetTextColor(.5,.5,.5)
-			frame.displayButton:Disable()
-		end
-	end
-
-	local function enable(frame)
-		frame.label:SetTextColor(1,.82,0)
-		frame.text:SetTextColor(1,1,1)
-		frame.dropButton:Enable()
-		if frame.displayButtonFont then
-			frame.displayButtonFont:SetTextColor(1,1,1)
-			frame.displayButton:Enable()
-		end
-	end
-
-	local displayButtonBackdrop = {
-		edgeFile = "Interface/Tooltips/UI-Tooltip-Border",
-		tile = true, tileSize = 16, edgeSize = 16,
-		insets = { left = 4, right = 4, top = 4, bottom = 4 },
-	}
-
-	-- create or retrieve BaseFrame
-	function AGSMW:GetBaseFrame()
-		local frame = CreateFrame("Frame", nil, UIParent)
-		frame:SetHeight(44)
-		frame:SetWidth(200)
-		frame:SetPoint("CENTER", UIParent, "CENTER")
-
-		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:SetText("")
-		frame.label = label
-
-		local DLeft = frame:CreateTexture(nil, "ARTWORK")
-			DLeft:SetWidth(25)
-			DLeft:SetHeight(64)
-			DLeft:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT", -17, -21)
-			DLeft:SetTexture([[Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame]])
-			DLeft:SetTexCoord(0, 0.1953125, 0, 1)
-		frame.DLeft = DLeft
-		local DRight = frame:CreateTexture(nil, "ARTWORK")
-			DRight:SetWidth(25)
-			DRight:SetHeight(64)
-			DRight:SetPoint("TOP", DLeft, "TOP")
-			DRight:SetPoint("RIGHT", frame, "RIGHT", 17, 0)
-			DRight:SetTexture([[Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame]])
-			DRight:SetTexCoord(0.8046875, 1, 0, 1)
-		frame.DRight = DRight
-		local DMiddle = frame:CreateTexture(nil, "ARTWORK")
-			DMiddle:SetHeight(64)
-			DMiddle:SetPoint("TOP", DLeft, "TOP")
-			DMiddle:SetPoint("LEFT", DLeft, "RIGHT")
-			DMiddle:SetPoint("RIGHT", DRight, "LEFT")
-			DMiddle:SetTexture([[Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame]])
-			DMiddle:SetTexCoord(0.1953125, 0.8046875, 0, 1)
-		frame.DMiddle = DMiddle
-
-		local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlightSmall")
-			text:SetPoint("RIGHT",DRight,"RIGHT",-43,1)
-			text:SetPoint("LEFT",DLeft,"LEFT",26,1)
-			text:SetJustifyH("RIGHT")
-			text:SetHeight(18)
-			text:SetText("")
-		frame.text = text
-
-		local dropButton = CreateFrame("Button", nil, frame)
-			dropButton:SetWidth(24)
-			dropButton:SetHeight(24)
-			dropButton:SetPoint("TOPRIGHT", DRight, "TOPRIGHT", -16, -18)
-			dropButton:SetNormalTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Up]])
-			dropButton:SetPushedTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Down]])
-			dropButton:SetDisabledTexture([[Interface\ChatFrame\UI-ChatIcon-ScrollDown-Disabled]])
-			dropButton:SetHighlightTexture([[Interface\Buttons\UI-Common-MouseHilight]], "ADD")
-		frame.dropButton = dropButton
-
-		frame.Disable = disable
-		frame.Enable = enable
-		return frame
-	end
-
-	function AGSMW:GetBaseFrameWithWindow()
-		local frame = self:GetBaseFrame()
-
-		local displayButton = CreateFrame("Button", nil, frame)
-			displayButton:SetHeight(42)
-			displayButton:SetWidth(42)
-			displayButton:SetPoint("TOPLEFT", frame, "TOPLEFT", 1, -2)
-			displayButton:SetBackdrop(displayButtonBackdrop)
-			displayButton:SetBackdropBorderColor(.5, .5, .5)
-		frame.displayButton = displayButton
-
-		frame.label:SetPoint("TOPLEFT",displayButton,"TOPRIGHT",1,2)
-
-		frame.DLeft:SetPoint("BOTTOMLEFT", displayButton, "BOTTOMRIGHT", -17, -20)
-
-		return frame
-	end
-
-end
-
-do
-
-	local sliderBackdrop = {
-		["bgFile"] = [[Interface\Buttons\UI-SliderBar-Background]],
-		["edgeFile"] = [[Interface\Buttons\UI-SliderBar-Border]],
-		["tile"] = true,
-		["edgeSize"] = 8,
-		["tileSize"] = 8,
-		["insets"] = {
-			["left"] = 3,
-			["right"] = 3,
-			["top"] = 3,
-			["bottom"] = 3,
-		},
-	}
-	local frameBackdrop = {
-		bgFile=[[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
-		edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
-		tile = true, tileSize = 32, edgeSize = 32,
-		insets = { left = 11, right = 12, top = 12, bottom = 9 },
-	}
-
-	local function OnMouseWheel(self, dir)
-		self.slider:SetValue(self.slider:GetValue()+(15*dir*-1))
-	end
-
-	local function AddFrame(self, frame)
-		frame:SetParent(self.contentframe)
-		local strata = self:GetFrameStrata()
-		frame:SetFrameStrata(strata)
-		local level =  self:GetFrameLevel() + 100
-		frame:SetFrameLevel(level)
-		if next(self.contentRepo) then
-			frame:SetPoint("TOPLEFT", self.contentRepo[#self.contentRepo], "BOTTOMLEFT", 0, 0)
-			frame:SetPoint("RIGHT", self.contentframe, "RIGHT", 0, 0)
-			self.contentframe:SetHeight(self.contentframe:GetHeight() + frame:GetHeight())
-			self.contentRepo[#self.contentRepo+1] = frame
-		else
-			self.contentframe:SetHeight(frame:GetHeight())
-			frame:SetPoint("TOPLEFT", self.contentframe, "TOPLEFT", 0, 0)
-			frame:SetPoint("RIGHT", self.contentframe, "RIGHT", 0, 0)
-			self.contentRepo[1] = frame
-		end
-		if self.contentframe:GetHeight() > UIParent:GetHeight()*2/5 - 20 then
-			self.scrollframe:SetWidth(146)
-			self:SetHeight(UIParent:GetHeight()*2/5)
-			self.slider:Show()
-			self:SetScript("OnMouseWheel", OnMouseWheel)
-			self.scrollframe:UpdateScrollChildRect()
-			self.slider:SetMinMaxValues(0, self.contentframe:GetHeight()-self.scrollframe:GetHeight())
-		else
-			self.scrollframe:SetWidth(160)
-			self:SetHeight(self.contentframe:GetHeight()+25)
-			self.slider:Hide()
-			self:SetScript("OnMouseWheel", nil)
-			self.scrollframe:UpdateScrollChildRect()
-			self.slider:SetMinMaxValues(0, 0)
-		end
-		self.contentframe:SetWidth(self.scrollframe:GetWidth())
-	end
-
-	local function ClearFrames(self)
-		for i, frame in ipairs(self.contentRepo) do
-			frame:ReturnSelf()
-			self.contentRepo[i] = nil
-		end
-	end
-
-	local function slider_OnValueChanged(self, value)
-		self.frame.scrollframe:SetVerticalScroll(value)
-	end
-
-	local DropDownCache = {}
-	function AGSMW:GetDropDownFrame()
-		local frame
-		if next(DropDownCache) then
-			frame = table.remove(DropDownCache)
-		else
-			frame = CreateFrame("Frame", nil, UIParent)
-				frame:SetClampedToScreen(true)
-				frame:SetWidth(188)
-				frame:SetBackdrop(frameBackdrop)
-				frame:SetFrameStrata("TOOLTIP")
-				frame:EnableMouseWheel(true)
-
-			local contentframe = CreateFrame("Frame", nil, frame)
-				contentframe:SetWidth(160)
-				contentframe:SetHeight(0)
-			frame.contentframe = contentframe
-			local scrollframe = CreateFrame("ScrollFrame", nil, frame)
-				scrollframe:SetPoint("TOPLEFT", frame, "TOPLEFT", 14, -13)
-				scrollframe:SetPoint("BOTTOM", frame, "BOTTOM", 0, 12)
-				scrollframe:SetWidth(160)
-				scrollframe:SetScrollChild(contentframe)
-			frame.scrollframe = scrollframe
-			local bgTex = frame:CreateTexture(nil, "ARTWORK")
-				bgTex:SetAllPoints(scrollframe)
-			frame.bgTex = bgTex
-
-			frame.AddFrame = AddFrame
-			frame.ClearFrames = ClearFrames
-			frame.contentRepo = {} -- store all our frames in here so we can get rid of them later
-			local slider = CreateFrame("Slider", nil, scrollframe)
-				slider:SetOrientation("VERTICAL")
-				slider:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -14, -10)
-				slider:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -14, 10)
-				slider:SetBackdrop(sliderBackdrop)
-				slider:SetThumbTexture([[Interface\Buttons\UI-SliderBar-Button-Vertical]])
-				slider:SetMinMaxValues(0, 1)
-				--slider:SetValueStep(1)
-				slider:SetWidth(12)
-				slider.frame = frame
-				slider:SetScript("OnValueChanged", slider_OnValueChanged)
-			frame.slider = slider
-		end
-		frame:SetHeight(UIParent:GetHeight()*2/5)
-		frame.slider:SetValue(0)
-		frame:Show()
-		return frame
-	end
-
-	function AGSMW:ReturnDropDownFrame(frame)
-		ClearFrames(frame)
-		frame:ClearAllPoints()
-		frame:Hide()
-		frame:SetBackdrop(frameBackdrop)
-		frame.bgTex:SetTexture(nil)
-		table.insert(DropDownCache, frame)
-		return nil
-	end
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/widget.xml b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/widget.xml
deleted file mode 100644
index 15cd102..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0-SharedMediaWidgets/widget.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="prototypes.lua" />
-	<Script file="FontWidget.lua" />
-	<Script file="SoundWidget.lua" />
-	<Script file="StatusbarWidget.lua" />
-	<Script file="BorderWidget.lua" />
-	<Script file="BackgroundWidget.lua" />
-</Ui>
\ No newline at end of file
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.lua
deleted file mode 100644
index 53295bb..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.lua
+++ /dev/null
@@ -1,805 +0,0 @@
---- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs.
--- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself
--- to create any custom GUI. There are more extensive examples in the test suite in the Ace3
--- stand-alone distribution.
---
--- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly,
--- as any "unknown" change to the widgets will cause addons that get your widget out of the widget pool
--- to misbehave. If you think some part of a widget should be modifiable, please open a ticket, and we"ll
--- implement a proper API to modify it.
--- @usage
--- local AceGUI = LibStub("AceGUI-3.0")
--- -- Create a container frame
--- local f = AceGUI:Create("Frame")
--- f:SetCallback("OnClose",function(widget) AceGUI:Release(widget) end)
--- f:SetTitle("AceGUI-3.0 Example")
--- f:SetStatusText("Status Bar")
--- f:SetLayout("Flow")
--- -- Create a button
--- local btn = AceGUI:Create("Button")
--- btn:SetWidth(170)
--- btn:SetText("Button !")
--- btn:SetCallback("OnClick", function() print("Click!") end)
--- -- Add the button to the container
--- f:AddChild(btn)
--- @class file
--- @name AceGUI-3.0
--- @release $Id: AceGUI-3.0.lua 924 2010-05-13 15:12:20Z nevcairiel $
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 33
-local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
-
-if not AceGUI then return end -- No upgrade needed
-
--- Lua APIs
-local tconcat, tremove, tinsert = table.concat, table.remove, table.insert
-local select, pairs, next, type = select, pairs, next, type
-local error, assert, loadstring = error, assert, loadstring
-local setmetatable, rawget, rawset = setmetatable, rawget, rawset
-local math_max = math.max
-
--- WoW APIs
-local UIParent = UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: geterrorhandler, LibStub
-
---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
-
---[[
-	 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, ...)
-	return Dispatchers[select("#", ...)](func, ...)
-end
-
--- Recycling functions
-local newWidget, delWidget
-do
-	-- Version Upgrade in Minor 29
-	-- Internal Storage of the objects changed, from an array table
-	-- to a hash table, and additionally we introduced versioning on
-	-- the widgets which would discard all widgets from a pre-29 version
-	-- anyway, so we just clear the storage now, and don't try to
-	-- convert the storage tables to the new format.
-	-- This should generally not cause *many* widgets to end up in trash,
-	-- since once dialogs are opened, all addons should be loaded already
-	-- and AceGUI should be on the latest version available on the users
-	-- setup.
-	-- -- nevcairiel - Nov 2nd, 2009
-	if oldminor and oldminor < 29 and AceGUI.objPools then
-		AceGUI.objPools = nil
-	end
-
-	AceGUI.objPools = AceGUI.objPools or {}
-	local objPools = AceGUI.objPools
-	--Returns a new instance, if none are available either returns a new table or calls the given contructor
-	function newWidget(type)
-		if not WidgetRegistry[type] then
-			error("Attempt to instantiate unknown widget type", 2)
-		end
-
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-
-		local newObj = next(objPools[type])
-		if not newObj then
-			newObj = WidgetRegistry[type]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[type]
-		else
-			objPools[type][newObj] = nil
-			-- if the widget is older then the latest, don't even try to reuse it
-			-- just forget about it, and grab a new one.
-			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
-				return newWidget(type)
-			end
-		end
-		return newObj
-	end
-	-- Releases an instance to the Pool
-	function delWidget(obj,type)
-		if not objPools[type] then
-			objPools[type] = {}
-		end
-		if objPools[type][obj] then
-			error("Attempt to Release Widget that is already released", 2)
-		end
-		objPools[type][obj] = true
-	end
-end
-
-
--------------------
--- API Functions --
--------------------
-
--- Gets a widget Object
-
---- Create a new Widget of the given type.
--- This function will instantiate a new widget (or use one from the widget pool), and call the
--- OnAcquire function on it, before returning.
--- @param type The type of the widget.
--- @return The newly created widget.
-function AceGUI:Create(type)
-	if WidgetRegistry[type] then
-		local widget = newWidget(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
-		-- Set the default Layout ("List")
-		safecall(widget.SetLayout, widget, "List")
-		safecall(widget.ResumeLayout, widget)
-		return widget
-	end
-end
-
---- Releases a widget Object.
--- This function calls OnRelease on the widget and places it back in the widget pool.
--- Any data on the widget is being erased, and the widget will be hidden.\\
--- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well.
--- @param widget The widget to release
-function AceGUI:Release(widget)
-	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(widget.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.relWidth = nil
-	widget.height = nil
-	widget.relHeight = nil
-	widget.noAutoHeight = nil
-	widget.frame:ClearAllPoints()
-	widget.frame:Hide()
-	widget.frame:SetParent(UIParent)
-	widget.frame.width = nil
-	widget.frame.height = nil
-	if widget.content then
-		widget.content.width = nil
-		widget.content.height = nil
-	end
-	delWidget(widget, widget.type)
-end
-
------------
--- Focus --
------------
-
-
---- Called when a widget has taken focus.
--- e.g. Dropdowns opening, Editboxes gaining kb focus
--- @param widget The widget that should be focused
-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
-
-	And the following members
-		frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes
-		type - the type of the object, same as the name given to :RegisterWidget()
-
-	Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet
-	It will be cleared automatically when a widget is released
-	Placing values directly into a widget object should be avoided
-
-	If the Widget can act as a container for other Widgets the following
-		content - frame or derivitive that children will be anchored to
-
-	The Widget can supply the following Optional Members
-		:OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data
-		:OnWidthSet(width) - Called when the width of the widget is changed
-		: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
-		:LayoutFinished(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 WidgetBase = AceGUI.WidgetBase
-
-	WidgetBase.SetParent = function(self, parent)
-		local frame = self.frame
-		frame:SetParent(nil)
-		frame:SetParent(parent.content)
-		self.parent = parent
-	end
-
-	WidgetBase.SetCallback = function(self, name, func)
-		if type(func) == "function" then
-			self.events[name] = func
-		end
-	end
-
-	WidgetBase.Fire = function(self, name, ...)
-		if self.events[name] then
-			local success, ret = safecall(self.events[name], self, name, ...)
-			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.SetRelativeWidth = function(self, width)
-		if width <= 0 or width > 1 then
-			error(":SetRelativeWidth(width): Invalid relative width.", 2)
-		end
-		self.relWidth = width
-		self.width = "relative"
-	end
-
-	WidgetBase.SetHeight = function(self, height)
-		self.frame:SetHeight(height)
-		self.frame.height = height
-		if self.OnHeightSet then
-			self:OnHeightSet(height)
-		end
-	end
-
-	--[[ WidgetBase.SetRelativeHeight = function(self, height)
-		if height <= 0 or height > 1 then
-			error(":SetRelativeHeight(height): Invalid relative height.", 2)
-		end
-		self.relHeight = height
-		self.height = "relative"
-	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, beforeWidget)
-		if beforeWidget then
-			local siblingIndex = 1
-			for _, widget in pairs(self.children) do
-				if widget == beforeWidget then
-					break
-				end
-				siblingIndex = siblingIndex + 1
-			end
-			tinsert(self.children, siblingIndex, child)
-		else
-			tinsert(self.children, child)
-		end
-		child:SetParent(self)
-		child.frame:Show()
-		self:DoLayout()
-	end
-
-	WidgetContainerBase.AddChildren = function(self, ...)
-		for i = 1, select("#", ...) do
-			local child = select(i, ...)
-			tinsert(self.children, child)
-			child:SetParent(self)
-			child.frame:Show()
-		end
-		self:DoLayout()
-	end
-
-	WidgetContainerBase.ReleaseChildren = function(self)
-		local children = self.children
-		for i = 1,#children do
-			AceGUI:Release(children[i])
-			children[i] = nil
-		end
-	end
-
-	WidgetContainerBase.SetLayout = function(self, Layout)
-		self.LayoutFunc = AceGUI:GetLayout(Layout)
-	end
-
-	WidgetContainerBase.SetAutoAdjustHeight = function(self, adjust)
-		if adjust then
-			self.noAutoHeight = nil
-		else
-			self.noAutoHeight = true
-		end
-	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
-
-	--- Register a widget-class as a container for newly created widgets.
-	-- @param widget The widget class
-	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")
-		return widget
-	end
-
-	--- Register a widget-class as a widget.
-	-- @param widget The widget class
-	function AceGUI:RegisterAsWidget(widget)
-		widget.userdata = {}
-		widget.events = {}
-		widget.base = WidgetBase
-		widget.frame.obj = widget
-		widget.frame:SetScript("OnSizeChanged", FrameResize)
-		setmetatable(widget, {__index = WidgetBase})
-		return widget
-	end
-end
-
-
-
-
-------------------
--- Widget API   --
-------------------
-
---- Registers a widget Constructor, this function returns a new instance of the Widget
--- @param Name The name of the widget
--- @param Constructor The widget constructor function
--- @param Version The version 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
--- @param Name The name of the layout
--- @param LayoutFunc Reference to the layout function
-function AceGUI:RegisterLayout(Name, LayoutFunc)
-	assert(type(LayoutFunc) == "function")
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	LayoutRegistry[Name] = LayoutFunc
-end
-
---- Get a Layout Function from the registry
--- @param Name The name of the layout
-function AceGUI:GetLayout(Name)
-	if type(Name) == "string" then
-		Name = Name:upper()
-	end
-	return LayoutRegistry[Name]
-end
-
-AceGUI.counts = AceGUI.counts or {}
-
---- A type-based counter to count the number of widgets created.
--- This is used by widgets that require a named frame, e.g. when a Blizzard
--- Template requires it.
--- @param type The widget type
-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
-
---- Return the number of created widgets for this type.
--- In contrast to GetNextWidgetNum, the number is not incremented.
--- @param type The widget type
-function AceGUI:GetWidgetCount(type)
-	return self.counts[type] or 0
-end
-
---- Return the version of the currently registered widget type.
--- @param type The widget type
-function AceGUI:GetWidgetVersion(type)
-	return WidgetVersions[type]
-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 = 1, #children do
-			local child = children[i]
-
-			local frame = child.frame
-			frame:ClearAllPoints()
-			frame:Show()
-			if i == 1 then
-				frame:SetPoint("TOPLEFT", content)
-			else
-				frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT")
-			end
-
-			if child.width == "fill" then
-				child:SetWidth(width)
-				frame:SetPoint("RIGHT", content)
-
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			elseif child.width == "relative" then
-				child:SetWidth(width * child.relWidth)
-
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			end
-
-			height = height + (frame.height or frame:GetHeight() or 0)
-		end
-		safecall(content.obj.LayoutFinished, content.obj, nil, height)
-	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 = 1, #children do
-			local child = children[i]
-			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
-			-- HACK: Why did we set a frameoffset of (frameheight / 2) ?
-			-- That was moving all widgets half the widgets size down, is that intended?
-			-- Actually, it seems to be neccessary for many cases, we'll leave it in for now.
-			-- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them.
-			-- TODO: Investigate moar!
-			frameoffset = child.alignoffset or (frameheight / 2)
-
-			if child.width == "relative" then
-				framewidth = width * child.relWidth
-			end
-
-			frame:Show()
-			frame:ClearAllPoints()
-			if i == 1 then
-				-- anchor the first control to the top left
-				frame:SetPoint("TOPLEFT", content)
-				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
-					if isfullheight then
-						-- a previous row has already filled the entire height, there's nothing we can usefully do anymore
-						-- (maybe error/warn about this?)
-						break
-					end
-					--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 = framewidth
-					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)
-
-				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 child.width == "relative" then
-				child:SetWidth(width * child.relWidth)
-
-				if child.DoLayout then
-					child:DoLayout()
-				end
-			elseif oversize then
-				if width > 1 then
-					frame:SetPoint("RIGHT", content)
-				end
-			end
-
-			if child.height == "fill" then
-				frame:SetPoint("BOTTOM", content)
-				isfullheight = true
-			end
-		end
-
-		--anchor the last row, if its full height needs a special case since  its height has just been changed by the anchor
-		if isfullheight then
-			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height)
-		elseif rowstart then
-			rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3))
-		end
-
-		height = height + rowheight + 3
-		safecall(content.obj.LayoutFinished, content.obj, nil, height)
-	end)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.xml b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.xml
deleted file mode 100644
index b515077..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/AceGUI-3.0.xml
+++ /dev/null
@@ -1,28 +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"/>
-	<!-- Container -->
-	<Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-DropDownGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-Frame.lua"/>
-	<Script file="widgets\AceGUIContainer-InlineGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-ScrollFrame.lua"/>
-	<Script file="widgets\AceGUIContainer-SimpleGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-TabGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-TreeGroup.lua"/>
-	<Script file="widgets\AceGUIContainer-Window.lua"/>
-	<!-- Widgets -->
-	<Script file="widgets\AceGUIWidget-Button.lua"/>
-	<Script file="widgets\AceGUIWidget-CheckBox.lua"/>
-	<Script file="widgets\AceGUIWidget-ColorPicker.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown.lua"/>
-	<Script file="widgets\AceGUIWidget-DropDown-Items.lua"/>
-	<Script file="widgets\AceGUIWidget-EditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-Heading.lua"/>
-	<Script file="widgets\AceGUIWidget-Icon.lua"/>
-	<Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/>
-	<Script file="widgets\AceGUIWidget-Keybinding.lua"/>
-	<Script file="widgets\AceGUIWidget-Label.lua"/>
-	<Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/>
-	<Script file="widgets\AceGUIWidget-Slider.lua"/>
-</Ui>
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
deleted file mode 100644
index 7f92d82..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
+++ /dev/null
@@ -1,133 +0,0 @@
---[[-----------------------------------------------------------------------------
-BlizOptionsGroup Container
-Simple container widget for the integration of AceGUI into the Blizzard Interface Options
--------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame = CreateFrame
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-
-local function OnShow(frame)
-	frame.obj:Fire("OnShow")
-end
-
-local function OnHide(frame)
-	frame.obj:Fire("OnHide")
-end
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-
-local function okay(frame)
-	frame.obj:Fire("okay")
-end
-
-local function cancel(frame)
-	frame.obj:Fire("cancel")
-end
-
-local function defaults(frame)
-	frame.obj:Fire("defaults")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetName()
-		self:SetTitle()
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 63
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 26
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetName"] = function(self, name, parent)
-		self.frame.name = name
-		self.frame.parent = parent
-	end,
-
-	["SetTitle"] = function(self, title)
-		local content = self.content
-		content:ClearAllPoints()
-		if not title or title == "" then
-			content:SetPoint("TOPLEFT", 10, -10)
-			self.label:SetText("")
-		else
-			content:SetPoint("TOPLEFT", 10, -40)
-			self.label:SetText(title)
-		end
-		content:SetPoint("BOTTOMRIGHT", -10, 10)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame")
-	frame:Hide()
-
-	-- support functions for the Blizzard Interface Options
-	frame.okay = okay
-	frame.cancel = cancel
-	frame.defaults = defaults
-
-	frame:SetScript("OnHide", OnHide)
-	frame:SetScript("OnShow", OnShow)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge")
-	label:SetPoint("TOPLEFT", 10, -15)
-	label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45)
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		label   = label,
-		frame   = frame,
-		content = content,
-		type    = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
deleted file mode 100644
index 083a9f7..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
+++ /dev/null
@@ -1,157 +0,0 @@
---[[-----------------------------------------------------------------------------
-DropdownGroup Container
-Container controlled by a dropdown on the top.
--------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local assert, pairs, type = assert, pairs, type
-
--- WoW APIs
-local CreateFrame = CreateFrame
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-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
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.dropdown:SetText("")
-		self:SetDropdownWidth(200)
-		self:SetTitle("")
-	end,
-
-	["OnRelease"] = function(self)
-		self.dropdown.list = nil
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end,
-
-	["SetTitle"] = function(self, title)
-		self.titletext:SetText(title)
-		self.dropdown.frame:ClearAllPoints()
-		if title and title ~= "" then
-			self.dropdown.frame:SetPoint("TOPRIGHT", -2, 0)
-		else
-			self.dropdown.frame:SetPoint("TOPLEFT", -1, 0)
-		end
-	end,
-
-	["SetGroupList"] = function(self,list)
-		self.dropdown:SetList(list)
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end,
-
-	["SetGroup"] = function(self,group)
-		self.dropdown:SetValue(group)
-		local status = self.status or self.localstatus
-		status.selected = group
-		self:Fire("OnGroupSelected", group)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 26
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 63
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		self:SetHeight((height or 0) + 63)
-	end,
-
-	["SetDropdownWidth"] = function(self, width)
-		self.dropdown:SetWidth(width)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 Constructor()
-	local frame = CreateFrame("Frame")
-	frame:SetHeight(100)
-	frame:SetWidth(100)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 4, -5)
-	titletext:SetPoint("TOPRIGHT", -4, -5)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-
-	local dropdown = AceGUI:Create("Dropdown")
-	dropdown.frame:SetParent(frame)
-	dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2)
-	dropdown:SetCallback("OnValueChanged", SelectedGroup)
-	dropdown.frame:SetPoint("TOPLEFT", -1, 0)
-	dropdown.frame:Show()
-	dropdown:SetLabel("")
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 0, -26)
-	border:SetPoint("BOTTOMRIGHT", 0, 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)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame       = frame,
-		localstatus = {},
-		titletext   = titletext,
-		dropdown    = dropdown,
-		border      = border,
-		content     = content,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	dropdown.parentgroup = widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
deleted file mode 100644
index b35797b..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
+++ /dev/null
@@ -1,298 +0,0 @@
---[[-----------------------------------------------------------------------------
-Frame Container
--------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-local wipe = table.wipe
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Button_OnClick(frame)
-	PlaySound("gsTitleOptionExit")
-	frame.obj:Hide()
-end
-
-local function Frame_OnClose(frame)
-	frame.obj:Fire("OnClose")
-end
-
-local function Frame_OnMouseDown(frame)
-	AceGUI:ClearFocus()
-end
-
-local function Title_OnMouseDown(frame)
-	frame:GetParent():StartMoving()
-	AceGUI:ClearFocus()
-end
-
-local function MoverSizer_OnMouseUp(mover)
-	local frame = mover: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 SizerSE_OnMouseDown(frame)
-	frame:GetParent():StartSizing("BOTTOMRIGHT")
-	AceGUI:ClearFocus()
-end
-
-local function SizerS_OnMouseDown(frame)
-	frame:GetParent():StartSizing("BOTTOM")
-	AceGUI:ClearFocus()
-end
-
-local function SizerE_OnMouseDown(frame)
-	frame:GetParent():StartSizing("RIGHT")
-	AceGUI:ClearFocus()
-end
-
-local function StatusBar_OnEnter(frame)
-	frame.obj:Fire("OnEnterStatusBar")
-end
-
-local function StatusBar_OnLeave(frame)
-	frame.obj:Fire("OnLeaveStatusBar")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.frame:SetParent(UIParent)
-		self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
-		self:SetTitle()
-		self:SetStatusText()
-		self:ApplyStatus()
-		self:Show()
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		wipe(self.localstatus)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 34
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 57
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetTitle"] = function(self, title)
-		self.titletext:SetText(title)
-	end,
-
-	["SetStatusText"] = function(self, text)
-		self.statustext:SetText(text)
-	end,
-
-	["Hide"] = function(self)
-		self.frame:Hide()
-	end,
-
-	["Show"] = function(self)
-		self.frame:Show()
-	end,
-
-	-- called to set an external table to store status in
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		self:ApplyStatus()
-	end,
-
-	["ApplyStatus"] = function(self)
-		local status = self.status or self.localstatus
-		local frame = self.frame
-		self:SetWidth(status.width or 700)
-		self:SetHeight(status.height or 500)
-		frame:ClearAllPoints()
-		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")
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetMovable(true)
-	frame:SetResizable(true)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-	frame:SetBackdrop(FrameBackdrop)
-	frame:SetBackdropColor(0, 0, 0, 1)
-	frame:SetMinResize(400, 200)
-	frame:SetToplevel(true)
-	frame:SetScript("OnHide", Frame_OnClose)
-	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
-
-	local closebutton = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate")
-	closebutton:SetScript("OnClick", Button_OnClick)
-	closebutton:SetPoint("BOTTOMRIGHT", -27, 17)
-	closebutton:SetHeight(20)
-	closebutton:SetWidth(100)
-	closebutton:SetText(CLOSE)
-
-	local statusbg = CreateFrame("Button", nil, frame)
-	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
-	statusbg:SetPoint("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)
-	statusbg:SetScript("OnEnter", StatusBar_OnEnter)
-	statusbg:SetScript("OnLeave", StatusBar_OnLeave)
-
-	local statustext = statusbg:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	statustext:SetPoint("TOPLEFT", 7, -2)
-	statustext:SetPoint("BOTTOMRIGHT", -7, 2)
-	statustext:SetHeight(20)
-	statustext:SetJustifyH("LEFT")
-	statustext:SetText("")
-
-	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", 0, 12)
-	titlebg:SetWidth(100)
-	titlebg:SetHeight(40)
-
-	local title = CreateFrame("Frame", nil, frame)
-	title:EnableMouse(true)
-	title:SetScript("OnMouseDown", Title_OnMouseDown)
-	title:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-	title:SetAllPoints(titlebg)
-
-	local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOP", titlebg, "TOP", 0, -14)
-
-	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")
-	titlebg_l:SetWidth(30)
-	titlebg_l:SetHeight(40)
-
-	local titlebg_r = frame:CreateTexture(nil, "OVERLAY")
-	titlebg_r:SetTexture("Interface\\DialogFrame\\UI-DialogBox-Header")
-	titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63)
-	titlebg_r:SetPoint("LEFT", titlebg, "RIGHT")
-	titlebg_r:SetWidth(30)
-	titlebg_r:SetHeight(40)
-
-	local sizer_se = CreateFrame("Frame", nil, frame)
-	sizer_se:SetPoint("BOTTOMRIGHT")
-	sizer_se:SetWidth(25)
-	sizer_se:SetHeight(25)
-	sizer_se:EnableMouse()
-	sizer_se:SetScript("OnMouseDown",SizerSE_OnMouseDown)
-	sizer_se:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	local line1 = sizer_se:CreateTexture(nil, "BACKGROUND")
-	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")
-	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", -25, 0)
-	sizer_s:SetPoint("BOTTOMLEFT")
-	sizer_s:SetHeight(25)
-	sizer_s:EnableMouse(true)
-	sizer_s:SetScript("OnMouseDown", SizerS_OnMouseDown)
-	sizer_s:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	local sizer_e = CreateFrame("Frame", nil, frame)
-	sizer_e:SetPoint("BOTTOMRIGHT", 0, 25)
-	sizer_e:SetPoint("TOPRIGHT")
-	sizer_e:SetWidth(25)
-	sizer_e:EnableMouse(true)
-	sizer_e:SetScript("OnMouseDown", SizerE_OnMouseDown)
-	sizer_e:SetScript("OnMouseUp", MoverSizer_OnMouseUp)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT", 17, -27)
-	content:SetPoint("BOTTOMRIGHT", -17, 40)
-
-	local widget = {
-		localstatus = {},
-		titletext   = titletext,
-		statustext  = statustext,
-		content     = content,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	closebutton.obj, statusbg.obj = widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
deleted file mode 100644
index 9413611..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
+++ /dev/null
@@ -1,102 +0,0 @@
---[[-----------------------------------------------------------------------------
-InlineGroup Container
-Simple container widget that creates a visible "box" with an optional title.
--------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetTitle"] = function(self,title)
-		self.titletext:SetText(title)
-	end,
-
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + 40)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 20
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 14, 0)
-	titletext:SetPoint("TOPRIGHT", -14, 0)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 0, -17)
-	border:SetPoint("BOTTOMRIGHT", -1, 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)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame     = frame,
-		content   = content,
-		titletext = titletext,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
deleted file mode 100644
index 10a4d58..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
+++ /dev/null
@@ -1,203 +0,0 @@
---[[-----------------------------------------------------------------------------
-ScrollFrame Container
-Plain container that scrolls its content and doesn't grow in height.
--------------------------------------------------------------------------------]]
-local Type, Version = "ScrollFrame", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-local min, max, floor, abs = math.min, math.max, math.floor, math.abs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function FixScrollOnUpdate(frame)
-	frame:SetScript("OnUpdate", nil)
-	frame.obj:FixScroll()
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function ScrollFrame_OnMouseWheel(frame, value)
-	frame.obj:MoveScroll(value)
-end
-
-local function ScrollFrame_OnSizeChanged(frame)
-	frame:SetScript("OnUpdate", FixScrollOnUpdate)
-end
-
-local function ScrollBar_OnScrollValueChanged(frame, value)
-	frame.obj:SetScroll(value)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetScroll(0)
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-		self.scrollframe:SetPoint("BOTTOMRIGHT")
-		self.scrollbar:Hide()
-		self.scrollBarShown = nil
-		self.content.height, self.content.width = nil, nil
-	end,
-
-	["SetScroll"] = function(self, value)
-		local status = self.status or self.localstatus
-		local viewheight = self.scrollframe:GetHeight()
-		local height = self.content:GetHeight()
-		local offset
-
-		if viewheight > height then
-			offset = 0
-		else
-			offset = floor((height - viewheight) / 1000.0 * value)
-		end
-		self.content:ClearAllPoints()
-		self.content:SetPoint("TOPLEFT", 0, offset)
-		self.content:SetPoint("TOPRIGHT", 0, offset)
-		status.offset = offset
-		status.scrollvalue = value
-	end,
-
-	["MoveScroll"] = function(self, value)
-		local status = self.status or self.localstatus
-		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
-
-		if self.scrollBarShown then
-			local diff = height - viewheight
-			local delta = 1
-			if value < 0 then
-				delta = -1
-			end
-			self.scrollbar:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000))
-		end
-	end,
-
-	["FixScroll"] = function(self)
-		if self.updateLock then return end
-		self.updateLock = true
-		local status = self.status or self.localstatus
-		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
-		local offset = status.offset or 0
-		local curvalue = self.scrollbar:GetValue()
-		-- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys
-		-- No-one is going to miss 2 pixels at the bottom of the frame, anyhow!
-		if viewheight < height + 2 then
-			if self.scrollBarShown then
-				self.scrollBarShown = nil
-				self.scrollbar:Hide()
-				self.scrollbar:SetValue(0)
-				self.scrollframe:SetPoint("BOTTOMRIGHT")
-				self:DoLayout()
-			end
-		else
-			if not self.scrollBarShown then
-				self.scrollBarShown = true
-				self.scrollbar:Show()
-				self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0)
-				self:DoLayout()
-			end
-			local value = (offset / (viewheight - height) * 1000)
-			if value > 1000 then value = 1000 end
-			self.scrollbar:SetValue(value)
-			self:SetScroll(value)
-			if value < 1000 then
-				self.content:ClearAllPoints()
-				self.content:SetPoint("TOPLEFT", 0, offset)
-				self.content:SetPoint("TOPRIGHT", 0, offset)
-				status.offset = offset
-			end
-		end
-		self.updateLock = nil
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		self.content:SetHeight(height or 0 + 20)
-		self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		if not status.scrollvalue then
-			status.scrollvalue = 0
-		end
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		content.width = width
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		content.height = height
-	end
-}
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	local num = AceGUI:GetNextWidgetNum(Type)
-
-	local scrollframe = CreateFrame("ScrollFrame", nil, frame)
-	scrollframe:SetPoint("TOPLEFT")
-	scrollframe:SetPoint("BOTTOMRIGHT")
-	scrollframe:EnableMouseWheel(true)
-	scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel)
-	scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged)
-
-	local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate")
-	scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16)
-	scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16)
-	scrollbar:SetMinMaxValues(0, 1000)
-	scrollbar:SetValueStep(1)
-	scrollbar:SetValue(0)
-	scrollbar:SetWidth(16)
-	scrollbar:Hide()
-	-- set the script as the last step, so it doesn't fire yet
-	scrollbar:SetScript("OnValueChanged", ScrollBar_OnScrollValueChanged)
-
-	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
-	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0, 0, 0, 0.4)
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, scrollframe)
-	content:SetPoint("TOPLEFT")
-	content:SetPoint("TOPRIGHT")
-	content:SetHeight(400)
-	scrollframe:SetScrollChild(content)
-
-	local widget = {
-		localstatus = { scrollvalue = 0 },
-		scrollframe = scrollframe,
-		scrollbar   = scrollbar,
-		content     = content,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	scrollframe.obj, scrollbar.obj = widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
deleted file mode 100644
index 57512c3..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
+++ /dev/null
@@ -1,69 +0,0 @@
---[[-----------------------------------------------------------------------------
-SimpleGroup Container
-Simple container widget that just groups widgets.
--------------------------------------------------------------------------------]]
-local Type, Version = "SimpleGroup", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(300)
-		self:SetHeight(100)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight(height or 0)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		content:SetWidth(width)
-		content.width = width
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		content:SetHeight(height)
-		content.height = height
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	--Container Support
-	local content = CreateFrame("Frame", nil, frame)
-	content:SetPoint("TOPLEFT")
-	content:SetPoint("BOTTOMRIGHT")
-
-	local widget = {
-		frame     = frame,
-		content   = content,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
deleted file mode 100644
index 8287696..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
+++ /dev/null
@@ -1,348 +0,0 @@
---[[-----------------------------------------------------------------------------
-TabGroup Container
-Container that uses tabs on top to switch between groups.
--------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 30
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab
-
--- local upvalue storage used by BuildTabs
-local widths = {}
-local rowwidths = {}
-local rowends = {}
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function UpdateTabLook(frame)
-	if frame.disabled then
-		PanelTemplates_SetDisabledTabState(frame)
-	elseif frame.selected then
-		PanelTemplates_SelectTab(frame)
-	else
-		PanelTemplates_DeselectTab(frame)
-	end
-end
-
-local function Tab_SetText(frame, text)
-	frame:_SetText(text)
-	local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0
-	PanelTemplates_TabResize(frame, 0, nil, width)
-end
-
-local function Tab_SetSelected(frame, selected)
-	frame.selected = selected
-	UpdateTabLook(frame)
-end
-
-local function Tab_SetDisabled(frame, disabled)
-	frame.disabled = disabled
-	UpdateTabLook(frame)
-end
-
-local function BuildTabsOnUpdate(frame)
-	local self = frame.obj
-	self:BuildTabs()
-	frame:SetScript("OnUpdate", nil)
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Tab_OnClick(frame)
-	if not (frame.selected or frame.disabled) then
-		PlaySound("igCharacterInfoTab")
-		frame.obj:SelectTab(frame.value)
-	end
-end
-
-local function Tab_OnEnter(frame)
-	local self = frame.obj
-	self:Fire("OnTabEnter", self.tabs[frame.id].value, frame)
-end
-
-local function Tab_OnLeave(frame)
-	local self = frame.obj
-	self:Fire("OnTabLeave", self.tabs[frame.id].value, frame)
-end
-
-local function Tab_OnShow(frame)
-	_G[frame:GetName().."HighlightTexture"]:SetWidth(frame:GetTextWidth() + 30)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetTitle()
-	end,
-
-	["OnRelease"] = function(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-		self.tablist = nil
-		for _, tab in pairs(self.tabs) do
-			tab:Hide()
-		end
-	end,
-
-	["CreateTab"] = function(self, id)
-		local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
-		local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
-		tab.obj = self
-		tab.id = id
-
-		tab.text = _G[tabname .. "Text"]
-		tab.text:ClearAllPoints()
-		tab.text:SetPoint("LEFT", 14, -3)
-		tab.text:SetPoint("RIGHT", -12, -3)
-
-		tab:SetScript("OnClick", Tab_OnClick)
-		tab:SetScript("OnEnter", Tab_OnEnter)
-		tab:SetScript("OnLeave", Tab_OnLeave)
-		tab:SetScript("OnShow", Tab_OnShow)
-
-		tab._SetText = tab.SetText
-		tab.SetText = Tab_SetText
-		tab.SetSelected = Tab_SetSelected
-		tab.SetDisabled = Tab_SetDisabled
-
-		return tab
-	end,
-
-	["SetTitle"] = function(self, text)
-		self.titletext:SetText(text or "")
-		if text and text ~= "" then
-			self.alignoffset = 25
-		else
-			self.alignoffset = 18
-		end
-		self:BuildTabs()
-	end,
-
-	["SetStatusTable"] = function(self, status)
-		assert(type(status) == "table")
-		self.status = status
-	end,
-
-	["SelectTab"] = function(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,
-
-	["SetTabs"] = function(self, tabs)
-		self.tablist = tabs
-		self:BuildTabs()
-	end,
-
-
-	["BuildTabs"] = function(self)
-		local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "")
-		local status = self.status or self.localstatus
-		local tablist = self.tablist
-		local tabs = self.tabs
-
-		if not tablist then return end
-
-		local width = self.frame.width or self.frame:GetWidth() or 0
-
-		wipe(widths)
-		wipe(rowwidths)
-		wipe(rowends)
-
-		--Place Text into tabs and get thier initial width
-		for i, v in ipairs(tablist) do
-			local tab = tabs[i]
-			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() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text
-		end
-
-		for i = (#tablist)+1, #tabs, 1 do
-			tabs[i]:Hide()
-		end
-
-		--First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout
-		local numtabs = #tablist
-		local numrows = 1
-		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, if there is enough space
-					if (rowwidths[numrows] + widths[numtabs-1]) <= width then
-						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
-		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, -(hastitle and 14 or 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,
-			-- if the used space is above 75% already
-			local padding = 0
-			if not (numrows == 1 and rowwidths[1] < width*0.75) then
-				padding = (width - rowwidths[row]) / (endtab - starttab+1)
-			end
-
-			for i = starttab, endtab do
-				PanelTemplates_TabResize(tabs[i], padding + 4, nil, width)
-			end
-			starttab = endtab + 1
-		end
-
-		self.borderoffset = (hastitle and 17 or 10)+((numrows)*20)
-		self.border:SetPoint("TOPLEFT", 1, -self.borderoffset)
-	end,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local contentwidth = width - 60
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-		self:BuildTabs(self)
-		self.frame:SetScript("OnUpdate", BuildTabsOnUpdate)
-	end,
-
-	["OnHeightSet"] = function(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,
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + (self.borderoffset + 23))
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 Constructor()
-	local num = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame",nil,UIParent)
-	frame:SetHeight(100)
-	frame:SetWidth(100)
-	frame:SetFrameStrata("FULLSCREEN_DIALOG")
-
-	local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal")
-	titletext:SetPoint("TOPLEFT", 14, 0)
-	titletext:SetPoint("TOPRIGHT", -14, 0)
-	titletext:SetJustifyH("LEFT")
-	titletext:SetHeight(18)
-	titletext:SetText("")
-
-	local border = CreateFrame("Frame", nil, frame)
-	border:SetPoint("TOPLEFT", 1, -27)
-	border:SetPoint("BOTTOMRIGHT", -1, 3)
-	border:SetBackdrop(PaneBackdrop)
-	border:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
-	border:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	local content = CreateFrame("Frame", nil, border)
-	content:SetPoint("TOPLEFT", 10, -7)
-	content:SetPoint("BOTTOMRIGHT", -10, 7)
-
-	local widget = {
-		num          = num,
-		frame        = frame,
-		localstatus  = {},
-		alignoffset  = 18,
-		titletext    = titletext,
-		border       = border,
-		borderoffset = 27,
-		tabs         = {},
-		content      = content,
-		type         = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
deleted file mode 100644
index a5b7916..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
+++ /dev/null
@@ -1,670 +0,0 @@
---[[-----------------------------------------------------------------------------
-TreeGroup Container
-Container that uses a tree control to switch between groups.
--------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 30
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
-local math_min, math_max, floor = math.min, math.max, floor
-local select, tremove, unpack = select, table.remove, unpack
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE
-
--- 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
-
-local DEFAULT_TREE_WIDTH = 175
-local DEFAULT_TREE_SIZABLE = true
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-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 UpdateButton(button, treeline, selected, canExpand, isExpanded)
-	local self = button.obj
-	local toggle = button.toggle
-	local frame = self.frame
-	local text = treeline.text or ""
-	local icon = treeline.icon
-	local iconCoords = treeline.iconCoords
-	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 normalTexture = button:GetNormalTexture()
-	local line = button.line
-	button.level = level
-	if ( level == 1 ) then
-		button:SetNormalFontObject("GameFontNormal")
-		button:SetHighlightFontObject("GameFontHighlight")
-		button.text:SetPoint("LEFT", (icon and 16 or 0) + 8, 2)
-	else
-		button:SetNormalFontObject("GameFontHighlightSmall")
-		button:SetHighlightFontObject("GameFontHighlightSmall")
-		button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2)
-	end
-
-	if disabled then
-		button:EnableMouse(false)
-		button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE)
-	else
-		button.text:SetText(text)
-		button:EnableMouse(true)
-	end
-
-	if icon then
-		button.icon:SetTexture(icon)
-		button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1)
-	else
-		button.icon:SetTexture(nil)
-	end
-
-	if iconCoords then
-		button.icon:SetTexCoord(unpack(iconCoords))
-	else
-		button.icon:SetTexCoord(0, 1, 0, 1)
-	end
-
-	if canExpand then
-		if not isExpanded then
-			toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-UP")
-			toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-DOWN")
-		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 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.icon = v.icon
-	line.iconCoords = v.iconCoords
-	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
-
---fire an update after one frame to catch the treeframes height
-local function FirstFrameUpdate(frame)
-	local self = frame.obj
-	frame:SetScript("OnUpdate", nil)
-	self:RefreshTree()
-end
-
-local function BuildUniqueValue(...)
-	local n = select('#', ...)
-	if n == 1 then
-		return ...
-	else
-		return (...).."\001"..BuildUniqueValue(select(2,...))
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Expand_OnClick(frame)
-	local button = frame.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 Button_OnClick(frame)
-	local self = frame.obj
-	self:Fire("OnClick", frame.uniquevalue, frame.selected)
-	if not frame.selected then
-		self:SetSelected(frame.uniquevalue)
-		frame.selected = true
-		frame:LockHighlight()
-		self:RefreshTree()
-	end
-	AceGUI:ClearFocus()
-end
-
-local function Button_OnDoubleClick(button)
-	local self = button.obj
-	local status = self.status or self.localstatus
-	local status = (self.status or self.localstatus).groups
-	status[button.uniquevalue] = not status[button.uniquevalue]
-	self:RefreshTree()
-end
-
-local function Button_OnEnter(frame)
-	local self = frame.obj
-	self:Fire("OnButtonEnter", frame.uniquevalue, frame)
-
-	if self.enabletooltips then
-		GameTooltip:SetOwner(frame, "ANCHOR_NONE")
-		GameTooltip:SetPoint("LEFT",frame,"RIGHT")
-		GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1)
-
-		GameTooltip:Show()
-	end
-end
-
-local function Button_OnLeave(frame)
-	local self = frame.obj
-	self:Fire("OnButtonLeave", frame.uniquevalue, frame)
-
-	if self.enabletooltips then
-		GameTooltip:Hide()
-	end
-end
-
-local function OnScrollValueChanged(frame, value)
-	if frame.obj.noupdate then return end
-	local self = frame.obj
-	local status = self.status or self.localstatus
-	status.scrollvalue = value
-	self:RefreshTree()
-	AceGUI:ClearFocus()
-end
-
-local function Tree_OnSizeChanged(frame)
-	frame.obj:RefreshTree()
-end
-
-local function Tree_OnMouseWheel(frame, delta)
-	local self = frame.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 Dragger_OnLeave(frame)
-	frame:SetBackdropColor(1, 1, 1, 0)
-end
-
-local function Dragger_OnEnter(frame)
-	frame:SetBackdropColor(1, 1, 1, 0.8)
-end
-
-local function Dragger_OnMouseDown(frame)
-	local treeframe = frame:GetParent()
-	treeframe:StartSizing("RIGHT")
-end
-
-local function Dragger_OnMouseUp(frame)
-	local treeframe = frame: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)
-
-	local status = self.status or self.localstatus
-	status.treewidth = treeframe:GetWidth()
-
-	treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth())
-	-- recalculate the content width
-	treeframe.obj:OnWidthSet(status.fullwidth)
-	-- update the layout of the content
-	treeframe.obj:DoLayout()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE)
-		self:EnableButtonTooltips(true)
-	end,
-
-	["OnRelease"] = function(self)
-		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,
-
-	["EnableButtonTooltips"] = function(self, enable)
-		self.enabletooltips = enable
-	end,
-
-	["CreateButton"] = function(self)
-		local num = AceGUI:GetNextWidgetNum("TreeGroupButton")
-		local button = CreateFrame("Button", ("AceGUI30TreeButton%d"):format(num), self.treeframe, "OptionsListButtonTemplate")
-		button.obj = self
-
-		local icon = button:CreateTexture(nil, "OVERLAY")
-		icon:SetWidth(14)
-		icon:SetHeight(14)
-		button.icon = icon
-
-		button:SetScript("OnClick",Button_OnClick)
-		button:SetScript("OnDoubleClick", Button_OnDoubleClick)
-		button:SetScript("OnEnter",Button_OnEnter)
-		button:SetScript("OnLeave",Button_OnLeave)
-
-		button.toggle.button = button
-		button.toggle:SetScript("OnClick",Expand_OnClick)
-
-		return button
-	end,
-
-	["SetStatusTable"] = function(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
-	["SetTree"] = function(self, tree, filter)
-		self.filter = filter
-		if tree then
-			assert(type(tree) == "table")
-		end
-		self.tree = tree
-		self:RefreshTree()
-	end,
-
-	["BuildLevel"] = function(self, tree, level, parent)
-		local groups = (self.status or self.localstatus).groups
-		local hasChildren = self.hasChildren
-
-		for i, v in ipairs(tree) do
-			if v.children then
-				if not self.filter or ShouldDisplayLevel(v.children) then
-					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,
-
-	["RefreshTree"] = function(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 = (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,
-
-	["SetSelected"] = function(self, value)
-		local status = self.status or self.localstatus
-		if status.selected ~= value then
-			status.selected = value
-			self:Fire("OnGroupSelected", value)
-		end
-	end,
-
-	["Select"] = function(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,
-
-	["SelectByPath"] = function(self, ...)
-		self:Select(BuildUniqueValue(...), ...)
-	end,
-
-	["SelectByValue"] = function(self, uniquevalue)
-		self:Select(uniquevalue, ("\001"):split(uniquevalue))
-	end,
-
-	["ShowScroll"] = function(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,
-
-	["OnWidthSet"] = function(self, width)
-		local content = self.content
-		local treeframe = self.treeframe
-		local status = self.status or self.localstatus
-		status.fullwidth = width
-
-		local contentwidth = width - status.treewidth - 20
-		if contentwidth < 0 then
-			contentwidth = 0
-		end
-		content:SetWidth(contentwidth)
-		content.width = contentwidth
-
-		local maxtreewidth = math_min(400, width - 50)
-
-		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
-			self:SetTreeWidth(maxtreewidth, status.treesizable)
-		end
-		treeframe:SetMaxResize(maxtreewidth, 1600)
-	end,
-
-	["OnHeightSet"] = function(self, height)
-		local content = self.content
-		local contentheight = height - 20
-		if contentheight < 0 then
-			contentheight = 0
-		end
-		content:SetHeight(contentheight)
-		content.height = contentheight
-	end,
-
-	["SetTreeWidth"] = function(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
-
-		-- recalculate the content width
-		if status.fullwidth then
-			self:OnWidthSet(status.fullwidth)
-		end
-	end,
-
-	["LayoutFinished"] = function(self, width, height)
-		if self.noAutoHeight then return end
-		self:SetHeight((height or 0) + 20)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 Constructor()
-	local num = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame", nil, UIParent)
-
-	local treeframe = CreateFrame("Frame", nil, frame)
-	treeframe:SetPoint("TOPLEFT")
-	treeframe:SetPoint("BOTTOMLEFT")
-	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
-	treeframe:EnableMouseWheel(true)
-	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)
-	treeframe:SetScript("OnUpdate", FirstFrameUpdate)
-	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
-	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
-
-	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("OnEnter", Dragger_OnEnter)
-	dragger:SetScript("OnLeave", Dragger_OnLeave)
-	dragger:SetScript("OnMouseDown", Dragger_OnMouseDown)
-	dragger:SetScript("OnMouseUp", Dragger_OnMouseUp)
-
-	local scrollbar = CreateFrame("Slider", ("AceConfigDialogTreeGroup%dScrollBar"):format(num), treeframe, "UIPanelScrollBarTemplate")
-	scrollbar:SetScript("OnValueChanged", nil)
-	scrollbar:SetPoint("TOPRIGHT", -10, -26)
-	scrollbar:SetPoint("BOTTOMRIGHT", -10, 26)
-	scrollbar:SetMinMaxValues(0,0)
-	scrollbar:SetValueStep(1)
-	scrollbar:SetValue(0)
-	scrollbar:SetWidth(16)
-	scrollbar:SetScript("OnValueChanged", OnScrollValueChanged)
-
-	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
-	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetTexture(0,0,0,0.4)
-
-	local border = CreateFrame("Frame",nil,frame)
-	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
-	border:SetPoint("BOTTOMRIGHT")
-	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)
-	content:SetPoint("TOPLEFT", 10, -10)
-	content:SetPoint("BOTTOMRIGHT", -10, 10)
-
-	local widget = {
-		frame        = frame,
-		lines        = {},
-		levels       = {},
-		buttons      = {},
-		hasChildren  = {},
-		localstatus  = { groups = {}, scrollvalue = 0 },
-		filter       = false,
-		treeframe    = treeframe,
-		dragger      = dragger,
-		scrollbar    = scrollbar,
-		border       = border,
-		content      = content,
-		type         = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	treeframe.obj, dragger.obj, scrollbar.obj = widget, widget, widget
-
-	return AceGUI:RegisterAsContainer(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
deleted file mode 100644
index bb0a2a2..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
+++ /dev/null
@@ -1,331 +0,0 @@
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Lua APIs
-local pairs, assert, type = pairs, assert, type
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontNormal
-
-----------------
--- Main Frame --
-----------------
---[[
-	Events :
-		OnClose
-
-]]
-do
-	local Type = "Window"
-	local Version = 4
-
-	local function frameOnClose(this)
-		this.obj:Fire("OnClose")
-	end
-
-	local function closeOnClick(this)
-		PlaySound("gsTitleOptionExit")
-		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()
-		self:EnableResize(true)
-		self:Show()
-	end
-
-	local function OnRelease(self)
-		self.status = nil
-		for k in pairs(self.localstatus) do
-			self.localstatus[k] = nil
-		end
-	end
-
-	-- called to set an external table to store status in
-	local function SetStatusTable(self, status)
-		assert(type(status) == "table")
-		self.status = status
-		self:ApplyStatus()
-	end
-
-	local function ApplyStatus(self)
-		local status = self.status or self.localstatus
-		local frame = self.frame
-		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 EnableResize(self, state)
-		local func = state and "Show" or "Hide"
-		self.sizer_se[func](self.sizer_se)
-		self.sizer_s[func](self.sizer_s)
-		self.sizer_e[func](self.sizer_e)
-	end
-
-	local function Constructor()
-		local frame = CreateFrame("Frame",nil,UIParent)
-		local self = {}
-		self.type = "Window"
-
-		self.Hide = Hide
-		self.Show = Show
-		self.SetTitle =  SetTitle
-		self.OnRelease = OnRelease
-		self.OnAcquire = OnAcquire
-		self.SetStatusText = SetStatusText
-		self.SetStatusTable = SetStatusTable
-		self.ApplyStatus = ApplyStatus
-		self.OnWidthSet = OnWidthSet
-		self.OnHeightSet = OnHeightSet
-		self.EnableResize = EnableResize
-
-		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:SetScript("OnHide",frameOnClose)
-		frame:SetMinResize(240,240)
-		frame:SetToplevel(true)
-
-		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
-		titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]])
-		titlebg:SetPoint("TOPLEFT", 9, -6)
-		titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24)
-
-		local dialogbg = frame:CreateTexture(nil, "BACKGROUND")
-		dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]])
-		dialogbg:SetPoint("TOPLEFT", 8, -24)
-		dialogbg:SetPoint("BOTTOMRIGHT", -6, 8)
-		dialogbg:SetVertexColor(0, 0, 0, .75)
-
-		local topleft = frame:CreateTexture(nil, "BORDER")
-		topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		topleft:SetWidth(64)
-		topleft:SetHeight(64)
-		topleft:SetPoint("TOPLEFT")
-		topleft:SetTexCoord(0.501953125, 0.625, 0, 1)
-
-		local topright = frame:CreateTexture(nil, "BORDER")
-		topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		topright:SetWidth(64)
-		topright:SetHeight(64)
-		topright:SetPoint("TOPRIGHT")
-		topright:SetTexCoord(0.625, 0.75, 0, 1)
-
-		local top = frame:CreateTexture(nil, "BORDER")
-		top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		top:SetHeight(64)
-		top:SetPoint("TOPLEFT", topleft, "TOPRIGHT")
-		top:SetPoint("TOPRIGHT", topright, "TOPLEFT")
-		top:SetTexCoord(0.25, 0.369140625, 0, 1)
-
-		local bottomleft = frame:CreateTexture(nil, "BORDER")
-		bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottomleft:SetWidth(64)
-		bottomleft:SetHeight(64)
-		bottomleft:SetPoint("BOTTOMLEFT")
-		bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1)
-
-		local bottomright = frame:CreateTexture(nil, "BORDER")
-		bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottomright:SetWidth(64)
-		bottomright:SetHeight(64)
-		bottomright:SetPoint("BOTTOMRIGHT")
-		bottomright:SetTexCoord(0.875, 1, 0, 1)
-
-		local bottom = frame:CreateTexture(nil, "BORDER")
-		bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		bottom:SetHeight(64)
-		bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT")
-		bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT")
-		bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1)
-
-		local left = frame:CreateTexture(nil, "BORDER")
-		left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		left:SetWidth(64)
-		left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT")
-		left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT")
-		left:SetTexCoord(0.001953125, 0.125, 0, 1)
-
-		local right = frame:CreateTexture(nil, "BORDER")
-		right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
-		right:SetWidth(64)
-		right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT")
-		right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT")
-		right:SetTexCoord(0.1171875, 0.2421875, 0, 1)
-
-		local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton")
-		close:SetPoint("TOPRIGHT", 2, 1)
-		close:SetScript("OnClick", closeOnClick)
-		self.closebutton = close
-		close.obj = self
-
-		local titletext = frame:CreateFontString(nil, "ARTWORK")
-		titletext:SetFontObject(GameFontNormal)
-		titletext:SetPoint("TOPLEFT", 12, -8)
-		titletext:SetPoint("TOPRIGHT", -32, -8)
-		self.titletext = titletext
-
-		local title = CreateFrame("Button", nil, frame)
-		title:SetPoint("TOPLEFT", titlebg)
-		title:SetPoint("BOTTOMRIGHT", titlebg)
-		title:EnableMouse()
-		title:SetScript("OnMouseDown",titleOnMouseDown)
-		title:SetScript("OnMouseUp", frameOnMouseUp)
-		self.title = title
-
-		local sizer_se = CreateFrame("Frame",nil,frame)
-		sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0)
-		sizer_se:SetWidth(25)
-		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",12,-32)
-		content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13)
-
-		AceGUI:RegisterAsContainer(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(Type,Constructor,Version)
-end
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
deleted file mode 100644
index 2f49a01..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
+++ /dev/null
@@ -1,92 +0,0 @@
---[[-----------------------------------------------------------------------------
-Button Widget
-Graphical Button.
--------------------------------------------------------------------------------]]
-local Type, Version = "Button", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local _G = _G
-local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Button_OnClick(frame, ...)
-	PlaySound("igMainMenuOption")
-	frame.obj:Fire("OnClick", ...)
-	AceGUI:ClearFocus()
-end
-
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- restore default values
-		self:SetHeight(24)
-		self:SetWidth(200)
-		self:SetDisabled(false)
-		self:SetText()
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetText"] = function(self, text)
-		self.text:SetText(text)
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-		else
-			self.frame:Enable()
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnClick", Button_OnClick)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-
-	local text = frame:GetFontString()
-	text:ClearAllPoints()
-	text:SetPoint("TOPLEFT", 15, -1)
-	text:SetPoint("BOTTOMRIGHT", -15, 1)
-	text:SetJustifyV("MIDDLE")
-
-	local widget = {
-		text  = text,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
deleted file mode 100644
index 34a2591..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
+++ /dev/null
@@ -1,289 +0,0 @@
---[[-----------------------------------------------------------------------------
-Checkbox Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "CheckBox", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs = select, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: SetDesaturation, GameFontHighlight
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function AlignImage(self)
-	local img = self.image:GetTexture()
-	self.text:ClearAllPoints()
-	if not img then
-		self.text:SetPoint("LEFT", self.checkbg, "RIGHT")
-		self.text:SetPoint("RIGHT")
-	else
-		self.text:SetPoint("LEFT", self.image,"RIGHT", 1, 0)
-		self.text:SetPoint("RIGHT")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function CheckBox_OnMouseDown(frame)
-	local self = frame.obj
-	if not self.disabled then
-		if self.image:GetTexture() then
-			self.text:SetPoint("LEFT", self.image,"RIGHT", 2, -1)
-		else
-			self.text:SetPoint("LEFT", self.checkbg, "RIGHT", 1, -1)
-		end
-	end
-	AceGUI:ClearFocus()
-end
-
-local function CheckBox_OnMouseUp(frame)
-	local self = frame.obj
-	if not self.disabled then
-		self:ToggleChecked()
-
-		if self.checked then
-			PlaySound("igMainMenuOptionCheckBoxOn")
-		else -- for both nil and false (tristate)
-			PlaySound("igMainMenuOptionCheckBoxOff")
-		end
-
-		self:Fire("OnValueChanged", self.checked)
-		AlignImage(self)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetType()
-		self:SetValue(false)
-		self:SetTriState(nil)
-		-- height is calculated from the width and required space for the description
-		self:SetWidth(200)
-		self:SetImage()
-		self:SetDisabled(nil)
-		self:SetDescription(nil)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		if self.desc then
-			self.desc:SetWidth(width - 30)
-			if self.desc:GetText() and self.desc:GetText() ~= "" then
-				self:SetHeight(28 + self.desc:GetHeight())
-			end
-		end
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.text:SetTextColor(0.5, 0.5, 0.5)
-			SetDesaturation(self.check, true)
-		else
-			self.frame:Enable()
-			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,
-
-	["SetValue"] = function(self,value)
-		local check = self.check
-		self.checked = value
-		if value then
-			SetDesaturation(self.check, false)
-			self.check:Show()
-		else
-			--Nil is the unknown tristate value
-			if self.tristate and value == nil then
-				SetDesaturation(self.check, true)
-				self.check:Show()
-			else
-				SetDesaturation(self.check, false)
-				self.check:Hide()
-			end
-		end
-		self:SetDisabled(self.disabled)
-	end,
-
-	["GetValue"] = function(self)
-		return self.checked
-	end,
-
-	["SetTriState"] = function(self, enabled)
-		self.tristate = enabled
-		self:SetValue(self:GetValue())
-	end,
-
-	["SetType"] = function(self, type)
-		local checkbg = self.checkbg
-		local check = self.check
-		local highlight = self.highlight
-
-		local size
-		if type == "radio" then
-			size = 16
-			checkbg:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			checkbg:SetTexCoord(0, 0.25, 0, 1)
-			check:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			check:SetTexCoord(0.25, 0.5, 0, 1)
-			check:SetBlendMode("ADD")
-			highlight:SetTexture("Interface\\Buttons\\UI-RadioButton")
-			highlight:SetTexCoord(0.5, 0.75, 0, 1)
-		else
-			size = 24
-			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
-		checkbg:SetHeight(size)
-		checkbg:SetWidth(size)
-	end,
-
-	["ToggleChecked"] = function(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,
-
-	["SetLabel"] = function(self, label)
-		self.text:SetText(label)
-	end,
-
-	["SetDescription"] = function(self, desc)
-		if desc then
-			if not self.desc then
-				local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-				desc:ClearAllPoints()
-				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				desc:SetWidth(self.frame.width - 30)
-				desc:SetJustifyH("LEFT")
-				desc:SetJustifyV("TOP")
-				self.desc = desc
-			end
-			self.desc:Show()
-			--self.text:SetFontObject(GameFontNormal)
-			self.desc:SetText(desc)
-			self:SetHeight(28 + self.desc:GetHeight())
-		else
-			if self.desc then
-				self.desc:SetText("")
-				self.desc:Hide()
-			end
-			--self.text:SetFontObject(GameFontHighlight)
-			self:SetHeight(24)
-		end
-	end,
-
-	["SetImage"] = function(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-
-		if image:GetTexture() then
-			local n = select("#", ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		end
-		AlignImage(self)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnMouseDown", CheckBox_OnMouseDown)
-	frame:SetScript("OnMouseUp", CheckBox_OnMouseUp)
-
-	local checkbg = frame:CreateTexture(nil, "ARTWORK")
-	checkbg:SetWidth(24)
-	checkbg:SetHeight(24)
-	checkbg:SetPoint("TOPLEFT")
-	checkbg:SetTexture("Interface\\Buttons\\UI-CheckBox-Up")
-
-	local check = frame:CreateTexture(nil, "OVERLAY")
-	check:SetAllPoints(checkbg)
-	check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
-
-	local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
-	text:SetJustifyH("LEFT")
-	text:SetHeight(18)
-	text:SetPoint("LEFT", checkbg, "RIGHT")
-	text:SetPoint("RIGHT")
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetTexture("Interface\\Buttons\\UI-CheckBox-Highlight")
-	highlight:SetBlendMode("ADD")
-	highlight:SetAllPoints(checkbg)
-
-	local image = frame:CreateTexture(nil, "OVERLAY")
-	image:SetHeight(16)
-	image:SetWidth(16)
-	image:SetPoint("LEFT", checkbg, "RIGHT", 1, 0)
-
-	local widget = {
-		checkbg   = checkbg,
-		check     = check,
-		text      = text,
-		highlight = highlight,
-		image     = image,
-		frame     = frame,
-		type      = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
deleted file mode 100644
index ba02615..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
+++ /dev/null
@@ -1,186 +0,0 @@
---[[-----------------------------------------------------------------------------
-ColorPicker Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ShowUIPanel, HideUIPanel, ColorPickerFrame, OpacitySliderFrame
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-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
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function ColorSwatch_OnClick(frame)
-	HideUIPanel(ColorPickerFrame)
-	local self = frame.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
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetHeight(24)
-		self:SetWidth(200)
-		self:SetHasAlpha(false)
-		self:SetColor(0, 0, 0, 1)
-		self:SetDisabled(nil)
-		self:SetLabel(nil)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetLabel"] = function(self, text)
-		self.text:SetText(text)
-	end,
-
-	["SetColor"] = function(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,
-
-	["SetHasAlpha"] = function(self, HasAlpha)
-		self.HasAlpha = HasAlpha
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if self.disabled then
-			self.frame:Disable()
-			self.text:SetTextColor(0.5, 0.5, 0.5)
-		else
-			self.frame:Enable()
-			self.text:SetTextColor(1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnClick", ColorSwatch_OnClick)
-
-	local colorSwatch = frame:CreateTexture(nil, "OVERLAY")
-	colorSwatch:SetWidth(19)
-	colorSwatch:SetHeight(19)
-	colorSwatch:SetTexture("Interface\\ChatFrame\\ChatFrameColorSwatch")
-	colorSwatch:SetPoint("LEFT")
-
-	local texture = frame:CreateTexture(nil, "BACKGROUND")
-	texture:SetWidth(16)
-	texture:SetHeight(16)
-	texture:SetTexture(1, 1, 1)
-	texture:SetPoint("CENTER", colorSwatch)
-	texture:Show()
-
-	local checkers = frame:CreateTexture(nil, "BACKGROUND")
-	checkers:SetWidth(14)
-	checkers:SetHeight(14)
-	checkers:SetTexture("Tileset\\Generic\\Checkers")
-	checkers:SetTexCoord(.25, 0, 0.5, .25)
-	checkers:SetDesaturated(true)
-	checkers:SetVertexColor(1, 1, 1, 0.75)
-	checkers:SetPoint("CENTER", colorSwatch)
-	checkers:Show()
-
-	local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight")
-	text:SetHeight(24)
-	text:SetJustifyH("LEFT")
-	text:SetTextColor(1, 1, 1)
-	text:SetPoint("LEFT", colorSwatch, "RIGHT", 2, 0)
-	text:SetPoint("RIGHT")
-
-	--local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	--highlight:SetTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight")
-	--highlight:SetBlendMode("ADD")
-	--highlight:SetAllPoints(frame)
-
-	local widget = {
-		colorSwatch = colorSwatch,
-		text        = text,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
deleted file mode 100644
index 37baf04..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
+++ /dev/null
@@ -1,465 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown-Items.lua 916 2010-03-15 12:24:36Z nevcairiel $ ]]--
-
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Lua APIs
-local select, assert = select, assert
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame = CreateFrame
-
-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 = 3
-
-	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
-		if self.value then
-			PlaySound("igMainMenuOptionCheckBoxOn")
-		else
-			PlaySound("igMainMenuOptionCheckBoxOff")
-		end
-		UpdateToggle(self)
-		self:Fire("OnValueChanged", self.value)
-	end
-
-	-- exported
-	local function SetValue(self, value)
-		self.value = value
-		UpdateToggle(self)
-	end
-
-	-- exported
-	local function GetValue(self)
-		return self.value
-	end
-
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-
-		self.frame:SetScript("OnClick", Frame_OnClick)
-
-		self.SetValue = SetValue
-		self.GetValue = GetValue
-		self.OnRelease = OnRelease
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- Item: Menu
--- Shows a submenu on mouse over
--- Does not close the pullout on click
-do
-	local widgetType = "Dropdown-Item-Menu"
-	local widgetVersion = 2
-
-	local function OnEnter(this)
-		local self = this.obj
-		self:Fire("OnEnter")
-
-		if self.specialOnEnter then
-			self.specialOnEnter(self)
-		end
-
-		self.highlight:Show()
-
-		if not self.disabled and self.submenu then
-			self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100)
-		end
-	end
-
-	local function OnHide(this)
-		local self = this.obj
-		if self.submenu then
-			self.submenu:Close()
-		end
-	end
-
-	-- exported
-	local function SetMenu(self, menu)
-		assert(menu.type == "Dropdown-Pullout")
-		self.submenu = menu
-	end
-
-	-- exported
-	local function CloseMenu(self)
-		self.submenu:Close()
-	end
-
-	local function Constructor()
-		local self = ItemBase.Create(widgetType)
-
-		self.sub:Show()
-
-		self.frame:SetScript("OnEnter", OnEnter)
-		self.frame:SetScript("OnHide", OnHide)
-
-		self.SetMenu   = SetMenu
-		self.CloseMenu = CloseMenu
-
-		AceGUI:RegisterAsWidget(self)
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version)
-end
-
--- 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/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
deleted file mode 100644
index cbbba1a..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
+++ /dev/null
@@ -1,707 +0,0 @@
---[[ $Id: AceGUIWidget-DropDown.lua 916 2010-03-15 12:24:36Z nevcairiel $ ]]--
-local AceGUI = LibStub("AceGUI-3.0")
-
--- Lua APIs
-local min, max, floor = math.min, math.max, math.floor
-local select, pairs, ipairs = select, pairs, ipairs
-local tsort = table.sort
-
--- WoW APIs
-local PlaySound = PlaySound
-local UIParent, CreateFrame = UIParent, CreateFrame
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: CLOSE
-
-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 = 3
-
-	--[[ Static data ]]--
-
-	local backdrop = {
-		bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-		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 = 22
-
-	--[[ 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
-		PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound
-		if self.open then
-			self.open = nil
-			self.pullout:Close()
-			AceGUI:ClearFocus()
-		else
-			self.open = true
-			self.pullout:SetWidth(self.frame:GetWidth())
-			self.pullout: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())
-
-		self:SetHeight(44)
-		self:SetWidth(200)
-	end
-
-	-- exported, AceGUI callback
-	local function OnRelease(self)
-		if self.open then
-			self.pullout:Close()
-		end
-		AceGUI:Release(self.pullout)
-		self.pullout = nil
-
-		self:SetText("")
-		self:SetLabel("")
-		self:SetDisabled(false)
-		self:SetMultiselect(false)
-
-		self.value = nil
-		self.list = nil
-		self.open = nil
-		self.hasClose = nil
-
-		self.frame:ClearAllPoints()
-		self.frame:Hide()
-	end
-
-	-- exported
-	local function SetDisabled(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.text:SetTextColor(0.5,0.5,0.5)
-			self.button:Disable()
-			self.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 GetValue(self)
-		return self.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
-		tsort(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.GetValue    = GetValue
-		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/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
deleted file mode 100644
index 34a2958..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
+++ /dev/null
@@ -1,235 +0,0 @@
---[[-----------------------------------------------------------------------------
-EditBox Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 22
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local tostring, pairs = tostring, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local GetCursorInfo, ClearCursor, GetSpellName = GetCursorInfo, ClearCursor, GetSpellName
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-if not AceGUIEditBoxInsertLink then
-	-- upgradeable hook
-	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-end
-
-function _G.AceGUIEditBoxInsertLink(text)
-	for i = 1, AceGUI:GetWidgetCount(Type) do
-		local editbox = _G["AceGUI-3.0EditBox"..i]
-		if editbox and editbox:IsVisible() and editbox:HasFocus() then
-			editbox:Insert(text)
-			return true
-		end
-	end
-end
-
-local function ShowButton(self)
-	if not self.disablebutton 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
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function EditBox_OnEscapePressed(frame)
-	AceGUI:ClearFocus()
-end
-
-local function EditBox_OnEnterPressed(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	local cancel = self:Fire("OnEnterPressed", value)
-	if not cancel then
-		PlaySound("igMainMenuOptionCheckBoxOn")
-		HideButton(self)
-	end
-end
-
-local function EditBox_OnReceiveDrag(frame)
-	local self = frame.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(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	if tostring(value) ~= tostring(self.lasttext) then
-		self:Fire("OnTextChanged", value)
-		self.lasttext = value
-		ShowButton(self)
-	end
-end
-
-local function Button_OnClick(frame)
-	local editbox = frame.obj.editbox
-	editbox:ClearFocus()
-	EditBox_OnEnterPressed(editbox)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- height is controlled by SetLabel
-		self:SetWidth(200)
-		self:SetDisabled(false)
-		self:SetLabel()
-		self:SetText()
-		self:DisableButton(false)
-		self:SetMaxLetters(0)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(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,
-
-	["SetText"] = function(self, text)
-		self.lasttext = text or ""
-		self.editbox:SetText(text or "")
-		self.editbox:SetCursorPosition(0)
-		HideButton(self)
-	end,
-
-	["GetText"] = function(self, text)
-		return self.editbox:GetText()
-	end,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			self.label:Show()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18)
-			self:SetHeight(44)
-			self.alignoffset = 30
-		else
-			self.label:SetText("")
-			self.label:Hide()
-			self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0)
-			self:SetHeight(26)
-			self.alignoffset = 12
-		end
-	end,
-
-	["DisableButton"] = function(self, disabled)
-		self.disablebutton = disabled
-		if disabled then
-			HideButton(self)
-		end
-	end,
-
-	["SetMaxLetters"] = function (self, num)
-		self.editbox:SetMaxLetters(num or 0)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local num  = AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate")
-	editbox:SetAutoFocus(false)
-	editbox:SetFontObject(ChatFontNormal)
-	editbox:SetScript("OnEnter", Control_OnEnter)
-	editbox:SetScript("OnLeave", Control_OnLeave)
-	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", 6, 0)
-	editbox:SetPoint("BOTTOMRIGHT")
-	editbox:SetHeight(19)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
-	label:SetPoint("TOPLEFT", 0, -2)
-	label:SetPoint("TOPRIGHT", 0, -2)
-	label:SetJustifyH("LEFT")
-	label:SetHeight(18)
-
-	local button = CreateFrame("Button", nil, editbox, "UIPanelButtonTemplate")
-	button:SetWidth(40)
-	button:SetHeight(20)
-	button:SetPoint("RIGHT", -2, 0)
-	button:SetText(OKAY)
-	button:SetScript("OnClick", Button_OnClick)
-	button:Hide()
-
-	local widget = {
-		alignoffset = 30,
-		editbox     = editbox,
-		label       = label,
-		button      = button,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	editbox.obj, button.obj = widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
deleted file mode 100644
index 1aaf3f5..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
+++ /dev/null
@@ -1,78 +0,0 @@
---[[-----------------------------------------------------------------------------
-Heading Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "Heading", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetText()
-		self:SetFullWidth()
-		self:SetHeight(18)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetText"] = function(self, text)
-		self.label:SetText(text or "")
-		if text and text ~= "" then
-			self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0)
-			self.right:Show()
-		else
-			self.left:SetPoint("RIGHT", -3, 0)
-			self.right:Hide()
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontNormal")
-	label:SetPoint("TOP")
-	label:SetPoint("BOTTOM")
-	label:SetJustifyH("CENTER")
-
-	local left = frame:CreateTexture(nil, "BACKGROUND")
-	left:SetHeight(8)
-	left:SetPoint("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")
-	right:SetHeight(8)
-	right:SetPoint("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)
-
-	local widget = {
-		label = label,
-		left  = left,
-		right = right,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
deleted file mode 100644
index f25b586..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
+++ /dev/null
@@ -1,144 +0,0 @@
---[[-----------------------------------------------------------------------------
-Icon Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "Icon", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs, print = select, pairs, print
-
--- WoW APIs
-local CreateFrame, UIParent, GetBuildInfo = CreateFrame, UIParent, GetBuildInfo
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Button_OnClick(frame, button)
-	frame.obj:Fire("OnClick", button)
-	AceGUI:ClearFocus()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetHeight(110)
-		self:SetWidth(110)
-		self:SetLabel()
-		self:SetImage(nil)
-		self:SetImageSize(64, 64)
-		self:SetDisabled(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:Show()
-			self.label:SetText(text)
-			self:SetHeight(self.image:GetHeight() + 25)
-		else
-			self.label:Hide()
-			self:SetHeight(self.image:GetHeight() + 10)
-		end
-	end,
-
-	["SetImage"] = function(self, path, ...)
-		local image = self.image
-		image:SetTexture(path)
-
-		if image:GetTexture() then
-			local n = select("#", ...)
-			if n == 4 or n == 8 then
-				image:SetTexCoord(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		end
-	end,
-
-	["SetImageSize"] = function(self, width, height)
-		self.image:SetWidth(width)
-		self.image:SetHeight(height)
-		--self.frame:SetWidth(width + 30)
-		if self.label:IsShown() then
-			self:SetHeight(height + 25)
-		else
-			self:SetHeight(height + 10)
-		end
-	end,
-
-	["SetDisabled"] = function(self, disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:Disable()
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-			self.image:SetVertexColor(0.5, 0.5, 0.5, 0.5)
-		else
-			self.frame:Enable()
-			self.label:SetTextColor(1, 1, 1)
-			self.image:SetVertexColor(1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Button", nil, UIParent)
-	frame:Hide()
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnClick", Button_OnClick)
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlight")
-	label:SetPoint("BOTTOMLEFT")
-	label:SetPoint("BOTTOMRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetJustifyV("TOP")
-	label:SetHeight(18)
-
-	local image = frame:CreateTexture(nil, "BACKGROUND")
-	image:SetWidth(64)
-	image:SetHeight(64)
-	image:SetPoint("TOP", 0, -5)
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetAllPoints(image)
-	highlight:SetTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight")
-	highlight:SetTexCoord(0, 1, 0.23, 0.77)
-	highlight:SetBlendMode("ADD")
-
-	local widget = {
-		label = label,
-		image = image,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	-- SetText is deprecated, but keep it around for a while. (say, to WoW 4.0)
-	if (select(4, GetBuildInfo()) < 40000) then
-		widget.SetText = widget.SetLabel
-	else
-		widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
deleted file mode 100644
index 9e06049..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
+++ /dev/null
@@ -1,101 +0,0 @@
---[[-----------------------------------------------------------------------------
-InteractiveLabel Widget
--------------------------------------------------------------------------------]]
-local Type, Version = "InteractiveLabel", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local select, pairs = select, pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Label_OnClick(frame, button)
-	frame.obj:Fire("OnClick", button)
-	AceGUI:ClearFocus()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:LabelOnAcquire()
-		self:SetHighlight()
-		self:SetHighlightTexCoord()
-		self:SetDisabled(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetHighlight"] = function(self, ...)
-		self.highlight:SetTexture(...)
-	end,
-
-	["SetHighlightTexCoord"] = function(self, ...)
-		local c = select("#", ...)
-		if c == 4 or c == 8 then
-			self.highlight:SetTexCoord(...)
-		else
-			self.highlight:SetTexCoord(0, 1, 0, 1)
-		end
-	end,
-
-	["SetDisabled"] = function(self,disabled)
-		self.disabled = disabled
-		if disabled then
-			self.frame:EnableMouse(false)
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-		else
-			self.frame:EnableMouse(true)
-			self.label:SetTextColor(1, 1, 1)
-		end
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	-- create a Label type that we will hijack
-	local label = AceGUI:Create("Label")
-
-	local frame = label.frame
-	frame:EnableMouse(true)
-	frame:SetScript("OnEnter", Control_OnEnter)
-	frame:SetScript("OnLeave", Control_OnLeave)
-	frame:SetScript("OnMouseDown", Label_OnClick)
-
-	local highlight = frame:CreateTexture(nil, "HIGHLIGHT")
-	highlight:SetTexture(nil)
-	highlight:SetAllPoints()
-	highlight:SetBlendMode("ADD")
-
-	label.highlight = highlight
-	label.type = Type
-	label.LabelOnAcquire = label.OnAcquire
-	for method, func in pairs(methods) do
-		label[method] = func
-	end
-
-	return label
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
-
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
deleted file mode 100644
index f3043ff..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
+++ /dev/null
@@ -1,230 +0,0 @@
---[[-----------------------------------------------------------------------------
-Keybinding Widget
-Set Keybindings in the Config UI.
--------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: NOT_BOUND
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Keybinding_OnClick(frame, button)
-	if button == "LeftButton" or button == "RightButton" then
-		local self = frame.obj
-		if self.waitingForKey then
-			frame:EnableKeyboard(false)
-			self.msgframe:Hide()
-			frame:UnlockHighlight()
-			self.waitingForKey = nil
-		else
-			frame:EnableKeyboard(true)
-			self.msgframe:Show()
-			frame:LockHighlight()
-			self.waitingForKey = true
-		end
-	end
-	AceGUI:ClearFocus()
-end
-
-local ignoreKeys = {
-	["BUTTON1"] = true, ["BUTTON2"] = true,
-	["UNKNOWN"] = true,
-	["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true,
-	["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true,
-}
-local function Keybinding_OnKeyDown(frame, key)
-	local self = frame.obj
-	if self.waitingForKey then
-		local keyPressed = key
-		if keyPressed == "ESCAPE" then
-			keyPressed = ""
-		else
-			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
-
-		frame:EnableKeyboard(false)
-		self.msgframe:Hide()
-		frame:UnlockHighlight()
-		self.waitingForKey = nil
-
-		if not self.disabled then
-			self:SetKey(keyPressed)
-			self:Fire("OnKeyChanged", keyPressed)
-		end
-	end
-end
-
-local function Keybinding_OnMouseDown(frame, 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(frame, button)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(200)
-		self:SetLabel("")
-		self:SetKey("")
-		self.waitingForKey = nil
-		self.msgframe:Hide()
-		self:SetDisabled(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(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,
-
-	["SetKey"] = function(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,
-
-	["GetKey"] = function(self)
-		local key = self.button:GetText()
-		if key == NOT_BOUND then
-			key = nil
-		end
-		return key
-	end,
-
-	["SetLabel"] = function(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,
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-
-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 keybindingMsgFixWidth(frame)
-	frame:SetWidth(frame.msg:GetWidth() + 10)
-	frame:SetScript("OnUpdate", nil)
-end
-
-local function Constructor()
-	local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
-
-	local frame = CreateFrame("Frame", nil, UIParent)
-	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2")
-
-	button:EnableMouse(true)
-	button:RegisterForClicks("AnyDown")
-	button:SetScript("OnEnter", Control_OnEnter)
-	button:SetScript("OnLeave", Control_OnLeave)
-	button:SetScript("OnClick", Keybinding_OnClick)
-	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
-	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
-	button:SetPoint("BOTTOMLEFT")
-	button:SetPoint("BOTTOMRIGHT")
-	button:SetHeight(24)
-
-	local text = button:GetFontString()
-	text:SetPoint("LEFT", 7, 0)
-	text:SetPoint("RIGHT", -7, 0)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
-	label:SetPoint("TOPLEFT")
-	label:SetPoint("TOPRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetHeight(18)
-
-	local msgframe = CreateFrame("Frame", nil, UIParent)
-	msgframe:SetHeight(30)
-	msgframe:SetBackdrop(ControlBackdrop)
-	msgframe:SetBackdropColor(0,0,0)
-	msgframe:SetFrameStrata("FULLSCREEN_DIALOG")
-	msgframe:SetFrameLevel(1000)
-
-	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", 5, -5)
-	msgframe:SetScript("OnUpdate", keybindingMsgFixWidth)
-	msgframe:SetPoint("BOTTOM", button, "TOP")
-	msgframe:Hide()
-
-	local widget = {
-		button      = button,
-		label       = label,
-		msgframe    = msgframe,
-		frame       = frame,
-		alignoffset = 30,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	button.obj = widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
deleted file mode 100644
index 7f5f1c5..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
+++ /dev/null
@@ -1,162 +0,0 @@
---[[-----------------------------------------------------------------------------
-Label Widget
-Displays text and optionally an icon.
--------------------------------------------------------------------------------]]
-local Type, Version = "Label", 21
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local max, select, pairs = math.max, select, pairs
-
--- WoW APIs
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-
-local function UpdateImageAnchor(self)
-	if self.resizing then return end
-	local frame = self.frame
-	local width = frame.width or frame:GetWidth() or 0
-	local image = self.image
-	local label = self.label
-	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")
-			label:SetPoint("TOP", image, "BOTTOM")
-			label:SetPoint("LEFT")
-			label:SetWidth(width)
-			height = image:GetHeight() + label:GetHeight()
-		else
-			-- image on the left
-			image:SetPoint("TOPLEFT")
-			label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0)
-			label:SetWidth(width - imagewidth - 4)
-			height = max(image:GetHeight(), label:GetHeight())
-		end
-	else
-		-- no image shown
-		label:SetPoint("TOPLEFT")
-		label:SetWidth(width)
-		height = label:GetHeight()
-	end
-
-	self.resizing = true
-	frame:SetHeight(height)
-	frame.height = height
-	self.resizing = nil
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		-- set the flag to stop constant size updates
-		self.resizing = true
-		-- height is set dynamically by the text and image size
-		self:SetWidth(200)
-		self:SetText()
-		self:SetImage(nil)
-		self:SetImageSize(16, 16)
-		self:SetColor()
-		self:SetFontObject()
-
-		-- reset the flag
-		self.resizing = nil
-		-- run the update explicitly
-		UpdateImageAnchor(self)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["OnWidthSet"] = function(self, width)
-		UpdateImageAnchor(self)
-	end,
-
-	["SetText"] = function(self, text)
-		self.label:SetText(text)
-		UpdateImageAnchor(self)
-	end,
-
-	["SetColor"] = function(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,
-
-	["SetImage"] = function(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(...)
-			else
-				image:SetTexCoord(0, 1, 0, 1)
-			end
-		else
-			self.imageshown = nil
-		end
-		UpdateImageAnchor(self)
-	end,
-
-	["SetFont"] = function(self, font, height, flags)
-		self.label:SetFont(font, height, flags)
-	end,
-
-	["SetFontObject"] = function(self, font)
-		self:SetFont((font or GameFontHighlightSmall):GetFont())
-	end,
-
-	["SetImageSize"] = function(self, width, height)
-		self.image:SetWidth(width)
-		self.image:SetHeight(height)
-		UpdateImageAnchor(self)
-	end,
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall")
-	label:SetJustifyH("LEFT")
-	label:SetJustifyV("TOP")
-
-	local image = frame:CreateTexture(nil, "BACKGROUND")
-
-	-- create widget
-	local widget = {
-		label = label,
-		image = image,
-		frame = frame,
-		type  = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
deleted file mode 100644
index 64d8dd7..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
+++ /dev/null
@@ -1,311 +0,0 @@
-local Type, Version = "MultiLineEditBox", 23
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local pairs = pairs
-
--- WoW APIs
-local GetCursorInfo, GetSpellName, ClearCursor = GetCursorInfo, GetSpellName, ClearCursor
-local CreateFrame, UIParent = CreateFrame, UIParent
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: ACCEPT, ChatFontNormal
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function Layout(self)
-	self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight)
-
-	if self.labelHeight == 0 then
-		self.scrollBar:SetPoint("TOP", self.frame, "TOP", 0, -23)
-	else
-		self.scrollBar:SetPoint("TOP", self.label, "BOTTOM", 0, -19)
-	end
-
-	if self.disablebutton then
-		self.scrollBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 21)
-		self.scrollBG:SetPoint("BOTTOMLEFT", 0, 4)
-	else
-		self.scrollBar:SetPoint("BOTTOM", self.button, "TOP", 0, 18)
-		self.scrollBG:SetPoint("BOTTOMLEFT", self.button, "TOPLEFT")
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function OnClick(self)                                                     -- Button
-	self = self.obj
-	self.editBox:ClearFocus()
-	if not self:Fire("OnEnterPressed", self.editBox:GetText()) then
-		self.button:Disable()
-	end
-end
-
-local function OnCursorChanged(self, _, y, _, cursorHeight)                      -- EditBox
-	self, y = self.obj.scrollFrame, -y
-	local offset = self:GetVerticalScroll()
-	if y < offset then
-		self:SetVerticalScroll(y)
-	else
-		y = y + cursorHeight - self:GetHeight()
-		if y > offset then
-			self:SetVerticalScroll(y)
-		end
-	end
-end
-
-local function OnEditFocusLost(self)                                             -- EditBox
-	self:HighlightText(0, 0)
-end
-
-local function OnEnter(self)                                                     -- EditBox / ScrollFrame
-	self = self.obj
-	if not self.entered then
-		self.entered = true
-		self:Fire("OnEnter")
-	end
-end
-
-local function OnLeave(self)                                                     -- EditBox / ScrollFrame
-	self = self.obj
-	if self.entered then
-		self.entered = nil
-		self:Fire("OnLeave")
-	end
-end
-
-local function OnMouseUp(self)                                                   -- ScrollFrame
-	self = self.obj.editBox
-	self:SetFocus()
-	self:SetCursorPosition(self:GetNumLetters())
-end
-
-local function OnReceiveDrag(self)                                               -- EditBox / ScrollFrame
-	local type, id, info = GetCursorInfo()
-	if type == "spell" then
-		info, id = GetSpellName(id, info)
-		if id and id:match("%d") then
-			info = info .. "(" .. id .. ")"
-		end
-	elseif type ~= "item" then
-		return
-	end
-	ClearCursor()
-	self = self.obj
-	local editBox = self.editBox
-	if not editBox:HasFocus() then
-		editBox:SetFocus()
-		editBox:SetCursorPosition(editBox:GetNumLetters())
-	end
-	editBox:Insert(info)
-	self.button:Enable()
-end
-
-local function OnSizeChanged(self, width, height)                                -- ScrollFrame
-	self.obj.editBox:SetWidth(width)
-end
-
-local function OnTextChanged(self, userInput)                                    -- EditBox
-	if userInput then
-		self = self.obj
-		self:Fire("OnTextChanged", self.editBox:GetText())
-		self.button:Enable()
-	end
-end
-
-local function OnTextSet(self)                                                   -- EditBox
-	self:HighlightText(0, 0)
-	self:SetCursorPosition(self:GetNumLetters())
-	self:SetCursorPosition(0)
-	self.obj.button:Disable()
-end
-
-local function OnVerticalScroll(self, offset)                                    -- ScrollFrame
-	local editBox = self.obj.editBox
-	editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self.editBox:SetText("")
-		self:SetDisabled(false)
-		self:SetWidth(200)
-		self:DisableButton(false)
-		self:SetNumLines()
-		self.entered = nil
-		self:SetMaxLetters(0)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(self, disabled)
-		local editBox = self.editBox
-		if disabled then
-			editBox:ClearFocus()
-			editBox:EnableMouse(false)
-			editBox:SetTextColor(0.5, 0.5, 0.5)
-			self.label:SetTextColor(0.5, 0.5, 0.5)
-			self.scrollFrame:EnableMouse(false)
-			self.button:Disable()
-		else
-			editBox:EnableMouse(true)
-			editBox:SetTextColor(1, 1, 1)
-			self.label:SetTextColor(1, 0.82, 0)
-			self.scrollFrame:EnableMouse(true)
-		end
-	end,
-
-	["SetLabel"] = function(self, text)
-		if text and text ~= "" then
-			self.label:SetText(text)
-			if self.labelHeight ~= 10 then
-				self.labelHeight = 10
-				self.label:Show()
-			end
-		elseif self.labelHeight ~= 0 then
-			self.labelHeight = 0
-			self.label:Hide()
-		end
-		Layout(self)
-	end,
-
-	["SetNumLines"] = function(self, value)
-		if not value or value < 4 then
-			value = 4
-		end
-		self.numlines = value
-		Layout(self)
-	end,
-
-	["SetText"] = function(self, text)
-		self.editBox:SetText(text)
-	end,
-
-	["GetText"] = function(self)
-		return self.editBox:GetText()
-	end,
-
-	["SetMaxLetters"] = function (self, num)
-		self.editBox:SetMaxLetters(num or 0)
-	end,
-
-	["DisableButton"] = function(self, disabled)
-		self.disablebutton = disabled
-		if disabled then
-			self.button:Hide()
-		else
-			self.button:Show()
-		end
-		Layout(self)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-local backdrop = {
-	bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
-	edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16,
-	insets = { left = 4, right = 3, top = 4, bottom = 3 }
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-	frame:Hide()
-
-	local widgetNum = AceGUI:GetNextWidgetNum(Type)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
-	label:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, -4)
-	label:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, -4)
-	label:SetJustifyH("LEFT")
-	label:SetText(ACCEPT)
-	label:SetHeight(10)
-
-	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate2")
-	button:SetPoint("BOTTOMLEFT", 0, 4)
-	button:SetHeight(22)
-	button:SetWidth(label:GetStringWidth() + 24)
-	button:SetText(ACCEPT)
-	button:SetScript("OnClick", OnClick)
-	button:Disable()
-
-	local text = button:GetFontString()
-	text:ClearAllPoints()
-	text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5)
-	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
-	text:SetJustifyV("MIDDLE")
-
-	local scrollBG = CreateFrame("Frame", nil, frame)
-	scrollBG:SetBackdrop(backdrop)
-	scrollBG:SetBackdropColor(0, 0, 0)
-	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
-
-	local scrollFrame = CreateFrame("ScrollFrame", ("%s%dScrollFrame"):format(Type, widgetNum), frame, "UIPanelScrollFrameTemplate")
-
-	local scrollBar = _G[scrollFrame:GetName() .. "ScrollBar"]
-	scrollBar:ClearAllPoints()
-	scrollBar:SetPoint("TOP", label, "BOTTOM", 0, -19)
-	scrollBar:SetPoint("BOTTOM", button, "TOP", 0, 18)
-	scrollBar:SetPoint("RIGHT", frame, "RIGHT")
-
-	scrollBG:SetPoint("TOPRIGHT", scrollBar, "TOPLEFT", 0, 19)
-	scrollBG:SetPoint("BOTTOMLEFT", button, "TOPLEFT")
-
-	scrollFrame:SetPoint("TOPLEFT", scrollBG, "TOPLEFT", 5, -6)
-	scrollFrame:SetPoint("BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 4)
-	scrollFrame:SetScript("OnEnter", OnEnter)
-	scrollFrame:SetScript("OnLeave", OnLeave)
-	scrollFrame:SetScript("OnMouseUp", OnMouseUp)
-	scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
-	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
-	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
-
-	local editBox = CreateFrame("EditBox", nil, scrollFrame)
-	editBox:SetAllPoints()
-	editBox:SetFontObject(ChatFontNormal)
-	editBox:SetMultiLine(true)
-	editBox:EnableMouse(true)
-	editBox:SetAutoFocus(false)
-	editBox:SetCountInvisibleLetters(false)
-	editBox:SetScript("OnCursorChanged", OnCursorChanged)
-	editBox:SetScript("OnEditFocusLost", OnEditFocusLost)
-	editBox:SetScript("OnEnter", OnEnter)
-	editBox:SetScript("OnEscapePressed", editBox.ClearFocus)
-	editBox:SetScript("OnLeave", OnLeave)
-	editBox:SetScript("OnMouseDown", OnReceiveDrag)
-	editBox:SetScript("OnReceiveDrag", OnReceiveDrag)
-	editBox:SetScript("OnTextChanged", OnTextChanged)
-	editBox:SetScript("OnTextSet", OnTextSet)
-
-	scrollFrame:SetScrollChild(editBox)
-
-	local widget = {
-		button      = button,
-		editBox     = editBox,
-		frame       = frame,
-		label       = label,
-		labelHeight = 10,
-		numlines    = 4,
-		scrollBar   = scrollBar,
-		scrollBG    = scrollBG,
-		scrollFrame = scrollFrame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	button.obj, editBox.obj, scrollFrame.obj = widget, widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type, Constructor, Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
deleted file mode 100644
index 7f0bd5f..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
+++ /dev/null
@@ -1,281 +0,0 @@
---[[-----------------------------------------------------------------------------
-Slider Widget
-Graphical Slider, like, for Range values.
--------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 20
-local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
-
--- Lua APIs
-local min, max, floor = math.min, math.max, math.floor
-local tonumber, pairs = tonumber, pairs
-
--- WoW APIs
-local PlaySound = PlaySound
-local CreateFrame, UIParent = CreateFrame, UIParent
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: GameFontHighlightSmall
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function UpdateText(self)
-	local value = self.value or 0
-	if self.ispercent then
-		self.editbox:SetText(("%s%%"):format(floor(value * 1000 + 0.5) / 10))
-	else
-		self.editbox:SetText(floor(value * 100 + 0.5) / 100)
-	end
-end
-
-local function UpdateLabels(self)
-	local min, max = (self.min or 0), (self.max or 100)
-	if self.ispercent then
-		self.lowtext:SetFormattedText("%s%%", (min * 100))
-		self.hightext:SetFormattedText("%s%%", (max * 100))
-	else
-		self.lowtext:SetText(min)
-		self.hightext:SetText(max)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scripts
--------------------------------------------------------------------------------]]
-local function Control_OnEnter(frame)
-	frame.obj:Fire("OnEnter")
-end
-
-local function Control_OnLeave(frame)
-	frame.obj:Fire("OnLeave")
-end
-
-local function Frame_OnMouseDown(frame)
-	frame.obj.slider:EnableMouseWheel(true)
-	AceGUI:ClearFocus()
-end
-
-local function Slider_OnValueChanged(frame)
-	local self = frame.obj
-	if not frame.setup then
-		local newvalue = frame:GetValue()
-		if newvalue ~= self.value and not self.disabled then
-			self.value = newvalue
-			self:Fire("OnValueChanged", newvalue)
-		end
-		if self.value then
-			UpdateText(self)
-		end
-	end
-end
-
-local function Slider_OnMouseUp(frame)
-	local self = frame.obj
-	self:Fire("OnMouseUp", self.value)
-end
-
-local function Slider_OnMouseWheel(frame, v)
-	local self = frame.obj
-	if not self.disabled then
-		local value = self.value
-		if v > 0 then
-			value = min(value + (self.step or 1), self.max)
-		else
-			value = max(value - (self.step or 1), self.min)
-		end
-		self.slider:SetValue(value)
-	end
-end
-
-local function EditBox_OnEscapePressed(frame)
-	frame:ClearFocus()
-end
-
-local function EditBox_OnEnterPressed(frame)
-	local self = frame.obj
-	local value = frame:GetText()
-	if self.ispercent then
-		value = value:gsub('%%', '')
-		value = tonumber(value) / 100
-	else
-		value = tonumber(value)
-	end
-
-	if value then
-		PlaySound("igMainMenuOptionCheckBoxOn")
-		self.slider:SetValue(value)
-		self:Fire("OnMouseUp", value)
-	end
-end
-
-local function EditBox_OnEnter(frame)
-	frame:SetBackdropBorderColor(0.5, 0.5, 0.5, 1)
-end
-
-local function EditBox_OnLeave(frame)
-	frame:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.8)
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-local methods = {
-	["OnAcquire"] = function(self)
-		self:SetWidth(200)
-		self:SetHeight(44)
-		self:SetDisabled(false)
-		self:SetIsPercent(nil)
-		self:SetSliderValues(0,100,1)
-		self:SetValue(0)
-		self.slider:EnableMouseWheel(false)
-	end,
-
-	-- ["OnRelease"] = nil,
-
-	["SetDisabled"] = function(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,
-
-	["SetValue"] = function(self, value)
-		self.slider.setup = true
-		self.slider:SetValue(value)
-		self.value = value
-		UpdateText(self)
-		self.slider.setup = nil
-	end,
-
-	["GetValue"] = function(self)
-		return self.value
-	end,
-
-	["SetLabel"] = function(self, text)
-		self.label:SetText(text)
-	end,
-
-	["SetSliderValues"] = function(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)
-		UpdateLabels(self)
-		frame:SetValueStep(step or 1)
-		if self.value then
-			frame:SetValue(self.value)
-		end
-		frame.setup = nil
-	end,
-
-	["SetIsPercent"] = function(self, value)
-		self.ispercent = value
-		UpdateLabels(self)
-		UpdateText(self)
-	end
-}
-
---[[-----------------------------------------------------------------------------
-Constructor
--------------------------------------------------------------------------------]]
-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 ManualBackdrop = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	tile = true, edgeSize = 1, tileSize = 5,
-}
-
-local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent)
-
-	frame:EnableMouse(true)
-	frame:SetScript("OnMouseDown", Frame_OnMouseDown)
-
-	local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-	label:SetPoint("TOPLEFT")
-	label:SetPoint("TOPRIGHT")
-	label:SetJustifyH("CENTER")
-	label:SetHeight(15)
-
-	local slider = CreateFrame("Slider", nil, frame)
-	slider:SetOrientation("HORIZONTAL")
-	slider:SetHeight(15)
-	slider:SetHitRectInsets(0, 0, -10, 0)
-	slider:SetBackdrop(SliderBackdrop)
-	slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal")
-	slider:SetPoint("TOP", label, "BOTTOM")
-	slider:SetPoint("LEFT", 3, 0)
-	slider:SetPoint("RIGHT", -3, 0)
-	slider:SetValue(0)
-	slider:SetScript("OnValueChanged",Slider_OnValueChanged)
-	slider:SetScript("OnEnter", Control_OnEnter)
-	slider:SetScript("OnLeave", Control_OnLeave)
-	slider:SetScript("OnMouseUp", Slider_OnMouseUp)
-	slider:SetScript("OnMouseWheel", Slider_OnMouseWheel)
-
-	local lowtext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-	lowtext:SetPoint("TOPLEFT", slider, "BOTTOMLEFT", 2, 3)
-
-	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
-
-	local editbox = CreateFrame("EditBox", nil, frame)
-	editbox:SetAutoFocus(false)
-	editbox:SetFontObject(GameFontHighlightSmall)
-	editbox:SetPoint("TOP", slider, "BOTTOM")
-	editbox:SetHeight(14)
-	editbox:SetWidth(70)
-	editbox:SetJustifyH("CENTER")
-	editbox:EnableMouse(true)
-	editbox:SetBackdrop(ManualBackdrop)
-	editbox:SetBackdropColor(0, 0, 0, 0.5)
-	editbox:SetBackdropBorderColor(0.3, 0.3, 0.30, 0.80)
-	editbox:SetScript("OnEnter", EditBox_OnEnter)
-	editbox:SetScript("OnLeave", EditBox_OnLeave)
-	editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed)
-	editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed)
-
-	local widget = {
-		label       = label,
-		slider      = slider,
-		lowtext     = lowtext,
-		hightext    = hightext,
-		editbox     = editbox,
-		alignoffset = 25,
-		frame       = frame,
-		type        = Type
-	}
-	for method, func in pairs(methods) do
-		widget[method] = func
-	end
-	slider.obj, editbox.obj = widget, widget
-
-	return AceGUI:RegisterAsWidget(widget)
-end
-
-AceGUI:RegisterWidgetType(Type,Constructor,Version)
diff --git a/Interface/AddOns/DockingStation_Config/Libs/LibMenuAssist-1.0.lua b/Interface/AddOns/DockingStation_Config/Libs/LibMenuAssist-1.0.lua
deleted file mode 100644
index bd171f0..0000000
--- a/Interface/AddOns/DockingStation_Config/Libs/LibMenuAssist-1.0.lua
+++ /dev/null
@@ -1,218 +0,0 @@
-local LIB, REVISION = "LibMenuAssist-1.0", 0
-if not LibStub then error(LIB .. " requires LibStub", 0) end
-
-local lib, oldRevision = LibStub:NewLibrary(LIB, REVISION)
-if not lib then return end
-
-local setmetatable = setmetatable
-
---[[-----------------------------------------------------------------------------
-Version bridge
--------------------------------------------------------------------------------]]
-local activeMenu, focusFrames, mt, OnHide, OnShow
-
-if oldRevision then
-	activeMenu, focusFrames, mt, OnHide, OnShow = lib.__void()
-else
-	focusFrames, mt, OnHide, OnShow = { }, { }, { }, { }
-	DropDownList1:HookScript('OnHide', function() lib.OnHideHook(activeMenu) end)
-	DropDownList1:HookScript('OnShow', function() lib.OnShowHook(UIDROPDOWNMENU_OPEN_MENU) end)
-end
-
---[[-----------------------------------------------------------------------------
-Hooks
--------------------------------------------------------------------------------]]
-function lib.OnHideHook(menu)
-	activeMenu = nil
-	if OnHide[menu] then
-		OnHide[menu](menu)
-	end
-end
-
-function lib.OnShowHook(menu)
-	activeMenu = menu
-	if OnShow[menu] then
-		OnShow[menu](menu)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Support functions
--------------------------------------------------------------------------------]]
-local function DoNothing()
-end
-
---[[-----------------------------------------------------------------------------
-Methods
--------------------------------------------------------------------------------]]
-mt.__index = {
-	displayMode = 'MENU',
-
-	["AddFocusFrame"] = function(self, frame)
-		local type = type(frame)
-		if type == 'string' or type == 'table' then
-			if not focusFrames[self] then
-				focusFrames[self] = { }
-			end
-			focusFrames[self][frame] = true
-		end
-	end,
-
-	["Close"] = function(self)
-		if activeMenu == self then
-			CloseDropDownMenus()
-			return true
-		end
-	end,
-
-	['GetScript'] = function(self, script)
-		if script == 'OnHide' then
-			return OnHide[self]
-		elseif script == 'OnShow' then
-			return OnShow[self]
-		else
-			error(LIB .. ": <menu>:GetScript(script) - '" .. tostring(script) .. "' is not a valid script for this object", 2)
-		end
-	end,
-
-	["HasMouseFocus"] = function(self)
-		local focus, focusFrames = GetMouseFocus(), focusFrames[self]
-		if focus then
-			local name = focus:GetName()
-			if (focusFrames and (focusFrames[focus] or focusFrames[name])) or (activeMenu == self and name and name:match("^DropDownList%d+")) then
-				return true
-			end
-		end
-	end,
-
-	['HasScript'] = function(self, script)
-		return script == 'OnHide' or script == 'OnShow'
-	end,
-
-	["IsOpen"] = function(self)
-		return activeMenu == self
-	end,
-
-	["Open"] = function(self)
-		local onHide, onShow, runOnShow = OnHide[self], OnShow[self], activeMenu ~= self
-		OnHide[self], OnShow[self] = nil, nil
-		CloseDropDownMenus()
-		if self.point ~= 'cursor' then
-			ToggleDropDownMenu(1, nil, self, self.relativeTo or 'UIParent')
-		else
-			ToggleDropDownMenu(1, nil, self, 'cursor', self.xOffset, self.yOffset)
-		end
-		DropDownList1.showTimer = nil																-- Fix for a typo in UIDropDownMenuTemplates.xml
-		OnHide[self], OnShow[self] = onHide, onShow
-		if runOnShow and onShow then
-			onShow(self)
-		end
-		return self:UpdateAutoHide()
-	end,
-
-	["Recycle"] = function(self)
-		self:Close()
-		focusFrames[self], OnHide[self], OnShow[self] = nil, nil, nil
-		mt.__metatable = nil
-		setmetatable(self, nil)
-		mt.__metatable = LIB
-	end,
-
-	["Refresh"] = function(self)
-		if activeMenu == self then
-			local menuLevel, frame = UIDROPDOWNMENU_MENU_LEVEL
-			for level = 2, menuLevel do
-				frame = _G['DropDownList' .. level]
-				if not (frame and frame:IsShown()) then
-					menuLevel = level - 1
-					break
-				end
-			end
-			if self:Open() then
-				local button, _
-				for level = 2, menuLevel do
-					frame = _G['DropDownList' .. level]
-					_, button = frame:GetPoint()
-					if button and button.hasArrow then
-						ToggleDropDownMenu(level, button.value, nil, nil, nil, nil, nil, button)
-						if frame.numButtons == 0 then
-							break
-						end
-					end
-				end
-				return self:UpdateAutoHide()
-			end
-		end
-	end,
-
-	["RemoveFocusFrame"] = function(self, frame)
-		if focusFrames[self] then
-			focusFrames[self][frame] = nil
-			if not next(focusFrames[self]) then
-				focusFrames[self] = nil
-			end
-		end
-	end,
-
-	["SetAnchor"] = function(self, xOffset, yOffset, point, relativeTo, relativePoint)
-		if point == 'cursor' then
-			relativeTo, relativePoint = nil, nil
-		end
-		if xOffset ~= self.xOffset or yOffset ~= self.yOffset or point ~= self.point or relativeTo ~= self.relativeTo or relativePoint ~= self.relativePoint then
-			self.xOffset, self.yOffset, self.point, self.relativeTo, self.relativePoint = xOffset, yOffset, point, relativeTo, relativePoint
-			return self:Refresh()
-		end
-	end,
-
-	['SetHeight'] = DoNothing,																		-- Let Blizzard's code keep thinking this is a frame
-
-	['SetScript'] = function(self, script, func)
-		if type(func) ~= 'function' and func ~= nil then
-			error(LIB .. ": <menu>:SetScript(script, func) - 'func' expected function or nil, got " .. type(func), 2)
-		elseif script == 'OnHide' then
-			OnHide[self] = func
-		elseif script == 'OnShow' then
-			OnShow[self] = func
-		else
-			error(LIB .. ": <menu>:SetScript(script, func) - '" .. tostring(script) .. "' is not a valid script for this object", 2)
-		end
-	end,
-
-	["UpdateAutoHide"] = function(self)
-		if activeMenu == self then
-			if self:HasMouseFocus() then
-				UIDropDownMenu_StopCounting(DropDownList1)
-			else
-				UIDropDownMenu_StartCounting(DropDownList1)
-			end
-			return true
-		end
-	end
-}
-
-mt.__metatable = LIB
-
---[[-----------------------------------------------------------------------------
-Tweaks
--------------------------------------------------------------------------------]]
-DropDownList1:SetClampedToScreen(true)
-
-for level = 2, UIDROPDOWNMENU_MAXLEVELS do
-	_G['DropDownList' .. level]:SetScript('OnUpdate', nil)
-end
-
---[[-----------------------------------------------------------------------------
-Private API
--------------------------------------------------------------------------------]]
-function lib.__void()
-	wipe(lib)
-	wipe(mt)
-	return activeMenu, focusFrames, mt, OnHide, OnShow
-end
-
---[[-----------------------------------------------------------------------------
-Public API
--------------------------------------------------------------------------------]]
-function lib:New()
-	return setmetatable({ }, mt)
-end
diff --git a/Interface/AddOns/DockingStation_Config/Locales/deDE.lua b/Interface/AddOns/DockingStation_Config/Locales/deDE.lua
deleted file mode 100644
index 18bcf3a..0000000
--- a/Interface/AddOns/DockingStation_Config/Locales/deDE.lua
+++ /dev/null
@@ -1,151 +0,0 @@
-if not _G[...] or GetLocale() ~= 'deDE' then return end
-
-local L = _G[...].L
-
-L["<unnamed>"] = "<unnamed>"
-L["Align the font vertically."] = "Align the font vertically."
-L["Align the icon vertically."] = "Align the icon vertically."
-L["Allow a global reference to this panel for compatibility with other addons."] = "Allow a global reference to this panel for compatibility with other addons."
-L["Allow global references to panels for compatibility with other addons."] = "Allow global references to panels for compatibility with other addons."
-L["Alpha, Base"] = "Alpha, Base"
-L["Alpha, Parameters"] = "Alpha, Parameters"
-L["Anchor"] = "Anchor"
-L["Automatically remove the border from stock icons."] = "Automatically remove the border from stock icons."
-L["Background"] = "Background"
-L["Background related settings."] = "Background related settings."
-L["Border"] = "Border"
-L["Border related settings."] = "Border related settings."
-L["Center Plugins"] = "Center Plugins"
-L["Change the color and transparency of the background."] = "Change the color and transparency of the background."
-L["Change the color and transparency of the border."] = "Change the color and transparency of the border."
-L["Change the color and transparency of the overlay."] = "Change the color and transparency of the overlay."
-L["Change the color of the font."] = "Change the color of the font."
-L["Choose a font to use."] = "Choose a font to use."
-L["Choose a texture to apply as an overlay to the panel."] = "Choose a texture to apply as an overlay to the panel."
-L["Choose a texture to use for the background."] = "Choose a texture to use for the background."
-L["Choose a texture to use for the border."] = "Choose a texture to use for the border."
-L["Choose an effect to apply to the font."] = "Choose an effect to apply to the font."
-L["Choose the default section of panels to display plugins."] = "Choose the default section of panels to display plugins."
-L["Choose the screen region for positioning to be relative to."] = "Choose the screen region for positioning to be relative to."
-L["Choose the section of a panel to display this plugin."] = "Choose the section of a panel to display this plugin."
-L["Choose which panel should be the default display for plugins."] = "Choose which panel should be the default display for plugins."
-L["Choose which panel should display this plugin."] = "Choose which panel should display this plugin."
-L["Color"] = "Color"
-L["Config"] = "Config"
-L["Create a new panel and switch to it's options."] = "Create a new panel and switch to it's options."
-L["Create New Panel"] = "Create New Panel"
-L["Defaults"] = "Defaults"
-L["Delete"] = "Delete"
-L["Determines if panels will open their configuration panel on a right click."] = "Determines if panels will open their configuration panel on a right click."
-L["Determines if the default Blizzard frames should be moved."] = "Determines if the default Blizzard frames should be moved."
-L["Determines if the icon should be hidden."] = "Determines if the icon should be hidden."
-L["Determines if the icon should be placed on the far end of the plugin."] = "Determines if the icon should be placed on the far end of the plugin."
-L["Determines if the name of the plugin, as it appears in the selection window, should replace any provided label."] = "Determines if the name of the plugin, as it appears in the selection window, should replace any provided label."
-L["Determines if the panel should be set to full visibility if it has the focus of the mouse."] = "Determines if the panel should be set to full visibility if it has the focus of the mouse."
-L["Determines if this component should be hidden."] = "Determines if this component should be hidden."
-L["Determines if this panel is active or not."] = "Determines if this panel is active or not."
-L["Determines if this panel will open it's configuration panel on a right click."] = "Determines if this panel will open it's configuration panel on a right click."
-L["Determines if this plugin should be shown or not."] = "Determines if this plugin should be shown or not."
-L["Determines whether or not panels can be dragged by the mouse."] = "Determines whether or not panels can be dragged by the mouse."
-L["Determines whether or not plugins can be dragged by the mouse."] = "Determines whether or not plugins can be dragged by the mouse."
-L["Determines whether or not the plugins in this panel can be dragged by the mouse."] = "Determines whether or not the plugins in this panel can be dragged by the mouse."
-L["Determines whether or not this panel can be dragged by the mouse."] = "Determines whether or not this panel can be dragged by the mouse."
-L["Enable"] = "Enable"
-L["Enter a value that best represents the width to be maintained.\n\nExample: 8888.88 DPS"] = "Enter a value that best represents the width to be maintained.\n\nExample: 8888.88 DPS"
-L["Enter parameters that will be evaluated to determine if the tooltip will be shown or hidden.\n\nExample: [combat] hide; show"] = "Enter parameters that will be evaluated to determine if the tooltip will be shown or hidden.\n\nExample: [combat] hide; show"
-L["Enter parameters that will be evaluated to set the alpha level of the panel, falling back to the base alpha as needed.\n\nExample: [group:raid] 0; [combat] 0.5"] = "Enter parameters that will be evaluated to set the alpha level of the panel, falling back to the base alpha as needed.\n\nExample: [group:raid] 0; [combat] 0.5"
-L["Effect"] = "Effect"
-L["Fixed Width"] = "Fixed Width"
-L["Flip"] = "Flip"
-L["Flop"] = "Flop"
-L["Font"] = "Font"
-L["General"] = "General"
-L["General settings."] = "General settings."
-L["Global"] = "Global"
-L["Height"] = "Height"
-L["Hide"] = "Hide"
-L["Hide Errors"] = "Hide Errors"
-L["Icon"] = "Icon"
-L["Icon related settings."] = "Icon related settings."
-L["Ignore native plugin font coloring."] = "Ignore native plugin font coloring."
-L["Inset"] = "Inset"
-L["Label"] = "Label"
-L["Label related settings."] = "Label related settings."
-L["Left Edge"] = "Left Edge"
-L["Left Plugins"] = "Left Plugins"
-L["Level"] = "Level"
-L["Lock"] = "Lock"
-L["Mouse Reveal"] = "Mouse Reveal"
-L["Move Blizzard Frames"] = "Move Blizzard Frames"
-L["None"] = "None"
-L["Outline"] = "Outline"
-L["Outline, Thick"] = "Outline, Thick"
-L["Overlay"] = "Overlay"
-L["Overlay related settings."] = "Overlay related settings."
-L["Override"] = "Override"
-L["Panel Options"] = "Panel Options"
-L["Plugin Defaults"] = "Plugin Defaults"
-L["Position"] = "Position"
-L["Position related settings."] = "Position related settings."
-L["Rename"] = "Rename"
-L["Reset Position"] = "Reset Position"
-L["Reset position to the current anchor."] = "Reset position to the current anchor."
-L["Reverse the texture horizontally."] = "Reverse the texture horizontally."
-L["Reverse the texture vertically."] = "Reverse the texture vertically."
-L["Right Edge"] = "Right Edge"
-L["Right Plugins"] = "Right Plugins"
-L["Same as Label"] = "Same as Label"
-L["Scale"] = "Scale"
-L["Screen Clamp"] = "Screen Clamp"
-L["Section"] = "Section"
-L["Set how much distance to place between the center plugins."] = "Set how much distance to place between the center plugins."
-L["Set how much distance to place between the left panel edge and the first left-side plugin."] = "Set how much distance to place between the left panel edge and the first left-side plugin."
-L["Set how much distance to place between the left-side plugins."] = "Set how much distance to place between the left-side plugins."
-L["Set how much distance to place between the right panel edge and the first right-side plugin."] = "Set how much distance to place between the right panel edge and the first right-side plugin."
-L["Set how much distance to place between the right-side plugins."] = "Set how much distance to place between the right-side plugins."
-L["Set how much off-screen movement to allow."] = "Set how much off-screen movement to allow."
-L["Set how much to zoom in on the icon by."] = "Set how much to zoom in on the icon by."
-L["Set how thick the border will be."] = "Set how thick the border will be."
-L["Set the base alpha level to use for the panel."] = "Set the base alpha level to use for the panel."
-L["Set the default behavior for panels."] = "Set the default behavior for panels."
-L["Set the default behavior for plugins."] = "Set the default behavior for plugins."
-L["Set the default behavior for plugins in this panel."] = "Set the default behavior for plugins in this panel."
-L["Set the distance inside the panel before the background begins."] = "Set the distance inside the panel before the background begins."
-L["Set the frame level."] = "Set the frame level."
-L["Set the frame strata layer."] = "Set the frame strata layer."
-L["Set the height."] = "Set the height."
-L["Set the scale of the panel and plugin selection window."] = "Set the scale of the panel and plugin selection window."
-L["Set the scale of the tooltip.\n\nMay not work for some plugins."] = "Set the scale of the tooltip.\n\nMay not work for some plugins."
-L["Set the size of the font."] = "Set the size of the font."
-L["Set the size of the icon."] = "Set the size of the icon."
-L["Set the width."] = "Set the width."
-L["Shadow"] = "Shadow"
-L["Shadow, Distinct"] = "Shadow, Distinct"
-L["Side Bar Scale"] = "Side Bar Scale"
-L["Size"] = "Size"
-L["Size related settings."] = "Size related settings."
-L["Spacing"] = "Spacing"
-L["Spacing related settings."] = "Spacing related settings."
-L["Strata"] = "Strata"
-L["Suffix"] = "Suffix"
-L["Suffix related settings."] = "Suffix related settings."
-L["Suppress errors generated by plugins."] = "Suppress errors generated by plugins."
-L["Text"] = "Text"
-L["Text related settings."] = "Text related settings."
-L["Texture"] = "Texture"
-L["These options allow you to change the appearance and behavior of %s."] = "These options allow you to change the appearance and behavior of %s."
-L["These options allow you to change the appearance and behavior of each panel individually."] = "These options allow you to change the appearance and behavior of each panel individually."
-L["These options allow you to change the appearance and behavior of each plugin individually."] = "These options allow you to change the appearance and behavior of each plugin individually."
-L["Tooltip"] = "Tooltip"
-L["Tooltip related settings."] = "Tooltip related settings."
-L["Trim"] = "Trim"
-L["Use defaults for these settings."] = "Use defaults for these settings."
-L["Use Name"] = "Use Name"
-L["Use the same settings as for the label."] = "Use the same settings as for the label."
-L["Version: %s"] = "Version: %s"
-L["Vertical Adjust"] = "Vertical Adjust"
-L["Visibility"] = "Visibility"
-L["Visibility related settings."] = "Visibility related settings."
-L["Visibility, Parameters"] = "Visibility, Parameters"
-L["Width"] = "Width"
-L["Zoom"] = "Zoom"
diff --git a/Interface/AddOns/DockingStation_Config/SideBar.lua b/Interface/AddOns/DockingStation_Config/SideBar.lua
deleted file mode 100644
index 8b08ee4..0000000
--- a/Interface/AddOns/DockingStation_Config/SideBar.lua
+++ /dev/null
@@ -1,433 +0,0 @@
-if not _G[...] then return end
-local addon = _G[...]
-local addonName = addon.addonName
-setfenv(1, addon)
-
-local currentList, LUT, PanelList, PluginList = PanelList, { }, PanelList, PluginList
-
-UpdateConfigVariables = DoNothing
-
---[[-----------------------------------------------------------------------------
-Constants
--------------------------------------------------------------------------------]]
-local ENTRY_HEIGHT, ENTRY_WIDTH, INSET_HEIGHT, INSET_WIDTH, NUM_ENTRIES = 18, 175, 21, 12, 23
-
---[[-----------------------------------------------------------------------------
-Main frame
--------------------------------------------------------------------------------]]
-local sideBar, slider = CreateFrame('Frame', nil, InterfaceOptionsFrame)
-sideBar:SetHeight(ENTRY_HEIGHT * NUM_ENTRIES + INSET_HEIGHT)
-sideBar:SetWidth(ENTRY_WIDTH + INSET_WIDTH)
-sideBar:SetBackdrop({ bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]], edgeSize = 32, tile = true, tileSize = 32, insets = { left = 11, right = 11, top = 11, bottom = 10 } })
-sideBar:SetPoint('LEFT', InterfaceOptionsFrame, 'RIGHT', -13, 0)
-sideBar:EnableMouse(true)
-sideBar:Hide()
-
-local displayed = { }
-function sideBar:Refresh(offset)
-	local numDisplayed, data, entry = 0
-	wipe(displayed)
-	for index = 1, #currentList do
-		if not currentList[index].hidden then
-			numDisplayed = numDisplayed + 1
-			displayed[numDisplayed] = currentList[index]
-		end
-	end
-	offset = slider:Refresh(numDisplayed - NUM_ENTRIES, offset)
-	for index = 1, NUM_ENTRIES do
-		entry = sideBar[index]																		-- Don't use 'self' here due to slider:OnValueChanged calls
-		data = displayed[index + offset]
-		if data then
-			entry.data = data
-			if not data.hasChildren then
-				entry.toggle:Hide()
-			else
-				if data.collapsed then
-					entry.toggle:SetNormalTexture([[Interface\Buttons\UI-PlusButton-Up]])
-					entry.toggle:SetPushedTexture([[Interface\Buttons\UI-PlusButton-Down]])
-				else
-					entry.toggle:SetNormalTexture([[Interface\Buttons\UI-MinusButton-Up]])
-					entry.toggle:SetPushedTexture([[Interface\Buttons\UI-MinusButton-Down]])
-				end
-				entry.toggle:Show()
-			end
-			if not data.parent then
-				entry:SetNormalFontObject(GameFontNormal)
-				entry:SetHighlightFontObject(GameFontHighlight)
-				entry.text:SetPoint('LEFT', entry, 'LEFT', 8, 2)
-			else
-				entry:SetNormalFontObject(GameFontHighlightSmall)
-				entry:SetHighlightFontObject(GameFontHighlightSmall)
-				entry.text:SetPoint('LEFT', entry, 'LEFT', 16, 2)
-			end
-			if not data.selected then
-				entry:UnlockHighlight()
-			else
-				entry:LockHighlight()
-			end
-			entry:SetText(data.label)
-			entry:Show()
-		else
-			entry:Hide()
-		end
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Scroll bar frames
--------------------------------------------------------------------------------]]
-slider = CreateFrame('Slider', nil, sideBar)
-slider:SetOrientation('VERTICAL')
-
-slider:SetThumbTexture([[Interface\Buttons\UI-ScrollBar-Knob]])
-local sliderThumb = slider:GetRegions()
-sliderThumb:SetHeight(24)
-sliderThumb:SetWidth(16)
-sliderThumb:SetTexCoord(0.25, 0.75, 0.125, 0.875)
-
-local sliderDown = CreateFrame('Button', nil, slider, 'UIPanelScrollDownButtonTemplate')
-sliderDown:SetPoint('BOTTOMRIGHT', sideBar, 'BOTTOMRIGHT', -11, 9)
-
-local sliderUp = CreateFrame('Button', nil, slider, 'UIPanelScrollUpButtonTemplate')
-sliderUp:SetPoint('TOPRIGHT', sideBar, 'TOPRIGHT', -11, -11)
-
-slider:SetPoint('TOPLEFT', sliderUp, 'BOTTOMLEFT', 0, 5)
-slider:SetPoint('BOTTOMRIGHT', sliderDown, 'TOPRIGHT', 0, -4)
-slider:SetBackdrop({ bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 12, tile = true, tileSize = 16, insets = { left = 0, right = 0, top = 0, bottom = 0 } })
-slider:SetBackdropBorderColor(0.6, 0.6, 0.6, 0.6)
-slider:EnableMouseWheel(true)
-slider:SetMinMaxValues(0, 0)
-slider:SetValue(0)
-slider:SetValueStep(1)
-
-slider:SetScript('OnHide', function(self)
-	sideBar:EnableMouseWheel(false)
-	sideBar:SetWidth(ENTRY_WIDTH + INSET_WIDTH)
-end)
-slider:SetScript('OnShow', function(self)
-	sideBar:EnableMouseWheel(true)
-	sideBar:SetWidth(ENTRY_WIDTH + INSET_WIDTH + self:GetWidth())
-end)
-slider:SetScript('OnValueChanged', sideBar.Refresh)
-
-local function OnClick(self)
-	PlaySound('UChatScrollButton')
-	slider:SetValue(slider:GetValue() - (self == sliderUp and 1 or -1))
-end
-sliderDown:SetScript('OnClick', OnClick)
-sliderUp:SetScript('OnClick', OnClick)
-
-sideBar:SetScript('OnMouseWheel', function(_, direction)									-- up = 1, down = -1
-	slider:SetValue(slider:GetValue() - direction)
-end)
-
-function slider:Refresh(max, offset)
-	if max > 0 then
-		self:SetMinMaxValues(0, max)
-		offset = offset or self:GetValue()
-		if offset ~= 0 then
-			sliderUp:Enable()
-		else
-			sliderUp:Disable()
-		end
-		if offset ~= max  then
-			sliderDown:Enable()
-		else
-			sliderDown:Disable()
-		end
-		self:Show()
-	else
-		offset = 0
-		self:Hide()
-	end
-	return offset
-end
-
---[[-----------------------------------------------------------------------------
-Selectable entries
--------------------------------------------------------------------------------]]
-local function OnToggle(self)
-	PlaySound('igMainMenuOptionCheckBoxOn')
-	local data = self:GetParent().data
-	data.collapsed = not data.collapsed
-	local collapsed, key = data.collapsed, data.key
-	for index = 1, #currentList do
-		if currentList[index].parent == key then
-			currentList[index].hidden = collapsed
-		end
-	end
-	sideBar:Refresh()
-end
-
-local function OnClick(self, button)
-	if button == 'RightButton' then
-		SideBarMenu.entry, SideBarMenu.isPanel = self, currentList == PanelList
-		return SideBarMenu:Open()
-	end
-	PlaySound('igMainMenuOptionCheckBoxOn')
-	currentList:Select(self.data.key)
-end
-
-local entry, highlight, text, toggle
-for index = 1, NUM_ENTRIES do
-	entry = CreateFrame('Button', nil, sideBar)
-	entry:SetHeight(ENTRY_HEIGHT)
-	entry:SetWidth(ENTRY_WIDTH)
-	if index ~= 1 then
-		entry:SetPoint('TOPLEFT', sideBar[index - 1], 'BOTTOMLEFT')
-	else
-		entry:SetPoint('TOPLEFT', sideBar, 'TOPLEFT', 6, -12)
-	end
-	entry:RegisterForClicks('AnyUp')
-	entry:SetScript('OnClick', OnClick)
-	entry:SetHighlightTexture([[Interface\QuestFrame\UI-QuestLogTitleHighlight]])
-	entry:SetText(index)
-
-	toggle = CreateFrame('Button', nil, entry)
-	toggle:SetHeight(14)
-	toggle:SetWidth(14)
-	toggle:SetPoint('TOPRIGHT', entry, 'TOPRIGHT', -6, -1)
-	toggle:RegisterForClicks('AnyUp')
-	toggle:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
-	toggle:SetScript('OnClick', OnToggle)
-
-	highlight, text = entry:GetRegions()
-	highlight:SetPoint('TOPLEFT', entry, 'TOPLEFT', 0, 1)
-	highlight:SetPoint('BOTTOMRIGHT', entry, 'BOTTOMRIGHT', 0, 1)
-	highlight:SetVertexColor(0.196, 0.388, 0.8)
-
-	text:SetPoint('RIGHT', toggle, 'LEFT', -2, -1)
-	text:SetJustifyH('LEFT')
-
-	entry.text, entry.toggle = text, toggle
-	sideBar[index] = entry
-end
-
---[[-----------------------------------------------------------------------------
-Shared panel/plugin list support
--------------------------------------------------------------------------------]]
-local heap, refresh_list = setmetatable({ }, { __mode = 'kv' })
-
-local function delete_entry(list, key, noRefresh)
-	local data = LUT[key]
-	for index = 1, #list do
-		if list[index] == data then
-			tremove(list, index)
-			break
-		end
-	end
-	if noRefresh then
-		return data
-	end
-	heap[#heap + 1], LUT[key] = wipe(data), nil
-	if list.selection == key then
-		list.selection = nil
-		list:Select(list[1].key)
-	elseif currentList == list then
-		sideBar:Refresh()
-	end
-end
-
-local function get_data()
-	local data
-	data, heap[#heap] = heap[#heap], nil
-	return data or { }
-end
-
-local function select_entry(list, key, noContainerRefresh)
-	if list.selection == key then return end
-	if LUT[list.selection] then
-		LUT[list.selection].selected = false
-	end
-	list.selection, LUT[key].selected = key, true
-	if list.container:IsVisible() and not noContainerRefresh then
-		UpdateConfigVariables()
-		list.container:Refresh()
-	end
-	if currentList == list then
-		sideBar:Refresh()
-	end
-end
-
-function refresh_list(list)
-	local Add = list.Add
-	for index = 1, #list do
-		heap[#heap + 1] = wipe(list[index])
-	end
-	wipe(list)
-	list.max, list.min, list.value = 0, 0, 0
-	list.Add, list.Delete, list.Refresh, list.Select = Add, delete_entry, refresh_list, select_entry
-	if list == PanelList then
-		list.container, list.source = ConfigFrames[1], settings.panels
-		wipe(LUT)																						-- Assumes PanelList is always refreshed just before PluginList
-	else
-		list.container, list.source = ConfigFrames[2], settings.plugins
-	end
-	for key in pairs(list.source) do
-		Add(list, key, true)
-	end
-	list:Select(list[1].key)
-end
-
---[[-----------------------------------------------------------------------------
-Panel list
--------------------------------------------------------------------------------]]
-function PanelList:Add(id, noRefresh)
-	local data
-	if LUT[id] then
-		data = self:Delete(id, true)
-		data.selected, data = data.selected, wipe(data)
-	else
-		data = get_data()
-		LUT[id] = data
-	end
-	local sortKey, insertPoint = settings.panels[id].alias or L["<unnamed>"]
-	data.key, data.label, data.sortKey = id, sortKey, sortKey
-	for index = 1, #self do
-		if sortKey < self[index].sortKey then
-			insertPoint = index
-			break
-		end
-	end
-	tinsert(self, insertPoint or #self + 1, data)
-	if currentList == self and not noRefresh then
-		sideBar:Refresh()
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Plugin list
--------------------------------------------------------------------------------]]
-local function plugin_list_iterator(parent, index)
-	for index = index + 1, #PluginList do
-		if PluginList[index].parent == parent then
-			return index, PluginList[index]
-		end
-	end
-end
-
-local function get_insert_point(data, start)
-	local insertPoint, sortKey = start + 1, data.sortKey
-	for index, element in plugin_list_iterator, data.parent, start do
-		if sortKey < element.sortKey then
-			insertPoint = index
-			break
-		else
-			insertPoint = index + 1
-		end
-	end
-	return insertPoint
-end
-
-local children = { }
-function PluginList:Add(name, noRefresh)
-	local data
-	if LUT[name] then
-		data = self:Delete(name, true)
-		data.selected, data = data.selected, wipe(data)
-	else
-		data = get_data()
-		LUT[name] = data
-	end
-	local numChildren, pluginSettings, insertPoint = 0, settings.plugins[name]
-	local label = pluginAlias[name] or strtrim(name)
-	local parent, sortKey = pluginSettings.group, strlower(RemoveColorCodes(label))
-	data.key, data.label, data.parent, data.sortKey = name, dataObj[name] and label or '|cff808080' .. RemoveColorCodes(label), parent, sortKey
-	if pluginType[name] == 'group' then
-		for _, element in plugin_list_iterator, name, 0 do
-			numChildren = numChildren + 1
-			children[numChildren] = element
-		end
-		for index = 1, numChildren do
-			self:Delete(children[index].key, true)
-		end
-		data.parent = nil																				-- Groups of groups not supported
-	elseif parent then
-		for index, element in plugin_list_iterator, nil, 0 do
-			if element.key == parent then
-				if not element.hasChildren then
-					element.collapsed, element.hasChildren = true, true
-				end
-				data.hidden, insertPoint = element.collapsed, index
-				break
-			end
-		end
-		insertPoint = insertPoint and get_insert_point(data, insertPoint)
-	end
-	if not insertPoint then
-		insertPoint = #PluginList + 1
-		for index, element in plugin_list_iterator, nil, 0 do
-			if sortKey < element.sortKey then
-				insertPoint = index
-				break
-			end
-		end
-	end
-	tinsert(PluginList, insertPoint, data)
-	if numChildren > 0 then
-		data.collapsed, data.hasChildren = true, true
-		local child
-		for index = 1, numChildren do
-			child = children[index]
-			tinsert(PluginList, get_insert_point(child, insertPoint), child)
-			child.hidden, LUT[child.key] = true, child
-		end
-		wipe(children)
-	end
-	if currentList == self and not noRefresh then
-		sideBar:Refresh()
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Auto-hide
--------------------------------------------------------------------------------]]
-local timer
-
-local function update_timer(self, elapsed)
-	timer = timer + elapsed
-	if timer < 2 then return end
-	self:SetScript('OnUpdate', nil)
-	timer = nil
-	if not (ConfigFrames[1]:IsShown() or ConfigFrames[2]:IsShown()) then
-		self:Hide()
-	end
-end
-
-sideBar:SetScript('OnHide', function(self)
-	SideBarMenu:Close()
-	if timer then
-		self:SetScript('OnUpdate', nil)
-		timer = nil
-	end
-end)
-
-sideBar:SetScale(settings.scaleSideBar)
-function sideBar:ShowScale(value)
-	self:SetScale(value)
-	if not timer then
-		self:SetScript('OnUpdate', update_timer)
-		self:Show()
-	end
-	timer = 0
-end
-
---[[-----------------------------------------------------------------------------
-Global to config
--------------------------------------------------------------------------------]]
-sideBar:SetScript('OnShow', function(self)
-	local list = ConfigFrames[2]:IsShown() and PluginList or PanelList
-	if currentList ~= list then
-		currentList.value, currentList.min, currentList.max = slider:GetValue(), slider:GetMinMaxValues()
-		currentList = list
-		slider:SetMinMaxValues(list.min, list.max)
-		slider:SetValue(list.value)
-		sideBar:Refresh()
-	end
-	self:SetFrameStrata(InterfaceOptionsFrame:GetFrameStrata())
-	self:SetFrameLevel(InterfaceOptionsFrame:GetFrameLevel() - 1)
-end)
-
-refresh_list(PanelList)
-refresh_list(PluginList)
-SideBar = sideBar
diff --git a/Interface/AddOns/DockingStation_Config/SideBarMenu.lua b/Interface/AddOns/DockingStation_Config/SideBarMenu.lua
deleted file mode 100644
index 7c24a65..0000000
--- a/Interface/AddOns/DockingStation_Config/SideBarMenu.lua
+++ /dev/null
@@ -1,145 +0,0 @@
-if not _G[...] then return end
-local addon = _G[...]
-local addonName = addon.addonName
-setfenv(1, addon)
-
---[[-----------------------------------------------------------------------------
-Core
--------------------------------------------------------------------------------]]
-local function DeletePanel(id)
-	local cacheSettings, pluginSettings, children, name, plugin  = settings.panels[id], settings.plugins
-	settings.panels[id] = nil
-	if settings.defaultPanel == id then
-		settings.defaultPanel = next(settings.panels)
-	end
-	for section in pairs(sectionTypes) do
-		children = cacheSettings[section]
-		for index = 1, #children do
-			name = children[index]
-			if pluginSettings[name] then
-				pluginSettings[name].enable = false
-				SetInheritance(name, nil)
-			end
-		end
-	end
-	if panels[id] then
-		panels[id]:Recycle()
-	end
-	PanelList:Delete(id)
-	update_panel_list()
-end
-
-local function DeletePlugin(name)
-	local id, section, index = GetPluginLocation(name)
-	if id then
-		tremove(settings.panels[id][section], index)
-	end
-	settings.plugins[name] = nil
-	PluginList:Delete(name)
-end
-
-local function RenamePanel(id, value)
-	if value == "" or value == L["<unnamed>"] then
-		value = nil
-	end
-	if settings.panels[id].alias ~= value then
-		settings.panels[id].alias = value
-		PanelList:Add(id)
-		update_panel_list()
-	end
-end
-
-local function RenamePlugin(name, value)
-	if value == "" or value == name then
-		value = nil
-	end
-	if pluginAlias[name] ~= value then
-		pluginAlias[name] = value
-		if plugins[name] then
-			plugins[name]:Refresh()
-		end
-		PluginList:Add(name)
-	end
-end
-
---[[-----------------------------------------------------------------------------
-Edit box
--------------------------------------------------------------------------------]]
-local editBox = CreateFrame('EditBox', nil, SideBar)
-editBox:SetFrameLevel(editBox:GetFrameLevel() + 1)
-editBox:SetCountInvisibleLetters(false)
-editBox:Hide()
-
-editBox:SetScript('OnEditFocusLost', function(self)
-	if self:IsShown() then
-		if self.ignore then
-			self.ignore = nil
-		else
-			(SideBarMenu.isPanel and RenamePanel or RenamePlugin)(self.entry.data.key, self:GetText():trim())
-		end
-		self:Hide()
-	end
-end)
-
-editBox:SetScript('OnEnterPressed', editBox.ClearFocus)
-
-editBox:SetScript('OnEscapePressed', function(self)
-	self.ignore = true
-	self:ClearFocus()
-end)
-
-editBox:SetScript('OnHide', function(self)
-	self.entry.text:Show()
-end)
-
-editBox:SetScript('OnShow', function(self)
-	local entry = SideBarMenu.entry
-	self.entry = entry
-	entry.text:Hide()
-	self:SetAllPoints(entry.text)
-	self:SetFontObject(entry:GetNormalFontObject())
-	self:SetText(entry.data.label)
-	self:HighlightText()
-	self:SetCursorPosition(self:GetNumLetters())
-	self:SetFocus()
-end)
-
---[[-----------------------------------------------------------------------------
-Drop down menu
--------------------------------------------------------------------------------]]
-local function OnClick(self, delete, key)
-	editBox:ClearFocus()
-	if delete then
-		delete(key)
-	else
-		editBox:Show()
-	end
-end
-
-SideBarMenu = LibStub('LibMenuAssist-1.0'):New()
-SideBarMenu.point = 'cursor'
-SideBarMenu.xOffset = 0
-SideBarMenu.yOffset = 0
-
-SideBarMenu.initialize = function(self, level)
-	local data, info = self.entry.data, UIDropDownMenu_CreateInfo()
-	info.notCheckable = true
-
-	info.isTitle = true
-	info.text = RemoveColorCodes(data.label)
-	UIDropDownMenu_AddButton(info, level)
-	info.isTitle = nil
-
-	info.func, info.arg2 = OnClick, data.key
-	info.text = L["Delete"]
-	if self.isPanel then
-		info.disabled, info.arg1 = #PanelList <= 1, DeletePanel
-	else
-		info.disabled, info.arg1 = dataObj[data.key], DeletePlugin
-	end
-	UIDropDownMenu_AddButton(info, level)
-	info.disabled, info.arg1 = nil, nil
-
-	info.text = L["Rename"]
-	UIDropDownMenu_AddButton(info, level)
-end
diff --git a/Interface/AddOns/DockingStation_Config/Widget-StatusbarOverlay.lua b/Interface/AddOns/DockingStation_Config/Widget-StatusbarOverlay.lua
deleted file mode 100644
index c26ac5c..0000000
--- a/Interface/AddOns/DockingStation_Config/Widget-StatusbarOverlay.lua
+++ /dev/null
@@ -1,115 +0,0 @@
-if not _G[...] then return end
-
--- Based on AceGUI-3.0-SharedMediaWidgets StatusbarWidget by Yssaril
-
-local AceGUI, LSM = LibStub('AceGUI-3.0'), LibStub('LibSharedMedia-3.0')
-
-local media = LSM.MediaTable["statusbar_overlay"]
-if type(media) ~= 'table' then
-	media = { }
-	LSM.MediaTable["statusbar_overlay"] = media
-end
-AceGUIWidgetLSMlists["statusbar_overlay"] = media
-
-local list = LSM:List("statusbar_overlay")
-
-local function SetText(self, text)
-	if media[text] and self.texture:SetTexture(media[text]) then
-		self.text:SetText(text)
-		self.texture:SetAlpha(1)
-		self.userdata.value = text
-	else
-		self.text:SetText("")
-		self.texture:SetAlpha(0)
-		self.userdata.value = ""
-	end
-end
-
-local Type, Version = "LSM30_Statusbar_Overlay-Item-Toggle", 1
-if (AceGUI:GetWidgetVersion(Type) or 0) < Version then
-	local function Constructor()
-		local self = AceGUI:Create('Dropdown-Item-Toggle')
-		local frame = self.frame
-
-		local bg = frame:CreateTexture(nil, 'BORDER')
-		bg:SetPoint('TOPLEFT', frame, 'TOPLEFT', 6, -1)
-		bg:SetPoint('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -4, 1)
-		bg:SetTexture([[Interface\BUTTONS\WHITE8X8]])
-		bg:SetVertexColor(0.5, 0.5, 0.5)
-
-		local texture = frame:CreateTexture(nil, 'ARTWORK')
-		texture:SetAllPoints(bg)
-		texture:SetTexture([[Interface\BUTTONS\WHITE8X8]])
-		texture:SetVertexColor(1, 1, 1)
-
-		self.texture, self.type, self.SetText = texture, Type, SetText
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(Type, Constructor, Version)
-end
-
-local Type, Version = "LSM30_Statusbar_Overlay", 3
-if (AceGUI:GetWidgetVersion(Type) or 0) < Version then
-	local function OnValueChanged(item, _, checked)
-		local self = item.userdata.obj
-		if checked then
-			self:SetValue(item.userdata.value)
-			self:Fire('OnValueChanged', item.userdata.value)
-		else
-			item:SetValue(true)
-		end
-		if self.open then
-			self.pullout:Close()
-		end
-	end
-
-	local function SetList(self)
-		local pullout = self.pullout
-		local items, item = pullout.items
-		for index = 1, #items do
-			items[index]:SetText(list[index])
-		end
-		for index = #items + 1, #list do
-			item = AceGUI:Create("LSM30_Statusbar_Overlay-Item-Toggle")
-			item.userdata.obj = self
-			item:SetText(list[index])
-			item:SetCallback('OnValueChanged', OnValueChanged)
-			pullout:AddItem(item)
-		end
-		self.list = media
-	end
-
-	local function SetValue(self, value)
-		self.value = value
-		self:SetText(value or "")
-	end
-
-	local function Constructor()
-		local self = AceGUI:Create('Dropdown')
-		local dropdown = self.dropdown
-		local name = dropdown:GetName()
-
-		_G[name .. 'Left']:SetDrawLayer('BACKGROUND')
-		_G[name .. 'Middle']:SetDrawLayer('BACKGROUND')
-		_G[name .. 'Right']:SetDrawLayer('BACKGROUND')
-
-		local bg = dropdown:CreateTexture(nil, 'BORDER')
-		bg:SetPoint('TOPLEFT', _G[name .. 'Left'], 'TOPLEFT', 24, -24)
-		bg:SetPoint('BOTTOMRIGHT', _G[name .. 'Right'], 'BOTTOMRIGHT', -39, 26)
-		bg:SetTexture([[Interface\BUTTONS\WHITE8X8]])
-		bg:SetVertexColor(0.5, 0.5, 0.5)
-
-		local texture = dropdown:CreateTexture(nil, 'ARTWORK')
-		texture:SetAllPoints(bg)
-		texture:SetTexture([[Interface\BUTTONS\WHITE8X8]])
-		texture:SetVertexColor(1, 1, 1)
-
-		self.text:SetDrawLayer('OVERLAY')
-
-		self.texture, self.type, self.SetList, self.SetText, self.SetValue = texture, Type, SetList, SetText, SetValue
-		return self
-	end
-
-	AceGUI:RegisterWidgetType(Type, Constructor, Version)
-end