diff --git a/ImproveAny.toc b/ImproveAny.toc
index a371c49..b456d54 100644
--- a/ImproveAny.toc
+++ b/ImproveAny.toc
@@ -4,7 +4,7 @@
 ## Interface-Cata: 40400
 ## Interface: 110002
 
-## Version: 0.9.105
+## Version: 0.9.106
 ## Title: ImproveAny by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Cata.toc b/ImproveAny_Cata.toc
index 727f325..1ac4321 100644
--- a/ImproveAny_Cata.toc
+++ b/ImproveAny_Cata.toc
@@ -1,5 +1,5 @@
 ## Interface: 40400
-## Version: 0.9.105
+## Version: 0.9.106
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_TBC.toc b/ImproveAny_TBC.toc
index 591ca28..2221cf1 100644
--- a/ImproveAny_TBC.toc
+++ b/ImproveAny_TBC.toc
@@ -1,5 +1,5 @@
 ## Interface: 20504
-## Version: 0.9.105
+## Version: 0.9.106
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Vanilla.toc b/ImproveAny_Vanilla.toc
index 1e6ad84..0d2c029 100644
--- a/ImproveAny_Vanilla.toc
+++ b/ImproveAny_Vanilla.toc
@@ -1,5 +1,5 @@
 ## Interface: 11504
-## Version: 0.9.105
+## Version: 0.9.106
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/ImproveAny_Wrath.toc b/ImproveAny_Wrath.toc
index 435163f..b7555e4 100644
--- a/ImproveAny_Wrath.toc
+++ b/ImproveAny_Wrath.toc
@@ -1,5 +1,5 @@
 ## Interface: 30403
-## Version: 0.9.105
+## Version: 0.9.106
 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Improve Any Ui or Frame
 ## Author: D4KiR
diff --git a/core.lua b/core.lua
index e6ba573..082de4e 100644
--- a/core.lua
+++ b/core.lua
@@ -268,7 +268,7 @@ function ImproveAny:Event(event, ...)
 						["icon"] = 136033,
 						["var"] = mmbtn,
 						["dbtab"] = IATAB,
-						["vTT"] = {{"ImproveAny |T136033:16:16:0:0|t", "v|cff3FC7EB0.9.105"}, {ImproveAny:GT("LEFTCLICK"), ImproveAny:GT("MMBTNLEFT")}, {ImproveAny:GT("RIGHTCLICK"), ImproveAny:GT("MMBTNRIGHT")}},
+						["vTT"] = {{"ImproveAny |T136033:16:16:0:0|t", "v|cff3FC7EB0.9.106"}, {ImproveAny:GT("LEFTCLICK"), ImproveAny:GT("MMBTNLEFT")}, {ImproveAny:GT("RIGHTCLICK"), ImproveAny:GT("MMBTNRIGHT")}},
 						["funcL"] = function()
 							ImproveAny:ToggleSettings()
 						end,
diff --git a/ele/lfgframe.lua b/ele/lfgframe.lua
index 0bbe1c6..6612bf5 100644
--- a/ele/lfgframe.lua
+++ b/ele/lfgframe.lua
@@ -27,7 +27,7 @@ if IMPORTREALMS[portal] then
 			if REALMS[portal][realmName] == nil then
 				REALMS[portal][realmName] = lang
 			else
-				print(">>> [ImproveAny |T136033:16:16:0:0|t] EXISTS ALREADY", realmName)
+				ImproveAny:MSG(">>> EXISTS ALREADY", realmName)
 			end
 		end
 	end
diff --git a/ele/minimap.lua b/ele/minimap.lua
index 779a642..23fae10 100644
--- a/ele/minimap.lua
+++ b/ele/minimap.lua
@@ -1,6 +1,13 @@
 local _, ImproveAny = ...
+local deg, atan2 = math.deg, math.atan2
 local mmdelay = 0.4
 local minimapshape = "ROUND"
+if GetMinimapShape == nil then
+	function GetMinimapShape()
+		return minimapshape
+	end
+end
+
 function ImproveAny:UpdateMinimapSettings()
 	if ImproveAny:IsEnabled("MINIMAP", false) and ImproveAny:IsEnabled("MINIMAPSHAPESQUARE", false) then
 		ImproveAny:SHAPE("SQUARE")
@@ -143,6 +150,89 @@ end
 local IAMMBtns = {}
 local IAMMBtnsConverted = {}
 local MMBtnSize = 31
+local function GetVaultData()
+	local vaultData = C_WeeklyRewards.GetActivities()
+	if not vaultData then return {}, {}, {} end
+	local res = {}
+	res["raid"] = {}
+	res["mplus"] = {}
+	res["world"] = {}
+	for x, data in pairs(vaultData) do
+		if data.type == 1 then
+			table.insert(res["mplus"], data)
+		elseif data.type == 3 then
+			table.insert(res["raid"], data)
+		elseif data.type == 6 then
+			table.insert(res["world"], data)
+		else
+			ImproveAny:MSG("[GetVaultData] Missing Type")
+		end
+	end
+
+	return res
+end
+
+local function GetVaultStatus(vaultData, name)
+	local res = ""
+	for i, data in pairs(vaultData[name]) do
+		local color = "|cFFFFFFFF"
+		if data.progress == 0 then
+			color = "|cFFFF0000"
+		elseif data.progress >= data.threshold then
+			color = "|cFF00FF00"
+		else
+			color = "|cFFFFFF00"
+		end
+
+		local status = color .. data.progress .. "|cFFFFFFFF/" .. color .. data.threshold
+		if data.progress > data.threshold then
+			status = color .. data.threshold .. "|cFFFFFFFF/" .. color .. data.threshold
+		end
+
+		if res ~= "" then
+			res = res .. "     "
+		end
+
+		res = res .. status
+	end
+
+	res = res .. "  "
+
+	return res
+end
+
+local function GetVaultStatusIlvl(vaultData, name)
+	local res = ""
+	for i, data in pairs(vaultData[name]) do
+		local ilvl = nil
+		local itemLink = C_WeeklyRewards.GetExampleRewardItemHyperlinks(data.id)
+		if itemLink then
+			ilvl = GetDetailedItemLevelInfo(itemLink)
+		end
+
+		local color = "|cFFFFFFFF"
+		if data.progress == 0 then
+			color = "|cFFFF0000"
+		elseif data.progress >= data.threshold then
+			color = "|cFF00FF00"
+		else
+			color = "|cFFFFFF00"
+		end
+
+		if res ~= "" then
+			res = res .. " "
+		end
+
+		if ilvl then
+			res = res .. " |cFFFFFFFF(" .. color .. ilvl .. "|cFFFFFFFF" .. ")"
+		else
+			res = res .. "         "
+		end
+	end
+
+	return res
+end
+
 function ImproveAny:InitMinimap()
 	function ImproveAny:SHAPE(msg)
 		msg = msg:upper()
@@ -164,7 +254,7 @@ function ImproveAny:InitMinimap()
 		C_Timer.After(
 			0.3,
 			function()
-				local mmBtnsNames = {"Lib_GPI_Minimap_", "LibDBIcon10_", "BtWQuests", "MinimapButton", "MinimapIcon", "_Minimap_"}
+				local mmBtnsNames = {"Lib_GPI_Minimap_", "D4Lib_MMBTN_", "LibDBIcon10_", "BtWQuests", "MinimapButton", "MinimapIcon", "_Minimap_"}
 				local IAMMBtnsBliz = {}
 				local IAMMBtnsFrame = CreateFrame("Frame", "IAMMBtnsFrame", UIParent)
 				IAMMBtnsFrame:SetSize(100, 100)
@@ -201,13 +291,14 @@ function ImproveAny:InitMinimap()
 				IAMMBtnsFrame.hide = true
 				if ImproveAny:IsEnabled("COMBINEMMBTNS", false) then
 					local mmbtn = nil
+					IATAB["MMBtns"] = IATAB["MMBtns"] or {}
 					ImproveAny:CreateMinimapButton(
 						{
 							["name"] = "ImproveAnyMMBtns",
 							["icon"] = 1120721,
 							["var"] = mmbtn,
 							["dbtab"] = IATAB["MMBtns"],
-							["vTT"] = {{"Minimap Buttons", "ImproveAny"}, {"Leftclick", "Toggle Visibility"}},
+							["vTT"] = {{"Minimap Buttons", "ImproveAny |T136033:16:16:0:0|t"}, {"Leftclick", "Toggle Visibility"}},
 							["funcL"] = function()
 								IAMMBtnsFrame.hide = not IAMMBtnsFrame.hide
 								ImproveAny:UpdateIAMMBtns()
@@ -217,6 +308,77 @@ function ImproveAny:InitMinimap()
 					)
 				end
 
+				if ImproveAny:GetWoWBuild() == "RETAIL" and ImproveAny:IsEnabled("SHOWVAULTMMBTN", true) then
+					local mmbtn = nil
+					IATAB["MMBtnGreatVault"] = IATAB["MMBtnGreatVault"] or {}
+					ImproveAny:CreateMinimapButton(
+						{
+							["name"] = "ImproveAnyGreatVault",
+							["atlas"] = "gficon-chest-evergreen-greatvault-complete",
+							["var"] = mmbtn,
+							["dbtab"] = IATAB["MMBtnGreatVault"],
+							["vTT"] = {{"Great Vault", "ImproveAny |T136033:16:16:0:0|t"}, {"Leftclick", "Toggle Great Vault"}},
+							["vTTUpdate"] = function(sel, tt)
+								if C_WeeklyRewards.HasAvailableRewards() or C_WeeklyRewards.HasGeneratedRewards() then
+									tt:AddDoubleLine(" ", " ")
+									tt:AddDoubleLine("GREAT VAULT HAS REWARD", "")
+								end
+
+								tt:AddDoubleLine(" ", " ")
+								local vaultData = GetVaultData()
+								local raid = GetVaultStatus(vaultData, "raid")
+								tt:AddDoubleLine("Raid", raid)
+								local raidIlvl = GetVaultStatusIlvl(vaultData, "raid")
+								if strtrim(raidIlvl) ~= "" then
+									tt:AddDoubleLine(" ", raidIlvl)
+								end
+
+								tt:AddDoubleLine(" ", " ")
+								local mplus = GetVaultStatus(vaultData, "mplus")
+								tt:AddDoubleLine("M+", mplus)
+								local mplusIlvl = GetVaultStatusIlvl(vaultData, "mplus")
+								if strtrim(mplusIlvl) ~= "" then
+									tt:AddDoubleLine(" ", mplusIlvl)
+								end
+
+								tt:AddDoubleLine(" ", " ")
+								local world = GetVaultStatus(vaultData, "world")
+								tt:AddDoubleLine("World", world)
+								local worldIlvl = GetVaultStatusIlvl(vaultData, "world")
+								if strtrim(worldIlvl) ~= "" then
+									tt:AddDoubleLine(" ", worldIlvl)
+								end
+
+								for i = 1, 99 do
+									local tr = _G[tt:GetName() .. "TextRight" .. i]
+									if tr then
+										tr:SetFontObject("ConsoleFontNormal")
+										local f1, _, f3 = tr:GetFont()
+										tr:SetFont(f1, 14, f3)
+									end
+								end
+
+								return false
+							end,
+							["funcL"] = function()
+								if not InCombatLockdown() then
+									if WeeklyRewardsFrame == nil then
+										WeeklyRewards_ShowUI()
+									elseif WeeklyRewardsFrame:IsShown() then
+										WeeklyRewardsFrame:Hide()
+									else
+										WeeklyRewards_ShowUI()
+									end
+								end
+							end,
+							["addoncomp"] = false,
+							["sw"] = 64,
+							["sh"] = 64,
+							["border"] = false,
+						}
+					)
+				end
+
 				local function sortFunc(a, b)
 					local a1 = a:GetName()
 					local b1 = b:GetName()
@@ -229,47 +391,49 @@ function ImproveAny:InitMinimap()
 				end
 
 				function ImproveAny:UpdateIAMMBtns()
-					local br = 7
-					local sr = 1
-					local sum = 0
-					for i, v in pairs(IAMMBtns) do
-						if v:IsShown() and (v:GetParent() == Minimap or v:GetParent() == IAMMBtnsFrame) then
-							sum = sum + 1
+					if ImproveAny:IsEnabled("COMBINEMMBTNS", false) then
+						local br = 7
+						local sr = 1
+						local sum = 0
+						for i, v in pairs(IAMMBtns) do
+							if v:IsShown() and (v:GetParent() == Minimap or v:GetParent() == IAMMBtnsFrame) then
+								sum = sum + 1
+							end
 						end
-					end
 
-					table.sort(IAMMBtns, sortFunc)
-					local rows, cols = ImproveAny:GetRowsCols(sum)
-					IAMMBtnsFrame:SetSize(cols * (MMBtnSize + sr) + 2 * br - sr, rows * (MMBtnSize + sr) + 2 * br - sr)
-					local row, col = 0, 0
-					for i, v in pairs(IAMMBtns) do
-						if v:IsShown() and (v:GetParent() == Minimap or v:GetParent() == IAMMBtnsFrame) then
-							if col == cols then
-								col = 0
-								row = row + 1
-							end
+						table.sort(IAMMBtns, sortFunc)
+						local rows, cols = ImproveAny:GetRowsCols(sum)
+						IAMMBtnsFrame:SetSize(cols * (MMBtnSize + sr) + 2 * br - sr, rows * (MMBtnSize + sr) + 2 * br - sr)
+						local row, col = 0, 0
+						for i, v in pairs(IAMMBtns) do
+							if v:IsShown() and (v:GetParent() == Minimap or v:GetParent() == IAMMBtnsFrame) then
+								if col == cols then
+									col = 0
+									row = row + 1
+								end
 
-							v:SetParent(IAMMBtnsFrame)
-							v:ClearAllPoints()
-							local cSpace = 0
-							local rSpace = 0
-							if col > 0 then
-								cSpace = col * sr
-							end
+								v:SetParent(IAMMBtnsFrame)
+								v:ClearAllPoints()
+								local cSpace = 0
+								local rSpace = 0
+								if col > 0 then
+									cSpace = col * sr
+								end
 
-							if row > 0 then
-								rSpace = row * sr
-							end
+								if row > 0 then
+									rSpace = row * sr
+								end
 
-							v:SetPoint("TOPLEFT", IAMMBtnsFrame, "TOPLEFT", col * MMBtnSize + cSpace + br, -row * MMBtnSize - rSpace - br)
-							col = col + 1
+								v:SetPoint("TOPLEFT", IAMMBtnsFrame, "TOPLEFT", col * MMBtnSize + cSpace + br, -row * MMBtnSize - rSpace - br)
+								col = col + 1
+							end
 						end
-					end
 
-					if not IAMMBtnsFrame.hide then
-						IAMMBtnsFrame:Show()
-					else
-						IAMMBtnsFrame:Hide()
+						if not IAMMBtnsFrame.hide then
+							IAMMBtnsFrame:Show()
+						else
+							IAMMBtnsFrame:Hide()
+						end
 					end
 				end
 
@@ -283,128 +447,53 @@ function ImproveAny:InitMinimap()
 							btn:Hide()
 						end
 
-						btn:SetParent(Minimap)
-						btn:SetMovable(true)
-						btn:SetUserPlaced(false)
-						local radius = 80
-						if ImproveAny:GetWoWBuild() == "RETAIL" then
-							radius = 110
-						end
-
-						local pos = random(0, 360)
-						local ofsx = -radius * cos(pos)
-						local ofsy = radius * sin(pos)
-						IATAB[name .. "ofsx"] = IATAB[name .. "ofsx"] or ofsx
-						IATAB[name .. "ofsy"] = IATAB[name .. "ofsy"] or ofsy
-						function btn:UpdatePos()
-							if ImproveAny:IsEnabled("COMBINEMMBTNS", false) and not stay then return end
-							if btn.lockupdate then return end
-							btn.lockupdate = true
-							if btn.maiinit == nil then
-								btn.maiinit = true
-								hooksecurefunc(
-									btn,
-									"SetPoint",
-									function(sel)
-										if sel.ia_setpoint_mmbtn then return end
-										sel.ia_setpoint_mmbtn = true
-										sel:SetParent(Minimap)
-										sel:SetMovable(true)
-										sel:SetUserPlaced(false)
-										sel:ClearAllPoints()
-										sel:SetPoint("CENTER", Minimap, "CENTER", IATAB[name .. "ofsx"], IATAB[name .. "ofsy"])
-										sel.ia_setpoint_mmbtn = false
-									end
-								)
-
-								btn:SetParent(Minimap)
+						if stay or not ImproveAny:IsEnabled("COMBINEMMBTNS", false) then
+							IATAB[name .. "db"] = IATAB[name .. "db"] or {}
+							btn:SetParent(Minimap)
+							btn:SetMovable(true)
+							btn.db = IATAB[name .. "db"]
+							btn.db.minimapPos = btn.db.minimapPos or 0
+							btn.minimapPos = btn.minimapPos or 0
+							if not InCombatLockdown() then
 								btn:ClearAllPoints()
-								btn:SetPoint("CENTER", Minimap, "CENTER", IATAB[name .. "ofsx"], IATAB[name .. "ofsy"])
+								ImproveAny:UpdatePosition(btn, btn.db.minimapPos)
 							end
 
-							if btn.moving then
-								if minimapshape == "ROUND" then
-									local Xpoa, Ypoa = GetCursorPosition()
-									local Xmin, Ymin = Minimap:GetLeft(), Minimap:GetBottom()
-									Xpoa = Xmin - Xpoa / Minimap:GetEffectiveScale() + radius
-									Ypoa = Ypoa / Minimap:GetEffectiveScale() - Ymin - radius
-									myIconPos = math.deg(math.atan2(Ypoa, Xpoa))
-									local ofsx1 = -radius * cos(myIconPos)
-									local ofsy1 = radius * sin(myIconPos)
-									IATAB[name .. "ofsx"] = ofsx1
-									IATAB[name .. "ofsy"] = ofsy1
-									btn:ClearAllPoints()
-									btn:SetPoint("CENTER", Minimap, "CENTER", ofsx1, ofsy1)
-								else
-									local Xpoa, Ypoa = GetCursorPosition()
-									local Xmin, Ymin = Minimap:GetLeft(), Minimap:GetBottom()
-									Xpoa = Xmin - Xpoa / Minimap:GetEffectiveScale() + radius
-									Ypoa = Ypoa / Minimap:GetEffectiveScale() - Ymin - radius
-									local dist = radius
-									if Ypoa >= dist or Ypoa <= -dist then
-										Xpoa = ImproveAny:MathC(Xpoa, -dist, dist)
-									else
-										if Xpoa > 0 then
-											Xpoa = dist
-										else
-											Xpoa = -dist
-										end
-									end
-
-									if Xpoa >= dist or Xpoa <= -dist then
-										Ypoa = ImproveAny:MathC(Ypoa, -dist, dist)
-									else
-										if Ypoa > 0 then
-											Ypoa = dist
-										else
-											Ypoa = -dist
-										end
-									end
-
-									local ofsx2 = -Xpoa
-									local ofsy2 = Ypoa
-									IATAB[name .. "ofsx"] = ofsx2
-									IATAB[name .. "ofsy"] = ofsy2
-									btn:ClearAllPoints()
-									btn:SetPoint("CENTER", Minimap, "CENTER", ofsx2, ofsy2)
-								end
-
-								C_Timer.After(
-									0.006,
-									function()
-										ImproveAny:Debug("minimap.lua: UpdatePos #1", "think")
-										btn.lockupdate = false
-										btn:UpdatePos()
-									end
-								)
-							else
-								C_Timer.After(
-									0.1,
-									function()
-										ImproveAny:Debug("minimap.lua: UpdatePos #2", "think")
-										btn.lockupdate = false
-										btn:UpdatePos()
-									end
-								)
-							end
-						end
-
-						if stay or not ImproveAny:IsEnabled("COMBINEMMBTNS", false) then
-							btn:UpdatePos()
 							btn:RegisterForDrag("LeftButton")
 							btn:SetScript(
 								"OnDragStart",
-								function()
-									btn:StartMoving()
-									btn.moving = true
+								function(sel)
+									sel.isMouseDown = true
+									sel:SetScript(
+										"OnUpdate",
+										function(se)
+											local mx, my = Minimap:GetCenter()
+											local px, py = GetCursorPosition()
+											local scale = Minimap:GetEffectiveScale()
+											px, py = px / scale, py / scale
+											local pos = 0
+											if se.db then
+												pos = deg(atan2(py - my, px - mx)) % 360
+												se.db.minimapPos = pos
+											else
+												pos = deg(atan2(py - my, px - mx)) % 360
+												se.minimapPos = pos
+											end
+
+											if not InCombatLockdown() then
+												se:ClearAllPoints()
+												ImproveAny:UpdatePosition(se, pos)
+											end
+										end
+									)
 								end
 							)
 
 							btn:SetScript(
 								"OnDragStop",
-								function()
-									btn:StopMovingOrSizing()
-									btn.moving = false
+								function(sel)
+									sel:SetScript("OnUpdate", nil)
+									sel.isMouseDown = false
 								end
 							)
 						end
@@ -505,7 +594,7 @@ function ImproveAny:InitMinimap()
 							for x, w in pairs(mmBtnsNames) do
 								if strfind(child:GetName(), w) and not tContains(mmbtns, child) and not strfind(child:GetName(), "Peggle") then
 									tinsert(mmbtns, child)
-									ImproveAny:ConvertToMinimapButton(child:GetName(), strfind(child:GetName(), "ImproveAnyMMBtns") ~= nil or strfind(child:GetName(), "BugSack") ~= nil or strfind(child:GetName(), "AutoQueueWA") ~= nil)
+									ImproveAny:ConvertToMinimapButton(child:GetName(), strfind(child:GetName(), "ImproveAnyMMBtns") ~= nil or strfind(child:GetName(), "ImproveAnyGreatVault") ~= nil or strfind(child:GetName(), "BugSack") ~= nil or strfind(child:GetName(), "AutoQueueWA") ~= nil)
 								end
 							end
 						end
diff --git a/ele/xpbar.lua b/ele/xpbar.lua
index 943b65f..9bfab75 100644
--- a/ele/xpbar.lua
+++ b/ele/xpbar.lua
@@ -157,7 +157,7 @@ function ImproveAny:UpdateQuestFrame()
 					if lvltext and qnt then
 						questNormalText:SetText(format("[%s]%s", lvltext, qnt))
 					else
-						print("[ImproveAny:UpdateQuestFrame] FAILED", lvltext, qnt)
+						ImproveAny:MSG("[UpdateQuestFrame] FAILED", lvltext, qnt)
 					end
 				end
 
diff --git a/libs/D4Lib/D4Lib.xml b/libs/D4Lib/D4Lib.xml
index 3d61c99..9963f01 100644
--- a/libs/D4Lib/D4Lib.xml
+++ b/libs/D4Lib/D4Lib.xml
@@ -1,9 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
 
-<Include file="LibDBIcon-1.0\embeds.xml"/>
-<Include file="LibDBIcon-1.0\LibDBIcon-1.0\lib.xml"/>
-
 <Script file="D4Lib.lua"/>
 
 <Script file="D4Math.lua"/>
diff --git a/libs/D4Lib/D4MinimapButtons.lua b/libs/D4Lib/D4MinimapButtons.lua
index 50eecc8..7c7a3ea 100644
--- a/libs/D4Lib/D4MinimapButtons.lua
+++ b/libs/D4Lib/D4MinimapButtons.lua
@@ -1,92 +1,255 @@
 local _, D4 = ...
-local icon = null
-function D4:GetLibDBIcon()
-    if not D4:IsOldWow() then
-        icon = icon or LibStub("LibDBIcon-1.0", true)
+local deg, atan2 = math.deg, math.atan2
+local rad, cos, sin, sqrt, max, min = math.rad, math.cos, math.sin, math.sqrt, math.max, math.min
+local mmShapes = {
+    ["ROUND"] = {true, true, true, true},
+    ["SQUARE"] = {false, false, false, false},
+    ["CORNER-TOPLEFT"] = {false, false, false, true},
+    ["CORNER-TOPRIGHT"] = {false, false, true, false},
+    ["CORNER-BOTTOMLEFT"] = {false, true, false, false},
+    ["CORNER-BOTTOMRIGHT"] = {true, false, false, false},
+    ["SIDE-LEFT"] = {false, true, false, true},
+    ["SIDE-RIGHT"] = {true, false, true, false},
+    ["SIDE-TOP"] = {false, false, true, true},
+    ["SIDE-BOTTOM"] = {true, true, false, false},
+    ["TRICORNER-TOPLEFT"] = {false, true, true, true},
+    ["TRICORNER-TOPRIGHT"] = {true, false, true, true},
+    ["TRICORNER-BOTTOMLEFT"] = {true, true, false, true},
+    ["TRICORNER-BOTTOMRIGHT"] = {true, true, true, false},
+}
+
+function D4:UpdatePosition(button, position, parent)
+    parent = parent or Minimap
+    local angle = rad(position or 225)
+    local x, y, q = cos(angle), sin(angle), 1
+    if x < 0 then
+        q = q + 1
+    end
+
+    if y > 0 then
+        q = q + 2
     end
 
-    return icon
+    local minimapShape = GetMinimapShape and GetMinimapShape() or "ROUND"
+    local qt = mmShapes[minimapShape]
+    local w = (Minimap:GetWidth() / 2) + button:GetWidth() / 2 - button:GetWidth() / 5
+    local h = (Minimap:GetHeight() / 2) + button:GetHeight() / 2 - button:GetHeight() / 5
+    if qt[q] then
+        x, y = x * w, y * h
+    else
+        local drw = sqrt(2 * w ^ 2) - 10
+        local drh = sqrt(2 * h ^ 2) - 10
+        x = max(-w, min(x * drw, w))
+        y = max(-h, min(y * drh, h))
+    end
+
+    button:SetPoint("CENTER", parent, "CENTER", x, y)
+end
+
+function D4:GetMMBtn(name)
+    return _G[name]
 end
 
-function D4:CreateMinimapButton(tab)
-    if not D4:IsOldWow() then
-        local mmbtn = LibStub("LibDataBroker-1.1"):NewDataObject(
-            tab.name,
+function D4:CreateMinimapButton(params)
+    if params.icon == nil and params.atlas == nil then
+        D4:MSG("[CreateMinimapButton] Missing Icon/Atlas")
+
+        return
+    end
+
+    if params.name == nil then
+        D4:MSG("[CreateMinimapButton] Missing Name")
+
+        return
+    end
+
+    if params.dbtab == nil then
+        D4:MSG("[CreateMinimapButton] Missing Database")
+
+        return
+    end
+
+    params.sw = params.sw or 31
+    params.sh = params.sh or 31
+    if params.border == nil then
+        params.border = true
+    end
+
+    params.dbtab[params.name] = params.dbtab[params.name] or {}
+    _G["D4Lib_MMBTN_" .. params.name] = CreateFrame("Button", "D4Lib_MMBTN_" .. params.name, Minimap)
+    local btn = _G["D4Lib_MMBTN_" .. params.name]
+    btn.border = params.border
+    btn.db = params.dbtab
+    btn.db.minimapPos = btn.db.minimapPos or 0
+    btn.minimapPos = btn.minimapPos or 0
+    btn:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
+    btn.icon = btn:CreateTexture()
+    btn.icon:SetPoint("CENTER")
+    if params.icon ~= nil then
+        btn.icon:SetTexture(params.icon)
+        btn.icon:SetMask("Interface\\AddOns\\ImproveAny\\media\\minimap_mask_round")
+    elseif params.atlas ~= nil then
+        local info = C_Texture.GetAtlasInfo(params.atlas)
+        btn.icon:SetTexture(info.file)
+        btn.icon:SetTexCoord(info.leftTexCoord, info.rightTexCoord, info.topTexCoord, info.bottomTexCoord)
+    end
+
+    btn:SetSize(params.sw, params.sh)
+    D4:UpdatePosition(btn, btn.db.minimapPos)
+    btn.overlay = btn:CreateTexture(nil, "OVERLAY")
+    if D4:GetWoWBuild() == "RETAIL" then
+        btn.overlay:SetSize(params.sw * 0.95, params.sh * 0.95)
+        btn.overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
+        btn.overlay:SetPoint("CENTER", btn, "CENTER", -0.6, -0.2)
+        btn.overlay:SetTexCoord(0, 0.6, 0, 0.6)
+        btn.icon:SetSize(params.sw * 0.65, params.sh * 0.65)
+    else
+        btn.overlay:SetSize(params.sw * 0.95, params.sh * 0.95)
+        btn.overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
+        btn.overlay:SetPoint("CENTER", btn, "CENTER", 0, 0)
+        btn.overlay:SetTexCoord(0, 0.6, 0, 0.6)
+        btn.icon:SetSize(params.sw * 0.65, params.sh * 0.65)
+    end
+
+    if params.border == false then
+        btn.overlay:Hide()
+    end
+
+    btn:SetScript(
+        "OnClick",
+        function(sel, btnName)
+            if sel.isMouseDown then return end
+            if btnName == "LeftButton" and IsShiftKeyDown() and params.funcSL then
+                params:funcSL()
+            elseif btnName == "RightButton" and IsShiftKeyDown() and params.funcSR then
+                params:funcSR()
+            elseif btnName == "LeftButton" and params.funcL then
+                params:funcL()
+            elseif btnName == "RightButton" and params.funcR then
+                params:funcR()
+            end
+        end
+    )
+
+    btn.tooltip = CreateFrame("GameTooltip", params.name .. "_tooltip", UIParent, "GameTooltipTemplate")
+    btn:SetScript(
+        "OnEnter",
+        function(sel)
+            btn.tooltip:SetOwner(sel, "ANCHOR_RIGHT")
+            if params.vTT then
+                for i, v in pairs(params.vTT) do
+                    btn.tooltip:AddDoubleLine(v[1], v[2])
+                end
+            end
+
+            if params.vTTUpdate then
+                params:vTTUpdate(btn.tooltip)
+            end
+
+            btn.tooltip:Show()
+        end
+    )
+
+    btn:SetScript(
+        "OnLeave",
+        function(sel)
+            btn.tooltip:Hide()
+        end
+    )
+
+    btn:RegisterForClicks("anyUp")
+    btn:RegisterForDrag("LeftButton")
+    btn:SetMovable(true)
+    btn:SetScript(
+        "OnDragStart",
+        function(sel)
+            sel.isMouseDown = true
+            sel:SetScript(
+                "OnUpdate",
+                function(se)
+                    local mx, my = Minimap:GetCenter()
+                    local px, py = GetCursorPosition()
+                    local scale = Minimap:GetEffectiveScale()
+                    px, py = px / scale, py / scale
+                    local pos = 0
+                    if se.db then
+                        pos = deg(atan2(py - my, px - mx)) % 360
+                        se.db.minimapPos = pos
+                    else
+                        pos = deg(atan2(py - my, px - mx)) % 360
+                        se.minimapPos = pos
+                    end
+
+                    D4:UpdatePosition(se, pos)
+                end
+            )
+
+            sel.tooltip:Hide()
+        end
+    )
+
+    btn:SetScript(
+        "OnDragStop",
+        function(sel)
+            sel:SetScript("OnUpdate", nil)
+            sel.isMouseDown = false
+        end
+    )
+
+    if AddonCompartmentFrame and (params.addoncomp == nil or params.addoncomp == true) then
+        AddonCompartmentFrame:RegisterAddon(
             {
-                type = "data source",
-                text = tab.name,
-                icon = tab.icon,
-                OnClick = function(sel, btnName)
-                    if btnName == "LeftButton" and IsShiftKeyDown() and tab.funcSL then
-                        tab:funcSL()
-                    elseif btnName == "RightButton" and IsShiftKeyDown() and tab.funcSR then
-                        tab:funcSR()
-                    elseif btnName == "LeftButton" and tab.funcL then
-                        tab:funcL()
-                    elseif btnName == "RightButton" and tab.funcR then
-                        tab:funcR()
+                text = params.name,
+                icon = params.icon,
+                registerForAnyClick = true,
+                notCheckable = true,
+                func = function(button, menuInputData, menu)
+                    local btnName = menuInputData.buttonName
+                    if btnName == "LeftButton" and IsShiftKeyDown() and params.funcSL then
+                        params:funcSL()
+                    elseif btnName == "RightButton" and IsShiftKeyDown() and params.funcSR then
+                        params:funcSR()
+                    elseif btnName == "LeftButton" and params.funcL then
+                        params:funcL()
+                    elseif btnName == "RightButton" and params.funcR then
+                        params:funcR()
                     end
                 end,
-                OnTooltipShow = function(tooltip)
-                    if not tooltip or not tooltip.AddLine then return end
-                    for i, v in pairs(tab.vTT) do
-                        tooltip:AddDoubleLine(v[1], v[2])
-                    end
+                funcOnEnter = function(button)
+                    MenuUtil.ShowTooltip(
+                        button,
+                        function(tooltip)
+                            if not tooltip or not tooltip.AddLine then return end
+                            for i, v in pairs(params.vTT) do
+                                tooltip:AddDoubleLine(v[1], v[2])
+                            end
+                        end
+                    )
+                end,
+                funcOnLeave = function(button)
+                    MenuUtil.HideTooltip(button)
                 end,
             }
         )
-
-        if mmbtn and D4:GetLibDBIcon() then
-            D4:GetLibDBIcon():Register(tab.name, mmbtn, tab.dbtab)
-        end
-
-        if AddonCompartmentFrame and (tab.addoncomp == nil or tab.addoncomp == true) then
-            AddonCompartmentFrame:RegisterAddon(
-                {
-                    text = tab.name,
-                    icon = tab.icon,
-                    registerForAnyClick = true,
-                    notCheckable = true,
-                    func = function(button, menuInputData, menu)
-                        local btnName = menuInputData.buttonName
-                        if btnName == "LeftButton" and IsShiftKeyDown() and tab.funcSL then
-                            tab:funcSL()
-                        elseif btnName == "RightButton" and IsShiftKeyDown() and tab.funcSR then
-                            tab:funcSR()
-                        elseif btnName == "LeftButton" and tab.funcL then
-                            tab:funcL()
-                        elseif btnName == "RightButton" and tab.funcR then
-                            tab:funcR()
-                        end
-                    end,
-                    funcOnEnter = function(button)
-                        MenuUtil.ShowTooltip(
-                            button,
-                            function(tooltip)
-                                if not tooltip or not tooltip.AddLine then return end
-                                for i, v in pairs(tab.vTT) do
-                                    tooltip:AddDoubleLine(v[1], v[2])
-                                end
-                            end
-                        )
-                    end,
-                    funcOnLeave = function(button)
-                        MenuUtil.HideTooltip(button)
-                    end,
-                }
-            )
-        end
     end
 end
 
 function D4:ShowMMBtn(name)
-    if not D4:IsOldWow() then
-        D4:GetLibDBIcon():Show(name)
+    if name == nil then
+        D4:MSG("[ShowMMBtn] Missing Name")
+
+        return
     end
+
+    D4:GetMMBtn("D4Lib_MMBTN_" .. name):Show()
 end
 
 function D4:HideMMBtn(name)
-    if not D4:IsOldWow() then
-        D4:GetLibDBIcon():Hide(name)
+    if name == nil then
+        D4:MSG("[HideMMBtn] Missing Name")
+
+        return
     end
+
+    D4:GetMMBtn("D4Lib_MMBTN_" .. name):Hide()
 end
diff --git a/libs/D4Lib/LibDBIcon-1.0/CHANGES.txt b/libs/D4Lib/LibDBIcon-1.0/CHANGES.txt
deleted file mode 100644
index b5e56d3..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/CHANGES.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-------------------------------------------------------------------------
-r141 | funkehdude | 2024-08-02 17:28:35 +0000 (Fri, 02 Aug 2024) | 1 line
-Changed paths:
-   M /trunk/LibDBIcon-1.0/LibDBIcon-1.0.lua
-
-Extra safety checks for the compartment
-------------------------------------------------------------------------
-r140 | funkehdude | 2024-07-24 21:45:35 +0000 (Wed, 24 Jul 2024) | 1 line
-Changed paths:
-   M /trunk/LibDBIcon-1.0/LibDBIcon-1.0.lua
-
-Update the compartment menu icon as needed
-------------------------------------------------------------------------
-r139 | funkehdude | 2024-07-24 21:09:05 +0000 (Wed, 24 Jul 2024) | 1 line
-Changed paths:
-   M /trunk/LibDBIcon-1.0/LibDBIcon-1.0.lua
-
-Compartment menu fixes for WoW 11
-------------------------------------------------------------------------
-
diff --git a/libs/D4Lib/LibDBIcon-1.0/CallbackHandler-1.0/CallbackHandler-1.0.lua b/libs/D4Lib/LibDBIcon-1.0/CallbackHandler-1.0/CallbackHandler-1.0.lua
deleted file mode 100644
index 21569f4..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/CallbackHandler-1.0/CallbackHandler-1.0.lua
+++ /dev/null
@@ -1,202 +0,0 @@
---[[ $Id: CallbackHandler-1.0.lua 26 2022-12-12 15:09:39Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 8
-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 securecallfunction, error = securecallfunction, error
-local setmetatable, rawget = setmetatable, rawget
-local next, select, pairs, type, tostring = next, select, pairs, type, tostring
-
-
-local function Dispatch(handlers, ...)
-	local index, method = next(handlers)
-	if not method then return end
-	repeat
-		securecallfunction(method, ...)
-		index, method = next(handlers, index)
-	until not method
-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(_self, target, RegisterName, UnregisterName, UnregisterAllName)
-
-	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
-
-		Dispatch(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 event,callbacks in pairs(registry.insertQueue) do
-				local first = not rawget(events, event) or not next(events[event])	-- test for empty before. not test for one member after. that one member may have been overwritten.
-				for object,func in pairs(callbacks) do
-					events[event][object] = func
-					-- fire OnUsed callback?
-					if first and registry.OnUsed then
-						registry.OnUsed(registry, target, event)
-						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/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0.toc b/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0.toc
deleted file mode 100644
index f55b4c6..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0.toc
+++ /dev/null
@@ -1,13 +0,0 @@
-## Interface: 11502, 11503, 20504, 30403, 40400, 100207, 110000, 110002
-## Version: v11.0.0
-## LoadOnDemand: 1
-## Title: Lib: DataBrokerIcon-1.0
-## Notes: Allows addons to easily create a lightweight minimap icon as an alternative to heavier LDB displays.
-## Author: Funkydude
-## X-Category: Library
-## X-License: All Rights Reserved
-## X-Credits: Rabbit, copystring
-
-embeds.xml
-LibDBIcon-1.0\lib.xml
-
diff --git a/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/LibDBIcon-1.0.lua b/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/LibDBIcon-1.0.lua
deleted file mode 100644
index 46d6448..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/LibDBIcon-1.0.lua
+++ /dev/null
@@ -1,584 +0,0 @@
---@curseforge-project-slug: libdbicon-1-0@
------------------------------------------------------------------------
--- LibDBIcon-1.0
---
--- Allows addons to easily create a lightweight minimap icon as an alternative to heavier LDB displays.
---
-
-local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 55 -- Bump on changes
-if not LibStub then error(DBICON10 .. " requires LibStub.") end
-local ldb = LibStub("LibDataBroker-1.1", true)
-if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
-local lib = LibStub:NewLibrary(DBICON10, DBICON10_MINOR)
-if not lib then return end
-
-lib.objects = lib.objects or {}
-lib.callbackRegistered = lib.callbackRegistered or nil
-lib.callbacks = lib.callbacks or LibStub("CallbackHandler-1.0"):New(lib)
-lib.radius = lib.radius or 5
-local next, Minimap, CreateFrame, AddonCompartmentFrame = next, Minimap, CreateFrame, AddonCompartmentFrame
-lib.tooltip = lib.tooltip or CreateFrame("GameTooltip", "LibDBIconTooltip", UIParent, "GameTooltipTemplate")
-local isDraggingButton = false
-
-function lib:IconCallback(event, name, key, value)
-	if lib.objects[name] then
-		if key == "icon" then
-			lib.objects[name].icon:SetTexture(value)
-			if lib:IsButtonInCompartment(name) and lib:IsButtonCompartmentAvailable() then
-				local addonList = AddonCompartmentFrame.registeredAddons
-				for i =1, #addonList do
-					if addonList[i].text == name then
-						addonList[i].icon = value
-						return
-					end
-				end
-			end
-		elseif key == "iconCoords" then
-			lib.objects[name].icon:UpdateCoord()
-		elseif key == "iconR" then
-			local _, g, b = lib.objects[name].icon:GetVertexColor()
-			lib.objects[name].icon:SetVertexColor(value, g, b)
-		elseif key == "iconG" then
-			local r, _, b = lib.objects[name].icon:GetVertexColor()
-			lib.objects[name].icon:SetVertexColor(r, value, b)
-		elseif key == "iconB" then
-			local r, g = lib.objects[name].icon:GetVertexColor()
-			lib.objects[name].icon:SetVertexColor(r, g, value)
-		end
-	end
-end
-if not lib.callbackRegistered then
-	ldb.RegisterCallback(lib, "LibDataBroker_AttributeChanged__icon", "IconCallback")
-	ldb.RegisterCallback(lib, "LibDataBroker_AttributeChanged__iconCoords", "IconCallback")
-	ldb.RegisterCallback(lib, "LibDataBroker_AttributeChanged__iconR", "IconCallback")
-	ldb.RegisterCallback(lib, "LibDataBroker_AttributeChanged__iconG", "IconCallback")
-	ldb.RegisterCallback(lib, "LibDataBroker_AttributeChanged__iconB", "IconCallback")
-	lib.callbackRegistered = true
-end
-
-local function getAnchors(frame)
-	local x, y = frame:GetCenter()
-	if not x or not y then return "CENTER" end
-	local hhalf = (x > UIParent:GetWidth()*2/3) and "RIGHT" or (x < UIParent:GetWidth()/3) and "LEFT" or ""
-	local vhalf = (y > UIParent:GetHeight()/2) and "TOP" or "BOTTOM"
-	return vhalf..hhalf, frame, (vhalf == "TOP" and "BOTTOM" or "TOP")..hhalf
-end
-
-local function onEnter(self)
-	if isDraggingButton then return end
-
-	for _, button in next, lib.objects do
-		if button.showOnMouseover then
-			button.fadeOut:Stop()
-			button:SetAlpha(1)
-		end
-	end
-
-	local obj = self.dataObject
-	if obj.OnTooltipShow then
-		lib.tooltip:SetOwner(self, "ANCHOR_NONE")
-		lib.tooltip:SetPoint(getAnchors(self))
-		obj.OnTooltipShow(lib.tooltip)
-		lib.tooltip:Show()
-	elseif obj.OnEnter then
-		obj.OnEnter(self)
-	end
-end
-
-local function onLeave(self)
-	lib.tooltip:Hide()
-
-	if not isDraggingButton then
-		for _, button in next, lib.objects do
-			if button.showOnMouseover then
-				button.fadeOut:Play()
-			end
-		end
-	end
-
-	local obj = self.dataObject
-	if obj.OnLeave then
-		obj.OnLeave(self)
-	end
-end
-
-local function onEnterCompartment(self, menu)
-	local buttonName = menu.text
-	local object = lib.objects[buttonName]
-	if object and object.dataObject then
-		if object.dataObject.OnTooltipShow then
-			lib.tooltip:SetOwner(self, "ANCHOR_NONE")
-			lib.tooltip:SetPoint(getAnchors(self))
-			object.dataObject.OnTooltipShow(lib.tooltip)
-			lib.tooltip:Show()
-		elseif object.dataObject.OnEnter then
-			object.dataObject.OnEnter(self)
-		end
-	end
-end
-
-local function onLeaveCompartment(self, menu)
-	lib.tooltip:Hide()
-
-	local buttonName = menu.text
-	local object = lib.objects[buttonName]
-	if object and object.dataObject then
-		if object.dataObject.OnLeave then
-			object.dataObject.OnLeave(self)
-		end
-	end
-end
-
---------------------------------------------------------------------------------
-
-local onDragStart, updatePosition
-
-do
-	local minimapShapes = {
-		["ROUND"] = {true, true, true, true},
-		["SQUARE"] = {false, false, false, false},
-		["CORNER-TOPLEFT"] = {false, false, false, true},
-		["CORNER-TOPRIGHT"] = {false, false, true, false},
-		["CORNER-BOTTOMLEFT"] = {false, true, false, false},
-		["CORNER-BOTTOMRIGHT"] = {true, false, false, false},
-		["SIDE-LEFT"] = {false, true, false, true},
-		["SIDE-RIGHT"] = {true, false, true, false},
-		["SIDE-TOP"] = {false, false, true, true},
-		["SIDE-BOTTOM"] = {true, true, false, false},
-		["TRICORNER-TOPLEFT"] = {false, true, true, true},
-		["TRICORNER-TOPRIGHT"] = {true, false, true, true},
-		["TRICORNER-BOTTOMLEFT"] = {true, true, false, true},
-		["TRICORNER-BOTTOMRIGHT"] = {true, true, true, false},
-	}
-
-	local rad, cos, sin, sqrt, max, min = math.rad, math.cos, math.sin, math.sqrt, math.max, math.min
-	function updatePosition(button, position)
-		local angle = rad(position or 225)
-		local x, y, q = cos(angle), sin(angle), 1
-		if x < 0 then q = q + 1 end
-		if y > 0 then q = q + 2 end
-		local minimapShape = GetMinimapShape and GetMinimapShape() or "ROUND"
-		local quadTable = minimapShapes[minimapShape]
-		local w = (Minimap:GetWidth() / 2) + lib.radius
-		local h = (Minimap:GetHeight() / 2) + lib.radius
-		if quadTable[q] then
-			x, y = x*w, y*h
-		else
-			local diagRadiusW = sqrt(2*(w)^2)-10
-			local diagRadiusH = sqrt(2*(h)^2)-10
-			x = max(-w, min(x*diagRadiusW, w))
-			y = max(-h, min(y*diagRadiusH, h))
-		end
-		button:SetPoint("CENTER", Minimap, "CENTER", x, y)
-	end
-end
-
-local function onClick(self, b)
-	if self.dataObject.OnClick then
-		self.dataObject.OnClick(self, b)
-	end
-end
-
-local function onMouseDown(self)
-	self.isMouseDown = true
-	self.icon:UpdateCoord()
-end
-
-local function onMouseUp(self)
-	self.isMouseDown = false
-	self.icon:UpdateCoord()
-end
-
-do
-	local deg, atan2 = math.deg, math.atan2
-	local function onUpdate(self)
-		local mx, my = Minimap:GetCenter()
-		local px, py = GetCursorPosition()
-		local scale = Minimap:GetEffectiveScale()
-		px, py = px / scale, py / scale
-		local pos = 225
-		if self.db then
-			pos = deg(atan2(py - my, px - mx)) % 360
-			self.db.minimapPos = pos
-		else
-			pos = deg(atan2(py - my, px - mx)) % 360
-			self.minimapPos = pos
-		end
-		updatePosition(self, pos)
-	end
-
-	function onDragStart(self)
-		self:LockHighlight()
-		self.isMouseDown = true
-		self.icon:UpdateCoord()
-		self:SetScript("OnUpdate", onUpdate)
-		isDraggingButton = true
-		lib.tooltip:Hide()
-		for _, button in next, lib.objects do
-			if button.showOnMouseover then
-				button.fadeOut:Stop()
-				button:SetAlpha(1)
-			end
-		end
-	end
-end
-
-local function onDragStop(self)
-	self:SetScript("OnUpdate", nil)
-	self.isMouseDown = false
-	self.icon:UpdateCoord()
-	self:UnlockHighlight()
-	isDraggingButton = false
-	for _, button in next, lib.objects do
-		if button.showOnMouseover then
-			button.fadeOut:Play()
-		end
-	end
-end
-
-local defaultCoords = {0, 1, 0, 1}
-local function updateCoord(self)
-	local coords = self:GetParent().dataObject.iconCoords or defaultCoords
-	local deltaX, deltaY = 0, 0
-	if not self:GetParent().isMouseDown then
-		deltaX = (coords[2] - coords[1]) * 0.05
-		deltaY = (coords[4] - coords[3]) * 0.05
-	end
-	self:SetTexCoord(coords[1] + deltaX, coords[2] - deltaX, coords[3] + deltaY, coords[4] - deltaY)
-end
-
-local function createButton(name, object, db, customCompartmentIcon)
-	local button = CreateFrame("Button", "LibDBIcon10_"..name, Minimap)
-	button.dataObject = object
-	button.db = db
-	button:SetFrameStrata("MEDIUM")
-	button:SetFixedFrameStrata(true)
-	button:SetFrameLevel(8)
-	button:SetFixedFrameLevel(true)
-	button:SetSize(31, 31)
-	button:RegisterForClicks("anyUp")
-	button:RegisterForDrag("LeftButton")
-	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
-	if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
-		local overlay = button:CreateTexture(nil, "OVERLAY")
-		overlay:SetSize(50, 50)
-		overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-		overlay:SetPoint("TOPLEFT", button, "TOPLEFT")
-		local background = button:CreateTexture(nil, "BACKGROUND")
-		background:SetSize(24, 24)
-		background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-		background:SetPoint("CENTER", button, "CENTER")
-		local icon = button:CreateTexture(nil, "ARTWORK")
-		icon:SetSize(18, 18)
-		icon:SetTexture(object.icon)
-		icon:SetPoint("CENTER", button, "CENTER")
-		button.icon = icon
-	else
-		local overlay = button:CreateTexture(nil, "OVERLAY")
-		overlay:SetSize(53, 53)
-		overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-		overlay:SetPoint("TOPLEFT")
-		local background = button:CreateTexture(nil, "BACKGROUND")
-		background:SetSize(20, 20)
-		background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-		background:SetPoint("TOPLEFT", 7, -5)
-		local icon = button:CreateTexture(nil, "ARTWORK")
-		icon:SetSize(17, 17)
-		icon:SetTexture(object.icon)
-		icon:SetPoint("TOPLEFT", 7, -6)
-		button.icon = icon
-	end
-
-	button.isMouseDown = false
-	local r, g, b = button.icon:GetVertexColor()
-	button.icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
-
-	button.icon.UpdateCoord = updateCoord
-	button.icon:UpdateCoord()
-
-	button:SetScript("OnEnter", onEnter)
-	button:SetScript("OnLeave", onLeave)
-	button:SetScript("OnClick", onClick)
-	if not db or not db.lock then
-		button:SetScript("OnDragStart", onDragStart)
-		button:SetScript("OnDragStop", onDragStop)
-	end
-	button:SetScript("OnMouseDown", onMouseDown)
-	button:SetScript("OnMouseUp", onMouseUp)
-
-	button.fadeOut = button:CreateAnimationGroup()
-	local animOut = button.fadeOut:CreateAnimation("Alpha")
-	animOut:SetOrder(1)
-	animOut:SetDuration(0.2)
-	animOut:SetFromAlpha(1)
-	animOut:SetToAlpha(0)
-	animOut:SetStartDelay(1)
-	button.fadeOut:SetToFinalAlpha(true)
-
-	lib.objects[name] = button
-
-	if lib.loggedIn then
-		updatePosition(button, db and db.minimapPos)
-		if not db or not db.hide then
-			button:Show()
-		else
-			button:Hide()
-		end
-	end
-
-	if db and db.showInCompartment then
-		lib:AddButtonToCompartment(name, customCompartmentIcon)
-	end
-	lib.callbacks:Fire("LibDBIcon_IconCreated", button, name) -- Fire 'Icon Created' callback
-end
-
--- Wait a bit with the initial positioning to let any GetMinimapShape addons
--- load up.
-if not lib.loggedIn then
-	local frame = CreateFrame("Frame")
-	frame:SetScript("OnEvent", function(self)
-		for _, button in next, lib.objects do
-			updatePosition(button, button.db and button.db.minimapPos)
-			if not button.db or not button.db.hide then
-				button:Show()
-			else
-				button:Hide()
-			end
-		end
-		lib.loggedIn = true
-		self:SetScript("OnEvent", nil)
-	end)
-	frame:RegisterEvent("PLAYER_LOGIN")
-end
-
-do
-	local function OnMinimapEnter()
-		if isDraggingButton then return end
-		for _, button in next, lib.objects do
-			if button.showOnMouseover then
-				button.fadeOut:Stop()
-				button:SetAlpha(1)
-			end
-		end
-	end
-	local function OnMinimapLeave()
-		if isDraggingButton then return end
-		for _, button in next, lib.objects do
-			if button.showOnMouseover then
-				button.fadeOut:Play()
-			end
-		end
-	end
-	Minimap:HookScript("OnEnter", OnMinimapEnter)
-	Minimap:HookScript("OnLeave", OnMinimapLeave)
-end
-
---------------------------------------------------------------------------------
--- Button API
---
-
-function lib:Register(name, object, db, customCompartmentIcon)
-	if not object.icon then error("Can't register LDB objects without icons set!") end
-	if lib:GetMinimapButton(name) then error(DBICON10.. ": Object '".. name .."' is already registered.") end
-	createButton(name, object, db, customCompartmentIcon)
-end
-
-function lib:Lock(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetScript("OnDragStart", nil)
-		button:SetScript("OnDragStop", nil)
-		if button.db then
-			button.db.lock = true
-		end
-	end
-end
-
-function lib:Unlock(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:SetScript("OnDragStart", onDragStart)
-		button:SetScript("OnDragStop", onDragStop)
-		if button.db then
-			button.db.lock = nil
-		end
-	end
-end
-
-function lib:Hide(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:Hide()
-	end
-end
-
-function lib:Show(name)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		button:Show()
-		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-	end
-end
-
-function lib:IsRegistered(name)
-	return lib.objects[name] and true or false
-end
-
-function lib:Refresh(name, db)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		if db then
-			button.db = db
-		end
-		updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-		if not button.db or not button.db.hide then
-			button:Show()
-		else
-			button:Hide()
-		end
-		if not button.db or not button.db.lock then
-			button:SetScript("OnDragStart", onDragStart)
-			button:SetScript("OnDragStop", onDragStop)
-		else
-			button:SetScript("OnDragStart", nil)
-			button:SetScript("OnDragStop", nil)
-		end
-	end
-end
-
-function lib:ShowOnEnter(name, value)
-	local button = lib:GetMinimapButton(name)
-	if button then
-		if value then
-			button.showOnMouseover = true
-			button.fadeOut:Stop()
-			button:SetAlpha(0)
-		else
-			button.showOnMouseover = false
-			button.fadeOut:Stop()
-			button:SetAlpha(1)
-		end
-	end
-end
-
-function lib:GetMinimapButton(name)
-	return lib.objects[name]
-end
-
-function lib:GetButtonList()
-	local t = {}
-	for name in next, lib.objects do
-		t[#t+1] = name
-	end
-	return t
-end
-
-function lib:SetButtonRadius(radius)
-	if type(radius) == "number" then
-		lib.radius = radius
-		for _, button in next, lib.objects do
-			updatePosition(button, button.db and button.db.minimapPos or button.minimapPos)
-		end
-	end
-end
-
-function lib:SetButtonToPosition(button, position)
-	updatePosition(lib.objects[button] or button, position)
-end
-
---------------------------------------------------------------------------------
--- Addon Compartment API
---
-
-function lib:IsButtonCompartmentAvailable()
-	if AddonCompartmentFrame then
-		return true
-	end
-end
-
-function lib:IsButtonInCompartment(buttonName)
-	local object = lib.objects[buttonName]
-	if object and object.db and object.db.showInCompartment then
-		return true
-	end
-	return false
-end
-
-function lib:AddButtonToCompartment(buttonName, customIcon)
-	if lib:IsButtonCompartmentAvailable() then
-		local object = lib.objects[buttonName]
-		if object and not object.compartmentData then
-			if object.db then
-				object.db.showInCompartment = true
-			end
-			object.compartmentData = {
-				text = buttonName,
-				icon = customIcon or object.dataObject.icon,
-				notCheckable = true,
-				registerForAnyClick = true,
-				func = function(_, menuInputData, menu)
-					object.dataObject.OnClick(menu, menuInputData.buttonName)
-				end,
-				funcOnEnter = onEnterCompartment,
-				funcOnLeave = onLeaveCompartment,
-			}
-			AddonCompartmentFrame:RegisterAddon(object.compartmentData)
-		end
-	end
-end
-
-function lib:RemoveButtonFromCompartment(buttonName)
-	if lib:IsButtonCompartmentAvailable() then
-		local object = lib.objects[buttonName]
-		if object and object.compartmentData then
-			for i = 1, #AddonCompartmentFrame.registeredAddons do
-				local entry = AddonCompartmentFrame.registeredAddons[i]
-				if entry == object.compartmentData then
-					object.compartmentData = nil
-					if object.db then
-						object.db.showInCompartment = nil
-					end
-					table.remove(AddonCompartmentFrame.registeredAddons, i)
-					AddonCompartmentFrame:UpdateDisplay()
-					return
-				end
-			end
-		end
-	end
-end
-
---------------------------------------------------------------------------------
--- Upgrades
---
-
-for name, button in next, lib.objects do
-	local db = button.db
-	if not db or not db.lock then
-		button:SetScript("OnDragStart", onDragStart)
-		button:SetScript("OnDragStop", onDragStop)
-	end
-	button:SetScript("OnEnter", onEnter)
-	button:SetScript("OnLeave", onLeave)
-	button:SetScript("OnClick", onClick)
-	button:SetScript("OnMouseDown", onMouseDown)
-	button:SetScript("OnMouseUp", onMouseUp)
-
-	if not button.fadeOut then -- Upgrade to 39
-		button.fadeOut = button:CreateAnimationGroup()
-		local animOut = button.fadeOut:CreateAnimation("Alpha")
-		animOut:SetOrder(1)
-		animOut:SetDuration(0.2)
-		animOut:SetFromAlpha(1)
-		animOut:SetToAlpha(0)
-		animOut:SetStartDelay(1)
-		button.fadeOut:SetToFinalAlpha(true)
-	end
-end
-lib:SetButtonRadius(lib.radius) -- Upgrade to 40
-if lib.notCreated then -- Upgrade to 50
-	for name in next, lib.notCreated do
-		createButton(name, lib.notCreated[name][1], lib.notCreated[name][2])
-	end
-	lib.notCreated = nil
-end
diff --git a/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/lib.xml b/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/lib.xml
deleted file mode 100644
index 5dca17c..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/LibDBIcon-1.0/lib.xml
+++ /dev/null
@@ -1,7 +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="LibDBIcon-1.0.lua"/>
-
-</Ui>
-
diff --git a/libs/D4Lib/LibDBIcon-1.0/LibDataBroker-1.1/LibDataBroker-1.1.lua b/libs/D4Lib/LibDBIcon-1.0/LibDataBroker-1.1/LibDataBroker-1.1.lua
deleted file mode 100644
index f47c0cd..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/LibDataBroker-1.1/LibDataBroker-1.1.lua
+++ /dev/null
@@ -1,90 +0,0 @@
-
-assert(LibStub, "LibDataBroker-1.1 requires LibStub")
-assert(LibStub:GetLibrary("CallbackHandler-1.0", true), "LibDataBroker-1.1 requires CallbackHandler-1.0")
-
-local lib, oldminor = LibStub:NewLibrary("LibDataBroker-1.1", 4)
-if not lib then return end
-oldminor = oldminor or 0
-
-
-lib.callbacks = lib.callbacks or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
-lib.attributestorage, lib.namestorage, lib.proxystorage = lib.attributestorage or {}, lib.namestorage or {}, lib.proxystorage or {}
-local attributestorage, namestorage, callbacks = lib.attributestorage, lib.namestorage, lib.callbacks
-
-if oldminor < 2 then
-	lib.domt = {
-		__metatable = "access denied",
-		__index = function(self, key) return attributestorage[self] and attributestorage[self][key] end,
-	}
-end
-
-if oldminor < 3 then
-	lib.domt.__newindex = function(self, key, value)
-		if not attributestorage[self] then attributestorage[self] = {} end
-		if attributestorage[self][key] == value then return end
-		attributestorage[self][key] = value
-		local name = namestorage[self]
-		if not name then return end
-		callbacks:Fire("LibDataBroker_AttributeChanged", name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged_"..name.."_"..key, name, key, value, self)
-		callbacks:Fire("LibDataBroker_AttributeChanged__"..key, name, key, value, self)
-	end
-end
-
-if oldminor < 2 then
-	function lib:NewDataObject(name, dataobj)
-		if self.proxystorage[name] then return end
-
-		if dataobj then
-			assert(type(dataobj) == "table", "Invalid dataobj, must be nil or a table")
-			self.attributestorage[dataobj] = {}
-			for i,v in pairs(dataobj) do
-				self.attributestorage[dataobj][i] = v
-				dataobj[i] = nil
-			end
-		end
-		dataobj = setmetatable(dataobj or {}, self.domt)
-		self.proxystorage[name], self.namestorage[dataobj] = dataobj, name
-		self.callbacks:Fire("LibDataBroker_DataObjectCreated", name, dataobj)
-		return dataobj
-	end
-end
-
-if oldminor < 1 then
-	function lib:DataObjectIterator()
-		return pairs(self.proxystorage)
-	end
-
-	function lib:GetDataObjectByName(dataobjectname)
-		return self.proxystorage[dataobjectname]
-	end
-
-	function lib:GetNameByDataObject(dataobject)
-		return self.namestorage[dataobject]
-	end
-end
-
-if oldminor < 4 then
-	local next = pairs(attributestorage)
-	function lib:pairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:pairs('dataobjectname') or ldb:pairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return next, attributestorage[dataobj], nil
-	end
-
-	local ipairs_iter = ipairs(attributestorage)
-	function lib:ipairs(dataobject_or_name)
-		local t = type(dataobject_or_name)
-		assert(t == "string" or t == "table", "Usage: ldb:ipairs('dataobjectname') or ldb:ipairs(dataobject)")
-
-		local dataobj = self.proxystorage[dataobject_or_name] or dataobject_or_name
-		assert(attributestorage[dataobj], "Data object not found")
-
-		return ipairs_iter, attributestorage[dataobj], 0
-	end
-end
diff --git a/libs/D4Lib/LibDBIcon-1.0/LibStub/LibStub.lua b/libs/D4Lib/LibDBIcon-1.0/LibStub/LibStub.lua
deleted file mode 100644
index ae1900e..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/LibStub/LibStub.lua
+++ /dev/null
@@ -1,51 +0,0 @@
--- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $
--- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
--- LibStub is hereby placed in the Public Domain
--- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
-local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
-local LibStub = _G[LIBSTUB_MAJOR]
-
--- Check to see is this version of the stub is obsolete
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	-- LibStub:NewLibrary(major, minor)
-	-- major (string) - the major version of the library
-	-- minor (string or number ) - the minor version of the library
-	-- 
-	-- returns nil if a newer or same version of the lib is already present
-	-- returns empty library object or old library object if upgrade is needed
-	function LibStub:NewLibrary(major, minor)
-		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
-		
-		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
-	
-	-- LibStub:GetLibrary(major, [silent])
-	-- major (string) - the major version of the library
-	-- silent (boolean) - if true, library is optional, silently return nil if its not found
-	--
-	-- throws an error if the library can not be found (except silent is set)
-	-- returns the library object if found
-	function LibStub:GetLibrary(major, silent)
-		if not self.libs[major] and not silent then
-			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	-- LibStub:IterateLibraries()
-	-- 
-	-- Returns an iterator for the currently registered libraries
-	function LibStub:IterateLibraries() 
-		return pairs(self.libs) 
-	end
-	
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
diff --git a/libs/D4Lib/LibDBIcon-1.0/embeds.xml b/libs/D4Lib/LibDBIcon-1.0/embeds.xml
deleted file mode 100644
index 06e68ac..0000000
--- a/libs/D4Lib/LibDBIcon-1.0/embeds.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="LibStub\LibStub.lua"/>
-<Script file="CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
-<Script file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
-
-</Ui>
-
diff --git a/libs/db.lua b/libs/db.lua
index e34db4a..e88601a 100644
--- a/libs/db.lua
+++ b/libs/db.lua
@@ -1,14 +1,4 @@
 local _, ImproveAny = ...
-local COL_R = "|cFFFF0000"
-local COL_Y = "|cFFFFFF00"
-function ImproveAny:MSG(msg)
-	print("|cff3FC7EB" .. "[ImproveAny |T136033:16:16:0:0|t]|r " .. COL_Y .. msg)
-end
-
-function ImproveAny:MSG_Error(msg)
-	print("|cff3FC7EB" .. "[ImproveAny |T136033:16:16:0:0|t]|r " .. COL_R .. "[ERROR] |r" .. msg)
-end
-
 function ImproveAny:GetCP()
 	IATAB = IATAB or {}
 	IATAB["CURRENTPROFILE"] = IATAB["CURRENTPROFILE"] or "DEFAULT"
@@ -56,13 +46,13 @@ end
 
 function ImproveAny:IsEnabled(element, value)
 	if element == nil then
-		ImproveAny:MSG_Error("[IsEnabled] Missing Name")
+		ImproveAny:MSG("[IsEnabled] Missing Name")
 
 		return false
 	end
 
 	if value == nil then
-		ImproveAny:MSG_Error("[IsEnabled] Missing Value")
+		ImproveAny:MSG("[IsEnabled] Missing Value")
 
 		return false
 	end
diff --git a/libs/lang.lua b/libs/lang.lua
index d8b913d..70aa7f5 100644
--- a/libs/lang.lua
+++ b/libs/lang.lua
@@ -14,7 +14,7 @@ function ImproveAny:GT(str)
 
 		return str
 	else
-		print("[ImproveAny |T136033:16:16:0:0|t] MISSING STR", str)
+		ImproveAny:MSG("MISSING STR", str)
 	end
 end
 
@@ -27,4 +27,4 @@ function ImproveAny:UpdateLanguage()
 	end
 end
 
-ImproveAny:UpdateLanguage()
\ No newline at end of file
+ImproveAny:UpdateLanguage()
diff --git a/libs/math.lua b/libs/math.lua
index 103e878..a72579c 100644
--- a/libs/math.lua
+++ b/libs/math.lua
@@ -3,9 +3,8 @@ ImproveAny:SetAddonOutput("ImproveAny", 136033)
 function ImproveAny:Debug(msg, typ)
 	if typ == "think" then return end
 	if typ == "retry" then return end
-	--if msg ~= "minimap.lua: UpdatePos #2" then return end
 	if false then
-		print("|cFFFF0000" .. "[DEBUG][ImproveAny |T136033:16:16:0:0|t] " .. msg)
+		ImproveAny:MSG("|cFFFF0000" .. "[DEBUG] " .. msg)
 	end
 end
 
diff --git a/locale/deDE.lua b/locale/deDE.lua
index 72df34b..ae65b57 100644
--- a/locale/deDE.lua
+++ b/locale/deDE.lua
@@ -114,6 +114,7 @@ function ImproveAny:Lang_deDE()
 		["IMPROVETRADESKILLFRAME"] = "Berufsfenster verbessern (Material vorhanden, Suche)",
 		["CHARACTERFRAMEAUTOEXPAND"] = "Charakterfenster automatisch erweitern",
 		["FRAMEANCHOR"] = "Fenster Anker",
+		["SHOWVAULTMMBTN"] = "Große Schatzkammer an der Minimap anzeigen",
 	}
 
 	ImproveAny:UpdateLanguageTab(tab)
diff --git a/locale/enUS.lua b/locale/enUS.lua
index e2152cd..59b6ba7 100644
--- a/locale/enUS.lua
+++ b/locale/enUS.lua
@@ -120,6 +120,7 @@ function ImproveAny:Lang_enUS()
 		["IMPROVETRADESKILLFRAME"] = "Improve Tradeskillframe (Has Materials, Search)",
 		["CHARACTERFRAMEAUTOEXPAND"] = "Auto expand Characterframe",
 		["FRAMEANCHOR"] = "Frame Anchor",
+		["SHOWVAULTMMBTN"] = "Show the Great Vault at the minimap",
 	}
 
 	ImproveAny:UpdateLanguageTab(tab)
diff --git a/settings.lua b/settings.lua
index 5e0e8f5..47b77ee 100644
--- a/settings.lua
+++ b/settings.lua
@@ -441,8 +441,8 @@ function ImproveAny:InitIASettings()
 		IASettings:Hide()
 	end
 
-	ImproveAny:SetVersion(AddonName, 136033, "0.9.105")
-	IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.105"))
+	ImproveAny:SetVersion(AddonName, 136033, "0.9.106")
+	IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.106"))
 	IASettings.CloseButton:SetScript(
 		"OnClick",
 		function()
@@ -504,16 +504,16 @@ function ImproveAny:InitIASettings()
 						if eb.lastchange < GetTime() - 0.9 then
 							ImproveAny:IASV("BLOCKWORDS", eb:GetText())
 							if eb:GetText() ~= "" then
-								print("|cFF00FF00" .. "[ImproveAny] " .. "BLOCKWORDS changed to: |r")
+								ImproveAny:MSG("|cFF00FF00" .. "BLOCKWORDS changed to: |r")
 								for i, v in pairs({string.split(",", ImproveAny:IAGV("BLOCKWORDS"))}) do
 									if strlen(v) < 3 then
-										print(" • |cFFFF0000" .. v .. " [TO SHORT!]")
+										ImproveAny:MSG(" • |cFFFF0000" .. v .. " [TO SHORT!]")
 									else
-										print(" • |cFF00FF00" .. v)
+										ImproveAny:MSG(" • |cFF00FF00" .. v)
 									end
 								end
 							else
-								print("|cFFFF0000" .. "[ImproveAny] " .. "BLOCKWORDS are disabled")
+								ImproveAny:MSG("|cFFFF0000" .. "BLOCKWORDS are disabled")
 							end
 						end
 					end
@@ -530,8 +530,12 @@ function ImproveAny:InitIASettings()
 		end
 
 		AddCheckBox(24, "MINIMAPSHAPESQUARE", false, ImproveAny.UpdateMinimapSettings)
-		AddCheckBox(4, "COMBINEMMBTNS", false, ImproveAny.UpdateMinimapSettings)
-		AddCheckBox(4, "MINIMAPMINIMAPBUTTONSMOVABLE", false, ImproveAny.UpdateMinimapSettings)
+		AddCheckBox(24, "COMBINEMMBTNS", false, ImproveAny.UpdateMinimapSettings)
+		AddCheckBox(24, "MINIMAPMINIMAPBUTTONSMOVABLE", false, ImproveAny.UpdateMinimapSettings)
+		if ImproveAny:GetWoWBuild() == "RETAIL" then
+			AddCheckBox(24, "SHOWVAULTMMBTN", true, ImproveAny.UpdateMinimapSettings)
+		end
+
 		AddCategory("ITEMLEVEL")
 		AddCheckBox(4, "ITEMLEVELSYSTEM")
 		AddCheckBox(24, "ITEMLEVELNUMBER", false, ImproveAny.UpdateILVLIcons)
@@ -709,7 +713,7 @@ function ImproveAny:CheckBlockedWords()
 	if IATAB and ImproveAny:IAGV("BLOCKWORDS") and ImproveAny:IAGV("BLOCKWORDS") ~= "" and ImproveAny:IAGV("BLOCKWORDS") ~= " " then
 		for i, v in pairs({string.split(",", ImproveAny:IAGV("BLOCKWORDS"))}) do
 			if strlen(v) < 3 then
-				print("|cFFFF0000" .. "[ImproveAny] " .. "Blockword \"" .. v .. "\" is to short!")
+				ImproveAny:MSG("|cFFFF0000" .. "Blockword \"" .. v .. "\" is to short!")
 			end
 		end
 	end