Quantcast

5.1.12

Steven Jackson [10-24-14 - 01:59]
5.1.12
Filename
Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
Interface/AddOns/SVUI/packages/aura/SVAura.lua
Interface/AddOns/SVUI/packages/chat/SVChat.lua
Interface/AddOns/SVUI/packages/stats/SVStats.lua
Interface/AddOns/SVUI/packages/stats/stats/system.lua
Interface/AddOns/SVUI/scripts/raid.lua
Interface/AddOns/SVUI/system/core.lua
Interface/AddOns/SVUI/system/docks.lua
Interface/AddOns/SVUI/system/templates.lua
Interface/AddOns/SVUI/xml/framework.xml
Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua
Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua
diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
index 9bce2f6..7ad3739 100644
--- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
+++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua
@@ -561,10 +561,10 @@ local registerEvent = function(self, eventname, eventfunc)
         self.___eventframe.___owner = self
         self.___eventframe:SetScript("OnEvent", innerOnEvent)
     end
-
+
     if(not self.___eventframe[eventname]) then
         local fn = eventfunc
-        if type(eventfunc) == "string" then
+        if(type(eventfunc) == "string") then
             fn = self[eventfunc]
         elseif(not fn and self[eventname]) then
             fn = self[eventname]
@@ -589,7 +589,8 @@ local innerOnUpdate = function(self, elapsed)
         for name, fn in pairs(callbacks) do
             local _, catch = pcall(fn, obj)
             if(catch and CoreObject.Debugging) then
-                print(catch)
+                local schema = obj.Schema
+                HandleErrors(schema, "OnUpdate", catch)
             end
         end

@@ -1176,6 +1177,8 @@ function lib:Initialize()
             NewLoadOnDemand(addonName, schema, header)
         end
     end
+
+    CoreObject.initialized = true
 end

 function lib:Launch()
diff --git a/Interface/AddOns/SVUI/packages/aura/SVAura.lua b/Interface/AddOns/SVUI/packages/aura/SVAura.lua
index 227e78f..96216fa 100644
--- a/Interface/AddOns/SVUI/packages/aura/SVAura.lua
+++ b/Interface/AddOns/SVUI/packages/aura/SVAura.lua
@@ -580,6 +580,7 @@ function MOD:Load()
 	local auras = CreateFrame("Frame", "SVUI_AurasAnchor", SV.Screen)
 	auras:SetSize(CB_WIDTH, CB_HEIGHT)
 	auras:Point("TOPRIGHT", Minimap, "TOPLEFT", -8, 0)
+	SV:AddToDisplayAudit(auras)

 	self.BuffFrame = CreateAuraHeader("HELPFUL")
 	self.BuffFrame:SetPoint("TOPRIGHT", auras, "TOPLEFT", -8, 0)
@@ -589,6 +590,7 @@ function MOD:Load()
 	SVUI_ConsolidatedBuffs:SetParent(SV.Screen)
 	SVUI_ConsolidatedBuffs:SetAllPoints(auras)
 	SVUI_ConsolidatedBuffs:SetFrameStrata("BACKGROUND")
+	SV:AddToDisplayAudit(SVUI_ConsolidatedBuffs)

 	for i = 1, NUM_LE_RAID_BUFF_TYPES do
 		SVUI_ConsolidatedBuffs[i] = CreateHyperBuff(i)
diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
index 66eeb26..6b514a0 100644
--- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua
+++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
@@ -612,6 +612,8 @@ do
 			chat:SetClampRectInsets(0, 0, 0, 0)
 			chat:SetClampedToScreen(false)
 			chat:RemoveTextures(true)
+			chat:SetBackdropColor(0,0,0,0)
+			chat.SetBackdropColor = SV.fubar
 			_G[chatName.."ButtonFrame"]:Die()
 			-------------------------------------------
 			_G[tabName .."Left"]:SetTexture(0,0,0,0)
@@ -700,7 +702,7 @@ do

 	function MOD:RefreshChatFrames(forced)
 		if (not SV.db.SVChat.enable) then return; end
-		if ((not forced) and refreshLocked and (IsMouseButtonDown("LeftButton") or InCombatLockdown())) then return; end
+		if ((not forced) and (refreshLocked and (IsMouseButtonDown("LeftButton") or InCombatLockdown()))) then return; end

 		for i,name in pairs(CHAT_FRAMES)do
 			local chat = _G[name]
@@ -721,19 +723,19 @@ do
 					tab.isDocked = false;
 					if(tab.Holder) then
 						tab.Holder.isDocked = false;
-						_removeTab(tab.Holder,chat)
+						_removeTab(tab.Holder, chat)
 					end
 				end
 			else
 				chat.Panel:Hide()
 				if id == 1 then
 					chat:ClearAllPoints()
-					chat:Width(CHAT_WIDTH)
-					chat:Height(CHAT_HEIGHT)
-					chat:Point("BOTTOMRIGHT",SV.Dock.Left.Window,"BOTTOMRIGHT",-4,10)
+					chat:SetWidth(CHAT_WIDTH)
+					chat:SetHeight(CHAT_HEIGHT)
+					chat:SetPoint("BOTTOMRIGHT", SVUI_DockLeftWindow, "BOTTOMRIGHT", 0, 0)
 					FCF_SavePositionAndDimensions(chat)
 				end
-				chat:SetParent(SV.Dock.Left.Window)
+				chat:SetParent(SVUI_DockLeftWindow)
 				if(not TAB_SKINS) then
 					tab.owner = chat;
 					tab.isDocked = chat.isDocked;
@@ -745,7 +747,7 @@ do
 					local arg3 = (chat.inUse or chat.isDocked or chat.isTemporary)
 					if(tab.Holder and arg3) then
 						tab.Holder.isDocked = true;
-						_addTab(tab.Holder,id)
+						_addTab(tab.Holder, id)
 					end
 				end
 				if chat:IsMovable()then
@@ -966,8 +968,6 @@ function MOD:ReLoad()
 end

 function MOD:Load()
-	if(not SV.db.SVChat.enable) then return end
-
 	ScrollIndicator:SetParent(SV.Dock.Left.Window)
 	ScrollIndicator:SetSize(20,20)
 	ScrollIndicator:SetPoint("BOTTOMRIGHT", SV.Dock.Left.Window, "BOTTOMRIGHT", 6, 0)
@@ -978,7 +978,6 @@ function MOD:Load()
 	ScrollIndicator.icon:SetBlendMode("ADD")
 	ScrollIndicator:Hide()

-
 	self:RegisterEvent('UPDATE_CHAT_WINDOWS', 'RefreshChatFrames')
 	self:RegisterEvent('UPDATE_FLOATING_CHAT_WINDOWS', 'RefreshChatFrames')
 	self:RegisterEvent('PET_BATTLE_CLOSE')
@@ -994,6 +993,7 @@ function MOD:Load()
 	_G.GeneralDockManager:SetAllPoints(SV.Dock.Left.ToolBar)

 	SetAllChatHooks()
+
 	FriendsMicroButton:Die()
 	ChatFrameMenuButton:Die()

diff --git a/Interface/AddOns/SVUI/packages/stats/SVStats.lua b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
index 85eb6ca..e97c68b 100644
--- a/Interface/AddOns/SVUI/packages/stats/SVStats.lua
+++ b/Interface/AddOns/SVUI/packages/stats/SVStats.lua
@@ -715,6 +715,7 @@ function MOD:Load()
 	local topanchor = CreateFrame("Frame", "SVUI_TopStatsDock", SV.Screen)
 	topanchor:Size(statBarWidth - 2, buttonsize - 8)
 	topanchor:Point("LEFT", SV.Dock.Top.ToolBar, "RIGHT", spacing, 0)
+	SV:AddToDisplayAudit(topanchor)

 	local topleftdata = CreateFrame("Frame", "SVUI_StatsBar1", topanchor)
 	topleftdata:Size((statBarWidth * 0.5) - 1, buttonsize - 8)
diff --git a/Interface/AddOns/SVUI/packages/stats/stats/system.lua b/Interface/AddOns/SVUI/packages/stats/stats/system.lua
index 83586c7..2f32c24 100644
--- a/Interface/AddOns/SVUI/packages/stats/stats/system.lua
+++ b/Interface/AddOns/SVUI/packages/stats/stats/system.lua
@@ -214,45 +214,67 @@ local function OnLeave(self)
 	MOD.tooltip:Hide()
 end

-local Update
-if(SV.DebugMode) then
-	Update = function(self, t)
-		int = int - t
-		if int < 0 then
-			UpdateAddOnMemoryUsage()
-			local svuiRAMout = formatMem(GetAddOnMemoryUsage("SVUI"))
-			self.text:SetFormattedText("RAM: %s%s|r", statusColors[1], svuiRAMout)
-			int = 1
-			if enteredFrame then
-				OnEnter(self)
-			end
-		end
+local Update = function(self, t)
+	int = int - t
+	int2 = int2 - t
+
+	if int < 0 then
+		RebuildAddonList()
+		int = 10
 	end
-else
-	Update = function(self, t)
-		int = int - t
-		int2 = int2 - t
-
-		if int < 0 then
-			RebuildAddonList()
-			int = 10
-		end
-		if int2 < 0 then
-			local framerate = floor(GetFramerate())
-			local latency = select(4, GetNetStats())
-
-			self.text:SetFormattedText("FPS: %s%d|r MS: %s%d|r",
-				statusColors[framerate >= 30 and 1 or (framerate >= 20 and framerate < 30) and 2 or (framerate >= 10 and framerate < 20) and 3 or 4],
-				framerate,
-				statusColors[latency < 150 and 1 or (latency >= 150 and latency < 300) and 2 or (latency >= 300 and latency < 500) and 3 or 4],
-				latency)
-			int2 = 1
-			if enteredFrame then
-				OnEnter(self)
-			end
-		end
+	if int2 < 0 then
+		local framerate = floor(GetFramerate())
+		local latency = select(4, GetNetStats())
+
+		self.text:SetFormattedText("FPS: %s%d|r MS: %s%d|r",
+			statusColors[framerate >= 30 and 1 or (framerate >= 20 and framerate < 30) and 2 or (framerate >= 10 and framerate < 20) and 3 or 4],
+			framerate,
+			statusColors[latency < 150 and 1 or (latency >= 150 and latency < 300) and 2 or (latency >= 300 and latency < 500) and 3 or 4],
+			latency)
+		int2 = 1
+		if enteredFrame then
+			OnEnter(self)
+		end
 	end
 end
+-- if(SV.DebugMode) then
+-- 	Update = function(self, t)
+-- 		int = int - t
+-- 		if int < 0 then
+-- 			UpdateAddOnMemoryUsage()
+-- 			local svuiRAMout = formatMem(GetAddOnMemoryUsage("SVUI"))
+-- 			self.text:SetFormattedText("RAM: %s%s|r", statusColors[1], svuiRAMout)
+-- 			int = 1
+-- 			if enteredFrame then
+-- 				OnEnter(self)
+-- 			end
+-- 		end
+-- 	end
+-- else
+-- 	Update = function(self, t)
+-- 		int = int - t
+-- 		int2 = int2 - t
+
+-- 		if int < 0 then
+-- 			RebuildAddonList()
+-- 			int = 10
+-- 		end
+-- 		if int2 < 0 then
+-- 			local framerate = floor(GetFramerate())
+-- 			local latency = select(4, GetNetStats())
+
+-- 			self.text:SetFormattedText("FPS: %s%d|r MS: %s%d|r",
+-- 				statusColors[framerate >= 30 and 1 or (framerate >= 20 and framerate < 30) and 2 or (framerate >= 10 and framerate < 20) and 3 or 4],
+-- 				framerate,
+-- 				statusColors[latency < 150 and 1 or (latency >= 150 and latency < 300) and 2 or (latency >= 300 and latency < 500) and 3 or 4],
+-- 				latency)
+-- 			int2 = 1
+-- 			if enteredFrame then
+-- 				OnEnter(self)
+-- 			end
+-- 		end
+-- 	end
+-- end

 MOD:Extend('System', nil, nil, Update, Click, OnEnter, OnLeave)

diff --git a/Interface/AddOns/SVUI/scripts/raid.lua b/Interface/AddOns/SVUI/scripts/raid.lua
index 4a18a4b..c49c17e 100644
--- a/Interface/AddOns/SVUI/scripts/raid.lua
+++ b/Interface/AddOns/SVUI/scripts/raid.lua
@@ -94,7 +94,7 @@ local function ToggleRaidUtil(event)
 	end

 	if CheckRaidStatus() then
-		local width = SV.Dock.Top.ToolBar.openWidth
+		local width = SV.Dock.Top:GetAttribute("buttonSize") + 12
 		SV.Dock.Top.ToolBar:SetWidth(width)
 		if RaidUtilityPanel.toggled == true then
 			SVUI_RaidTools:Hide()
diff --git a/Interface/AddOns/SVUI/system/core.lua b/Interface/AddOns/SVUI/system/core.lua
index 70631cf..cecd728 100644
--- a/Interface/AddOns/SVUI/system/core.lua
+++ b/Interface/AddOns/SVUI/system/core.lua
@@ -447,7 +447,6 @@ function SVUI:PET_BATTLE_CLOSE()
 end

 function SVUI:PET_BATTLE_OPENING_START()
-    print("PET_BATTLE_OPENING_START")
     self:FlushDisplayAudit()
 end

@@ -529,6 +528,18 @@ function SVUI:Load()
     self:LoadSystemAlerts();

     self:RegisterEvent('PLAYER_REGEN_DISABLED');
+    self:RegisterEvent("PLAYER_ENTERING_WORLD");
+    self:RegisterEvent("UI_SCALE_CHANGED");
+    self:RegisterEvent("PET_BATTLE_CLOSE");
+    self:RegisterEvent("PET_BATTLE_OPENING_START");
+    self:RegisterEvent("ADDON_ACTION_BLOCKED", "TaintHandler");
+    self:RegisterEvent("ADDON_ACTION_FORBIDDEN", "TaintHandler");
+    self:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED", "PlayerInfoUpdate");
+    self:RegisterEvent("PLAYER_TALENT_UPDATE", "PlayerInfoUpdate");
+    self:RegisterEvent("CHARACTER_POINTS_CHANGED", "PlayerInfoUpdate");
+    self:RegisterEvent("UNIT_INVENTORY_CHANGED", "PlayerInfoUpdate");
+    self:RegisterEvent("UPDATE_BONUS_ACTIONBAR", "PlayerInfoUpdate");
+
     self.Timers:Initialize()
 end

@@ -545,18 +556,6 @@ function SVUI:Initialize()

     hooksecurefunc("StaticPopup_Show", self.StaticPopup_Show)

-    self:RegisterEvent("PLAYER_ENTERING_WORLD");
-    self:RegisterEvent("UI_SCALE_CHANGED");
-    self:RegisterEvent("PET_BATTLE_CLOSE");
-    self:RegisterEvent("PET_BATTLE_OPENING_START");
-    self:RegisterEvent("ADDON_ACTION_BLOCKED", "TaintHandler");
-    self:RegisterEvent("ADDON_ACTION_FORBIDDEN", "TaintHandler");
-    self:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED", "PlayerInfoUpdate");
-    self:RegisterEvent("PLAYER_TALENT_UPDATE", "PlayerInfoUpdate");
-    self:RegisterEvent("CHARACTER_POINTS_CHANGED", "PlayerInfoUpdate");
-    self:RegisterEvent("UNIT_INVENTORY_CHANGED", "PlayerInfoUpdate");
-    self:RegisterEvent("UPDATE_BONUS_ACTIONBAR", "PlayerInfoUpdate");
-
     SVLib:RefreshModule("SVMap");

     collectgarbage("collect")
diff --git a/Interface/AddOns/SVUI/system/docks.lua b/Interface/AddOns/SVUI/system/docks.lua
index e72c54a..c7bc634 100644
--- a/Interface/AddOns/SVUI/system/docks.lua
+++ b/Interface/AddOns/SVUI/system/docks.lua
@@ -524,6 +524,7 @@ function Dock:CreateDockPanels()
     self.Left.Button:RegisterForClicks("AnyUp")
     self.Left.ToolBar:Point("LEFT", self.Left.Button, "RIGHT", spacing, 0)
     self.Left.ToolBar:Height(buttonsize)
+    self.Left.Window:Size(leftWidth, leftHeight - (buttonsize + 4))

 	self.Left.Alert.Activate = AlertActivate
 	self.Left.Alert.Deactivate = AlertDeactivate
@@ -552,8 +553,7 @@ function Dock:CreateDockPanels()
 	self.Right.ToolBar.AddonButton.Icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-ADDON]])
 	self.Right.ToolBar.AddonButton:SetAttribute("tipText", "")
 	self.Right.ToolBar.AddonButton.IsRegistered = false;
-	self.Right.UtilityBar:Point("RIGHT", self.Right.ToolBar, "LEFT", -spacing, 0)
-	self.Right.UtilityBar:Size(1, buttonsize)
+	self.Right.Window:Size(rightWidth, rightHeight - (buttonsize + 4))

 	self.Right.Alert.Activate = AlertActivate
 	self.Right.Alert.Deactivate = AlertDeactivate
@@ -563,6 +563,7 @@ function Dock:CreateDockPanels()
 	self:ActivateDockletButton(self.Right.Button, SV.ToggleHenchman)
 	self:ActivateDockletButton(self.Right.ToolBar.AddonButton, AddonDockletToggle)
 	SV.Mentalo:Add(self.Right, L["Right Dock"])
+	SV:AddToDisplayAudit(self.Right.Window)

 	if SV.cache.Docks.IsFaded then Dock.Left:Hide() Dock.Right:Hide() end

@@ -698,23 +699,10 @@ do
 		end
 	end

-	local function AddMacroTool(frame)
-		local height = Dock.Right.ToolBar:GetHeight();
-		if not LastAddedMacro then
-			frame:Point("RIGHT", Dock.Right.UtilityBar, "RIGHT", -6, 0);
-		else
-			frame:Point("RIGHT", LastAddedMacro, "LEFT", -6, 0);
-		end
-		LastAddedMacro = frame;
-		MacroCount = MacroCount + 1;
-		width = MacroCount * (height + 6)
-		Dock.Right.UtilityBar:Size(width, height)
-	end
-
 	local function CreateMacroToolButton(proName, proID, itemID, size)
 		local data = TOOL_DATA[proID]
 		if(not data) then return end
-		local button = CreateFrame("Button", ("%s_MacroBarButton"):format(itemID), Dock.Right.UtilityBar, "SecureActionButtonTemplate,SVUI_DockletButtonTemplate")
+		local button = CreateFrame("Button", ("%s_MacroBarButton"):format(itemID), Dock.Right.ToolBar, "SecureActionButtonTemplate,SVUI_DockletButtonTemplate")
 		button:Size(size, size)
 		AddTool(button)
 		button:SetFramedButtonTemplate()
@@ -748,8 +736,8 @@ do
 	function Dock:LoadToolBarProfessions()
 		if(SV.ToolBarLoaded) then return end
 		if(InCombatLockdown()) then Dock:RegisterEvent("PLAYER_REGEN_ENABLED"); return end
-		local size = Dock.Right.UtilityBar:GetHeight()
-		local hearth = CreateFrame("Button", "SVUI_HearthButton", Dock.Right.UtilityBar, "SecureActionButtonTemplate, SVUI_DockletButtonTemplate")
+		local size = Dock.Right.ToolBar:GetHeight()
+		local hearth = CreateFrame("Button", "SVUI_HearthButton", Dock.Right.ToolBar, "SecureActionButtonTemplate, SVUI_DockletButtonTemplate")
 		hearth:Size(size, size)
 		AddTool(hearth)
 		hearth:SetFramedButtonTemplate()
@@ -830,16 +818,19 @@ do
 		if not button or not button.listIndex then return end
 		local name = button:GetName();
 		if not Dock.HandledDocklets[name] then return end
-		Dock.HandledDocklets[name] = false;
-		local i = button.listIndex;
-		local PREV_TOOL = Dock.DockletButtons[i - 1]
-		tremove(Dock.DockletButtons, i)
-		if(PREV_TOOL) then
-			local height = Dock.Right.ToolBar:GetHeight();
-			local xOffset = (#Dock.DockletButtons - 1) * (height + 6) + 6
-			PREV_TOOL:SetPoint("RIGHT", Dock.Right.ToolBar, "RIGHT", (xOffset * -1), 0);
-		end
+		Dock.HandledDocklets[name] = nil;
+		local index = button.listIndex;
+		tremove(Dock.DockletButtons, index)
 		button:Hide()
+
+		local height = Dock.Right.ToolBar:GetHeight();
+
+		for i = 1, #Dock.DockletButtons do
+			local nextButton = Dock.DockletButtons[i]
+			local xOffset = (i - 1) * (height + 6) + 6
+			nextButton:ClearAllPoints()
+			nextButton:SetPoint("RIGHT", Dock.Right.ToolBar, "RIGHT", (xOffset * -1), 0);
+		end
 	end

 	function Dock:ReloadDocklets(alert)
@@ -985,7 +976,9 @@ function Dock:Refresh()
 	local spacing = SV.db.Dock.buttonSpacing or 4;

 	self.Left:Size(leftWidth, leftHeight)
+	self.Left.Window:Size(leftWidth, leftHeight - (buttonsize + 4))
 	self.Right:Size(rightWidth, rightHeight)
+	self.Right.Window:Size(rightWidth, rightHeight - (buttonsize + 4))

 	self:BottomBorderVisibility();
 	self:TopBorderVisibility();
diff --git a/Interface/AddOns/SVUI/system/templates.lua b/Interface/AddOns/SVUI/system/templates.lua
index f7f190e..396d0fa 100644
--- a/Interface/AddOns/SVUI/system/templates.lua
+++ b/Interface/AddOns/SVUI/system/templates.lua
@@ -52,8 +52,6 @@ LOCAL VARS
 local SizeScaled, HeightScaled, WidthScaled, PointScaled, WrapOuter, FillInner
 local TemplateUpdateFrames = {};
 local FontUpdateFrames = {};
-local NewFrame = CreateFrame;
-local NewHook = hooksecurefunc;
 local STANDARD_TEXT_FONT = _G.STANDARD_TEXT_FONT;
 --[[
 ##########################################################
@@ -126,7 +124,7 @@ end
 APPENDED DESTROY METHODS
 ##########################################################
 ]]--
-local _purgatory = NewFrame("Frame", nil)
+local _purgatory = CreateFrame("Frame", nil)
 _purgatory:Hide()

 local function Die(self)
@@ -455,7 +453,7 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd
     local xmlTemplate = XML_LOOKUP[templateName] or "SVUI_PanelTemplate_Default"
     local borderColor = {0,0,0,1}

-    frame.Panel = NewFrame('Frame', nil, frame, xmlTemplate)
+    frame.Panel = CreateFrame('Frame', nil, frame, xmlTemplate)

     local level = frame:GetFrameLevel()
     if(level == 0 and not InCombatLockdown()) then
@@ -469,7 +467,7 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd

     frame.Panel:SetFrameLevel(adjustment)

-    NewHook(frame, "SetFrameLevel", HookFrameLevel)
+    hooksecurefunc(frame, "SetFrameLevel", HookFrameLevel)

     if(defaultColor) then
         frame.Panel:SetAttribute("panelColor", defaultColor)
@@ -527,11 +525,11 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd
         end

         if(templateName ~= 'Transparent') then
-            NewHook(frame.Panel, "SetBackdropBorderColor", HookPanelBorderColor)
-            NewHook(frame, "SetBackdropBorderColor", HookBackdropBorderColor)
+            hooksecurefunc(frame.Panel, "SetBackdropBorderColor", HookPanelBorderColor)
+            hooksecurefunc(frame, "SetBackdropBorderColor", HookBackdropBorderColor)
             if(underlay) then
-                NewHook(frame, "SetBackdrop", HookBackdrop)
-                NewHook(frame, "SetBackdropColor", HookBackdropColor)
+                hooksecurefunc(frame, "SetBackdrop", HookBackdrop)
+                hooksecurefunc(frame, "SetBackdropColor", HookBackdropColor)
             end
             frame.BackdropNeedsUpdate = true
             if(templateName == 'Pattern' or templateName == 'Comic') then
@@ -702,10 +700,10 @@ local function SetBasicPanel(self, topX, topY, bottomX, bottomY, hasShadow)

         self.Panel:SetFrameLevel(adjustment)

-        NewHook(self, "SetFrameLevel", HookFrameLevel)
-        NewHook(self, "SetBackdrop", HookBackdrop)
-        NewHook(self, "SetBackdropColor", HookBackdropColor)
-        NewHook(self, "SetBackdropBorderColor", HookBackdropBorderColor)
+        hooksecurefunc(self, "SetFrameLevel", HookFrameLevel)
+        hooksecurefunc(self, "SetBackdrop", HookBackdrop)
+        hooksecurefunc(self, "SetBackdropColor", HookBackdropColor)
+        hooksecurefunc(self, "SetBackdropBorderColor", HookBackdropBorderColor)
     end
 end

@@ -893,7 +891,7 @@ local function SetCheckboxTemplate(self, underlay, x, y)
     CreatePanelTemplate(self, "Slot", underlay, true, 1, x, y)
     CreateButtonPanel(self, false, true)

-    NewHook(self, "SetChecked", function(self,checked)
+    hooksecurefunc(self, "SetChecked", function(self,checked)
         local r,g,b = 0,0,0
         if(checked == 1 or checked == true) then
             r,g,b = self:GetCheckedTexture():GetVertexColor()
@@ -1105,7 +1103,7 @@ local function AppendMethods(OBJECT)
     if not OBJECT.SetFontTemplate then META.SetFontTemplate = SetFontTemplate end
 end

-local HANDLER, OBJECT = {["Frame"] = true}, NewFrame("Frame")
+local HANDLER, OBJECT = {["Frame"] = true}, CreateFrame("Frame")
 AppendMethods(OBJECT)
 AppendMethods(OBJECT:CreateTexture())
 AppendMethods(OBJECT:CreateFontString())
diff --git a/Interface/AddOns/SVUI/xml/framework.xml b/Interface/AddOns/SVUI/xml/framework.xml
index a272d16..15190de 100644
--- a/Interface/AddOns/SVUI/xml/framework.xml
+++ b/Interface/AddOns/SVUI/xml/framework.xml
@@ -142,12 +142,6 @@
                     </Button>
                 </Frames>
             </Frame>
-            <Frame name="$parentUtilityBar" parentKey="UtilityBar">
-                <Size x="1" y="22"/>
-                <Anchors>
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentToolBar" relativePoint="BOTTOMLEFT" x="-4" y="0" />
-                </Anchors>
-            </Frame>
             <Frame name="$parentAlert" parentKey="Alert" frameStrata="BACKGROUND">
                 <Size y="1"/>
                 <Anchors>
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua
index 66cf6d0..e5b4776 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua
@@ -102,6 +102,7 @@ SV.Options.args.Dock.args["leftDockGroup"] = {
 				set = function(key,value)
 					MOD:ChangeDBVar(value,key[#key]);
 					MOD:Refresh()
+					CHAT:UpdateLocals()
 					CHAT:RefreshChatFrames(true)
 				end,
 			},
@@ -118,6 +119,7 @@ SV.Options.args.Dock.args["leftDockGroup"] = {
 				set = function(key,value)
 					MOD:ChangeDBVar(value,key[#key]);
 					MOD:Refresh()
+					CHAT:UpdateLocals()
 					CHAT:RefreshChatFrames(true)
 				end,
 			},
@@ -202,6 +204,7 @@ SV.Options.args.Dock.args["rightDockGroup"] = {
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:Refresh()
+				CHAT:UpdateLocals()
 				CHAT:RefreshChatFrames(true)
 			end,
 		},
@@ -218,6 +221,7 @@ SV.Options.args.Dock.args["rightDockGroup"] = {
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:Refresh()
+				CHAT:UpdateLocals()
 				CHAT:RefreshChatFrames(true)
 				BAG.BagFrame:UpdateLayout()
 				BAG.BankFrame:UpdateLayout()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua
index 93a629c..4fe1008 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua
@@ -101,6 +101,8 @@ end
 local function StyleSkada()
   assert(Skada, "AddOn Not Loaded")

+  Skada.displays['bar'].ApplySettings = StupidSkada
+
   CheckForHolders()
   Skada.ShowPopup = Skada_ShowPopup

diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua
index 1d3c951..664c988 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petbattle.lua
@@ -363,6 +363,7 @@ local function PetBattleStyle()
 	BottomFrame.Delimiter:RemoveTextures()

 	BottomFrame.xpBar:ClearAllPoints()
+	BottomFrame.xpBar:RemoveTextures()
 	BottomFrame.xpBar:SetParent(PetBattleActionBar)
 	BottomFrame.xpBar:Size((PBAB_WIDTH * 0.8) - 4, 16)
 	BottomFrame.xpBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]])