update Skins

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua

@@ -10,7 +10,7 @@ local pairs = pairs
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.auctionhouse ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.auctionhouse ~= true then return end
 
 	E:StripTextures(AuctionFrame, true)
 	E:CreateBackdrop(AuctionFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/BGScore.lua

@@ -9,7 +9,7 @@ local split = string.split
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.bgscore ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.bgscore ~= true then return end
 
 	E:CreateBackdrop(WorldStateScoreFrame, "Transparent")
 	WorldStateScoreFrame.backdrop:SetPoint("TOPLEFT", 10, -15)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Bags.lua

@@ -51,7 +51,7 @@ function S:BankFrameItemButton_OnUpdate()
 end
 
 local function LoadSkin()
-	-- if not E.private.skins.blizzard.enable and E.private.skins.blizzard.bags and not E.private.bags.enable then return end
+	if not E.private.skins.blizzard.enable and E.private.skins.blizzard.bags and not E.private.bags.enable then return end
 
 	-- ContainerFrame
 	local containerFrame, containerFrameClose

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Battlefield.lua

@@ -2,6 +2,8 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
 local S = E:GetModule("Skins");
 
 local function LoadSkin()
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.battlefield ~= true then return end
+
 	E:StripTextures(BattlefieldFrame)
 
 	E:CreateBackdrop(BattlefieldFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Binding.lua

@@ -7,7 +7,7 @@ local _G = _G
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.binding ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.binding ~= true then return end
 
 	E:StripTextures(KeyBindingFrame)
 	E:CreateBackdrop(KeyBindingFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Character.lua

@@ -16,6 +16,7 @@ local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
 local CHARACTERFRAME_SUBFRAMES = CHARACTERFRAME_SUBFRAMES
 
 local function LoadSkin()
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.character ~= true then return end
 
 	-- Character Frame
 	E:StripTextures(CharacterFrame, true)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua

@@ -14,7 +14,7 @@ local GetCraftItemLink = GetCraftItemLink
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or not E.private.skins.blizzard.craft ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or not E.private.skins.blizzard.craft ~= true then return end
 
 	E:StripTextures(CraftFrame, true)
 	E:CreateBackdrop(CraftFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Debug.lua

@@ -10,7 +10,7 @@ local getn = table.getn
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.debug ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.debug ~= true then return end
 
 	-- ScriptErrorsFrame:SetParent(E.UIParent)
 	ScriptErrorsFrame:SetScale(UIParent:GetScale())

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/DressingRoom.lua

@@ -7,7 +7,7 @@ local S = E:GetModule("Skins");
 local SetDressUpBackground = SetDressUpBackground
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.dressingroom ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.dressingroom ~= true then return end
 
 	E:StripTextures(DressUpFrame)
 	E:CreateBackdrop(DressUpFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Friends.lua

@@ -15,7 +15,7 @@ local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS
 local hooksecurefunc = hooksecurefunc
 
 function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.friends ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.friends ~= true then return end
 
 	-- Friends Frame
 	E:StripTextures(FriendsFrame, true)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Gossip.lua

@@ -8,7 +8,7 @@ local _G = _G
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.gossip ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.gossip ~= true then return end
 
 	E:StripTextures(ItemTextFrame, true)
 	E:StripTextures(ItemTextScrollFrame)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Greeting.lua

@@ -9,7 +9,7 @@ local find, gsub = string.find, string.gsub
 local HookScript = HookScript
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.greeting ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.greeting ~= true then return end
 
 	HookScript(QuestFrameGreetingPanel, "OnShow", function()
 		E:StripTextures(QuestFrameGreetingPanel)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/GuildRegistrar.lua

@@ -7,7 +7,7 @@ local _G = _G
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.guildregistrar ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.guildregistrar ~= true then return end
 
 	E:StripTextures(GuildRegistrarFrame, true)
 	E:CreateBackdrop(GuildRegistrarFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Help.lua

@@ -8,7 +8,7 @@ local getn = table.getn
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.help ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.help ~= true then return end
 
 	local helpFrameButtons = {
 		"GeneralBack",

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Inspect.lua

@@ -14,7 +14,7 @@ local GetItemQualityColor = GetItemQualityColor
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.inspect then return end
+	if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.inspect then return end
 
 	E:StripTextures(InspectFrame, true)
 	E:CreateBackdrop(InspectFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Loot.lua

@@ -16,8 +16,8 @@ local NUM_GROUP_LOOT_FRAMES = NUM_GROUP_LOOT_FRAMES
 local LOOT = LOOT
 
 local function LoadSkin()
-	-- if E.private.general.loot then return end
+	if E.private.general.loot then return end
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.loot ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.loot ~= true then return end
 
 	E:StripTextures(LootFrame)
 
@@ -92,8 +92,8 @@ local function LoadSkin()
 end
 
 local function LoadRollSkin()
-	-- if E.private.general.lootRoll then return end
+	if E.private.general.lootRoll then return end
-	-- if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.lootRoll then return end
+	if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.lootRoll then return end
 
 	local function OnShow(self)
 		E:SetTemplate(self, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Macro.lua

@@ -9,7 +9,7 @@ local getn = table.getn
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.macro ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.macro ~= true then return end
 
 	E:StripTextures(MacroFrame)
 	E:CreateBackdrop(MacroFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua

@@ -14,7 +14,7 @@ local hooksecurefunc = hooksecurefunc
 local INBOXITEMS_TO_DISPLAY = INBOXITEMS_TO_DISPLAY
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.mail ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.mail ~= true then return end
 
 	-- Inbox Frame
 	E:StripTextures(MailFrame, true)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua

@@ -15,7 +15,7 @@ local GetItemLinkByName = GetItemLinkByName
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.merchant ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.merchant ~= true then return end
 
 	E:StripTextures(MerchantFrame, true)
 	E:CreateBackdrop(MerchantFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/MirrorTimers.lua

@@ -9,7 +9,7 @@ local floor, format = math.floor, string.format
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.mirrorTimers ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.mirrorTimers ~= true then return end
 
 	hooksecurefunc("MirrorTimerFrame_OnUpdate", function(frame, elapsed)
 		if frame.paused then

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua

@@ -12,7 +12,8 @@ local UnitIsUnit = UnitIsUnit
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.misc ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.misc ~= true then return end
+
 	-- Blizzard frame we want to reskin
 	local skins = {
 		"GameMenuFrame",

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Petition.lua

@@ -7,7 +7,7 @@ local _G = _G
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.petition ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.petition ~= true then return end
 
 	E:StripTextures(PetitionFrame, true)
 	E:CreateBackdrop(PetitionFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Quest.lua

@@ -13,7 +13,7 @@ local GetItemQualityColor = GetItemQualityColor
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.quest ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.quest ~= true then return end
 
 	local QuestStrip = {
 		"QuestFrame",

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/QuestTimers.lua

@@ -7,7 +7,7 @@ local S = E:GetModule("Skins");
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.questtimer ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.questtimers ~= true then return end
 
 	E:StripTextures(QuestTimerFrame)
 	E:SetTemplate(QuestTimerFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua

@@ -10,7 +10,7 @@ local pairs = pairs
 local hooksecurefunc = hooksecurefunc
 
 function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.raid ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.raid ~= true then return end
 
 	-- RaidFrame
 	local StripAllTextures = {

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/SpellBook.lua

@@ -8,7 +8,7 @@ local unpack = unpack
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.spellbook ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.spellbook ~= true then return end
 
 	E:StripTextures(SpellBookFrame, true)
 	E:CreateBackdrop(SpellBookFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Stable.lua

@@ -11,7 +11,7 @@ local hooksecurefunc = hooksecurefunc
 local UnitExists = UnitExists
 
 function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.stable ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.stable ~= true then return end
 
 	E:StripTextures(PetStableFrame)
 	E:Kill(PetStableFramePortrait)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Tabard.lua

@@ -8,7 +8,7 @@ local _G = _G
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tabard ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tabard ~= true then return end
 
 	E:StripTextures(TabardFrame)
 	E:Kill(TabardFramePortrait)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Talent.lua

@@ -8,7 +8,7 @@ local unpack = unpack
 --WoW API / Variables
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.talent ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.talent ~= true then return end
 
 	E:StripTextures(TalentFrame)
 	E:CreateBackdrop(TalentFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Taxi.lua

@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
 local S = E:GetModule("Skins");
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.taxi ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.taxi ~= true then return end
 
 	E:CreateBackdrop(TaxiFrame, "Transparent")
 	TaxiFrame.backdrop:SetPoint("TOPLEFT", 11, -12)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Tooltip.lua

@@ -9,6 +9,8 @@ local pairs = pairs
 --WoW API / Variables
 
 local function LoadSkin()
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tooltip ~= true then return end
+
 	S:HandleCloseButton(ItemRefCloseButton)
 
 	local GameTooltip = _G["GameTooltip"]

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Trade.lua

@@ -12,7 +12,7 @@ local GetTradeTargetItemInfo = GetTradeTargetItemInfo
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.trade ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.trade ~= true then return end
 
 	E:StripTextures(TradeFrame, true)
 	TradeFrame:SetWidth(400)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua

@@ -15,7 +15,7 @@ local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tradeskill ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tradeskill ~= true then return end
 
 	E:StripTextures(TradeSkillFrame, true)
 	E:CreateBackdrop(TradeSkillFrame, "Transparent")

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Trainer.lua

@@ -10,7 +10,7 @@ local find = string.find
 local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.trainer ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.trainer ~= true then return end
 
 	E:CreateBackdrop(ClassTrainerFrame, "Transparent")
 	ClassTrainerFrame.backdrop:SetPoint("TOPLEFT", 10, -11)

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Tutorial.lua

@@ -8,7 +8,7 @@ local _G = _G
 local MAX_TUTORIAL_ALERTS = MAX_TUTORIAL_ALERTS
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tutorial ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tutorial ~= true then return end
 
 	for i = 1, MAX_TUTORIAL_ALERTS do
 		local button = _G["TutorialFrameAlertButton"..i]

2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/WorldMap.lua

@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
 local S = E:GetModule("Skins");
 
 local function LoadSkin()
-	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.worldmap ~= true then return end
+	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.worldmap ~= true then return end
 
 	E:StripTextures(WorldMapFrame)
 	E:CreateBackdrop(WorldMapPositioningGuide, "Transparent")

2/3/4/5/6/7/ElvUI/Settings/Private.lua

@@ -46,7 +46,43 @@ V["skins"] = {
 	},
 	["blizzard"] = {
 		["enable"] = true,
-
+		["alertframes"] = true,
+		["auctionhouse"] = true,
+		["bags"] = true,
+		["battlefield"] = true,
+		["bgscore"] = true,
+		["binding"] = true,
+		["character"] = true,
+		["debug"] = true,
+		["dressingroom"] = true,
+		["friends"] = true,
+		["gossip"] = true,
+		["greeting"] = true,
+		["guildregistrar"] = true,
+		["help"] = true,
+		["inspect"] = true,
+		["loot"] = true,
+		["lootRoll"] = true,
+		["macro"] = true,
+		["mail"] = true,
+		["merchant"] = true,
+		["misc"] = true,
+		["petition"] = true,
+		["quest"] = true,
+		["questtimers"] = true,
+		["raid"] = true,
+		["spellbook"] = true,
+		["stable"] = true,
+		["tabard"] = true,
+		["talent"] = true,
+		["taxi"] = true,
+		["tooltip"] = true,
+		["trade"] = true,
+		["tradeskill"] = true,
+		["trainer"] = true,
+		["tutorial"] = true,
+		["worldmap"] = true,
+		["mirrorTimers"] = true
 	},
 }
 

2/3/4/5/6/7/ElvUI_Config/Skins.lua

@@ -34,26 +34,11 @@ E.Options.args.skins = {
 			disabled = function() return not E.private.skins.blizzard.enable end,
 			guiInline = true,
 			args = {
-				achievement = {
-					type = "toggle",
-					name = L["Achievement Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				alertframes = {
 					type = "toggle",
 					name = L["Alert Frames"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				arena = {
-					type = "toggle",
-					name = L["Arena Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
-				arenaregistrar = {
-					type = "toggle",
-					name = L["Arena Registrar"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				auctionhouse = {
 					type = "toggle",
 					name = L["Auction Frame"],
@@ -65,14 +50,9 @@ E.Options.args.skins = {
 					desc = L["TOGGLESKIN_DESC"],
 					disabled = function() return E.private.bags.enable end
 				},
-				barber = {
+				battlefield = {
 					type = "toggle",
-					name = L["Barbershop Frame"],
+					name = L["Battlefield Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
-				bgmap = {
-					type = "toggle",
-					name = L["BG Map"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
 				bgscore = {
@@ -85,11 +65,6 @@ E.Options.args.skins = {
 					name = L["KeyBinding Frame"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				calendar = {
-					type = "toggle",
-					name = L["Calendar Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				character = {
 					type = "toggle",
 					name = L["Character Frame"],
@@ -110,16 +85,6 @@ E.Options.args.skins = {
 					name = L["Friends"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				gbank = {
-					type = "toggle",
-					name = L["Guild Bank"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
-				gmchat = {
-					type = "toggle",
-					name = L["GM Chat"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				gossip = {
 					type = "toggle",
 					name = L["Gossip Frame"],
@@ -145,16 +110,6 @@ E.Options.args.skins = {
 					name = L["Inspect Frame"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				lfd = {
-					type = "toggle",
-					name = L["LFD Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
-				lfr = {
-					type = "toggle",
-					name = L["LFR Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				loot = {
 					type = "toggle",
 					name = L["Loot Frames"],
@@ -192,26 +147,21 @@ E.Options.args.skins = {
 					name = L["Petition Frame"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				pvp = {
-					type = "toggle",
-					name = L["PvP Frames"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				quest = {
 					type = "toggle",
 					name = L["Quest Frames"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
+				questtimers = {
+					type = "toggle",
+					name = QUEST_TIMERS,
+					desc = L["TOGGLESKIN_DESC"]
+				},
 				raid = {
 					type = "toggle",
 					name = L["Raid Frame"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				socket = {
-					type = "toggle",
-					name = L["Socket Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				spellbook = {
 					type = "toggle",
 					name = L["Spellbook"],
@@ -242,11 +192,6 @@ E.Options.args.skins = {
 					name = L["Tooltip"],
 					desc = L["TOGGLESKIN_DESC"],
 				},
-				timemanager = {
-					type = "toggle",
-					name = L["Time Manager"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				trade = {
 					type = "toggle",
 					name = L["Trade Frame"],
@@ -267,11 +212,6 @@ E.Options.args.skins = {
 					name = L["Tutorial Frame"],
 					desc = L["TOGGLESKIN_DESC"]
 				},
-				watchframe = {
-					type = "toggle",
-					name = L["Watch Frame"],
-					desc = L["TOGGLESKIN_DESC"]
-				},
 				worldmap = {
 					type = "toggle",
 					name = L["World Map"],