fix

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 3346743..e0f235d 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
@@ -914,7 +914,7 @@ function lib:NewCore(gfile, pfile, cfile)
     CoreObject.NameID        = CoreName;
     CoreObject.Version       = AddonVersion;
     CoreObject.GameVersion   = tonumber(InterfaceVersion);
-    CoreObject.DebugMode     = false;
+    CoreObject.DebugMode     = true;
     CoreObject.Schema        = GetAddOnMetadata(CoreName, SchemaFromMeta);
     CoreObject.TitleID       = GetAddOnMetadata(CoreName, HeaderFromMeta);

diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
index dfbccf2..4c28c10 100644
--- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua
+++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
@@ -348,7 +348,7 @@ function MOD:Layout(isBank, isReagent)
 	if not f then return; end
 	local buttonSize = isBank and MOD.db.bankSize or MOD.db.bagSize;
 	local buttonSpacing = 8;
-	local containerWidth = (MOD.db.alignToChat == true and (isBank and (SV.SVDock.db.dockLeftWidth - 14) or (SV.SVDock.db.dockRightWidth - 14))) or (isBank and MOD.db.bankWidth) or MOD.db.bagWidth
+	local containerWidth = (MOD.db.alignToChat == true and (isBank and (SV.db.SVDock.dockLeftWidth - 14) or (SV.db.SVDock.dockRightWidth - 14))) or (isBank and MOD.db.bankWidth) or MOD.db.bagWidth
 	local numContainerColumns = floor(containerWidth / (buttonSize + buttonSpacing));
 	local holderWidth = ((buttonSize + buttonSpacing) * numContainerColumns) - buttonSpacing;
 	local numContainerRows = 0;
diff --git a/Interface/AddOns/SVUI/packages/chat/SVChat.lua b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
index 92726a6..cfad2bf 100644
--- a/Interface/AddOns/SVUI/packages/chat/SVChat.lua
+++ b/Interface/AddOns/SVUI/packages/chat/SVChat.lua
@@ -903,8 +903,8 @@ do
 end

 function MOD:UpdateLocals()
-	CHAT_WIDTH = (SV.SVDock.db.dockLeftWidth or 350) - 10;
-	CHAT_HEIGHT = (SV.SVDock.db.dockLeftHeight or 180) - 15;
+	CHAT_WIDTH = (SV.db.SVDock.dockLeftWidth or 350) - 10;
+	CHAT_HEIGHT = (SV.db.SVDock.dockLeftHeight or 180) - 15;
 	CHAT_THROTTLE = self.db.throttleInterval;
 	CHAT_ALLOW_URL = self.db.url;
 	CHAT_HOVER_URL = self.db.hyperlinkHover;
diff --git a/Interface/AddOns/SVUI/packages/dock/SVDock.lua b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
index 12c1bbb..eb4e1fe 100644
--- a/Interface/AddOns/SVUI/packages/dock/SVDock.lua
+++ b/Interface/AddOns/SVUI/packages/dock/SVDock.lua
@@ -746,9 +746,9 @@ SV.CurrentlyDocked = {};
 function SV:IsDockletReady(arg)
 	local addon = arg;
 	if arg == "DockletMain" or arg == "DockletExtra" then
-		addon = MOD.db.docklets[arg]
+		addon = self.db.SVDock.docklets[arg]
 	end
-	if addon == nil or addon == "None" or not IsAddOnLoaded(addon) then
+	if addon == nil or addon == "None" then
 		return false
 	end
 	return true
@@ -763,7 +763,9 @@ function SV:RemoveTool()
 	tremove(TOOL_CACHE, i)
 	local width;
 	local height = SuperDockToolBarRight.currentSize;
-	PREV_TOOL = TOOL_CACHE[#TOOL_CACHE]
+	local PREV_TOOL = TOOL_CACHE[#TOOL_CACHE]
+	local xOffset = (#TOOL_CACHE - 1) * (height + 6) + 6
+	PREV_TOOL:SetPoint("RIGHT", SuperDockToolBarRight, "RIGHT", (xOffset * -1), 0);
 	width = #TOOL_CACHE * (height + 6)
 	SuperDockToolBarRight:Size(width, height)
 	self:Hide()
@@ -775,14 +777,10 @@ function SV:AddTool()
 	SAFETY_CACHE[name] = true;
 	local width;
 	local height = SuperDockToolBarRight.currentSize;
-	if not PREV_TOOL or PREV_TOOL == self then
-		self:Point("RIGHT", SuperDockToolBarRight, "RIGHT", -6, 0);
-	else
-		self:Point("RIGHT", PREV_TOOL, "LEFT", -6, 0);
-	end
+	local xOffset = #TOOL_CACHE * (height + 6) + 6
+	self:SetPoint("RIGHT", SuperDockToolBarRight, "RIGHT", (xOffset * -1), 0);
 	tinsert(TOOL_CACHE, self)
  	self.listIndex = #TOOL_CACHE;
-	PREV_TOOL = self;
 	width = #TOOL_CACHE * (height + 6)
 	SuperDockToolBarRight:Size(width, height)
 	self:Show()
@@ -796,38 +794,37 @@ do
 		tremove(DOCKLET_CACHE, i)
 	end

-	local function UnregisterDocklets()
+	function SV:ReloadDocklets(alert)
+		if InCombatLockdown() then return end
+
 		local frame, i;
-		twipe(SV.CurrentlyDocked);
-		if SV:IsDockletReady("DockletMain") then
-			frame = MOD.db.docklets.MainWindow
+		twipe(self.CurrentlyDocked);
+		if self:IsDockletReady("DockletMain") then
+			frame = self.db.SVDock.docklets.MainWindow
 			if frame ~= nil and frame ~= "None" and _G[frame] then
 				UnregisterDocklet(frame)
-				MOD.db.docklets.MainWindow = "None"
+				self.db.SVDock.docklets.MainWindow = "None"
 			end
 		elseif AddOnButton.IsRegistered then
-			SV.RemoveTool(AddOnButton)
+			self.RemoveTool(AddOnButton)
 			AddOnButton.TText = "";
 			AddOnButton.IsRegistered = false;
 		end
-		if SV:IsDockletReady("DockletExtra") then
-			frame = MOD.db.docklets.ExtraWindow
+		if self:IsDockletReady("DockletExtra") then
+			frame = self.db.SVDock.docklets.ExtraWindow
 			if frame ~= nil and frame ~= "None" and _G[frame] then
 				UnregisterDocklet(frame)
-				MOD.db.docklets.ExtraWindow = "None"
+				self.db.SVDock.docklets.ExtraWindow = "None"
 			end
 		end
 		SuperDockletMain.FrameName = "None"
 		SuperDockletExtra.FrameName = "None"
-	end

-	function SV:ReloadDocklets(alert)
-		UnregisterDocklets()
-		if InCombatLockdown()then return end
-		local width = MOD.db.dockRightWidth or 350;
-		local height = (MOD.db.dockRightHeight or 180) - 22
-		if SV:IsDockletReady('DockletMain') then
-			if SV:IsDockletReady("DockletExtra") and MOD.db.docklets.enableExtra then
+		local width = self.db.SVDock.dockRightWidth or 350;
+		local height = (self.db.SVDock.dockRightHeight or 180) - 22
+
+		if self:IsDockletReady('DockletMain') then
+			if self:IsDockletReady("DockletExtra") and self.db.SVDock.docklets.enableExtra then
 				width = width * 0.5;
 			end
 			SuperDockletMain:ClearAllPoints()
@@ -849,7 +846,7 @@ function SV:RegisterDocklet(name, tooltip, texture, onclick, isdefault)
 		frame.FrameName = name;
 		tinsert(DOCKLET_CACHE, frame);
 		frame.listIndex = #DOCKLET_CACHE;
-		MOD:CreateBasicToolButton(tooltip, texture, onclick, name, isdefault)
+		self.SVDock:CreateBasicToolButton(tooltip, texture, onclick, name, isdefault)
 	end
 end

diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua
index 9dc13d3..f1dea36 100644
--- a/Interface/AddOns/SVUI/scripts/misc.lua
+++ b/Interface/AddOns/SVUI/scripts/misc.lua
@@ -474,7 +474,7 @@ end

 local function CreateTotemBar()
 	if(not SV.db.totems.enable) then return; end
-	local xOffset = SV.SVDock.db.dockLeftWidth + 12
+	local xOffset = SV.db.SVDock.dockLeftWidth + 12
 	TotemBar = CreateFrame("Frame", "SVUI_TotemBar", SV.UIParent)
 	TotemBar:SetPoint("BOTTOMLEFT", SV.UIParent, "BOTTOMLEFT", xOffset, 40)
 	for i = 1, MAX_TOTEMS do
diff --git a/Interface/AddOns/SVUI/system/setup.lua b/Interface/AddOns/SVUI/system/setup.lua
index 0dbb2ad..43449c5 100644
--- a/Interface/AddOns/SVUI/system/setup.lua
+++ b/Interface/AddOns/SVUI/system/setup.lua
@@ -1303,7 +1303,7 @@ end

 local function UFMoveRightQuadrant(toggle)
 	if not SVUI_Cache.anchors then SVUI_Cache.anchors = {} end
-	local dH = SV.SVDock.db.dockRightHeight  +  60
+	local dH = SV.db.SVDock.dockRightHeight  +  60
 	if not toggle or toggle == "high" then
 		SVUI_Cache.anchors.SVUI_BossHolder_MOVE = "RIGHTSVUIParentRIGHT-1050"
 		SVUI_Cache.anchors.SVUI_ArenaHolder_MOVE = "RIGHTSVUIParentRIGHT-1050"
@@ -1450,10 +1450,10 @@ local function SetUserScreen(rez, preserve)
 	if not SVUI_Cache.anchors then SVUI_Cache.anchors = {} end
 	if rez == "low" then
 		if not preserve then
-			SV.SVDock.db.dockLeftWidth = 350;
-			SV.SVDock.db.dockLeftHeight = 180;
-			SV.SVDock.db.dockRightWidth = 350;
-			SV.SVDock.db.dockRightHeight = 180;
+			SV.db.SVDock.dockLeftWidth = 350;
+			SV.db.SVDock.dockLeftHeight = 180;
+			SV.db.SVDock.dockRightWidth = 350;
+			SV.db.SVDock.dockRightHeight = 180;
 			SV.SVAura.db.wrapAfter = 10
 			SV.SVUnit.db.fontSize = 10;
 			SV.SVUnit.db.player.width = 200;
diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
index 4ea7f7c..e60c9a5 100644
--- a/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
+++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/dock.lua
@@ -58,7 +58,7 @@ SV.Options.args.SVDock.args["common"] = {
 			type = 'toggle',
 			name = L['Bottom Panel'],
 			desc = L['Display a border across the bottom of the screen.'],
-			get = function(j)return SV.SVDock.db.bottomPanel end,
+			get = function(j)return SV.db.SVDock.bottomPanel end,
 			set = function(key,value)MOD:ChangeDBVar(value,key[#key]);MOD:BottomPanelVisibility()end
 		},
 		topPanel = {
@@ -66,7 +66,7 @@ SV.Options.args.SVDock.args["common"] = {
 			type = 'toggle',
 			name = L['Top Panel'],
 			desc = L['Display a border across the top of the screen.'],
-			get = function(j)return SV.SVDock.db.topPanel end,
+			get = function(j)return SV.db.SVDock.topPanel end,
 			set = function(key,value)MOD:ChangeDBVar(value,key[#key]);MOD:TopPanelVisibility()end
 		},
 		dockStatWidth = {
@@ -78,7 +78,7 @@ SV.Options.args.SVDock.args["common"] = {
 			max = 1200,
 			step = 1,
 			width = "full",
-			get = function()return SV.SVDock.db.dockStatWidth end,
+			get = function()return SV.db.SVDock.dockStatWidth end,
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:UpdateSuperDock(true)
@@ -98,7 +98,7 @@ SV.Options.args.SVDock.args["leftDockGroup"] = {
 				type = 'toggle',
 				name = L['Left Dock Backdrop'],
 				desc = L['Display a backdrop behind the left-side dock.'],
-				get = function(j)return SV.SVDock.db.leftDockBackdrop end,
+				get = function(j)return SV.db.SVDock.leftDockBackdrop end,
 				set = function(key,value)
 					MOD:ChangeDBVar(value,key[#key]);
 					MOD:UpdateDockBackdrops()
@@ -113,7 +113,7 @@ SV.Options.args.SVDock.args["leftDockGroup"] = {
 				max = 600,
 				step = 1,
 				width = "full",
-				get = function()return SV.SVDock.db.dockLeftHeight;end,
+				get = function()return SV.db.SVDock.dockLeftHeight;end,
 				set = function(key,value)
 					MOD:ChangeDBVar(value,key[#key]);
 					MOD:UpdateSuperDock(true)
@@ -129,7 +129,7 @@ SV.Options.args.SVDock.args["leftDockGroup"] = {
 				max = 700,
 				step = 1,
 				width = "full",
-				get = function()return SV.SVDock.db.dockLeftWidth;end,
+				get = function()return SV.db.SVDock.dockLeftWidth;end,
 				set = function(key,value)
 					MOD:ChangeDBVar(value,key[#key]);
 					MOD:UpdateSuperDock(true)
@@ -148,7 +148,7 @@ local acceptableDocklets = {
 };

 local function GetLiveDockletsA()
-	local test = SV.SVDock.db.docklets.DockletExtra;
+	local test = SV.db.SVDock.docklets.DockletExtra;
 	local t = {["None"] = L["None"]};
 	for n,l in pairs(acceptableDocklets) do
 		if IsAddOnLoaded(n) or IsAddOnLoaded(l) then
@@ -166,7 +166,7 @@ local function GetLiveDockletsA()
 end

 local function GetLiveDockletsB()
-	local test = SV.SVDock.db.docklets.DockletMain;
+	local test = SV.db.SVDock.docklets.DockletMain;
 	local t = {["None"] = L["None"]};
 	for n,l in pairs(acceptableDocklets) do
 		if IsAddOnLoaded(n) or IsAddOnLoaded(l) then
@@ -194,7 +194,7 @@ SV.Options.args.SVDock.args["rightDockGroup"] = {
 			type = 'toggle',
 			name = L['Right Dock Backdrop'],
 			desc = L['Display a backdrop behind the right-side dock.'],
-			get = function(j)return SV.SVDock.db.rightDockBackdrop end,
+			get = function(j)return SV.db.SVDock.rightDockBackdrop end,
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:UpdateDockBackdrops()
@@ -209,7 +209,7 @@ SV.Options.args.SVDock.args["rightDockGroup"] = {
 			max = 600,
 			step = 1,
 			width = "full",
-			get = function()return SV.SVDock.db.dockRightHeight;end,
+			get = function()return SV.db.SVDock.dockRightHeight;end,
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:UpdateSuperDock(true)
@@ -225,7 +225,7 @@ SV.Options.args.SVDock.args["rightDockGroup"] = {
 			max = 700,
 			step = 1,
 			width = "full",
-			get = function()return SV.SVDock.db.dockRightWidth;end,
+			get = function()return SV.db.SVDock.dockRightWidth;end,
 			set = function(key,value)
 				MOD:ChangeDBVar(value,key[#key]);
 				MOD:UpdateSuperDock(true)
@@ -243,8 +243,8 @@ SV.Options.args.SVDock.args["rightDockGroup"] = {
 					order = 1,
 					type = "toggle",
 					name = L["Enable"],
-					get = function()return SV.db.questWatch end,
-				 	set = function(j, value) SV.db.questWatch = value; SV:StaticPopup_Show("RL_CLIENT") end
+					get = function()return SV.db.general.questWatch end,
+				 	set = function(j, value) SV.db.general.questWatch = value; SV:StaticPopup_Show("RL_CLIENT") end
 				}
 			}
 		},
@@ -266,33 +266,33 @@ SV.Options.args.SVDock.args["rightDockGroup"] = {
 							name = "Primary Docklet",
 							desc = "Select an addon to occupy the primary docklet window",
 							values = function()return GetLiveDockletsA()end,
-							get = function()return SV.SVDock.db.docklets.DockletMain end,
-							set = function(a,value)SV.SVDock.db.docklets.DockletMain = value;SV:ReloadDocklets()end,
+							get = function()return SV.db.SVDock.docklets.DockletMain end,
+							set = function(a,value)SV.db.SVDock.docklets.DockletMain = value;SV:ReloadDocklets()end,
 						},
 						DockletCombatFade = {
 							type = "toggle",
 							order = 2,
 							name = "Out of Combat (Hide)",
-							get = function()return SV.SVDock.db.docklets.DockletCombatFade end,
-							set = function(a,value)SV.SVDock.db.docklets.DockletCombatFade = value;end
+							get = function()return SV.db.SVDock.docklets.DockletCombatFade end,
+							set = function(a,value)SV.db.SVDock.docklets.DockletCombatFade = value;end
 						},
 						enableExtra = {
 							type = "toggle",
 							order = 3,
 							name = "Split Docklet",
 							desc = "Split the primary docklet window for 2 addons.",
-							get = function()return SV.SVDock.db.docklets.enableExtra end,
-							set = function(a,value)SV.SVDock.db.docklets.enableExtra = value;SV:ReloadDocklets()end,
+							get = function()return SV.db.SVDock.docklets.enableExtra end,
+							set = function(a,value)SV.db.SVDock.docklets.enableExtra = value;SV:ReloadDocklets()end,
 						},
 						DockletExtra = {
 							type = "select",
 							order = 4,
 							name = "Secondary Docklet",
 							desc = "Select another addon",
-							disabled = function()return (not SV.SVDock.db.docklets.enableExtra or SV.SVDock.db.docklets.DockletMain == "None") end,
+							disabled = function()return (not SV.db.SVDock.docklets.enableExtra or SV.db.SVDock.docklets.DockletMain == "None") end,
 							values = function()return GetLiveDockletsB()end,
-							get = function()return SV.SVDock.db.docklets.DockletExtra end,
-							set = function(a,value)SV.SVDock.db.docklets.DockletExtra = value;SV:ReloadDocklets()end,
+							get = function()return SV.db.SVDock.docklets.DockletExtra end,
+							set = function(a,value)SV.db.SVDock.docklets.DockletExtra = value;SV:ReloadDocklets()end,
 						}
 					}
 				}
diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
index 220f481..0c5d962 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
@@ -38,7 +38,7 @@ GET ADDON DATA
 ##########################################################
 ]]--
 local SVUIAddOnName, PLUGIN = ...;
-local SV = SVUI
+local SV = _G.SVUI
 local SVLib = LibStub("LibSuperVillain-1.0")
 local L = SVLib:Lang()
 local NewHook = hooksecurefunc;
@@ -76,7 +76,7 @@ PLUGIN.OptionsCache = {
 		},
 	}
 }
-PLUGIN.Debugging = true
+PLUGIN.Debugging = false
 --[[
 ##########################################################
 CORE FUNCTIONS
@@ -114,14 +114,16 @@ end

 function PLUGIN:Style(style, fn, ...)
 	local pass, error = pcall(fn, ...)
+	if(self.Debugging and error) then
+		SV:Debugger(errorMessage:format(VERSION, style, error))
+		return
+	end
 	if(pass and (not style:find("Blizzard")) and not self.StyledAddons[style]) then
 		self.StyledAddons[style] = true
 		local verb = charming[math.random(1,#charming)]
 		self:AddonMessage(styleMessage:format(style, verb))
-	elseif(self.Debugging and error) then
-		SV:Debugger(errorMessage:format(VERSION, style, error))
 	end
-	--self.Debugging = false
+	self.Debugging = false
 end

 function PLUGIN:IsAddonReady(addon, ...)
@@ -290,8 +292,8 @@ OPTIONS CREATION
 local RegisterAddonDocklets = function()
 	local MAIN = _G["SuperDockletMain"];
 	local EXTRA = _G["SuperDockletExtra"];
-	local main = SV.SVDock.db.docklets.DockletMain;
-  	local alternate = SV.SVDock.db.docklets.enableExtra and SV.SVDock.db.docklets.DockletExtra or "";
+	local main = SV.db.SVDock.docklets.DockletMain;
+  	local alternate = SV.db.SVDock.docklets.enableExtra and SV.db.SVDock.docklets.DockletExtra or "";
   	local tipLeft, tipRight = "", "";
   	if main == nil or main == "None" then return end

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua
index 8c71566..53d6f10 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Omen.lua
@@ -29,8 +29,6 @@ local format = string.format;
 GET ADDON DATA
 ##########################################################
 ]]--
-local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
 local STYLE = _G.StyleVillain;
 --[[
 ##########################################################
@@ -42,12 +40,14 @@ local function StyleOmen()

   Omen.db.profile.Scale = 1
   Omen.db.profile.Bar.Spacing = 1
+  Omen.db.profile.Bar.Texture = "SVUI MultiColorBar"
   Omen.db.profile.Background.EdgeSize = 2
   Omen.db.profile.Background.BarInset = 2
+  Omen.db.profile.Background.Texture = "None"
   Omen.db.profile.TitleBar.UseSameBG = true

   hooksecurefunc(Omen, 'UpdateBackdrop', function(self)
-    if not SV.CurrentlyDocked["OmenAnchor"] then
+    if not SVUI.CurrentlyDocked["OmenAnchor"] then
       STYLE:ApplyFrameStyle(self.BarList, 'Transparent')
       self.Title:RemoveTextures()
       self.Title:SetPanelTemplate("Default")
@@ -56,21 +56,11 @@ local function StyleOmen()
     self.BarList:SetPoint('TOPLEFT', self.Title, 'BOTTOMLEFT', 0, 1)
   end)

-  hooksecurefunc(Omen, 'Toggle', function(self)
-    if InCombatLockdown() then return end
-    if not SV.CurrentlyDocked["OmenAnchor"] then return end
-    if self.Anchor:IsShown() then
-      SuperDockWindow:Show()
-    else
-      SuperDockWindow:Hide()
-    end
-  end)
-
   Omen:UpdateBackdrop()
   Omen:ReAnchorBars()
   Omen:ResizeBars()
 end
-STYLE:SaveAddonStyle("Omen", StyleOmen)
+STYLE:SaveAddonStyle("Omen", StyleOmen, nil, true)

 function STYLE:Docklet_Omen(parent)
   if not Omen then return end
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
index 1a5da90..f1df7e2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
@@ -30,8 +30,6 @@ local twipe = table.wipe;
 GET ADDON DATA
 ##########################################################
 ]]--
-local SV = _G.SVUI;
-local L = LibStub("LibSuperVillain-1.0"):Lang();
 local STYLE = _G.StyleVillain;
 local activePanels = {};
 --[[
@@ -39,18 +37,11 @@ local activePanels = {};
 SKADA
 ##########################################################
 ]]--
-local function Skada_ShowPopup(self)
-  STYLE:LoadAlert(L['Do you want to reset Skada?'], function(self) Skada:Reset() self:GetParent():Hide() end)
-end
-
-local function skada_panel_loader(holder, window, parent)
+local function skada_panel_loader(holder, window)
   if not window then return end

   local bars = Skada.displays['bar']

-  holder:SetParent(parent)
-  holder:SetAllPoints()
-
   local width,height = holder:GetSize()

   window.db.barspacing = 1;
@@ -64,7 +55,7 @@ local function skada_panel_loader(holder, window, parent)
   window.bargroup:SetFrameStrata('LOW')

   local bgroup = window.bargroup.backdrop;
-  if bgroup and not bgroup.Panel then
+  if bgroup then
     bgroup:Show()
     bgroup:SetFixedPanelTemplate('Transparent',true)
   end
@@ -72,14 +63,42 @@ local function skada_panel_loader(holder, window, parent)
   bars.ApplySettings(bars, window)
 end

+function STYLE:Docklet_Skada()
+  if not Skada then return end
+  if(not SkadaHolder) then
+    local SkadaHolder = CreateFrame("Frame", "SkadaHolder", SuperDockletMain)
+    SkadaHolder:SetAllPoints(SuperDockletMain)
+  end
+  if(not SkadaHolder2) then
+    local SkadaHolder2 = CreateFrame("Frame", "SkadaHolder2", SuperDockletExtra)
+    SkadaHolder2:SetAllPoints(SuperDockletExtra)
+  end
+  for index,window in pairs(Skada:GetWindows()) do
+    local key = "Skada"..window.db.name
+    if(SVUI.db.SVDock.docklets.DockletMain == key)then
+      skada_panel_loader(SkadaHolder, window)
+    elseif(SVUI.db.SVDock.docklets.enableExtra and SVUI.db.SVDock.docklets.DockletExtra == key) then
+      skada_panel_loader(SkadaHolder2, window)
+    else
+      window.db.barslocked = false;
+    end
+  end
+end
+
+local function Skada_ShowPopup(self)
+  STYLE:LoadAlert('Do you want to reset Skada?', function(self) Skada:Reset() self:GetParent():Hide() end)
+end
+
 local function StyleSkada()
   assert(Skada, "AddOn Not Loaded")

   if(not SkadaHolder) then
-    local SkadaHolder = CreateFrame("Frame", "SkadaHolder", UIParent)
+    local SkadaHolder = CreateFrame("Frame", "SkadaHolder", SuperDockletMain)
+    SkadaHolder:SetAllPoints(SuperDockletMain)
   end
   if(not SkadaHolder2) then
-    local SkadaHolder2 = CreateFrame("Frame", "SkadaHolder2", UIParent)
+    local SkadaHolder2 = CreateFrame("Frame", "SkadaHolder2", SuperDockletExtra)
+    SkadaHolder2:SetAllPoints(SuperDockletExtra)
   end
   Skada.ShowPopup = Skada_ShowPopup

@@ -97,77 +116,42 @@ local function StyleSkada()

   hooksecurefunc(SkadaDisplayBar, 'ApplySettings', function(self, window)
     local skada = window.bargroup
+    if not skada then return end
+    local panelAnchor = skada
     skada:SetSpacing(1)
     skada:SetFrameLevel(5)
     skada:SetBackdrop(nil)

     if(window.db.enabletitle) then
+      panelAnchor = skada.button
       skada.button:SetHeight(18)
       skada.button:SetButtonTemplate()
-      skada.button:GetFontString():SetFont(SV.Media.font.names, 15, "OUTLINE")
+      skada.button:GetFontString():SetFont(SVUI.Media.font.names, 15, "OUTLINE")
     end

-    if(not skada.Panel) then
-      STYLE:ApplyWindowHolder(skada, true)
-      skada.Panel:ClearAllPoints()
-      skada.Panel:Point('TOPLEFT', window.db.enabletitle and skada.button or skada, 'TOPLEFT', -2, 2)
-      skada.Panel:Point('BOTTOMRIGHT', skada, 'BOTTOMRIGHT', 2, -2)
-    else
-      skada.Panel:ClearAllPoints()
-      skada.Panel:Point('TOPLEFT', window.db.enabletitle and skada.button or skada, 'TOPLEFT', -2, 2)
-      skada.Panel:Point('BOTTOMRIGHT', skada, 'BOTTOMRIGHT', 2, -2)
-    end
-  end)
-
-  hooksecurefunc(Skada, 'ToggleWindow', function()
-    if InCombatLockdown() then return end
-    if not SV.CurrentlyDocked["SkadaHolder"] or not SV.CurrentlyDocked["SkadaHolder2"] then return end
-    for index, window in ipairs(Skada:GetWindows()) do
-      if window:IsShown() then
-        SuperDockWindowRight:Show()
-      else
-        SuperDockWindowRight:Hide()
-      end
-    end
+    skada:SetPanelTemplate("Transparent")
+    skada.Panel:ClearAllPoints()
+    skada.Panel:SetPoint('TOPLEFT', panelAnchor, 'TOPLEFT', -2, 2)
+    skada.Panel:SetPoint('BOTTOMRIGHT', skada, 'BOTTOMRIGHT', 2, -2)
   end)

   hooksecurefunc(Skada, 'CreateWindow', function()
-    if SV.CurrentlyDocked["SkadaHolder"] or SV.CurrentlyDocked["SkadaHolder2"] then
+    if SVUI.CurrentlyDocked["SkadaHolder"] or SVUI.CurrentlyDocked["SkadaHolder2"] then
       STYLE:Docklet_Skada()
     end
   end)

   hooksecurefunc(Skada, 'DeleteWindow', function()
-    if SV.CurrentlyDocked["SkadaHolder"] or SV.CurrentlyDocked["SkadaHolder2"] then
+    if SVUI.CurrentlyDocked["SkadaHolder"] or SVUI.CurrentlyDocked["SkadaHolder2"] then
       STYLE:Docklet_Skada()
     end
   end)

   hooksecurefunc(Skada, 'UpdateDisplay', function()
-    if SV.CurrentlyDocked["SkadaHolder"] or SV.CurrentlyDocked["SkadaHolder2"] then
+    if SVUI.CurrentlyDocked["SkadaHolder"] or SVUI.CurrentlyDocked["SkadaHolder2"] then
       STYLE:Docklet_Skada()
     end
   end)
 end

-function STYLE:Docklet_Skada()
-  if not Skada then return end
-  if(not SkadaHolder) then
-    local SkadaHolder = CreateFrame("Frame", "SkadaHolder", UIParent)
-  end
-  if(not SkadaHolder2) then
-    local SkadaHolder2 = CreateFrame("Frame", "SkadaHolder2", UIParent)
-  end
-  for index,window in pairs(Skada:GetWindows()) do
-    local key = "Skada"..window.db.name
-    if(SV.SVDock.db.docklets.DockletMain == key)then
-      skada_panel_loader(SkadaHolder, window, SuperDockletMain)
-    elseif(SV.SVDock.db.docklets.enableExtra and SV.SVDock.db.docklets.DockletExtra == key) then
-      skada_panel_loader(SkadaHolder2, window, SuperDockletExtra)
-    else
-      window.db.barslocked = false;
-    end
-  end
-end
-
-STYLE:SaveAddonStyle("Skada", StyleSkada)
\ No newline at end of file
+STYLE:SaveAddonStyle("Skada", StyleSkada, nil, true)
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
index 3e8622e..3010da0 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/alDamageMeter.lua
@@ -45,7 +45,7 @@ local function StyleALDamageMeter()
   alDamageMeterFrame:HookScript('OnShow', function()
     if InCombatLockdown() then return end
     if SV.CurrentlyDocked["alDamagerMeterFrame"] then
-      SuperDockWindow:Show()
+      SuperDockWindowRight:Show()
     end
   end)
 end
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
index e197b28..7f9badf 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
@@ -74,13 +74,14 @@ local function TradeSkillStyle()
 	TradeSkillIncrementButton:Point("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0)
 	STYLE:ApplyCloseButtonStyle(TradeSkillFrameCloseButton)

+	TradeSkillSkillIcon:SetFixedPanelTemplate("Slot")
+
 	local internalTest = false;

 	hooksecurefunc("TradeSkillFrame_SetSelection", function(_)
+		TradeSkillSkillIcon:SetFixedPanelTemplate("Slot")
 		if TradeSkillSkillIcon:GetNormalTexture() then
 			TradeSkillSkillIcon:GetNormalTexture():SetTexCoord(0.1, 0.9, 0.1, 0.9)
-			TradeSkillSkillIcon:GetNormalTexture():FillInner()
-			TradeSkillSkillIcon:SetSlotTemplate()
 		end
 		for i=1, MAX_TRADE_SKILL_REAGENTS do
 			local u = _G["TradeSkillReagent"..i]