Quantcast

taintlog parse and clean stage 3

Steven Jackson [10-10-14 - 00:54]
taintlog parse and clean stage 3
Filename
Interface/AddOns/SVUI/SVUI.lua
Interface/AddOns/SVUI/docs/schema.lua
Interface/AddOns/SVUI/language/chinese_ui.lua
Interface/AddOns/SVUI/language/english_ui.lua
Interface/AddOns/SVUI/language/french_ui.lua
Interface/AddOns/SVUI/language/german_ui.lua
Interface/AddOns/SVUI/language/italian_ui.lua
Interface/AddOns/SVUI/language/korean_ui.lua
Interface/AddOns/SVUI/language/portuguese_ui.lua
Interface/AddOns/SVUI/language/russian_ui.lua
Interface/AddOns/SVUI/language/spanish_ui.lua
Interface/AddOns/SVUI/language/taiwanese_ui.lua
Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
Interface/AddOns/SVUI/packages/bag/SVBag.lua
Interface/AddOns/SVUI/packages/chat/SVChat.lua
Interface/AddOns/SVUI/packages/override/SVOverride.lua
Interface/AddOns/SVUI/packages/stats/SVStats.lua
Interface/AddOns/SVUI/packages/tip/SVTip.lua
Interface/AddOns/SVUI/scripts/ego.lua
Interface/AddOns/SVUI/scripts/questwatch.lua
Interface/AddOns/SVUI/scripts/spellbind.lua
Interface/AddOns/SVUI/setup/installer.lua
Interface/AddOns/SVUI/setup/presets.lua
Interface/AddOns/SVUI/system/alerts.lua
Interface/AddOns/SVUI/system/load.lua
Interface/AddOns/SVUI/system/media.lua
Interface/AddOns/SVUI/system/slash.lua
Interface/AddOns/SVUI_ChatOMatic/Loader.lua
Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua
Interface/AddOns/SVUI_ConfigOMatic/components/profiles.lua
Interface/AddOns/SVUI_CraftOMatic/Loader.lua
Interface/AddOns/SVUI_FightOMatic/Loader.lua
Interface/AddOns/SVUI_LogOMatic/Loader.lua
Interface/AddOns/SVUI_StyleOMatic/Loader.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua
Interface/AddOns/SVUI_TrackOMatic/Loader.lua
diff --git a/Interface/AddOns/SVUI/SVUI.lua b/Interface/AddOns/SVUI/SVUI.lua
index d2ef83f..f17e95e 100644
--- a/Interface/AddOns/SVUI/SVUI.lua
+++ b/Interface/AddOns/SVUI/SVUI.lua
@@ -73,13 +73,13 @@ _G.BINDING_NAME_SVUI_MARKERS = "Raid Markers";
 _G.BINDING_NAME_SVUI_DOCKS = "Toggle Docks";
 _G.BINDING_NAME_SVUI_RIDE = "Let's Ride";

+_G.SlashCmdList.RELOADUI = ReloadUI
 _G.SLASH_RELOADUI1 = "/rl"
 _G.SLASH_RELOADUI2 = "/reloadui"
-_G.SlashCmdList.RELOADUI = ReloadUI

 --[[ GET THE REGISTRY LIB ]]--

-local SVLib = LibSuperVillain;
+local SVLib = _G.LibSuperVillain;

 --[[ LOCALS ]]--

@@ -125,9 +125,13 @@ end

 --[[ BUILD CLASS COLOR GLOBAL ]]--

-_G.SVUI_CLASS_COLORS = {};
+local SVUI_CLASS_COLORS;

 do
+    local env = getfenv(0)
+    env.SVUI_CLASS_COLORS = {}
+    SVUI_CLASS_COLORS = env.SVUI_CLASS_COLORS
+
     local classes = {};
     local supercolors = {
         ["HUNTER"]        = { r = 0.454, g = 0.698, b = 0 },
diff --git a/Interface/AddOns/SVUI/docs/schema.lua b/Interface/AddOns/SVUI/docs/schema.lua
index 61dffa4..fdf841f 100644
--- a/Interface/AddOns/SVUI/docs/schema.lua
+++ b/Interface/AddOns/SVUI/docs/schema.lua
@@ -42,7 +42,7 @@ S U P E R - V I L L A I N - U I   By: Munglunch                              #

 ]]--

-local lib = LibSuperVillain
+local lib = _G.LibSuperVillain
 local PKG = {};

 --Here you would build your package object, then...
diff --git a/Interface/AddOns/SVUI/language/chinese_ui.lua b/Interface/AddOns/SVUI/language/chinese_ui.lua
index 6ce4bc7..53efbcc 100644
--- a/Interface/AddOns/SVUI/language/chinese_ui.lua
+++ b/Interface/AddOns/SVUI/language/chinese_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("zhCN");
+local L = _G.LibSuperVillain:Lang("zhCN");
 if not L then return end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/english_ui.lua b/Interface/AddOns/SVUI/language/english_ui.lua
index fdff64a..9211ac5 100644
--- a/Interface/AddOns/SVUI/language/english_ui.lua
+++ b/Interface/AddOns/SVUI/language/english_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("enUS", true);
+local L = _G.LibSuperVillain:Lang("enUS", true);
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/french_ui.lua b/Interface/AddOns/SVUI/language/french_ui.lua
index 5767ed6..6dd382c 100644
--- a/Interface/AddOns/SVUI/language/french_ui.lua
+++ b/Interface/AddOns/SVUI/language/french_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("frFR");
+local L = _G.LibSuperVillain:Lang("frFR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/german_ui.lua b/Interface/AddOns/SVUI/language/german_ui.lua
index 1b597e7..6cadd3a 100644
--- a/Interface/AddOns/SVUI/language/german_ui.lua
+++ b/Interface/AddOns/SVUI/language/german_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("deDE");
+local L = _G.LibSuperVillain:Lang("deDE");
 if not L then return end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/italian_ui.lua b/Interface/AddOns/SVUI/language/italian_ui.lua
index 09c14a2..1a993cd 100644
--- a/Interface/AddOns/SVUI/language/italian_ui.lua
+++ b/Interface/AddOns/SVUI/language/italian_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("itIT");
+local L = _G.LibSuperVillain:Lang("itIT");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/korean_ui.lua b/Interface/AddOns/SVUI/language/korean_ui.lua
index 5fb983b..d0c5665 100644
--- a/Interface/AddOns/SVUI/language/korean_ui.lua
+++ b/Interface/AddOns/SVUI/language/korean_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("koKR");
+local L = _G.LibSuperVillain:Lang("koKR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/portuguese_ui.lua b/Interface/AddOns/SVUI/language/portuguese_ui.lua
index 2b55f4c..1126daa 100644
--- a/Interface/AddOns/SVUI/language/portuguese_ui.lua
+++ b/Interface/AddOns/SVUI/language/portuguese_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("ptBR");
+local L = _G.LibSuperVillain:Lang("ptBR");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/russian_ui.lua b/Interface/AddOns/SVUI/language/russian_ui.lua
index 78a0df3..14aec3f 100644
--- a/Interface/AddOns/SVUI/language/russian_ui.lua
+++ b/Interface/AddOns/SVUI/language/russian_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("ruRU");
+local L = _G.LibSuperVillain:Lang("ruRU");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/language/spanish_ui.lua b/Interface/AddOns/SVUI/language/spanish_ui.lua
index 64a3e0c..fb3d1b5 100644
--- a/Interface/AddOns/SVUI/language/spanish_ui.lua
+++ b/Interface/AddOns/SVUI/language/spanish_ui.lua
@@ -1,6 +1,6 @@
-local L = LibSuperVillain:Lang("esES");
+local L = _G.LibSuperVillain:Lang("esES");
 if not L then
-	L = LibSuperVillain:Lang("esMX")
+	L = _G.LibSuperVillain:Lang("esMX")
 end
 if not L then return; end
 --[[REACTION TEXTS]]--
diff --git a/Interface/AddOns/SVUI/language/taiwanese_ui.lua b/Interface/AddOns/SVUI/language/taiwanese_ui.lua
index 759aebe..13e99bc 100644
--- a/Interface/AddOns/SVUI/language/taiwanese_ui.lua
+++ b/Interface/AddOns/SVUI/language/taiwanese_ui.lua
@@ -1,4 +1,4 @@
-local L = LibSuperVillain:Lang("zhTW");
+local L = _G.LibSuperVillain:Lang("zhTW");
 if not L then return; end
 --[[REACTION TEXTS]]--
 L[" is drinking."] = true;
diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
index 029260e..f85d2b9 100644
--- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
+++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/LibSuperVillain-1.0.lua
@@ -26,7 +26,7 @@ core add-ins functioning outside of the core object.

 --[[ LOCALIZED GLOBALS ]]--
 --GLOBAL NAMESPACE
-local _G = _G;
+local _G = getfenv(0);
 --LUA
 local unpack        = _G.unpack;
 local select        = _G.select;
@@ -76,11 +76,10 @@ local IsAddOnLoadOnDemand   = _G.IsAddOnLoadOnDemand;


 --[[ LIB CONSTRUCT ]]--
-local lib = _G["LibSuperVillain"]
-if not lib then
-    local env = getfenv(0)
-    env["LibSuperVillain"] = {}
-    lib = env["LibSuperVillain"]
+local lib
+do
+    _G.LibSuperVillain = {}
+    lib = _G.LibSuperVillain
 end

 --[[ ADDON DATA ]]--
diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
index 844a7e1..c553710 100644
--- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua
+++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
@@ -49,8 +49,8 @@ local TTIP = SV.SVTip;
 LOCAL VARS
 ##########################################################
 ]]--
-local NewFrame = CreateFrame;
-local NewHook = hooksecurefunc;
+local CreateFrame = _G.CreateFrame;
+local hooksecurefunc = _G.hooksecurefunc;
 local iconTex = [[Interface\BUTTONS\WHITE8X8]]
 local borderTex = [[Interface\Addons\SVUI\assets\artwork\Template\ROUND]]
 local ICON_BAGS = [[Interface\AddOns\SVUI\assets\artwork\Icons\BAGS-BAGS]]
@@ -94,7 +94,7 @@ local function StyleBagToolButton(button)
 	local icon = button:CreateTexture(nil, "OVERLAY")
 	icon:WrapOuter(button, 6, 6)
 	SetPortraitToTexture(icon, iconTex)
-	NewHook(icon, "SetTexture", SetPortraitToTexture)
+	hooksecurefunc(icon, "SetTexture", SetPortraitToTexture)

 	local hover = button:CreateTexture(nil, "HIGHLIGHT")
 	hover:WrapOuter(button, 6, 6)
@@ -376,10 +376,10 @@ local ContainerFrame_UpdateLayout = function(self)
 				if(not menu[i]) then
 					if isBank then
 						globalName = ("SVUI_BankBag%d"):format((bagID - 4));
-						bagSlot = NewFrame("CheckButton", globalName, menu, "BankItemButtonBagTemplate")
+						bagSlot = CreateFrame("CheckButton", globalName, menu, "BankItemButtonBagTemplate")
 					else
 						globalName = ("SVUI_MainBag%dSlot"):format(bagID);
-						bagSlot = NewFrame("CheckButton", globalName, menu, "BagSlotButtonTemplate")
+						bagSlot = CreateFrame("CheckButton", globalName, menu, "BagSlotButtonTemplate")
 					end

 					bagSlot.parent = self;
@@ -438,7 +438,7 @@ local ContainerFrame_UpdateLayout = function(self)
 			local bag;

 			if not self.Bags[bagID] then
-				bag = NewFrame("Frame", bagName, self);
+				bag = CreateFrame("Frame", bagName, self);
 				bag:SetID(bagID);
 				bag.numSlots = numSlots;
 				bag.SlotUpdate = SlotUpdate;
@@ -475,7 +475,7 @@ local ContainerFrame_UpdateLayout = function(self)
 						local iconName = ("%sIconTexture"):format(slotName)
 						local cdName = ("%sCooldown"):format(slotName)

-						slot = NewFrame("CheckButton", slotName, bag, template);
+						slot = CreateFrame("CheckButton", slotName, bag, template);
 						slot:SetNormalTexture(nil);
 						slot:SetCheckedTexture(nil);
 						slot:SetSlotTemplate(true, 2, 0, 0, true);
@@ -659,7 +659,7 @@ do
 	local function LoadBagBar()
 		if MOD.BagBarLoaded then return end

-		local bar = NewFrame("Frame", "SVUI_BagBar", SV.UIParent)
+		local bar = CreateFrame("Frame", "SVUI_BagBar", SV.UIParent)
 		bar:SetPoint("TOPRIGHT", RightSuperDock, "TOPLEFT", -4, 0)
 		bar.buttons = {}
 		bar:EnableMouse(true)
@@ -992,7 +992,7 @@ do
 		local bagName = "SVUI_ContainerFrame"
 		local uisCount = #UISpecialFrames + 1;
 		local bagsCount = #self.BagFrames + 1;
-		local frame = NewFrame("Button", "SVUI_ContainerFrame", SV.UIParent)
+		local frame = CreateFrame("Button", "SVUI_ContainerFrame", SV.UIParent)

 		frame:SetPanelTemplate("Container")
 		frame:SetFrameStrata("HIGH")
@@ -1025,12 +1025,12 @@ do
 		frame.topOffset = 65;
 		frame.BagIDs = {0, 1, 2, 3, 4}
 		frame.Bags = {}
-		frame.closeButton = NewFrame("Button", "SVUI_ContainerFrameCloseButton", frame, "UIPanelCloseButton")
+		frame.closeButton = CreateFrame("Button", "SVUI_ContainerFrameCloseButton", frame, "UIPanelCloseButton")
 		frame.closeButton:Point("TOPRIGHT", -4, -4)
-		frame.holderFrame = NewFrame("Frame", nil, frame)
+		frame.holderFrame = CreateFrame("Frame", nil, frame)
 		frame.holderFrame:Point("TOP", frame, "TOP", 0, -frame.topOffset)
 		frame.holderFrame:Point("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset)
-		frame.BagMenu = NewFrame("Button", "SVUI_ContainerFrameBagMenu", frame)
+		frame.BagMenu = CreateFrame("Button", "SVUI_ContainerFrameBagMenu", frame)
 		frame.BagMenu:Point("BOTTOMLEFT", frame, "TOPLEFT", 0, 1)
 		frame.BagMenu:SetFixedPanelTemplate("Transparent")
 		frame.BagMenu:Hide()
@@ -1039,7 +1039,7 @@ do
 		frame.goldText:SetFontTemplate(SV.Media.font.numbers)
 		frame.goldText:Point("BOTTOMRIGHT", frame.holderFrame, "TOPRIGHT", -2, 4)
 		frame.goldText:SetJustifyH("RIGHT")
-		frame.editBox = NewFrame("EditBox", "SVUI_ContainerFrameEditBox", frame)
+		frame.editBox = CreateFrame("EditBox", "SVUI_ContainerFrameEditBox", frame)
 		frame.editBox:SetFrameLevel(frame.editBox:GetFrameLevel()+2)
 		frame.editBox:SetEditboxTemplate()
 		frame.editBox:Height(15)
@@ -1057,7 +1057,7 @@ do
 		frame.editBox:SetText(SEARCH)
 		frame.editBox:SetFontTemplate(SV.Media.font.roboto)

-		local searchButton = NewFrame("Button", nil, frame)
+		local searchButton = CreateFrame("Button", nil, frame)
 		searchButton:RegisterForClicks("LeftButtonUp", "RightButtonUp")
 		searchButton:SetSize(60, 18)
 		searchButton:SetPoint("BOTTOMLEFT", frame.editBox, "BOTTOMLEFT", -2, 0)
@@ -1071,7 +1071,7 @@ do
 		searchButton:SetFontString(searchText)
 		frame.detail = searchButton

-		frame.sortButton = NewFrame("Button", nil, frame)
+		frame.sortButton = CreateFrame("Button", nil, frame)
 		frame.sortButton:Point("TOP", frame, "TOP", 0, -10)
 		frame.sortButton:Size(25, 25)
 		frame.sortButton:SetNormalTexture(ICON_SORT)
@@ -1082,7 +1082,7 @@ do
 		local Sort_OnClick = (SV.GameVersion >= 60000) and SortBags or MOD:RunSortingProcess(MOD.Sort, "bags")
 		frame.sortButton:SetScript("OnClick", Sort_OnClick)

-		frame.stackButton = NewFrame("Button", nil, frame)
+		frame.stackButton = CreateFrame("Button", nil, frame)
 		frame.stackButton:Point("LEFT", frame.sortButton, "RIGHT", 10, 0)
 		frame.stackButton:Size(25, 25)
 		frame.stackButton:SetNormalTexture(ICON_STACK)
@@ -1093,7 +1093,7 @@ do
 		local Stack_OnClick = MOD:RunSortingProcess(MOD.Stack, "bags")
 		frame.stackButton:SetScript("OnClick", Stack_OnClick)

-		frame.vendorButton = NewFrame("Button", nil, frame)
+		frame.vendorButton = CreateFrame("Button", nil, frame)
 		frame.vendorButton:Point("RIGHT", frame.sortButton, "LEFT", -10, 0)
 		frame.vendorButton:Size(25, 25)
 		frame.vendorButton:SetNormalTexture(ICON_VENDOR)
@@ -1105,7 +1105,7 @@ do
 		frame.vendorButton:SetScript("OnLeave", Tooltip_Hide)
 		frame.vendorButton:SetScript("OnClick", Vendor_OnClick)

-		frame.bagsButton = NewFrame("Button", nil, frame)
+		frame.bagsButton = CreateFrame("Button", nil, frame)
 		frame.bagsButton:Point("RIGHT", frame.vendorButton, "LEFT", -10, 0)
 		frame.bagsButton:Size(25, 25)
 		frame.bagsButton:SetNormalTexture(ICON_BAGS)
@@ -1118,7 +1118,7 @@ do
 		end
 		frame.bagsButton:SetScript("OnClick", BagBtn_OnClick)

-		frame.transferButton = NewFrame("Button", nil, frame)
+		frame.transferButton = CreateFrame("Button", nil, frame)
 		frame.transferButton:Point("LEFT", frame.stackButton, "RIGHT", 10, 0)
 		frame.transferButton:Size(25, 25)
 		frame.transferButton:SetNormalTexture(ICON_TRANSFER)
@@ -1129,12 +1129,12 @@ do
 		local Transfer_OnClick = MOD:RunSortingProcess(MOD.Transfer, "bags bank")
 		frame.transferButton:SetScript("OnClick", Transfer_OnClick)

-		frame.currencyButton = NewFrame("Frame", nil, frame)
+		frame.currencyButton = CreateFrame("Frame", nil, frame)
 		frame.currencyButton:Point("BOTTOMLEFT", frame, "BOTTOMLEFT", 4, 0)
 		frame.currencyButton:Point("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -4, 0)
 		frame.currencyButton:Height(32)
 		for h = 1, MAX_WATCHED_TOKENS do
-			frame.currencyButton[h] = NewFrame("Button", nil, frame.currencyButton)
+			frame.currencyButton[h] = CreateFrame("Button", nil, frame.currencyButton)
 			frame.currencyButton[h]:Size(22)
 			frame.currencyButton[h]:SetFixedPanelTemplate("Default")
 			frame.currencyButton[h]:SetID(h)
@@ -1151,7 +1151,8 @@ do
 		end

 		frame:SetScript("OnHide", CloseAllBags)
-		UISpecialFrames[uisCount] = "SVUI_ContainerFrame";
+		SV:AddToDisplayAudit(frame)
+		--UISpecialFrames[uisCount] = "SVUI_ContainerFrame";

 		self.BagFrames[bagsCount] = frame
 		self.BagFrame = frame
@@ -1164,7 +1165,7 @@ do
 		local uisCount = #UISpecialFrames + 1;
 		local bagsCount = #self.BagFrames + 1;

-		local frame = NewFrame("Button", bagName, isReagent and self.BankFrame or SV.UIParent)
+		local frame = CreateFrame("Button", bagName, isReagent and self.BankFrame or SV.UIParent)
 		frame:SetPanelTemplate(isReagent and "Action" or "Container")
 		frame:SetFrameStrata("HIGH")

@@ -1203,19 +1204,19 @@ do

 		frame.Bags = {}

-		frame.closeButton = NewFrame("Button", bagName.."CloseButton", frame, "UIPanelCloseButton")
+		frame.closeButton = CreateFrame("Button", bagName.."CloseButton", frame, "UIPanelCloseButton")
 		frame.closeButton:Point("TOPRIGHT", -4, -4)

-		frame.holderFrame = NewFrame("Frame", nil, frame)
+		frame.holderFrame = CreateFrame("Frame", nil, frame)
 		frame.holderFrame:Point("TOP", frame, "TOP", 0, -frame.topOffset)
 		frame.holderFrame:Point("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset)

-		frame.BagMenu = NewFrame("Button", bagName.."BagMenu", frame)
+		frame.BagMenu = CreateFrame("Button", bagName.."BagMenu", frame)
 		frame.BagMenu:Point("BOTTOMLEFT", frame, "TOPLEFT", 0, 1)
 		frame.BagMenu:SetFixedPanelTemplate("Transparent")
 		frame.BagMenu:Hide()

-		frame.sortButton = NewFrame("Button", nil, frame)
+		frame.sortButton = CreateFrame("Button", nil, frame)
 		frame.sortButton:Point("TOPRIGHT", frame, "TOP", 0, -10)
 		frame.sortButton:Size(25, 25)
 		frame.sortButton:SetNormalTexture(ICON_SORT)
@@ -1226,7 +1227,7 @@ do
 		local Sort_OnClick = (SV.GameVersion >= 60000) and BankFrame_AutoSortButtonOnClick or MOD:RunSortingProcess(MOD.Sort, "bank")
 		frame.sortButton:SetScript("OnClick", Sort_OnClick)

-		frame.stackButton = NewFrame("Button", nil, frame)
+		frame.stackButton = CreateFrame("Button", nil, frame)
 		frame.stackButton:Point("LEFT", frame.sortButton, "RIGHT", 10, 0)
 		frame.stackButton:Size(25, 25)
 		frame.stackButton:SetNormalTexture(ICON_STACK)
@@ -1237,7 +1238,7 @@ do
 		local Stack_OnClick = MOD:RunSortingProcess(MOD.Stack, "bank")
 		frame.stackButton:SetScript("OnClick", Stack_OnClick)

-		frame.transferButton = NewFrame("Button", nil, frame)
+		frame.transferButton = CreateFrame("Button", nil, frame)
 		frame.transferButton:Point("LEFT", frame.stackButton, "RIGHT", 10, 0)
 		frame.transferButton:Size(25, 25)
 		frame.transferButton:SetNormalTexture(ICON_TRANSFER)
@@ -1249,12 +1250,12 @@ do
 		frame.transferButton:SetScript("OnClick", Transfer_OnClick)


-
-		UISpecialFrames[uisCount] = bagName;
+		SV:AddToDisplayAudit(frame)
+		--UISpecialFrames[uisCount] = bagName;
 		self.BagFrames[bagsCount] = frame

 		if(not isReagent) then
-			frame.bagsButton = NewFrame("Button", nil, frame)
+			frame.bagsButton = CreateFrame("Button", nil, frame)
 			frame.bagsButton:Point("RIGHT", frame.sortButton, "LEFT", -10, 0)
 			frame.bagsButton:Size(25, 25)
 			frame.bagsButton:SetNormalTexture(ICON_BAGS)
@@ -1272,7 +1273,7 @@ do
 			end
 			frame.bagsButton:SetScript("OnClick", BagBtn_OnClick)

-			frame.purchaseBagButton = NewFrame("Button", nil, frame)
+			frame.purchaseBagButton = CreateFrame("Button", nil, frame)
 			frame.purchaseBagButton:Size(25, 25)
 			frame.purchaseBagButton:Point("RIGHT", frame.bagsButton, "LEFT", -10, 0)
 			frame.purchaseBagButton:SetFrameLevel(frame.purchaseBagButton:GetFrameLevel()+2)
@@ -1292,7 +1293,7 @@ do
 			frame.purchaseBagButton:SetScript("OnClick", PurchaseBtn_OnClick)

 			if(SV.GameVersion >= 60000) then
-				frame.swapButton = NewFrame("Button", nil, frame)
+				frame.swapButton = CreateFrame("Button", nil, frame)
 				frame.swapButton:Point("TOPRIGHT", frame, "TOPRIGHT", -40, -10)
 				frame.swapButton:Size(25, 25)
 				frame.swapButton:SetNormalTexture(ICON_BAGS)
@@ -1481,12 +1482,12 @@ function MOD:Load()

 	SV.Timers:ExecuteTimer(self.BreakStuffLoader, 5)

-	NewHook("OpenAllBags", _openBags)
-	NewHook("CloseAllBags", _closeBags)
-	NewHook("ToggleBag", _toggleBags)
-	NewHook("ToggleAllBags", _toggleBackpack)
-	NewHook("ToggleBackpack", _toggleBackpack)
-	NewHook("BackpackTokenFrame_Update", self.RefreshTokens)
+	hooksecurefunc("OpenAllBags", _openBags)
+	hooksecurefunc("CloseAllBags", _closeBags)
+	hooksecurefunc("ToggleBag", _toggleBags)
+	hooksecurefunc("ToggleAllBags", _toggleBackpack)
+	hooksecurefunc("ToggleBackpack", _toggleBackpack)
+	hooksecurefunc("BackpackTokenFrame_Update", self.RefreshTokens)

 	self:RegisterEvent("BANKFRAME_OPENED")
 	self:RegisterEvent("BANKFRAME_CLOSED")
diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
index 846a5cb..8ffc834 100644
--- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua
+++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
@@ -117,25 +117,25 @@ INIT SETTINGS
 ##########################################################
 ]]--
 local CHAT_FRAMES = _G.CHAT_FRAMES
-_G.CHAT_GUILD_GET = "|Hchannel:GUILD|hG|h %s ";
-_G.CHAT_OFFICER_GET = "|Hchannel:OFFICER|hO|h %s ";
-_G.CHAT_RAID_GET = "|Hchannel:RAID|hR|h %s ";
-_G.CHAT_RAID_WARNING_GET = "RW %s ";
-_G.CHAT_RAID_LEADER_GET = "|Hchannel:RAID|hRL|h %s ";
-_G.CHAT_PARTY_GET = "|Hchannel:PARTY|hP|h %s ";
-_G.CHAT_PARTY_LEADER_GET = "|Hchannel:PARTY|hPL|h %s ";
-_G.CHAT_PARTY_GUIDE_GET = "|Hchannel:PARTY|hPG|h %s ";
-_G.CHAT_INSTANCE_CHAT_GET = "|Hchannel:Battleground|hI.|h %s: ";
-_G.CHAT_INSTANCE_CHAT_LEADER_GET = "|Hchannel:Battleground|hIL.|h %s: ";
-_G.CHAT_WHISPER_INFORM_GET = "to %s ";
-_G.CHAT_WHISPER_GET = "from %s ";
-_G.CHAT_BN_WHISPER_INFORM_GET = "to %s ";
-_G.CHAT_BN_WHISPER_GET = "from %s ";
-_G.CHAT_SAY_GET = "%s ";
-_G.CHAT_YELL_GET = "%s ";
-_G.CHAT_FLAG_AFK = "[AFK] ";
-_G.CHAT_FLAG_DND = "[DND] ";
-_G.CHAT_FLAG_GM = "[GM] ";
+local CHAT_GUILD_GET = "|Hchannel:GUILD|hG|h %s ";
+local CHAT_OFFICER_GET = "|Hchannel:OFFICER|hO|h %s ";
+local CHAT_RAID_GET = "|Hchannel:RAID|hR|h %s ";
+local CHAT_RAID_WARNING_GET = "RW %s ";
+local CHAT_RAID_LEADER_GET = "|Hchannel:RAID|hRL|h %s ";
+local CHAT_PARTY_GET = "|Hchannel:PARTY|hP|h %s ";
+local CHAT_PARTY_LEADER_GET = "|Hchannel:PARTY|hPL|h %s ";
+local CHAT_PARTY_GUIDE_GET = "|Hchannel:PARTY|hPG|h %s ";
+local CHAT_INSTANCE_CHAT_GET = "|Hchannel:Battleground|hI.|h %s: ";
+local CHAT_INSTANCE_CHAT_LEADER_GET = "|Hchannel:Battleground|hIL.|h %s: ";
+local CHAT_WHISPER_INFORM_GET = "to %s ";
+local CHAT_WHISPER_GET = "from %s ";
+local CHAT_BN_WHISPER_INFORM_GET = "to %s ";
+local CHAT_BN_WHISPER_GET = "from %s ";
+local CHAT_SAY_GET = "%s ";
+local CHAT_YELL_GET = "%s ";
+local CHAT_FLAG_AFK = "[AFK] ";
+local CHAT_FLAG_DND = "[DND] ";
+local CHAT_FLAG_GM = "[GM] ";
 --[[
 ##########################################################
 LOCAL FUNCTIONS
diff --git a/Interface/AddOns/SVUI/packages/override/SVOverride.lua b/Interface/AddOns/SVUI/packages/override/SVOverride.lua
index 22317b6..58f5e6b 100644
--- a/Interface/AddOns/SVUI/packages/override/SVOverride.lua
+++ b/Interface/AddOns/SVUI/packages/override/SVOverride.lua
@@ -1065,7 +1065,9 @@ function MOD:Load()
 	SVUI_LootFrame:SetFixedPanelTemplate('Transparent');
 	SVUI_LootFrame.title:SetFont(LSM:Fetch("font", "SVUI Number Font"),18,"OUTLINE")
 	SV.Mentalo:Add(SVUI_LootFrameHolder, L["Loot Frame"], nil, nil, nil, nil, "SVUI_LootFrame");
-	tinsert(UISpecialFrames, "SVUI_LootFrame");
+	SV:AddToDisplayAudit(SVUI_LootFrame);
+	SVUI_LootFrame:Hide();
+	--tinsert(UISpecialFrames, "SVUI_LootFrame");

 	UIParent:UnregisterEvent("LOOT_BIND_CONFIRM")
 	UIParent:UnregisterEvent("CONFIRM_DISENCHANT_ROLL")
diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
index 4f94a8b..8549fec 100644
--- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua
+++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
@@ -673,7 +673,7 @@ function MOD:Load()
 	local hexClass = classColor.colorStr
 	BGStatString = "|cff" .. hexHighlight .. "%s: |c" .. hexClass .. "%s|r";

-	self.Accountant = LibSuperVillain:NewGlobal("Accountant")
+	self.Accountant = _G.LibSuperVillain:NewGlobal("Accountant")

 	self.Accountant = self.Accountant or {};
 	self.Accountant[playerRealm] = self.Accountant[playerRealm] or {};
diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
index e97e773..f166b1d 100644
--- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua
+++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
@@ -581,8 +581,8 @@ local _hook_GameTooltip_SetDefaultAnchor = function(self, parent)
 		end
 	end
 	if not SV.Mentalo:HasMoved("SVUI_ToolTip_MOVE")then
-		if(SVUI_ContainerFrame and SVUI_ContainerFrame:IsShown()) then
-			self:SetPoint("BOTTOMLEFT", SVUI_ContainerFrame, "TOPLEFT", 0, 18)
+		if(SV.SVBag.BagFrame and SV.SVBag.BagFrame:IsShown()) then
+			self:SetPoint("BOTTOMLEFT", SV.SVBag.BagFrame, "TOPLEFT", 0, 18)
 		elseif(RightSuperDock:GetAlpha() == 1 and RightSuperDock:IsShown()) then
 			self:SetPoint("BOTTOMRIGHT", RightSuperDock, "TOPRIGHT", -44, 18)
 		else
diff --git a/Interface/AddOns/SVUI/scripts/ego.lua b/Interface/AddOns/SVUI/scripts/ego.lua
index 2866a40..5b6a9fa 100644
--- a/Interface/AddOns/SVUI/scripts/ego.lua
+++ b/Interface/AddOns/SVUI/scripts/ego.lua
@@ -51,10 +51,8 @@ local LaunchAnimation = function(self, key)
 	key = key or rng()
 	local emote = Sequences[key][1]
 	self:Show()
-	self.anim[2]:SetOffset(0, 0)
-	self.anim[2]:SetOffset(0, 0)
-	self.anim:Play()
 	self:SetAnimation(emote)
+	self.anim:Play()
 end

 local LaunchFreezeFrame = function(self, key)
@@ -62,10 +60,10 @@ local LaunchFreezeFrame = function(self, key)
 	local animation = Sequences[key]
 	local size = SVUIParent:GetHeight()
 	self:Show()
+	self:SetSequenceTime(unpack(animation))
 	self.anim[2]:SetOffset(size, -size)
 	self.anim[2]:SetOffset(0, 0)
 	self.anim:Play()
-	self:SetSequenceTime(unpack(animation))
 end

 local ResetPosition = function(self)
@@ -84,10 +82,6 @@ local Ego_OnEvent = function(self, event)
 	end
 end

-_G.BeAwesome = function()
-	EgoFrame:LaunchAnimation(4)
-end
-
 function SV:ToggleEgo()
 	if not SV.db.general.ego then
 		EgoFrame:UnregisterEvent("ACHIEVEMENT_EARNED")
@@ -112,15 +106,15 @@ local function LoadSVEgo()
 	EgoFrame.LaunchAnimation = LaunchAnimation
 	EgoFrame.LaunchFreezeFrame = LaunchFreezeFrame
 	EgoFrame.ResetPosition = ResetPosition
-
 	SV.Animate:Slide(EgoFrame, 0, 0, true, 1.5)
-	EgoFrame:SetAlpha(0)
 	EgoFrame.anim[4]:SetScript("OnFinished", EgoPop_OnUpdate)

-	SLASH_SVUI_BADASS1="/badass"
-	SlashCmdList["SVUI_BADASS"] = BeAwesome;
+	EgoFrame:Hide()
+end

-	EgoFrame:Show()
+_G.SlashCmdList["BADASS"] = function()
+	EgoFrame:LaunchAnimation(4)
 end
+_G.SLASH_BADASS1 = "/badass"

 SV:NewScript(LoadSVEgo)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI/scripts/questwatch.lua b/Interface/AddOns/SVUI/scripts/questwatch.lua
index 5fc8b15..e7884af 100644
--- a/Interface/AddOns/SVUI/scripts/questwatch.lua
+++ b/Interface/AddOns/SVUI/scripts/questwatch.lua
@@ -65,7 +65,6 @@ local currentQuestItems = {};
 local QuestDockletFrame, QuestDockletFrameTitle, QuestDockletFrameList, QuestDockletFrameSlider;
 local ICON_FILE = [[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-QUESTS]]
 local WATCHFRAME_MAXLINEWIDTH = _G.WATCHFRAME_MAXLINEWIDTH;
-local WATCHFRAME_NUM_POPUPS = _G.WATCHFRAME_NUM_POPUPS;
 local WATCHFRAME_EXPANDEDWIDTH = _G.WATCHFRAME_EXPANDEDWIDTH;
 local WATCHFRAME_FILTER_TYPE = _G.WATCHFRAME_FILTER_TYPE;
 local WATCHFRAME_FILTER_COMPLETED_QUESTS = _G.WATCHFRAME_FILTER_COMPLETED_QUESTS;
@@ -266,14 +265,16 @@ end

 local function SetQuestDockEvents()
 	WatchFrame:HookScript("OnEvent", QWQuestItems)
-	WatchFrame.ScrollListUpdate = function()
+	WatchFrame.ScrollListUpdate = function(self)
+		local WatchFrame = _G.WatchFrame
 		QWSetWatchFrameTitle();
 		WATCHFRAME_MAXLINEWIDTH = WatchFrame:GetWidth();
 		if QuestDockletFrameList then
 			WATCHFRAME_MAXLINEWIDTH = QuestDockletFrameList:GetWidth() - 62
 		end
 	end
-	WatchFrame.OnUpdate = function()
+	WatchFrame.OnUpdate = function(self)
+		local WatchFrame = _G.WatchFrame
 		WATCHFRAME_MAXLINEWIDTH = WatchFrame:GetWidth()
 		if QuestDockletFrameList then
 			WATCHFRAME_MAXLINEWIDTH = QuestDockletFrameList:GetWidth() - 62
@@ -282,21 +283,22 @@ local function SetQuestDockEvents()
 		--QWSetAllLevels()
 		WatchFrame.ScrollListUpdate()
 	end
-	WatchFrame.OnShow = function()
-		Collapsed = (WatchFrame.collapsed or false);
-		if WatchFrameHeader == nil then
-			WatchFrame.userCollapsed = true
-		end
-		UserCollapsed = (WatchFrame.userCollapsed or false);
-		if Collapsed then
-			WatchFrame_Collapse(WatchFrame)
-			WatchFrame.userCollapsed=UserCollapsed
-		else
-			WatchFrame_Expand(WatchFrame)
-		end
-		WatchFrame.OnUpdate();
-	end
-	WatchFrame.OnShow()
+	-- WatchFrame.OnShow = function(self)
+	-- 	local WatchFrame = _G.WatchFrame
+	-- 	Collapsed = (WatchFrame.collapsed or false);
+	-- 	if WatchFrameHeader == nil then
+	-- 		WatchFrame.userCollapsed = true
+	-- 	end
+	-- 	UserCollapsed = (WatchFrame.userCollapsed or false);
+	-- 	if Collapsed then
+	-- 		WatchFrame_Collapse(WatchFrame)
+	-- 		WatchFrame.userCollapsed=UserCollapsed
+	-- 	else
+	-- 		WatchFrame_Expand(WatchFrame)
+	-- 	end
+	-- 	WatchFrame.OnUpdate();
+	-- end
+	-- WatchFrame.OnShow()

 	hooksecurefunc("QuestLog_Update", WatchFrame.OnUpdate)
 end
diff --git a/Interface/AddOns/SVUI/scripts/spellbind.lua b/Interface/AddOns/SVUI/scripts/spellbind.lua
index f632061..22d5eb8 100644
--- a/Interface/AddOns/SVUI/scripts/spellbind.lua
+++ b/Interface/AddOns/SVUI/scripts/spellbind.lua
@@ -39,7 +39,11 @@ local SVLib = _G.LibSuperVillain
 Simple click2cast spell SpellBinder(sBinder by Fernir)
 ##########################################################
 ]]--
-_G.ClickCastFrames = _G.ClickCastFrames or {}
+local ClickCastFrames
+do
+	_G.ClickCastFrames = _G.ClickCastFrames or {}
+	ClickCastFrames = _G.ClickCastFrames
+end

 local UnitParseListing = {
 	"PlayerFrame", "PetFrame",
@@ -66,7 +70,7 @@ local UnitParseListing = {
 for _, gName in pairs(UnitParseListing) do
 	local frame = _G[gName]
 	if(frame) then
-		_G.ClickCastFrames[frame] = true
+		ClickCastFrames[frame] = true
 	end
 end

@@ -269,7 +273,7 @@ function SpellBinder:BuildSpells(delete)
 			bf.fs:SetText(spell.modifier..spell.origbutton)
 			bf.fs:SetPoint("RIGHT", bf.delete, "LEFT", -4, 0)

-			for frame,_ in pairs(_G.ClickCastFrames) do
+			for frame,_ in pairs(ClickCastFrames) do
 				if frame and SV.cache.SpellBinder.frames[frame] then
 					if frame:CanChangeAttribute() or frame:CanChangeProtectedState() then
 						if frame:GetAttribute(spell.modifier.."type"..spell.button) ~= "menu" then
@@ -302,7 +306,7 @@ end

 function SpellBinder:BuildList()
 	if(SV.cache.SpellBinder and SV.cache.SpellBinder.frames) then
-		for frame,_ in pairs(_G.ClickCastFrames) do
+		for frame,_ in pairs(ClickCastFrames) do
 			SV.cache.SpellBinder.frames[frame] = SV.cache.SpellBinder.frames[frame] or true
 		end
 	end
@@ -332,7 +336,7 @@ function SpellBinder:DeleteSpell()
 	local count = table.getn(SV.cache.SpellBinder.spells)
 	for i, spell in ipairs(SV.cache.SpellBinder.spells) do
 		if spell.checked then
-			for frame,_ in pairs(_G.ClickCastFrames) do
+			for frame,_ in pairs(ClickCastFrames) do
 				local f
 				if frame and type(frame) == "table" then f = frame:GetName() end
 				if f then
@@ -380,11 +384,11 @@ SET HOOKS
 ##########################################################
 ]]--
 local _hook_CreateFrame = function(self, name, parent, template)
-	if template and template:find("SecureUnitButtonTemplate") then _G.ClickCastFrames[_G[name]] = true end
+	if template and template:find("SecureUnitButtonTemplate") then ClickCastFrames[_G[name]] = true end
 end

 local _hook_CompactUnitFrame_SetUpFrame = function(self, ...)
-	_G.ClickCastFrames[self] = true
+	ClickCastFrames[self] = true
 end

 local _hook_SpellBookFrame_OnUpdate = function(self)
diff --git a/Interface/AddOns/SVUI/setup/installer.lua b/Interface/AddOns/SVUI/setup/installer.lua
index 526bee7..cf4385e 100644
--- a/Interface/AddOns/SVUI/setup/installer.lua
+++ b/Interface/AddOns/SVUI/setup/installer.lua
@@ -42,7 +42,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = select(2, ...)
-local SVLib = LibSuperVillain;
+local SVLib = _G.LibSuperVillain;
 local L = SV.L;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/setup/presets.lua b/Interface/AddOns/SVUI/setup/presets.lua
index 29b69cb..ecb2a56 100644
--- a/Interface/AddOns/SVUI/setup/presets.lua
+++ b/Interface/AddOns/SVUI/setup/presets.lua
@@ -42,7 +42,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = select(2, ...)
-local SVLib = LibSuperVillain
+local SVLib = _G.LibSuperVillain
 local L = SV.L;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/alerts.lua b/Interface/AddOns/SVUI/system/alerts.lua
index 0308bb0..2cf5300 100644
--- a/Interface/AddOns/SVUI/system/alerts.lua
+++ b/Interface/AddOns/SVUI/system/alerts.lua
@@ -42,7 +42,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = select(2, ...)
-local SVLib = LibSuperVillain;
+local SVLib = _G.LibSuperVillain;
 local L = SV.L;
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/load.lua b/Interface/AddOns/SVUI/system/load.lua
index c9c5db0..bf48f8a 100644
--- a/Interface/AddOns/SVUI/system/load.lua
+++ b/Interface/AddOns/SVUI/system/load.lua
@@ -36,7 +36,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = select(2, ...)
-local SVLib = LibSuperVillain
+local SVLib = _G.LibSuperVillain
 local L = SV.L
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua
index f1c3c63..cc169e0 100644
--- a/Interface/AddOns/SVUI/system/media.lua
+++ b/Interface/AddOns/SVUI/system/media.lua
@@ -39,7 +39,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = select(2, ...)
-local SVLib = LibSuperVillain
+local SVLib = _G.LibSuperVillain
 local L = SV.L
 local LSM = LibStub("LibSharedMedia-3.0")
 --[[
diff --git a/Interface/AddOns/SVUI/system/slash.lua b/Interface/AddOns/SVUI/system/slash.lua
index 74a63e6..49d4393 100644
--- a/Interface/AddOns/SVUI/system/slash.lua
+++ b/Interface/AddOns/SVUI/system/slash.lua
@@ -184,26 +184,29 @@ do
 		end
 	end
 end
+--[[
+##########################################################
+LOAD ALL SLASH FUNCTIONS
+##########################################################
+]]--
+_G.SlashCmdList["SVUISV"] = SVUIMasterCommand;
+_G.SLASH_SVUISV1="/sv"
+
+_G.SlashCmdList["SVUISVUI"] = SVUIMasterCommand;
+_G.SLASH_SVUISVUI1="/svui"
+
+_G.SlashCmdList["SVUIENABLE"] = EnableAddon;
+_G.SLASH_SVUIENABLE1="/enable"
+
+_G.SlashCmdList["SVUIDISABLE"] = DisableAddon;
+_G.SLASH_SVUIDISABLE1="/disable"

-_G.SLASH_KOMBAT1 = "/kombat"
 _G.SlashCmdList["KOMBAT"] = function(msg)
 	SV:ToastyKombat()
 end
+_G.SLASH_KOMBAT1 = "/kombat"

-_G.SLASH_LOLWUT1 = "/lolwut"
 _G.SlashCmdList["LOLWUT"] = function(msg)
 	PlaySoundFile("Sound\\Character\\Human\\HumanVocalFemale\\HumanFemalePissed04.wav")
 end
---[[
-##########################################################
-LOAD ALL SLASH FUNCTIONS
-##########################################################
-]]--
-_G.SLASH_SVUI_SV1="/sv"
-_G.SlashCmdList["SVUI_SV"] = SVUIMasterCommand;
-_G.SLASH_SVUI_SVUI1="/svui"
-_G.SlashCmdList["SVUI_SVUI"] = SVUIMasterCommand;
-_G.SLASH_SVUI_ENABLE1="/enable"
-_G.SlashCmdList["SVUI_ENABLE"] = EnableAddon;
-_G.SLASH_SVUI_DISABLE1="/disable"
-_G.SlashCmdList["SVUI_DISABLE"] = DisableAddon;
\ No newline at end of file
+_G.SLASH_LOLWUT1 = "/lolwut"
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI_ChatOMatic/Loader.lua b/Interface/AddOns/SVUI_ChatOMatic/Loader.lua
index f02f61c..fc761df 100644
--- a/Interface/AddOns/SVUI_ChatOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_ChatOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua
index 7b8737b..94cc304 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/components/bar.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G["SVUI"];
-local SVLib = LibSuperVillain;
+local SVLib = _G.LibSuperVillain;
 local L = SV.L;
 local MOD = SV.SVBar;
 --[[
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/profiles.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/profiles.lua
index 1c81bbd..dbf99be 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/components/profiles.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/components/profiles.lua
@@ -30,7 +30,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SV = _G["SVUI"];
-local SVLib = LibSuperVillain;
+local SVLib = _G.LibSuperVillain;
 local L = SV.L;

 local playerRealm = GetRealmName()
diff --git a/Interface/AddOns/SVUI_CraftOMatic/Loader.lua b/Interface/AddOns/SVUI_CraftOMatic/Loader.lua
index fecfe30..b7bdd81 100644
--- a/Interface/AddOns/SVUI_CraftOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_CraftOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];
diff --git a/Interface/AddOns/SVUI_FightOMatic/Loader.lua b/Interface/AddOns/SVUI_FightOMatic/Loader.lua
index 10cfbd1..488d0ef 100644
--- a/Interface/AddOns/SVUI_FightOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_FightOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];
diff --git a/Interface/AddOns/SVUI_LogOMatic/Loader.lua b/Interface/AddOns/SVUI_LogOMatic/Loader.lua
index 68164db..81ea16f 100644
--- a/Interface/AddOns/SVUI_LogOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_LogOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];
diff --git a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua
index fb3e34a..9814082 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua
index fa27245..bd44ba3 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/chat.lua
@@ -429,7 +429,13 @@ local function ChatStyle()

 	ChatConfigChannelSettingsLeft:HookScript("OnShow", ChatConfigChannelSettingsLeft_OnEvent)

-	CreateChatChannelList(ChatConfigChannelSettings, GetChannelList())
+	-- do
+	-- 	local chatchannellist = GetChannelList()
+	-- 	local CreateChatChannelList = _G.CreateChatChannelList;
+	-- 	local ChatConfigChannelSettings = _G.ChatConfigChannelSettings;
+	-- 	CreateChatChannelList(ChatConfigChannelSettings, chatchannellist)
+	-- end
+
 	ChatConfig_CreateCheckboxes(ChatConfigChannelSettingsLeft, CHAT_CONFIG_CHANNEL_LIST, "ChatConfigCheckBoxWithSwatchAndClassColorTemplate", CHANNELS)
 	ChatConfig_UpdateCheckboxes(ChatConfigChannelSettingsLeft)

diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua
index bd3809d..8b5c624 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/loothistory.lua
@@ -110,7 +110,6 @@ local function LootHistoryStyle()
   local LootHistoryFrame = _G.LootHistoryFrame;
   local BonusRollFrame = _G.BonusRollFrame;
   local MissingLootFramePassButton = _G.MissingLootFramePassButton;
-  local MissingLootFrame_OnShow = _G.MissingLootFrame_OnShow;

   LootHistoryFrame:SetFrameStrata('HIGH')

diff --git a/Interface/AddOns/SVUI_TrackOMatic/Loader.lua b/Interface/AddOns/SVUI_TrackOMatic/Loader.lua
index a96fd05..3494f8f 100644
--- a/Interface/AddOns/SVUI_TrackOMatic/Loader.lua
+++ b/Interface/AddOns/SVUI_TrackOMatic/Loader.lua
@@ -25,9 +25,9 @@ local assert        = _G.assert;

 local AddonName, AddonObject = ...

-assert(LibSuperVillain, AddonName .. " requires LibSuperVillain")
+assert(_G.LibSuperVillain, AddonName .. " requires LibSuperVillain")

-local PLUGIN = LibSuperVillain:NewPlugin(AddonName, AddonObject)
+local PLUGIN = _G.LibSuperVillain:NewPlugin(AddonName, AddonObject)

 local Schema = PLUGIN.Schema;
 local SV = _G["SVUI"];