diff --git a/Event/LOOT_OPENED.lua b/Event/LOOT_OPENED.lua
index 90bd638..95740a0 100644
--- a/Event/LOOT_OPENED.lua
+++ b/Event/LOOT_OPENED.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -29,7 +29,10 @@ LOOT_OPENED_Frame:SetScript("OnEvent",
             -- get the iteminfo using the slot itemlink
             name, link, quality, iLevel, reqLevel, class, subclass, maxStack, equipSlot, texture, vendorPrice = GetItemInfo(iLink)
             -- get the item value using the link, return nil if the item has no value
-            value = MX.TSM:GetItemValue(link, "DBMarket");
+            local itemId = MX:ToItemID(link);
+            if (itemId ~= nil) then
+              value = MX.TSM:GetItemValue(itemId, "DBMarket");
+            end
 
             -- MINIMUM QUALITY SETTINGS ------
             local eq = 2 -- equipable quality
@@ -72,8 +75,12 @@ LOOT_OPENED_Frame:SetScript("OnEvent",
                   MX:ChatGuildLootMessage(link,value);
                 end
               end
-              value = nil
-              iLink = nil
+          end
+          if (value ~= nil) then
+            Farmer_Money_LootSession = Farmer_Money_LootSession + value;
+            MX:UpdateMainUI()
+            value = nil
+            iLink = nil
           end
           end
       end
diff --git a/Event/PLAYER_MONEY.lua b/Event/PLAYER_MONEY.lua
index 95998cd..1732d3c 100644
--- a/Event/PLAYER_MONEY.lua
+++ b/Event/PLAYER_MONEY.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -17,7 +17,7 @@ PLAYER_MONEY_Frame:SetScript("OnEvent", function(self, event, ...)
 
     if (DiffGold > 0) then -- Gold gain
 
-      local date = C_Calendar.GetDate();
+      local date = C_DateAndTime.GetCurrentCalendarTime();
     	local weekday, month, day, year = date.weekday, date.month, date.monthDay, date.year;
 
       -- Write to SavedVariables
diff --git a/Frame/MainFrame.lua b/Frame/MainFrame.lua
index 6bb7976..b225ae8 100644
--- a/Frame/MainFrame.lua
+++ b/Frame/MainFrame.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -12,7 +12,7 @@ local GUI_LOOTCOLLECTED, GUI_SCROLLCONTAINER
 local lootCollectedLastEntry = nil
 local mxwVersion = GetAddOnMetadata("MxW", "Version")
 
-local date = C_Calendar.GetDate();
+local date = C_DateAndTime.GetCurrentCalendarTime();
 local weekday, month, day, year = date.weekday, date.month, date.monthDay, date.year;
 
 local backdrop = {
@@ -25,27 +25,30 @@ local backdrop = {
 local labTodayGold = AceGUI:Create("Label")
 local labMonthGold = AceGUI:Create("Label")
 local labDailyRecord = AceGUI:Create("Label")
+local labLootSession = AceGUI:Create("Label")
 local labDayCounter = AceGUI:Create("Label")
 
 local EditBoxMinAlert = AceGUI:Create("EditBox")
 
 function MX:ShowMainUI()
   local MAIN_UI = AceGUI:Create("Window")
-  MAIN_UI:SetHeight(30)
+  MAIN_UI:SetHeight(100)
   MAIN_UI:SetTitle("MxW " .. self.db.profile.version)
   MAIN_UI:SetStatusTable(self.db.profile.mainUI)
   MAIN_UI:SetLayout("List")
   MAIN_UI:SetWidth(200)
   MAIN_UI:EnableResize(false)
 
-  labTodayGold:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Homespun.ttf", 10)
+  labTodayGold:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Consola.ttf", 12)
   labTodayGold:SetColor(1, 1, 1)
   labTodayGold:SetFullWidth(true)
+	labTodayGold:SetPoint("LEFT", 30, 15)
   MAIN_UI:AddChild(labTodayGold)
 
-  labMonthGold:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Homespun.ttf", 10)
+  labMonthGold:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Consola.ttf", 12)
   labMonthGold:SetColor(1, 1, 1)
   labMonthGold:SetFullWidth(true)
+	labMonthGold:SetPoint("LEFT", 30, 15)
   MAIN_UI:AddChild(labMonthGold)
 
   local labSpaceB = AceGUI:Create("Label")
@@ -55,15 +58,27 @@ function MX:ShowMainUI()
   labSpaceB:SetText("  ")
   MAIN_UI:AddChild(labSpaceB)
 
-	labDailyRecord:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Homespun.ttf", 10)
+	labDailyRecord:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Consola.ttf", 12)
   labDailyRecord:SetColor(1, 1, 1)
   labDailyRecord:SetFullWidth(true)
   MAIN_UI:AddChild(labDailyRecord)
 
-  local BUTTON_SETTINGS = AceGUI:Create("Button")
+	labLootSession:SetFont("Interface\\Addons\\MxW\\Media\\Font\\Consola.ttf", 12)
+  labLootSession:SetColor(1, 1, 1)
+  labLootSession:SetFullWidth(true)
+  MAIN_UI:AddChild(labLootSession)
+
+	local labSpaceB = AceGUI:Create("Label")
+	labSpaceB:SetFont("Fonts\\FRIZQT__.TTF", 10)
+	labSpaceB:SetColor(1, 1, 1)
+	labSpaceB:SetFullWidth(true)
+	labSpaceB:SetText("  ")
+	MAIN_UI:AddChild(labSpaceB)
+
+	local BUTTON_SETTINGS = AceGUI:Create("Button")
 	BUTTON_SETTINGS:SetAutoWidth(true)
-	BUTTON_SETTINGS:SetText(L["MainForm_Button_Settings"])
-  BUTTON_SETTINGS:SetPoint("RIGHT", 5, 15)
+	BUTTON_SETTINGS:SetText("C")
+  BUTTON_SETTINGS:SetPoint("LEFT", 5, 15)
 	BUTTON_SETTINGS:SetCallback("OnClick",
 		function()
 		    MX:ShowSettingsUI()
@@ -192,6 +207,7 @@ function MX:UpdateMainUI()
   labTodayGold:SetText(format("%s (%s)", MX:FormatMoney(Farmer_Money_DayGlobal),L["MainForm_Label_Money_Lab_Today"]))
   labMonthGold:SetText(format("%s (%s)", MX:FormatMoney(Farmer_Money_MonthGlobal),L["MainForm_Label_Money_Lab_Month"]))
 	labDailyRecord:SetText(format("%s %s", MX:FormatMoneyGoldOnly(DailyRecord), L["Chat_ChatGuildDailyRecordUI"]))
+	labLootSession:SetText(format("%s (Loot)", MX:FormatMoneyGoldOnly(Farmer_Money_LootSession)))
 end
 
 function MX:ShowMain()
diff --git a/Function/Alert.lua b/Function/Alert.lua
index 876aa58..a149483 100644
--- a/Function/Alert.lua
+++ b/Function/Alert.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -42,9 +42,18 @@ function CookAlert(frame, item, fvalue)
   background:SetTexCoord(0, 0.605, 0, 0.703);
   background:SetPoint("TOPLEFT", 0, 0);
   background:SetPoint("BOTTOMRIGHT", 0, 0);
-  frame:SetBackdrop(backdrop)
-	frame:SetBackdropColor(0, 0, 0)
-	frame:SetBackdropBorderColor(0.4, 0.4, 0.4)
+	frame.Backdrop = CreateFrame("Frame", name.."Backdrop", f, "BackdropTemplate");
+	frame.Backdrop:SetAllPoints();
+	frame.Backdrop.backdropInfo = {
+        bgFile = "Interface\Tooltips\UI-Tooltip-Background",
+        edgeFile = "Interface\Tooltips\UI-Tooltip-Border",
+        edgeSize = 2,
+        insets = { left = 11, right = 12, top = 12, bottom = 9, },
+  };
+	frame.Backdrop:SetBackdrop(frame.Backdrop.backdropInfo);
+  --frame:SetBackdrop(backdrop)
+	frame.Backdrop:SetBackdropColor(51, 51, 51);
+	frame.Backdrop:SetBackdropBorderColor(0, 0, 0);
   --local iconBorder = frame.Icon.Overlay;
   --iconBorder:SetTexture("Interface\\AchievementFrame\\UI-Achievement-IconFrame");
   --iconBorder:SetTexCoord(0, 0.5625, 0, 0.5625);
diff --git a/Function/Chat.lua b/Function/Chat.lua
index 642016f..28e3e4d 100644
--- a/Function/Chat.lua
+++ b/Function/Chat.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
diff --git a/Function/DB.lua b/Function/DB.lua
index c458744..198409f 100644
--- a/Function/DB.lua
+++ b/Function/DB.lua
@@ -1,5 +1,5 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
diff --git a/Function/Item.lua b/Function/Item.lua
new file mode 100644
index 0000000..de147a2
--- /dev/null
+++ b/Function/Item.lua
@@ -0,0 +1,18 @@
+-- MxW (MxW Addon)
+-- By mikx
+-- https://git.mikx.xyz/mikx/MxW_Addon
+-- Licensed under the GNU General Public License 3.0
+-- See included License file for more informations.
+
+local MX = LibStub("AceAddon-3.0"):GetAddon("MxW");
+local L = LibStub("AceLocale-3.0"):GetLocale("MxW");
+
+function MX:ToItemID(itemString)
+    if not itemString then
+        return
+    end
+
+    local _, _, Color, Ltype, Id, Enchant, Gem1, Gem2, Gem3, Gem4, Suffix, Unique, LinkLvl, reforging, Name = string.find(itemString, "|?c?f?f?(%x*)|?H?([^:]*):?(%d+):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%-?%d*):?(%-?%d*):?(%d*):?(%d*)|?h?%[?([^%[%]]*)%]?|?h?|?r?")
+
+    return tonumber(Id)
+end
diff --git a/Function/Load_Functions.xml b/Function/Load_Functions.xml
index 40af5c2..c03eb82 100644
--- a/Function/Load_Functions.xml
+++ b/Function/Load_Functions.xml
@@ -2,6 +2,7 @@
 	<Script file="Alert.lua"/>
 	<Script file="DB.lua"/>
 	<Script file="Chat.lua"/>
+	<Script file="Item.lua"/>
 	<Script file="Math.lua"/>
 	<Script file="Money.lua"/>
 	<Script file="TSM.lua"/>
diff --git a/Function/Math.lua b/Function/Math.lua
index c458744..198409f 100644
--- a/Function/Math.lua
+++ b/Function/Math.lua
@@ -1,5 +1,5 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
diff --git a/Function/Money.lua b/Function/Money.lua
index a80c788..e8651f7 100644
--- a/Function/Money.lua
+++ b/Function/Money.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
diff --git a/Function/Option.lua b/Function/Option.lua
index 4abca68..deea900 100644
--- a/Function/Option.lua
+++ b/Function/Option.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
diff --git a/Function/TSM.lua b/Function/TSM.lua
index 1b50511..8367427 100644
--- a/Function/TSM.lua
+++ b/Function/TSM.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -16,5 +16,6 @@ MX.TSM = MX.TSM or {}
 -- GetItemValue(itemID, priceSource)
 -- Return itemID value as a int using priceSource
 function MX.TSM:GetItemValue(itemID, priceSource)
-	return TSMAPI_FOUR.CustomPrice.GetValue(priceSource, itemID)
+	local itemLink = "i:" .. tostring(itemID);
+	return TSM_API.GetCustomPriceValue(priceSource, itemLink)
 end
diff --git a/Libraries/DropDownMenu/DropDownMenu.xml b/Libraries/DropDownMenu/DropDownMenu.xml
deleted file mode 100644
index 1551cd8..0000000
--- a/Libraries/DropDownMenu/DropDownMenu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-
-<Include file="UIDropDownMenuTemplates.xml"/>
-<script file="UIDropDownMenu.lua"/>
-<script file="EasyMenu.lua"/>
-
-</Ui>
\ No newline at end of file
diff --git a/Libraries/DropDownMenu/EasyMenu.lua b/Libraries/DropDownMenu/EasyMenu.lua
deleted file mode 100644
index e35b80a..0000000
--- a/Libraries/DropDownMenu/EasyMenu.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-
--- Simplified Menu Display System
---	This is a basic system for displaying a menu from a structure table.
---
---	See UIDropDownMenu.lua for the menuList details.
---
---	Args:
---		menuList - menu table
---		menuFrame - the UI frame to populate
---		anchor - where to anchor the frame (e.g. CURSOR)
---		x - x offset
---		y - y offset
---		displayMode - border type
---		autoHideDelay - how long until the menu disappears
---
---
-function Lib_EasyMenu(menuList, menuFrame, anchor, x, y, displayMode, autoHideDelay )
-	if ( displayMode == "MENU" ) then
-		menuFrame.displayMode = displayMode;
-	end
-	Lib_UIDropDownMenu_Initialize(menuFrame, Lib_EasyMenu_Initialize, displayMode, nil, menuList);
-	Lib_ToggleDropDownMenu(1, nil, menuFrame, anchor, x, y, menuList, nil, autoHideDelay);
-end
-
-function Lib_EasyMenu_Initialize( frame, level, menuList )
-	for index = 1, #menuList do
-		local value = menuList[index]
-		if (value.text) then
-			value.index = index;
-			Lib_UIDropDownMenu_AddButton( value, level );
-		end
-	end
-end
-
diff --git a/Libraries/DropDownMenu/UIDropDownMenu.lua b/Libraries/DropDownMenu/UIDropDownMenu.lua
deleted file mode 100644
index 8e475d3..0000000
--- a/Libraries/DropDownMenu/UIDropDownMenu.lua
+++ /dev/null
@@ -1,1232 +0,0 @@
-LIB_UIDROPDOWNMENU_MINBUTTONS = 8;
-LIB_UIDROPDOWNMENU_MAXBUTTONS = 8;
-LIB_UIDROPDOWNMENU_MAXLEVELS = 2;
-LIB_UIDROPDOWNMENU_BUTTON_HEIGHT = 16;
-LIB_UIDROPDOWNMENU_BORDER_HEIGHT = 15;
--- The current open menu
-LIB_UIDROPDOWNMENU_OPEN_MENU = nil;
--- The current menu being initialized
-LIB_UIDROPDOWNMENU_INIT_MENU = nil;
--- Current level shown of the open menu
-LIB_UIDROPDOWNMENU_MENU_LEVEL = 1;
--- Current value of the open menu
-LIB_UIDROPDOWNMENU_MENU_VALUE = nil;
--- Time to wait to hide the menu
-LIB_UIDROPDOWNMENU_SHOW_TIME = 2;
--- Default dropdown text height
-LIB_UIDROPDOWNMENU_DEFAULT_TEXT_HEIGHT = nil;
--- List of open menus
-LIB_OPEN_DROPDOWNMENUS = {}; --used by UnitPopup only
-
-local Lib_UIDropDownMenuDelegate = CreateFrame("FRAME");
-for i = 1, LIB_UIDROPDOWNMENU_MAXLEVELS do
-	local listFrameName = "Lib_DropDownList"..i;	
-	local f = CreateFrame("Button", listFrameName, nil, "Lib_UIDropDownListTemplate");
-	f:SetID(i);
-	f:SetSize(180, 10);
-	f:SetFrameStrata("FULLSCREEN_DIALOG");
-	local fontName, fontHeight, fontFlags = _G["Lib_DropDownList1Button1NormalText"]:GetFont();
-	LIB_UIDROPDOWNMENU_DEFAULT_TEXT_HEIGHT = fontHeight;
-	for j = 1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-		local b = CreateFrame("Button", listFrameName.."Button"..j, f, "Lib_UIDropDownMenuButtonTemplate");
-		b:SetID(j);
-	end
-
-	--Allow closing with escape
-	tinsert(UIMenus, listFrameName)
-end
-
-function Lib_UIDropDownMenuDelegate_OnAttributeChanged (self, attribute, value)
-	if ( attribute == "createframes" and value == true ) then
-		Lib_UIDropDownMenu_CreateFrames(self:GetAttribute("createframes-level"), self:GetAttribute("createframes-index"));
-	elseif ( attribute == "initmenu" ) then
-		LIB_UIDROPDOWNMENU_INIT_MENU = value;
-	elseif ( attribute == "openmenu" ) then
-		LIB_UIDROPDOWNMENU_OPEN_MENU = value;
-	end
-end
-
-Lib_UIDropDownMenuDelegate:SetScript("OnAttributeChanged", Lib_UIDropDownMenuDelegate_OnAttributeChanged);
-
-function Lib_UIDropDownMenu_InitializeHelper (frame)
-	-- This deals with the potentially tainted stuff!
-	if ( frame ~= LIB_UIDROPDOWNMENU_OPEN_MENU ) then
-		LIB_UIDROPDOWNMENU_MENU_LEVEL = 1;
-	end
-
-	-- Set the frame that's being intialized
-	Lib_UIDropDownMenuDelegate:SetAttribute("initmenu", frame);
-	
-	-- Hide all the buttons
-	local button, dropDownList;
-	for i = 1, LIB_UIDROPDOWNMENU_MAXLEVELS, 1 do
-		dropDownList = _G["Lib_DropDownList"..i];
-		if ( i >= LIB_UIDROPDOWNMENU_MENU_LEVEL or frame ~= LIB_UIDROPDOWNMENU_OPEN_MENU ) then
-			dropDownList.numButtons = 0;
-			dropDownList.maxWidth = 0;
-			for j=1, LIB_UIDROPDOWNMENU_MAXBUTTONS, 1 do
-				button = _G["Lib_DropDownList"..i.."Button"..j];
-				button:Hide();
-			end
-			dropDownList:Hide();
-		end
-	end
-	frame:SetHeight(LIB_UIDROPDOWNMENU_BUTTON_HEIGHT * 2);
-end
-
-function Lib_UIDropDownMenu_Initialize(frame, initFunction, displayMode, level, menuList)
-	frame.menuList = menuList;
-
-	securecall("Lib_UIDropDownMenu_InitializeHelper", frame);
-	
-	-- Set the initialize function and call it.  The initFunction populates the dropdown list.
-	if ( initFunction ) then
-		frame.initialize = initFunction;
-		initFunction(frame, level, frame.menuList);
-	end
-
-	--master frame
-	if(level == nil) then
-		level = 1;
-	end
-	local dropDownList = _G["Lib_DropDownList"..level]
-	dropDownList.dropdown = frame;
-	dropDownList.shouldRefresh = true;
-
-	-- Change appearance based on the displayMode
-	if ( displayMode == "MENU" ) then
-		local name = frame:GetName();
-		_G[name.."Left"]:Hide();
-		_G[name.."Middle"]:Hide();
-		_G[name.."Right"]:Hide();
-		_G[name.."ButtonNormalTexture"]:SetTexture("");
-		_G[name.."ButtonDisabledTexture"]:SetTexture("");
-		_G[name.."ButtonPushedTexture"]:SetTexture("");
-		_G[name.."ButtonHighlightTexture"]:SetTexture("");
-		local button = _G[name.."Button"]
-		button:ClearAllPoints();
-		button:SetPoint("LEFT", name.."Text", "LEFT", -9, 0);
-		button:SetPoint("RIGHT", name.."Text", "RIGHT", 6, 0);
-		frame.displayMode = "MENU";
-	end
-
-end
-
-function Lib_UIDropDownMenu_RefreshDropDownSize(self)
-	self.maxWidth = Lib_UIDropDownMenu_GetMaxButtonWidth(self);
-	self:SetWidth(self.maxWidth + 25);
-		
-	for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS, 1 do
-		local icon = _G[self:GetName().."Button"..i.."Icon"];
-		
-		if ( icon.tFitDropDownSizeX ) then
-			icon:SetWidth(self.maxWidth - 5);
-		end
-	end	
-end
--- If dropdown is visible then see if its timer has expired, if so hide the frame
-function Lib_UIDropDownMenu_OnUpdate(self, elapsed)
-	if ( self.shouldRefresh ) then
-		Lib_UIDropDownMenu_RefreshDropDownSize(self);
-		self.shouldRefresh = false;
-	end
-	if ( not self.showTimer or not self.isCounting ) then
-		return;
-	elseif ( self.showTimer < 0 ) then
-		self:Hide();
-		self.showTimer = nil;
-		self.isCounting = nil;
-	else
-		self.showTimer = self.showTimer - elapsed;
-	end
-end
-
--- Start the countdown on a frame
-function Lib_UIDropDownMenu_StartCounting(frame)
-	if ( frame.parent ) then
-		Lib_UIDropDownMenu_StartCounting(frame.parent);
-	else
-		frame.showTimer = LIB_UIDROPDOWNMENU_SHOW_TIME;
-		frame.isCounting = 1;
-	end
-end
-
--- Stop the countdown on a frame
-function Lib_UIDropDownMenu_StopCounting(frame)
-	if ( frame.parent ) then
-		Lib_UIDropDownMenu_StopCounting(frame.parent);
-	else
-		frame.isCounting = nil;
-	end
-end
-
---[[
-List of button attributes
-======================================================
-info.text = [STRING]  --  The text of the button
-info.value = [ANYTHING]  --  The value that UIDROPDOWNMENU_MENU_VALUE is set to when the button is clicked
-info.func = [function()]  --  The function that is called when you click the button
-info.checked = [nil, true, function]  --  Check the button if true or function returns true
-info.isNotRadio = [nil, true]  --  Check the button uses radial image if false check box image if true
-info.isTitle = [nil, true]  --  If it's a title the button is disabled and the font color is set to yellow
-info.disabled = [nil, true]  --  Disable the button and show an invisible button that still traps the mouseover event so menu doesn't time out
-info.tooltipWhileDisabled = [nil, 1] -- Show the tooltip, even when the button is disabled.
-info.hasArrow = [nil, true]  --  Show the expand arrow for multilevel menus
-info.hasColorSwatch = [nil, true]  --  Show color swatch or not, for color selection
-info.r = [1 - 255]  --  Red color value of the color swatch
-info.g = [1 - 255]  --  Green color value of the color swatch
-info.b = [1 - 255]  --  Blue color value of the color swatch
-info.colorCode = [STRING] -- "|cAARRGGBB" embedded hex value of the button text color. Only used when button is enabled
-info.swatchFunc = [function()]  --  Function called by the color picker on color change
-info.hasOpacity = [nil, 1]  --  Show the opacity slider on the colorpicker frame
-info.opacity = [0.0 - 1.0]  --  Percentatge of the opacity, 1.0 is fully shown, 0 is transparent
-info.opacityFunc = [function()]  --  Function called by the opacity slider when you change its value
-info.cancelFunc = [function(previousValues)] -- Function called by the colorpicker when you click the cancel button (it takes the previous values as its argument)
-info.notClickable = [nil, 1]  --  Disable the button and color the font white
-info.notCheckable = [nil, 1]  --  Shrink the size of the buttons and don't display a check box
-info.owner = [Frame]  --  Dropdown frame that "owns" the current dropdownlist
-info.keepShownOnClick = [nil, 1]  --  Don't hide the dropdownlist after a button is clicked
-info.tooltipTitle = [nil, STRING] -- Title of the tooltip shown on mouseover
-info.tooltipText = [nil, STRING] -- Text of the tooltip shown on mouseover
-info.tooltipOnButton = [nil, 1] -- Show the tooltip attached to the button instead of as a Newbie tooltip.
-info.justifyH = [nil, "CENTER"] -- Justify button text
-info.arg1 = [ANYTHING] -- This is the first argument used by info.func
-info.arg2 = [ANYTHING] -- This is the second argument used by info.func
-info.fontObject = [FONT] -- font object replacement for Normal and Highlight
-info.menuTable = [TABLE] -- This contains an array of info tables to be displayed as a child menu
-info.noClickSound = [nil, 1]  --  Set to 1 to suppress the sound when clicking the button. The sound only plays if .func is set.
-info.padding = [nil, NUMBER] -- Number of pixels to pad the text on the right side
-info.leftPadding = [nil, NUMBER] -- Number of pixels to pad the button on the left side
-info.minWidth = [nil, NUMBER] -- Minimum width for this line
-]]
-
-local Lib_UIDropDownMenu_ButtonInfo = {};
-
---Until we get around to making this betterz...
-local Lib_UIDropDownMenu_SecureInfo = {};
-
-local wipe = table.wipe;
-
-function Lib_UIDropDownMenu_CreateInfo()
-	-- Reuse the same table to prevent memory churn
-	
-	if ( issecure() ) then
-		securecall(wipe, Lib_UIDropDownMenu_SecureInfo);
-		return Lib_UIDropDownMenu_SecureInfo;
-	else
-		return wipe(Lib_UIDropDownMenu_ButtonInfo);
-	end
-end
-
-function Lib_UIDropDownMenu_CreateFrames(level, index)
-
-	while ( level > LIB_UIDROPDOWNMENU_MAXLEVELS ) do
-		LIB_UIDROPDOWNMENU_MAXLEVELS = LIB_UIDROPDOWNMENU_MAXLEVELS + 1;
-		local newList = CreateFrame("Button", "Lib_DropDownList"..LIB_UIDROPDOWNMENU_MAXLEVELS, nil, "Lib_UIDropDownListTemplate");
-		newList:SetFrameStrata("FULLSCREEN_DIALOG");
-		newList:SetToplevel(true);
-		newList:Hide();
-		newList:SetID(LIB_UIDROPDOWNMENU_MAXLEVELS);
-		newList:SetWidth(180)
-		newList:SetHeight(10)
-		for i=LIB_UIDROPDOWNMENU_MINBUTTONS+1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-			local newButton = CreateFrame("Button", "Lib_DropDownList"..LIB_UIDROPDOWNMENU_MAXLEVELS.."Button"..i, newList, "Lib_UIDropDownMenuButtonTemplate");
-			newButton:SetID(i);
-		end
-	end
-
-	while ( index > LIB_UIDROPDOWNMENU_MAXBUTTONS ) do
-		LIB_UIDROPDOWNMENU_MAXBUTTONS = LIB_UIDROPDOWNMENU_MAXBUTTONS + 1;
-		for i=1, LIB_UIDROPDOWNMENU_MAXLEVELS do
-			local newButton = CreateFrame("Button", "Lib_DropDownList"..i.."Button"..LIB_UIDROPDOWNMENU_MAXBUTTONS, _G["Lib_DropDownList"..i], "Lib_UIDropDownMenuButtonTemplate");
-			newButton:SetID(LIB_UIDROPDOWNMENU_MAXBUTTONS);
-		end
-	end
-end
-
-function Lib_UIDropDownMenu_AddSeparator(info, level)
-	info.text = nil;
-	info.hasArrow = false;
-	info.dist = 0;
-	info.isTitle = true;
-	info.isUninteractable = true;
-	info.notCheckable = true;
-	info.iconOnly = true;
-	info.icon = "Interface\\Common\\UI-TooltipDivider-Transparent";
-	info.tCoordLeft = 0;
-	info.tCoordRight = 1;
-	info.tCoordTop = 0;
-	info.tCoordBottom = 1;
-	info.tSizeX = 0;
-	info.tSizeY = 8;
-	info.tFitDropDownSizeX = true;
-	info.iconInfo = { tCoordLeft = info.tCoordLeft,
-							tCoordRight = info.tCoordRight,
-							tCoordTop = info.tCoordTop,
-							tCoordBottom = info.tCoordBottom,
-							tSizeX = info.tSizeX,
-							tSizeY = info.tSizeY,
-							tFitDropDownSizeX = info.tFitDropDownSizeX };
-
-	Lib_UIDropDownMenu_AddButton(info, level);
-end
-
-function Lib_UIDropDownMenu_AddButton(info, level)
-	--[[
-	Might to uncomment this if there are performance issues 
-	if ( not LIB_UIDROPDOWNMENU_OPEN_MENU ) then
-		return;
-	end
-	]]
-	if ( not level ) then
-		level = 1;
-	end
-	
-	local listFrame = _G["Lib_DropDownList"..level];
-	local index = listFrame and (listFrame.numButtons + 1) or 1;
-	local width;
-
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes-level", level);
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes-index", index);
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes", true);
-	
-	listFrame = listFrame or _G["Lib_DropDownList"..level];
-	local listFrameName = listFrame:GetName();
-	
-	-- Set the number of buttons in the listframe
-	listFrame.numButtons = index;
-	
-	local button = _G[listFrameName.."Button"..index];
-	local normalText = _G[button:GetName().."NormalText"];
-	local icon = _G[button:GetName().."Icon"];
-	-- This button is used to capture the mouse OnEnter/OnLeave events if the dropdown button is disabled, since a disabled button doesn't receive any events
-	-- This is used specifically for drop down menu time outs
-	local invisibleButton = _G[button:GetName().."InvisibleButton"];
-	
-	-- Default settings
-	button:SetDisabledFontObject(GameFontDisableSmallLeft);
-	invisibleButton:Hide();
-	button:Enable();
-	
-	-- If not clickable then disable the button and set it white
-	if ( info.notClickable ) then
-		info.disabled = true;
-		button:SetDisabledFontObject(GameFontHighlightSmallLeft);
-	end
-
-	-- Set the text color and disable it if its a title
-	if ( info.isTitle ) then
-		info.disabled = true;
-		button:SetDisabledFontObject(GameFontNormalSmallLeft);
-	end
-	
-	-- Disable the button if disabled and turn off the color code
-	if ( info.disabled ) then
-		button:Disable();
-		invisibleButton:Show();
-		info.colorCode = nil;
-	end
-	
-	-- If there is a color for a disabled line, set it
-	if( info.disablecolor ) then
-		info.colorCode = info.disablecolor;
-	end
-
-	-- Configure button
-	if ( info.text ) then
-		-- look for inline color code this is only if the button is enabled
-		if ( info.colorCode ) then
-			button:SetText(info.colorCode..info.text.."|r");
-		else
-			button:SetText(info.text);
-		end
-		-- Set icon
-		if ( info.icon ) then
-			icon:SetSize(16,16);
-			icon:SetTexture(info.icon);
-			icon:ClearAllPoints();
-			icon:SetPoint("RIGHT");
-
-			if ( info.tCoordLeft ) then
-				icon:SetTexCoord(info.tCoordLeft, info.tCoordRight, info.tCoordTop, info.tCoordBottom);
-			else
-				icon:SetTexCoord(0, 1, 0, 1);
-			end
-			icon:Show();
-		else
-			icon:Hide();
-		end
-		-- Check to see if there is a replacement font
-		if ( info.fontObject ) then
-			button:SetNormalFontObject(info.fontObject);
-			button:SetHighlightFontObject(info.fontObject);
-		else
-			button:SetNormalFontObject(GameFontHighlightSmallLeft);
-			button:SetHighlightFontObject(GameFontHighlightSmallLeft);
-		end
-	else
-		button:SetText("");
-		icon:Hide();
-	end
-	
-	button.iconOnly = nil;
-	button.icon = nil;
-	button.iconInfo = nil;
-	
-	if (info.iconInfo) then
-		icon.tFitDropDownSizeX = info.iconInfo.tFitDropDownSizeX;
-	else
-		icon.tFitDropDownSizeX = nil;
-	end
-	if (info.iconOnly and info.icon) then
-		button.iconOnly = true;
-		button.icon = info.icon;
-		button.iconInfo = info.iconInfo;
-
-		Lib_UIDropDownMenu_SetIconImage(icon, info.icon, info.iconInfo);
-		icon:ClearAllPoints();
-		icon:SetPoint("LEFT");
-	end
-
-	-- Pass through attributes
-	button.func = info.func;
-	button.owner = info.owner;
-	button.hasOpacity = info.hasOpacity;
-	button.opacity = info.opacity;
-	button.opacityFunc = info.opacityFunc;
-	button.cancelFunc = info.cancelFunc;
-	button.swatchFunc = info.swatchFunc;
-	button.keepShownOnClick = info.keepShownOnClick;
-	button.tooltipTitle = info.tooltipTitle;
-	button.tooltipText = info.tooltipText;
-	button.arg1 = info.arg1;
-	button.arg2 = info.arg2;
-	button.hasArrow = info.hasArrow;
-	button.hasColorSwatch = info.hasColorSwatch;
-	button.notCheckable = info.notCheckable;
-	button.menuList = info.menuList;
-	button.tooltipWhileDisabled = info.tooltipWhileDisabled;
-	button.tooltipOnButton = info.tooltipOnButton;
-	button.noClickSound = info.noClickSound;
-	button.padding = info.padding;
-	
-	if ( info.value ) then
-		button.value = info.value;
-	elseif ( info.text ) then
-		button.value = info.text;
-	else
-		button.value = nil;
-	end
-	
-	-- Show the expand arrow if it has one
-	if ( info.hasArrow ) then
-		_G[listFrameName.."Button"..index.."ExpandArrow"]:Show();
-	else
-		_G[listFrameName.."Button"..index.."ExpandArrow"]:Hide();
-	end
-	button.hasArrow = info.hasArrow;
-	
-	-- If not checkable move everything over to the left to fill in the gap where the check would be
-	local xPos = 5;
-	local yPos = -((button:GetID() - 1) * LIB_UIDROPDOWNMENU_BUTTON_HEIGHT) - LIB_UIDROPDOWNMENU_BORDER_HEIGHT;
-	local displayInfo = normalText;
-	if (info.iconOnly) then
-		displayInfo = icon;
-	end
-	
-	displayInfo:ClearAllPoints();
-	if ( info.notCheckable ) then
-		if ( info.justifyH and info.justifyH == "CENTER" ) then
-			displayInfo:SetPoint("CENTER", button, "CENTER", -7, 0);
-		else
-			displayInfo:SetPoint("LEFT", button, "LEFT", 0, 0);
-		end
-		xPos = xPos + 10;
-		
-	else
-		xPos = xPos + 12;
-		displayInfo:SetPoint("LEFT", button, "LEFT", 20, 0);
-	end
-
-	-- Adjust offset if displayMode is menu
-	local frame = LIB_UIDROPDOWNMENU_OPEN_MENU;
-	if ( frame and frame.displayMode == "MENU" ) then
-		if ( not info.notCheckable ) then
-			xPos = xPos - 6;
-		end
-	end
-	
-	-- If no open frame then set the frame to the currently initialized frame
-	frame = frame or LIB_UIDROPDOWNMENU_INIT_MENU;
-
-	if ( info.leftPadding ) then
-		xPos = xPos + info.leftPadding;
-	end
-	button:SetPoint("TOPLEFT", button:GetParent(), "TOPLEFT", xPos, yPos);
-
-	-- See if button is selected by id or name
-	if ( frame ) then
-		if ( Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-			if ( button:GetText() == Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-				info.checked = 1;
-			end
-		elseif ( Lib_UIDropDownMenu_GetSelectedID(frame) ) then
-			if ( button:GetID() == Lib_UIDropDownMenu_GetSelectedID(frame) ) then
-				info.checked = 1;
-			end
-		elseif ( Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-			if ( button.value == Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-				info.checked = 1;
-			end
-		end
-	end
-
-
-	if not info.notCheckable then 
-		if ( info.disabled ) then
-			_G[listFrameName.."Button"..index.."Check"]:SetDesaturated(true);
-			_G[listFrameName.."Button"..index.."Check"]:SetAlpha(0.5);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetDesaturated(true);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetAlpha(0.5);
-		else
-			_G[listFrameName.."Button"..index.."Check"]:SetDesaturated(false);
-			_G[listFrameName.."Button"..index.."Check"]:SetAlpha(1);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetDesaturated(false);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetAlpha(1);
-		end
-		if info.isNotRadio then
-			_G[listFrameName.."Button"..index.."Check"]:SetTexCoord(0.0, 0.5, 0.0, 0.5);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetTexCoord(0.5, 1.0, 0.0, 0.5);
-		else
-			_G[listFrameName.."Button"..index.."Check"]:SetTexCoord(0.0, 0.5, 0.5, 1.0);
-			_G[listFrameName.."Button"..index.."UnCheck"]:SetTexCoord(0.5, 1.0, 0.5, 1.0);
-		end
-		
-		-- Checked can be a function now
-		local checked = info.checked;
-		if ( type(checked) == "function" ) then
-			checked = checked(button);
-		end
-
-		-- Show the check if checked
-		if ( checked ) then
-			button:LockHighlight();
-			_G[listFrameName.."Button"..index.."Check"]:Show();
-			_G[listFrameName.."Button"..index.."UnCheck"]:Hide();
-		else
-			button:UnlockHighlight();
-			_G[listFrameName.."Button"..index.."Check"]:Hide();
-			_G[listFrameName.."Button"..index.."UnCheck"]:Show();
-		end
-	else
-		_G[listFrameName.."Button"..index.."Check"]:Hide();
-		_G[listFrameName.."Button"..index.."UnCheck"]:Hide();
-	end	
-	button.checked = info.checked;
-
-	-- If has a colorswatch, show it and vertex color it
-	local colorSwatch = _G[listFrameName.."Button"..index.."ColorSwatch"];
-	if ( info.hasColorSwatch ) then
-		_G["Lib_DropDownList"..level.."Button"..index.."ColorSwatch".."NormalTexture"]:SetVertexColor(info.r, info.g, info.b);
-		button.r = info.r;
-		button.g = info.g;
-		button.b = info.b;
-		colorSwatch:Show();
-	else
-		colorSwatch:Hide();
-	end
-
-	width = max(Lib_UIDropDownMenu_GetButtonWidth(button), info.minWidth or 0);
-	--Set maximum button width
-	if ( width > listFrame.maxWidth ) then
-		listFrame.maxWidth = width;
-	end
-	-- Set the height of the listframe
-	listFrame:SetHeight((index * LIB_UIDROPDOWNMENU_BUTTON_HEIGHT) + (LIB_UIDROPDOWNMENU_BORDER_HEIGHT * 2));
-
-	button:Show();
-end
-
-function Lib_UIDropDownMenu_GetMaxButtonWidth(self)
-	local maxWidth = 0;
-	for i=1, self.numButtons do
-		local button = _G[self:GetName().."Button"..i];
-		if ( button:IsShown() ) then
-			local width = Lib_UIDropDownMenu_GetButtonWidth(button);
-			if ( width > maxWidth ) then
-				maxWidth = width;
-			end
-		end
-	end
-	return maxWidth;
-end
-
-function Lib_UIDropDownMenu_GetButtonWidth(button)
-	local width;
-	local buttonName = button:GetName();
-	local icon = _G[buttonName.."Icon"];
-	local normalText = _G[buttonName.."NormalText"];
-	
-	if ( button.iconOnly and icon ) then
-		width = icon:GetWidth();
-	elseif ( normalText and normalText:GetText() ) then
-		width = normalText:GetWidth() + 40;
-		
-		if ( button.icon ) then
-			-- Add padding for the icon
-			width = width + 10;
-		end
-	else
-		return 0;
-	end
-	
-	-- Add padding if has and expand arrow or color swatch
-	if ( button.hasArrow or button.hasColorSwatch ) then
-		width = width + 10;
-	end
-	if ( button.notCheckable ) then
-		width = width - 30;
-	end
-	if ( button.padding ) then
-		width = width + button.padding;
-	end
-	
-	return width;
-end
-function Lib_UIDropDownMenu_Refresh(frame, useValue, dropdownLevel)
-	local button, checked, checkImage, uncheckImage, normalText, width;
-	local maxWidth = 0;
-	local somethingChecked = nil; 
-	if ( not dropdownLevel ) then
-		dropdownLevel = LIB_UIDROPDOWNMENU_MENU_LEVEL;
-	end
-
-	local listFrame = _G["Lib_DropDownList"..dropdownLevel];
-	listFrame.numButtons = listFrame.numButtons or 0;
-	-- Just redraws the existing menu
-	for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-		button = _G["Lib_DropDownList"..dropdownLevel.."Button"..i];
-		checked = nil;
-
-		if(i <= listFrame.numButtons) then
-			-- See if checked or not
-			if ( Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-				if ( button:GetText() == Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-					checked = 1;
-				end
-			elseif ( Lib_UIDropDownMenu_GetSelectedID(frame) ) then
-				if ( button:GetID() == Lib_UIDropDownMenu_GetSelectedID(frame) ) then
-					checked = 1;
-				end
-			elseif ( Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-				if ( button.value == Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-					checked = 1;
-				end
-			end
-		end
-		if (button.checked and type(button.checked) == "function") then
-			checked = button.checked(button);
-		end
-
-		if not button.notCheckable and button:IsShown() then	
-			-- If checked show check image
-			checkImage = _G["Lib_DropDownList"..dropdownLevel.."Button"..i.."Check"];
-			uncheckImage = _G["Lib_DropDownList"..dropdownLevel.."Button"..i.."UnCheck"];
-			if ( checked ) then
-				somethingChecked = true;
-				local icon = _G[frame:GetName().."Icon"];
-				if (button.iconOnly and icon and button.icon) then
-					Lib_UIDropDownMenu_SetIconImage(icon, button.icon, button.iconInfo);
-				elseif ( useValue ) then
-					Lib_UIDropDownMenu_SetText(frame, button.value);
-					icon:Hide();
-				else
-					Lib_UIDropDownMenu_SetText(frame, button:GetText());
-					icon:Hide();
-				end
-				button:LockHighlight();
-				checkImage:Show();
-				uncheckImage:Hide();
-			else
-				button:UnlockHighlight();
-				checkImage:Hide();
-				uncheckImage:Show();
-			end
-		end
-
-		if ( button:IsShown() ) then
-			width = Lib_UIDropDownMenu_GetButtonWidth(button);
-			if ( width > maxWidth ) then
-				maxWidth = width;
-			end
-		end
-	end
-	if(somethingChecked == nil) then
-		Lib_UIDropDownMenu_SetText(frame, VIDEO_QUALITY_LABEL6);
-	end
-	if (not frame.noResize) then
-		for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-			button = _G["Lib_DropDownList"..dropdownLevel.."Button"..i];
-			button:SetWidth(maxWidth);
-		end
-		Lib_UIDropDownMenu_RefreshDropDownSize(_G["Lib_DropDownList"..dropdownLevel]);
-	end
-end
-
-function Lib_UIDropDownMenu_RefreshAll(frame, useValue)
-	for dropdownLevel = LIB_UIDROPDOWNMENU_MENU_LEVEL, 2, -1 do
-		local listFrame = _G["Lib_DropDownList"..dropdownLevel];
-		if ( listFrame:IsShown() ) then
-			Lib_UIDropDownMenu_Refresh(frame, nil, dropdownLevel);
-		end
-	end
-	-- useValue is the text on the dropdown, only needs to be set once
-	Lib_UIDropDownMenu_Refresh(frame, useValue, 1);
-end
-
-function Lib_UIDropDownMenu_SetIconImage(icon, texture, info)
-	icon:SetTexture(texture);
-	if ( info.tCoordLeft ) then
-		icon:SetTexCoord(info.tCoordLeft, info.tCoordRight, info.tCoordTop, info.tCoordBottom);
-	else
-		icon:SetTexCoord(0, 1, 0, 1);
-	end
-	if ( info.tSizeX ) then
-		icon:SetWidth(info.tSizeX);
-	else
-		icon:SetWidth(16);
-	end
-	if ( info.tSizeY ) then
-		icon:SetHeight(info.tSizeY);
-	else
-		icon:SetHeight(16);
-	end
-	icon:Show();
-end
-
-function Lib_UIDropDownMenu_SetSelectedName(frame, name, useValue)
-	frame.selectedName = name;
-	frame.selectedID = nil;
-	frame.selectedValue = nil;
-	Lib_UIDropDownMenu_Refresh(frame, useValue);
-end
-
-function Lib_UIDropDownMenu_SetSelectedValue(frame, value, useValue)
-	-- useValue will set the value as the text, not the name
-	frame.selectedName = nil;
-	frame.selectedID = nil;
-	frame.selectedValue = value;
-	Lib_UIDropDownMenu_Refresh(frame, useValue);
-end
-
-function Lib_UIDropDownMenu_SetSelectedID(frame, id, useValue)
-	frame.selectedID = id;
-	frame.selectedName = nil;
-	frame.selectedValue = nil;
-	Lib_UIDropDownMenu_Refresh(frame, useValue);
-end
-
-function Lib_UIDropDownMenu_GetSelectedName(frame)
-	return frame.selectedName;
-end
-
-function Lib_UIDropDownMenu_GetSelectedID(frame)
-	if ( frame.selectedID ) then
-		return frame.selectedID;
-	else
-		-- If no explicit selectedID then try to send the id of a selected value or name
-		local button;
-		for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-			button = _G["Lib_DropDownList"..LIB_UIDROPDOWNMENU_MENU_LEVEL.."Button"..i];
-			-- See if checked or not
-			if ( Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-				if ( button:GetText() == Lib_UIDropDownMenu_GetSelectedName(frame) ) then
-					return i;
-				end
-			elseif ( Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-				if ( button.value == Lib_UIDropDownMenu_GetSelectedValue(frame) ) then
-					return i;
-				end
-			end
-		end
-	end
-end
-
-function Lib_UIDropDownMenu_GetSelectedValue(frame)
-	return frame.selectedValue;
-end
-
-function Lib_UIDropDownMenuButton_OnClick(self)
-	local checked = self.checked;
-	if ( type (checked) == "function" ) then
-		checked = checked(self);
-	end
-	
-
-	if ( self.keepShownOnClick ) then
-		if not self.notCheckable then
-			if ( checked ) then
-				_G[self:GetName().."Check"]:Hide();
-				_G[self:GetName().."UnCheck"]:Show();
-				checked = false;
-			else
-				_G[self:GetName().."Check"]:Show();
-				_G[self:GetName().."UnCheck"]:Hide();
-				checked = true;
-			end
-		end
-	else
-		self:GetParent():Hide();
-	end
-
-	if ( type (self.checked) ~= "function" ) then 
-		self.checked = checked;
-	end
-
-	-- saving this here because func might use a dropdown, changing this self's attributes
-	local playSound = true;
-	if ( self.noClickSound ) then
-		playSound = false;
-	end
-
-	local func = self.func;
-	if ( func ) then
-		func(self, self.arg1, self.arg2, checked);
-	else
-		return;
-	end
-
-	if ( playSound ) then
-		PlaySound("UChatScrollButton");
-	end
-end
-
-function Lib_HideDropDownMenu(level)
-	local listFrame = _G["Lib_DropDownList"..level];
-	listFrame:Hide();
-end
-
-function Lib_ToggleDropDownMenu(level, value, dropDownFrame, anchorName, xOffset, yOffset, menuList, button, autoHideDelay)
-	if ( not level ) then
-		level = 1;
-	end
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes-level", level);
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes-index", 0);
-	Lib_UIDropDownMenuDelegate:SetAttribute("createframes", true);
-	LIB_UIDROPDOWNMENU_MENU_LEVEL = level;
-	LIB_UIDROPDOWNMENU_MENU_VALUE = value;
-	local listFrame = _G["Lib_DropDownList"..level];
-	local listFrameName = "Lib_DropDownList"..level;
-	local tempFrame;
-	local point, relativePoint, relativeTo;
-	if ( not dropDownFrame ) then
-		tempFrame = button:GetParent();
-	else
-		tempFrame = dropDownFrame;
-	end
-	if ( listFrame:IsShown() and (LIB_UIDROPDOWNMENU_OPEN_MENU == tempFrame) ) then
-		listFrame:Hide();
-	else
-		-- Set the dropdownframe scale
-		local uiScale;
-		local uiParentScale = UIParent:GetScale();
-		if ( GetCVar("useUIScale") == "1" ) then
-			uiScale = tonumber(GetCVar("uiscale"));
-			if ( uiParentScale < uiScale ) then
-				uiScale = uiParentScale;
-			end
-		else
-			uiScale = uiParentScale;
-		end
-		listFrame:SetScale(uiScale);
-		
-		-- Hide the listframe anyways since it is redrawn OnShow() 
-		listFrame:Hide();
-		
-		-- Frame to anchor the dropdown menu to
-		local anchorFrame;
-
-		-- Display stuff
-		-- Level specific stuff
-		if ( level == 1 ) then	
-			Lib_UIDropDownMenuDelegate:SetAttribute("openmenu", dropDownFrame);
-			listFrame:ClearAllPoints();
-			-- If there's no specified anchorName then use left side of the dropdown menu
-			if ( not anchorName ) then
-				-- See if the anchor was set manually using setanchor
-				if ( dropDownFrame.xOffset ) then
-					xOffset = dropDownFrame.xOffset;
-				end
-				if ( dropDownFrame.yOffset ) then
-					yOffset = dropDownFrame.yOffset;
-				end
-				if ( dropDownFrame.point ) then
-					point = dropDownFrame.point;
-				end
-				if ( dropDownFrame.relativeTo ) then
-					relativeTo = dropDownFrame.relativeTo;
-				else
-					relativeTo = LIB_UIDROPDOWNMENU_OPEN_MENU:GetName().."Left";
-				end
-				if ( dropDownFrame.relativePoint ) then
-					relativePoint = dropDownFrame.relativePoint;
-				end
-			elseif ( anchorName == "cursor" ) then
-				relativeTo = nil;
-				local cursorX, cursorY = GetCursorPosition();
-				cursorX = cursorX/uiScale;
-				cursorY =  cursorY/uiScale;
-
-				if ( not xOffset ) then
-					xOffset = 0;
-				end
-				if ( not yOffset ) then
-					yOffset = 0;
-				end
-				xOffset = cursorX + xOffset;
-				yOffset = cursorY + yOffset;
-			else
-				-- See if the anchor was set manually using setanchor
-				if ( dropDownFrame.xOffset ) then
-					xOffset = dropDownFrame.xOffset;
-				end
-				if ( dropDownFrame.yOffset ) then
-					yOffset = dropDownFrame.yOffset;
-				end
-				if ( dropDownFrame.point ) then
-					point = dropDownFrame.point;
-				end
-				if ( dropDownFrame.relativeTo ) then
-					relativeTo = dropDownFrame.relativeTo;
-				else
-					relativeTo = anchorName;
-				end
-				if ( dropDownFrame.relativePoint ) then
-					relativePoint = dropDownFrame.relativePoint;
-				end
-			end
-			if ( not xOffset or not yOffset ) then
-				xOffset = 8;
-				yOffset = 22;
-			end
-			if ( not point ) then
-				point = "TOPLEFT";
-			end
-			if ( not relativePoint ) then
-				relativePoint = "BOTTOMLEFT";
-			end
-			listFrame:SetPoint(point, relativeTo, relativePoint, xOffset, yOffset);
-		else
-			if ( not dropDownFrame ) then
-				dropDownFrame = LIB_UIDROPDOWNMENU_OPEN_MENU;
-			end
-			listFrame:ClearAllPoints();
-			-- If this is a dropdown button, not the arrow anchor it to itself
-			local bname = button:GetParent():GetName()
-			if bname:match("^Lib_DropDownList%d+$") then
-				anchorFrame = button;
-			else
-				anchorFrame = button:GetParent();
-			end
-			point = "TOPLEFT";
-			relativePoint = "TOPRIGHT";
-			listFrame:SetPoint(point, anchorFrame, relativePoint, 0, 0);
-		end
-		
-		-- Change list box appearance depending on display mode
-		if ( dropDownFrame and dropDownFrame.displayMode == "MENU" ) then
-			_G[listFrameName.."Backdrop"]:Hide();
-			_G[listFrameName.."MenuBackdrop"]:Show();
-		else
-			_G[listFrameName.."Backdrop"]:Show();
-			_G[listFrameName.."MenuBackdrop"]:Hide();
-		end
-		dropDownFrame.menuList = menuList;
-		Lib_UIDropDownMenu_Initialize(dropDownFrame, dropDownFrame.initialize, nil, level, menuList);
-		-- If no items in the drop down don't show it
-		if ( listFrame.numButtons == 0 ) then
-			return;
-		end
-
-		-- Check to see if the dropdownlist is off the screen, if it is anchor it to the top of the dropdown button
-		listFrame:Show();
-		-- Hack since GetCenter() is returning coords relative to 1024x768
-		local x, y = listFrame:GetCenter();
-		-- Hack will fix this in next revision of dropdowns
-		if ( not x or not y ) then
-			listFrame:Hide();
-			return;
-		end
-
-		listFrame.onHide = dropDownFrame.onHide;
-		
-		
-		--  We just move level 1 enough to keep it on the screen. We don't necessarily change the anchors.
-		if ( level == 1 ) then
-			local offLeft = listFrame:GetLeft()/uiScale;
-			local offRight = (GetScreenWidth() - listFrame:GetRight())/uiScale;
-			local offTop = (GetScreenHeight() - listFrame:GetTop())/uiScale;
-			local offBottom = listFrame:GetBottom()/uiScale;
-			
-			local xAddOffset, yAddOffset = 0, 0;
-			if ( offLeft < 0 ) then
-				xAddOffset = -offLeft;
-			elseif ( offRight < 0 ) then
-				xAddOffset = offRight;
-			end
-			
-			if ( offTop < 0 ) then
-				yAddOffset = offTop;
-			elseif ( offBottom < 0 ) then
-				yAddOffset = -offBottom;
-			end
-			
-			listFrame:ClearAllPoints();
-			if ( anchorName == "cursor" ) then
-				listFrame:SetPoint(point, relativeTo, relativePoint, xOffset + xAddOffset, yOffset + yAddOffset);
-			else
-				listFrame:SetPoint(point, relativeTo, relativePoint, xOffset + xAddOffset, yOffset + yAddOffset);
-			end
-		else
-			-- Determine whether the menu is off the screen or not
-			local offscreenY, offscreenX;
-			if ( (y - listFrame:GetHeight()/2) < 0 ) then
-				offscreenY = 1;
-			end
-			if ( listFrame:GetRight() > GetScreenWidth() ) then
-				offscreenX = 1;	
-			end
-			if ( offscreenY and offscreenX ) then
-				point = gsub(point, "TOP(.*)", "BOTTOM%1");
-				point = gsub(point, "(.*)LEFT", "%1RIGHT");
-				relativePoint = gsub(relativePoint, "TOP(.*)", "BOTTOM%1");
-				relativePoint = gsub(relativePoint, "(.*)RIGHT", "%1LEFT");
-				xOffset = -11;
-				yOffset = -14;
-			elseif ( offscreenY ) then
-				point = gsub(point, "TOP(.*)", "BOTTOM%1");
-				relativePoint = gsub(relativePoint, "TOP(.*)", "BOTTOM%1");
-				xOffset = 0;
-				yOffset = -14;
-			elseif ( offscreenX ) then
-				point = gsub(point, "(.*)LEFT", "%1RIGHT");
-				relativePoint = gsub(relativePoint, "(.*)RIGHT", "%1LEFT");
-				xOffset = -11;
-				yOffset = 14;
-			else
-				xOffset = 0;
-				yOffset = 14;
-			end
-			
-			listFrame:ClearAllPoints();
-			listFrame.parentLevel = tonumber(strmatch(anchorFrame:GetName(), "Lib_DropDownList(%d+)"));
-			listFrame.parentID = anchorFrame:GetID();
-			listFrame:SetPoint(point, anchorFrame, relativePoint, xOffset, yOffset);
-		end
-
-		if ( autoHideDelay and tonumber(autoHideDelay)) then
-			listFrame.showTimer = autoHideDelay;
-			listFrame.isCounting = 1;
-		end
-	end
-end
-
-function Lib_CloseDropDownMenus(level)
-	if ( not level ) then
-		level = 1;
-	end
-	for i=level, LIB_UIDROPDOWNMENU_MAXLEVELS do
-		_G["Lib_DropDownList"..i]:Hide();
-	end
-end
-
-function Lib_UIDropDownMenu_OnHide(self)
-	local id = self:GetID()
-	if ( self.onHide ) then
-		self.onHide(id+1);
-		self.onHide = nil;
-	end
-	Lib_CloseDropDownMenus(id+1);
-	LIB_OPEN_DROPDOWNMENUS[id] = nil;
-	if (id == 1) then
-		LIB_UIDROPDOWNMENU_OPEN_MENU = nil;
-	end
-end
-
-function Lib_UIDropDownMenu_SetWidth(frame, width, padding)
-	_G[frame:GetName().."Middle"]:SetWidth(width);
-	local defaultPadding = 25;
-	if ( padding ) then
-		frame:SetWidth(width + padding);
-	else
-		frame:SetWidth(width + defaultPadding + defaultPadding);
-	end
-	if ( padding ) then
-		_G[frame:GetName().."Text"]:SetWidth(width);
-	else
-		_G[frame:GetName().."Text"]:SetWidth(width - defaultPadding);
-	end
-	frame.noResize = 1;
-end
-
-function Lib_UIDropDownMenu_SetButtonWidth(frame, width)
-	if ( width == "TEXT" ) then
-		width = _G[frame:GetName().."Text"]:GetWidth();
-	end
-	
-	_G[frame:GetName().."Button"]:SetWidth(width);
-	frame.noResize = 1;
-end
-
-function Lib_UIDropDownMenu_SetText(frame, text)
-	local filterText = _G[frame:GetName().."Text"];
-	filterText:SetText(text);
-end
-
-function Lib_UIDropDownMenu_GetText(frame)
-	local filterText = _G[frame:GetName().."Text"];
-	return filterText:GetText();
-end
-
-function Lib_UIDropDownMenu_ClearAll(frame)
-	-- Previous code refreshed the menu quite often and was a performance bottleneck
-	frame.selectedID = nil;
-	frame.selectedName = nil;
-	frame.selectedValue = nil;
-	Lib_UIDropDownMenu_SetText(frame, "");
-
-	local button, checkImage, uncheckImage;
-	for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-		button = _G["Lib_DropDownList"..LIB_UIDROPDOWNMENU_MENU_LEVEL.."Button"..i];
-		button:UnlockHighlight();
-
-		checkImage = _G["Lib_DropDownList"..LIB_UIDROPDOWNMENU_MENU_LEVEL.."Button"..i.."Check"];
-		checkImage:Hide();
-		uncheckImage = _G["Lib_DropDownList"..LIB_UIDROPDOWNMENU_MENU_LEVEL.."Button"..i.."UnCheck"];
-		uncheckImage:Hide();
-	end
-end
-
-function Lib_UIDropDownMenu_JustifyText(frame, justification)
-	local text = _G[frame:GetName().."Text"];
-	text:ClearAllPoints();
-	if ( justification == "LEFT" ) then
-		text:SetPoint("LEFT", frame:GetName().."Left", "LEFT", 27, 2);
-		text:SetJustifyH("LEFT");
-	elseif ( justification == "RIGHT" ) then
-		text:SetPoint("RIGHT", frame:GetName().."Right", "RIGHT", -43, 2);
-		text:SetJustifyH("RIGHT");
-	elseif ( justification == "CENTER" ) then
-		text:SetPoint("CENTER", frame:GetName().."Middle", "CENTER", -5, 2);
-		text:SetJustifyH("CENTER");
-	end
-end
-
-function Lib_UIDropDownMenu_SetAnchor(dropdown, xOffset, yOffset, point, relativeTo, relativePoint)
-	dropdown.xOffset = xOffset;
-	dropdown.yOffset = yOffset;
-	dropdown.point = point;
-	dropdown.relativeTo = relativeTo;
-	dropdown.relativePoint = relativePoint;
-end
-
-function Lib_UIDropDownMenu_GetCurrentDropDown()
-	if ( LIB_UIDROPDOWNMENU_OPEN_MENU ) then
-		return LIB_UIDROPDOWNMENU_OPEN_MENU;
-	elseif ( LIB_UIDROPDOWNMENU_INIT_MENU ) then
-		return LIB_UIDROPDOWNMENU_INIT_MENU;
-	end
-end
-
-function Lib_UIDropDownMenuButton_GetChecked(self)
-	return _G[self:GetName().."Check"]:IsShown();
-end
-
-function Lib_UIDropDownMenuButton_GetName(self)
-	return _G[self:GetName().."NormalText"]:GetText();
-end
-
-function Lib_UIDropDownMenuButton_OpenColorPicker(self, button)
-	CloseMenus();
-	if ( not button ) then
-		button = self;
-	end
-	LIB_UIDROPDOWNMENU_MENU_VALUE = button.value;
-	OpenColorPicker(button); --remains shared through color picker frame
-end
-
-function Lib_UIDropDownMenu_DisableButton(level, id)
-	_G["Lib_DropDownList"..level.."Button"..id]:Disable();
-end
-
-function Lib_UIDropDownMenu_EnableButton(level, id)
-	_G["Lib_DropDownList"..level.."Button"..id]:Enable();
-end
-
-function Lib_UIDropDownMenu_SetButtonText(level, id, text, colorCode)
-	local button = _G["Lib_DropDownList"..level.."Button"..id];
-	if ( colorCode) then
-		button:SetText(colorCode..text.."|r");
-	else
-		button:SetText(text);
-	end
-end
-
-function Lib_UIDropDownMenu_SetButtonNotClickable(level, id)
-	_G["Lib_DropDownList"..level.."Button"..id]:SetDisabledFontObject(GameFontHighlightSmallLeft);
-end
-
-function Lib_UIDropDownMenu_SetButtonClickable(level, id)
-	_G["Lib_DropDownList"..level.."Button"..id]:SetDisabledFontObject(GameFontDisableSmallLeft);
-end
-
-function Lib_UIDropDownMenu_DisableDropDown(dropDown)
-	local label = _G[dropDown:GetName().."Label"];
-	if ( label ) then
-		label:SetVertexColor(GRAY_FONT_COLOR.r, GRAY_FONT_COLOR.g, GRAY_FONT_COLOR.b);
-	end
-	_G[dropDown:GetName().."Text"]:SetVertexColor(GRAY_FONT_COLOR.r, GRAY_FONT_COLOR.g, GRAY_FONT_COLOR.b);
-	_G[dropDown:GetName().."Button"]:Disable();
-	dropDown.isDisabled = 1;
-end
-
-function Lib_UIDropDownMenu_EnableDropDown(dropDown)
-	local label = _G[dropDown:GetName().."Label"];
-	if ( label ) then
-		label:SetVertexColor(NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b);
-	end
-	_G[dropDown:GetName().."Text"]:SetVertexColor(HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b);
-	_G[dropDown:GetName().."Button"]:Enable();
-	dropDown.isDisabled = nil;
-end
-
-function Lib_UIDropDownMenu_IsEnabled(dropDown)
-	return not dropDown.isDisabled;
-end
-
-function Lib_UIDropDownMenu_GetValue(id)
-	--Only works if the dropdown has just been initialized, lame, I know =(
-	local button = _G["DropDownList1Button"..id];
-	if ( button ) then
-		return _G["DropDownList1Button"..id].value;
-	else
-		return nil;
-	end
-end
-
---[[function OpenColorPicker(info) ColorPicker stuff not changed
-	ColorPickerFrame.func = info.swatchFunc;
-	ColorPickerFrame.hasOpacity = info.hasOpacity;
-	ColorPickerFrame.opacityFunc = info.opacityFunc;
-	ColorPickerFrame.opacity = info.opacity;
-	ColorPickerFrame.previousValues = {r = info.r, g = info.g, b = info.b, opacity = info.opacity};
-	ColorPickerFrame.cancelFunc = info.cancelFunc;
-	ColorPickerFrame.extraInfo = info.extraInfo;
-	-- This must come last, since it triggers a call to ColorPickerFrame.func()
-	ColorPickerFrame:SetColorRGB(info.r, info.g, info.b);
-	ShowUIPanel(ColorPickerFrame);
-end
-
-function ColorPicker_GetPreviousValues()
-	return ColorPickerFrame.previousValues.r, ColorPickerFrame.previousValues.g, ColorPickerFrame.previousValues.b;
-end]]
\ No newline at end of file
diff --git a/Libraries/DropDownMenu/UIDropDownMenuTemplates.xml b/Libraries/DropDownMenu/UIDropDownMenuTemplates.xml
deleted file mode 100644
index 4090f4c..0000000
--- a/Libraries/DropDownMenu/UIDropDownMenuTemplates.xml
+++ /dev/null
@@ -1,413 +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">
-	<Button name="Lib_UIDropDownMenuButtonTemplate" virtual="true">
-		<Size x="100" y="16"/>
-		<Layers>
-			<Layer level="BACKGROUND">
-				<Texture name="$parentHighlight" file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD" setAllPoints="true" hidden="true"/>
-			</Layer>
-			<Layer level="ARTWORK">
-				<Texture name="$parentCheck" file="Interface\Common\UI-DropDownRadioChecks">
-					<Size x="16" y="16"/>
-					<Anchors>
-						<Anchor point="LEFT">
-							<Offset x="0" y="0"/>
-						</Anchor>
-					</Anchors>
-					<TexCoords left="0" right="0.5" top="0.5" bottom="1.0"/>
-				</Texture>
-				<Texture name="$parentUnCheck" file="Interface\Common\UI-DropDownRadioChecks">
-					<Size x="16" y="16"/>
-					<Anchors>
-						<Anchor point="LEFT">
-							<Offset x="0" y="0"/>
-						</Anchor>
-					</Anchors>
-					<TexCoords left="0.5" right="1.0" top="0.5" bottom="1.0"/>
-				</Texture>
-				<Texture name="$parentIcon" hidden="true">
-					<Size>
-						<AbsDimension x="16" y="16"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT">
-							<Offset x="0" y="0"/>
-						</Anchor>
-					</Anchors>
-				</Texture>
-			</Layer>
-		</Layers>
-		<Frames>
-			<Button name="$parentColorSwatch" hidden="true">
-				<Size>
-					<AbsDimension x="16" y="16"/>
-				</Size>
-				<Anchors>
-					<Anchor point="RIGHT">
-						<Offset>
-							<AbsDimension x="-6" y="0"/>
-						</Offset>
-					</Anchor>
-				</Anchors>
-				<Layers>
-					<Layer level="BACKGROUND">
-						<Texture name="$parentSwatchBg">
-							<Size>
-								<AbsDimension x="14" y="14"/>
-							</Size>
-							<Anchors>
-								<Anchor point="CENTER">
-									<Offset>
-										<AbsDimension x="0" y="0"/>
-									</Offset>
-								</Anchor>
-							</Anchors>
-							<Color r="1.0" g="1.0" b="1.0"/>
-						</Texture>
-					</Layer>
-				</Layers>
-				<Scripts>
-					<OnClick>
-						CloseMenus();
-						Lib_UIDropDownMenuButton_OpenColorPicker(self:GetParent());
-					</OnClick>
-					<OnEnter>
-						Lib_CloseDropDownMenus(self:GetParent():GetParent():GetID() + 1);
-						_G[self:GetName().."SwatchBg"]:SetVertexColor(NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b);
-						Lib_UIDropDownMenu_StopCounting(self:GetParent():GetParent());
-					</OnEnter>
-					<OnLeave>
-						_G[self:GetName().."SwatchBg"]:SetVertexColor(HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b);
-						Lib_UIDropDownMenu_StartCounting(self:GetParent():GetParent());
-					</OnLeave>
-				</Scripts>
-				<NormalTexture name="$parentNormalTexture" file="Interface\ChatFrame\ChatFrameColorSwatch"/>
-			</Button>
-			<Button name="$parentExpandArrow" hidden="true">
-				<Size>
-					<AbsDimension x="16" y="16"/>
-				</Size>
-				<Anchors>
-					<Anchor point="RIGHT">
-						<Offset>
-							<AbsDimension x="0" y="0"/>
-						</Offset>
-					</Anchor>                   
-				</Anchors>
-				<Scripts>
-					<OnClick>
-						Lib_ToggleDropDownMenu(self:GetParent():GetParent():GetID() + 1, self:GetParent().value, nil, nil, nil, nil, self:GetParent().menuList, self);
-					</OnClick>
-					<OnEnter>
-						local level =  self:GetParent():GetParent():GetID() + 1;
-						local listFrame = _G["Lib_DropDownList"..level];
-						if ( not listFrame or not listFrame:IsShown() or select(2, listFrame:GetPoint()) ~= self ) then
-							Lib_ToggleDropDownMenu(level, self:GetParent().value, nil, nil, nil, nil, self:GetParent().menuList, self);
-						end
-						Lib_UIDropDownMenu_StopCounting(self:GetParent():GetParent());
-					</OnEnter>
-					<OnLeave>
-						Lib_UIDropDownMenu_StartCounting(self:GetParent():GetParent());
-					</OnLeave>
-				</Scripts>
-				<NormalTexture file="Interface\ChatFrame\ChatFrameExpandArrow"/>
-			</Button>
-			<Button name="$parentInvisibleButton" hidden="true" parentKey="invisibleButton">
-				<Anchors>
-					<Anchor point="TOPLEFT"/>
-					<Anchor point="BOTTOMLEFT"/>
-					<Anchor point="RIGHT" relativeTo="$parentColorSwatch" relativePoint="LEFT">
-						<Offset>
-							<AbsDimension x="0" y="0"/>
-						</Offset>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnEnter>
-						Lib_UIDropDownMenu_StopCounting(self:GetParent():GetParent());
-						Lib_CloseDropDownMenus(self:GetParent():GetParent():GetID() + 1);
-						local parent = self:GetParent();
-						if ( parent.tooltipTitle and parent.tooltipWhileDisabled) then
-							if ( parent.tooltipOnButton ) then
-								GameTooltip:SetOwner(parent, "ANCHOR_RIGHT");
-								GameTooltip:AddLine(parent.tooltipTitle, 1.0, 1.0, 1.0);
-								GameTooltip:AddLine(parent.tooltipText, nil, nil, nil, true);
-								GameTooltip:Show();
-							else
-								GameTooltip_AddNewbieTip(parent, parent.tooltipTitle, 1.0, 1.0, 1.0, parent.tooltipText, 1);
-							end
-						end
-					</OnEnter>
-					<OnLeave>
-						Lib_UIDropDownMenu_StartCounting(self:GetParent():GetParent());
-						GameTooltip:Hide();
-					</OnLeave>
-				</Scripts>
-			</Button>
-		</Frames>
-		<Scripts>
-			<OnLoad>				
-				self:SetFrameLevel(self:GetParent():GetFrameLevel()+2);
-			</OnLoad>
-			<OnClick>
-				Lib_UIDropDownMenuButton_OnClick(self, button, down);
-			</OnClick>
-			<OnEnter>
-				if ( self.hasArrow ) then
-					local level =  self:GetParent():GetID() + 1;
-					local listFrame = _G["Lib_DropDownList"..level];
-					if ( not listFrame or not listFrame:IsShown() or select(2, listFrame:GetPoint()) ~= self ) then
-						Lib_ToggleDropDownMenu(self:GetParent():GetID() + 1, self.value, nil, nil, nil, nil, self.menuList, self);
-					end
-				else
-					Lib_CloseDropDownMenus(self:GetParent():GetID() + 1);
-				end
-				_G[self:GetName().."Highlight"]:Show();
-				Lib_UIDropDownMenu_StopCounting(self:GetParent());
-				if ( self.tooltipTitle ) then
-					if ( self.tooltipOnButton ) then
-						GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-						GameTooltip:AddLine(self.tooltipTitle, 1.0, 1.0, 1.0);
-						GameTooltip:AddLine(self.tooltipText, nil, nil, nil, true);
-						GameTooltip:Show();
-					else
-						GameTooltip_AddNewbieTip(self, self.tooltipTitle, 1.0, 1.0, 1.0, self.tooltipText, 1);
-					end
-				end
-			</OnEnter>
-			<OnLeave>
-				_G[self:GetName().."Highlight"]:Hide();
-				Lib_UIDropDownMenu_StartCounting(self:GetParent());
-				GameTooltip:Hide();
-			</OnLeave>
-			<OnEnable>
-				self.invisibleButton:Hide();
-			</OnEnable>
-			<OnDisable>
-				self.invisibleButton:Show();
-			</OnDisable>
-		</Scripts>
-		<ButtonText name="$parentNormalText">
-			<Anchors>
-				<Anchor point="LEFT">
-					<Offset x="-5" y="0"/>
-				</Anchor>
-			</Anchors>
-		</ButtonText>
-		<NormalFont style="GameFontHighlightSmallLeft"/>
-		<HighlightFont style="GameFontHighlightSmallLeft"/>
-		<DisabledFont style="GameFontDisableSmallLeft"/>
-	</Button>
-	
-	<Button name="Lib_UIDropDownListTemplate" hidden="true" frameStrata="DIALOG" enableMouse="true" virtual="true">
-		<Frames>
-			<Frame name="$parentBackdrop" setAllPoints="true">
-				<Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background-Dark" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="true">
-					<BackgroundInsets>
-						<AbsInset left="11" right="12" top="12" bottom="9"/>
-					</BackgroundInsets>
-					<TileSize>
-						<AbsValue val="32"/>
-					</TileSize>
-					<EdgeSize>
-						<AbsValue val="32"/>
-					</EdgeSize>
-				</Backdrop>
-			</Frame>
-			<Frame name="$parentMenuBackdrop" setAllPoints="true">
-				<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
-					<EdgeSize>
-						<AbsValue val="16"/>
-					</EdgeSize>
-					<TileSize>
-						<AbsValue val="16"/>
-					</TileSize>
-					<BackgroundInsets>
-						<AbsInset left="5" right="5" top="5" bottom="4"/>
-					</BackgroundInsets>
-				</Backdrop>
-				<Scripts>
-					<OnLoad>
-						self:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b);
-						self:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b);
-					</OnLoad>
-				</Scripts>
-			</Frame>
-			<Button name="$parentButton1" inherits="Lib_UIDropDownMenuButtonTemplate" id="1"/>
-			<Button name="$parentButton2" inherits="Lib_UIDropDownMenuButtonTemplate" id="2"/>
-			<Button name="$parentButton3" inherits="Lib_UIDropDownMenuButtonTemplate" id="3"/>
-			<Button name="$parentButton4" inherits="Lib_UIDropDownMenuButtonTemplate" id="4"/>
-			<Button name="$parentButton5" inherits="Lib_UIDropDownMenuButtonTemplate" id="5"/>
-			<Button name="$parentButton6" inherits="Lib_UIDropDownMenuButtonTemplate" id="6"/>
-			<Button name="$parentButton7" inherits="Lib_UIDropDownMenuButtonTemplate" id="7"/>
-			<Button name="$parentButton8" inherits="Lib_UIDropDownMenuButtonTemplate" id="8"/>
-		</Frames>
-		<Scripts>
-			<OnClick>
-				self:Hide();
-			</OnClick>
-			<OnEnter>
-				Lib_UIDropDownMenu_StopCounting(self, motion);
-			</OnEnter>
-			<OnLeave>
-				Lib_UIDropDownMenu_StartCounting(self, motion);
-			</OnLeave>
-			<OnUpdate>
-				Lib_UIDropDownMenu_OnUpdate(self, elapsed);
-			</OnUpdate>
-			<OnShow>
-				for i=1, LIB_UIDROPDOWNMENU_MAXBUTTONS do
-					if (not self.noResize) then
-						_G[self:GetName().."Button"..i]:SetWidth(self.maxWidth);
-					end
-				end
-				if (not self.noResize) then
-					self:SetWidth(self.maxWidth+25);
-				end
-				self.showTimer = nil;
-				if ( self:GetID() > 1 ) then
-					self.parent = _G["Lib_DropDownList"..(self:GetID() - 1)];
-				end
-			</OnShow>
-			<OnHide>
-				Lib_UIDropDownMenu_OnHide(self);
-			</OnHide>
-		</Scripts>
-	</Button>
-	
-	<Frame name="Lib_UIDropDownMenuTemplate" virtual="true">
-		<Size>
-			<AbsDimension x="40" y="32"/>
-		</Size>
-		<Layers>
-			<Layer level="ARTWORK">
-				<Texture name="$parentLeft" file="Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame">
-					<Size>
-						<AbsDimension x="25" y="64"/>
-					</Size>
-					<Anchors>
-						<Anchor point="TOPLEFT">
-							<Offset>
-								<AbsDimension x="0" y="17"/>
-							</Offset>
-						</Anchor>
-					</Anchors>
-					<TexCoords left="0" right="0.1953125" top="0" bottom="1"/>
-				</Texture>
-				<Texture name="$parentMiddle" file="Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame">
-					<Size>
-						<AbsDimension x="115" y="64"/>
-					</Size>
-					<Anchors>
-						<Anchor point="LEFT" relativeTo="$parentLeft" relativePoint="RIGHT"/>
-					</Anchors>
-					<TexCoords left="0.1953125" right="0.8046875" top="0" bottom="1"/>
-				</Texture>
-				<Texture name="$parentRight" file="Interface\Glues\CharacterCreate\CharacterCreate-LabelFrame">
-					<Size>
-						<AbsDimension x="25" y="64"/>
-					</Size>
-					<Anchors>
-						<Anchor point="LEFT" relativeTo="$parentMiddle" relativePoint="RIGHT"/>
-					</Anchors>
-					<TexCoords left="0.8046875" right="1" top="0" bottom="1"/>
-				</Texture>
-				<FontString parentKey="Text" name="$parentText" inherits="GameFontHighlightSmall" wordwrap="false" justifyH="RIGHT">
-					<Size>
-						<AbsDimension x="0" y="10"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT" relativeTo="$parentRight">
-							<Offset>
-								<AbsDimension x="-43" y="2"/>
-							</Offset>
-						</Anchor>
-					</Anchors>
-				</FontString>
-			</Layer>
-			<Layer level="OVERLAY">
-				<Texture parentKey="Icon" name="$parentIcon" hidden="true">
-					<Size>
-						<AbsDimension x="16" y="16"/>
-					</Size>
-					<Anchors>
-						<Anchor point="LEFT">
-							<Offset x="30" y="2"/>
-						</Anchor>
-					</Anchors>
-				</Texture>
-			</Layer>
-		</Layers>
-		<Frames>
-			<Button parentKey="Button" name="$parentButton" motionScriptsWhileDisabled="true" >
-				<Size>
-					<AbsDimension x="24" y="24"/>
-				</Size>
-				<Anchors>
-					<Anchor point="TOPRIGHT" relativeTo="$parentRight">
-						<Offset>
-							<AbsDimension x="-16" y="-18"/>
-						</Offset>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnEnter>
-						local parent = self:GetParent();
-						local myscript = parent:GetScript("OnEnter");
-						if(myscript ~= nil) then
-							myscript(parent);
-						end
-					</OnEnter>
-					<OnLeave>
-						local parent = self:GetParent();
-						local myscript = parent:GetScript("OnLeave");
-						if(myscript ~= nil) then
-							myscript(parent);
-						end
-					</OnLeave>
-					<OnClick>
-						Lib_ToggleDropDownMenu(nil, nil, self:GetParent());
-						PlaySound("igMainMenuOptionCheckBoxOn");
-					</OnClick>
-				</Scripts>
-				<NormalTexture name="$parentNormalTexture" file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Up">
-					<Size>
-						<AbsDimension x="24" y="24"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT"/>
-					</Anchors>
-				</NormalTexture>
-				<PushedTexture name="$parentPushedTexture" file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Down">
-					<Size>
-						<AbsDimension x="24" y="24"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT"/>
-					</Anchors>
-				</PushedTexture>
-				<DisabledTexture name="$parentDisabledTexture" file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Disabled">
-					<Size>
-						<AbsDimension x="24" y="24"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT"/>
-					</Anchors>
-				</DisabledTexture>
-				<HighlightTexture name="$parentHighlightTexture" file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD">
-					<Size>
-						<AbsDimension x="24" y="24"/>
-					</Size>
-					<Anchors>
-						<Anchor point="RIGHT"/>
-					</Anchors>
-				</HighlightTexture>
-			</Button>
-		</Frames>
-		<Scripts>
-			<OnHide>
-				Lib_CloseDropDownMenus();
-			</OnHide>
-		</Scripts>
-	</Frame>
-</Ui>
diff --git a/Libraries/DropDownMenu/readme.txt b/Libraries/DropDownMenu/readme.txt
deleted file mode 100644
index bfc8b05..0000000
--- a/Libraries/DropDownMenu/readme.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Standard UIDropDownMenu global functions using protected frames and causing taints when used by third-party addons. But it is possible to avoid taints by using same functionality with that library.
-
-== What is it ==
-Library is standard code from Blizzard's files EasyMenu.lua, UIDropDownMenu.lua and UIDropDownMenuTemplates.xml with frames, tables, variables and functions renamed to:
-* constants (typed with all CAPS): "LIB_" added at the start
-* functions: "Lib_" added at the start
-
-== Constants ==
-* LIB_UIDROPDOWNMENU_MINBUTTONS
-* LIB_UIDROPDOWNMENU_MAXBUTTONS
-* LIB_UIDROPDOWNMENU_MAXLEVELS
-* LIB_UIDROPDOWNMENU_BUTTON_HEIGHT
-* LIB_UIDROPDOWNMENU_BORDER_HEIGHT
-* LIB_UIDROPDOWNMENU_OPEN_MENU
-* LIB_UIDROPDOWNMENU_INIT_MENU
-* LIB_UIDROPDOWNMENU_MENU_LEVEL
-* LIB_UIDROPDOWNMENU_MENU_VALUE
-* LIB_UIDROPDOWNMENU_SHOW_TIME
-* LIB_UIDROPDOWNMENU_DEFAULT_TEXT_HEIGHT
-* LIB_OPEN_DROPDOWNMENUS
-
-== Functions ==
-* Lib_EasyMenu
-* Lib_EasyMenu_Initialize
-
-* Lib_UIDropDownMenuDelegate_OnAttributeChanged
-* Lib_UIDropDownMenu_InitializeHelper
-* Lib_UIDropDownMenu_Initialize
-* Lib_UIDropDownMenu_OnUpdate
-* Lib_UIDropDownMenu_StartCounting
-* Lib_UIDropDownMenu_StopCounting
-* Lib_UIDropDownMenu_CreateInfo
-* Lib_UIDropDownMenu_CreateFrames
-* Lib_UIDropDownMenu_AddButton
-* Lib_UIDropDownMenu_Refresh
-* Lib_UIDropDownMenu_RefreshAll
-* Lib_UIDropDownMenu_SetIconImage
-* Lib_UIDropDownMenu_SetSelectedName
-* Lib_UIDropDownMenu_SetSelectedValue
-* Lib_UIDropDownMenu_SetSelectedID
-* Lib_UIDropDownMenu_GetSelectedName
-* Lib_UIDropDownMenu_GetSelectedID
-* Lib_UIDropDownMenu_GetSelectedValue
-* Lib_UIDropDownMenuButton_OnClick
-* Lib_HideDropDownMenu
-* Lib_ToggleDropDownMenu
-* Lib_CloseDropDownMenus
-* Lib_UIDropDownMenu_OnHide
-* Lib_UIDropDownMenu_SetWidth
-* Lib_UIDropDownMenu_SetButtonWidth
-* Lib_UIDropDownMenu_SetText
-* Lib_UIDropDownMenu_GetText
-* Lib_UIDropDownMenu_ClearAll
-* Lib_UIDropDownMenu_JustifyText
-* Lib_UIDropDownMenu_SetAnchor
-* Lib_UIDropDownMenu_GetCurrentDropDown
-* Lib_UIDropDownMenuButton_GetChecked
-* Lib_UIDropDownMenuButton_GetName
-* Lib_UIDropDownMenuButton_OpenColorPicker
-* Lib_UIDropDownMenu_DisableButton
-* Lib_UIDropDownMenu_EnableButton
-* Lib_UIDropDownMenu_SetButtonText
-* Lib_UIDropDownMenu_DisableDropDown
-* Lib_UIDropDownMenu_EnableDropDown
-* Lib_UIDropDownMenu_IsEnabled
-* Lib_UIDropDownMenu_GetValue
-
-== How to use it ==
-
-* Add it to your toc. 
-* Like ordinal code for UIDropDownMenu with "Lib_" instead.
\ No newline at end of file
diff --git a/Libraries/Load_Libraries.xml b/Libraries/Load_Libraries.xml
index ee69f1e..7ff58a9 100644
--- a/Libraries/Load_Libraries.xml
+++ b/Libraries/Load_Libraries.xml
@@ -24,5 +24,4 @@
 	<Include file="LibCompress\lib.xml"/>
 	<Include file="LibBase64-1.0\lib.xml"/>
 	<Script file="LibAnim\LibAnim.lua"/>
-	<Include file="DropDownMenu\DropDownMenu.xml"/>
 </Ui>
diff --git a/Locale/frFR.lua b/Locale/frFR.lua
index 0b793b8..baae3b4 100644
--- a/Locale/frFR.lua
+++ b/Locale/frFR.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
diff --git a/Locale/usEN.lua b/Locale/usEN.lua
index 98898f0..dd665fa 100644
--- a/Locale/usEN.lua
+++ b/Locale/usEN.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
diff --git a/Media/Font/Consola.ttf b/Media/Font/Consola.ttf
new file mode 100644
index 0000000..e881ca4
Binary files /dev/null and b/Media/Font/Consola.ttf differ
diff --git a/Media/Font/Verdana.ttf b/Media/Font/Verdana.ttf
new file mode 100644
index 0000000..9a34997
Binary files /dev/null and b/Media/Font/Verdana.ttf differ
diff --git a/MxW.toc b/MxW.toc
index 3eb42a7..f4e5e37 100644
--- a/MxW.toc
+++ b/MxW.toc
@@ -1,10 +1,10 @@
-## Interface: 80100
+## Interface: 90001
 ## Title: |cff1784d1MxW|r
-## Version: 1.7.0_8.1.5
+## Version: 1.10.0_9.0.1
 ## Author: mikx
 ## Notes: MxW Addon
-## RequiredDeps: TradeSkillMaster
-## SavedVariables: MxWDB,DayCounter,DailyRecord,DailyRecordFlag,DailyTen,DailyTwenty,DailyThirty,DailyForty,DailyFifty,DailySixty,DailySeventy,DailyEighty,DailyNinety,DailyHundred,CurrentGold,Settings_Alert_Enabled,Settings_GuildMessage_Enabled,Farmer_Money_MonthBack,Farmer_Logic_Day,Farmer_Logic_MinUI,Farmer_Logic_MinAlert,Farmer_Money_MonthGlobal,Farmer_Money_DayGlobal
+## RequiredDeps: TradeSkillMaster,AddOnSkins
+## SavedVariables: MxWDB,DayCounter,DailyRecord,DailyRecordFlag,DailyTen,DailyTwenty,DailyThirty,DailyForty,DailyFifty,DailySixty,DailySeventy,DailyEighty,DailyNinety,DailyHundred,CurrentGold,Settings_Alert_Enabled,Settings_GuildMessage_Enabled,Farmer_Money_MonthBack,Farmer_Logic_Day,Farmer_Logic_MinUI,Farmer_Logic_MinAlert,Farmer_Money_MonthGlobal,Farmer_Money_DayGlobal,Farmer_Money_LootSession
 
 Libraries\Load_Libraries.xml
 Locale\Load_Locales.xml
diff --git a/init.lua b/init.lua
index 752b5c1..0f5e41c 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 -- MxW (MxW Addon)
 -- By mikx
--- https://git.mikx.xyz/wow/MxW_Addon
+-- https://git.mikx.xyz/mikx/MxW_Addon
 -- Licensed under the GNU General Public License 3.0
 -- See included License file for more informations.
 
@@ -8,7 +8,7 @@ local MX = LibStub("AceAddon-3.0"):NewAddon("MxW", "AceConsole-3.0", "AceEvent-3
 local L = LibStub("AceLocale-3.0"):GetLocale("MxW");
 local AceGUI = LibStub("AceGUI-3.0")
 
-local date = C_Calendar.GetDate();
+local date = C_DateAndTime.GetCurrentCalendarTime();
 local weekday, month, day, year = date.weekday, date.month, date.monthDay, date.year;
 
 local MXLDB = LibStub("LibDataBroker-1.1"):NewDataObject("MxW", {
@@ -40,6 +40,9 @@ function MX:OnInitialize()
 	if (Farmer_Money_MonthGlobal == nil) then
 	  Farmer_Money_MonthGlobal = 0;
 	end
+	if (Farmer_Money_LootSession == nil) then
+	  Farmer_Money_LootSession = 0;
+	end
 	if (Farmer_Logic_MinUI == nil) then
 	  Farmer_Logic_MinUI = 500000; -- 50 golds
 	end
@@ -138,9 +141,12 @@ local function MyAddonCommands(msg, editbox)
 			DailyRecordFlag = false;
 			ReloadUI();
 		end
-	elseif (msg == 'resetd') then
+	elseif (msg == 'resetd' or msg == 'resetday') then
 		Farmer_Money_DayGlobal = 0;
 		ReloadUI();
+	elseif (msg == 'resetl' or msg == 'resetloot') then
+		Farmer_Money_LootSession = 0;
+		ReloadUI();
 	elseif (msg == 'alert') then
 		if (Settings_Alert_Enabled) then
 			Settings_Alert_Enabled = false;