4.3.5

diff --git a/Interface/AddOns/SVUI/SVUI.lua b/Interface/AddOns/SVUI/SVUI.lua
index 609ce84..af8179d 100644
--- a/Interface/AddOns/SVUI/SVUI.lua
+++ b/Interface/AddOns/SVUI/SVUI.lua
@@ -64,6 +64,8 @@ if GetLocale() == "ruRU" then
     INFO_HEADER = "Supervillain UI (устарела %.3f): Плагины";
 end

+local actualWidth, actualHeight = UIParent:GetSize()
+
 --[[  CONSTANTS ]]--

 BINDING_HEADER_SVUI = "Supervillain UI";
@@ -547,7 +549,7 @@ local function SetPluginString(addonName)
     local Pname = GetAddOnMetadata(addonName, "Title") or addonName
     local version = GetAddOnMetadata(addonName, "Version") or "???"
     pluginString = INFO_BY:format(pluginString, author)
-    pluginString = ("%s%s"):format(pluginString, Pname)
+    pluginString = ("%s %s"):format(pluginString, Pname)
     pluginString = INFO_VERSION:format(pluginString, "|cff00FF00", version)
     pluginString = ("%s|r\n"):format(pluginString)

@@ -646,7 +648,7 @@ local function SetExternalModule(obj, core, schema, addonName, header, lod)
                     type = "toggle",
                     name = "Enable",
                     get = function() return obj.db.enable end,
-                    set = function(key, value) obj:ChangeDBVar(value, "enable") end,
+                    set = function(key, value) obj:ChangeDBVar(value, "enable"); core:StaticPopup_Show("RL_CLIENT") end,
                 }
             }
         }
@@ -885,6 +887,11 @@ local SVUI = {
     UnitRole = "NONE",
     ConfigurationMode = false,
     DebuggingMode = false,
+    EffectiveScale = 1,
+    ActualHeight = actualHeight,
+    ActualWidth = actualWidth,
+    yScreenArea = (actualHeight * 0.33),
+    xScreenArea = (actualWidth * 0.33),
     SetLocaleStrings = Core_SetLocaleStrings,
     Prototype = Core_Prototype,
     AddonMessage = Core_AddonMessage,
diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Background/COMIC-MODEL.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Background/COMIC-MODEL.blp
new file mode 100644
index 0000000..cc16871
Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/Background/COMIC-MODEL.blp differ
diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua
index 33156e1..4dcd9af 100644
--- a/Interface/AddOns/SVUI/packages/map/SVMap.lua
+++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua
@@ -116,17 +116,20 @@ do
 	}

 	local function UpdateMinimapButtons()
-		if(not MOD.db.minimapbar.enable) then return end
+		if(not MOD.db.minimapbar.enable) then return end
+
 		MMBBar:SetPoint("CENTER", MMBHolder, "CENTER", 0, 0)
 		MMBBar:Height(MOD.db.minimapbar.buttonSize + 4)
 		MMBBar:Width(MOD.db.minimapbar.buttonSize + 4)
+
 		local lastButton, anchor, relative, xPos, yPos;
 		local list  = buttonCache[2]
 		local count = #list
+
 		for i = 1, count do
 			local btn = _G[list[i]]
 			local preset = btn.preset;
-			if MOD.db.minimapbar.styleType == "NOANCHOR"then
+			if(MOD.db.minimapbar.styleType == "NOANCHOR") then
 				btn:SetParent(preset.Parent)
 				if preset.DragStart then
 					btn:SetScript("OnDragStart", preset.DragStart)
@@ -195,6 +198,7 @@ do
 				if name:find(reserved[i]) ~= nil then return end
 			end
 		end
+
 		btn:SetPushedTexture(nil)
 		btn:SetHighlightTexture(nil)
 		btn:SetDisabledTexture(nil)
@@ -203,21 +207,21 @@ do
 			btn:HookScript("OnEnter", MMB_OnEnter)
 			btn:HookScript("OnLeave", MMB_OnLeave)
 			btn:HookScript("OnClick", UpdateMinimapButtons)
+			btn.preset = {}
+			btn.preset.Width, btn.preset.Height = btn:GetSize()
+			btn.preset.Point, btn.preset.relativeTo, btn.preset.relativePoint, btn.preset.xOfs, btn.preset.yOfs = btn:GetPoint()
+			btn.preset.Parent = btn:GetParent()
+			btn.preset.FrameStrata = btn:GetFrameStrata()
+			btn.preset.FrameLevel = btn:GetFrameLevel()
+			btn.preset.Scale = btn:GetScale()
+			if btn:HasScript("OnDragStart") then
+				btn.preset.DragStart = btn:GetScript("OnDragStart")
+			end
+			if btn:HasScript("OnDragEnd") then
+				btn.preset.DragEnd = btn:GetScript("OnDragEnd")
+			end
 			for i = 1, btn:GetNumRegions() do
 				local frame = select(i, btn:GetRegions())
-				btn.preset = {}
-				btn.preset.Width, btn.preset.Height = btn:GetSize()
-				btn.preset.Point, btn.preset.relativeTo, btn.preset.relativePoint, btn.preset.xOfs, btn.preset.yOfs = btn:GetPoint()
-				btn.preset.Parent = btn:GetParent()
-				btn.preset.FrameStrata = btn:GetFrameStrata()
-				btn.preset.FrameLevel = btn:GetFrameLevel()
-				btn.preset.Scale = btn:GetScale()
-				if btn:HasScript("OnDragStart") then
-					btn.preset.DragStart = btn:GetScript("OnDragStart")
-				end
-				if btn:HasScript("OnDragEnd") then
-					btn.preset.DragEnd = btn:GetScript("OnDragEnd")
-				end
 				if frame:GetObjectType() == "Texture" then
 					local iconFile = frame:GetTexture()
 					if(iconFile ~= nil and (iconFile:find("Border") or iconFile:find("Background") or iconFile:find("AlphaMask"))) then
@@ -234,26 +238,34 @@ do
 					end
 				end
 			end
+
 			btn:SetSlotTemplate(true, 2, -1, -1)
-			if name == "DBMMinimapButton" then
+
+			if(name == "DBMMinimapButton") then
 				btn:SetNormalTexture("Interface\\Icons\\INV_Helmet_87")
 			end
-			if name == "SmartBuff_MiniMapButton" then
+
+			if(name == "SmartBuff_MiniMapButton") then
 				btn:SetNormalTexture(select(3, GetSpellInfo(12051)))
 			end
+
 			btn.isStyled = true
+
 			local nextindex = #buttonCache[2] + 1
 			buttonCache[2][nextindex] = name
-		end
+		end
 	end

 	local StyleMinimapButtons = function()
 		local count = Minimap:GetNumChildren()
+
 		for i=1, count do
 			local child = select(i,Minimap:GetChildren())
 			SetMinimapButton(child)
-		end
+		end
+
 		UpdateMinimapButtons()
+
 		if MOD.db.minimapbar.mouseover then
 			MMBBar:SetAlpha(0)
 		else
@@ -261,9 +273,13 @@ do
 		end
 	end

-	function MOD:UpdateMinimapButtonSettings()
-		if(not self.db.minimapbar.enable) then return end
-		SV.Timers:ExecuteTimer(StyleMinimapButtons, 4)
+	function MOD:UpdateMinimapButtonSettings(notimer)
+		if(not self.db.minimapbar.enable or not MMBBar:IsShown()) then return end
+		if(notimer) then
+			StyleMinimapButtons()
+		else
+			SV.Timers:ExecuteTimer(StyleMinimapButtons, 4)
+		end
 	end
 end

@@ -684,6 +700,7 @@ local function CreateMiniMapElements()
 	SVUI_MinimapFrame.backdrop:WrapOuter(SVUI_MinimapFrame, 2)
 	SVUI_MinimapFrame.backdrop:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]])
 	SVUI_MinimapFrame.backdrop:SetGradient(unpack(MM_COLOR))
+	SVUI_MinimapFrame:SetPanelTemplate("Blackout")

 	local border = CreateFrame("Frame", nil, SVUI_MinimapFrame)
 	border:WrapOuter(SVUI_MinimapFrame.backdrop)
@@ -879,6 +896,10 @@ function MOD:PLAYER_REGEN_DISABLED()
 	WorldMapFrameSizeDownButton:Disable()
 	WorldMapFrameSizeUpButton:Disable()
 end
+
+function MOD:PET_BATTLE_CLOSE()
+	self:UpdateMinimapButtonSettings()
+end
 --[[
 ##########################################################
 BUILD FUNCTION / UPDATE
@@ -904,6 +925,7 @@ function MOD:Load()
 	self:RegisterEvent("ZONE_CHANGED", UpdateMinimapLocation)
 	self:RegisterEvent("ZONE_CHANGED_INDOORS", UpdateMinimapLocation)
 	self:RegisterEvent('ADDON_LOADED')
+	--self:RegisterEvent("PET_BATTLE_CLOSE")

 	if(self.db.minimapbar.enable == true) then
 		MMBHolder = CreateFrame("Frame", "SVUI_MiniMapButtonHolder", SVUI_MinimapFrame)
diff --git a/Interface/AddOns/SVUI/scripts/misc.lua b/Interface/AddOns/SVUI/scripts/misc.lua
index d6f25e1..29e7965 100644
--- a/Interface/AddOns/SVUI/scripts/misc.lua
+++ b/Interface/AddOns/SVUI/scripts/misc.lua
@@ -215,12 +215,12 @@ end

 local function LoadDressupHelper()
 	--[[ PAPER DOLL ENHANCEMENT ]]--
-	local tabard1 = SV:CreateButton(DressUpFrame, "Tabard", "BOTTOMLEFT", 26, 79, 80, 22, "")
+	local tabard1 = SV:CreateButton(DressUpFrame, "Tabard", "BOTTOMLEFT", 12, 12, 80, 22, "")
 	tabard1:SetScript("OnClick", function()
 		DressUpModel:UndressSlot(19)
 	end)

-	local nude1 = SV:CreateButton(DressUpFrame, "Nude", "BOTTOMLEFT", 106, 79, 80, 22, "")
+	local nude1 = SV:CreateButton(DressUpFrame, "Nude", "BOTTOMLEFT", 104, 12, 80, 22, "")
 	nude1:SetScript("OnClick", function()
 		DressUpFrameResetButton:Click()
 		for i = 1, 19 do
@@ -230,6 +230,7 @@ local function LoadDressupHelper()

 	local BtnStrata, BtnLevel = SideDressUpModelResetButton:GetFrameStrata(), SideDressUpModelResetButton:GetFrameLevel()

+	-- frame, label, anchor, x, y, width, height, tooltip

 	local tabard2 = SV:CreateButton(SideDressUpFrame, "Tabard", "BOTTOMLEFT", 14, 20, 60, 22, "")
 	tabard2:SetFrameStrata(BtnStrata);
diff --git a/Interface/AddOns/SVUI/system/common.lua b/Interface/AddOns/SVUI/system/common.lua
index ddf89cb..3171d3c 100644
--- a/Interface/AddOns/SVUI/system/common.lua
+++ b/Interface/AddOns/SVUI/system/common.lua
@@ -162,6 +162,10 @@ function SV:ScreenCalibration(event)
         end

         self.UIParent:UnregisterEvent('PLAYER_LOGIN')
+
+        self.EffectiveScale = self.UIParent:GetEffectiveScale()
+        self.ActualHeight = self.UIParent:GetHeight()
+        self.ActualWidth = self.UIParent:GetWidth()
     end
 end
 --[[
@@ -564,6 +568,29 @@ local _templates = {
         shadow = false,
         noupdate = false,
     },
+    ["ModelComic"] = {
+        backdrop = {
+            bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\Background\COMIC-MODEL]],
+            edgeFile = [[Interface\BUTTONS\WHITE8X8]],
+            tile = false,
+            tileSize = 0,
+            edgeSize = 3,
+            insets =
+            {
+                left = 0,
+                right = 0,
+                top = 0,
+                bottom = 0,
+            },
+        },
+        color = "special",
+        gradient = "class",
+        texture = [[Interface\AddOns\SVUI\assets\artwork\Template\Background\COMIC-MODEL]],
+        texupdate = false,
+        padding = 3,
+        shadow = false,
+        noupdate = true,
+    },
     ["Container"] = {
         backdrop = {
             bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\Background\PATTERN3]],
@@ -657,7 +684,31 @@ local _templates = {
         shadow = true,
         noupdate = false,
         extended = [[ACTION]],
-    },
+    },
+    ["Blackout"] = {
+        backdrop = {
+            bgFile = [[Interface\BUTTONS\WHITE8X8]],
+            edgeFile = [[Interface\BUTTONS\WHITE8X8]],
+            tile = false,
+            tileSize = 0,
+            edgeSize = 2,
+            insets =
+            {
+                left = 1,
+                right = 1,
+                top = 1,
+                bottom = 1,
+            },
+        },
+        color = "transparent",
+        gradient = false,
+        texture = [[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]],
+        texupdate = false,
+        padding = 2,
+        forcedOffset = 2,
+        shadow = true,
+        noupdate = true,
+    },
     ["UnitLarge"] = {
         backdrop = false,
         color = "special",
@@ -691,7 +742,7 @@ local HookPanelBorderColor = function(self,r,g,b,a)
         self[3]:SetTexture(r,g,b,a)
         self[4]:SetTexture(r,g,b,a)
         if self[5]then
-            self[5]:SetBackdropBorderColor(r,g,b,0.5)
+            self[5]:SetBackdropBorderColor(r,g,b,0.7)
         end
     end
 end
@@ -758,8 +809,8 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd

     padding = padding or settings.padding or 1

-    xOffset = xOffset or 1
-    yOffset = yOffset or 1
+    xOffset = settings.forcedOffset or xOffset or 1
+    yOffset = settings.forcedOffset or yOffset or 1

     frame._template = templateName;
     frame._color = colorName;
@@ -877,16 +928,13 @@ local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padd
     end

     if(texFile) then
-        local xyOffset = padding + 1;
         if(not frame._skin) then
             if(underlay) then
                 frame._skin = frame.Panel:CreateTexture(nil,"BACKGROUND",nil,initLevel)
-                frame._skin:Point('TOPLEFT', frame.Panel, 'TOPLEFT', xyOffset, (xyOffset * -1))
-                frame._skin:Point('BOTTOMRIGHT', frame.Panel, 'BOTTOMRIGHT', (xyOffset * -1), xyOffset)
+                frame._skin:SetAllPoints(frame.Panel)
             else
                 frame._skin = frame:CreateTexture(nil,"BACKGROUND",nil,initLevel)
-                frame._skin:Point('TOPLEFT', frame, 'TOPLEFT', xyOffset, (xyOffset * -1))
-                frame._skin:Point('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', (xyOffset * -1), xyOffset)
+                frame._skin:SetAllPoints(frame)
             end
         end

@@ -1273,7 +1321,7 @@ local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOff
 end

 local function SetSlotTemplate(self, underlay, padding, x, y, noChecked)
-    if(not self or (self and self.Panel)) then return end
+    if(not self) then return end

     padding = padding or 1
     CreatePanelTemplate(self, "Slot", underlay, true, padding, x, y)
diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua
index 387109c..87cf595 100644
--- a/Interface/AddOns/SVUI/system/media.lua
+++ b/Interface/AddOns/SVUI/system/media.lua
@@ -132,17 +132,17 @@ do
   local Shared = SV.Shared

   SV.Media["color"] = {
-    ["default"]   = {0.2, 0.2, 0.2, 1},
-    ["special"]   = {.37, .32, .29, 1},
-    ["unique"]    = {0.32, 0.258, 0.21, 1},
-    ["class"]     = {r1, g1, b1, 1},
-    ["bizzaro"]   = {ir1, ig1, ib1, 1},
-    ["dark"]    = {0, 0, 0, 1},
-    ["light"]     = {0.95, 0.95, 0.95, 1},
+    ["default"]     = {0.2, 0.2, 0.2, 1},
+    ["special"]     = {.37, .32, .29, 1},
+    ["unique"]      = {0.32, 0.258, 0.21, 1},
+    ["class"]       = {r1, g1, b1, 1},
+    ["bizzaro"]     = {ir1, ig1, ib1, 1},
+    ["dark"]        = {0, 0, 0, 1},
+    ["light"]       = {0.95, 0.95, 0.95, 1},
     ["highlight"]   = {0.1, 0.8, 0.8, 1},
-    ["green"]     = {0.25, 0.9, 0.08, 1},
-    ["red"]     = {0.9, 0.08, 0.08, 1},
-    ["yellow"]    = {1, 1, 0, 1},
+    ["green"]       = {0.25, 0.9, 0.08, 1},
+    ["red"]         = {0.9, 0.08, 0.08, 1},
+    ["yellow"]      = {1, 1, 0, 1},
     ["transparent"] = {0, 0, 0, 0.5},
   }

diff --git a/Interface/AddOns/SVUI/system/utilities.lua b/Interface/AddOns/SVUI/system/utilities.lua
index 29e0be2..1a28bff 100644
--- a/Interface/AddOns/SVUI/system/utilities.lua
+++ b/Interface/AddOns/SVUI/system/utilities.lua
@@ -238,7 +238,26 @@ do
         --[[ auto-set specific properties to save on logic ]]--
         frame.initialAnchor = anchor;
     end
-end
+end
+
+function SV:AnchorToCursor(frame)
+    local x, y = GetCursorPosition()
+    local vHold = self.yScreenArea
+    local scale = self.EffectiveScale
+    local initialAnchor = "CENTER"
+    local mod = 0
+
+    if(y > (vHold * 2)) then
+        initialAnchor = "TOPLEFT"
+        mod = -12
+    elseif(y < vHold) then
+        initialAnchor = "BOTTOMLEFT"
+        mod = 12
+    end
+
+    frame:ClearAllPoints()
+    frame:SetPoint(initialAnchor, SV.UIParent, "BOTTOMLEFT", (x  /  scale), (y  /  scale) + mod)
+end
 --[[
 ##########################################################
 ITEM UTILITY FUNCTIONS
diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
index c1bf7e6..46c4143 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
@@ -381,6 +381,7 @@ BUILD FUNCTION
 ##########################################################
 ]]--
 function PLUGIN:Load()
+	if(not SV.db[SCHEMA].enable) then return end
 	self.db = SV.db[SCHEMA]

 	local alert = CreateFrame('Frame', nil, UIParent);
@@ -727,6 +728,7 @@ function PLUGIN:Load()
 end

 CONFIGS[SCHEMA] = {
+	["enable"] = true,
 	["blizzard"] = {
 		["enable"] = true,
 		["bags"] = true,
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
index cbe7310..592347a 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/achievement.lua
@@ -159,7 +159,7 @@ local function AchievementStyle()
 		end
 	end

-	STYLE:ApplyWindowHolder(AchievementFrame)
+	STYLE:ApplyWindowStyle(AchievementFrame)

 	AchievementFrameSummaryAchievements:RemoveTextures(true)
 	AchievementFrameSummaryAchievements:SetBasicPanel()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
index ed8797a..3a9616b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua
@@ -81,7 +81,7 @@ local function AuctionStyle()
 	--STYLE.Debugging = true
 	if(SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.auctionhouse ~= true) then return end

-	STYLE:ApplyWindowHolder(AuctionFrame, false, true)
+	STYLE:ApplyWindowStyle(AuctionFrame, false, true)

 	BrowseFilterScrollFrame:RemoveTextures()
 	BrowseScrollFrame:RemoveTextures()
@@ -105,8 +105,7 @@ local function AuctionStyle()
 	SideDressUpFrame:SetPanelTemplate("Halftone")
 	SideDressUpFrame:Point("TOPLEFT", AuctionFrame, "TOPRIGHT", 7, 0)
 	SideDressUpModel:RemoveTextures(true)
-	SideDressUpModel:SetFixedPanelTemplate("Comic")
-	SideDressUpModel:SetPanelColor("special")
+	SideDressUpModel:SetFixedPanelTemplate("ModelComic")
 	SideDressUpModelResetButton:SetButtonTemplate()
 	STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton)

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
index 4f302c7..45ea3b0 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/calendar.lua
@@ -36,7 +36,7 @@ local function CalendarStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(CalendarFrame)
+	STYLE:ApplyWindowStyle(CalendarFrame)

 	STYLE:ApplyCloseButtonStyle(CalendarCloseButton)
 	CalendarCloseButton:Point("TOPRIGHT", CalendarFrame, "TOPRIGHT", -4, -4)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
index b227ee6..860af88 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/character.lua
@@ -182,7 +182,7 @@ local function CharacterFrameStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(CharacterFrame, true)
+	STYLE:ApplyWindowStyle(CharacterFrame, true)

 	STYLE:ApplyCloseButtonStyle(CharacterFrameCloseButton)
 	STYLE:ApplyScrollFrameStyle(CharacterStatsPaneScrollBar)
@@ -258,7 +258,7 @@ local function CharacterFrameStyle()
 	CharacterModelFrameBackgroundBotLeft:SetTexture(0,0,0,0)
 	CharacterModelFrameBackgroundBotRight:SetTexture(0,0,0,0)

-	CharacterModelFrame:SetPanelTemplate("Comic", false, 0)
+	CharacterModelFrame:SetFixedPanelTemplate("ModelComic")
 	CharacterFrameExpandButton:SetFrameLevel(CharacterModelFrame:GetFrameLevel() + 5)

 	PaperDollTitlesPane:SetBasicPanel()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
index a9301fa..460db5d 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/dressup.lua
@@ -23,25 +23,23 @@ DRESSUP STYLER
 local function DressUpStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.dressingroom ~= true then
 		 return
-	end
-	DressUpFrame:RemoveTextures(true)
-	local w = DressUpFrame:GetWidth() - 32
-	local h = DressUpFrame:GetHeight() - 72
-	local bg = CreateFrame("Frame",nil,DressUpFrame)
-	local lvl = DressUpFrame:GetFrameLevel()
-	if lvl > 0 then
-		lvl = lvl - 1
 	end
-	bg:SetPoint("TOPLEFT",DressUpFrame,"TOPLEFT",7,-7)
-	bg:SetSize(w,h)
-	bg:SetFrameLevel(lvl)
-	bg:SetPanelTemplate("Pattern")
-	DressUpModel:SetFixedPanelTemplate("Comic")
-	DressUpModel:SetPanelColor("special")
-	DressUpFrameResetButton:SetButtonTemplate()
+
+	STYLE:ApplyWindowStyle(DressUpFrame, true, true)
+
+	DressUpModel:ClearAllPoints()
+	DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76)
+	DressUpModel:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36)
+
+	DressUpModel:SetFixedPanelTemplate("ModelComic")
+
+	DressUpFrameCancelButton:Point("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12)
 	DressUpFrameCancelButton:SetButtonTemplate()
-	STYLE:ApplyCloseButtonStyle(DressUpFrameCloseButton, bg.Panel)
-	DressUpFrameResetButton:Point("RIGHT", DressUpFrameCancelButton, "LEFT", -2, 0)
+
+	DressUpFrameResetButton:Point("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0)
+	DressUpFrameResetButton:SetButtonTemplate()
+
+	STYLE:ApplyCloseButtonStyle(DressUpFrameCloseButton, DressUpFrame.Panel)
 end
 --[[
 ##########################################################
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
index 0667b5d..f923df6 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua
@@ -119,7 +119,7 @@ local function FriendsFrameStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(FriendsFrame)
+	STYLE:ApplyWindowStyle(FriendsFrame)

 	STYLE:ApplyScrollFrameStyle(FriendsFrameFriendsScrollFrameScrollBar, 5)
 	STYLE:ApplyScrollFrameStyle(WhoListScrollFrameScrollBar, 5)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
index d7579ab..a2655f2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua
@@ -165,7 +165,7 @@ local function GuildBankStyle()
 		return
 	end

-	STYLE:ApplyWindowHolder(GuildBankFrame)
+	STYLE:ApplyWindowStyle(GuildBankFrame)

 	GuildBankEmblemFrame:RemoveTextures(true)
 	GuildBankMoneyFrameBackground:Die()
@@ -287,7 +287,7 @@ local function GuildFrameStyle()
 		return
 	end

-	STYLE:ApplyWindowHolder(GuildFrame)
+	STYLE:ApplyWindowStyle(GuildFrame)

 	STYLE:ApplyCloseButtonStyle(GuildMemberDetailCloseButton)
 	STYLE:ApplyCloseButtonStyle(GuildFrameCloseButton)
@@ -536,7 +536,7 @@ local function GuildControlStyle()
 	GuildControlUIRankBankFrameInset:RemoveTextures()
 	GuildControlUIRankBankFrameInsetScrollFrame:RemoveTextures()

-	STYLE:ApplyWindowHolder(GuildControlUI)
+	STYLE:ApplyWindowStyle(GuildControlUI)

 	STYLE:ApplyScrollFrameStyle(GuildControlUIRankBankFrameInsetScrollFrameScrollBar)

@@ -605,7 +605,7 @@ local function GuildRegistrarStyle()
 		return
 	end

-	STYLE:ApplyWindowHolder(GuildRegistrarFrame, true, true)
+	STYLE:ApplyWindowStyle(GuildRegistrarFrame, true, true)

 	GuildRegistrarFrameInset:Die()
 	GuildRegistrarFrameEditBox:RemoveTextures()
@@ -642,7 +642,7 @@ end
 local function LFGuildFrameStyle()
 	if(SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.lfguild ~= true) then return end

-	STYLE:ApplyWindowHolder(LookingForGuildFrame, true)
+	STYLE:ApplyWindowStyle(LookingForGuildFrame, true)

 	for i = 1, #LFGFrameList do
 		local check = _G[LFGFrameList[i]]
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
index 756c778..ebb78de 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua
@@ -25,7 +25,7 @@ local function ItemUpgradeStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(ItemUpgradeFrame, true)
+	STYLE:ApplyWindowStyle(ItemUpgradeFrame, true)

 	STYLE:ApplyCloseButtonStyle(ItemUpgradeFrameCloseButton)
 	ItemUpgradeFrameUpgradeButton:RemoveTextures()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
index 24d4d79..eee4b67 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua
@@ -108,7 +108,7 @@ LFD STYLER
 local function LFDFrameStyle()
   if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.lfg ~= true then return end

-  STYLE:ApplyWindowHolder(PVEFrame, true)
+  STYLE:ApplyWindowStyle(PVEFrame, true)

   PVEFrameLeftInset:RemoveTextures()
   RaidFinderQueueFrame:RemoveTextures(true)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
index 115f516..4189fbd 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/mailbox.lua
@@ -43,7 +43,7 @@ MAILBOX STYLER
 local function MailBoxStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.mail ~= true then return end

-	STYLE:ApplyWindowHolder(MailFrame)
+	STYLE:ApplyWindowStyle(MailFrame)

 	for b = 1, INBOXITEMS_TO_DISPLAY do
 		local i = _G["MailItem"..b]
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
index 18d39cc..f3cf0fa 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petbattle.lua
@@ -59,24 +59,29 @@ local function PetBattleStyle()
 			frame.Border:SetAlpha(0)
 			frame.Border2:SetAlpha(0)
 			frame.healthBarWidth = 300;
+
 			frame.IconBackdrop = CreateFrame("Frame", nil, frame)
-			frame.IconBackdrop:SetFrameLevel(frame:GetFrameLevel()-1)
-			frame.IconBackdrop:WrapOuter(frame.Icon)
-			frame.IconBackdrop:SetFixedPanelTemplate("Slot")
+			frame.IconBackdrop:SetFrameLevel(0)
+			frame.IconBackdrop:WrapOuter(frame.Icon, 3, 3)
+			frame.IconBackdrop:SetSlotTemplate(true, 3, 0, 0, true);
+
+			frame.IconBackdrop.Panel:SetFixedPanelTemplate("Blackout")
+
 			frame.BorderFlash:Die()
 			frame.HealthBarBG:Die()
 			frame.HealthBarFrame:Die()
 			frame.HealthBarBackdrop = CreateFrame("Frame", nil, frame)
 			frame.HealthBarBackdrop:SetFrameLevel(frame:GetFrameLevel()-1)
-			frame.HealthBarBackdrop:SetFixedPanelTemplate("Inset")
+			frame.HealthBarBackdrop:SetFixedPanelTemplate("Blackout")
 			frame.HealthBarBackdrop:Width(frame.healthBarWidth+(2))
-			frame.ActualHealthBar:SetTexture([[Interface\BUTTONS\WHITE8X8]])
+			frame.ActualHealthBar:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]])
 			frame.PetTypeFrame = CreateFrame("Frame", nil, frame)
 			frame.PetTypeFrame:Size(100, 23)
 			frame.PetTypeFrame.text = frame.PetTypeFrame:CreateFontString(nil, 'OVERLAY')
-			frame.PetTypeFrame.text:SetFontTemplate()
+			frame.PetTypeFrame.text:SetFont(SV.Media.font.roboto, 12, "OUTLINE")
 			frame.PetTypeFrame.text:SetText("")
 			frame.ActualHealthBar:ClearAllPoints()
+			frame.Name:SetFontObject(SystemFont_Shadow_Outline_Huge2)
 			frame.Name:ClearAllPoints()
 			frame.FirstAttack = frame:CreateTexture(nil, "ARTWORK")
 			frame.FirstAttack:Size(30)
@@ -88,7 +93,7 @@ local function PetBattleStyle()
 				PetBattleFrame.Ally2.iconPoint = frame.IconBackdrop;
 				PetBattleFrame.Ally3.iconPoint = frame.IconBackdrop;
 				frame.ActualHealthBar:Point('BOTTOMLEFT', frame.Icon, 'BOTTOMRIGHT', 10, 0)
-				frame.Name:Point('BOTTOMLEFT', frame.ActualHealthBar, 'TOPLEFT', 0, 10)
+				frame.Name:Point('BOTTOMLEFT', frame.ActualHealthBar, 'TOPLEFT', 0, 8)
 				frame.PetTypeFrame:SetPoint("BOTTOMRIGHT", frame.HealthBarBackdrop, "TOPRIGHT", 0, 4)
 				frame.PetTypeFrame.text:SetPoint("RIGHT")
 				frame.FirstAttack:SetPoint("LEFT", frame.HealthBarBackdrop, "RIGHT", 5, 0)
@@ -101,7 +106,7 @@ local function PetBattleStyle()
 				PetBattleFrame.Enemy2.iconPoint = frame.IconBackdrop;
 				PetBattleFrame.Enemy3.iconPoint = frame.IconBackdrop;
 				frame.ActualHealthBar:Point('BOTTOMRIGHT', frame.Icon, 'BOTTOMLEFT', -10, 0)
-				frame.Name:Point('BOTTOMRIGHT', frame.ActualHealthBar, 'TOPRIGHT', 0, 10)
+				frame.Name:Point('BOTTOMRIGHT', frame.ActualHealthBar, 'TOPRIGHT', 0, 8)
 				frame.PetTypeFrame:SetPoint("BOTTOMLEFT", frame.HealthBarBackdrop, "TOPLEFT", 2, 4)
 				frame.PetTypeFrame.text:SetPoint("LEFT")
 				frame.FirstAttack:SetPoint("RIGHT", frame.HealthBarBackdrop, "LEFT", -5, 0)
@@ -110,14 +115,14 @@ local function PetBattleStyle()
 			end
 			frame.HealthText:ClearAllPoints()
 			frame.HealthText:SetPoint('CENTER', frame.HealthBarBackdrop, 'CENTER')
+			frame.PetType:SetFrameLevel(frame.PetTypeFrame:GetFrameLevel()+2)
 			frame.PetType:ClearAllPoints()
 			frame.PetType:SetAllPoints(frame.PetTypeFrame)
-			frame.PetType:SetFrameLevel(frame.PetTypeFrame:GetFrameLevel()+2)
 			frame.PetType:SetAlpha(0)
 			frame.LevelUnderlay:SetAlpha(0)
 			frame.Level:SetFontObject(NumberFont_Outline_Huge)
 			frame.Level:ClearAllPoints()
-			frame.Level:Point('BOTTOMLEFT', frame.Icon, 'BOTTOMLEFT', 2, 2)
+			frame.Level:Point('BOTTOMLEFT', frame.Icon, 'BOTTOMLEFT', -2, -2)
 			if frame.SpeedIcon then
 				frame.SpeedIcon:ClearAllPoints()
 				frame.SpeedIcon:SetPoint("CENTER")
@@ -135,25 +140,21 @@ local function PetBattleStyle()
 			frame.HealthDivider:SetAlpha(0)
 			frame:Size(40)

-			local tempBG = CreateFrame('Frame', nil, frame)
-			tempBG:WrapOuter(frame, 2, 2)
-			tempBG:SetFrameLevel(0)
-			tempBG:SetBackdrop({ edgeFile = [[Interface\BUTTONS\WHITE8X8]], edgeSize = 2 })
-			tempBG:SetBackdropBorderColor(0, 0, 0)
+			frame.IconBackdrop = CreateFrame("Frame", nil, frame)
+			frame.IconBackdrop:SetFrameLevel(0)
+			frame.IconBackdrop:WrapOuter(frame, 2, 2)
+			frame.IconBackdrop:SetSlotTemplate(true, 2, 0, 0, true);

-			frame.bgTexture = tempBG:CreateTexture(nil, "BACKGROUND", nil, -5)
-			frame.bgTexture:FillInner(frame, 2, 2)
-			frame.bgTexture:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]])
-			frame.bgTexture:SetVertexColor(0.1, 0.1, 0.1)
-			frame.bgTexture:SetBlendMode("ADD")
+			frame.IconBackdrop.Panel:SetFixedPanelTemplate("Blackout")

 			frame:ClearAllPoints()
 			frame.healthBarWidth = 40;
 			frame.ActualHealthBar:ClearAllPoints()
-			frame.ActualHealthBar:SetPoint("TOPLEFT", tempBG, 'BOTTOMLEFT', 1, -3)
+			frame.ActualHealthBar:SetPoint("TOPLEFT", frame.IconBackdrop, 'BOTTOMLEFT', 2, -3)
+			frame.ActualHealthBar:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]])
 			frame.HealthBarBackdrop = CreateFrame("Frame", nil, frame)
 			frame.HealthBarBackdrop:SetFrameLevel(frame:GetFrameLevel()-1)
-			frame.HealthBarBackdrop:SetFixedPanelTemplate("Inset")
+			frame.HealthBarBackdrop:SetFixedPanelTemplate("Blackout")
 			frame.HealthBarBackdrop:Width(frame.healthBarWidth+2)
 			frame.HealthBarBackdrop:Point('TOPLEFT', frame.ActualHealthBar, 'TOPLEFT', -1, 1)
 			frame.HealthBarBackdrop:Point('BOTTOMLEFT', frame.ActualHealthBar, 'BOTTOMLEFT', -1, -1)
@@ -166,7 +167,7 @@ local function PetBattleStyle()
 	PetBattleActionBar:EnableMouse(true)
 	PetBattleActionBar:SetFrameLevel(0)
 	PetBattleActionBar:SetFrameStrata('BACKGROUND')
-	PetBattleActionBar:SetFixedPanelTemplate("Inset")
+	PetBattleActionBar:SetFixedPanelTemplate("Blackout")

 	if(SuperDockBottomDataAnchor) then
 		PetBattleActionBar:SetPoint("BOTTOM", SuperDockBottomDataAnchor, "TOP", 0, 4)
@@ -186,9 +187,9 @@ local function PetBattleStyle()
 	BottomFrame.TurnTimer:RemoveTextures()
 	BottomFrame.TurnTimer.SkipButton:SetParent(PetBattleActionBar)
 	BottomFrame.TurnTimer.SkipButton:SetButtonTemplate()
-	BottomFrame.TurnTimer.SkipButton:Width(PBAB_WIDTH)
+	BottomFrame.TurnTimer.SkipButton:Size((PBAB_WIDTH * 0.2) - 4, 18)
 	BottomFrame.TurnTimer.SkipButton:ClearAllPoints()
-	BottomFrame.TurnTimer.SkipButton:SetPoint("BOTTOM", PetBattleActionBar, "TOP", 0, -1)
+	BottomFrame.TurnTimer.SkipButton:SetPoint("BOTTOMLEFT", PetBattleActionBar.Panel, "TOPLEFT", 2, 2)
 	BottomFrame.TurnTimer:Size(BottomFrame.TurnTimer.SkipButton:GetWidth(), BottomFrame.TurnTimer.SkipButton:GetHeight())
 	BottomFrame.TurnTimer:ClearAllPoints()
 	BottomFrame.TurnTimer:SetPoint("TOP", SV.UIParent, "TOP", 0, -140)
@@ -198,9 +199,10 @@ local function PetBattleStyle()
 	BottomFrame.Delimiter:RemoveTextures()
 	BottomFrame.xpBar:ClearAllPoints()
 	BottomFrame.xpBar:SetParent(PetBattleActionBar)
-	BottomFrame.xpBar:Width(PBAB_WIDTH - 2)
-	BottomFrame.xpBar:SetPanelTemplate("Inset")
-	BottomFrame.xpBar:SetPoint("BOTTOM", BottomFrame.TurnTimer.SkipButton, "TOP", 0, 1)
+	BottomFrame.xpBar:Size((PBAB_WIDTH * 0.8) - 4, 16)
+	BottomFrame.xpBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]])
+	BottomFrame.xpBar:SetPanelTemplate("Bar")
+	BottomFrame.xpBar:SetPoint("BOTTOMRIGHT", PetBattleActionBar.Panel, "TOPRIGHT", -3, 3)
 	BottomFrame.xpBar:SetScript("OnShow", function(self)
 		self:RemoveTextures()
 		self:SetStatusBarTexture(SV.Media.bar.default)
@@ -306,17 +308,26 @@ local function PetBattleStyle()

 	hooksecurefunc("PetBattleUnitFrame_UpdateDisplay", function(self)
 		self.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
+		--Update the pet rarity border
+	    if (self.IconBackdrop) then
+	    	local petOwner = self.petOwner;
+    		local petIndex = self.petIndex;
+	        local rarity = C_PetBattles.GetBreedQuality(petOwner, petIndex);
+	        if (ENABLE_COLORBLIND_MODE ~= "1") then
+	        	self.IconBackdrop:SetBackdropColor(ITEM_QUALITY_COLORS[rarity-1].r, ITEM_QUALITY_COLORS[rarity-1].g, ITEM_QUALITY_COLORS[rarity-1].b);
+	            self.IconBackdrop:SetBackdropBorderColor(ITEM_QUALITY_COLORS[rarity-1].r, ITEM_QUALITY_COLORS[rarity-1].g, ITEM_QUALITY_COLORS[rarity-1].b);
+	        end
+	    end
 	end)

 	hooksecurefunc("PetBattleAbilityTooltip_Show", function()
-		PetBattlePrimaryAbilityTooltip:ClearAllPoints()
-		PetBattlePrimaryAbilityTooltip:SetPoint("BOTTOMLEFT", RightSuperDock, "TOPLEFT")
+		SV:AnchorToCursor(PetBattlePrimaryAbilityTooltip)
 	end)

 	hooksecurefunc(BottomFrame.TurnTimer.SkipButton, "SetPoint", function(self, arg1, _, arg2, arg3, arg4)
 		if (arg1 ~= "BOTTOM" or arg2 ~= "TOP" or arg3 ~= 0 or arg4 ~= -1) then
 			self:ClearAllPoints()
-			self:SetPoint("BOTTOM", PetBattleActionBar, "TOP", 0, -1)
+			self:SetPoint("BOTTOMLEFT", PetBattleActionBar.Panel, "TOPLEFT", 2, 2)
 		end
 	end)

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
index fc5b18d..817957a 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/petjournal.lua
@@ -89,7 +89,7 @@ FRAME STYLER
 local function PetJournalStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.mounts ~= true then return end

-	STYLE:ApplyWindowHolder(PetJournalParent)
+	STYLE:ApplyWindowStyle(PetJournalParent)

 	PetJournalParentPortrait:Hide()
 	STYLE:ApplyTabStyle(PetJournalParentTab1)
@@ -107,7 +107,7 @@ local function PetJournalStyle()
 	MountJournalSearchBox:SetEditboxTemplate()

 	STYLE:ApplyScrollFrameStyle(MountJournalListScrollFrameScrollBar)
-	MountJournal.MountDisplay:SetFixedPanelTemplate("Comic")
+	MountJournal.MountDisplay:SetFixedPanelTemplate("ModelComic")

 	for i = 1, #MountJournal.ListScrollFrame.buttons do
 		local button = _G["MountJournalListScrollFrameButton"..i]
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
index 443ac9a..74c44e9 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua
@@ -27,7 +27,7 @@ local function PVPFrameStyle()
 		return
 	end

-	STYLE:ApplyWindowHolder(PVPUIFrame, true)
+	STYLE:ApplyWindowStyle(PVPUIFrame, true)

 	STYLE:ApplyCloseButtonStyle(PVPUIFrameCloseButton)

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
index 901d1b2..2160d9d 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua
@@ -118,7 +118,7 @@ end
 local function QuestFrameStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.quest ~= true then return end

-	STYLE:ApplyWindowHolder(QuestFrame, true, true)
+	STYLE:ApplyWindowStyle(QuestFrame, true, true)

 	--[[ THIS SECTION NOT WORKING IN WOD ]]--
 	if(SV.___interface < 60000) then
@@ -129,7 +129,7 @@ local function QuestFrameStyle()
 		QuestLogFrameShowMapButton:RemoveTextures()
 		QuestLogFrameCompleteButton:RemoveTextures()

-		STYLE:ApplyWindowHolder(QuestLogFrame)
+		STYLE:ApplyWindowStyle(QuestLogFrame)
 		QuestLogCount:SetFixedPanelTemplate("Default")

 		QuestLogDetailFrameInset:Die()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
index 25549e7..11a31de 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/reforging.lua
@@ -23,7 +23,7 @@ REFORGING STYLER
 local function ReforgingStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.reforge ~= true then return end

-	STYLE:ApplyWindowHolder(ReforgingFrame, true)
+	STYLE:ApplyWindowStyle(ReforgingFrame, true)

 	ReforgingFrame.ButtonFrame:RemoveTextures()
 	ReforgingFrameReforgeButton:ClearAllPoints()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
index 7b78d2b..06b01e1 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua
@@ -214,7 +214,7 @@ SPELLBOOK STYLER
 local function SpellBookStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.spellbook ~= true then return end

-	STYLE:ApplyWindowHolder(SpellBookFrame)
+	STYLE:ApplyWindowStyle(SpellBookFrame)
 	STYLE:ApplyCloseButtonStyle(SpellBookFrameCloseButton)

 	for _, gName in pairs(bookFrames) do
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
index 7592316..dade5fe 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/store.lua
@@ -25,7 +25,7 @@ local function StoreStyle()
 	-- 	 return
 	-- end

-	--STYLE:ApplyWindowHolder(StoreFrame)
+	--STYLE:ApplyWindowStyle(StoreFrame)
 	STYLE:ApplyTooltipStyle(StoreTooltip)
 end
 --[[
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
index 6c07211..051dc32 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua
@@ -414,7 +414,7 @@ local function SystemPanelQue()
 	for i = 1, #SystemFrameList1 do
 		local this = _G[SystemFrameList1[i]]
 		if(this) then
-			STYLE:ApplyWindowHolder(this)
+			STYLE:ApplyWindowStyle(this)
 		end
 	end

diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
index cc35c17..2304091 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/talents.lua
@@ -107,7 +107,7 @@ TALENTFRAME STYLER
 local function TalentFrameStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.talent ~= true then return end

-	STYLE:ApplyWindowHolder(PlayerTalentFrame)
+	STYLE:ApplyWindowStyle(PlayerTalentFrame)

 	PlayerTalentFrameInset:RemoveTextures()
 	PlayerTalentFrameTalents:RemoveTextures()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
index afc75ea..c51751a 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua
@@ -25,7 +25,7 @@ local function TaxiStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(TaxiFrame)
+	STYLE:ApplyWindowStyle(TaxiFrame)

 	TaxiRouteMap:SetPanelTemplate("Default")
 	TaxiRouteMap.Panel:WrapOuter(TaxiRouteMap, 4, 4)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
index 9d2c491..0d8b30b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/thirdparty/Skada.lua
@@ -96,15 +96,22 @@ local function StyleSkada()

   hooksecurefunc(SkadaDisplayBar, 'ApplySettings', function(self, window)
     local skada = window.bargroup
+    skada:SetSpacing(1)
     skada:SetFrameLevel(5)
     skada:SetBackdrop(nil)
-    if(window.db.enabletitle and not skada.button.Panel) then
-      skada.button:SetFixedPanelTemplate('Default', true)
+
+    if(window.db.enabletitle) then
+      skada.button:SetHeight(18)
+      skada.button:SetButtonTemplate()
+      skada.button:GetFontString():SetFont(SV.Media.font.names, 15, "OUTLINE")
     end
+
     if(not skada.Panel) then
-      STYLE:ApplyFrameStyle(skada)
-    end
-    if(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)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
index a7bd6fd..d4d94f8 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/timemanager.lua
@@ -25,7 +25,7 @@ local function TimeManagerStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(TimeManagerFrame, true)
+	STYLE:ApplyWindowStyle(TimeManagerFrame, true)

 	STYLE:ApplyCloseButtonStyle(TimeManagerFrameCloseButton)
 	TimeManagerFrameInset:Die()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
index 77fa660..ef59323 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua
@@ -25,7 +25,7 @@ local function TradeFrameStyle()
 		 return
 	end

-	STYLE:ApplyWindowHolder(TradeFrame, true)
+	STYLE:ApplyWindowStyle(TradeFrame, true)

 	TradeFrameInset:Die()
 	TradeFrameTradeButton:SetButtonTemplate()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
index c0b2440..960e48e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/tradeskill.lua
@@ -37,8 +37,8 @@ local function TradeSkillStyle()
 	TradeSkillCreateAllButton:RemoveTextures(true)
 	TradeSkillViewGuildCraftersButton:RemoveTextures(true)

-	STYLE:ApplyWindowHolder(TradeSkillFrame, true, true)
-	STYLE:ApplyWindowHolder(TradeSkillGuildFrame)
+	STYLE:ApplyWindowStyle(TradeSkillFrame, true, true)
+	STYLE:ApplyWindowStyle(TradeSkillGuildFrame)

 	TradeSkillGuildFrame:Point("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19)
 	TradeSkillGuildFrameContainer:RemoveTextures()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
index ec29f2a..13ec18b 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/trainer.lua
@@ -43,7 +43,7 @@ local function TrainerStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.trainer ~= true then return end

 	ClassTrainerFrame:SetHeight(ClassTrainerFrame:GetHeight() + 42)
-	STYLE:ApplyWindowHolder(ClassTrainerFrame)
+	STYLE:ApplyWindowStyle(ClassTrainerFrame)

 	for i=1, 8 do
 		_G["ClassTrainerScrollFrameButton"..i]:RemoveTextures()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
index 666bc44..29a4d19 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/transmog.lua
@@ -50,7 +50,7 @@ TRANSMOG STYLER
 local function TransmogStyle()
 	if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.transmogrify ~= true then return end

-	STYLE:ApplyWindowHolder(TransmogrifyFrame, true)
+	STYLE:ApplyWindowStyle(TransmogrifyFrame, true)

 	for p, texture in pairs(TransmogFrameList)do
 		 _G[texture]:Die()
@@ -58,7 +58,7 @@ local function TransmogStyle()

 	select(2, TransmogrifyModelFrame:GetRegions()):Die()

-	TransmogrifyModelFrame:SetFixedPanelTemplate("Comic")
+	TransmogrifyModelFrame:SetFixedPanelTemplate("ModelComic")
 	TransmogrifyFrameButtonFrame:GetRegions():Die()
 	TransmogrifyApplyButton:RemoveTextures()
 	TransmogrifyApplyButton:SetButtonTemplate()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
index 061c14d..a49dc10 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/addons/voidstorage.lua
@@ -39,7 +39,7 @@ local function VoidStorageStyle()
      return
   end

-  STYLE:ApplyWindowHolder(VoidStorageFrame, true)
+  STYLE:ApplyWindowStyle(VoidStorageFrame, true)

   for _,frame in pairs(VoidStorageList)do
     _G[frame]:RemoveTextures()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
index 9a9b282..5d2d83e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua
@@ -72,7 +72,7 @@ function STYLE:ApplyUnderlayStyle(this, template, noStripping, fullStripping)
     this:SetFixedPanelTemplate(template)
 end

-function STYLE:ApplyWindowHolder(this, action, fullStrip)
+function STYLE:ApplyWindowStyle(this, action, fullStrip)
 	if(not this or (this and this.Panel)) then return end
 	local template = action and "Action" or "Halftone"
 	local baselevel = this:GetFrameLevel()
@@ -82,8 +82,17 @@ function STYLE:ApplyWindowHolder(this, action, fullStrip)

 	this:RemoveTextures(fullStrip)
 	this:SetPanelTemplate(template)
+end

-	-- print(this:GetName() .. ": " .. tostring(baselevel) .. " >> " .. adjustment)
+function STYLE:ApplyWindowHolder(this, fullStrip)
+	if(not this or (this and this.Panel)) then return end
+	local baselevel = this:GetFrameLevel()
+	if(baselevel < 1) then
+		this:SetFrameLevel(1)
+	end
+
+	this:RemoveTextures(fullStrip)
+	this:SetPanelTemplate("Blackout")
 end
 --[[
 ##########################################################