Quantcast

new textures, options for model bg's and shipyard added to layout frames

failcoder [07-27-15 - 16:15]
new textures, options for model bg's and shipyard added to layout frames
Filename
SVUI_!Core/system/funstuff.lua
SVUI_!Core/system/layout.lua
SVUI_!Options/SVUI_!Options.lua
SVUI_Skins/Loader.lua
SVUI_Skins/components/blizzard/character.lua
SVUI_Skins/components/blizzard/quest.lua
SVUI_UnitFrames/SVUI_UnitFrames.lua
diff --git a/SVUI_!Core/system/funstuff.lua b/SVUI_!Core/system/funstuff.lua
index 9c45bfd..a1e851b 100644
--- a/SVUI_!Core/system/funstuff.lua
+++ b/SVUI_!Core/system/funstuff.lua
@@ -358,7 +358,7 @@ function SV.Comix:LaunchPopup()
 			ComixToastyPanelBG.anim:Play()
 			PlaySoundFile([[Interface\AddOns\SVUI_!Core\assets\sounds\toasty.mp3]])
 		end
-	elseif(rng < 8) then
+	elseif(rng < 24) then
 		step1_x = random(-150, 150);
 		if(step1_x > -20 and step1_x < 20) then step1_x = step1_x * 3 end
 		step1_y = random(50, 150);
@@ -369,7 +369,7 @@ function SV.Comix:LaunchPopup()
 		self.Deluxe.anim[2]:SetOffset(step2_x, step2_y);
 		self.Deluxe.anim[3]:SetOffset(0,0);
 		self.Deluxe.anim:Play();
-	elseif(rng < 16) then
+	elseif(rng < 12) then
 		step1_x = random(-100, 100);
 		step1_y = random(-50, 1);
 		size = random(96,128);
diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua
index 4aa2279..281afa8 100644
--- a/SVUI_!Core/system/layout.lua
+++ b/SVUI_!Core/system/layout.lua
@@ -81,6 +81,7 @@ UIPanels["GuildRegistrarFrame"] 			= { moving = false, snapped = false, canupdat
 UIPanels["GarrisonLandingPage"] 			= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
 UIPanels["GarrisonMissionFrame"] 			= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
 UIPanels["GarrisonBuildingFrame"] 			= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
+UIPanels["GarrisonShipyardFrame"] 			= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
 UIPanels["GarrisonCapacitiveDisplayFrame"]  = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false };
 UIPanels["HelpFrame"] 						= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
 UIPanels["InterfaceOptionsFrame"] 			= { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true };
diff --git a/SVUI_!Options/SVUI_!Options.lua b/SVUI_!Options/SVUI_!Options.lua
index 76903a2..b63ba9e 100644
--- a/SVUI_!Options/SVUI_!Options.lua
+++ b/SVUI_!Options/SVUI_!Options.lua
@@ -557,20 +557,38 @@ SV.Options.args.Core.args.mostCommon = {
 				SV:RefreshEverything(true)
 			end,
 			args = {
-				pattern = {
+				default = {
 					type = "select",
 					dialogControl = 'LSM30_Background',
 					order = 1,
 					name = L["Primary Texture"],
+					desc = L["Used on almost every frame of this UI."],
 					values = AceGUIWidgetLSMlists.background
 				},
-				premium = {
+				pattern = {
 					type = "select",
 					dialogControl = 'LSM30_Background',
-					order = 1,
+					order = 2,
 					name = L["Secondary Texture"],
+					desc = L["Used on most patterned frames."],
 					values = AceGUIWidgetLSMlists.background
-				}
+				},
+				model = {
+					type = "select",
+					dialogControl = 'LSM30_Background',
+					order = 3,
+					name = L["ModelFrame Texture"],
+					desc = L["Used behind 3D model frames. (ie..Dressing Room, Character, Pet, and Mount displays)"],
+					values = AceGUIWidgetLSMlists.background
+				},
+				premium = {
+					type = "select",
+					dialogControl = 'LSM30_Background',
+					order = 4,
+					name = L["Unique Texture"],
+					desc = L["Used in special areas. (ie..Glyphs BG)"],
+					values = AceGUIWidgetLSMlists.background
+				},
 			}
 		},
 		colors = {
diff --git a/SVUI_Skins/Loader.lua b/SVUI_Skins/Loader.lua
index 33c973f..39d2408 100644
--- a/SVUI_Skins/Loader.lua
+++ b/SVUI_Skins/Loader.lua
@@ -1,7 +1,7 @@
 --[[
 ##########################################################
 S V U I   By: Munglunch
-##########################################################
+##########################################################
 LOCALIZED LUA FUNCTIONS
 ##########################################################
 ]]--
@@ -17,67 +17,102 @@ local L = SV.L
 local MOD = SV:NewModule(...);
 local Schema = MOD.Schema;

+LSM:Register("background", "SVUI Model BG 2", [[Interface\TALENTFRAME\DeathKnightBlood-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 3", [[Interface\TALENTFRAME\DeathKnightFrost-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 4", [[Interface\TALENTFRAME\DeathKnightUnholy-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 5", [[Interface\TALENTFRAME\DruidBalance-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 6", [[Interface\TALENTFRAME\DruidFeralCombat-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 7", [[Interface\TALENTFRAME\DruidRestoration-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 8", [[Interface\TALENTFRAME\HunterBeastMastery-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 9", [[Interface\TALENTFRAME\HunterMarksmanship-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 10", [[Interface\TALENTFRAME\HunterPetCunning-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 11", [[Interface\TALENTFRAME\HunterPetFerocity-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 12", [[Interface\TALENTFRAME\HunterPetTenacity-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 13", [[Interface\TALENTFRAME\HunterSurvival-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 14", [[Interface\TALENTFRAME\MageArcane-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 15", [[Interface\TALENTFRAME\MageFire-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 16", [[Interface\TALENTFRAME\MageFrost-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 17", [[Interface\TALENTFRAME\PALADINCOMBAT-TOPLEFT]]);
+LSM:Register("background", "SVUI Model BG 18", [[Interface\TALENTFRAME\PALADINHOLY-TOPLEFT]]);
+LSM:Register("background", "SVUI Model BG 19", [[Interface\TALENTFRAME\PALADINPROTECTION-TOPLEFT]]);
+LSM:Register("background", "SVUI Model BG 20", [[Interface\TALENTFRAME\PriestDiscipline-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 21", [[Interface\TALENTFRAME\PriestHoly-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 22", [[Interface\TALENTFRAME\PriestShadow-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 23", [[Interface\TALENTFRAME\RogueAssassination-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 24", [[Interface\TALENTFRAME\RogueCombat-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 25", [[Interface\TALENTFRAME\RogueSubtlety-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 26", [[Interface\TALENTFRAME\ShamanElementalCombat-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 27", [[Interface\TALENTFRAME\ShamanEnhancement-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 28", [[Interface\TALENTFRAME\ShamanRestoration-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 29", [[Interface\TALENTFRAME\WarlockCurses-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 30", [[Interface\TALENTFRAME\WarlockDestruction-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 31", [[Interface\TALENTFRAME\WarlockSummoning-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 32", [[Interface\TALENTFRAME\WarriorArm-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 33", [[Interface\TALENTFRAME\WarriorArms-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 34", [[Interface\TALENTFRAME\WarriorFury-TopLeft]]);
+LSM:Register("background", "SVUI Model BG 35", [[Interface\TALENTFRAME\WarriorProtection-TopLeft]]);
+
 SV.defaults[Schema] = {
 	["enable"] = true,
 	["blizzard"] = {
-		["enable"] = true,
-		["bags"] = true,
+		["enable"] = true,
+		["bags"] = true,
 		["bmah"] = true,
-		["chat"] = true,
-		["reforge"] = true,
-		["calendar"] = true,
-		["achievement"] = true,
-		["lfguild"] = true,
-		["inspect"] = true,
-		["binding"] = true,
-		["gbank"] = true,
-		["archaeology"] = true,
-		["guildcontrol"] = true,
-		["gossip"] = true,
-		["guild"] = true,
-		["tradeskill"] = true,
-		["raid"] = false,
-		["talent"] = true,
-		["auctionhouse"] = true,
-		["barber"] = true,
-		["macro"] = true,
-		["debug"] = true,
-		["trainer"] = true,
-		["socket"] = true,
-		["loot"] = true,
-		["alertframes"] = true,
-		["bgscore"] = true,
-		["merchant"] = true,
-		["mail"] = true,
-		["help"] = true,
-		["trade"] = true,
-		["gossip"] = true,
-		["greeting"] = true,
-		["worldmap"] = true,
-		["taxi"] = true,
-		["quest"] = true,
-		["petition"] = true,
-		["dressingroom"] = true,
-		["pvp"] = true,
-		["lfg"] = true,
-		["nonraid"] = true,
-		["friends"] = true,
-		["spellbook"] = true,
-		["character"] = true,
-		["misc"] = true,
-		["tabard"] = true,
-		["guildregistrar"] = true,
-		["timemanager"] = true,
-		["encounterjournal"] = true,
-		["voidstorage"] = true,
-		["transmogrify"] = true,
-		["stable"] = true,
-		["bgmap"] = true,
-		["mounts"] = true,
-		["petbattleui"] = true,
-		["losscontrol"] = true,
-		["itemUpgrade"] = true,
-	},
+		["chat"] = true,
+		["reforge"] = true,
+		["calendar"] = true,
+		["achievement"] = true,
+		["lfguild"] = true,
+		["inspect"] = true,
+		["binding"] = true,
+		["gbank"] = true,
+		["archaeology"] = true,
+		["guildcontrol"] = true,
+		["gossip"] = true,
+		["guild"] = true,
+		["tradeskill"] = true,
+		["raid"] = false,
+		["talent"] = true,
+		["auctionhouse"] = true,
+		["barber"] = true,
+		["macro"] = true,
+		["debug"] = true,
+		["trainer"] = true,
+		["socket"] = true,
+		["loot"] = true,
+		["alertframes"] = true,
+		["bgscore"] = true,
+		["merchant"] = true,
+		["mail"] = true,
+		["help"] = true,
+		["trade"] = true,
+		["gossip"] = true,
+		["greeting"] = true,
+		["worldmap"] = true,
+		["taxi"] = true,
+		["quest"] = true,
+		["petition"] = true,
+		["dressingroom"] = true,
+		["pvp"] = true,
+		["lfg"] = true,
+		["nonraid"] = true,
+		["friends"] = true,
+		["spellbook"] = true,
+		["character"] = true,
+		["misc"] = true,
+		["tabard"] = true,
+		["guildregistrar"] = true,
+		["timemanager"] = true,
+		["encounterjournal"] = true,
+		["voidstorage"] = true,
+		["transmogrify"] = true,
+		["stable"] = true,
+		["bgmap"] = true,
+		["mounts"] = true,
+		["petbattleui"] = true,
+		["losscontrol"] = true,
+		["itemUpgrade"] = true,
+	},
 	["addons"] = {
 		["enable"] = true,
 		['ACP'] = true,
@@ -131,8 +166,8 @@ function MOD:LoadOptions()
 		name = Schema,
 		args = {
 			blizzardEnable = {
-			    order = 2,
-				name = "Standard UI Styling",
+			    order = 2,
+				name = "Standard UI Styling",
 			    type = "toggle",
 			    get = function(key) return SV.db[Schema].blizzard.enable end,
 			    set = function(key,value) SV.db[Schema].blizzard.enable = value; SV:StaticPopup_Show("RL_CLIENT") end
@@ -145,301 +180,301 @@ function MOD:LoadOptions()
 			    set = function(key,value) SV.db[Schema].addons.enable = value; SV:StaticPopup_Show("RL_CLIENT") end
 			},
 			addons = {
-				order = 4,
-				type = "group",
-				name = "Addon Styling",
-				get = function(key) return SV.db[Schema].addons[key[#key]] end,
+				order = 4,
+				type = "group",
+				name = "Addon Styling",
+				get = function(key) return SV.db[Schema].addons[key[#key]] end,
 				set = function(key,value) SV.db[Schema].addons[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT")end,
 				disabled = function() return not SV.db[Schema].addons.enable end,
-				guiInline = true,
+				guiInline = true,
 				args = AddonConfigOptions()
 			},
 			blizzard = {
-				order = 300,
-				type = "group",
-				name = "Individual Mods",
-				get = function(key) return SV.db[Schema].blizzard[key[#key]] end,
-				set = function(key,value) SV.db[Schema].blizzard[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT") end,
-				disabled = function() return not SV.db[Schema].blizzard.enable end,
-				guiInline = true,
+				order = 300,
+				type = "group",
+				name = "Individual Mods",
+				get = function(key) return SV.db[Schema].blizzard[key[#key]] end,
+				set = function(key,value) SV.db[Schema].blizzard[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT") end,
+				disabled = function() return not SV.db[Schema].blizzard.enable end,
+				guiInline = true,
 				args = {
 					bmah = {
-						type = "toggle",
-						name = L["Black Market AH"],
+						type = "toggle",
+						name = L["Black Market AH"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					chat = {
-						type = "toggle",
-						name = L["Chat Menus"],
+						type = "toggle",
+						name = L["Chat Menus"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					transmogrify = {
-						type = "toggle",
-						name = L["Transmogrify Frame"],
+						type = "toggle",
+						name = L["Transmogrify Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					encounterjournal = {
-						type = "toggle",
-						name = L["Encounter Journal"],
+						type = "toggle",
+						name = L["Encounter Journal"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					reforge = {
-						type = "toggle",
-						name = L["Reforge Frame"],
+						type = "toggle",
+						name = L["Reforge Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					calendar = {
-						type = "toggle",
-						name = L["Calendar Frame"],
+						type = "toggle",
+						name = L["Calendar Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					achievement = {
-						type = "toggle",
-						name = L["Achievement Frame"],
+						type = "toggle",
+						name = L["Achievement Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					lfguild = {
-						type = "toggle",
-						name = L["LF Guild Frame"],
+						type = "toggle",
+						name = L["LF Guild Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					inspect = {
-						type = "toggle",
-						name = L["Inspect Frame"],
+						type = "toggle",
+						name = L["Inspect Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					binding = {
-						type = "toggle",
-						name = L["KeyBinding Frame"],
+						type = "toggle",
+						name = L["KeyBinding Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					gbank = {
-						type = "toggle",
-						name = L["Guild Bank"],
+						type = "toggle",
+						name = L["Guild Bank"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					archaeology = {
-						type = "toggle",
-						name = L["Archaeology Frame"],
+						type = "toggle",
+						name = L["Archaeology Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					guildcontrol = {
-						type = "toggle",
-						name = L["Guild Control Frame"],
+						type = "toggle",
+						name = L["Guild Control Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					guild = {
-						type = "toggle",
-						name = L["Guild Frame"],
+						type = "toggle",
+						name = L["Guild Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					tradeskill = {
-						type = "toggle",
-						name = L["TradeSkill Frame"],
+						type = "toggle",
+						name = L["TradeSkill Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					raid = {
-						type = "toggle",
-						name = L["Raid Frame"],
+						type = "toggle",
+						name = L["Raid Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					talent = {
-						type = "toggle",
-						name = L["Talent Frame"],
+						type = "toggle",
+						name = L["Talent Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					auctionhouse = {
-						type = "toggle",
-						name = L["Auction Frame"],
+						type = "toggle",
+						name = L["Auction Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					timemanager = {
-						type = "toggle",
-						name = L["Time Manager"],
+						type = "toggle",
+						name = L["Time Manager"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					barber = {
-						type = "toggle",
-						name = L["Barbershop Frame"],
+						type = "toggle",
+						name = L["Barbershop Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					macro = {
-						type = "toggle",
-						name = L["Macro Frame"],
+						type = "toggle",
+						name = L["Macro Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					debug = {
-						type = "toggle",
-						name = L["Debug Tools"],
+						type = "toggle",
+						name = L["Debug Tools"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					trainer = {
-						type = "toggle",
-						name = L["Trainer Frame"],
+						type = "toggle",
+						name = L["Trainer Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					socket = {
-						type = "toggle",
-						name = L["Socket Frame"],
+						type = "toggle",
+						name = L["Socket Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					alertframes = {
-						type = "toggle",
-						name = L["Alert Frames"],
+						type = "toggle",
+						name = L["Alert Frames"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					loot = {
-						type = "toggle",
-						name = L["Loot Frames"],
+						type = "toggle",
+						name = L["Loot Frames"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					bgscore = {
-						type = "toggle",
-						name = L["BG Score"],
+						type = "toggle",
+						name = L["BG Score"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					merchant = {
-						type = "toggle",
-						name = L["Merchant Frame"],
+						type = "toggle",
+						name = L["Merchant Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					mail = {
-						type = "toggle",
-						name = L["Mail Frame"],
+						type = "toggle",
+						name = L["Mail Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					help = {
-						type = "toggle",
-						name = L["Help Frame"],
+						type = "toggle",
+						name = L["Help Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					trade = {
-						type = "toggle",
-						name = L["Trade Frame"],
+						type = "toggle",
+						name = L["Trade Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					gossip = {
-						type = "toggle",
-						name = L["Gossip Frame"],
+						type = "toggle",
+						name = L["Gossip Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					greeting = {
-						type = "toggle",
-						name = L["Greeting Frame"],
+						type = "toggle",
+						name = L["Greeting Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					worldmap = {
-						type = "toggle",
-						name = L["World Map"],
+						type = "toggle",
+						name = L["World Map"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					taxi = {
-						type = "toggle",
-						name = L["Taxi Frame"],
+						type = "toggle",
+						name = L["Taxi Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					lfg = {
-						type = "toggle",
-						name = L["LFG Frame"],
+						type = "toggle",
+						name = L["LFG Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					mounts = {
-						type = "toggle",
-						name = L["Mounts & Pets"],
+						type = "toggle",
+						name = L["Mounts & Pets"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					quest = {
-						type = "toggle",
-						name = L["Quest Frames"],
+						type = "toggle",
+						name = L["Quest Frames"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					petition = {
-						type = "toggle",
-						name = L["Petition Frame"],
+						type = "toggle",
+						name = L["Petition Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					dressingroom = {
-						type = "toggle",
-						name = L["Dressing Room"],
+						type = "toggle",
+						name = L["Dressing Room"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					pvp = {
-						type = "toggle",
-						name = L["PvP Frames"],
+						type = "toggle",
+						name = L["PvP Frames"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					nonraid = {
-						type = "toggle",
-						name = L["Non-Raid Frame"],
+						type = "toggle",
+						name = L["Non-Raid Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					friends = {
-						type = "toggle",
-						name = L["Friends"],
+						type = "toggle",
+						name = L["Friends"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					spellbook = {
-						type = "toggle",
-						name = L["Spellbook"],
+						type = "toggle",
+						name = L["Spellbook"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					character = {
-						type = "toggle",
-						name = L["Character Frame"],
+						type = "toggle",
+						name = L["Character Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					misc = {
-						type = "toggle",
-						name = L["Misc Frames"],
+						type = "toggle",
+						name = L["Misc Frames"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					tabard = {
-						type = "toggle",
-						name = L["Tabard Frame"],
+						type = "toggle",
+						name = L["Tabard Frame"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					guildregistrar = {
-						type = "toggle",
-						name = L["Guild Registrar"],
+						type = "toggle",
+						name = L["Guild Registrar"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					bags = {
-						type = "toggle",
-						name = L["Bags"],
+						type = "toggle",
+						name = L["Bags"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					stable = {
-						type = "toggle",
-						name = L["Stable"],
+						type = "toggle",
+						name = L["Stable"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					bgmap = {
-						type = "toggle",
-						name = L["BG Map"],
+						type = "toggle",
+						name = L["BG Map"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					petbattleui = {
-						type = "toggle",
-						name = L["Pet Battle"],
+						type = "toggle",
+						name = L["Pet Battle"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					losscontrol = {
-						type = "toggle",
-						name = L["Loss Control"],
+						type = "toggle",
+						name = L["Loss Control"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					voidstorage = {
-						type = "toggle",
-						name = L["Void Storage"],
+						type = "toggle",
+						name = L["Void Storage"],
 						desc = L["TOGGLEART_DESC"]
 					},
 					itemUpgrade = {
-						type = "toggle",
-						name = L["Item Upgrade"],
+						type = "toggle",
+						name = L["Item Upgrade"],
 						desc = L["TOGGLEART_DESC"]
 					}
 				}
 			}
 		}
 	}
-end
\ No newline at end of file
+end
diff --git a/SVUI_Skins/components/blizzard/character.lua b/SVUI_Skins/components/blizzard/character.lua
index b84fda5..9d4c9bf 100644
--- a/SVUI_Skins/components/blizzard/character.lua
+++ b/SVUI_Skins/components/blizzard/character.lua
@@ -371,7 +371,7 @@ local function CharacterFrameStyle()
 		TokenFramePopup:SetPoint("TOPLEFT", TokenFrame, "TOPRIGHT", 4, -28)
 	end)

-	PetModelFrame:SetStyle("Frame", "Premium", false, 1, -7, -7)
+	PetModelFrame:SetStyle("Frame", "Model", false, 1, -7, -7)
 	PetPaperDollPetInfo:GetRegions():SetTexCoord(.12, .63, .15, .55)
 	PetPaperDollPetInfo:SetFrameLevel(PetPaperDollPetInfo:GetFrameLevel() + 10)
 	PetPaperDollPetInfo:SetStyle("Frame", "Icon")
diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua
index 22d648a..a98d270 100644
--- a/SVUI_Skins/components/blizzard/quest.lua
+++ b/SVUI_Skins/components/blizzard/quest.lua
@@ -72,7 +72,7 @@ local function StyleQuestRewards()
 end

 local Hook_QuestFrame_SetTitleTextColor = function(fontString)
-	fontString:SetTextColor(1,1,0,1)
+	fontString:SetTextColor(1,1,0,1)
 end

 local Hook_QuestInfoItem_OnClick = function(self)
@@ -218,7 +218,7 @@ local function QuestFrameStyle()
 	end

 	QuestNPCModel:RemoveTextures()
-	QuestNPCModel:SetStyle("Frame", "Premium")
+	QuestNPCModel:SetStyle("Frame", "Model")

 	QuestNPCModelTextFrame:RemoveTextures()
 	QuestNPCModelTextFrame:SetStyle("Frame", "Default")
diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua
index 21672c0..06417ce 100644
--- a/SVUI_UnitFrames/SVUI_UnitFrames.lua
+++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua
@@ -463,7 +463,7 @@ function MOD:RefreshUnitLayout(frame, template)

 	if(RESIZE_NEEDED) then
 		frame:SetSize(UNIT_WIDTH + (MASTER_X1_OFFSET + MASTER_X2_OFFSET), UNIT_HEIGHT + (MASTER_TOP_OFFSET + MASTER_BOTTOM_OFFSET))
-		frame.Grip:SetSize(frame:GetSize())
+		if(frame.Grip) then frame.Grip:SetSize(frame:GetSize()) end
 	end

 	MASTER_GRIP:ClearAllPoints();