diff --git a/init/compat.xml b/init/compat.xml
index 7d9f7b2d..173883ce 100644
--- a/init/compat.xml
+++ b/init/compat.xml
@@ -1,4 +1,3 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
   <Include file="..\compat\vanilla.lua"/>
-  <Include file="..\compat\tbc.lua"/>
 </Ui>
diff --git a/init/modules.xml b/init/modules.xml
index 9c17cf52..07f703ff 100644
--- a/init/modules.xml
+++ b/init/modules.xml
@@ -35,7 +35,6 @@
   <Include file="..\modules\questitem.lua"/>
   <Include file="..\modules\thirdparty.lua"/>
   <Include file="..\modules\thirdparty-vanilla.lua"/>
-  <Include file="..\modules\thirdparty-tbc.lua"/>
   <Include file="..\modules\buff.lua"/>
   <Include file="..\modules\buffwatch.lua"/>
   <Include file="..\modules\nameplates.lua"/>
@@ -66,10 +65,11 @@
   <Include file="..\modules\afkcam.lua"/>
   <Include file="..\modules\screenshot.lua"/>
   <Include file="..\modules\addoncompat.lua"/>
-  <Include file="..\modules\combatlogfix.lua"/>
   <Include file="..\modules\energytick.lua"/>
   <Include file="..\modules\totems.lua"/>
   <Include file="..\modules\macrotweak.lua"/>
   <Include file="..\modules\turtle-wow.lua"/>
   <Include file="..\modules\superwow.lua"/>
+  <Include file="..\modules\nampower.lua"/>
+  <Include file="..\modules\unitxp.lua"/>
 </Ui>
diff --git a/init/skins.xml b/init/skins.xml
index 010e2b96..088c2d55 100644
--- a/init/skins.xml
+++ b/init/skins.xml
@@ -26,7 +26,6 @@
   <Include file="..\skins\blizzard\game_menu.lua"/>
   <Include file="..\skins\blizzard\guild_registrar.lua"/>
   <Include file="..\skins\blizzard\help.lua"/>
-  <Include file="..\skins\blizzard\options-interface.lua"/>
   <Include file="..\skins\blizzard\options-sound.lua"/>
   <Include file="..\skins\blizzard\options-video.lua"/>
   <Include file="..\skins\blizzard\petition.lua"/>
@@ -34,13 +33,4 @@
   <Include file="..\skins\blizzard\tooltips.lua"/>
   <Include file="..\skins\blizzard\tabard.lua"/>
   <Include file="..\skins\blizzard\itemtext.lua"/>
-
-  <!-- TBC -->
-  <Include file="..\skins\blizzard\tracking.lua"/>
-  <Include file="..\skins\blizzard\guildbank.lua"/>
-  <Include file="..\skins\blizzard\socket.lua"/>
-  <Include file="..\skins\blizzard\arena_registrar.lua"/>
-  <Include file="..\skins\blizzard\arena.lua"/>
-  <Include file="..\skins\blizzard\time_manager.lua"/>
-  <Include file="..\skins\blizzard\lfg.lua"/>
 </Ui>
diff --git a/pfUI-tbc.toc b/pfUI-tbc.toc
deleted file mode 100644
index 1686229a..00000000
--- a/pfUI-tbc.toc
+++ /dev/null
@@ -1,17 +0,0 @@
-## Interface: 20400
-## Title: |cff33ffccpf|cffffffffUI
-## Author: Shagu
-## Notes: A complete user interface replacement.
-## Notes-ruRU: Полная замена пользовательского интерфейса.
-## Version: 5.5.4
-## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache
-## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
-
-pfUI.lua
-
-init\env.xml
-init\compat.xml
-init\api.xml
-init\libs.xml
-init\skins.xml
-init\modules.xml
diff --git a/skins/blizzard/auction.lua b/skins/blizzard/auction.lua
index 0cd64855..f94c3e3a 100644
--- a/skins/blizzard/auction.lua
+++ b/skins/blizzard/auction.lua
@@ -1,16 +1,11 @@
-pfUI:RegisterSkin("Auctionhouse", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Auctionhouse", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
   HookAddonOrVariable("Blizzard_AuctionUI", function()
-    -- Compatibility
-    if BrowseResetButton then -- tbc
-      SkinButton(BrowseResetButton)
-    else -- vanilla
-      SkinArrowButton(BidPrevPageButton, "left", 18)
-      SkinArrowButton(BidNextPageButton, "right", 18)
-      SkinArrowButton(AuctionsPrevPageButton, "left", 18)
-      SkinArrowButton(AuctionsNextPageButton, "right", 18)
-    end
+    SkinArrowButton(BidPrevPageButton, "left", 18)
+    SkinArrowButton(BidNextPageButton, "right", 18)
+    SkinArrowButton(AuctionsPrevPageButton, "left", 18)
+    SkinArrowButton(AuctionsNextPageButton, "right", 18)
 
     hooksecurefunc("AuctionFrame_OnShow", function()
       AuctionFrame:ClearAllPoints()
diff --git a/skins/blizzard/battlefield.lua b/skins/blizzard/battlefield.lua
index 7ff50008..f8dcb283 100644
--- a/skins/blizzard/battlefield.lua
+++ b/skins/blizzard/battlefield.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Battlefield", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Battlefield", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/battlefield_minimap.lua b/skins/blizzard/battlefield_minimap.lua
index e0a21d5e..e2eb12b7 100644
--- a/skins/blizzard/battlefield_minimap.lua
+++ b/skins/blizzard/battlefield_minimap.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Battlefield Minimap", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Battlefield Minimap", "vanilla", function ()
   local rawborder, border = GetBorderSize()
 
   HookAddonOrVariable("Blizzard_BattlefieldMinimap", function()
diff --git a/skins/blizzard/character.lua b/skins/blizzard/character.lua
index 88d4775f..fea07800 100644
--- a/skins/blizzard/character.lua
+++ b/skins/blizzard/character.lua
@@ -1,26 +1,13 @@
-pfUI:RegisterSkin("Character", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Character", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- Compatibility
-  if PlayerTitleDropDown then -- tbc, wotlk
-    -- Character Tab
-    SkinDropDown(PlayerTitleDropDown)
-    PlayerTitleDropDown:SetPoint("TOP", CharacterLevelText, "BOTTOM", 0, -2)
-    PlayerTitleDropDownText:SetPoint("LEFT", PlayerTitleDropDown.backdrop, "LEFT", 6, 2)
-    SkinDropDown(PlayerStatFrameLeftDropDown)
-    SkinDropDown(PlayerStatFrameRightDropDown)
+  -- Honor Tab
+  StripTextures(HonorFrame)
 
-    -- Honor Tab
-    StripTextures(PVPFrame)
-  else -- vanilla
-    -- Honor Tab
-    StripTextures(HonorFrame)
-
-    HonorFrameProgressBar:SetStatusBarTexture(pfUI.media["img:bar"])
-    CreateBackdrop(HonorFrameProgressBar)
-    HonorFrameProgressBar:SetHeight(24)
-  end
+  HonorFrameProgressBar:SetStatusBarTexture(pfUI.media["img:bar"])
+  CreateBackdrop(HonorFrameProgressBar)
+  HonorFrameProgressBar:SetHeight(24)
 
   local magicResTextureCords = {
     {0.21875, 0.78125, 0.25, 0.3203125},
diff --git a/skins/blizzard/dressup.lua b/skins/blizzard/dressup.lua
index d618a36c..cf5c0ffe 100644
--- a/skins/blizzard/dressup.lua
+++ b/skins/blizzard/dressup.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Dress Up Frame", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Dress Up Frame", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/friends.lua b/skins/blizzard/friends.lua
index fe6080e6..26b21ce3 100644
--- a/skins/blizzard/friends.lua
+++ b/skins/blizzard/friends.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Friends", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Friends", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
   local maxtab = pfUI.expansion == "vanilla" and 4 or 5
@@ -336,24 +336,6 @@ pfUI:RegisterSkin("Friends", "vanilla:tbc", function ()
     GuildInfoCancelButton:ClearAllPoints()
     GuildInfoCancelButton:SetPoint("BOTTOMRIGHT", GuildInfoFrame, "BOTTOMRIGHT", -10, 8)
 
-    if GuildInfoGuildEventButton then -- log button (tbc+)
-      SkinButton(GuildInfoGuildEventButton)
-      GuildInfoGuildEventButton:ClearAllPoints()
-      GuildInfoGuildEventButton:SetPoint("BOTTOM", GuildInfoFrame, "BOTTOM", 0, 8)
-    end
-
-    if GuildEventLogFrame then -- guild log frame (tbc+)
-      StripTextures(GuildEventFrame)
-      CreateBackdrop(GuildEventFrame, nil, true, .75)
-      StripTextures(GuildEventLogFrame)
-      CreateBackdrop(GuildEventLogFrame, nil, true, .75)
-      StripTextures(GuildEventLogScrollFrame)
-      SkinScrollbar(GuildEventLogScrollFrameScrollBar)
-      SkinCloseButton(GuildEventLogCloseButton)
-      GuildEventLogCancelButton:SetPoint("BOTTOMRIGHT", -9, 8)
-      SkinButton(GuildEventLogCancelButton)
-    end
-
     -- guild control
     StripTextures(GuildControlPopupFrame)
     CreateBackdrop(GuildControlPopupFrame, nil, true, .75)
@@ -392,46 +374,6 @@ pfUI:RegisterSkin("Friends", "vanilla:tbc", function ()
     GuildControlPopupAcceptButton:SetPoint("RIGHT", GuildControlPopupFrameCancelButton, "LEFT", -2*bpad, 0)
   end
 
-  if ChannelFrameVerticalBar then -- Channel Tab (TBC+)
-    StripTextures(ChannelFrameVerticalBar)
-    SkinButton(ChannelFrameNewButton)
-    ChannelFrameNewButton:SetPoint("BOTTOMRIGHT", -15, 82)
-
-    StripTextures(ChannelListScrollFrame)
-    SkinScrollbar(ChannelListScrollFrameScrollBar)
-
-    for i = 1, MAX_DISPLAY_CHANNEL_BUTTONS do
-      StripTextures(_G["ChannelButton"..i])
-      SkinButton(_G["ChannelButton"..i])
-    end
-
-    for i = 1, 22 do
-      StripTextures(_G["ChannelMemberButton"..i])
-    end
-
-    CreateBackdrop(ChannelMemberButton1)
-    ChannelMemberButton1.backdrop:SetPoint("BOTTOMRIGHT", ChannelMemberButton22, "BOTTOMRIGHT", -1, 0)
-
-    StripTextures(ChannelRosterScrollFrame)
-    SkinScrollbar(ChannelRosterScrollFrameScrollBar)
-
-    StripTextures(ChannelFrameDaughterFrame)
-    CreateBackdrop(ChannelFrameDaughterFrame)
-
-    StripTextures(ChannelFrameDaughterFrameChannelName)
-    CreateBackdrop(ChannelFrameDaughterFrameChannelName, nil, true)
-    ChannelFrameDaughterFrameChannelName:SetTextInsets(5,5,5,5)
-
-    StripTextures(ChannelFrameDaughterFrameChannelPassword)
-    CreateBackdrop(ChannelFrameDaughterFrameChannelPassword, nil, true)
-    ChannelFrameDaughterFrameChannelPassword:SetTextInsets(5,5,5,5)
-
-    SkinCloseButton(ChannelFrameDaughterFrameDetailCloseButton)
-
-    SkinButton(ChannelFrameDaughterFrameCancelButton)
-    SkinButton(ChannelFrameDaughterFrameOkayButton)
-  end
-
   do -- Raid Tab
     StripTextures(RaidInfoFrame)
     CreateBackdrop(RaidInfoFrame, nil, true, .75)
diff --git a/skins/blizzard/game_menu.lua b/skins/blizzard/game_menu.lua
index 9b6d440b..9e202c7a 100644
--- a/skins/blizzard/game_menu.lua
+++ b/skins/blizzard/game_menu.lua
@@ -1,14 +1,10 @@
-pfUI:RegisterSkin("Game Menu", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Game Menu", "vanilla", function ()
   StripTextures(GameMenuFrame)
   CreateBackdrop(GameMenuFrame, nil, true, .75)
   CreateBackdropShadow(GameMenuFrame)
 
   GameMenuFrame:SetWidth(GameMenuFrame:GetWidth() - 30)
-  if pfUI.expansion == 'tbc' then
-    GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 10)
-  elseif pfUI.expansion == 'vanilla' then
-    GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 6)
-  end
+  GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 6)
 
   local title = GetNoNameObject(GameMenuFrame, "FontString", "ARTWORK", MAIN_MENU)
   title:SetTextColor(1,1,1,1)
diff --git a/skins/blizzard/gossipquest.lua b/skins/blizzard/gossipquest.lua
index 183347d7..dec691a6 100644
--- a/skins/blizzard/gossipquest.lua
+++ b/skins/blizzard/gossipquest.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Gossip and Quest", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Gossip and Quest", "vanilla", 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 44c1459d..62955cf4 100644
--- a/skins/blizzard/guild_registrar.lua
+++ b/skins/blizzard/guild_registrar.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Guild Registrar", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Guild Registrar", "vanilla", function ()
   StripTextures(GuildRegistrarFrame)
   StripTextures(GuildRegistrarGreetingFrame)
   CreateBackdrop(GuildRegistrarFrame, nil, nil, .75)
diff --git a/skins/blizzard/help.lua b/skins/blizzard/help.lua
index 54413aa1..b47060b7 100644
--- a/skins/blizzard/help.lua
+++ b/skins/blizzard/help.lua
@@ -1,19 +1,7 @@
-pfUI:RegisterSkin("Help", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Help", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- not much here for tbc yet
-  if pfUI.client > 11200 then
-    local ticket, background = TicketStatusFrame:GetChildren()
-    CreateBackdrop(background, nil, true, .75)
-    TicketStatusFrame:SetHeight(40)
-    TicketStatusFrame:ClearAllPoints()
-    TicketStatusFrame:SetPoint("TOP", 0, -5)
-
-    UpdateMovable(TicketStatusFrame)
-    return
-  end
-
   StripTextures(HelpFrame)
   CreateBackdrop(HelpFrame, nil, nil, .75)
   CreateBackdropShadow(HelpFrame)
diff --git a/skins/blizzard/inspect.lua b/skins/blizzard/inspect.lua
index b81609c3..cbbc39b4 100644
--- a/skins/blizzard/inspect.lua
+++ b/skins/blizzard/inspect.lua
@@ -20,111 +20,6 @@ local slots = {
   "RangedSlot",
 }
 
-pfUI:RegisterSkin("Inspect", "tbc", function ()
-  local rawborder, border = GetBorderSize()
-  local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
-
-  HookAddonOrVariable("Blizzard_InspectUI", function()
-    CreateBackdrop(InspectFrame, nil, nil, .75)
-    CreateBackdropShadow(InspectFrame)
-
-    InspectFrame.backdrop:SetPoint("TOPLEFT", 10, -10)
-    InspectFrame.backdrop:SetPoint("BOTTOMRIGHT", -30, 72)
-    InspectFrame:SetHitRectInsets(10,30,10,72)
-    EnableMovable("InspectFrame", "Blizzard_InspectUI", INSPECTFRAME_SUBFRAMES)
-
-    SkinCloseButton(InspectFrameCloseButton, InspectFrame.backdrop, -6, -6)
-
-    InspectFrame:DisableDrawLayer("ARTWORK")
-
-    InspectNameText:ClearAllPoints()
-    InspectNameText:SetPoint("TOP", InspectFrame.backdrop, "TOP", 0, -10)
-    InspectGuildText:Show()
-    InspectGuildText:ClearAllPoints()
-    InspectGuildText:SetPoint("TOP", InspectLevelText, "BOTTOM", 0, -1)
-
-    for i = 1, 3 do
-      local tab = _G["InspectFrameTab"..i]
-      local lastTab = _G["InspectFrameTab"..(i-1)]
-      tab:ClearAllPoints()
-      if lastTab then
-        tab:SetPoint("LEFT", lastTab, "RIGHT", border*2 + 1, 0)
-    else
-        tab:SetPoint("TOPLEFT", InspectFrame.backdrop, "BOTTOMLEFT", bpad, -(border + (border == 1 and 1 or 2)))
-      end
-      SkinTab(tab)
-    end
-
-    do -- Character Tab
-      StripTextures(InspectPaperDollFrame)
-
-      EnableClickRotate(InspectModelFrame)
-      InspectModelRotateLeftButton:Hide()
-      InspectModelRotateRightButton:Hide()
-
-      for _, slot in pairs(slots) do
-        local frame = _G["Inspect"..slot]
-        SkinButton(frame, nil, nil, nil, _G["Inspect"..slot.."IconTexture"], true)
-      end
-
-      hooksecurefunc("InspectPaperDollFrame_OnShow", function()
-        local guild, title = GetGuildInfo(InspectFrame.unit)
-        local text = guild and format(TEXT(GUILD_TITLE_TEMPLATE), title, guild) or ""
-        InspectGuildText:SetText(text)
-      end)
-
-      hooksecurefunc("InspectPaperDollItemSlotButton_Update", function(button)
-        local unit = InspectFrame.unit
-        local link = GetInventoryItemLink(unit, button:GetID())
-        if link then
-          local quality = select(3, GetItemInfo(link))
-          button:SetBackdropBorderColor(GetItemQualityColor(quality))
-        else
-          button:SetBackdropBorderColor(pfUI.cache.er, pfUI.cache.eg, pfUI.cache.eb, pfUI.cache.ea)
-        end
-      end)
-    end
-
-    do -- PVP Tab
-      StripTextures(InspectPVPFrame)
-    end
-
-    do -- Talent Tab
-      StripTextures(InspectTalentFrame)
-      InspectTalentFrameCancelButton:Hide()
-      InspectTalentFrameCloseButton:Hide()
-
-      InspectTalentFrameSpentPoints:ClearAllPoints()
-      InspectTalentFrameSpentPoints:SetPoint("BOTTOMRIGHT", InspectTalentFrame, "BOTTOMRIGHT", 0, 83)
-
-      StripTextures(InspectTalentFrameScrollFrame)
-      SkinScrollbar(InspectTalentFrameScrollFrameScrollBar)
-
-      for i = 1, MAX_NUM_TALENTS do
-        local talent = _G["InspectTalentFrameTalent"..i]
-        if talent then
-          StripTextures(talent)
-          SkinButton(talent, nil, nil, nil, _G["InspectTalentFrameTalent"..i.."IconTexture"])
-
-          _G["InspectTalentFrameTalent"..i.."Rank"]:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
-        end
-      end
-
-      for i = 1, 3 do
-        local tab = _G["InspectTalentFrameTab"..i]
-        local lastTab = _G["InspectTalentFrameTab"..(i-1)]
-        tab:ClearAllPoints()
-        if lastTab then
-          tab:SetPoint("LEFT", lastTab, "RIGHT", border*2 + 1, 0)
-        else
-          tab:SetPoint("TOPLEFT", 70, -50)
-        end
-        SkinTab(tab)
-      end
-    end
-  end)
-end)
-
 pfUI:RegisterSkin("Inspect", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
diff --git a/skins/blizzard/itemtext.lua b/skins/blizzard/itemtext.lua
index 2455919a..568901d9 100644
--- a/skins/blizzard/itemtext.lua
+++ b/skins/blizzard/itemtext.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Books", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Books", "vanilla", function ()
   StripTextures(ItemTextFrame)
   CreateBackdrop(ItemTextFrame, nil, nil, .75)
   CreateBackdropShadow(ItemTextFrame)
diff --git a/skins/blizzard/keybindings.lua b/skins/blizzard/keybindings.lua
index 049aac20..9b570b88 100644
--- a/skins/blizzard/keybindings.lua
+++ b/skins/blizzard/keybindings.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("KeyBindings", "vanilla:tbc", function ()
+pfUI:RegisterSkin("KeyBindings", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/macro.lua b/skins/blizzard/macro.lua
index 890ad6bc..efe4c582 100644
--- a/skins/blizzard/macro.lua
+++ b/skins/blizzard/macro.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Macro", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Macro", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/mail.lua b/skins/blizzard/mail.lua
index 861c7d1f..8830e0fe 100644
--- a/skins/blizzard/mail.lua
+++ b/skins/blizzard/mail.lua
@@ -1,53 +1,10 @@
-pfUI:RegisterSkin("Mailbox", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Mailbox", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- Compatibility
   local StationeryBackgroundLeft, StationeryBackgroundRight
-  if ATTACHMENTS_MAX_SEND then -- tbc
-    do -- SendMailFrame
-      for i = 1, ATTACHMENTS_MAX_SEND do
-        local btn = _G["SendMailAttachment"..i]
-        StripTextures(btn)
-        SkinButton(btn, nil, nil, nil, nil, true)
-      end
 
-      hooksecurefunc("SendMailFrame_Update", function()
-        for i = 1, ATTACHMENTS_MAX_SEND do
-          local btn = _G["SendMailAttachment"..i]
-          HandleIcon(btn, btn:GetNormalTexture())
-
-          local link = GetSendMailItemLink(i)
-          if link then
-            local r,g,b = GetItemQualityColor(select(3, GetItemInfo(link)))
-            btn:SetBackdropBorderColor(r,g,b,1)
-            else
-            btn:SetBackdropBorderColor(GetStringColor(pfUI_config.appearance.border.color))
-          end
-        end
-      end)
-
-      StationeryBackgroundLeft, StationeryBackgroundRight = SendStationeryBackgroundLeft, SendStationeryBackgroundRight
-    end
-
-    do -- OpenMailFrame
-      for i = 1, ATTACHMENTS_MAX_RECEIVE do
-        SkinButton(_G["OpenMailAttachmentButton"..i], nil, nil, nil, _G["OpenMailAttachmentButton"..i.."IconTexture"], true)
-      end
-
-      hooksecurefunc("InboxFrame_OnClick", function(index)
-        for i=1, ATTACHMENTS_MAX_RECEIVE do
-          local link = GetInboxItemLink(index, i)
-          if not link then return end
-          local r,g,b = GetItemQualityColor(select(3, GetItemInfo(link)))
-          _G["OpenMailAttachmentButton"..i]:SetBackdropBorderColor(r,g,b,1)
-        end
-      end)
-
-      SkinButton(OpenMailReportSpamButton)
-    end
-  else -- vanilla
-    do -- SendMailFrame
+  do -- SendMailFrame
       local skin = CreateFrame("Frame")
       skin:SetScript("OnEvent", function()
         this:UnregisterEvent("MAIL_SHOW")
@@ -122,7 +79,6 @@ pfUI:RegisterSkin("Mailbox", "vanilla:tbc", function ()
         end
       end)
     end
-  end
 
   StripTextures(MailFrame, true)
   CreateBackdrop(MailFrame, nil, nil, .75)
diff --git a/skins/blizzard/merchant.lua b/skins/blizzard/merchant.lua
index ccceba7e..084285cf 100644
--- a/skins/blizzard/merchant.lua
+++ b/skins/blizzard/merchant.lua
@@ -1,21 +1,9 @@
-pfUI:RegisterSkin("Merchant", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Merchant", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- Compatibility
-  if MerchantGuildBankRepairButton then -- tbc
-    SkinButton(MerchantGuildBankRepairButton, nil, nil, nil, MerchantGuildBankRepairButtonIcon)
-    MerchantGuildBankRepairButtonIcon:SetTexCoord(.59, .82, .06, .54)
-    hooksecurefunc("MerchantFrame_UpdateRepairButtons", function()
-      MerchantGuildBankRepairButton:ClearAllPoints()
-      MerchantGuildBankRepairButton:SetPoint("RIGHT", MerchantBuyBackItemItemButton, "LEFT", -14, 0)
-      MerchantRepairAllButton:ClearAllPoints()
-      MerchantRepairAllButton:SetPoint("RIGHT", MerchantGuildBankRepairButton, "LEFT", -6, 0)
-    end)
-  else -- vanilla
-    MerchantRepairAllButton:ClearAllPoints()
-    MerchantRepairAllButton:SetPoint("RIGHT", MerchantBuyBackItemItemButton, "LEFT", -6, 0)
-  end
+  MerchantRepairAllButton:ClearAllPoints()
+  MerchantRepairAllButton:SetPoint("RIGHT", MerchantBuyBackItemItemButton, "LEFT", -6, 0)
 
   StripTextures(MerchantFrame)
   CreateBackdrop(MerchantFrame, nil, nil, .75)
diff --git a/skins/blizzard/miscellaneous.lua b/skins/blizzard/miscellaneous.lua
index ea67ac3b..2af1e4de 100644
--- a/skins/blizzard/miscellaneous.lua
+++ b/skins/blizzard/miscellaneous.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Stack Split", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Stack Split", "vanilla", function ()
   StripTextures(StackSplitFrame)
   CreateBackdrop(StackSplitFrame, nil, nil, .75)
   CreateBackdropShadow(StackSplitFrame)
@@ -7,7 +7,7 @@ pfUI:RegisterSkin("Stack Split", "vanilla:tbc", function ()
   SkinButton(StackSplitCancelButton)
 end)
 
-pfUI:RegisterSkin("Coin Pickup", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Coin Pickup", "vanilla", function ()
   StripTextures(CoinPickupFrame)
   CreateBackdrop(CoinPickupFrame, nil, nil, .75)
   CreateBackdropShadow(CoinPickupFrame)
@@ -16,7 +16,7 @@ pfUI:RegisterSkin("Coin Pickup", "vanilla:tbc", function ()
   SkinButton(CoinPickupCancelButton)
 end)
 
-pfUI:RegisterSkin("Color Picker", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Color Picker", "vanilla", function ()
   CreateBackdrop(ColorPickerFrame)
   CreateBackdropShadow(ColorPickerFrame)
 
@@ -32,7 +32,7 @@ pfUI:RegisterSkin("Color Picker", "vanilla:tbc", function ()
   SkinSlider(OpacitySliderFrame)
 end)
 
-pfUI:RegisterSkin("Opacity", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Opacity", "vanilla", function ()
   CreateBackdrop(OpacityFrame, nil, true, .75)
   CreateBackdropShadow(OpacityFrame)
 
@@ -41,7 +41,7 @@ pfUI:RegisterSkin("Opacity", "vanilla:tbc", function ()
   OpacityFrameSlider:SetPoint("CENTER", 0, 0)
 end)
 
-pfUI:RegisterSkin("Tutorial", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Tutorial", "vanilla", function ()
   CreateBackdrop(TutorialFrame, nil, true, .75)
   CreateBackdropShadow(TutorialFrame)
 
@@ -49,7 +49,7 @@ pfUI:RegisterSkin("Tutorial", "vanilla:tbc", function ()
   SkinButton(TutorialFrameOkayButton)
 end)
 
-pfUI:RegisterSkin("Quest Timer", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Quest Timer", "vanilla", function ()
   CreateBackdrop(QuestTimerFrame, nil, nil, .75)
   CreateBackdropShadow(QuestTimerFrame)
   UpdateMovable(QuestTimerFrame, true)
diff --git a/skins/blizzard/options-sound.lua b/skins/blizzard/options-sound.lua
index 341486ab..257d4023 100644
--- a/skins/blizzard/options-sound.lua
+++ b/skins/blizzard/options-sound.lua
@@ -1,40 +1,18 @@
-pfUI:RegisterSkin("Options - Sound", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Options - Sound", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- Compatibility
-  local SoundOptionsFrameHeaderText, NUM_CHECKBOXES, NUM_SLIDERS
-  if SOUND_OPTIONS then -- tbc
-    SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "BACKGROUND", SOUND_OPTIONS)
-    NUM_CHECKBOXES = 11
-    NUM_SLIDERS = 6
+  local SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "ARTWORK", SOUNDOPTIONS_MENU)
+  local NUM_CHECKBOXES = 8
+  local NUM_SLIDERS = 4
 
-    StripTextures(AudioOptionsFrame)
-    CreateBackdrop(SoundOptionsFramePlayback, nil, true, .75)
-    CreateBackdrop(SoundOptionsFrameHardware, nil, true, .75)
-    CreateBackdrop(SoundOptionsFrameVolume, nil, true, .75)
-
-    SkinDropDown(SoundOptionsOutputDropDown)
-
-    SoundOptionsFrameDefaults:ClearAllPoints()
-    SoundOptionsFrameDefaults:SetPoint("TOPLEFT", SoundOptionsFramePlayback, "BOTTOMLEFT", 0, -10)
-    SoundOptionsFrameCancel:ClearAllPoints()
-    SoundOptionsFrameCancel:SetPoint("TOPRIGHT", SoundOptionsFrameVolume, "BOTTOMRIGHT", 0, -10)
-    SoundOptionsFrameOkay:ClearAllPoints()
-    SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
-  else -- vanilla
-    SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "ARTWORK", SOUNDOPTIONS_MENU)
-    NUM_CHECKBOXES = 8
-    NUM_SLIDERS = 4
-
-    SoundOptionsFrameOkay:ClearAllPoints()
-    SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
-    SoundOptionsFrameSlider1:ClearAllPoints()
-    SoundOptionsFrameSlider1:SetPoint("TOPRIGHT", SoundOptionsFrame, "TOPRIGHT", -18, -43)
-    for i=2, NUM_SLIDERS do
-      _G["SoundOptionsFrameSlider"..i]:ClearAllPoints()
-      _G["SoundOptionsFrameSlider"..i]:SetPoint("TOP", _G["SoundOptionsFrameSlider"..i-1], "BOTTOM", 0, -30)
-    end
+  SoundOptionsFrameOkay:ClearAllPoints()
+  SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
+  SoundOptionsFrameSlider1:ClearAllPoints()
+  SoundOptionsFrameSlider1:SetPoint("TOPRIGHT", SoundOptionsFrame, "TOPRIGHT", -18, -43)
+  for i=2, NUM_SLIDERS do
+    _G["SoundOptionsFrameSlider"..i]:ClearAllPoints()
+    _G["SoundOptionsFrameSlider"..i]:SetPoint("TOP", _G["SoundOptionsFrameSlider"..i-1], "BOTTOM", 0, -30)
   end
 
   StripTextures(SoundOptionsFrame)
diff --git a/skins/blizzard/options-video.lua b/skins/blizzard/options-video.lua
index 70c7e325..853bdcb0 100644
--- a/skins/blizzard/options-video.lua
+++ b/skins/blizzard/options-video.lua
@@ -1,45 +1,19 @@
-pfUI:RegisterSkin("Options - Video", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Options - Video", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
-  -- Compatibility
-  local MAX_SLIDERS, MAX_CHECKBOXES
-  if OptionsFrameSlider10 then -- tbc
-    MAX_SLIDERS = 11
-    MAX_CHECKBOXES = 19
+  local MAX_SLIDERS = 9
+  local MAX_CHECKBOXES = 18
 
-    for i=1, MAX_SLIDERS do
-      local slider = _G["OptionsFrameSlider"..i]
-      local shift = 0
-      if i == 4 or i == 5 or i == 7 or i == 8 or i == 10 or i == 11 then shift = 10 end
-      local point, anchor, anchorPoint, x, y = slider:GetPoint()
-      slider:ClearAllPoints()
-      slider:SetPoint(point, anchor, anchorPoint, x, y - shift)
-    end
-
-    hooksecurefunc("OptionsFrame_Load", function()
-      OptionsFramePixelShaders:SetWidth(230)
-      OptionsFrameMiscellaneous:ClearAllPoints()
-      OptionsFrameMiscellaneous:SetPoint("LEFT", OptionsFramePixelShaders, "RIGHT", 6, 0)
-    end)
-    OptionsFrameDefaults:ClearAllPoints()
-    OptionsFrameDefaults:SetPoint("TOPLEFT", OptionsFramePixelShaders, "BOTTOMLEFT", 0, -10)
-    OptionsFrameCancel:ClearAllPoints()
-    OptionsFrameCancel:SetPoint("TOPRIGHT", OptionsFrameMiscellaneous, "BOTTOMRIGHT", 0, -10)
-  else -- vanilla
-    MAX_SLIDERS = 9
-    MAX_CHECKBOXES = 18
-
-    for i=1, MAX_SLIDERS do
-      local slider = _G["OptionsFrameSlider"..i]
-      local shift = 0
-      if i == 1 or i == 6 then shift = 4
-      elseif i == 4 or i == 8 then shift = 10
-      end
-      local point, anchor, anchorPoint, x, y = slider:GetPoint()
-      slider:ClearAllPoints()
-      slider:SetPoint(point, anchor, anchorPoint, x, y - shift)
+  for i=1, MAX_SLIDERS do
+    local slider = _G["OptionsFrameSlider"..i]
+    local shift = 0
+    if i == 1 or i == 6 then shift = 4
+    elseif i == 4 or i == 8 then shift = 10
     end
+    local point, anchor, anchorPoint, x, y = slider:GetPoint()
+    slider:ClearAllPoints()
+    slider:SetPoint(point, anchor, anchorPoint, x, y - shift)
   end
 
   CreateBackdrop(OptionsFrame, nil, nil, .75)
diff --git a/skins/blizzard/popup_dialogs.lua b/skins/blizzard/popup_dialogs.lua
index d795a7bf..fc3aed02 100644
--- a/skins/blizzard/popup_dialogs.lua
+++ b/skins/blizzard/popup_dialogs.lua
@@ -1,12 +1,5 @@
-pfUI:RegisterSkin("Popup Dialogs", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Popup Dialogs", "vanilla", function ()
   for i = 1, STATICPOPUP_NUMDIALOGS do
-    -- Compatibility
-    local money = _G["StaticPopup"..i.."MoneyInputFrame"]
-    if money then -- tbc
-      SkinMoneyInputFrame(money)
-    end
-
-
     local dialog = _G["StaticPopup"..i]
     CreateBackdrop(dialog, nil, true, .75)
     CreateBackdropShadow(dialog)
diff --git a/skins/blizzard/professions.lua b/skins/blizzard/professions.lua
index eab6d31e..bbd266d1 100644
--- a/skins/blizzard/professions.lua
+++ b/skins/blizzard/professions.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Profession", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Profession", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
@@ -219,37 +219,7 @@ pfUI:RegisterSkin("Profession", "vanilla:tbc", function ()
         end)
       end
 
-      -- Compatibility
-      if search then -- tbc
-        _G[displayed] = 21
-        scrollframe:SetHeight(338)
-
-        local rank = _G[name.."RankFrameSkillRank"]
-        rank:ClearAllPoints()
-        rank:SetPoint("CENTER", rankbar, "CENTER", 0, 0)
-
-        local available = _G[frame:GetName().."AvailableFilterCheckButton"]
-        SkinCheckbox(available)
-        available:ClearAllPoints()
-        available:SetPoint("TOPLEFT", scrollframe.backdrop, "BOTTOMLEFT", -4, -5)
-
-        search:DisableDrawLayer("BACKGROUND")
-        CreateBackdrop(search, nil, nil, 1)
-        search.backdrop:SetAllPoints(search)
-        search:SetTextInsets(5, 5, 5, 5)
-        search:SetHeight(22)
-        search:ClearAllPoints()
-        search:SetPoint("TOPRIGHT", scrollframe.backdrop, "BOTTOMRIGHT", 0, -5)
-
-        local craft_filter = CraftFrameFilterDropDown
-        if craft_filter then
-          SkinDropDown(craft_filter)
-          craft_filter:ClearAllPoints()
-          craft_filter:SetPoint("BOTTOMRIGHT", scrollframe.backdrop, "TOPRIGHT", 15, 0)
-        end
-      else -- vanilla
-        _G[displayed] = 23
-      end
+      _G[displayed] = 23
       -- build remaining tradeskills
       for i = 9, _G[displayed] do
         local button = _G[template..i] or CreateFrame("Button", template..i, frame, template.."ButtonTemplate")
diff --git a/skins/blizzard/questlog.lua b/skins/blizzard/questlog.lua
index 23b4d0e8..748b2fb9 100644
--- a/skins/blizzard/questlog.lua
+++ b/skins/blizzard/questlog.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Quest Log", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Quest Log", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
@@ -6,23 +6,10 @@ pfUI:RegisterSkin("Quest Log", "vanilla:tbc", function ()
   _G.MAX_WATCHABLE_QUESTS = 20 -- TODO
 
   do -- quest log frame
-    -- Compatibility
-    local QUEST_COUNT
-    if QuestLogCount then -- tbc
-      QUEST_COUNT = QuestLogCount
+    local QUEST_COUNT = QuestLogQuestCount
 
-      StripTextures(QUEST_COUNT)
-      QUEST_COUNT:ClearAllPoints()
-      hooksecurefunc("QuestLogUpdateQuestCount", function(numQuests)
-        QUEST_COUNT:ClearAllPoints()
-        QUEST_COUNT:SetPoint("BOTTOMRIGHT", QuestLogFrame, "TOPRIGHT", 0, -50)
-      end)
-    else -- vanilla
-      QUEST_COUNT = QuestLogQuestCount
-
-      QUEST_COUNT:ClearAllPoints()
-      QUEST_COUNT:SetPoint("TOPRIGHT", -10, -30)
-    end
+    QUEST_COUNT:ClearAllPoints()
+    QUEST_COUNT:SetPoint("TOPRIGHT", -10, -30)
 
     hooksecurefunc("QuestLog_OnShow", function()
       QuestLogFrame:ClearAllPoints()
diff --git a/skins/blizzard/readycheck.lua b/skins/blizzard/readycheck.lua
index 51ec176b..0d21ec89 100644
--- a/skins/blizzard/readycheck.lua
+++ b/skins/blizzard/readycheck.lua
@@ -1,12 +1,6 @@
-pfUI:RegisterSkin("Readycheck", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Readycheck", "vanilla", function ()
   HookAddonOrVariable("Blizzard_RaidUI", function()
-    -- Compatibility
-    local update_func
-    if ReadyCheckFrame_OnUpdate then -- tbc
-      update_func = "ReadyCheckFrame_OnUpdate"
-    else -- vanilla
-      update_func = "ReadyCheck_OnUpdate"
-    end
+    local update_func = "ReadyCheck_OnUpdate"
 
     StripTextures(ReadyCheckFrame, true)
     CreateBackdrop(ReadyCheckFrame, nil, nil, .75)
diff --git a/skins/blizzard/spellbook.lua b/skins/blizzard/spellbook.lua
index e28383c3..db5bf427 100644
--- a/skins/blizzard/spellbook.lua
+++ b/skins/blizzard/spellbook.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Spellbook", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Spellbook", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/stable.lua b/skins/blizzard/stable.lua
index 9e6e7a52..fdf6f7f1 100644
--- a/skins/blizzard/stable.lua
+++ b/skins/blizzard/stable.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Pet Stable Master", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Pet Stable Master", "vanilla", function ()
   StripTextures(PetStableFrame)
   CreateBackdrop(PetStableFrame, nil, nil, .75)
   CreateBackdropShadow(PetStableFrame)
diff --git a/skins/blizzard/tabard.lua b/skins/blizzard/tabard.lua
index e8e48c21..46efde05 100644
--- a/skins/blizzard/tabard.lua
+++ b/skins/blizzard/tabard.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Guild Tabard", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Guild Tabard", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/talents.lua b/skins/blizzard/talents.lua
index f26e5a4c..11c9370a 100644
--- a/skins/blizzard/talents.lua
+++ b/skins/blizzard/talents.lua
@@ -1,16 +1,10 @@
-pfUI:RegisterSkin("Talents", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Talents", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
   HookAddonOrVariable("Blizzard_TalentUI", function()
-    -- Compatibility
-    local TALENT_FRAME, TALENT_FRAME_NAME
-    if PlayerTalentFrame then -- tbc
-      TALENT_FRAME = _G.PlayerTalentFrame
-    else -- vanilla
-      TALENT_FRAME = _G.TalentFrame
-    end
-    TALENT_FRAME_NAME = TALENT_FRAME:GetName()
+    local TALENT_FRAME = _G.TalentFrame
+    local TALENT_FRAME_NAME = TALENT_FRAME:GetName()
 
 
     StripTextures(TALENT_FRAME)
diff --git a/skins/blizzard/taxi.lua b/skins/blizzard/taxi.lua
index fac03ade..79a7bc36 100644
--- a/skins/blizzard/taxi.lua
+++ b/skins/blizzard/taxi.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Flightmaster", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Flightmaster", "vanilla", function ()
   StripTextures(TaxiFrame)
   CreateBackdrop(TaxiFrame, nil, nil, .75)
   CreateBackdropShadow(TaxiFrame)
diff --git a/skins/blizzard/tooltips.lua b/skins/blizzard/tooltips.lua
index c050c541..d1195ee8 100644
--- a/skins/blizzard/tooltips.lua
+++ b/skins/blizzard/tooltips.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Tooltips", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Tooltips", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local alpha = tonumber(C.tooltip.alpha)
 
diff --git a/skins/blizzard/trade.lua b/skins/blizzard/trade.lua
index fd6237d6..fe0a9e4c 100644
--- a/skins/blizzard/trade.lua
+++ b/skins/blizzard/trade.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Trade", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Trade", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
 
diff --git a/skins/blizzard/trainer.lua b/skins/blizzard/trainer.lua
index 62df6005..e752f7bb 100644
--- a/skins/blizzard/trainer.lua
+++ b/skins/blizzard/trainer.lua
@@ -1,4 +1,4 @@
-pfUI:RegisterSkin("Trainer", "vanilla:tbc", function ()
+pfUI:RegisterSkin("Trainer", "vanilla", function ()
   local rawborder, border = GetBorderSize()
   local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()