diff --git a/modules/skin.lua b/modules/skin.lua
index c4a703ae..617601a9 100644
--- a/modules/skin.lua
+++ b/modules/skin.lua
@@ -28,10 +28,6 @@ pfUI:RegisterModule("skin", function ()
     end)
   end
 
-  _, class = UnitClass("player")
-  local color = RAID_CLASS_COLORS[class]
-  local cr, cg, cb = color.r , color.g, color.b
-
   local boxes = {
     "DropDownList1MenuBackdrop",
     "DropDownList2MenuBackdrop",
diff --git a/pfUI.toc b/pfUI.toc
index 234d60b3..62c53bd0 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -58,14 +58,14 @@ skins\blizzard\talents.lua
 skins\blizzard\inspect.lua
 skins\blizzard\macro.lua
 skins\blizzard\miscellaneous.lua
-skins\blizzard\gossip&quest.lua
+skins\blizzard\gossipquest.lua
 skins\blizzard\professions.lua
 skins\blizzard\auction.lua
 skins\blizzard\questlog.lua
 skins\blizzard\mail.lua
 skins\blizzard\readycheck.lua
 skins\blizzard\battlefield_minimap.lua
-skins\blizzard\GMSurvey.lua
+skins\blizzard\survey.lua
 skins\blizzard\keybindings.lua
 skins\blizzard\merchant.lua
 skins\blizzard\popup_dialogs.lua
diff --git a/skins/blizzard/auction.lua b/skins/blizzard/auction.lua
index ea573991..fc69df60 100644
--- a/skins/blizzard/auction.lua
+++ b/skins/blizzard/auction.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("AuctionFrame", function ()
+pfUI:RegisterSkin("Auctionhouse", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/battlefield.lua b/skins/blizzard/battlefield.lua
index 0090abc4..92312f45 100644
--- a/skins/blizzard/battlefield.lua
+++ b/skins/blizzard/battlefield.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("BattlefieldFrame", function ()
+pfUI:RegisterSkin("Battlefield Map", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/battlefield_minimap.lua b/skins/blizzard/battlefield_minimap.lua
index 23ed5113..6f0c8542 100644
--- a/skins/blizzard/battlefield_minimap.lua
+++ b/skins/blizzard/battlefield_minimap.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("BattlefieldMinimap", function ()
+pfUI:RegisterSkin("Battlefield Minimap", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
 
   HookAddonOrVariable("Blizzard_BattlefieldMinimap", function()
diff --git a/skins/blizzard/dressup.lua b/skins/blizzard/dressup.lua
index 12a505fb..5675ddcb 100644
--- a/skins/blizzard/dressup.lua
+++ b/skins/blizzard/dressup.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("DressUpFrame", function ()
+pfUI:RegisterSkin("Dress Up Frame", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/game_menu.lua b/skins/blizzard/game_menu.lua
index f638f56b..20ed93f0 100644
--- a/skins/blizzard/game_menu.lua
+++ b/skins/blizzard/game_menu.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("GameMenuFrame", function ()
+pfUI:RegisterSkin("Game Menu", function ()
   StripTextures(GameMenuFrame)
   CreateBackdrop(GameMenuFrame, nil, true, .75)
   GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 2)
diff --git a/skins/blizzard/gossip&quest.lua b/skins/blizzard/gossipquest.lua
similarity index 98%
rename from skins/blizzard/gossip&quest.lua
rename to skins/blizzard/gossipquest.lua
index d8ee8725..b7a2f55f 100644
--- a/skins/blizzard/gossip&quest.lua
+++ b/skins/blizzard/gossipquest.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Gossip&Quest Frames", function ()
+pfUI:RegisterSkin("Gossip and Quest", function ()
   local frames = {'Quest', 'Gossip'}
   local panels = {'Greeting', 'Detail', 'Progress', 'Reward'}
   local buttons = {
diff --git a/skins/blizzard/guild_registrar.lua b/skins/blizzard/guild_registrar.lua
index 7a3f17ab..6dc63f53 100644
--- a/skins/blizzard/guild_registrar.lua
+++ b/skins/blizzard/guild_registrar.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("GuildRegistrarFrame", function ()
+pfUI:RegisterSkin("Guild Registrar", function ()
   StripTextures(GuildRegistrarFrame)
   StripTextures(GuildRegistrarGreetingFrame)
   CreateBackdrop(GuildRegistrarFrame, nil, nil, .75)
diff --git a/skins/blizzard/help.lua b/skins/blizzard/help.lua
index 0d71a1aa..cad4759b 100644
--- a/skins/blizzard/help.lua
+++ b/skins/blizzard/help.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("HelpFrame", function ()
+pfUI:RegisterSkin("Help", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/inspect.lua b/skins/blizzard/inspect.lua
index 32d21c47..64985e1e 100644
--- a/skins/blizzard/inspect.lua
+++ b/skins/blizzard/inspect.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("InspectFrame", function ()
+pfUI:RegisterSkin("Inspect", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
@@ -150,7 +150,7 @@ pfUI:RegisterSkin("InspectFrame", function ()
 					SetItemButtonCount(button, cache[button:GetID()]["count"]);
 					button.hasItem = 1;
 				end
-				
+
         UpdateSlots()
         QueueFunction(UpdateSlots)
       end, 1)
diff --git a/skins/blizzard/keybindings.lua b/skins/blizzard/keybindings.lua
index 8d4a87db..d92d4b82 100644
--- a/skins/blizzard/keybindings.lua
+++ b/skins/blizzard/keybindings.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("KeyBindingFrame", function ()
+pfUI:RegisterSkin("KeyBindings", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/macro.lua b/skins/blizzard/macro.lua
index 4958ff87..3eccf871 100644
--- a/skins/blizzard/macro.lua
+++ b/skins/blizzard/macro.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("MacroFrame", function ()
+pfUI:RegisterSkin("Macro", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/mail.lua b/skins/blizzard/mail.lua
index 81e18459..85af9020 100644
--- a/skins/blizzard/mail.lua
+++ b/skins/blizzard/mail.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("MailFrame", function ()
+pfUI:RegisterSkin("Mailbox", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/merchant.lua b/skins/blizzard/merchant.lua
index 34c5c33c..11c442fe 100644
--- a/skins/blizzard/merchant.lua
+++ b/skins/blizzard/merchant.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("MerchantFrame", function ()
+pfUI:RegisterSkin("Merchant", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/miscellaneous.lua b/skins/blizzard/miscellaneous.lua
index 0f5a3298..b4d199fa 100644
--- a/skins/blizzard/miscellaneous.lua
+++ b/skins/blizzard/miscellaneous.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("StackSplitFrame", function ()
+pfUI:RegisterSkin("Stack Split", function ()
   StripTextures(StackSplitFrame)
   CreateBackdrop(StackSplitFrame, nil, nil, .75)
 
@@ -6,7 +6,7 @@ pfUI:RegisterSkin("StackSplitFrame", function ()
   SkinButton(StackSplitCancelButton)
 end)
 
-pfUI:RegisterSkin("CoinPickupFrame", function ()
+pfUI:RegisterSkin("Coin Pickup", function ()
   StripTextures(CoinPickupFrame)
   CreateBackdrop(CoinPickupFrame, nil, nil, .75)
 
@@ -14,7 +14,7 @@ pfUI:RegisterSkin("CoinPickupFrame", function ()
   SkinButton(CoinPickupCancelButton)
 end)
 
-pfUI:RegisterSkin("ColorPickerFrame", function ()
+pfUI:RegisterSkin("Color Picker", function ()
   CreateBackdrop(ColorPickerFrame)
 
   ColorPickerFrameHeader:SetTexture("")
@@ -29,7 +29,7 @@ pfUI:RegisterSkin("ColorPickerFrame", function ()
   SkinSlider(OpacitySliderFrame)
 end)
 
-pfUI:RegisterSkin("OpacityFrame", function ()
+pfUI:RegisterSkin("Opacity", function ()
   CreateBackdrop(OpacityFrame, nil, true, .75)
 
   SkinSlider(OpacityFrameSlider)
@@ -37,20 +37,13 @@ pfUI:RegisterSkin("OpacityFrame", function ()
   OpacityFrameSlider:SetPoint("CENTER", 0, 0)
 end)
 
-pfUI:RegisterSkin("TutorialFrame", function ()
+pfUI:RegisterSkin("Tutorial", function ()
   CreateBackdrop(TutorialFrame, nil, true, .75)
-  --[[
-    for i = 1, MAX_TUTORIAL_ALERTS do
-    local button = _G["TutorialFrameAlertButton"..i]
-    end
-  --]]
   SkinCheckbox(TutorialFrameCheckButton)
   SkinButton(TutorialFrameOkayButton)
 end)
 
-pfUI:RegisterSkin("QuestTimerFrame", function ()
+pfUI:RegisterSkin("Quest Timer", function ()
   CreateBackdrop(QuestTimerFrame, nil, nil, .75)
-  --EnableMovable(QuestTimerFrame) -- Does not work! I need to fix it later! point update in UIParent_ManageFramePositions
-
   QuestTimerHeader:Hide()
 end)
diff --git a/skins/blizzard/options-interface.lua b/skins/blizzard/options-interface.lua
index 25b086ea..453e3f50 100644
--- a/skins/blizzard/options-interface.lua
+++ b/skins/blizzard/options-interface.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Options-Interface", function ()
+pfUI:RegisterSkin("Options - Interface", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/options-sound.lua b/skins/blizzard/options-sound.lua
index 982f2828..d86afef7 100644
--- a/skins/blizzard/options-sound.lua
+++ b/skins/blizzard/options-sound.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Options-Sound", function ()
+pfUI:RegisterSkin("Options - Sound", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/options-video.lua b/skins/blizzard/options-video.lua
index 7ca1d4b4..7b05bd45 100644
--- a/skins/blizzard/options-video.lua
+++ b/skins/blizzard/options-video.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Options-Video", function ()
+pfUI:RegisterSkin("Options - Video", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/petition.lua b/skins/blizzard/petition.lua
index c547ab3d..33017855 100644
--- a/skins/blizzard/petition.lua
+++ b/skins/blizzard/petition.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("PetitionFrame", function ()
+pfUI:RegisterSkin("Petition", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/popup_dialogs.lua b/skins/blizzard/popup_dialogs.lua
index 69c4a367..1459cd35 100644
--- a/skins/blizzard/popup_dialogs.lua
+++ b/skins/blizzard/popup_dialogs.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("StaticPopupDialogs", function ()
+pfUI:RegisterSkin("Popup Dialogs", function ()
   for i = 1, STATICPOPUP_NUMDIALOGS do
     local dialog = _G["StaticPopup"..i]
 
diff --git a/skins/blizzard/professions.lua b/skins/blizzard/professions.lua
index 82705399..6a9344d5 100644
--- a/skins/blizzard/professions.lua
+++ b/skins/blizzard/professions.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Profession Frames", function ()
+pfUI:RegisterSkin("Profession", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/questlog.lua b/skins/blizzard/questlog.lua
index bf6a6f47..15c568f0 100644
--- a/skins/blizzard/questlog.lua
+++ b/skins/blizzard/questlog.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("QuestLogFrame", function ()
+pfUI:RegisterSkin("Quest Log", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/readycheck.lua b/skins/blizzard/readycheck.lua
index b26e9306..8bb40e49 100644
--- a/skins/blizzard/readycheck.lua
+++ b/skins/blizzard/readycheck.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("ReadyCheckFrame", function ()
+pfUI:RegisterSkin("Readycheck", function ()
   HookAddonOrVariable("Blizzard_RaidUI", function()
     StripTextures(ReadyCheckFrame, true)
     CreateBackdrop(ReadyCheckFrame, nil, nil, .75)
diff --git a/skins/blizzard/spellbook.lua b/skins/blizzard/spellbook.lua
index 62fefec4..eb321dba 100644
--- a/skins/blizzard/spellbook.lua
+++ b/skins/blizzard/spellbook.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("SpellBookFrame", function ()
+pfUI:RegisterSkin("Spellbook", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/stable.lua b/skins/blizzard/stable.lua
index 7d5e5af6..fdb8a08a 100644
--- a/skins/blizzard/stable.lua
+++ b/skins/blizzard/stable.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("PetStableFrame", function ()
+pfUI:RegisterSkin("Pet Stable Master", function ()
   StripTextures(PetStableFrame)
   CreateBackdrop(PetStableFrame, nil, nil, .75)
   PetStableFrame.backdrop:SetPoint("TOPLEFT", 10, -10)
diff --git a/skins/blizzard/GMSurvey.lua b/skins/blizzard/survey.lua
similarity index 96%
rename from skins/blizzard/GMSurvey.lua
rename to skins/blizzard/survey.lua
index 9b098c77..b38eae05 100644
--- a/skins/blizzard/GMSurvey.lua
+++ b/skins/blizzard/survey.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("GMSurveyFrame", function ()
+pfUI:RegisterSkin("GM Survey", function ()
   HookAddonOrVariable("Blizzard_GMSurveyUI", function()
     StripTextures(GMSurveyFrame)
     CreateBackdrop(GMSurveyFrame, nil, nil, .75)
diff --git a/skins/blizzard/talents.lua b/skins/blizzard/talents.lua
index 919854c0..5dc9c630 100644
--- a/skins/blizzard/talents.lua
+++ b/skins/blizzard/talents.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("TalentFrame", function ()
+pfUI:RegisterSkin("Talents", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/taxi.lua b/skins/blizzard/taxi.lua
index cbb54710..401f3e64 100644
--- a/skins/blizzard/taxi.lua
+++ b/skins/blizzard/taxi.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("TaxiFrame", function ()
+pfUI:RegisterSkin("Flightmaster", function ()
   StripTextures(TaxiFrame)
   CreateBackdrop(TaxiFrame, nil, nil, .75)
   TaxiFrame.backdrop:SetPoint("TOPLEFT", 10, -10)
diff --git a/skins/blizzard/trade.lua b/skins/blizzard/trade.lua
index 3a37f60a..633d7944 100644
--- a/skins/blizzard/trade.lua
+++ b/skins/blizzard/trade.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("TradeFrame", function ()
+pfUI:RegisterSkin("Trade", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1
 
diff --git a/skins/blizzard/trainer.lua b/skins/blizzard/trainer.lua
index ae077c4e..c493e935 100644
--- a/skins/blizzard/trainer.lua
+++ b/skins/blizzard/trainer.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("TrainerFrame", function ()
+pfUI:RegisterSkin("Trainer", function ()
   local border = tonumber(pfUI_config.appearance.border.default)
   local bpad = border > 1 and border - 1 or 1