Use PFUI_CLASS_COLORS in loothistory

40-y rangecheck on by default
Support binding a click to a named macro
2026-09-22 07:36:56 +00:00 · 2026-08-12 14:33:05 -05:00 · 2026-08-12 14:25:37 -05:00 · 2026-08-12 00:33:49 -05:00 · 2026-08-11 02:06:28 -05:00 · 2026-08-11 00:38:28 -05:00
79 changed files with 1901 additions and 8914 deletions
@@ -2,11 +2,11 @@

 [![Octo WoW](https://img.shields.io/badge/Octo%20WoW-1.18.1-brightgreen.svg)](https://octowow.st/)
 [![ClassicAPI](https://img.shields.io/badge/ClassicAPI-Required-purple.svg)](https://github.com/brues-code/ClassicAPI)
-[![SuperWoW](https://img.shields.io/badge/SuperWoW-Required-purple.svg)](https://github.com/balakethelock/SuperWoW)
 [![Nampower](https://img.shields.io/badge/Nampower-Required-purple.svg)](https://github.com/brues-code/nampower)
-[![UnitXP](https://img.shields.io/badge/UnitXP__SP3-Optional-yellow.svg)](https://codeberg.org/konaka/UnitXP_SP3)
+[![SuperWoW](https://img.shields.io/badge/SuperWoW-Optional-yellow.svg)](https://github.com/balakethelock/SuperWoW)
+[![UnitXP](https://img.shields.io/badge/UnitXP__SP3-Optional-yellow.svg)](https://github.com/brues-code/UnitXP_SP3)

-**A pfUI fork specifically optimized for ClassicAPI on [Octo WoW](https://octowow.st/) which requires Nampower and SuperWoW with optional UnitXP_SP3 DLL integration.**
+**A pfUI fork specifically optimized for ClassicAPI on [Octo WoW](https://octowow.st/)**

 This version includes significant performance improvements and DLL-enhanced features.

@@ -16,7 +16,7 @@ This version includes significant performance improvements and DLL-enhanced feat
 4. Copy "pfUI" into Wow-Directory\Interface\AddOns
 5. Restart Wow

-## Optional DLL Enhancements
+## DLL Enhancements

 Since pfUI 6.0.0 includes integrations with client-side DLLs for enhanced functionality. These DLLs are permitted on Octo WoW:

@@ -36,23 +36,24 @@ Provides:
 - Faster, safer profile sharing - Engine-side serialize/compress/base64 via C_EncodingUtil
 - C_Timer - After / NewTicker replacing hand-rolled OnUpdate throttles
 - Feign death, shapeshift and quest-item detection via real API calls
+- Mouseover Unit Frames
+- Click-casting
+- Loot Roll History (/loothistory)
+- New item highlighting
 - Plenty other functions

-### [SuperWoW](https://github.com/balakethelock/SuperWoW)
-
-Provides:
- UnitPosition for distance calculations
- SetMouseoverUnit for improved targeting
-
 ### [Nampower](https://github.com/brues-code/nampower)

 Provides:
 - Spell queue indicator
 - GCD indicator
- Reactive spell detection
- Enhanced cast information

-### [UnitXP_SP3](https://codeberg.org/konaka/UnitXP_SP3)
+### [SuperWoW](https://github.com/balakethelock/SuperWoW)
+
+Provides:
+- Tracks party/raid units on the minimap
+
+### [UnitXP_SP3](https://github.com/brues-code/UnitXP_SP3)

 Provides:
 - Line of Sight detection
@@ -79,6 +80,7 @@ Use `/pfdll` in-game to check which DLLs are detected.
    /swapfocus    Toggle Focus and Target-Frame
    /pftest       Toggle pfUI Unitframe Test Mode
    /abp          Addon Button Panel
+    /loothistory  Show Loot Roll History

 ## Languages
 pfUI supports and contains language specific code for the following gameclients.
@@ -91,7 +93,7 @@ pfUI supports and contains language specific code for the following gameclients.
 * Russian (ruRU)

 ## Recommended Addons
-* [pfQuest](https://shagu.org/pfQuest) A simple database and quest helper
+* [pfQuest](https://github.com/brues-code/pfQuest) A simple database and quest helper
 * [SuperCleveRoidMacros](https://github.com/brues-code/SuperCleveRoidMacros) Supports modern macro formats

 ## Plugins
@@ -231,7 +231,7 @@ end
 -- unit         [string]        the unitstring
 -- return:      [table]         string, r, g, b
 function pfUI.api.GetUnitColor(unitstr)
-  local _, class = UnitClass(unitstr)
+  local class = UnitClassBase(unitstr)
  local classColor = PFUI_CLASS_COLORS[class]
  return classColor:GenerateHexColorMarkup(), classColor:GetRGB()
 end
@@ -377,36 +377,53 @@ end
 -- 'str'        [string]         input string that should be matched
 -- 'pat'        [string]         unformatted pattern
 -- returns:     [strings]        matched string in capture order
-local a, b, c, d, e
-local _, va, vb, vc, vd, ve
-local ra, rb, rc, rd, re
 function pfUI.api.cmatch(str, pat)
-  -- read capture indexes
-  a, b, c, d, e = GetCaptures(pat)
-  _, _, va, vb, vc, vd, ve = string.find(str, pfUI.api.SanitizePattern(pat))
+  -- idx* = the logical %N index of each physical capture slot (nil when the
+  -- pattern has no %N$ markers); val* = the matched values in physical order.
+  local idx1, idx2, idx3, idx4, idx5 = GetCaptures(pat)
+  local _, _, val1, val2, val3, val4, val5 = string.find(str, pfUI.api.SanitizePattern(pat))

-  -- put entries into the proper return values
-  ra = e == 1 and ve or d == 1 and vd or c == 1 and vc or b == 1 and vb or va
-  rb = e == 2 and ve or d == 2 and vd or c == 2 and vc or a == 2 and va or vb
-  rc = e == 3 and ve or d == 3 and vd or a == 3 and va or b == 3 and vb or vc
-  rd = e == 4 and ve or a == 4 and va or c == 4 and vc or b == 4 and vb or vd
-  re = a == 5 and va or d == 5 and vd or c == 5 and vc or b == 5 and vb or ve
+  -- reorder the physical matches into logical (%1..%5) order
+  local out1 = idx5 == 1 and val5 or idx4 == 1 and val4 or idx3 == 1 and val3 or idx2 == 1 and val2 or val1
+  local out2 = idx5 == 2 and val5 or idx4 == 2 and val4 or idx3 == 2 and val3 or idx1 == 2 and val1 or val2
+  local out3 = idx5 == 3 and val5 or idx4 == 3 and val4 or idx1 == 3 and val1 or idx2 == 3 and val2 or val3
+  local out4 = idx5 == 4 and val5 or idx1 == 4 and val1 or idx3 == 4 and val3 or idx2 == 4 and val2 or val4
+  local out5 = idx1 == 5 and val1 or idx4 == 5 and val4 or idx3 == 5 and val3 or idx2 == 5 and val2 or val5

-  return ra, rb, rc, rd, re
+  return out1, out2, out3, out4, out5
 end

 -- [ GetItemLinkByName ]
 -- Returns an itemLink for the given itemname
 -- 'name'       [string]         name of the item
 -- returns:     [string]         entire itemLink for the given item
+local itemLinkCache = {}
+local itemLinkMisses = {}
+local ITEMLINK_MAX_SCANS = 2
 function pfUI.api.GetItemLinkByName(name)
-  for itemID = 1, 25818 do
+  -- GetInboxItem() hands us a nil name for attachment-less mail
+  if not name then return end
+  -- cache successful resolutions so repeated lookups (e.g. per inbox click) are free
+  if itemLinkCache[name] then return itemLinkCache[name] end
+
+  -- Failures have to be counted, not just retried. An unresolvable name walks
+  -- the entire id range and finds nothing -- a visible hitch on every tooltip
+  -- hover. Allow a couple of attempts (rendering the tooltip caches the item,
+  -- so the next hover usually resolves), then stop scanning for that name.
+  local misses = itemLinkMisses[name] or 0
+  if misses >= ITEMLINK_MAX_SCANS then return end
+
+  -- Octo/Turtle custom items live well past the 25818 vanilla ceiling
+  for itemID = 1, 61000 do
    local itemName = C_Item.GetItemNameByID(itemID)
    if itemName and itemName == name then
      local _, itemLink = C_Item.GetItemInfo(itemID)
+      itemLinkCache[name] = itemLink
      return itemLink
    end
  end
+
+  itemLinkMisses[name] = misses + 1
 end

 -- [ FindItem ]
@@ -997,13 +1014,10 @@ end

 -- [ GetStringColor ]
 -- Queries the pfUI setting strings and extract its color codes
-- returns r,g,b,a as numbers
+-- returns r,g,b,a as strings
 local color_cache = setmetatable({}, {
  __index = function(t, k)
    local color = { pfUI.api.strsplit(",", k) }
-    for i = 1, table.getn(color) do
-      color[i] = tonumber(color[i])
-    end
    rawset(t, k, color)
    return color
  end
@@ -1018,7 +1032,8 @@ end
 -- returns a ColorMixin
 local color_object_cache = setmetatable({}, {
  __index = function(t, k)
-    local color = CreateColor(pfUI.api.GetStringColor(k))
+    local r,g,b,a = pfUI.api.GetStringColor(k)
+    local color = CreateColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
    rawset(t, k, color)
    return color
  end
@@ -155,6 +155,7 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("appearance", "cd",          "dynamicsize",      "1")
  pfUI:UpdateConfig("appearance", "castbar",     "castbarcolor",     ".7,.7,.9,.8")
  pfUI:UpdateConfig("appearance", "castbar",     "channelcolor",     ".9,.9,.7,.8")
+  pfUI:UpdateConfig("appearance", "castbar",     "failcolor",        "1,.2,.2,.8")
  pfUI:UpdateConfig("appearance", "castbar",     "texture",          "Interface\\AddOns\\pfUI\\img\\bar")
  pfUI:UpdateConfig("appearance", "infight",     "screen",           "0")
  pfUI:UpdateConfig("appearance", "infight",     "aggro",            "0")
@@ -222,7 +223,7 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("unitframes", nil,           "always2dportrait", "0")
  pfUI:UpdateConfig("unitframes", nil,           "portraittexture",  "1")
  pfUI:UpdateConfig("unitframes", nil,           "layout",           "default")
-  pfUI:UpdateConfig("unitframes", nil,           "rangecheck",       "0")
+  pfUI:UpdateConfig("unitframes", nil,           "rangecheck",       "1")
  pfUI:UpdateConfig("unitframes", nil,           "rangecheck_mode",  "vanilla")
  pfUI:UpdateConfig("unitframes", nil,           "rangecheck_distance", "40")
  pfUI:UpdateConfig("unitframes", nil,           "buffdetect",       "0")
@@ -553,7 +554,6 @@ function pfUI:LoadConfig()

    pfUI:UpdateConfig("unitframes", unit,      "glowaggro",        "1")
    pfUI:UpdateConfig("unitframes", unit,      "glowcombat",       "1")
-    pfUI:UpdateConfig("unitframes", unit,      "showtooltip",      "1")
    pfUI:UpdateConfig("unitframes", unit,      "healthcolor",      "1")
    pfUI:UpdateConfig("unitframes", unit,      "powercolor",       "1")
    pfUI:UpdateConfig("unitframes", unit,      "levelcolor",       "1")
@@ -784,6 +784,10 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("tooltip",    nil,           "extguild",         "1")
  pfUI:UpdateConfig("tooltip",    nil,           "itemid",           "0")
  pfUI:UpdateConfig("tooltip",    nil,           "movespeed",        "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "aurasource",       "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "spellid",          "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "unitid",           "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "showbuffs",        "0")
  pfUI:UpdateConfig("tooltip",    nil,           "alpha",            "0.8")
  pfUI:UpdateConfig("tooltip",    nil,           "alwaysperc",       "0")
  pfUI:UpdateConfig("tooltip",    "compare",     "basestats",        "1")
@@ -954,6 +958,7 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("questlog",   nil,           "showQuestLevels",  "0")

  pfUI:UpdateConfig("character",  "inventory",   "durability",       "1")
+  pfUI:UpdateConfig("character",  "inventory",   "equipflyout",      "0")
  pfUI:UpdateConfig("character",  "reputation",  "repRequired",      "1")
  pfUI:UpdateConfig("thirdparty", nil,           "chatbg",           "1")
  pfUI:UpdateConfig("thirdparty", nil,           "showmeter",        "0")
@@ -961,6 +966,7 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("thirdparty", "dpsmate",     "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "shagudps",    "skin",             "0")
  pfUI:UpdateConfig("thirdparty", "shagudps",    "dock",             "0")
+  pfUI:UpdateConfig("thirdparty", "greedmeter",  "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "swstats",     "skin",             "0")
  pfUI:UpdateConfig("thirdparty", "swstats",     "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "ktm",         "skin",             "0")
@@ -587,7 +587,7 @@ end
 function pfUI.api.SetHighlight(frame, cr, cg, cb)
  if not frame then return end
  if not cr or not cg or not cb then
-    cr, cg, cb = GetClassColor(UnitClassBase('player'))
+    cr, cg, cb = PFUI_CLASS_COLORS[UnitClassBase('player')]:GetRGB()
  end

  frame.cr, frame.cg, frame.cb = cr, cg, cb, ca
@@ -632,7 +632,7 @@ function pfUI.api.SkinButton(button, cr, cg, cb, icon, disableHighlight)
  if not b then b = button end
  if not b then return end
  if not cr or not cg or not cb then
-    cr, cg, cb = GetClassColor(UnitClassBase('player'))
+    cr, cg, cb = PFUI_CLASS_COLORS[UnitClassBase('player')]:GetRGB()
  end
  pfUI.api.CreateBackdrop(b, nil, true)
  b:SetNormalTexture("")
@@ -709,7 +709,7 @@ end
 function pfUI.api.SkinRotateButton(button)
  pfUI.api.CreateBackdrop(button)

-  local cr, cg, cb = GetClassColor(UnitClassBase('player'))
+  local cr, cg, cb = PFUI_CLASS_COLORS[UnitClassBase('player')]:GetRGB()

  local btnW, btnH = button:GetSize()
  button:SetSize(btnW - 18, btnH - 18)
@@ -895,8 +895,7 @@ function pfUI.api.SkinDropDown(frame, cr, cg, cb, useSmall)
  CreateBackdrop(button)

  button.backdrop:ClearAllPoints()
-  button.backdrop:SetWidth(18)
-  button.backdrop:SetHeight(18)
+  button.backdrop:SetSize(18, 18)
  button.backdrop:SetPoint("RIGHT", frame.backdrop, "RIGHT", -2, 0)

  if not button.icon then
@@ -908,7 +907,7 @@ function pfUI.api.SkinDropDown(frame, cr, cg, cb, useSmall)
  end

  if not cr or not cg or not cb then
-    cr, cg, cb = GetClassColor(UnitClassBase('player'))
+    cr, cg, cb = PFUI_CLASS_COLORS[UnitClassBase('player')]:GetRGB()
  end

  SetHighlight(button, cr, cg, cb)
@@ -1247,3 +1246,249 @@ function pfUI.api.SkinMoneyInputFrame(frame)
  copperIcon:ClearAllPoints()
  copperIcon:SetPoint("LEFT", copper_editbox, "RIGHT", 2, 0)
 end
+
+-- Shared icon picker widget. Builds a name field, a "currently selected"
+-- preview, and a 10x8 icon grid backed by IconDataProviderMixin with an
+-- All/Spells/Items filter and a name search. Used by the macro icon picker
+-- and the equipment manager's name/icon popup. The widgets attach to
+-- `parent`; the caller owns the surrounding frame, its OK/Cancel buttons,
+-- and the save flow. Selection is tracked by texture PATH (not index) so it
+-- survives filter changes -- a spell icon you picked still saves after you
+-- switch the filter to "Items" and it drops out of the visible grid.
+--
+--   name          global-name prefix for the scroll frame and editboxes
+--   parent        the popup frame to attach the widgets to
+--   extraType     IconDataProviderExtraType.* seed (Spellbook / Equipment)
+--   nameLabelText header shown above the name field
+--
+-- Returns a handle:
+--   .editbox                 name EditBox (caller wires enter/escape)
+--   .search                  search EditBox
+--   .GetIcon()               current selected texture path
+--   .SetIcon(path)           set selection (nil -> question mark)
+--   .Refresh()               ensure provider, redraw grid + preview
+--   .SetIconAreaShown(shown) show/hide the grid, filter, search, and labels
+function pfUI.api.CreateIconPicker(name, parent, extraType, nameLabelText)
+  local QUESTION_MARK = "INTERFACE\\ICONS\\INV_MISC_QUESTIONMARK"
+
+  local ICON_GRID_COLS = 10
+  local ICON_GRID_ROWS = 8
+  local ICON_BTN_SIZE  = 36
+  local ICON_BTN_PAD   = 6
+
+  local provider = nil
+  local selectedIconPath = QUESTION_MARK
+  local currentFilter = "all"
+  local searchText = ""
+  local filtered = nil  -- provider indices matching the search, or nil when empty
+  local RefreshIconGrid, RebuildFilter
+
+  local function EnsureProvider()
+    if not provider then
+      provider = CreateAndInitFromMixin(IconDataProviderMixin, extraType)
+    end
+  end
+
+  -- Normalize a texture to an uppercase basename so matching works across
+  -- sources: GetMacroInfo / stored set icons return "Interface\Icons\<name>"
+  -- while provider paths are uppercase-prefixed for base icons and
+  -- mixed-case for spellbook extras.
+  local function IconKey(path)
+    if type(path) ~= "string" then return path end
+    return string.gsub(string.upper(path), "^.*[\\/]", "")
+  end
+
+  parent.nameLabel = parent:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+  parent.nameLabel:SetPoint("TOPLEFT", parent, "TOPLEFT", 14, -20)
+  parent.nameLabel:SetText(nameLabelText)
+
+  parent.editbox = CreateFrame("EditBox", name.."Name", parent, "InputBoxTemplate")
+  parent.editbox:SetSize(280, 20)
+  parent.editbox:SetPoint("TOPLEFT", parent, "TOPLEFT", 14, -38)
+  parent.editbox:SetAutoFocus(false)
+  parent.editbox:SetMaxLetters(16)
+  CreateBackdrop(parent.editbox)
+
+  parent.selectedLabel = parent:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+  parent.selectedLabel:SetPoint("TOPRIGHT", parent, "TOPRIGHT", -14, -14)
+  parent.selectedLabel:SetText(ICON_SELECTION_TITLE_CURRENT)
+  parent.selectedLabel:SetTextColor(1, 0.82, 0)
+
+  parent.selectedPreview = CreateFrame("Frame", nil, parent)
+  parent.selectedPreview:SetSize(42, 42)
+  parent.selectedPreview:SetPoint("TOPRIGHT", parent, "TOPRIGHT", -14, -30)
+  CreateBackdrop(parent.selectedPreview)
+  parent.selectedPreview.tex = parent.selectedPreview:CreateTexture(nil, "ARTWORK")
+  parent.selectedPreview.tex:SetAllPoints(parent.selectedPreview)
+  parent.selectedPreview.tex:SetTexCoord(.08, .92, .08, .92)
+
+  parent.iconLabel = parent:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+  parent.iconLabel:SetPoint("TOPLEFT", parent, "TOPLEFT", 14, -86)
+  parent.iconLabel:SetText(MACRO_POPUP_CHOOSE_ICON)
+
+  -- Icon grid + scroll
+  local iconScroll = CreateFrame("ScrollFrame", name.."Scroll", parent, "FauxScrollFrameTemplate")
+  iconScroll:SetPoint("TOPLEFT", parent, "TOPLEFT", 14, -116)
+  iconScroll:SetWidth(ICON_GRID_COLS * (ICON_BTN_SIZE + ICON_BTN_PAD) - ICON_BTN_PAD)
+  iconScroll:SetHeight(ICON_GRID_ROWS * (ICON_BTN_SIZE + ICON_BTN_PAD) - ICON_BTN_PAD)
+
+  local scrollbar = _G[name.."ScrollScrollBar"]
+  scrollbar:ClearAllPoints()
+  scrollbar:SetPoint("TOPLEFT", iconScroll, "TOPRIGHT", 8, -16)
+  scrollbar:SetPoint("BOTTOMLEFT", iconScroll, "BOTTOMRIGHT", 8, 16)
+  SkinScrollbar(scrollbar)
+
+  -- Filter dropdown: All / Spells / Items
+  local filterDropdown = CreateFrame("Frame", name.."Filter", parent, "UIDropDownMenuTemplate")
+  filterDropdown:SetPoint("TOPRIGHT", parent, "TOPRIGHT", 0, -80)
+  local function ApplyFilter(value)
+    currentFilter = value
+    UIDropDownMenu_SetSelectedValue(filterDropdown, value)
+    if provider then
+      if value == "spells" then provider:SetIconTypes({ IconDataProviderIconType.Spell })
+      elseif value == "items" then provider:SetIconTypes({ IconDataProviderIconType.Item })
+      else provider:SetIconTypes(nil) end
+      RebuildFilter()
+      RefreshIconGrid()
+    end
+  end
+  UIDropDownMenu_Initialize(filterDropdown, function()
+    local info
+    info = {}; info.text = ICON_FILTER_ALL; info.value = "all"
+    info.func = function() ApplyFilter("all") end
+    info.checked = currentFilter == "all"
+    UIDropDownMenu_AddButton(info)
+    info = {}; info.text = ICON_FILTER_SPELL; info.value = "spells"
+    info.func = function() ApplyFilter("spells") end
+    info.checked = currentFilter == "spells"
+    UIDropDownMenu_AddButton(info)
+    info = {}; info.text = ICON_FILTER_ITEM; info.value = "items"
+    info.func = function() ApplyFilter("items") end
+    info.checked = currentFilter == "items"
+    UIDropDownMenu_AddButton(info)
+  end)
+  UIDropDownMenu_SetWidth(120, filterDropdown)
+  UIDropDownMenu_SetSelectedValue(filterDropdown, "all")
+  SkinDropDown(filterDropdown)
+
+  local iconButtons = {}
+  for r = 1, ICON_GRID_ROWS do
+    for c = 1, ICON_GRID_COLS do
+      local i = (r - 1) * ICON_GRID_COLS + c
+      local btn = CreateFrame("Button", nil, parent)
+      btn:SetSize(ICON_BTN_SIZE, ICON_BTN_SIZE)
+      btn:SetPoint("TOPLEFT", iconScroll, "TOPLEFT", (c-1) * (ICON_BTN_SIZE + ICON_BTN_PAD), -(r-1) * (ICON_BTN_SIZE + ICON_BTN_PAD))
+      CreateBackdrop(btn)
+      btn.texture = btn:CreateTexture(nil, "ARTWORK")
+      btn.texture:SetAllPoints(btn)
+      btn.texture:SetTexCoord(.08, .92, .08, .92)
+      btn:SetScript("OnClick", function()
+        if this.iconIndex and provider then
+          local path = provider:GetIconByIndex(this.iconIndex)
+          if path then selectedIconPath = path end
+          RefreshIconGrid()
+        end
+      end)
+      btn:SetScript("OnEnter", function()
+        if not this.iconIndex or not provider then return end
+        local path = provider:GetIconByIndex(this.iconIndex)
+        if type(path) == "string" then
+          GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+          GameTooltip:SetText(IconKey(path), 1, 1, 1)
+          GameTooltip:Show()
+        end
+      end)
+      btn:SetScript("OnLeave", GameTooltip_Hide)
+      iconButtons[i] = btn
+    end
+  end
+
+  -- Rebuild the search-filtered index list (provider indices whose icon
+  -- basename contains the search text); nil when the search box is empty.
+  function RebuildFilter()
+    EnsureProvider()
+    if searchText == "" then
+      filtered = nil
+      return
+    end
+    filtered = {}
+    for i = 1, provider:GetNumIcons() do
+      local path = provider:GetIconByIndex(i)
+      if type(path) == "string" and string.find(IconKey(path), searchText, 1, true) then
+        table.insert(filtered, i)
+      end
+    end
+  end
+
+  function RefreshIconGrid()
+    EnsureProvider()
+    local numIcons = filtered and table.getn(filtered) or provider:GetNumIcons()
+    local numRows = math.ceil(numIcons / ICON_GRID_COLS)
+    FauxScrollFrame_Update(iconScroll, numRows, ICON_GRID_ROWS, ICON_BTN_SIZE + ICON_BTN_PAD)
+    local offset = FauxScrollFrame_GetOffset(iconScroll)
+    for i = 1, ICON_GRID_ROWS * ICON_GRID_COLS do
+      local listIdx = i + offset * ICON_GRID_COLS
+      local btn = iconButtons[i]
+      if listIdx <= numIcons then
+        btn:Show()
+        local providerIdx = filtered and filtered[listIdx] or listIdx
+        btn.iconIndex = providerIdx
+        local path = provider:GetIconByIndex(providerIdx)
+        btn.texture:SetTexture(path)
+        if IconKey(path) == IconKey(selectedIconPath) then
+          btn.backdrop:SetBackdropBorderColor(1, 0.82, 0, 1)
+        else
+          btn.backdrop:SetBackdropBorderColor(pfUI.cache.er, pfUI.cache.eg, pfUI.cache.eb, pfUI.cache.ea)
+        end
+      else
+        btn:Hide()
+        btn.iconIndex = nil
+      end
+    end
+    parent.selectedPreview.tex:SetTexture(selectedIconPath)
+  end
+
+  iconScroll:SetScript("OnVerticalScroll", function()
+    FauxScrollFrame_OnVerticalScroll(ICON_BTN_SIZE + ICON_BTN_PAD, function() RefreshIconGrid() end)
+  end)
+
+  -- Search box (bottom-left) filters the grid by icon name.
+  parent.searchLabel = parent:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+  parent.searchLabel:SetPoint("BOTTOMLEFT", parent, "BOTTOMLEFT", 16, 18)
+  parent.searchLabel:SetText(SEARCH)
+
+  parent.search = CreateFrame("EditBox", name.."Search", parent, "InputBoxTemplate")
+  parent.search:SetSize(180, 20)
+  parent.search:SetPoint("LEFT", parent.searchLabel, "RIGHT", 10, 0)
+  parent.search:SetAutoFocus(false)
+  CreateBackdrop(parent.search)
+  parent.search:SetScript("OnEscapePressed", function() this:ClearFocus() end)
+  parent.search:SetScript("OnTextChanged", function()
+    searchText = strupper(strtrim(this:GetText()))
+    RebuildFilter()
+    scrollbar:SetValue(0)
+    RefreshIconGrid()
+  end)
+
+  -- Release the provider when the popup closes so its icon cache GCs.
+  parent:HookScript("OnHide", function()
+    if provider then provider:Release(); provider = nil end
+  end)
+
+  local handle = { editbox = parent.editbox, search = parent.search }
+  function handle.GetIcon() return selectedIconPath end
+  function handle.SetIcon(path) selectedIconPath = path or QUESTION_MARK end
+  function handle.Refresh() RefreshIconGrid() end
+  function handle.SetIconAreaShown(shown)
+    local method = shown and "Show" or "Hide"
+    iconScroll[method](iconScroll)
+    for _, b in ipairs(iconButtons) do b[method](b) end
+    parent.iconLabel[method](parent.iconLabel)
+    parent.selectedLabel[method](parent.selectedLabel)
+    parent.selectedPreview[method](parent.selectedPreview)
+    filterDropdown[method](filterDropdown)
+    parent.searchLabel[method](parent.searchLabel)
+    parent.search[method](parent.search)
+  end
+  return handle
+end
@@ -140,32 +140,43 @@ function pfUI.api.GetUnitStats(unitstr)
 end

 local aggrodata = { }
+local aggroScan = nil -- static { u, t, tt } triples, built once so the hot scan allocates nothing
 function pfUI.api.UnitHasAggro(unit)
-  -- Only cache positive results to allow instant detection when aggro changes
-  if aggrodata[unit] and aggrodata[unit].state > 0 and GetTime() < aggrodata[unit].check + 1 then
-    return aggrodata[unit].state
+  local now = GetTime()
+  local data = aggrodata[unit]
+  -- Cache positive results 1s (so aggro clears fast) AND negative results 0.3s
+  -- (so we don't rescan the whole unit table on every call while nothing has aggro).
+  if data and now < data.check + (data.state > 0 and 1 or 0.3) then
+    return data.state
  end

-  aggrodata[unit] = aggrodata[unit] or { }
-  aggrodata[unit].check = GetTime()
-  aggrodata[unit].state = 0
+  if not data then data = { }; aggrodata[unit] = data end
+  data.check = now
+  data.state = 0

  if UnitExists(unit) and UnitIsFriend(unit, "player") then
-    for u in pairs(pfValidUnits) do
-      local t = u .. "target"
-      local tt = t .. "target"
-
-      if UnitExists(t) and UnitIsUnit(t, unit) and UnitCanAttack(u, unit) then
-        aggrodata[unit].state = aggrodata[unit].state + 1
+    -- pfValidUnits never changes after load, so precompute the "<u>target" /
+    -- "<u>targettarget" token strings once instead of concatenating per call.
+    if not aggroScan then
+      aggroScan = {}
+      for u in pairs(pfValidUnits) do
+        local t = u .. "target"
+        table.insert(aggroScan, { u = u, t = t, tt = t .. "target" })
      end
+    end

-      if UnitExists(tt) and UnitIsUnit(tt, unit) and UnitCanAttack(t, unit) then
-        aggrodata[unit].state = aggrodata[unit].state + 1
+    for i = 1, table.getn(aggroScan) do
+      local s = aggroScan[i]
+      if UnitExists(s.t) and UnitIsUnit(s.t, unit) and UnitCanAttack(s.u, unit) then
+        data.state = data.state + 1
+      end
+      if UnitExists(s.tt) and UnitIsUnit(s.tt, unit) and UnitCanAttack(s.t, unit) then
+        data.state = data.state + 1
      end
    end
  end

-  return aggrodata[unit].state
+  return data.state
 end

 pfUI.uf.glow = CreateFrame("Frame", nil, UIParent)
@@ -238,6 +249,7 @@ function pfUI.uf:UpdateVisibility()
  end

  local unitstr = string.format("%s%s", self.label or "", self.id or "")
+  self:SetAttribute("unit", unitstr ~= "" and unitstr or nil)
  local visibility = string.format("[target=%s,exists] show; hide", unitstr)

  -- Group frames are redundant when the group is already shown as a raid grid:
@@ -397,12 +409,11 @@ function pfUI.uf:UpdateConfig()

  f.power:ClearAllPoints()
  f.power:SetPoint(f.config.panchor, f.hp, relative_point, f.config.poffx, -2 * default_border - spacing + f.config.poffy * GetPerfectPixel())
-  f.power:SetWidth((f.config.pwidth ~= "-1" and f.config.pwidth or f.config.width))
-  f.power:SetHeight(f.config.pheight)
+  f.power:SetSize((f.config.pwidth ~= "-1" and f.config.pwidth or f.config.width), f.config.pheight)
  if tonumber(f.config.pheight) < 0 then f.power:Hide() end

  pfUI.api.CreateBackdrop(f.power, default_border)
-  f.power.bar:SetFrameLevel(f.power:GetFrameLevel() + 1)
+  f.power.bar:SetFrameLevel(f.power.backdrop:GetFrameLevel() + 1)
  f.power.bar:SetStatusBarTexture(pfUI.media[f.config.pbartexture])
  f.power.bar:SetAllPoints(f.power)

@@ -790,8 +801,7 @@ function pfUI.uf:UpdateConfig()
      f.debuffs[i]:SetFrameLevel(12)
      f.debuffs[i]:RegisterForClicks("RightButtonUp")
      f.debuffs[i]:ClearAllPoints()
-      f.debuffs[i]:SetWidth(f.config.debuffsize)
-      f.debuffs[i]:SetHeight(f.config.debuffsize)
+      f.debuffs[i]:SetSize(f.config.debuffsize, f.config.debuffsize)
      f.debuffs[i]:SetNormalTexture(nil)
      
      -- Create CD frame if it doesn't exist
@@ -1112,11 +1122,7 @@ function pfUI.uf.OnUpdate()
        
        -- update ressurections
        local ress = libpredict:UnitHasIncomingResurrection(unit)
-        if ress and UnitIsDeadOrGhost(unit) then
-          this.ressIcon:Show()
-        else
-          this.ressIcon:Hide()
-        end
+        this.ressIcon:SetShown(ress and UnitIsDeadOrGhost(unit))
      end
    end
  end
@@ -1179,61 +1185,6 @@ function pfUI.uf.OnUpdate()
  end
 end

-function pfUI.uf.OnEnter()
-  if not this.label then return end
-
-  -- Nampower: Set native mouseover unit for macro/addon compatibility
-  if SetMouseoverUnit then
-    local unitstr = this.label .. this.id
-    -- For GUID-based frames (focus), use the GUID directly
-    if this.label and string.find(this.label, "^0x") then
-      SetMouseoverUnit(this.label)
-    elseif UnitExists(unitstr) then
-      SetMouseoverUnit(unitstr)
-    end
-  end
-
-  if this.config.showtooltip == "0" then return end
-  GameTooltip_SetDefaultAnchor(GameTooltip, this)
-  GameTooltip:SetUnit(this.label .. this.id)
-  GameTooltip:Show()
-end
-
-function pfUI.uf.OnLeave()
-  -- Nampower: Clear native mouseover unit
-  if SetMouseoverUnit then
-    SetMouseoverUnit()
-  end
-
-  GameTooltip:FadeOut()
-end
-
-function pfUI.uf.OnClick()
-  if not this.label and this.unitname then
-    TargetByName(this.unitname, true)
-  else
-    pfUI.uf:ClickAction(arg1)
-  end
-end
-
-function pfUI.uf:RightClickAction(unit)
-  if unit == "player" then
-    ToggleDropDownMenu(1, nil, PlayerFrameDropDown, "cursor")
-  elseif unit == "target" then
-    ToggleDropDownMenu(1, nil, TargetFrameDropDown, "cursor")
-  elseif unit == "pet" then
-    ToggleDropDownMenu(1, nil, PetFrameDropDown, "cursor")
-  elseif unit == "party" or strfind(unit, "party%d") then
-    ToggleDropDownMenu(1, nil, getglobal("PartyMemberFrame" .. this.id .. "DropDown"), "cursor")
-  elseif unit == "raid" or strfind(unit, "raid%d") then
-    local name = this.lastUnit
-    local unitstr = this.label .. this.id
-    FriendsDropDown.displayMode = "MENU"
-    FriendsDropDown.initialize = function() UnitPopup_ShowMenu(_G[UIDROPDOWNMENU_OPEN_MENU], "PARTY", unitstr, name, id) end
-    ToggleDropDownMenu(1, nil, FriendsDropDown, "cursor")
-  end
-end
-
 function pfUI.uf:EnableEvents()
  local f = self

@@ -1269,17 +1220,72 @@ function pfUI.uf:EnableEvents()
    'MiddleButtonUp', 'Button4Up', 'Button5Up')
 end

+-- ============================================================
+-- Clique compatibility
+-- Clique's pfUI plugin replaces pfUI.uf.ClickAction and expects an
+-- OnClick script to call it (with `this` = frame, `arg1` = button). The
+-- secure attribute path replaced that dispatch, so when Clique is loaded
+-- EnableScripts routes clicks through this legacy Lua path instead. The
+-- secure path is skipped there because type1="target" switches the target
+-- before Clique can cast.
+-- ============================================================
+
+function pfUI.uf.OnClick()
+  if not this.label and this.unitname then
+    TargetByName(this.unitname, true)
+  else
+    pfUI.uf:ClickAction(arg1)
+  end
+end
+
+function pfUI.uf:ClickAction(button)
+  local label = this.label or ""
+  local id = this.id or ""
+  local unitstr = label .. id
+
+  if SpellIsTargeting() and button == "RightButton" then
+    SpellStopTargeting()
+    return
+  end
+
+  if SpellIsTargeting() and button == "LeftButton" then
+    SpellTargetUnit(unitstr)
+  elseif CursorHasItem() then
+    DropItemOnUnit(unitstr)
+  end
+
+  -- right-click opens the standard unit menu (ClassicAPI resolves the type)
+  if button == "RightButton" then
+    ClassicAPI_ToggleUnitMenu(unitstr)
+    return
+  end
+
+  -- drop food on petframe
+  if label == "pet" and CursorHasItem() then
+    if UnitClassBase("player") == "HUNTER" then
+      DropItemOnUnit("pet")
+      return
+    end
+  end
+
+  -- default click
+  TargetUnit(unitstr)
+end
+
 function pfUI.uf:EnableScripts()
  local f = self

-  f:SetScript("OnClick", pfUI.uf.OnClick)
+  if IsAddOnLoaded("Clique") then
+    f:SetScript("OnClick", pfUI.uf.OnClick)
+  else
+    f:SetAttribute("type1", "target")
+    f:SetAttribute("type2", "menu")
+    f:EnableClickCast()
+  end

  f:SetScript("OnShow", pfUI.uf.OnShow)
  f:SetScript("OnEvent", pfUI.uf.OnEvent)
  f:SetScript("OnUpdate", pfUI.uf.OnUpdate)
-  f:SetScript("OnEnter", pfUI.uf.OnEnter)
-  f:SetScript("OnLeave", pfUI.uf.OnLeave)
-  f:EnableClickCast()

  -- add frame to visibility refresh handler
  visibilityscan.frames[f] = true
@@ -1307,7 +1313,7 @@ function pfUI.uf:CreateUnitFrame(unit, id, config, tick)
    unit, id = "target", ""
  end

-  local f = CreateFrame("Button", "pf" .. fname, UIParent, UNITFRAME_SECURE_TEMPLATE)
+  local f = CreateFrame("Button", "pf" .. fname, UIParent)

  -- add unitframe functions
  f.UpdateFrameSize  = pfUI.uf.UpdateFrameSize
@@ -1414,7 +1420,7 @@ function pfUI.uf:CreateUnitFrame(unit, id, config, tick)
    f.group:SetFont(pfUI.font_unit, 8, "OUTLINE")
    f.group:SetTextColor(1,1,1,.8)
    f.group:SetHeight(16)
-    f.group:SetText("Group " .. group)
+    f.group:SetText(T["Group"] .. " " .. group)
    f.group:Hide()
  end

@@ -1434,6 +1440,10 @@ function pfUI.uf:CreateUnitFrame(unit, id, config, tick)
    f:Hide()
  end

+  if f.label ~= "" then
+    f:SetAttribute("unit", f.label .. f.id)
+  end
+
  -- register frame for clique
  _G.ClickCastFrames = ClickCastFrames or {}
  ClickCastFrames[f] = true
@@ -1488,11 +1498,7 @@ function pfUI.uf:RefreshIndicators(unit)
  local unitstr = unit.label .. unit.id

  if unit.leaderIcon then -- Leader Icon
-    if unit.config.leadericon == "1" and UnitIsPartyLeader(unitstr) and IsInGroup() then
-      unit.leaderIcon:Show()
-    else
-      unit.leaderIcon:Hide()
-    end
+    unit.leaderIcon:SetShown(unit.config.leadericon == "1" and UnitIsPartyLeader(unitstr) and IsInGroup())
  end

  if unit.lootIcon then -- Loot Icon
@@ -1502,33 +1508,20 @@ function pfUI.uf:RefreshIndicators(unit)
      -- no third return value here.. but leaving this as a hint
      local method, group, raid = GetLootMethod()
      local name = group and UnitName(group == 0 and "player" or "party"..group) or raid and UnitName("raid"..raid) or nil
-
-      if name and name == UnitName(unitstr) then
-        unit.lootIcon:Show()
-      else
-        unit.lootIcon:Hide()
-      end
+      unit.lootIcon:SetShown(name and name == UnitName(unitstr))
    end
  end

  if unit.pvpIcon then -- PvP Icon
-    if unit.config.showPVP == "1" and UnitIsPVP(unitstr) then
-      unit.pvpIcon:Show()
-    else
-      unit.pvpIcon:Hide()
-    end
+    unit.pvpIcon:SetShown(unit.config.showPVP == "1" and UnitIsPVP(unitstr))
  end

  if unit.restIcon and unit:GetName() == "pfPlayer" then -- Rest Icon
-    if C.unitframes.player.showRest == "1" and UnitIsUnit(unitstr, "player") and IsResting() then
-      unit.restIcon:Show()
-    else
-      unit.restIcon:Hide()
-    end
+    unit.restIcon:SetShown(C.unitframes.player.showRest == "1" and UnitIsUnit(unitstr, "player") and IsResting())
  end

  if unit.happinessIcon and unit:GetName() == "pfPet" then -- Happiness Icon
-    local _, pclass = UnitClass("player")
+    local pclass = UnitClassBase("player")
    if unit.config.happinessicon == "0" or pclass ~= "HUNTER" then
      unit.happinessIcon:Hide()
    else
@@ -1572,7 +1565,7 @@ function pfUI.uf:UpdateDruidMana(unit)
  local unitstr = unit.label .. unit.id
  if not UnitExists(unitstr) then bar:Hide() return end
  if unit.label ~= "player" then
-    local _, cls = UnitClass(unitstr)
+    local cls = UnitClassBase(unitstr)
    if cls ~= "DRUID" then bar:Hide() return end
  end
  if UnitPowerType(unitstr) == Enum.PowerType.Mana then bar:Hide() return end
@@ -1594,7 +1587,7 @@ function pfUI.uf:RefreshUnit(unit, component)
  if not unit.hp then return end
  if not unit.power then return end
  if not unit.id then unit.id = "" end
-  local component = component or ""
+  component = component or ""

  -- don't update scanner activity
  if unit.label == "target" or unit.label == "targettarget" or unit.label == "targettargettarget" then
@@ -1791,8 +1784,7 @@ function pfUI.uf:RefreshUnit(unit, component)
        if size ~= indicator.size or disptype ~= indicator.disp or indipos ~= indicator.ipos then
          indicator:ClearAllPoints()
          indicator:SetPoint(indipos, 0, 0)
-          indicator:SetHeight(size)
-          indicator:SetWidth(size)
+          indicator:SetSize(size, size)
          indicator.size = size
          indicator.disp = disptype
          indicator.ipos  = indipos
@@ -1821,16 +1813,14 @@ function pfUI.uf:RefreshUnit(unit, component)
            indicator[debuff].tex:SetVertexColor(dispelColor:GetRGBA())
            indicator[debuff].tex:Show()
            indicator[debuff]:ClearAllPoints()
-            indicator[debuff]:SetHeight(size)
-            indicator[debuff]:SetWidth(size)
+            indicator[debuff]:SetSize(size, size)
            indicator[debuff]:SetBackdrop(nil)
          elseif disptype == "3" then
            indicator[debuff].tex:SetTexture(dispelColor:GetRGBA())
            indicator[debuff].tex:SetVertexColor(1,1,1,1)
            indicator[debuff].tex:Show()
            indicator[debuff]:ClearAllPoints()
-            indicator[debuff]:SetHeight(size)
-            indicator[debuff]:SetWidth(size)
+            indicator[debuff]:SetSize(size, size)
            indicator[debuff]:SetBackdrop(nil)
          elseif disptype == "2" then
            indicator[debuff].tex:Hide()
@@ -2140,14 +2130,6 @@ function pfUI.uf:RefreshUnit(unit, component)
  end
 end

-local buttons = {
-  [1] = "LeftButton",
-  [2] = "RightButton",
-  [3] = "MiddleButton",
-  [4] = "Button4",
-  [5] = "Button5",
-}
-
 local modifiers = {
  [""] = "",
  ["alt"] = "_alt",
@@ -2157,86 +2139,34 @@ local modifiers = {

 function pfUI.uf:EnableClickCast()
  if self.config.clickcast ~= "1" then return end
-  for bid, button in pairs(buttons) do
+  for bid = 1, 5 do -- LeftButton, RightButton, MiddleButton, Button4, Button5
    for modifier, mconf in pairs(modifiers) do
      local bconf = bid == 1 and "" or bid
-      if pfUI_config.unitframes["clickcast"..bconf..mconf] ~= "" then
-        -- fill clickaction table
-        self.clickactions = self.clickactions or {}
-        self.clickactions[modifier..button] = pfUI_config.unitframes["clickcast"..bconf..mconf]
+      local action = pfUI_config.unitframes["clickcast"..bconf..mconf]
+      if action and action ~= "" then
+        local prefix = modifier ~= "" and (modifier .. "-") or ""
+        local low = string.lower(action)
+        if low == "menu" then
+          self:SetAttribute(prefix .. "type" .. bid, "menu")
+        elseif low == "target" then
+          self:SetAttribute(prefix .. "type" .. bid, "target")
+        elseif low == "focus" then
+          self:SetAttribute(prefix .. "type" .. bid, "focus")
+        elseif string.find(low, "^macro:") then
+          self:SetAttribute(prefix .. "type" .. bid, "macro")
+          self:SetAttribute(prefix .. "macro" .. bid, string.gsub(string.sub(action, 7), "^%s+", ""))
+        elseif string.find(action, "^/") then
+          self:SetAttribute(prefix .. "type" .. bid, "macro")
+          self:SetAttribute(prefix .. "macrotext" .. bid, action)
+        else
+          self:SetAttribute(prefix .. "type" .. bid, "spell")
+          self:SetAttribute(prefix .. "spell" .. bid, action)
+        end
      end
    end
  end
 end

-function pfUI.uf:ClickAction(button)
-  local label = this.label or ""
-  local id = this.id or ""
-  local unitstr = label .. id
-  local showmenu = button == "RightButton" and true or nil
-  if SpellIsTargeting() and button == "RightButton" then
-    SpellStopTargeting()
-    return
-  end
-
-  if SpellIsTargeting() and button == "LeftButton" then
-    SpellTargetUnit(unitstr)
-  elseif CursorHasItem() then
-    DropItemOnUnit(unitstr)
-  end
-
-  -- run click casting if enabled
-  local modstring = ""
-  modstring = IsAltKeyDown() and modstring.."alt" or modstring
-  modstring = IsControlKeyDown() and modstring.."ctrl" or modstring
-  modstring = IsShiftKeyDown() and modstring.."shift" or modstring
-  modstring = modstring..button
-  if this.clickactions and this.clickactions[modstring] then
-    local action_lower = string.lower(this.clickactions[modstring])
-    if string.find(action_lower, "^menu") then
-      -- show menu
-      showmenu = true
-    elseif string.find(action_lower, "^target") then
-      -- target unit
-      showmenu = nil
-    else
-      -- run click cast action
-      local is_macro = string.find(this.clickactions[modstring], "^%/(.+)")
-
-      local tswitch = UnitIsUnit(unitstr, "target")
-      TargetUnit(unitstr)
-
-      if is_macro then
-        RunMacroText(this.clickactions[modstring])
-      else
-        CastSpellByName(this.clickactions[modstring])
-      end
-
-      if not tswitch then TargetLastTarget() end
-
-      return
-    end
-  end
-
-  -- dropdown menus
-  if showmenu then
-    pfUI.uf:RightClickAction(label)
-    return
-  end
-
-  -- drop food on petframe
-  if label == "pet" and CursorHasItem() then
-    local _, playerClass = UnitClass("player")
-    if playerClass == "HUNTER" then
-      DropItemOnUnit("pet")
-      return
-    end
-  end
-
-  -- default click
-  TargetUnit(unitstr)
-end
-
 function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)
  local showtime = frame.config.indicator_time == "1" and true or nil
  local showstacks = frame.config.indicator_stacks == "1" and true or nil
@@ -2279,8 +2209,7 @@ function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)

  -- update icon configuration
  if frame.icon[pos].iconsize ~= iconsize or frame.icon[pos].spacing ~= spacing then
-    frame.icon[pos]:SetWidth(iconsize)
-    frame.icon[pos]:SetHeight(iconsize)
+    frame.icon[pos]:SetSize(iconsize, iconsize)
    frame.icon[pos]:SetPoint("TOPLEFT", frame.icon, "TOPLEFT", (pos-1)*(iconsize + spacing), 0)
    frame.icon[pos].stacks:SetFont(pfUI.font_unit, math.max(iconsize/3, 10), "OUTLINE")
    frame.icon[pos].iconsize = iconsize
@@ -2336,7 +2265,7 @@ function pfUI.uf:HideIcon(frame, pos)
 end

 function pfUI.uf:SetupDebuffFilter(allclasses)
-  local _, myclass = UnitClass("player")
+  local myclass = UnitClassBase("player")
  local debuffs = {}

  if myclass == "PALADIN" or myclass == "PRIEST" or myclass == "WARLOCK" or allclasses then
@@ -2359,7 +2288,7 @@ function pfUI.uf:SetupDebuffFilter(allclasses)
 end

 function pfUI.uf:SetupBuffIndicators(config)
-  local _, myclass = UnitClass("player")
+  local myclass = UnitClassBase("player")
  local indicators = {}

  if config.show_buffs == "1" then -- buffs
@@ -25,7 +25,6 @@ PLAYER_BUFF_START_ID = -1

 ACTIONBAR_SECURE_TEMPLATE_BAR = nil
 ACTIONBAR_SECURE_TEMPLATE_BUTTON = nil
-UNITFRAME_SECURE_TEMPLATE = nil

 --[[ Vanilla API Extensions ]]--

@@ -51,10 +51,12 @@ pfUI_translation["deDE"] = {
  ["Auto Sell Grey Items"] = nil,
  ["Average Per Hour"] = nil,
  ["Background Color"] = nil,
+  ["Bags"] = "Taschen",
  ["Bags & Bank"] = nil,
  ["Bags Border Size"] = nil,
  ["Bagslots Per Row"] = nil,
  ["Bagspace"] = nil,
+  ["Bank"] = "Bank",
  ["Banker"] = nil,
  ["Bankslots Per Row"] = nil,
  ["Bar Background"] = nil,
@@ -290,7 +292,6 @@ pfUI_translation["deDE"] = {
  ["Enable Mana Ticks"] = nil,
  ["Enable Micro Bar"] = nil,
  ["Enable Mouselook With Right Click"] = nil,
-  ["Enable Mouseover Tooltip"] = nil,
  ["Enable Movable Bags"] = nil,
  ["Enable Offscreen Frame Positions"] = nil,
  ["Enable Overlap"] = nil,
@@ -311,6 +312,7 @@ pfUI_translation["deDE"] = {
  ["Encode"] = nil,
  ["Ended"] = nil,
  ["Energy Color"] = nil,
+  ["Equipped"] = "Angelegt",
  ["Equipped Item Color"] = nil,
  ["Estimate Debuffs"] = nil,
  ["Estimate Enemy Health Points"] = nil,
@@ -819,6 +821,7 @@ pfUI_translation["deDE"] = {
  ["Top Actionbar"] = nil,
  ["Top Left"] = nil,
  ["Top Right"] = nil,
+  ["Total"] = "Gesamt",
  ["Total Gold"] = nil,
  ["Totem Direction"] = nil,
  ["Totem Icons"] = nil,
@@ -52,15 +52,19 @@ pfUI_translation["enUS"] = {
  ["Auto Sell Grey Items"] = nil,
  ["Average Per Hour"] = nil,
  ["Background Color"] = nil,
+  ["Bags"] = nil,
  ["Bags & Bank"] = nil,
  ["Bags Border Size"] = nil,
  ["Bagslots Per Row"] = nil,
  ["Bagspace"] = nil,
+  ["Bank"] = nil,
  ["Banker"] = nil,
  ["Bankslots Per Row"] = nil,
  ["Bar Background"] = nil,
  ["Bar Texture"] = nil,
+  ["Battleground Frames"] = nil,
  ["Battleground Statistics"] = nil,
+  ["BEHIND"] = nil,
  ["Blacklist"] = nil,
  ["Blinding Powder"] = nil,
  ["Blue Border On Friendly Players"] = nil,
@@ -293,7 +297,6 @@ pfUI_translation["enUS"] = {
  ["Enable Mana Ticks"] = nil,
  ["Enable Micro Bar"] = nil,
  ["Enable Mouselook With Right Click"] = nil,
-  ["Enable Mouseover Tooltip"] = nil,
  ["Enable Movable Bags"] = nil,
  ["Enable Offscreen Frame Positions"] = nil,
  ["Enable Overlap"] = nil,
@@ -314,6 +317,7 @@ pfUI_translation["enUS"] = {
  ["Encode"] = nil,
  ["Ended"] = nil,
  ["Energy Color"] = nil,
+  ["Equipped"] = nil,
  ["Equipped Item Color"] = nil,
  ["Estimate Debuffs"] = nil,
  ["Estimate Enemy Health Points"] = nil,
@@ -326,6 +330,7 @@ pfUI_translation["enUS"] = {
  ["Export"] = nil,
  ["Face"] = nil,
  ["Fade To Custom Color"] = nil,
+  ["FARM MODE"] = nil,
  ["Fast"] = nil,
  ["Filter Mode"] = nil,
  ["Finish"] = nil,
@@ -536,6 +541,7 @@ pfUI_translation["enUS"] = {
  ["Next Memory Cleanup"] = nil,
  ["No"] = nil,
  ["No Anchor"] = nil,
+  ["NO LOS"] = nil,
  ["None"] = nil,
  ["Not a valid button!"] = nil,
  ["No tracking spell active"] = nil,
@@ -771,6 +777,8 @@ pfUI_translation["enUS"] = {
  ["Small"] = nil,
  ["Some settings need to reload the UI to take effect.\nDo you want to reload now?"] = nil,
  ["Some settings need to reload the UI to take effect.\nDo you want to reloadUI now?"] = nil,
+  ["Sort Bags"] = nil,
+  ["Sort Bank"] = nil,
  ["Sort Order"] = nil,
  ["Soul Shard"] = nil,
  ["Soulshard Counter"] = nil,
@@ -835,6 +843,7 @@ pfUI_translation["enUS"] = {
  ["Top Actionbar"] = nil,
  ["Top Left"] = nil,
  ["Top Right"] = nil,
+  ["Total"] = nil,
  ["Total Gold"] = nil,
  ["Totem Direction"] = nil,
  ["Totem Icons"] = nil,
@@ -51,10 +51,12 @@ pfUI_translation["esES"] = {
  ["Auto Sell Grey Items"] = "Vender objetos grises automáticamente",
  ["Average Per Hour"] = "Promedio por hora",
  ["Background Color"] = "Color del fondo",
+  ["Bags"] = "Bolsas",
  ["Bags & Bank"] = "Bolsas y banco",
  ["Bags Border Size"] = "Tamaño del borde de las bolsas",
  ["Bagslots Per Row"] = "Casillas de la bolsa por fila",
  ["Bagspace"] = "Huecos en las bolsas",
+  ["Bank"] = "Banco",
  ["Banker"] = "Banquero",
  ["Bankslots Per Row"] = "Casillas del banco por fila",
  ["Bar Background"] = "Fondo de la barra",
@@ -290,7 +292,6 @@ pfUI_translation["esES"] = {
  ["Enable Mana Ticks"] = "Activar el indicador de pulsos del maná",
  ["Enable Micro Bar"] = "Activar microbarra",
  ["Enable Mouselook With Right Click"] = "Mirar usando el puntero con clic derecho",
-  ["Enable Mouseover Tooltip"] = "Activar la descripción emergente al pasar el puntero",
  ["Enable Movable Bags"] = "Permitir mover las bolsas",
  ["Enable Offscreen Frame Positions"] = "Permitir mover los marcos fuera de la pantalla",
  ["Enable Overlap"] = "Permitir superposición",
@@ -311,6 +312,7 @@ pfUI_translation["esES"] = {
  ["Encode"] = "Codificar",
  ["Ended"] = "Terminado",
  ["Energy Color"] = "Color de energía",
+  ["Equipped"] = "Equipado",
  ["Equipped Item Color"] = "Color del objeto equipado",
  ["Estimate Debuffs"] = "Estimar los perjuicios",
  ["Estimate Enemy Health Points"] = "Estimar los puntos de salud del enemigo",
@@ -819,6 +821,7 @@ pfUI_translation["esES"] = {
  ["Top Actionbar"] = "Barra de acción superior",
  ["Top Left"] = "Superior derecha",
  ["Top Right"] = "Superior izquierda",
+  ["Total"] = "Total",
  ["Total Gold"] = "Oro Total",
  ["Totem Direction"] = "Dirección del tótem",
  ["Totem Icons"] = "Iconos de los tótems",
@@ -51,10 +51,12 @@ pfUI_translation["frFR"] = {
  ["Auto Sell Grey Items"] = "Vente automatique des objets gris",
  ["Average Per Hour"] = "Moyenne par heure",
  ["Background Color"] = "Couleur de l'arrière-plan",
+  ["Bags"] = "Sacs",
  ["Bags & Bank"] = "Sacs et Banque",
  ["Bags Border Size"] = "Taille de la bordure des Sacs",
  ["Bagslots Per Row"] = "Emplacements des sacs par rangée",
  ["Bagspace"] = "Place libre des sacs",
+  ["Bank"] = "Banque",
  ["Banker"] = "Banquier",
  ["Bankslots Per Row"] = "Emplacements de la banque par rangée",
  ["Bar Background"] = "Arrière plan de la barre",
@@ -290,7 +292,6 @@ pfUI_translation["frFR"] = {
  ["Enable Mana Ticks"] = "Activer les Ticks de mana",
  ["Enable Micro Bar"] = "Activer la barre des menus miniature",
  ["Enable Mouselook With Right Click"] = "Activer le déplacement de la caméra avec le clic droit",
-  ["Enable Mouseover Tooltip"] = "Activer l'infobulle au passage de la souris",
  ["Enable Movable Bags"] = "Activer les sacs mobiles",
  ["Enable Offscreen Frame Positions"] = "Activer le positionnement des cadres en dehors de l'écran",
  ["Enable Overlap"] = "Activer la superposition",
@@ -311,6 +312,7 @@ pfUI_translation["frFR"] = {
  ["Encode"] = "Encoder",
  ["Ended"] = "Terminé",
  ["Energy Color"] = "Couleur de l'energie",
+  ["Equipped"] = "Équipé",
  ["Equipped Item Color"] = "Couleur de l'objet équipé",
  ["Estimate Debuffs"] = "Estimer les Affaiblissements",
  ["Estimate Enemy Health Points"] = "Estimer les points de vie ennemis",
@@ -819,6 +821,7 @@ pfUI_translation["frFR"] = {
  ["Top Actionbar"] = "Barre d'action supérieure",
  ["Top Left"] = "Haut Gauche",
  ["Top Right"] = "Haut Droit",
+  ["Total"] = "Total",
  ["Total Gold"] = "Or Total",
  ["Totem Direction"] = "Direction des totems",
  ["Totem Icons"] = "Icones des totems",
@@ -51,10 +51,12 @@ pfUI_translation["koKR"] = {
  ["Auto Sell Grey Items"] = "회색아이템 자동 판매",
  ["Average Per Hour"] = nil,
  ["Background Color"] = "백그라운드 색상",
+  ["Bags"] = "가방",
  ["Bags & Bank"] = "가방&은행",
  ["Bags Border Size"] = "가방 테두리 크기",
  ["Bagslots Per Row"] = nil,
  ["Bagspace"] = "가방 공간",
+  ["Bank"] = "은행",
  ["Banker"] = nil,
  ["Bankslots Per Row"] = nil,
  ["Bar Background"] = nil,
@@ -290,7 +292,6 @@ pfUI_translation["koKR"] = {
  ["Enable Mana Ticks"] = nil,
  ["Enable Micro Bar"] = "미니바 보기(블리자드 마이크로바)",
  ["Enable Mouselook With Right Click"] = "오른쪽 클릭 Mouselook 사용",
-  ["Enable Mouseover Tooltip"] = nil,
  ["Enable Movable Bags"] = nil,
  ["Enable Offscreen Frame Positions"] = "오프스크린 프레임 위치 활성화",
  ["Enable Overlap"] = "겹쳐서 표시",
@@ -311,6 +312,7 @@ pfUI_translation["koKR"] = {
  ["Encode"] = nil,
  ["Ended"] = nil,
  ["Energy Color"] = nil,
+  ["Equipped"] = "착용 중",
  ["Equipped Item Color"] = nil,
  ["Estimate Debuffs"] = nil,
  ["Estimate Enemy Health Points"] = nil,
@@ -819,6 +821,7 @@ pfUI_translation["koKR"] = {
  ["Top Actionbar"] = nil,
  ["Top Left"] = nil,
  ["Top Right"] = nil,
+  ["Total"] = "총",
  ["Total Gold"] = "총 금",
  ["Totem Direction"] = nil,
  ["Totem Icons"] = nil,
@@ -51,10 +51,12 @@ pfUI_translation["ruRU"] = {
  ["Auto Sell Grey Items"] = "Автоматическая продажа серых предметов",
  ["Average Per Hour"] = "Среднее за час",
  ["Background Color"] = "Цвет фона",
+  ["Bags"] = "Сумки",
  ["Bags & Bank"] = "Сумки & Банк",
  ["Bags Border Size"] = "Размер границы сумок",
  ["Bagslots Per Row"] = "Количество ячеек в сумке на строку",
  ["Bagspace"] = "Место в сумках",
+  ["Bank"] = "Банк",
  ["Banker"] = "Банкир",
  ["Bankslots Per Row"] = "Количество ячеек в банке на строку",
  ["Bar Background"] = "Фон панели",
@@ -290,7 +292,6 @@ pfUI_translation["ruRU"] = {
  ["Enable Mana Ticks"] = "Включить восполнение маны",
  ["Enable Micro Bar"] = "Включить панель микро меню",
  ["Enable Mouselook With Right Click"] = "Включить нажатие правой кнопки мыши на индикаторе здоровья",
-  ["Enable Mouseover Tooltip"] = "Включить подсказку при наведении мыши",
  ["Enable Movable Bags"] = "Включить подвижные сумки",
  ["Enable Offscreen Frame Positions"] = "Включить расположение окон за пределами экрана",
  ["Enable Overlap"] = "Включить перекрытие",
@@ -311,6 +312,7 @@ pfUI_translation["ruRU"] = {
  ["Encode"] = "Кодировать",
  ["Ended"] = "Окончание",
  ["Energy Color"] = "Цвет энергии",
+  ["Equipped"] = "Экипировано",
  ["Equipped Item Color"] = "Цвет экипированных предметов",
  ["Estimate Debuffs"] = "Оценка дебафов",
  ["Estimate Enemy Health Points"] = "Оценка очков здоровья врага",
@@ -819,6 +821,7 @@ pfUI_translation["ruRU"] = {
  ["Top Actionbar"] = "Верхняя",
  ["Top Left"] = "Сверху слева",
  ["Top Right"] = "Сверху справа",
+  ["Total"] = "Всего",
  ["Total Gold"] = "Всего золота",
  ["Totem Direction"] = "Направление тотемов",
  ["Totem Icons"] = "Иконки тотемов",
@@ -51,10 +51,12 @@ pfUI_translation["zhCN"] = {
  ["Auto Sell Grey Items"] = "自动贩卖灰色物品",
  ["Average Per Hour"] = "平均每小时",
  ["Background Color"] = "背景颜色",
+  ["Bags"] = "背包",
  ["Bags & Bank"] = "背包和银行",
  ["Bags Border Size"] = "背包边框大小",
  ["Bagslots Per Row"] = "每行包裹槽数量",
  ["Bagspace"] = "背包空间",
+  ["Bank"] = "银行",
  ["Banker"] = "工会银行角色",
  ["Bankslots Per Row"] = "每行银行槽数量",
  ["Bar Background"] = "动作条背景",
@@ -290,7 +292,6 @@ pfUI_translation["zhCN"] = {
  ["Enable Mana Ticks"] = "显示法力值刻度",
  ["Enable Micro Bar"] = "显示菜单栏",
  ["Enable Mouselook With Right Click"] = "启动右键移动镜头",
-  ["Enable Mouseover Tooltip"] = "启用鼠标悬停工具提示",
  ["Enable Movable Bags"] = "启用可移动包裹",
  ["Enable Offscreen Frame Positions"] = "允许本插件所有框体移出屏幕边缘",
  ["Enable Overlap"] = "叠加显示",
@@ -311,6 +312,7 @@ pfUI_translation["zhCN"] = {
  ["Encode"] = "编码",
  ["Ended"] = "结束",
  ["Energy Color"] = "能量值颜色",
+  ["Equipped"] = "已装备",
  ["Equipped Item Color"] = "已装备物品颜色",
  ["Estimate Debuffs"] = "预估Debuffs",
  ["Estimate Enemy Health Points"] = "预估敌人的生命值",
@@ -820,6 +822,7 @@ pfUI_translation["zhCN"] = {
  ["Top Actionbar"] = "上方动作条",
  ["Top Left"] = "左上方",
  ["Top Right"] = "右上方",
+  ["Total"] = "总计",
  ["Total Gold"] = "总黄金",
  ["Totem Direction"] = "图腾方向",
  ["Totem Icons"] = "图腾图标",
@@ -51,10 +51,12 @@ pfUI_translation["zhTW"] = {
  ["Auto Sell Grey Items"] = "自動販賣灰色物品",
  ["Average Per Hour"] = "平均每小時",
  ["Background Color"] = "背景顏色",
+  ["Bags"] = "背包",
  ["Bags & Bank"] = "背包和銀行",
  ["Bags Border Size"] = "背包邊框大小",
  ["Bagslots Per Row"] = "每行包裹槽數量",
  ["Bagspace"] = "背包空間",
+  ["Bank"] = "銀行",
  ["Banker"] = "工會銀行角色",
  ["Bankslots Per Row"] = "每行銀行槽數量",
  ["Bar Background"] = nil,
@@ -290,7 +292,6 @@ pfUI_translation["zhTW"] = {
  ["Enable Mana Ticks"] = nil,
  ["Enable Micro Bar"] = "顯示功能表列",
  ["Enable Mouselook With Right Click"] = "啟動右鍵移動鏡頭",
-  ["Enable Mouseover Tooltip"] = "啟用滑鼠懸停工具提示",
  ["Enable Movable Bags"] = "啟用可移動包裹",
  ["Enable Offscreen Frame Positions"] = "啟用螢幕框架固定",
  ["Enable Overlap"] = "疊加顯示",
@@ -311,6 +312,7 @@ pfUI_translation["zhTW"] = {
  ["Encode"] = "編碼",
  ["Ended"] = nil,
  ["Energy Color"] = nil,
+  ["Equipped"] = "已裝備",
  ["Equipped Item Color"] = nil,
  ["Estimate Debuffs"] = nil,
  ["Estimate Enemy Health Points"] = nil,
@@ -819,6 +821,7 @@ pfUI_translation["zhTW"] = {
  ["Top Actionbar"] = nil,
  ["Top Left"] = "左上方",
  ["Top Right"] = "右上方",
+  ["Total"] = "全部",
  ["Total Gold"] = "總金量",
  ["Totem Direction"] = nil,
  ["Totem Icons"] = nil,
@@ -71,6 +71,7 @@
  <Include file="..\modules\energytick.lua"/>
  <Include file="..\modules\totems.lua"/>
  <Include file="..\modules\macrotweak.lua"/>
+  <Include file="..\modules\macroicons.lua"/>
  <Include file="..\modules\turtle-wow.lua"/>
  <Include file="..\modules\superwow.lua"/>
  <Include file="..\modules\innervatecall.lua"/>
@@ -80,4 +81,5 @@
  <Include file="..\modules\equipmentmanager.lua"/>
  <Include file="..\modules\loothistory.lua"/>
  <Include file="..\modules\newitem.lua"/>
+  <Include file="..\modules\friendnotes.lua"/>
 </Ui>
@@ -41,8 +41,6 @@
  <!-- Turtle WoW -->
  <Include file="..\skins\blizzard\barbershop.lua"/>
  <Include file="..\skins\blizzard\transmog.lua"/>
-  <Include file="..\skins\blizzard\custom_merchant.lua"/>
-  <Include file="..\skins\blizzard\arena_score.lua"/>
  <Include file="..\skins\blizzard\ebc.lua"/>

 </Ui>
@@ -29,8 +29,7 @@ if GetLocale() == "ruRU" then
 end

 local libdebuff = CreateFrame("Frame", "pfdebuffsScanner", UIParent)
-local _, class = UnitClass("player")
-local lastspell
+local class = UnitClassBase("player")

 -- Nampower Support
 local hasNampower = false
@@ -377,11 +376,9 @@ local function GetDebuffSlotMap(guid)
      local texture = libdebuff:GetSpellIcon(spellId)
      local stacks = (auraApps and auraApps[auraSlot] or 0) + 1
      local dtype = nil
-      if GetSpellRecField then
-        local dispelId = GetSpellRecField(spellId, "dispel")
-        if dispelId and dispelId > 0 then
-          dtype = dispelTypeMap[dispelId]
-        end
+      local dispelId = C_Spell.GetSpellDispelType(spellId)
+      if dispelId and dispelId > 0 then
+        dtype = dispelTypeMap[dispelId]
      end
      map[displaySlot] = {
        auraSlot = auraSlot,
@@ -594,37 +591,13 @@ end
 -- DURATION FUNCTIONS
 -- ============================================================================

+-- Report the live, talent-accurate duration of a matching aura on the player.
+-- ClassicAPI's C_UnitAuras carries the real (mod-folded) duration straight from
+-- the engine, so there's no static duration table to maintain. Returns 0 when
+-- the player has no such aura (e.g. a debuff that only ever lands on enemies).
 function libdebuff:GetDuration(effect, rank)
-  if L["debuffs"][effect] then
-    local rank = rank and tonumber((string.gsub(rank, RANK, ""))) or 0
-    local rank = L["debuffs"][effect][rank] and rank or libdebuff:GetMaxRank(effect)
-    local duration = L["debuffs"][effect][rank]
-
-    if effect == L["dyndebuffs"]["Demoralizing Shout"] then
-      local _,_,_,_,count = GetTalentInfo(2,1)
-      if count and count > 0 then duration = duration + ( duration / 100 * (count*10)) end
-    elseif effect == L["dyndebuffs"]["Shadow Word: Pain"] then
-      local _,_,_,_,count = GetTalentInfo(3,4)
-      if count and count > 0 then duration = duration + count * 3 end
-    elseif effect == L["dyndebuffs"]["Frostbolt"] then
-      local _,_,_,_,count = GetTalentInfo(3,7)
-      if count and count > 0 then duration = duration + count end
-    elseif effect == L["dyndebuffs"]["Gouge"] then
-      local _,_,_,_,count = GetTalentInfo(3,3)
-      if count and count > 0 then duration = duration + (count*.5) end
-    end
-    return duration
-  else
-    return 0
-  end
-end
-
-function libdebuff:GetMaxRank(effect)
-  local max = 0
-  for id in pairs(L["debuffs"][effect]) do
-    if id > max then max = id end
-  end
-  return max
+  local aura = C_UnitAuras.GetAuraDataBySpellName("player", effect)
+  return aura and aura.duration or 0
 end

 function libdebuff:UpdateDuration(unit, unitlevel, effect, duration)
@@ -650,7 +623,6 @@ libdebuff.objects = {}

 function libdebuff:AddPending(unit, unitlevel, effect, duration, caster, rank)
  if not unit or duration <= 0 then return end
-  if not L["debuffs"][effect] then return end
  if libdebuff.pending[3] then return end

  libdebuff.pending[1] = unit
@@ -729,39 +701,25 @@ end
 -- API: GetBestAuraCast (for libpredict HoT tracking)
 -- ============================================================================

+-- Report the active aura for spellName on `guid`, read straight from
+-- C_UnitAuras. expirationTime is the true, caster-modified remaining time, so
+-- no cast-event bookkeeping is needed -- and a unit only ever holds one instance
+-- of a given spell, so this is inherently the "best" one.
+-- Returns (startTime, duration, timeleft, rank, casterGuid) or nil.
 function libdebuff:GetBestAuraCast(guid, spellName)
  if not guid or not spellName then return nil end
-  
-  -- Check ownDebuffs first (for our casts)
-  if ownDebuffs[guid] and ownDebuffs[guid][spellName] then
-    local data = ownDebuffs[guid][spellName]
-    local timeleft = (data.startTime + data.duration) - GetTime()
-    if timeleft > 0 then
-      return data.startTime, data.duration, timeleft, data.rank, GetPlayerGuid()
-    end
-  end
-  
-  -- Check allAuraCasts (for any caster)
-  if allAuraCasts[guid] and allAuraCasts[guid][spellName] then
-    local bestData = nil
-    local bestCaster = nil
-    local bestTimeleft = 0
-    
-    for casterGuid, data in pairs(allAuraCasts[guid][spellName]) do
-      local timeleft = (data.startTime + data.duration) - GetTime()
-      if timeleft > bestTimeleft then
-        bestTimeleft = timeleft
-        bestData = data
-        bestCaster = casterGuid
-      end
-    end
-    
-    if bestData and bestTimeleft > 0 then
-      return bestData.startTime, bestData.duration, bestTimeleft, bestData.rank, bestCaster
-    end
-  end
-  
-  return nil
+
+  local aura = C_UnitAuras.GetAuraDataBySpellName(guid, spellName)
+  if not aura or not aura.expirationTime or aura.expirationTime == 0 then return nil end
+
+  local timeleft = aura.expirationTime - GetTime()
+  if timeleft <= 0 then return nil end
+
+  local duration = (aura.duration and aura.duration > 0) and aura.duration or timeleft
+  local startTime = aura.expirationTime - duration
+  local rank = aura.spellId and tonumber((string.gsub(C_Spell.GetSpellSubtext(aura.spellId) or "", RANK, ""))) or nil
+
+  return startTime, duration, timeleft, rank, aura.sourceGUID
 end

 -- ============================================================================
@@ -1222,7 +1222,7 @@ libpredict.sender:SetScript("OnEvent", function()
 end)

 function libpredict:GetHotDuration(unit, spell)
-  if unit == UNKNOWNOBJECT or unit == UNKOWNBEING then return end
+  if unit == UNKNOWNOBJECT or unit == UKNOWNBEING then return end
  
  -- NEW: Try libdebuff first (Nampower AURA_CAST events)
  if pfUI.api.libdebuff and pfUI.api.libdebuff.GetBestAuraCast then
@@ -83,12 +83,13 @@ end
 --              [number]            Casting time of the spell in milliseconds
 --              [number]            Minimum range from the target required to cast the spell
 --              [number]            Maximum range from the target at which you can cast the spell
--              [number]            The numeric spell-id of the spell
+--              [number]            Spell's index in the book
 --              [number]            The type of the spellbook that the spell is in
+--              [number]            The numeric spell-id of the spell
 local spellinfo = {}
 function libspell.GetSpellInfo(index, bookType)
  local cache = spellinfo[index]
-  if cache then return cache[1], cache[2], cache[3], cache[4], cache[5], cache[6], cache[7], cache[8] end
+  if cache then return unpack(cache) end

  local slot
  if type(index) == "string" then
@@ -108,10 +109,10 @@ function libspell.GetSpellInfo(index, bookType)
  -- ClassicAPI's GetSpellInfo returns: name, rank, icon, cost, isFunnel, powerType,
  -- castTime(ms), minRange, maxRange, spellID. Keep libspell's historical positional
  -- shape (castingTime at 4, ranges at 5/6, slot+bookType at 7/8).
-  local name, rank, icon, _, _, _, castingTime, minRange, maxRange = GetSpellInfo(slot, bookType)
+  local name, rank, icon, _, _, _, castingTime, minRange, maxRange, spellId = GetSpellInfo(slot, bookType)

-  spellinfo[index] = { name, rank, icon, castingTime, minRange, maxRange, slot, bookType }
-  return name, rank, icon, castingTime, minRange, maxRange, slot, bookType
+  spellinfo[index] = SafePack(name, rank, icon, castingTime, minRange, maxRange, slot, bookType, spellId)
+  return name, rank, icon, castingTime, minRange, maxRange, slot, bookType, spellId
 end

 -- Reset all spell caches whenever new spells are learned/unlearned
@@ -89,20 +89,19 @@ libunitscan:SetScript("OnEvent", function()

    -- update own character details
    local name = UnitName("player")
-    local _, class = UnitClass("player")
+    local class = UnitClassBase("player")
    local level = UnitLevel("player")
    local guild = GetGuildInfo("player")
    AddData("players", name, class, level, nil, guild)
    RememberByUnit("player", name, class)

  elseif event == "FRIENDLIST_UPDATE" then
-    local name, class, level
    for i = 1, GetNumFriends() do
-      name, level, class = GetFriendInfo(i)
-      class = L["class"][class] or nil
-      -- friendlist updates due to friend going off-line return level 0, let's not overwrite good older values
-      level = level > 0 and level or nil
-      AddData("players", name, class, level)
+      local info = C_FriendList.GetFriendInfoByIndex(i)
+      if info then
+        local level = info.level > 0 and info.level or nil
+        AddData("players", info.name, info.classFilename, level)
+      end
    end

  elseif event == "GUILD_ROSTER_UPDATE" then
@@ -128,7 +127,7 @@ libunitscan:SetScript("OnEvent", function()
    local name, class, level, unit, _, guild
    for i = 1, GetNumPartyMembers() do
      unit = "party" .. i
-      _, class = UnitClass(unit)
+      class = UnitClassBase(unit)
      name = UnitName(unit)
      level = UnitLevel(unit)
      guild = GetGuildInfo(unit)
@@ -137,11 +136,11 @@ libunitscan:SetScript("OnEvent", function()
    end

  elseif event == "WHO_LIST_UPDATE" or event == "CHAT_MSG_SYSTEM" then
-    local name, class, level, guild, _
-    for i = 1, GetNumWhoResults() do
-      name, guild, level, _, class, _ = GetWhoInfo(i)
-      class = L["class"][class] or nil
-      AddData("players", name, class, level, nil, guild)
+    for i = 1, C_FriendList.GetNumWhoResults() do
+      local info = C_FriendList.GetWhoInfo(i)
+      if info then
+        AddData("players", info.fullName, info.filename, info.level, nil, info.fullGuildName)
+      end
    end

  elseif event == "UPDATE_MOUSEOVER_UNIT" or event == "PLAYER_TARGET_CHANGED" or event == "NAME_PLATE_UNIT_ADDED" then
@@ -149,24 +148,26 @@ libunitscan:SetScript("OnEvent", function()
              or event == "NAME_PLATE_UNIT_ADDED" and arg1
              or "mouseover"
    local name, class, level, elite, guild, _
-    if UnitIsPlayer(scan) then
-      _, class = UnitClass(scan)
-      level = UnitLevel(scan)
-      -- UnitLevel returns -1 for unknown levels, don't overwrite known values
-      level = level > 0 and level or nil
-      name = UnitName(scan)
-      guild = GetGuildInfo(scan)
-      AddData("players", name, class, level, nil, guild)
-      RememberByUnit(scan, name, class)
-    else
-      _, class = UnitClass(scan)
-      elite = UnitClassification(scan)
-      level = UnitLevel(scan)
-      -- UnitLevel returns -1 for unknown levels, don't overwrite known values
-      level = level > 0 and level or nil
-      name = UnitName(scan)
-      guild = UnitSubName(scan)
-      AddData("mobs", name, class, level, elite, guild)
+    if UnitExists(scan) then
+      if UnitIsPlayer(scan) then
+        class = UnitClassBase(scan)
+        level = UnitLevel(scan)
+        -- UnitLevel returns -1 for unknown levels, don't overwrite known values
+        level = level > 0 and level or nil
+        name = UnitName(scan)
+        guild = GetGuildInfo(scan)
+        AddData("players", name, class, level, nil, guild)
+        RememberByUnit(scan, name, class)
+      else
+        class = UnitClassBase(scan)
+        elite = UnitClassification(scan)
+        level = UnitLevel(scan)
+        -- UnitLevel returns -1 for unknown levels, don't overwrite known values
+        level = level > 0 and level or nil
+        name = UnitName(scan)
+        guild = UnitSubName(scan)
+        AddData("mobs", name, class, level, elite, guild)
+      end
    end
  end
 end)
@@ -1,5 +1,5 @@
 pfUI:RegisterModule("actionbar", function ()
-  local _, class = UnitClass("player")
+  local class = UnitClassBase("player")
  local _, cr, cg, cb = GetUnitColor('player')
  local er, eg, eb, ea = GetStringColor(pfUI_config.appearance.border.color)

@@ -168,8 +168,7 @@ pfUI:RegisterModule("actionbar", function ()
    ["zoomfade"] = function()
      if this.active == 0 then
        -- init animation
-        this:SetWidth(this.parent:GetWidth())
-        this:SetHeight(this.parent:GetHeight())
+        this:SetSize(this.parent:GetSize())
        this:SetScale(this.parent:GetScale())
        this.tex:SetTexture(this.parent.icon:GetTexture())
        this.tex:SetVertexColor(this.parent.icon:GetVertexColor())
@@ -191,8 +190,7 @@ pfUI:RegisterModule("actionbar", function ()
    ["shrinkreturn"] = function()
      if this.active == 0 then
        -- init animation
-        this:SetWidth(this.parent:GetWidth())
-        this:SetHeight(this.parent:GetHeight())
+        this:SetSize(this.parent:GetSize())
        this:SetScale(this.parent:GetScale())
        this.tex:SetTexture(this.parent.icon:GetTexture())
        this.tex:SetVertexColor(this.parent.icon:GetVertexColor())
@@ -218,8 +216,7 @@ pfUI:RegisterModule("actionbar", function ()
    ["elasticzoom"] = function()
      if this.active == 0 then
        -- init animation
-        this:SetWidth(this.parent:GetWidth())
-        this:SetHeight(this.parent:GetHeight())
+        this:SetSize(this.parent:GetSize())
        this:SetScale(this.parent:GetScale())
        this.tex:SetTexture(this.parent.icon:GetTexture())
        this.tex:SetVertexColor(this.parent.icon:GetVertexColor())
@@ -245,8 +242,7 @@ pfUI:RegisterModule("actionbar", function ()
    ["wobblezoom"] = function()
      if this.active == 0 then
        -- init animation
-        this:SetWidth(this.parent:GetWidth())
-        this:SetHeight(this.parent:GetHeight())
+        this:SetSize(this.parent:GetSize())
        this:SetScale(this.parent:GetScale())
        this.tex:SetTexture(this.parent.icon:GetTexture())
        this.tex:SetVertexColor(this.parent.icon:GetVertexColor())
@@ -375,12 +371,12 @@ pfUI:RegisterModule("actionbar", function ()
    -- active conditional dynamically, instead of being frozen to the first
    -- statically-scanned spell.
    if CleveRoids and CleveRoids.IsManagedAction and CleveRoids.IsManagedAction(self.id) then
-      self.spellslot, self.booktype = nil, nil
+      self.spellslot, self.booktype, self.spellID = nil, nil, nil
      return
    end

    local kind, slot = GetActionInfo(self.id)
-    self.spellslot, self.booktype = nil, nil
+    self.spellslot, self.booktype, self.spellID = nil, nil, nil
    if kind == 'macro' then
      local name, _, body = GetMacroInfo(slot)

@@ -418,10 +414,7 @@ pfUI:RegisterModule("actionbar", function ()
          end

          if match then
-            local _, _, spell, rank = string.find(match, '(.+)%((.+)%)')
-            spell = spell or match
-            self.spellslot, self.booktype = libspell.GetSpellIndex(spell, rank)
-
+            self.spellslot, self.booktype, self.spellID = select(7, libspell.GetSpellInfo(match))
            if self.spellslot and self.spellslot > 0 then return end
          end
        end
@@ -430,7 +423,7 @@ pfUI:RegisterModule("actionbar", function ()
  end

  local function ButtonEnter(self)
-    local self = self or this
+    self = self or this

    -- indicate that dragging could get enabled
    drag_await = true
@@ -448,6 +441,8 @@ pfUI:RegisterModule("actionbar", function ()
      else
        GameTooltip:SetPetAction(self.id)
      end
+    elseif self.spellID then
+      GameTooltip:SetSpellByID(self.spellID)
    elseif self.spellslot and self.booktype then
      GameTooltip:SetSpell(self.spellslot, self.booktype)
    else
@@ -458,7 +453,7 @@ pfUI:RegisterModule("actionbar", function ()
  end

  local function ButtonLeave(self)
-    local self = self or this
+    self = self or this

    -- no longer wait for a drag event
    drag_await = nil
@@ -471,7 +466,7 @@ pfUI:RegisterModule("actionbar", function ()
  local grid, sid, id, bar, active, texture, _
  local function ButtonSlotUpdate(self)
    if not self then return end
-    local self = self or this
+    self = self or this
    sid = self.id -- 1 to 120

    -- reset shared variables
@@ -590,7 +585,7 @@ pfUI:RegisterModule("actionbar", function ()

  local sid, usable, oom, _
  local function ButtonUsableUpdate(self)
-    local self = self or this
+    self = self or this
    sid = self.id -- 1 to 120

    if self.bar == 11 then
@@ -604,17 +599,17 @@ pfUI:RegisterModule("actionbar", function ()
    -- update usable [out-of-range = 1, oom = 2, not-usable = 3, default = 0]
    if self.outofrange and C.bars.glowrange == "1" then
      if self.vertexstate ~= 1 then
-        self.icon:SetVertexColor(self.rangeColor[1], self.rangeColor[2], self.rangeColor[3], self.rangeColor[4])
+        self.icon:SetVertexColor(self.rangeColor:GetRGBA())
        self.vertexstate = 1
      end
    elseif oom and C.bars.showoom == "1" then
      if self.vertexstate ~= 2 then
-        self.icon:SetVertexColor(self.oomColor[1], self.oomColor[2], self.oomColor[3], self.oomColor[4])
+        self.icon:SetVertexColor(self.oomColor:GetRGBA())
        self.vertexstate = 2
      end
    elseif not usable and C.bars.showna == "1" then
      if self.vertexstate ~= 3 then
-        self.icon:SetVertexColor(self.naColor[1], self.naColor[2], self.naColor[3], self.naColor[4])
+        self.icon:SetVertexColor(self.naColor:GetRGBA())
        self.vertexstate = 3
      end
    else
@@ -626,7 +621,7 @@ pfUI:RegisterModule("actionbar", function ()
  end

  local function ButtonRangeUpdate(self)
-    local self = self or this
+    self = self or this

    -- update range display
    if C.bars.glowrange == "1" and self.bar ~= 11 and self.bar ~= 12 and HasAction(self.id) and ActionHasRange(self.id) and IsActionInRange(self.id) == 0 then
@@ -704,7 +699,7 @@ pfUI:RegisterModule("actionbar", function ()
  end

  local function BarsEvent(self)
-    local self = self or this
+    self = self or this

    -- refresh only specific slots
    if event == "ACTIONBAR_SLOT_CHANGED" and arg1 and arg1 ~= 0 then
@@ -996,13 +991,13 @@ pfUI:RegisterModule("actionbar", function ()
    local font_offset = tonumber(C.bars.font_offset)

    local macro_size = tonumber(C.bars.macro_size)
-    local macro_color = { strsplit(",", C.bars.macro_color) }
+    local macro_color = { GetStringColor(C.bars.macro_color) }

    local count_size = tonumber(C.bars.count_size)
-    local count_color = { strsplit(",", C.bars.count_color) }
+    local count_color = { GetStringColor(C.bars.count_color) }

    local bind_size = tonumber(C.bars.bind_size)
-    local bind_color = { strsplit(",", C.bars.bind_color) }
+    local bind_color = { GetStringColor(C.bars.bind_color) }

    local cd_size = tonumber(C.bars.cd_size)

@@ -1161,23 +1156,22 @@ pfUI:RegisterModule("actionbar", function ()
    end

    -- range glow color
-    f.rangeColor = { strsplit(",", C.bars.rangecolor) }
+    f.rangeColor = GetStringColorObject(C.bars.rangecolor)

    -- out of mana color
-    f.oomColor = { strsplit(",", C.bars.oomcolor) }
+    f.oomColor = GetStringColorObject(C.bars.oomcolor)

    -- not usable color
-    f.naColor = { strsplit(",", C.bars.nacolor) }
+    f.naColor = GetStringColorObject(C.bars.nacolor)

    -- equipped color
    if f.equipped then
-      f.equipped:SetTexture(strsplit(",", C.bars.eqcolor))
+      f.equipped:SetTexture(GetStringColor(C.bars.eqcolor))
    end

    -- general appearance
    f.showempty = showempty == "1" and true or nil
-    f:SetHeight(size)
-    f:SetWidth(size)
+    f:SetSize(size, size)
    CreateBackdrop(f, border)

    return f
@@ -1349,8 +1343,7 @@ pfUI:RegisterModule("actionbar", function ()

    -- adjust actionbar size
    BarLayoutSize(bars[i], buttons, formfactor, size, border, spacing, uneven, fillmode)
-    bars[i]:SetWidth(bars[i]._size[1])
-    bars[i]:SetHeight(bars[i]._size[2])
+    bars[i]:SetSize(bars[i]._size[1], bars[i]._size[2])
    bars[i]:ClearAllPoints()
    if i == 1 then -- main
      bars[i]:SetPoint("BOTTOM", 0, 2*border)
@@ -1552,7 +1545,7 @@ pfUI:RegisterModule("actionbar", function ()
    -- via GetActionInfo + C_Spell.GetSpellReagents. Macro actions and
    -- bag-item actions are skipped (their reagent resolution would need a
    -- macro-body parse / item-effect lookup that we don't bother with).
-    local UpdateSlot = function(slot)
+    local function UpdateSlot(slot)
      local newID = nil
      if HasAction(slot) then
        local kind, spellID = GetActionInfo(slot)
@@ -1567,60 +1560,44 @@ pfUI:RegisterModule("actionbar", function ()
      if reagent_slots[slot] ~= newID then
        reagent_slots[slot] = newID
        if newID then
-          reagent_counts[newID] = reagent_counts[newID] or 0
+          reagent_counts[newID] = reagent_counts[newID] or C_Item.GetItemCount(newID)
        end
        updatecache[slot] = true
      end
    end

+    -- Recount every tracked reagent and flag its buttons for a refresh.
+    local RecountReagents = function()
+      for itemID in pairs(reagent_counts) do
+        reagent_counts[itemID] = C_Item.GetItemCount(itemID)
+      end
+      for slot in pairs(reagent_slots) do
+        updatecache[slot] = true
+      end
+    end
+
    local reagentcounter = CreateFrame("Frame", "pfReagentCounter", UIParent)
    reagentcounter:RegisterEvent("PLAYER_ENTERING_WORLD")
    reagentcounter:RegisterEvent("ACTIONBAR_SLOT_CHANGED")
    reagentcounter:RegisterEvent("BAG_UPDATE_DELAYED")
    reagentcounter:SetScript("OnEvent", function()
-      if event == "BAG_UPDATE_DELAYED" then
-        this.event = true
+      if event == "ACTIONBAR_SLOT_CHANGED" then
+        -- arg1 is the changed slot; 0 (or nil) means "all slots"
+        if arg1 and arg1 > 0 then
+          UpdateSlot(arg1)
+        else
+          for slot = 1, 120 do UpdateSlot(slot) end
+        end
+      elseif event == "BAG_UPDATE_DELAYED" then
+        -- inventory changed: refresh the counts we already track
+        RecountReagents()
      else
-        this.scan = 1
+        -- PLAYER_ENTERING_WORLD: seed the full reagent map (UpdateSlot seeds
+        -- each new reagent's count; a BAG_UPDATE_DELAYED follows during login)
+        for slot = 1, 120 do UpdateSlot(slot) end
      end
    end)

-    -- Reagent counter update with throttle for performance optimization
-    reagentcounter:SetScript("OnUpdate", function()
-      -- Throttle entire function to 10 FPS for smooth scanning
-      if (this.tick_update or 0) > GetTime() then return end
-      this.tick_update = GetTime() + 0.1
-      
-      -- scan one action slot per update
-      if this.scan and this.scan <= 120 then
-        UpdateSlot(this.scan)
-        this.scan = this.scan + 1
-      end
-
-      -- trigger reagent count updates after action scans
-      if this.scan and this.scan >= 120 then
-        this.event = true
-        this.scan = nil
-      end
-
-      -- queue events to fire only once per second
-      if not this.event then return end
-      if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + 1 end
-
-      -- scan for all reagent item counts
-      for itemID in pairs(reagent_counts) do
-        reagent_counts[itemID] = C_Item.GetItemCount(itemID)
-      end
-
-      -- update all actionbar buttons
-      for slot in pairs(reagent_slots) do
-        updatecache[slot] = true
-      end
-
-      -- remove event trigger
-      this.event = nil
-    end)
-
    function IsReagentAction(slot)
      return reagent_slots[slot] and true or nil
    end
@@ -37,15 +37,10 @@ pfUI:RegisterModule("addonbuttons", function ()

  pfUI.addonbuttons.minimapbutton = CreateFrame("Button", "pfMinimapButton", pfUI.minimap or UIParent)
  pfUI.addonbuttons.minimapbutton:SetFrameLevel(24)
-  pfUI.addonbuttons.minimapbutton:SetWidth(12)
-  pfUI.addonbuttons.minimapbutton:SetHeight(12)
+  pfUI.addonbuttons.minimapbutton:SetSize(12, 12)

  pfUI.addonbuttons.minimapbutton:SetScript("OnClick", function()
-    if pfUI.addonbuttons:IsShown() then
-      pfUI.addonbuttons:Hide()
-    else
-      pfUI.addonbuttons:Show()
-    end
+    pfUI.addonbuttons:SetShown(not pfUI.addonbuttons:IsShown())
  end)

  pfUI.addonbuttons.buttons = {}
@@ -163,27 +158,25 @@ pfUI:RegisterModule("addonbuttons", function ()
    pfUI.addonbuttons:SetScale(pfUI.minimap:GetScale())

    pfUI.addonbuttons.minimapbutton:ClearAllPoints()
+    local mbtnWidth, mbtnHeight = pfUI.minimap:GetSize()
+    local dynamicSize = ceil((GetNumButtons() > 0 and GetNumButtons() or 1) / tonumber(C.abuttons.rowsize)) * GetStringSize() + tonumber(C.abuttons.spacing)
    if C.abuttons.position == "bottom" then
-      pfUI.addonbuttons:SetWidth(pfUI.minimap:GetWidth())
-      pfUI.addonbuttons:SetHeight(ceil((GetNumButtons() > 0 and GetNumButtons() or 1) / tonumber(C.abuttons.rowsize)) * GetStringSize() + tonumber(C.abuttons.spacing))
+      pfUI.addonbuttons:SetSize(mbtnWidth, dynamicSize)
      pfUI.addonbuttons:SetPoint("TOP", pfUI.minimap, "BOTTOM", 0 , -default_border * 3)
      SkinArrowButton(pfUI.addonbuttons.minimapbutton, "down")
      pfUI.addonbuttons.minimapbutton:SetPoint("BOTTOM", pfUI.minimap, "BOTTOM", 0, 4)
    elseif C.abuttons.position == "left" then
-      pfUI.addonbuttons:SetWidth(ceil((GetNumButtons() > 0 and GetNumButtons() or 1) / tonumber(C.abuttons.rowsize)) * GetStringSize() + tonumber(C.abuttons.spacing))
-      pfUI.addonbuttons:SetHeight(pfUI.minimap:GetHeight())
+      pfUI.addonbuttons:SetSize(dynamicSize, mbtnHeight)
      pfUI.addonbuttons:SetPoint("TOPRIGHT", pfUI.minimap, "TOPLEFT", -default_border * 3, 0)
      SkinArrowButton(pfUI.addonbuttons.minimapbutton, "left")
      pfUI.addonbuttons.minimapbutton:SetPoint("LEFT", pfUI.minimap, "LEFT", 4, 0)
    elseif C.abuttons.position == "top" then
-      pfUI.addonbuttons:SetWidth(pfUI.minimap:GetWidth())
-      pfUI.addonbuttons:SetHeight(ceil((GetNumButtons() > 0 and GetNumButtons() or 1) / tonumber(C.abuttons.rowsize)) * GetStringSize() + tonumber(C.abuttons.spacing))
+      pfUI.addonbuttons:SetSize(mbtnWidth, dynamicSize)
      pfUI.addonbuttons:SetPoint("BOTTOM", pfUI.minimap, "TOP", 0 , default_border * 3)
      SkinArrowButton(pfUI.addonbuttons.minimapbutton, "up")
      pfUI.addonbuttons.minimapbutton:SetPoint("TOP", pfUI.minimap, "TOP", 0, -4)
    elseif C.abuttons.position == "right" then
-      pfUI.addonbuttons:SetWidth(ceil((GetNumButtons() > 0 and GetNumButtons() or 1) / tonumber(C.abuttons.rowsize)) * GetStringSize() + tonumber(C.abuttons.spacing))
-      pfUI.addonbuttons:SetHeight(pfUI.minimap:GetHeight())
+      pfUI.addonbuttons:SetSize(dynamicSize, mbtnHeight)
      pfUI.addonbuttons:SetPoint("TOPLEFT", pfUI.minimap, "TOPRIGHT", default_border * 3, 0)
      SkinArrowButton(pfUI.addonbuttons.minimapbutton, "right")
      pfUI.addonbuttons.minimapbutton:SetPoint("RIGHT", pfUI.minimap, "RIGHT", -4, 0)
@@ -231,7 +224,7 @@ pfUI:RegisterModule("addonbuttons", function ()
      frame.backup.is_clamped_to_screen = frame:IsClampedToScreen()
      frame.backup.is_movable = frame:IsMovable()
      frame.backup.point = {frame:GetPoint()}
-      frame.backup.size = {frame:GetHeight(), frame:GetWidth()}
+      frame.backup.size = {frame:GetSize()}
      frame.backup.scale = frame:GetScale()
      if frame:HasScript("OnDragStart") then
        frame.backup.on_drag_start = frame:GetScript("OnDragStart")
@@ -256,8 +249,7 @@ pfUI:RegisterModule("addonbuttons", function ()
      frame:SetClampedToScreen(frame.backup.is_clamped_to_screen)
      frame:SetMovable(frame.backup.is_movable)
      frame:SetScale(frame.backup.scale)
-      frame:SetHeight(frame.backup.size[1])
-      frame:SetWidth(frame.backup.size[2])
+      frame:SetSize(frame.backup.size[2], frame.backup.size[1])
      frame:ClearAllPoints()
      frame:SetPoint(frame.backup.point[1], frame.backup.point[2], frame.backup.point[3], frame.backup.point[4], frame.backup.point[5])
      if frame.backup.on_drag_start ~= nil then
@@ -405,22 +397,25 @@ pfUI:RegisterModule("addonbuttons", function ()
    pfUI.addonbuttons:ProcessButtons()
  end)

-  pfUI.addonbuttons:SetScript("OnUpdate", function()
+  -- Initial setup on the next frame, once other addons' minimap buttons exist
+  RunNextFrame(function()
    -- check if the panel should be shown by default
-    if not this.initialized then
-      if C.abuttons.showdefault == "1" and GetNumButtons() > 0 then
-        pfUI.addonbuttons:Show()
-      else
-        pfUI.addonbuttons:Hide()
-      end
-
-      -- update all buttons
-      pfUI.addonbuttons:ProcessButtons()
-      this.initialized = true
+    if C.abuttons.showdefault == "1" and GetNumButtons() > 0 then
+      pfUI.addonbuttons:Show()
+    else
+      pfUI.addonbuttons:Hide()
    end

-    -- throttle updates to once per 5 seconds
-    if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + 5 end
+    -- update all buttons and apply workarounds
+    pfUI.addonbuttons:ProcessButtons()
+    for k, v in pairs(pfUI.addonbuttons.overrides) do
+      _G[k] = v
+    end
+  end)
+
+  -- Rescan minimap buttons every 5 seconds while the panel is shown
+  C_Timer.NewTicker(5, function()
+    if not pfUI.addonbuttons:IsShown() then return end

    -- reload/rescan minimap buttons
    pfUI.addonbuttons:ProcessButtons()
@@ -18,8 +18,7 @@ pfUI:RegisterModule("addons", function ()
  -- addon window
  pfUI.addons = CreateFrame("Frame", "pfAddons", UIParent)
  pfUI.addons:SetFrameStrata("DIALOG")
-  pfUI.addons:SetHeight(490)
-  pfUI.addons:SetWidth(380)
+  pfUI.addons:SetSize(380, 490)
  pfUI.addons:SetPoint("CENTER", 0,0)
  pfUI.addons:EnableMouseWheel(1)
  pfUI.addons:SetMovable(true)
@@ -51,8 +50,7 @@ pfUI:RegisterModule("addons", function ()
  pfUI.addons.close = CreateFrame("Button", "pfBagClose", pfUI.addons)
  pfUI.addons.close:SetPoint("TOPRIGHT", -border*2,-border*2 )
  CreateBackdrop(pfUI.addons.close)
-  pfUI.addons.close:SetHeight(15)
-  pfUI.addons.close:SetWidth(15)
+  pfUI.addons.close:SetSize(15, 15)
  pfUI.addons.close.texture = pfUI.addons.close:CreateTexture("pfBagClose")
  pfUI.addons.close.texture:SetTexture(pfUI.media["img:close"])
  pfUI.addons.close.texture:ClearAllPoints()
@@ -125,8 +123,7 @@ pfUI:RegisterModule("addons", function ()
  end)

  pfUI.addons.profile:SetPoint("TOP", pfUI.addons, "TOP", 0, -30)
-  pfUI.addons.profile:SetHeight(30)
-  pfUI.addons.profile:SetWidth(370)
+  pfUI.addons.profile:SetSize(370, 30)
  CreateBackdrop(pfUI.addons.profile, nil, true)

  -- addon profile: title
@@ -139,8 +136,7 @@ pfUI:RegisterModule("addons", function ()
  -- addon profile: delete
  pfUI.addons.profile.del = CreateFrame("Button", nil, pfUI.addons.profile, "UIPanelButtonTemplate")
  SkinButton(pfUI.addons.profile.del)
-  pfUI.addons.profile.del:SetWidth(16)
-  pfUI.addons.profile.del:SetHeight(16)
+  pfUI.addons.profile.del:SetSize(16, 16)
  pfUI.addons.profile.del:SetPoint("RIGHT", -10, 0)
  pfUI.addons.profile.del:GetFontString():SetPoint("CENTER", 1, 0)
  pfUI.addons.profile.del:SetText("-")
@@ -157,8 +153,7 @@ pfUI:RegisterModule("addons", function ()
  -- addon profile: create
  pfUI.addons.profile.add = CreateFrame("Button", nil, pfUI.addons.profile, "UIPanelButtonTemplate")
  SkinButton(pfUI.addons.profile.add)
-  pfUI.addons.profile.add:SetWidth(16)
-  pfUI.addons.profile.add:SetHeight(16)
+  pfUI.addons.profile.add:SetSize(16, 16)
  pfUI.addons.profile.add:SetPoint("RIGHT", pfUI.addons.profile.del, "LEFT", -4, 0)
  pfUI.addons.profile.add:GetFontString():SetPoint("CENTER", 1, 0)
  pfUI.addons.profile.add:SetText("+")
@@ -201,8 +196,7 @@ pfUI:RegisterModule("addons", function ()

  -- addon list: scroll frame
  pfUI.addons.scroll = CreateScrollFrame("pfAddonListScroll", pfUI.addons)
-  pfUI.addons.scroll:SetWidth(360)
-  pfUI.addons.scroll:SetHeight(410)
+  pfUI.addons.scroll:SetSize(360, 410)
  pfUI.addons.scroll:SetPoint("BOTTOM", 0, 10)

  pfUI.addons.scroll.backdrop = CreateFrame("Frame", nil, pfUI.addons.scroll)
@@ -292,8 +286,7 @@ pfUI:RegisterModule("addons", function ()
        frame.adeps = { GetAddOnDependencies(i) }                          -- required (.toc Dependencies)
        frame.aoptdeps = { C_AddOns.GetAddOnOptionalDependencies(i) }      -- optional (.toc OptionalDeps)

-        frame:SetWidth(340)
-        frame:SetHeight(25)
+        frame:SetSize(340, 25)
        frame:SetPoint("TOPLEFT", 5, i * -25 + 20)

        frame:SetBackdrop(pfUI.backdrop_hover)
@@ -48,8 +48,7 @@ pfUI:RegisterModule("afkcam", function ()
  local chat = CreateFrame("ScrollingMessageFrame", "pfAFKCamChat", overlay)
  chat:EnableMouse(false)
  chat:EnableMouseWheel(true)
-  chat:SetHeight(150)
-  chat:SetWidth(500)
+  chat:SetSize(500, 150)
  chat:SetPoint("BOTTOMLEFT",overlay,"BOTTOMLEFT", 10, 10)
  chat:SetTimeVisible(1800.0)
  chat:SetMaxLines(500)
@@ -2,6 +2,11 @@ pfUI:RegisterModule("autoshift", function ()
  pfUI.autoshift = CreateFrame("Frame")
  pfUI.autoshift:RegisterEvent("UI_ERROR_MESSAGE")

+  -- Empty stub kept only so Turtle WoW's pfUI-turtle addon doesn't error when
+  -- its obsolete moonkin autoshift module iterates pfUI.autoshift.shapeshifts.
+  -- This fork drives autoshift off GetShapeshiftFormID() and no longer uses it.
+  pfUI.autoshift.shapeshifts = {}
+
  pfUI.autoshift.scanString = string.gsub(SPELL_FAILED_ONLY_SHAPESHIFT, "%%s", "(.+)")

  pfUI.autoshift.errors = { SPELL_FAILED_NOT_MOUNTED, ERR_ATTACK_MOUNTED, ERR_TAXIPLAYERALREADYMOUNTED,
@@ -56,8 +56,7 @@ pfUI:RegisterModule("autovendor", function ()

  -- Setup Autosell button
  autovendor.button = CreateFrame("Button", "pfMerchantAutoVendorButton", MerchantFrame)
-  autovendor.button:SetWidth(36)
-  autovendor.button:SetHeight(36)
+  autovendor.button:SetSize(36, 36)
  autovendor.button.icon = autovendor.button:CreateTexture("ARTWORK")
  autovendor.button.icon:SetTexture("Interface\\Icons\\Spell_Shadow_SacrificialShield")
  autovendor.button:SetScript("OnEnter", function()
@@ -326,8 +326,7 @@ pfUI:RegisterModule("bags", function ()
          default_border + x*(frame.button_size+default_border*3),
          -default_border*2 - y*(frame.button_size+default_border*3) - topspace)

-        pfUI.bags[bag].slots[slot].frame:SetHeight(frame.button_size)
-        pfUI.bags[bag].slots[slot].frame:SetWidth(frame.button_size)
+        pfUI.bags[bag].slots[slot].frame:SetSize(frame.button_size, frame.button_size)

        if x >= rowlength - 1 then
          y = y + 1
@@ -545,8 +544,7 @@ pfUI:RegisterModule("bags", function ()
    local width = (frame.button_size/5*4 + default_border*2) * (max-min+1+extra)
    local height = default_border + (frame.button_size/5*4 + default_border)

-    frame.bagslots:SetWidth(width)
-    frame.bagslots:SetHeight(height)
+    frame.bagslots:SetSize(width, height)
    for slot=min, max do
      if not frame.bagslots.slots[slot] then
        frame.bagslots.slots[slot] = {}
@@ -606,8 +604,7 @@ pfUI:RegisterModule("bags", function ()

      frame.bagslots.slots[slot].frame:ClearAllPoints()
      frame.bagslots.slots[slot].frame:SetPoint("TOPLEFT", frame.bagslots, "TOPLEFT", left, top)
-      frame.bagslots.slots[slot].frame:SetHeight(frame.button_size/5*4)
-      frame.bagslots.slots[slot].frame:SetWidth(frame.button_size/5*4)
+      frame.bagslots.slots[slot].frame:SetSize(frame.button_size/5*4, frame.button_size/5*4)

      CreateBackdrop(frame.bagslots.slots[slot].frame, default_border)
      frame.bagslots.slots[slot].frame:Show()
@@ -626,8 +623,7 @@ pfUI:RegisterModule("bags", function ()
        end
        frame.bagslots.buy:SetPoint("RIGHT", frame.bagslots, "RIGHT", -default_border, 0)
        CreateBackdrop(frame.bagslots.buy, default_border)
-        frame.bagslots.buy:SetHeight(frame.button_size/5*4)
-        frame.bagslots.buy:SetWidth(frame.button_size/5*4)
+        frame.bagslots.buy:SetSize(frame.button_size/5*4, frame.button_size/5*4)
        frame.bagslots.buy:SetText("+")
        frame.bagslots.buy:SetTextColor(.5,.5,1,1)
        frame.bagslots.buy:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
@@ -719,8 +715,7 @@ pfUI:RegisterModule("bags", function ()
        frame.close = CreateFrame("Button", "pfBagClose", frame)
        frame.close:SetPoint("TOPRIGHT", -default_border*1,-default_border )
        CreateBackdrop(frame.close, default_border)
-        frame.close:SetHeight(12)
-        frame.close:SetWidth(12)
+        frame.close:SetSize(12, 12)
        frame.close.texture = frame.close:CreateTexture("pfBagClose")
        frame.close.texture:SetTexture(pfUI.media["img:close"])
        frame.close.texture:ClearAllPoints()
@@ -745,8 +740,7 @@ pfUI:RegisterModule("bags", function ()
        frame.bags = CreateFrame("Button", "pfBagSlotShow", frame)
        frame.bags:SetPoint("TOPRIGHT", frame.close, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.bags, default_border)
-        frame.bags:SetHeight(12)
-        frame.bags:SetWidth(12)
+        frame.bags:SetSize(12, 12)
        frame.bags:SetTextColor(1,1,.25,1)
        frame.bags:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.bags.texture = frame.bags:CreateTexture("pfBagArrowUp")
@@ -773,11 +767,7 @@ pfUI:RegisterModule("bags", function ()
        end)

        frame.bags:SetScript("OnClick", function()
-          if pfUI.bag.right.bagslots:IsShown() then
-            pfUI.bag.right.bagslots:Hide()
-          else
-            pfUI.bag.right.bagslots:Show()
-          end
+          pfUI.bag.right.bagslots:SetShown(not pfUI.bag.right.bagslots:IsShown())
        end)
      end

@@ -786,8 +776,7 @@ pfUI:RegisterModule("bags", function ()
        frame.open = CreateFrame("Button", "pfBagSlotOpen", frame)
        frame.open:SetPoint("TOPRIGHT", frame.bags, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.open, default_border)
-        frame.open:SetHeight(12)
-        frame.open:SetWidth(12)
+        frame.open:SetSize(12, 12)
        frame.open:SetTextColor(1,1,.25,1)
        frame.open:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.open.texture = frame.open:CreateTexture("pfBagOpenContainer")
@@ -845,8 +834,7 @@ pfUI:RegisterModule("bags", function ()
        frame.disenchant = CreateFrame("Button", "pfBagSlotDisenchant", frame)
        frame.disenchant:SetPoint("TOPRIGHT", frame.open, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.disenchant, default_border)
-        frame.disenchant:SetHeight(12)
-        frame.disenchant:SetWidth(12)
+        frame.disenchant:SetSize(12, 12)
        frame.disenchant:SetTextColor(1,1,.25,1)
        frame.disenchant:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.disenchant.texture = frame.disenchant:CreateTexture("pfBagDisenchant")
@@ -888,8 +876,7 @@ pfUI:RegisterModule("bags", function ()
        frame.picklock = CreateFrame("Button", "pfBagSlotPicklock", frame)
        frame.picklock:SetPoint("TOPRIGHT", frame.disenchant, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.picklock, default_border)
-        frame.picklock:SetHeight(12)
-        frame.picklock:SetWidth(12)
+        frame.picklock:SetSize(12, 12)
        frame.picklock:SetTextColor(1,1,.25,1)
        frame.picklock:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.picklock.texture = frame.picklock:CreateTexture("pfBagPicklock")
@@ -931,8 +918,7 @@ pfUI:RegisterModule("bags", function ()
        frame.keys = CreateFrame("Button", "pfBagSlotShow", frame)
        frame.keys:SetPoint("TOPRIGHT", frame.picklock, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.keys, default_border)
-        frame.keys:SetHeight(12)
-        frame.keys:SetWidth(12)
+        frame.keys:SetSize(12, 12)
        frame.keys:SetTextColor(1,1,.25,1)
        frame.keys:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.keys.texture = frame.keys:CreateTexture("pfBagArrowUp")
@@ -974,8 +960,7 @@ pfUI:RegisterModule("bags", function ()
        frame.sort = CreateFrame("Button", "pfBagSort", frame)
        frame.sort:SetPoint("TOPRIGHT", frame.keys, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.sort, default_border)
-        frame.sort:SetHeight(12)
-        frame.sort:SetWidth(12)
+        frame.sort:SetSize(12, 12)
        frame.sort.texture = frame.sort:CreateTexture("pfBagSortIcon")
        frame.sort.texture:SetTexture(pfUI.media["img:sort"])
        frame.sort.texture:ClearAllPoints()
@@ -987,7 +972,7 @@ pfUI:RegisterModule("bags", function ()
          frame.sort.backdrop:SetBackdropBorderColor(1,1,.25,1)
          frame.sort.texture:SetVertexColor(1,1,.25,1)
          GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
-          GameTooltip:SetText("Sort Bags")
+          GameTooltip:SetText(T["Sort Bags"])
          GameTooltip:Show()
        end)

@@ -1008,8 +993,7 @@ pfUI:RegisterModule("bags", function ()
      if not frame.gold and (C.appearance.bags.movable == "1" or not pfUI.panel) then
        frame.gold = CreateFrame("Frame", "pfBagGoldString", frame)
        frame.gold:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -4, 1)
-        frame.gold:SetWidth(200)
-        frame.gold:SetHeight(18)
+        frame.gold:SetSize(200, 18)
        frame.gold:RegisterEvent("PLAYER_ENTERING_WORLD")
        frame.gold:RegisterEvent("PLAYER_MONEY")
        frame.gold:SetScript("OnEvent", function()
@@ -1101,21 +1085,6 @@ pfUI:RegisterModule("bags", function ()
          frame.search.edit:ClearFocus()
        end)

-        frame.search:SetScript("OnHide", function()
-          frame.search.edit:SetText(T["Search"])
-          for bag = -2, 11 do
-            if pfUI.bags[bag] then
-              local bagsize = GetContainerNumSlots(bag)
-              if bag == -2 and pfUI.bag.showKeyring == true then bagsize = GetKeyRingSize() end
-              for slot = 1, bagsize do
-                if pfUI.bags[bag] and pfUI.bags[bag].slots[slot] then
-                  pfUI.bags[bag].slots[slot].frame:SetAlpha(1)
-                end
-              end
-            end
-          end
-        end)
-
        frame.search.edit:SetScript("OnMouseUp", function()
          if arg1 == "RightButton" then
            this:ClearFocus()
@@ -1145,8 +1114,7 @@ pfUI:RegisterModule("bags", function ()
        frame.close = CreateFrame("Button", "pfBagClose", frame)
        frame.close:SetPoint("TOPRIGHT", -default_border*1,-default_border )
        CreateBackdrop(frame.close, default_border)
-        frame.close:SetHeight(12)
-        frame.close:SetWidth(12)
+        frame.close:SetSize(12, 12)
        frame.close.texture = frame.close:CreateTexture("pfBagClose")
        frame.close.texture:SetTexture(pfUI.media["img:close"])
        frame.close.texture:ClearAllPoints()
@@ -1171,8 +1139,7 @@ pfUI:RegisterModule("bags", function ()
        frame.bags = CreateFrame("Button", "pfBagSlotShow", frame)
        frame.bags:SetPoint("TOPRIGHT", frame.close, "TOPLEFT", -default_border*3, 0)
        CreateBackdrop(frame.bags, default_border)
-        frame.bags:SetHeight(12)
-        frame.bags:SetWidth(12)
+        frame.bags:SetSize(12, 12)
        frame.bags:SetTextColor(1,1,.25,1)
        frame.bags:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
        frame.bags.texture = frame.bags:CreateTexture("pfBagArrowUp")
@@ -1225,7 +1192,7 @@ pfUI:RegisterModule("bags", function ()
          frame.sort.backdrop:SetBackdropBorderColor(1,1,.25,1)
          frame.sort.texture:SetVertexColor(1,1,.25,1)
          GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
-          GameTooltip:SetText("Sort Bank")
+          GameTooltip:SetText(T["Sort Bank"])
          GameTooltip:Show()
        end)

@@ -2,14 +2,12 @@ pfUI:RegisterModule("bgscore", function ()
  local bgframe = WorldStateAlwaysUpFrame
  if not bgframe then
    bgframe = CreateFrame("Frame", "WorldStateAlwaysUpFrame", UIParent)
-    bgframe:SetWidth(200)
-    bgframe:SetHeight(25)
+    bgframe:SetSize(200, 25)
    bgframe:SetPoint("TOP", UIParent, "TOP", 0, -100)
  end

  local mover = CreateFrame("Frame", "pfUIBGScoreMover", UIParent)
-  mover:SetWidth(220)
-  mover:SetHeight(30)
+  mover:SetSize(220, 30)
  mover:SetPoint("TOP", UIParent, "TOP", 0, -100)
  mover:SetFrameStrata("DIALOG")
  mover:SetMovable(true)
@@ -34,7 +32,7 @@ pfUI:RegisterModule("bgscore", function ()
  -- Title label
  local title = mover:CreateFontString(nil, "OVERLAY")
  title:SetFont("Fonts\\FRIZQT__.TTF", 14, "OUTLINE")
-  title:SetText("Battleground Frames")
+  title:SetText(T["Battleground Frames"])
  title:SetPoint("TOP", mover, "TOP", 0, -2)

  -- BG score preview text
@@ -138,16 +138,10 @@ pfUI:RegisterModule("buff", function ()
      end
    end)

-    buff:SetScript("OnLeave", function()
-      GameTooltip:Hide()
-    end)
+    buff:SetScript("OnLeave", GameTooltip_Hide)

    buff:SetScript("OnClick", function()
-      if CancelItemTempEnchantment and this.mode and this.mode == "MAINHAND" then
-        CancelItemTempEnchantment(1)
-      elseif CancelItemTempEnchantment and this.mode and this.mode == "OFFHAND" then
-        CancelItemTempEnchantment(2)
-      elseif this.spellId then
+      if this.spellId then
        C_Spell.CancelSpellByID(this.spellId)
      end
    end)
@@ -277,28 +271,27 @@ pfUI:RegisterModule("buff", function ()
  -- config loading
  function pfUI.buff:UpdateConfigBuffButton(buff)
    local fontsize = C.buffs.fontsize == "-1" and C.global.font_size or C.buffs.fontsize
+    local buffSize, buffSpacing = tonumber(C.buffs.size), tonumber(C.buffs.spacing)
    local rowcount, relFrame, offsetX, offsetY
    if buff.btype == "HELPFUL" then
      if buff.weapon == 1 and C.buffs.separateweapons == "1" then
        rowcount = floor((buff.gid-1) / tonumber(C.buffs.wepbuffrowsize))
        relFrame = pfUI.buff.wepbuffs
-        offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.wepbuffrowsize))*(tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
-        offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
+        offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.wepbuffrowsize))*(buffSize+2*buffSpacing)
+        offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+buffSize+2*buffSpacing)
      else
        rowcount = floor((buff.gid-1) / tonumber(C.buffs.buffrowsize))
        relFrame = pfUI.buff.buffs
-        offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.buffrowsize))*(tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
-        offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
+        offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.buffrowsize))*(buffSize+2*buffSpacing)
+        offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+buffSize+2*buffSpacing)
      end
    else
      rowcount = floor((buff.gid-1) / tonumber(C.buffs.debuffrowsize))
      relFrame = pfUI.buff.debuffs
-      offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.debuffrowsize))*(tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
-      offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing))
+      offsetX = -(buff.gid-1-rowcount*tonumber(C.buffs.debuffrowsize))*(buffSize+2*buffSpacing)
+      offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+buffSize+2*buffSpacing)
    end
-
-    buff:SetWidth(tonumber(C.buffs.size))
-    buff:SetHeight(tonumber(C.buffs.size))
+    buff:SetSize(buffSize, buffSize)
    buff:ClearAllPoints()
    buff:SetPoint("TOPRIGHT", relFrame, "TOPRIGHT",offsetX, offsetY)

@@ -318,20 +311,26 @@ pfUI:RegisterModule("buff", function ()
  function pfUI.buff:UpdateConfig()
    local fontsize = C.buffs.fontsize == "-1" and C.global.font_size or C.buffs.fontsize

-    pfUI.buff.buffs:SetWidth(tonumber(C.buffs.buffrowsize) * (tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
-    pfUI.buff.buffs:SetHeight(ceil(32/tonumber(C.buffs.buffrowsize)) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
-    pfUI.buff.buffs:SetPoint("TOPRIGHT", pfUI.minimap or UIParent, "TOPLEFT", -4*tonumber(C.buffs.spacing), 0)
+    local spacing  = tonumber(C.buffs.spacing)
+    local cell     = tonumber(C.buffs.size) + 2 * spacing
+    local rowextra = C.buffs.textinside == "1" and 0 or (fontsize * 1.5)
+
+    local function SizeBuffFrame(frame, rowsize, count)
+      rowsize = tonumber(rowsize)
+      frame:SetSize(rowsize * cell, ceil(count / rowsize) * (rowextra + cell))
+    end
+
+    SizeBuffFrame(pfUI.buff.buffs, C.buffs.buffrowsize, 32)
+    pfUI.buff.buffs:SetPoint("TOPRIGHT", pfUI.minimap or UIParent, "TOPLEFT", -4 * spacing, 0)
    UpdateMovable(pfUI.buff.buffs)

-    pfUI.buff.debuffs:SetWidth(tonumber(C.buffs.debuffrowsize) * (tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
-    pfUI.buff.debuffs:SetHeight(ceil(16/tonumber(C.buffs.debuffrowsize)) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
+    SizeBuffFrame(pfUI.buff.debuffs, C.buffs.debuffrowsize, 16)
    pfUI.buff.debuffs:SetPoint("TOPRIGHT", pfUI.buff.buffs, "BOTTOMRIGHT", 0, 0)
    UpdateMovable(pfUI.buff.debuffs)

    if C.buffs.separateweapons == "1" then
      pfUI.buff.wepbuffs:ClearAllPoints()
-      pfUI.buff.wepbuffs:SetWidth(tonumber(C.buffs.wepbuffrowsize) * (tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
-      pfUI.buff.wepbuffs:SetHeight(ceil(2/tonumber(C.buffs.wepbuffrowsize)) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
+      SizeBuffFrame(pfUI.buff.wepbuffs, C.buffs.wepbuffrowsize, 2)
      pfUI.buff.wepbuffs:SetPoint("TOPRIGHT", pfUI.buff.debuffs, "BOTTOMRIGHT", 0, 0)
      pfUI.buff.wepbuffs:Show()
      UpdateMovable(pfUI.buff.wepbuffs)
@@ -90,12 +90,14 @@ pfUI:RegisterModule("buffwatch", function ()
          if val == skill then return end
        end
        config.whitelist = config.whitelist .. "#" .. skill
+        fcache[tostring(config)] = nil -- invalidate so the new entry takes effect immediately
        DEFAULT_CHAT_FRAME:AddMessage("|cff33ffcc" .. skill .. "|r" .. T["is now whitelisted."])
      elseif IsShiftKeyDown() then
        for _, val in pairs({strsplit("#", config.blacklist)}) do
          if val == skill then return end
        end
        config.blacklist = config.blacklist .. "#" .. skill
+        fcache[tostring(config)] = nil -- invalidate so the new entry takes effect immediately
        DEFAULT_CHAT_FRAME:AddMessage("|cff33ffcc" .. skill .. "|r" .. T["is now blacklisted."])
      end
    elseif this.parent.unit == "player" then
@@ -162,8 +164,7 @@ pfUI:RegisterModule("buffwatch", function ()
    local color = parent.color
    local bordercolor = parent.bordercolor
    local textcolor = parent.textcolor
-    local width = parent:GetWidth()
-    local height = parent:GetHeight()
+    local width, height = parent:GetSize()
    local framename = "pf" .. parent.unit .. ( parent.type == "HARMFUL" and "Debuff" or "Buff" ) .. "Bar" .. bar

    local font = parent.config.use_unitfonts == "1" and pfUI.font_unit or pfUI.font_default
@@ -172,8 +173,7 @@ pfUI:RegisterModule("buffwatch", function ()
    frame:EnableMouse(1)
    frame:Hide()
    frame:SetPoint("BOTTOM", 0, (bar-1)*(height+2*border+1))
-    frame:SetWidth(width)
-    frame:SetHeight(height)
+    frame:SetSize(width, height)

    frame.bar = CreateFrame("StatusBar", "pfBuffBar" .. bar, frame)
    frame.bar:SetPoint("TOPLEFT", frame, "TOPLEFT", height+1, 0)
@@ -202,8 +202,7 @@ pfUI:RegisterModule("buffwatch", function ()
    frame.time:SetJustifyH("RIGHT")

    frame.icon = frame:CreateTexture(nil, "OVERLAY")
-    frame.icon:SetWidth(height)
-    frame.icon:SetHeight(height)
+    frame.icon:SetSize(height, height)
    frame.icon:SetPoint("LEFT", frame, "LEFT", 0, 0)
    frame.icon:SetTexCoord(.07,.93,.07,.93)

@@ -225,7 +224,7 @@ pfUI:RegisterModule("buffwatch", function ()

    CreateBackdrop(frame)
    CreateBackdropShadow(frame)
-    if bordercolor.r ~= "0" and bordercolor.g ~= "0" and bordercolor.b ~= "0" and bordercolor.a ~= "0" then
+    if bordercolor.r ~= 0 and bordercolor.g ~= 0 and bordercolor.b ~= 0 and bordercolor.a ~= 0 then
      frame.backdrop:SetBackdropBorderColor(bordercolor.r,bordercolor.g,bordercolor.b,1)
    end

@@ -422,18 +421,15 @@ pfUI:RegisterModule("buffwatch", function ()
  if pfUI.uf.player and C.buffbar.pbuff.enable == "1" then
    pfUI.uf.player.buffbar = CreateBuffBarFrame("Player", "HELPFUL")
    local config = C.buffbar.pbuff
-    local r, g, b, a = strsplit(",", config.color)
-    local br, bg, bb, ba = strsplit(",", config.bordercolor)
-    local tr, tg, tb, ta = strsplit(",", config.textcolor)

    pfUI.uf.player.buffbar:SetWidth(config.width == "-1" and pfUI.uf.player:GetWidth() or config.width)
    pfUI.uf.player.buffbar:SetHeight(config.height)
    pfUI.uf.player.buffbar.threshold = tonumber(config.threshold)
    pfUI.uf.player.buffbar.config = config
    pfUI.uf.player.buffbar.buffcmp = config.sort == "asc" and asc or desc
-    pfUI.uf.player.buffbar.color = { r = r, g = g, b = b, a = a }
-    pfUI.uf.player.buffbar.bordercolor = { r = br, g = bg, b = bb, a = ba }
-    pfUI.uf.player.buffbar.textcolor = { r = tr, g = tg, b = tb, a = ta }
+    pfUI.uf.player.buffbar.color = GetStringColorObject(config.color)
+    pfUI.uf.player.buffbar.bordercolor = GetStringColorObject(config.bordercolor)
+    pfUI.uf.player.buffbar.textcolor = GetStringColorObject(config.textcolor)
    pfUI.uf.player.buffbar.anchors = {
      pfUI.uf.player,
      pfUI.uf.player and pfUI.uf.player.debuffs,
@@ -448,9 +444,6 @@ pfUI:RegisterModule("buffwatch", function ()
  -- create player debuffbars
  if pfUI.uf.player and C.buffbar.pdebuff.enable == "1" then
    local config = C.buffbar.pdebuff
-    local r, g, b, a = strsplit(",", config.color)
-    local br, bg, bb, ba = strsplit(",", config.bordercolor)
-    local tr, tg, tb, ta = strsplit(",", config.textcolor)

    pfUI.uf.player.debuffbar = CreateBuffBarFrame("Player", "HARMFUL")
    pfUI.uf.player.debuffbar:SetWidth(config.width == "-1" and pfUI.uf.player:GetWidth() or config.width)
@@ -458,9 +451,9 @@ pfUI:RegisterModule("buffwatch", function ()
    pfUI.uf.player.debuffbar.threshold = tonumber(config.threshold)
    pfUI.uf.player.debuffbar.config = config
    pfUI.uf.player.debuffbar.buffcmp = config.sort == "asc" and asc or desc
-    pfUI.uf.player.debuffbar.color = { r = r, g = g, b = b, a = a }
-    pfUI.uf.player.debuffbar.bordercolor = { r = br, g = bg, b = bb, a = ba }
-    pfUI.uf.player.debuffbar.textcolor = { r = tr, g = tg, b = tb, a = ta }
+    pfUI.uf.player.debuffbar.color = GetStringColorObject(config.color)
+    pfUI.uf.player.debuffbar.bordercolor = GetStringColorObject(config.bordercolor)
+    pfUI.uf.player.debuffbar.textcolor = GetStringColorObject(config.textcolor)
    pfUI.uf.player.debuffbar.anchors = {
      pfUI.uf.player,
      pfUI.uf.player and pfUI.uf.player.buffbar and pfUI.uf.player.buffbar.bars,
@@ -476,18 +469,15 @@ pfUI:RegisterModule("buffwatch", function ()
  -- create target debuffbars
  if pfUI.uf.target and C.buffbar.tdebuff.enable == "1" then
    local config = C.buffbar.tdebuff
-    local r, g, b, a = strsplit(",", config.color)
-    local br, bg, bb, ba = strsplit(",", config.bordercolor)
-    local tr, tg, tb, ta = strsplit(",", config.textcolor)

    pfUI.uf.target.debuffbar = CreateBuffBarFrame("Target", "HARMFUL")
    pfUI.uf.target.debuffbar:SetWidth(config.width == "-1" and pfUI.uf.target:GetWidth() or config.width)
    pfUI.uf.target.debuffbar:SetHeight(config.height)
    pfUI.uf.target.debuffbar.config = config
    pfUI.uf.target.debuffbar.buffcmp = config.sort == "asc" and asc or desc
-    pfUI.uf.target.debuffbar.color = { r = r, g = g, b = b, a = a }
-    pfUI.uf.target.debuffbar.bordercolor = { r = br, g = bg, b = bb, a = ba }
-    pfUI.uf.target.debuffbar.textcolor = { r = tr, g = tg, b = tb, a = ta }
+    pfUI.uf.target.debuffbar.color = GetStringColorObject(config.color)
+    pfUI.uf.target.debuffbar.bordercolor = GetStringColorObject(config.bordercolor)
+    pfUI.uf.target.debuffbar.textcolor = GetStringColorObject(config.textcolor)
    pfUI.uf.target.debuffbar.threshold = tonumber(config.threshold)
    pfUI.uf.target.debuffbar.anchors = {
      pfUI.uf.target,
@@ -16,9 +16,13 @@ pfUI:RegisterModule("castbar", function ()
    end
  end

-  -- Clear cast state on the bar. Shows the bar full for one frame, then
-  -- OnUpdate fades it out.
-  local function ClearBar(cb)
+  -- Clear cast state on the bar and start the fade-out. On a normal end the bar
+  -- is left at its current fill (a completed cast is already ~full; nothing
+  -- snaps to full, which used to flash for a frame when the next cast stamped
+  -- the bar). When `failed` is set for a cast that was actually in progress, the
+  -- bar flashes full red before fading — the cancelled-cast indicator.
+  local function ClearBar(cb, failed)
+    local wasActive = cb.endTime ~= nil
    cb.startTime, cb.endTime, cb.isChannel = nil, nil, nil
    cb.activeName, cb.spellID = nil, nil
    cb.isTradeskill = nil
@@ -26,8 +30,11 @@ pfUI:RegisterModule("castbar", function ()
    cb.tradeskillSingleMs, cb.currentCraftStart = nil, nil
    cb.lastMax = nil
    cb.delay = 0
-    cb.bar:SetMinMaxValues(1, 100)
-    cb.bar:SetValue(100)
+    if failed and wasActive then
+      cb.bar:SetStatusBarColor(GetStringColor(C.appearance.castbar.failcolor))
+      cb.bar:SetMinMaxValues(0, 1)
+      cb.bar:SetValue(1)
+    end
    if cb.bar.spark then cb.bar.spark:Hide() end
    cb.fadeout = 1
  end
@@ -65,8 +72,8 @@ pfUI:RegisterModule("castbar", function ()
  end

  -- Mark the start of craft 2..N within an active merge (called from the
-  -- SPELLCAST_START / SPELL_START_SELF handlers). Resets the per-craft
-  -- spark to the left edge of the bar.
+  -- UNIT_SPELLCAST_START handler). Resets the per-craft spark to the left
+  -- edge of the bar.
  local function StartTradeskillCraft(cb)
    cb.currentCraftStart = GetTime() * 1000
    local remaining = cb.tradeskillTotal - (cb.tradeskillCompleted or 0)
@@ -79,7 +86,7 @@ pfUI:RegisterModule("castbar", function ()

  -- Stamp the bar with cast data and render text/icon/lag once. OnUpdate
  -- then animates the fill from this state without touching C_Spell.
-  local function StampBar(cb, name, tex, startMs, endMs, spellID, isChannel, delayMs, isTradeskill)
+  local function StampBar(cb, name, tex, startMs, endMs, spellID, isChannel, delayMs, isTradeskill, rank)
    cb.startTime = startMs
    cb.endTime = endMs
    cb.isChannel = isChannel
@@ -92,10 +99,13 @@ pfUI:RegisterModule("castbar", function ()

    cb.bar:SetStatusBarColor(GetStringColor(C.appearance.castbar[isChannel and "channelcolor" or "castbarcolor"]))

-    local rank = ""
-    if spellID then
+    -- Rank: prefer the value the UNIT_SPELLCAST_* event delivered (arg5, passed
+    -- through by RefreshBar). Only the retarget re-poll has no event in hand, so
+    -- it falls back to a lookup.
+    if not rank and spellID then
      rank = C_Spell.GetSpellSubtext(spellID) or ""
    end
+    rank = rank or ""
    local spellname = (cb.showname and name) and (name .. " ") or ""
    local rankstr = (cb.showrank and rank ~= "") and string.format("|cffaaffcc[%s]|r", rank) or ""
    cb.bar.left:SetText(spellname .. rankstr)
@@ -122,11 +132,21 @@ pfUI:RegisterModule("castbar", function ()

    cb.bar:SetMinMaxValues(0, duration)
    cb.lastMax = duration
+
+    -- Prime the fill on this frame. StampBar otherwise leaves the previous
+    -- value in place (ClearBar, run on the prior cast's STOP, leaves it full),
+    -- so the bar would flash full for the frame between here and the next
+    -- OnUpdate tick. Reset the throttle too so the timer text updates promptly.
+    local nowSec = GetTime()
+    local cur = isChannel and (endMs / 1000 - nowSec) or (nowSec - startMs / 1000)
+    if cur < 0 then cur = 0 elseif cur > duration then cur = duration end
+    cb.bar:SetValue(cur)
+    cb.tick = 0
  end

  -- One-shot poll: read C_Spell for the bar's unit, stamp or clear. Called
  -- from event handlers (cast start, target/focus change), never per-frame.
-  local function RefreshBar(cb)
+  local function RefreshBar(cb, rank)
    local query = cb.unitstr ~= "" and cb.unitstr or cb.unitname
    if not query or (cb.unitstr ~= "" and not UnitExists(cb.unitstr)) then
      ClearBar(cb)
@@ -149,7 +169,7 @@ pfUI:RegisterModule("castbar", function ()
      end
    end
    if name and startMs and endMs then
-      StampBar(cb, name, tex, startMs, endMs, spellID, isChan, delayMs, isTradeskill)
+      StampBar(cb, name, tex, startMs, endMs, spellID, isChan, delayMs, isTradeskill, rank)
    else
      ClearBar(cb)
    end
@@ -294,35 +314,27 @@ pfUI:RegisterModule("castbar", function ()
      end
    end)

-    -- Cast lifecycle events. Player bars react to vanilla SPELLCAST_*; non-
-    -- player bars also react to Nampower SPELL_*_OTHER (gated by the
-    -- NP_EnableSpell{Start,Go}Events CVars, enabled by libdebuff) plus the
-    -- retarget event. Player events also feed non-player bars for the
-    -- target=self case.
-    cb:RegisterEvent("SPELLCAST_START")
-    cb:RegisterEvent("SPELLCAST_STOP")
-    cb:RegisterEvent("SPELLCAST_FAILED")
-    cb:RegisterEvent("SPELLCAST_INTERRUPTED")
-    cb:RegisterEvent("SPELLCAST_CHANNEL_START")
-    cb:RegisterEvent("SPELLCAST_CHANNEL_STOP")
-    cb:RegisterEvent("SPELLCAST_CHANNEL_UPDATE")
-    cb:RegisterEvent("SPELL_DELAYED_SELF")
-    -- Chained same-spell recasts never run the client cast path (the 1.12
-    -- engine short-circuits at spellID == current-cast), so vanilla
-    -- SPELLCAST_START never fires for them. nampower's SPELL_START_SELF
-    -- (server-driven) is the only signal that shows them.
-    cb:RegisterEvent("SPELL_START_SELF")
-    if unitstr == "player" then
-      cb:RegisterEvent("SPELL_GO_SELF")
-    end
-    if unitstr ~= "player" and unitstr ~= "" then
-      cb:RegisterEvent("SPELL_START_OTHER")
-      cb:RegisterEvent("SPELL_FAILED_OTHER")
-      if unitstr == "target" then
-        cb:RegisterEvent("PLAYER_TARGET_CHANGED")
-      elseif unitstr == "focus" then
-        cb:RegisterEvent("PLAYER_FOCUS_CHANGED")
-      end
+    -- Cast lifecycle, entirely on ClassicAPI's UNIT_SPELLCAST_* events. They
+    -- fire per unit token: arg1=="player" for the player's own casts, and the
+    -- remote token(s) ("target", "focus", ...) for other units -- so one set of
+    -- events drives every bar with no Nampower dependency. The handler routes an
+    -- event to this bar when arg1 matches its unit, or -- since the player's own
+    -- casts only ever fire arg1=="player" -- when the bar's unit resolves to the
+    -- player (target=self). PLAYER_TARGET/FOCUS_CHANGED re-polls so a unit
+    -- already mid-cast when it becomes the target/focus still shows.
+    cb:RegisterEvent("UNIT_SPELLCAST_START")
+    cb:RegisterEvent("UNIT_SPELLCAST_STOP")
+    cb:RegisterEvent("UNIT_SPELLCAST_FAILED")
+    cb:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
+    cb:RegisterEvent("UNIT_SPELLCAST_DELAYED")
+    cb:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
+    cb:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
+    cb:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
+    cb:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
+    if unitstr == "target" then
+      cb:RegisterEvent("PLAYER_TARGET_CHANGED")
+    elseif unitstr == "focus" then
+      cb:RegisterEvent("PLAYER_FOCUS_CHANGED")
    end

    cb:SetScript("OnEvent", function()
@@ -333,83 +345,33 @@ pfUI:RegisterModule("castbar", function ()
        return
      end

-      if event == "SPELL_START_OTHER" then
-        -- arg3=casterGuid. Defer one frame so ClassicAPI's UnitChannelInfo
-        -- can see the engine's +0x228 broadcast for remote-unit channels
-        -- (the cohook+packet handler runs in the same frame; the broadcast
-        -- propagates after).
-        if arg3 == UnitGUID(unit) then
-          local target = this
-          RunNextFrame(function() RefreshBar(target) end)
-        end
+      -- UNIT_SPELLCAST_* fire per unit token (arg1). Handle an event when it's
+      -- for this bar's unit, or -- since the player's own casts only ever fire
+      -- arg1=="player" -- when this bar's unit currently resolves to the player
+      -- (target=self / focus=self).
+      -- Args: arg1=unit, arg2=castGUID, arg3=spellID, arg4=name, arg5=rank.
+      if arg1 ~= unit and not (arg1 == "player" and UnitIsUnit(unit, "player")) then
        return
      end

-      if event == "SPELL_FAILED_OTHER" then
-        if arg1 == UnitGUID(unit) then ClearBar(this) end
-        return
-      end
-
-      -- Vanilla SPELLCAST_* + SPELL_DELAYED_SELF fire only for the local
-      -- player. Non-player bars handle them only when their unit currently
-      -- resolves to the player (target=self / focus=self).
-      if not UnitIsUnit(unit, 'player') then return end
-
-      if event == "SPELLCAST_START" or event == "SPELLCAST_CHANNEL_START" then
+      if event == "UNIT_SPELLCAST_START" or event == "UNIT_SPELLCAST_CHANNEL_START" then
+        -- START also fires per craft in a same-spell chain, so an active merge
+        -- just resyncs the current craft's spark/label instead of restamping.
        if this.tradeskillTotal then
-          -- Mid-chain craft N+1 of N. Keep the merged bar; resync the spark
-          -- to the new craft's start and refresh the "(N)" count label.
          StartTradeskillCraft(this)
        else
-          RefreshBar(this)
+          RefreshBar(this, arg5)
          if this.isTradeskill and (this.pendingTradeskillCount or 0) > 1
              and C.castbar.player.mergetradeskill == "1" then
            EnterTradeskillMerge(this, this.startTime, this.endTime, this.pendingTradeskillCount)
          end
          this.pendingTradeskillCount = nil
        end
-      elseif event == "SPELL_START_SELF" then
-        -- Catches chained same-spell recasts (no SPELLCAST_START fires) —
-        -- including tradeskill chaining where craft 2..N reuse one spell.
-        -- Defer one frame so ClassicAPI's SMSG_SPELL_START co-hook has
-        -- stamped g_cast before we poll, regardless of co-hook order.
-        if this.tradeskillTotal then
-          StartTradeskillCraft(this)
-        else
-          local target = this
-          RunNextFrame(function()
-            -- Re-check: SPELL_START_SELF (nampower co-hook) fires before vanilla
-            -- SPELLCAST_START on the same packet, so SPELLCAST_START may have
-            -- entered merge in this same frame. Don't restamp over it.
-            if target.tradeskillTotal then
-              StartTradeskillCraft(target)
-              return
-            end
-            RefreshBar(target)
-            if target.unitstr == "player" and target.isTradeskill
-                and (target.pendingTradeskillCount or 0) > 1
-                and C.castbar.player.mergetradeskill == "1" then
-              EnterTradeskillMerge(target, target.startTime, target.endTime, target.pendingTradeskillCount)
-            end
-            target.pendingTradeskillCount = nil
-          end)
-        end
-      elseif event == "SPELLCAST_CHANNEL_STOP" then
-        -- A channel's stop can arrive after a following cast already claimed
-        -- the bar (channel->cast transition); only clear if a channel is
-        -- actually being shown, so it doesn't wipe an active cast bar.
-        if this.isChannel then ClearBar(this) end
-      elseif event == "SPELLCAST_STOP" then
-        -- During a tradeskill chain, SPELL_GO_SELF already counted this craft
-        -- and either cleared the bar (chain done) or kept it running. Only a
-        -- non-merge cast clears here.
-        if not this.tradeskillTotal then ClearBar(this) end
-      elseif event == "SPELLCAST_FAILED" or event == "SPELLCAST_INTERRUPTED" then
-        ClearBar(this)
-      elseif event == "SPELL_GO_SELF" then
-        -- arg2 = spellId. In a tradeskill merge, count each successful craft
-        -- and clear when the chain is done.
-        if this.tradeskillTotal and arg2 == this.tradeskillSpellID then
+      elseif event == "UNIT_SPELLCAST_SUCCEEDED" then
+        -- Per-craft completion during a tradeskill merge (arg3 = spellID):
+        -- count and clear when the chain is done. A no-op for normal casts,
+        -- which are cleared by UNIT_SPELLCAST_STOP.
+        if this.tradeskillTotal and arg3 == this.tradeskillSpellID then
          this.tradeskillCompleted = (this.tradeskillCompleted or 0) + 1
          if this.tradeskillCompleted >= this.tradeskillTotal then
            ClearBar(this)
@@ -417,33 +379,46 @@ pfUI:RegisterModule("castbar", function ()
            UpdateTradeskillLabel(this)
          end
        end
-      elseif event == "SPELL_DELAYED_SELF" then
-        -- Cast pushback. nampower's event carries the delay (arg2); apply it
-        -- locally rather than re-polling, so the bar doesn't depend on
-        -- ClassicAPI's SMSG_SPELL_DELAYED co-hook having bumped g_cast before
-        -- this fires (co-hook order vs nampower is not guaranteed).
-        if not this.endTime or not arg2 then return end
-        local delayMs = tonumber(arg2) or 0
-        if delayMs > 0 then
-          this.delay = (this.delay or 0) + delayMs / 1000
-          this.endTime = this.endTime + delayMs
-          local newDuration = (this.endTime - this.startTime) / 1000
-          this.bar:SetMinMaxValues(0, newDuration)
-          this.lastMax = newDuration
-        end
-      elseif event == "SPELLCAST_CHANNEL_UPDATE" then
-        -- Channel pushback. ClassicAPI doesn't track channel delay in
-        -- g_channel, so we adjust endTime + delay locally and resize the
-        -- bar so OnUpdate animates against the new total.
-        if not this.endTime or not arg1 then return end
-        local newEndMs = GetTime() * 1000 + arg1
-        local diff = this.endTime - newEndMs
-        if diff > 50 then
-          this.delay = (this.delay or 0) + diff / 1000
-          this.endTime = newEndMs
-          local newDuration = (this.endTime - this.startTime) / 1000
-          this.bar:SetMinMaxValues(0, newDuration)
-          this.lastMax = newDuration
+      elseif event == "UNIT_SPELLCAST_CHANNEL_STOP" then
+        -- A channel's stop can arrive after a following cast already claimed
+        -- the bar (channel->cast transition); only clear if a channel is
+        -- actually being shown, so it doesn't wipe an active cast bar.
+        if this.isChannel then ClearBar(this) end
+      elseif event == "UNIT_SPELLCAST_STOP" then
+        -- STOP fires between crafts in a merge too (each craft is a new cast);
+        -- UNIT_SPELLCAST_SUCCEEDED owns the count, so only a non-merge cast
+        -- clears here.
+        if not this.tradeskillTotal then ClearBar(this) end
+      elseif event == "UNIT_SPELLCAST_FAILED" or event == "UNIT_SPELLCAST_INTERRUPTED" then
+        ClearBar(this, true)
+      elseif event == "UNIT_SPELLCAST_DELAYED" or event == "UNIT_SPELLCAST_CHANNEL_UPDATE" then
+        -- Pushback: a cast delayed later or a channel shortened. Following
+        -- Quartz, re-poll just the times and accumulate the shift into a running
+        -- this.delay for the +/- indicator, rather than a full restamp (which
+        -- would reset that total and re-render icon/text). ClassicAPI moves
+        -- endMs (SpellDelayed_h bumps g_cast.endMs; the MSG_CHANNEL_UPDATE
+        -- co-hook rewrites g_channel.endMs) while startMs stays put, so we diff
+        -- endMs. delay is a positive magnitude; OnUpdate signs it "+" for casts
+        -- and "-" for channels. Skipped during a tradeskill merge.
+        if this.endTime and not this.tradeskillTotal then
+          local query = this.unitstr ~= "" and this.unitstr or this.unitname
+          local startMs, endMs
+          if this.isChannel then
+            local _, _, _, s, e = C_Spell.UnitChannelInfo(query)
+            startMs, endMs = s, e
+          else
+            local _, _, _, s, e = C_Spell.UnitCastingInfo(query)
+            startMs, endMs = s, e
+          end
+          if startMs and endMs then
+            local shift = this.isChannel and (this.endTime - endMs) or (endMs - this.endTime)
+            this.delay = (this.delay or 0) + shift / 1000
+            this.startTime = startMs
+            this.endTime = endMs
+            local newDuration = (endMs - startMs) / 1000
+            this.bar:SetMinMaxValues(0, newDuration)
+            this.lastMax = newDuration
+          end
        end
      end
    end)
@@ -489,10 +464,10 @@ pfUI:RegisterModule("castbar", function ()
    UpdateMovable(pfUI.castbar.player)

    -- Tradeskill merge: hook DoTradeSkill so the player castbar knows the
-    -- requested count before the first SPELLCAST_START fires. Always-on hook
-    -- (the config knob is read at event time so toggling takes effect on the
-    -- next craft without a /reload). DoTradeSkill is synchronous; the server
-    -- roundtrip to SPELLCAST_START gives us plenty of time after this hook.
+    -- requested count before the first UNIT_SPELLCAST_START fires. Always-on
+    -- hook (the config knob is read at event time so toggling takes effect on
+    -- the next craft without a /reload). DoTradeSkill is synchronous; the
+    -- server roundtrip to UNIT_SPELLCAST_START gives us plenty of time.
    hooksecurefunc("DoTradeSkill", function(index, num)
      if pfUI.castbar.player then
        pfUI.castbar.player.pendingTradeskillCount = tonumber(num) or 1
@@ -82,10 +82,10 @@ pfUI:RegisterModule("chat", function ()
  end

  if C.chat.global.custombg == "1" then
-    local r, g, b, a = strsplit(",", C.chat.global.background)
+    local r, g, b, a = GetStringColor(C.chat.global.background)
    pfUI.chat.left.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-    local r, g, b, a = strsplit(",", C.chat.global.border)
+    local r, g, b, a = GetStringColor(C.chat.global.border)
    pfUI.chat.left.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
  end

@@ -257,10 +257,10 @@ pfUI:RegisterModule("chat", function ()
  end

  if C.chat.global.custombg == "1" then
-    local r, g, b, a = strsplit(",", C.chat.global.background)
+    local r, g, b, a = GetStringColor(C.chat.global.background)
    pfUI.chat.right.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-    local r, g, b, a = strsplit(",", C.chat.global.border)
+    local r, g, b, a = GetStringColor(C.chat.global.border)
    pfUI.chat.right.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
  end

@@ -429,7 +429,7 @@ pfUI:RegisterModule("chat", function ()
        _G["ChatFrame" .. i .. "TabFlash"].Show = function() return end
      end

-      local _, class = UnitClass("player")
+      local class = UnitClassBase("player")
      local classColor = PFUI_CLASS_COLORS[class]
      _G["ChatFrame" .. i .. "TabText"]:SetTextColor((classColor.r + .3) * .5, (classColor.g + .3) * .5, (classColor.b + .3) * .5, 1)
      _G["ChatFrame" .. i .. "TabText"]:SetFont(panelfont,panelfont_size, "OUTLINE")
@@ -675,7 +675,7 @@ pfUI:RegisterModule("chat", function ()
  end

  -- read and parse whisper color settings
-  local cr, cg, cb, ca = strsplit(",", C.chat.global.whisper)
+  local cr, cg, cb, ca = GetStringColor(C.chat.global.whisper)
  cr, cg, cb = tonumber(cr), tonumber(cg), tonumber(cb)
  local wcol = rgbhex(cr, cg, cb)

@@ -706,10 +706,10 @@ pfUI:RegisterModule("chat", function ()
    _G.CHAT_WHISPER_INFORM_GET = '[W]' .. default
  end

-  local r,g,b,a = strsplit(",", C.chat.text.timecolor)
+  local r,g,b,a = GetStringColor(C.chat.text.timecolor)
  local timecolorhex = rgbhex(r,g,b,a)

-  local r,g,b = strsplit(",", C.chat.text.unknowncolor)
+  local r,g,b = GetStringColor(C.chat.text.unknowncolor)
  local unknowncolorhex = rgbhex(r,g,b)

  -- Suppress FriendsFrame's WHO_LIST_UPDATE handling for our DLL-issued
@@ -810,23 +810,25 @@ pfUI:RegisterModule("chat", function ()
      end
    end

+    -- detect the whisper prefix BEFORE prepending a timestamp; the timestamp
+    -- pushes the whisper colour code off position 1 and the find below fails
+    local isWhisper = C.chat.global.whispermod == "1" and string.find(text, wcol, 1) == 1
+
    -- show timestamp in chat
    if C.chat.text.time == "1" then
      text = timecolorhex .. tleft .. date(C.chat.text.timeformat) .. tright .. "|r " .. text
    end

    -- save chat history
-    if C.chat.global.whispermod == "1" and string.find(text, wcol, 1) == 1 then
+    if isWhisper then
      SaveChatHistory(frame:GetID(), string.gsub(text, wcol, ""), cr, cg, cb)
    else
      SaveChatHistory(frame:GetID(), text, a1, a2, a3)
    end

-    if C.chat.global.whispermod == "1" then
+    if isWhisper then
      -- patch incoming whisper string to match the colors
-      if string.find(text, wcol, 1) == 1 then
-        text = string.gsub(text, "|r", "|r" .. wcol)
-      end
+      text = string.gsub(text, "|r", "|r" .. wcol)
    end

    frame:HookAddMessage(text, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)
@@ -96,8 +96,7 @@ pfUI:RegisterModule("chatcopy", function ()
        scroll:Hide()

        local editbox = CreateFrame("EditBox", "pfChatCopyBox" .. i, scroll)
-        editbox:SetHeight(frame:GetHeight())
-        editbox:SetWidth(frame:GetWidth())
+        editbox:SetSize(frame:GetSize())
        editbox:SetAllPoints(scroll)
        editbox:SetTextColor(1,1,1,1)
        editbox:SetFontObject(ChatFontNormal)
@@ -5,7 +5,7 @@ pfUI:RegisterModule("combopoints", function ()
  ComboFrame:Hide()
  ComboFrame:UnregisterAllEvents()

-  local _, class = UnitClass("player")
+  local class = UnitClassBase("player")
  local combo_width = C["unitframes"]["combowidth"]
  local combo_height = C["unitframes"]["comboheight"]
  pfUI.combopoints = {}
@@ -1,15 +1,15 @@
 pfUI:RegisterModule("cooldown", function ()
  -- cache values
-  local lowcolor    = {strsplit(",", C.appearance.cd.lowcolor)}
-  local normalcolor = {strsplit(",", C.appearance.cd.normalcolor)}
-  local minutecolor = {strsplit(",", C.appearance.cd.minutecolor)}
-  local hourcolor   = {strsplit(",", C.appearance.cd.hourcolor)}
-  local daycolor    = {strsplit(",", C.appearance.cd.daycolor)}
+  -- local lowcolor    = {strsplit(",", C.appearance.cd.lowcolor)}
+  -- local normalcolor = {strsplit(",", C.appearance.cd.normalcolor)}
+  -- local minutecolor = {strsplit(",", C.appearance.cd.minutecolor)}
+  -- local hourcolor   = {strsplit(",", C.appearance.cd.hourcolor)}
+  -- local daycolor    = {strsplit(",", C.appearance.cd.daycolor)}

  local parent, parent_name
  local function pfCooldownOnUpdate()
    parent = this:GetParent()
-    if not parent then this:Hide() end
+    if not parent then this:Hide() return end
    parent_name = parent:GetName()

    -- avoid to set cooldowns on invalid frames
@@ -123,8 +123,7 @@ pfUI:RegisterModule("easteregg", function ()
      local f = GetExplosion()
      f:ClearAllPoints()
      f:SetPoint("CENTER", fireworks, "TOPLEFT", x, y)
-      f:SetWidth(25)
-      f:SetHeight(25)
+      f:SetSize(25, 25)
      f.tex:SetTexture(1,1,1,.5)
      f:SetAlpha(1)
      f:Show()
@@ -134,8 +133,7 @@ pfUI:RegisterModule("easteregg", function ()
        local f = GetExplosion()
        f:ClearAllPoints()
        f:SetPoint("CENTER", fireworks, "TOPLEFT", x+(math.random(0,100)-50), y+(math.random(0,100)-50))
-        f:SetWidth(2)
-        f:SetHeight(2)
+        f:SetSize(2, 2)
        f.tex:SetTexture(math.random(),math.random(),math.random(),1)
        f:SetAlpha(1)
        f:Show()
@@ -2,7 +2,7 @@ local function getAdjustedTickTimer()
  local adjustedEnergyTick = 2

  -- Check rogue talents and compute energy tick timing reduction for Combat spec (1.18.0 Blade Rush Talent)
-  if UnitClass("player") == "Rogue" then
+  if UnitClassBase("player") == "ROGUE" then
    local _, _, _, _, currRank = GetTalentInfo(2, 16)
    local bladeRushRank = currRank or 0

@@ -1,11 +1,10 @@
 -- Equipment Manager module
-- Backport of the 4.3.4 GearManagerDialog UI on top of ClassicAPI's
-- C_EquipmentSet.* API. Adds a 6th tab to CharacterFrame.
+-- Backport of the 4.3.4 GearManagerDialog UI on top of ClassicAPI's C_EquipmentSet.* API.

 pfUI:RegisterModule("equipmentmanager", function()
  if not C_EquipmentSet or not C_EquipmentSet.CanUseEquipmentSets() then return end

-  pfUI.equipmentmanager = pfUI.equipmentmanager or {}
+  pfUI.equipmentmanager = {}

  local SET_ROW_HEIGHT = 36

@@ -14,6 +13,7 @@ pfUI:RegisterModule("equipmentmanager", function()
  local pendingAction = nil  -- "new" | "save" | "rename" — what the popups apply to
  local slotOverlays = {}    -- [invSlotID] = ignored-overlay texture on the character slot
  local popoutButtons = {}   -- popout arrow buttons; toggled with the EM frame
+  local UpdatePopouts        -- forward decl; assigned once popouts + flyout exist

  -- Pending ignored-slot toggles per set: a slotID here means the
  -- effective state is flipped from what's persisted. Committed on
@@ -55,7 +55,7 @@ pfUI:RegisterModule("equipmentmanager", function()
  local function EquipSet(setID)
    if not setID then return end
    if C_EquipmentSet.EquipmentSetContainsLockedItems(setID) then
-      UIErrorsFrame:AddMessage(ERR_CLIENT_LOCKED_OUT or "Locked items in set", 1, .1, .1, 1)
+      UIErrorsFrame:AddMessage(ERR_CLIENT_LOCKED_OUT, 1, .1, .1, 1)
      return
    end
    ClearCursor()
@@ -68,8 +68,7 @@ pfUI:RegisterModule("equipmentmanager", function()
  -- ============================================================

  local frame = CreateFrame("Frame", "pfEquipmentManagerFrame", CharacterFrame)
-  frame:SetWidth(220)
-  frame:SetHeight(350)
+  frame:SetSize(220, 350)
  frame:SetFrameStrata("HIGH")
  frame:SetScript("OnShow", function()
    this:ClearAllPoints()
@@ -78,7 +77,7 @@ pfUI:RegisterModule("equipmentmanager", function()
    else
      frame:SetPoint("TOPLEFT", CharacterFrame, "TOPRIGHT", 0, 0)
    end
-    for _, b in ipairs(popoutButtons) do b:Show() end
+    UpdatePopouts()
  end)
  CreateBackdrop(frame, nil, nil, .9)
  CreateBackdropShadow(frame)
@@ -86,7 +85,7 @@ pfUI:RegisterModule("equipmentmanager", function()

  frame.title = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
  frame.title:SetPoint("TOP", frame, "TOP", 0, -10)
-  frame.title:SetText(T["Equipment Manager"] or "Equipment Manager")
+  frame.title:SetText(EQUIPMENT_MANAGER)

  local closeBtn = CreateFrame("Button", nil, frame, "UIPanelCloseButton")
  closeBtn:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -4, -4)
@@ -98,15 +97,14 @@ pfUI:RegisterModule("equipmentmanager", function()
  -- ============================================================

  local toggleBtn = CreateFrame("Button", "pfEqMgrToggleButton", PaperDollFrame)
-  toggleBtn:SetWidth(28)
-  toggleBtn:SetHeight(28)
+  toggleBtn:SetSize(28, 28)
  toggleBtn:SetPoint("BOTTOM", CharacterHandsSlot, "TOP", 0, 4)
  toggleBtn:SetNormalTexture(pfUI.path.."\\img\\UI-GearManager-Button")
  toggleBtn:SetPushedTexture(pfUI.path.."\\img\\UI-GearManager-Button-Pushed")
  toggleBtn:SetHighlightTexture("Interface\\Buttons\\ButtonHilight-Square", "ADD")
  toggleBtn:SetScript("OnEnter", function()
    GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
-    GameTooltip:SetText(T["Equipment Manager"] or "Equipment Manager")
+    GameTooltip:SetText(PAPERDOLL_EQUIPMENTMANAGER)
    GameTooltip:Show()
  end)
  toggleBtn:SetScript("OnLeave", function() GameTooltip:Hide() end)
@@ -126,13 +124,13 @@ pfUI:RegisterModule("equipmentmanager", function()
  -- ============================================================

  local btnEquip = CreateFrame("Button", "pfEqMgrEquip", frame, "UIPanelButtonTemplate")
-  btnEquip:SetWidth(86); btnEquip:SetHeight(22); btnEquip:SetText(T["Equip"] or "Equip")
+  btnEquip:SetSize(86, 22); btnEquip:SetText(EQUIPSET_EQUIP)
  btnEquip:SetPoint("TOPLEFT", frame, "TOPLEFT", 16, -30)
  SkinButton(btnEquip)
  btnEquip:SetScript("OnClick", function() EquipSet(selectedSetID) end)

  local btnSave = CreateFrame("Button", "pfEqMgrSave", frame, "UIPanelButtonTemplate")
-  btnSave:SetWidth(86); btnSave:SetHeight(22); btnSave:SetText(T["Save"] or "Save")
+  btnSave:SetSize(86, 22); btnSave:SetText(SAVE)
  btnSave:SetPoint("LEFT", btnEquip, "RIGHT", 6, 0)
  SkinButton(btnSave)
  btnSave:SetScript("OnClick", function()
@@ -141,7 +139,7 @@ pfUI:RegisterModule("equipmentmanager", function()
    if not name then return end
    local targetID = selectedSetID
    StaticPopupDialogs["PFUI_EQMGR_SAVE_CONFIRM"] = {
-      text = string.format(T["Would you like to save the equipment set '%s'?"] or "Would you like to save the equipment set '%s'?", name),
+      text = string.format(CONFIRM_SAVE_EQUIPMENT_SET, name),
      button1 = YES, button2 = NO,
      OnAccept = function()
        C_EquipmentSet.ClearIgnoredSlotsForSave()
@@ -166,7 +164,7 @@ pfUI:RegisterModule("equipmentmanager", function()

  local rowMenu = CreateFrame("Frame", "pfEqMgrRowMenu", UIParent)
  rowMenu:SetFrameStrata("DIALOG")
-  rowMenu:SetWidth(140); rowMenu:SetHeight(50)
+  rowMenu:SetSize(140, 50);
  rowMenu:Hide()
  CreateBackdrop(rowMenu, nil, nil, .95)
  CreateBackdropShadow(rowMenu)
@@ -185,9 +183,9 @@ pfUI:RegisterModule("equipmentmanager", function()
  tinsert(UISpecialFrames, "pfEqMgrRowMenu")  -- Escape closes it

  rowMenu.changeBtn = CreateFrame("Button", nil, rowMenu, "UIPanelButtonTemplate")
-  rowMenu.changeBtn:SetWidth(130); rowMenu.changeBtn:SetHeight(20)
+  rowMenu.changeBtn:SetSize(130, 20);
  rowMenu.changeBtn:SetPoint("TOPLEFT", rowMenu, "TOPLEFT", 5, -3)
-  rowMenu.changeBtn:SetText(T["Change Name/Icon"] or "Change Name/Icon")
+  rowMenu.changeBtn:SetText(EQUIPMENT_SET_EDIT)
  SkinButton(rowMenu.changeBtn)
  rowMenu.changeBtn:SetScript("OnClick", function()
    rowMenu:Hide()
@@ -198,9 +196,9 @@ pfUI:RegisterModule("equipmentmanager", function()
  end)

  rowMenu.deleteBtn = CreateFrame("Button", nil, rowMenu, "UIPanelButtonTemplate")
-  rowMenu.deleteBtn:SetWidth(130); rowMenu.deleteBtn:SetHeight(20)
+  rowMenu.deleteBtn:SetSize(130, 20);
  rowMenu.deleteBtn:SetPoint("TOP", rowMenu.changeBtn, "BOTTOM", 0, -2)
-  rowMenu.deleteBtn:SetText(T["Delete"] or "Delete")
+  rowMenu.deleteBtn:SetText(DELETE)
  SkinButton(rowMenu.deleteBtn)
  rowMenu.deleteBtn:SetScript("OnClick", function()
    rowMenu:Hide()
@@ -208,7 +206,7 @@ pfUI:RegisterModule("equipmentmanager", function()
    local targetID = rowMenu.targetSetID
    local name = C_EquipmentSet.GetEquipmentSetInfo(targetID)
    StaticPopupDialogs["PFUI_EQMGR_DELETE"] = {
-      text = string.format(T["Delete equipment set '%s'?"] or "Delete equipment set '%s'?", name or "?"),
+      text = string.format(CONFIRM_DELETE_EQUIPMENT_SET, name or "?"),
      button1 = YES, button2 = NO,
      OnAccept = function()
        pendingIgnoredToggles[targetID] = nil
@@ -229,9 +227,8 @@ pfUI:RegisterModule("equipmentmanager", function()
  local LIST_ROW_STRIDE = SET_ROW_HEIGHT + 2
  local listFrame = CreateFrame("Frame", nil, frame)
  listFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 16, -58)
-  listFrame:SetWidth(180)
  -- Height fits N rows + (N-1) inter-row gaps + 3px top/bottom padding.
-  listFrame:SetHeight(LIST_VISIBLE_ROWS * LIST_ROW_STRIDE + 4)
+  listFrame:SetSize(180, LIST_VISIBLE_ROWS * LIST_ROW_STRIDE + 4)
  CreateBackdrop(listFrame, nil, nil, .75)

  -- Mouse-wheel scroll: list of [sets..., newSetRow] is virtualized
@@ -247,15 +244,13 @@ pfUI:RegisterModule("equipmentmanager", function()
  local setRows = {}
  local function CreateSetRow()
    local row = CreateFrame("Button", nil, listFrame)
-    row:SetWidth(170)
-    row:SetHeight(SET_ROW_HEIGHT)
+    row:SetSize(170, SET_ROW_HEIGHT)
    -- Position is set per-Refresh based on the row's visible slot;
    -- start anchored to avoid uninitialized geometry before first Refresh.
    row:SetPoint("TOPLEFT", listFrame, "TOPLEFT", 5, -3)

    row.icon = row:CreateTexture(nil, "ARTWORK")
-    row.icon:SetWidth(30)
-    row.icon:SetHeight(30)
+    row.icon:SetSize(30, 30)
    row.icon:SetPoint("LEFT", row, "LEFT", 2, 0)
    row.icon:SetTexCoord(.08, .92, .08, .92)

@@ -270,7 +265,7 @@ pfUI:RegisterModule("equipmentmanager", function()
    row.highlight:Hide()

    row.gear = CreateFrame("Button", nil, row)
-    row.gear:SetWidth(16); row.gear:SetHeight(16)
+    row.gear:SetSize(16, 16);
    row.gear:SetPoint("RIGHT", row, "RIGHT", -4, 0)
    row.gear.tex = row.gear:CreateTexture(nil, "ARTWORK")
    row.gear.tex:SetAllPoints(row.gear)
@@ -306,27 +301,27 @@ pfUI:RegisterModule("equipmentmanager", function()
      pfUI.equipmentmanager.Refresh()
    end)

-    -- Hover handling: OnLeave fires when the cursor moves onto a child
-    -- (the gear button becomes the topmost mouse target). Use an
-    -- OnUpdate poll so the gear stays shown while the cursor is over
-    -- the row OR the gear itself.
+    -- Show the gear and tooltip while the cursor is over the row or its
+    -- gear child. The gear sits inside the row's rectangle, so a single
+    -- MouseIsOver(row) check covers both. OnLeave on the row and the gear
+    -- catches every exit path, so no OnUpdate poll is needed.
+    local function HideRowHover()
+      if MouseIsOver(row) then return end
+      GameTooltip:Hide()
+      row.gear:Hide()
+    end
    row:SetScript("OnEnter", function()
-      if not this.setID then return end
-      local name = C_EquipmentSet.GetEquipmentSetInfo(this.setID)
+      if not row.setID then return end
+      local name = C_EquipmentSet.GetEquipmentSetInfo(row.setID)
      if name then
-        GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+        GameTooltip:SetOwner(row, "ANCHOR_RIGHT")
        GameTooltip:SetEquipmentSet(name)
        GameTooltip:Show()
      end
      row.gear:Show()
-      this:SetScript("OnUpdate", function()
-        if not MouseIsOver(this) and not MouseIsOver(row.gear) then
-          this:SetScript("OnUpdate", nil)
-          GameTooltip:Hide()
-          row.gear:Hide()
-        end
-      end)
    end)
+    row:SetScript("OnLeave", HideRowHover)
+    row.gear:SetScript("OnLeave", HideRowHover)

    return row
  end
@@ -338,10 +333,10 @@ pfUI:RegisterModule("equipmentmanager", function()
  -- specific set index (row[i] always shows ids[i]).

  local newSetRow = CreateFrame("Button", nil, listFrame)
-  newSetRow:SetWidth(170); newSetRow:SetHeight(SET_ROW_HEIGHT)
+  newSetRow:SetSize(170, SET_ROW_HEIGHT);

  newSetRow.icon = newSetRow:CreateTexture(nil, "ARTWORK")
-  newSetRow.icon:SetWidth(24); newSetRow.icon:SetHeight(24)
+  newSetRow.icon:SetSize(24, 24);
  newSetRow.icon:SetPoint("LEFT", newSetRow, "LEFT", 5, 0)
  newSetRow.icon:SetTexture(pfUI.path.."\\img\\Character-Plus")

@@ -349,7 +344,7 @@ pfUI:RegisterModule("equipmentmanager", function()
  newSetRow.text:SetPoint("LEFT", newSetRow.icon, "RIGHT", 8, 0)
  newSetRow.text:SetPoint("RIGHT", newSetRow, "RIGHT", -4, 0)
  newSetRow.text:SetJustifyH("LEFT")
-  newSetRow.text:SetText(T["New Set"] or "New Set")
+  newSetRow.text:SetText(PAPERDOLL_NEWEQUIPMENTSET)
  newSetRow.text:SetTextColor(0.2, 1, 0.2)

  newSetRow.highlight = newSetRow:CreateTexture(nil, "BACKGROUND")
@@ -362,8 +357,7 @@ pfUI:RegisterModule("equipmentmanager", function()

  local function MakeButton(name, label, parent, anchor, ax, ay, width)
    local b = CreateFrame("Button", name, parent, "UIPanelButtonTemplate")
-    b:SetWidth(width or 70)
-    b:SetHeight(22)
+    b:SetSize(width or 70, 22)
    b:SetText(label)
    b:SetPoint("TOPLEFT", anchor, "BOTTOMLEFT", ax, ay)
    SkinButton(b)
@@ -376,8 +370,7 @@ pfUI:RegisterModule("equipmentmanager", function()

  local namePopup = CreateFrame("Frame", "pfEqMgrNamePopup", UIParent)
  namePopup:SetFrameStrata("DIALOG")
-  namePopup:SetWidth(472)
-  namePopup:SetHeight(498)
+  namePopup:SetSize(472, 484)
  namePopup:SetPoint("CENTER", UIParent, "CENTER")
  namePopup:Hide()
  CreateBackdrop(namePopup, nil, nil, .9)
@@ -388,200 +381,28 @@ pfUI:RegisterModule("equipmentmanager", function()
  namePopup:SetScript("OnDragStart", function() this:StartMoving() end)
  namePopup:SetScript("OnDragStop", function() this:StopMovingOrSizing() end)

-  namePopup.title = namePopup:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-  namePopup.title:SetPoint("TOP", namePopup, "TOP", 0, -10)
-  namePopup.title:SetText(T["Save Set"] or "Save Set")
+  -- Equipment seed leads the grid with gear-relevant item icons. The widget
+  -- owns the name field, preview, grid, filter, and search; this module keeps
+  -- the OK/Cancel buttons and the create/save/rename flow below.
+  local iconPicker = CreateIconPicker("pfEqMgrIcon", namePopup,
+                                      IconDataProviderExtraType.Equipment, GEARSETS_POPUP_TEXT)

-  namePopup.nameLabel = namePopup:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-  namePopup.nameLabel:SetPoint("TOPLEFT", namePopup, "TOPLEFT", 14, -34)
-  namePopup.nameLabel:SetText(T["Enter Set Name (Max 16 Characters):"] or "Enter Set Name (Max 16 Characters):")
+  local btnPopupOK = MakeButton("pfEqMgrPopupOK", OKAY, namePopup, namePopup, 14, -340, 80)

-  namePopup.editbox = CreateFrame("EditBox", "pfEqMgrNameEdit", namePopup, "InputBoxTemplate")
-  namePopup.editbox:SetWidth(280)
-  namePopup.editbox:SetHeight(20)
-  namePopup.editbox:SetPoint("TOPLEFT", namePopup, "TOPLEFT", 14, -52)
-  namePopup.editbox:SetAutoFocus(false)
-  namePopup.editbox:SetMaxLetters(16)
-  CreateBackdrop(namePopup.editbox)
-
-  namePopup.selectedLabel = namePopup:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-  namePopup.selectedLabel:SetPoint("TOPRIGHT", namePopup, "TOPRIGHT", -14, -28)
-  namePopup.selectedLabel:SetText(T["Currently Selected"] or "Currently Selected")
-  namePopup.selectedLabel:SetTextColor(1, 0.82, 0)
-
-  namePopup.selectedPreview = CreateFrame("Frame", nil, namePopup)
-  namePopup.selectedPreview:SetWidth(42)
-  namePopup.selectedPreview:SetHeight(42)
-  namePopup.selectedPreview:SetPoint("TOPRIGHT", namePopup, "TOPRIGHT", -14, -44)
-  CreateBackdrop(namePopup.selectedPreview)
-  namePopup.selectedPreview.tex = namePopup.selectedPreview:CreateTexture(nil, "ARTWORK")
-  namePopup.selectedPreview.tex:SetAllPoints(namePopup.selectedPreview)
-  namePopup.selectedPreview.tex:SetTexCoord(.08, .92, .08, .92)
-
-  namePopup.iconLabel = namePopup:CreateFontString(nil, "OVERLAY", "GameFontNormal")
-  namePopup.iconLabel:SetPoint("TOPLEFT", namePopup, "TOPLEFT", 14, -100)
-  namePopup.iconLabel:SetText(T["Choose an Icon:"] or "Choose an Icon:")
-
-  -- Icon picker: 10×8 grid of buttons + scroll
-  local ICON_GRID_COLS = 10
-  local ICON_GRID_ROWS = 8
-  local ICON_BTN_SIZE = 36
-  local ICON_BTN_PAD = 6
-
-  local iconScroll = CreateFrame("ScrollFrame", "pfEqMgrIconScroll", namePopup, "FauxScrollFrameTemplate")
-  iconScroll:SetPoint("TOPLEFT", namePopup, "TOPLEFT", 14, -130)
-  iconScroll:SetWidth(ICON_GRID_COLS * (ICON_BTN_SIZE + ICON_BTN_PAD) - ICON_BTN_PAD)
-  iconScroll:SetHeight(ICON_GRID_ROWS * (ICON_BTN_SIZE + ICON_BTN_PAD) - ICON_BTN_PAD)
-
-  -- IconDataProviderMixin owns the icon DB, dedup, and lazy load.
-  -- Init on first picker open; release on hide so the cache GCs.
-  local provider = nil
-  -- Selection is tracked by PATH (not index) so it survives filter
-  -- changes: a spell icon you picked still saves correctly even after
-  -- you switch the filter to "Items" and it's no longer in the visible list.
-  local QUESTION_MARK = "INTERFACE\\ICONS\\INV_MISC_QUESTIONMARK"
-  local selectedIconPath = QUESTION_MARK
-
-  local function EnsureProvider()
-    if not provider then
-      provider = CreateAndInitFromMixin(IconDataProviderMixin,
-                                         IconDataProviderExtraType.Equipment)
-    end
-  end
-
-  -- Anchor scrollbar to iconScroll's right edge so its position tracks
-  -- the icon grid rather than the popup. -16/+16 vertical insets are the
-  -- standard up/down arrow spacing for UIPanelScrollBarTemplate.
-  local scrollbar = _G["pfEqMgrIconScrollScrollBar"]
-  if scrollbar then
-    scrollbar:ClearAllPoints()
-    scrollbar:SetPoint("TOPLEFT", iconScroll, "TOPRIGHT", 8, -16)
-    scrollbar:SetPoint("BOTTOMLEFT", iconScroll, "BOTTOMRIGHT", 8, 16)
-    SkinScrollbar(scrollbar)
-  end
-
-  -- Filter dropdown: "All Icons" / "Spells" / "Items" (top right of icon area).
-  local filterDropdown = CreateFrame("Frame", "pfEqMgrIconFilter", namePopup, "UIDropDownMenuTemplate")
-  filterDropdown:SetPoint("TOPRIGHT", namePopup, "TOPRIGHT", 0, -94)
-  local currentFilter = "all"
-  local function ApplyFilter(value)
-    currentFilter = value
-    UIDropDownMenu_SetSelectedValue(filterDropdown, value)
-    if provider then
-      if value == "spells" then provider:SetIconTypes({ IconDataProviderIconType.Spell })
-      elseif value == "items" then provider:SetIconTypes({ IconDataProviderIconType.Item })
-      else provider:SetIconTypes(nil) end
-      -- Don't reset selection — selectedIconPath persists. If the
-      -- selected icon isn't in the new filter, no grid entry will be
-      -- highlighted but Save will still write the chosen icon.
-      pfUI.equipmentmanager.RefreshIconGrid()
-    end
-  end
-  UIDropDownMenu_Initialize(filterDropdown, function()
-    local info
-    info = {}; info.text = T["All Icons"] or "All Icons"; info.value = "all"
-    info.func = function() ApplyFilter("all") end
-    info.checked = currentFilter == "all"
-    UIDropDownMenu_AddButton(info)
-    info = {}; info.text = T["Spells"] or "Spells"; info.value = "spells"
-    info.func = function() ApplyFilter("spells") end
-    info.checked = currentFilter == "spells"
-    UIDropDownMenu_AddButton(info)
-    info = {}; info.text = T["Items"] or "Items"; info.value = "items"
-    info.func = function() ApplyFilter("items") end
-    info.checked = currentFilter == "items"
-    UIDropDownMenu_AddButton(info)
-  end)
-  UIDropDownMenu_SetWidth(120, filterDropdown)
-  UIDropDownMenu_SetSelectedValue(filterDropdown, "all")
-  SkinDropDown(filterDropdown)
-
-  local iconButtons = {}
-  for r = 1, ICON_GRID_ROWS do
-    for c = 1, ICON_GRID_COLS do
-      local i = (r - 1) * ICON_GRID_COLS + c
-      local btn = CreateFrame("Button", nil, namePopup)
-      btn:SetWidth(ICON_BTN_SIZE)
-      btn:SetHeight(ICON_BTN_SIZE)
-      btn:SetPoint("TOPLEFT", iconScroll, "TOPLEFT", (c-1) * (ICON_BTN_SIZE + ICON_BTN_PAD), -(r-1) * (ICON_BTN_SIZE + ICON_BTN_PAD))
-      CreateBackdrop(btn)
-      btn.texture = btn:CreateTexture(nil, "ARTWORK")
-      btn.texture:SetAllPoints(btn)
-      btn.texture:SetTexCoord(.08, .92, .08, .92)
-      btn.gridIndex = i
-      btn:SetScript("OnClick", function()
-        if this.iconIndex and provider then
-          local path = provider:GetIconByIndex(this.iconIndex)
-          if path then selectedIconPath = path end
-          pfUI.equipmentmanager.RefreshIconGrid()
-        end
-      end)
-      btn:SetScript("OnEnter", function()
-        if not this.iconIndex or not provider then return end
-        local path = provider:GetIconByIndex(this.iconIndex)
-        if type(path) == "string" then
-          local name = string.gsub(path, "^.-INTERFACE\\\\ICONS\\\\", "")
-          GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
-          GameTooltip:SetText(name)
-          GameTooltip:Show()
-        end
-      end)
-      btn:SetScript("OnLeave", GameTooltip_Hide)
-      iconButtons[i] = btn
-    end
-  end
-
-  function pfUI.equipmentmanager.RefreshIconGrid()
-    EnsureProvider()
-    local numIcons = provider:GetNumIcons()
-    local numRows = math.ceil(numIcons / ICON_GRID_COLS)
-    FauxScrollFrame_Update(iconScroll, numRows, ICON_GRID_ROWS, ICON_BTN_SIZE + ICON_BTN_PAD)
-    local offset = FauxScrollFrame_GetOffset(iconScroll)
-    for i = 1, ICON_GRID_ROWS * ICON_GRID_COLS do
-      local listIdx = i + offset * ICON_GRID_COLS
-      local btn = iconButtons[i]
-      if listIdx <= numIcons then
-        btn:Show()
-        btn.iconIndex = listIdx
-        local path = provider:GetIconByIndex(listIdx)
-        btn.texture:SetTexture(path)
-        if path == selectedIconPath then
-          btn.backdrop:SetBackdropBorderColor(1, 0.82, 0, 1)
-        else
-          btn.backdrop:SetBackdropBorderColor(pfUI.cache.er, pfUI.cache.eg, pfUI.cache.eb, pfUI.cache.ea)
-        end
-      else
-        btn:Hide()
-        btn.iconIndex = nil
-      end
-    end
-    -- Sync the "Currently Selected" preview from the path directly so it
-    -- still shows the chosen icon when filtered out of the grid.
-    namePopup.selectedPreview.tex:SetTexture(selectedIconPath)
-  end
-
-  iconScroll:SetScript("OnVerticalScroll", function()
-    FauxScrollFrame_OnVerticalScroll(ICON_BTN_SIZE + ICON_BTN_PAD, function() pfUI.equipmentmanager.RefreshIconGrid() end)
-  end)
-
-  namePopup:SetScript("OnHide", function()
-    if provider then provider:Release(); provider = nil end
-  end)
-
-  local btnPopupOK = MakeButton("pfEqMgrPopupOK", T["OK"] or "OK", namePopup, namePopup, 14, -340, 80)
-  btnPopupOK:ClearAllPoints()
-  btnPopupOK:SetPoint("BOTTOMLEFT", namePopup, "BOTTOMLEFT", 14, 12)
-
-  local btnPopupCancel = MakeButton("pfEqMgrPopupCancel", T["Cancel"] or "Cancel", namePopup, namePopup, 0, 0, 80)
+  local btnPopupCancel = MakeButton("pfEqMgrPopupCancel", CANCEL, namePopup, namePopup, 0, 0, 80)
  btnPopupCancel:ClearAllPoints()
  btnPopupCancel:SetPoint("BOTTOMRIGHT", namePopup, "BOTTOMRIGHT", -14, 12)
  btnPopupCancel:SetScript("OnClick", function() namePopup:Hide() end)

+  -- Okay | Cancel, both anchored to the bottom-right corner.
+  btnPopupOK:ClearAllPoints()
+  btnPopupOK:SetPoint("BOTTOMRIGHT", btnPopupCancel, "BOTTOMLEFT", -6, 0)
+
  btnPopupOK:SetScript("OnClick", function()
    local name = namePopup.editbox:GetText()
    if not name or name == "" then return end
    -- Strip the prefix to match ClassicAPI's persisted short-form basenames.
-    local iconForSave = string.gsub(selectedIconPath, "INTERFACE\\ICONS\\", "")
+    local iconForSave = string.gsub(iconPicker.GetIcon(), "INTERFACE\\ICONS\\", "")
    if pendingAction == "new" then
      C_EquipmentSet.CreateEquipmentSet(name, iconForSave)
      C_EquipmentSet.ClearIgnoredSlotsForSave()
@@ -610,31 +431,20 @@ pfUI:RegisterModule("equipmentmanager", function()
  function OpenNamePopup(action, prefillName, prefillIcon)
    pendingAction = action
    namePopup.editbox:SetText(prefillName or "")
-    EnsureProvider()
    if prefillIcon then
-      local short = string.gsub(prefillIcon, "INTERFACE\\ICONS\\", "")
-      selectedIconPath = "INTERFACE\\ICONS\\" .. strupper(short)
+      -- Stored icons come back either as a full path or a bare basename
+      -- (see the row rendering in Refresh). Only prepend the prefix when
+      -- there's no path separator, so a full path isn't double-prefixed.
+      iconPicker.SetIcon(string.find(prefillIcon, "\\") and prefillIcon
+                         or ("INTERFACE\\ICONS\\" .. prefillIcon))
    else
-      selectedIconPath = QUESTION_MARK
-    end
-    if action == "rename" then
-      namePopup.title:SetText(T["Rename Set"] or "Rename Set")
-      iconScroll:Hide()
-      for _, b in ipairs(iconButtons) do b:Hide() end
-      namePopup.iconLabel:Hide()
-      namePopup.selectedLabel:Hide()
-      namePopup.selectedPreview:Hide()
-      filterDropdown:Hide()
-    else
-      namePopup.title:SetText(action == "new" and (T["Name Set"] or "Name Set") or (T["Save Set"] or "Save Set"))
-      iconScroll:Show()
-      namePopup.iconLabel:Show()
-      namePopup.selectedLabel:Show()
-      namePopup.selectedPreview:Show()
-      filterDropdown:Show()
+      iconPicker.SetIcon(nil)
    end
+    namePopup.search:SetText("")
+    -- Rename only changes the name, so hide the whole icon-picking area.
+    iconPicker.SetIconAreaShown(action ~= "rename")
    namePopup:Show()
-    if action ~= "rename" then pfUI.equipmentmanager.RefreshIconGrid() end
+    if action ~= "rename" then iconPicker.Refresh() end
    namePopup.editbox:SetFocus()
  end

@@ -643,9 +453,13 @@ pfUI:RegisterModule("equipmentmanager", function()
  -- ============================================================

  local flyout = CreateFrame("Frame", "pfEqMgrFlyout", UIParent)
+  -- The name/icon popup is sidecar-only, so it closes with the sidecar.
+  -- Popout arrows and the flyout are reconciled by UpdatePopouts: by
+  -- default they follow the sidecar, but with the "Always Show Equipment
+  -- Slot Flyouts" option they stay while the paperdoll is open.
  frame:SetScript("OnHide", function()
-    for _, b in ipairs(popoutButtons) do b:Hide() end
-    flyout:Hide()
+    namePopup:Hide()
+    UpdatePopouts()
  end)
  flyout:SetFrameStrata("DIALOG")
  flyout:Hide()
@@ -676,7 +490,7 @@ pfUI:RegisterModule("equipmentmanager", function()
      end
    end
    ClearCursor()
-    UIErrorsFrame:AddMessage(EQUIPMENT_MANAGER_BAGS_FULL or "Your bags are full.", 1, .1, .1, 1)
+    UIErrorsFrame:AddMessage(ERR_EQUIPMENT_MANAGER_BAGS_FULL, 1, .1, .1, 1)
  end

  local function MakeFlyoutButton(i)
@@ -692,11 +506,11 @@ pfUI:RegisterModule("equipmentmanager", function()
    b:SetScript("OnEnter", function()
      GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
      if this.specialAction == "placeInBags" then
-        GameTooltip:SetText(EQUIPMENT_MANAGER_PLACE_IN_BAGS or "Place in Bags", 1, 1, 1)
+        GameTooltip:SetText(EQUIPMENT_MANAGER_PLACE_IN_BAGS, 1, 1, 1)
      elseif this.specialAction == "ignore" then
-        GameTooltip:SetText(EQUIPMENT_MANAGER_IGNORE_SLOT or "Ignore this slot", 1, 1, 1)
+        GameTooltip:SetText(EQUIPMENT_MANAGER_IGNORE_SLOT, 1, 1, 1)
      elseif this.specialAction == "unignore" then
-        GameTooltip:SetText(EQUIPMENT_MANAGER_UNIGNORE_SLOT or "Stop ignoring this slot", 1, 1, 1)
+        GameTooltip:SetText(EQUIPMENT_MANAGER_UNIGNORE_SLOT, 1, 1, 1)
      elseif this.bag then
        GameTooltip:SetBagItem(this.bag, this.slot)
      elseif this.invSlot then
@@ -704,7 +518,7 @@ pfUI:RegisterModule("equipmentmanager", function()
      end
      GameTooltip:Show()
    end)
-    b:SetScript("OnLeave", function() GameTooltip:Hide() end)
+    b:SetScript("OnLeave", GameTooltip_Hide)
    b:SetScript("OnClick", function()
      if this.specialAction == "placeInBags" then
        UnequipToBags(flyout.targetInvSlot)
@@ -809,7 +623,6 @@ pfUI:RegisterModule("equipmentmanager", function()

    if num == 0 then
      flyout:Hide()
-      UIErrorsFrame:AddMessage(T["No matching items in bags"] or "No matching items in bags", 1, 1, 0, 1)
      return
    end

@@ -938,15 +751,26 @@ pfUI:RegisterModule("equipmentmanager", function()
    end
  end

-  -- Tie popout visibility to the EM sidecar. They appear when the
-  -- sidecar opens, hide when it closes, and the flyout closes too.
-  frame:HookScript("OnShow", function()
-    for _, b in ipairs(popoutButtons) do b:Show() end
-  end)
-  frame:HookScript("OnHide", function()
-    for _, b in ipairs(popoutButtons) do b:Hide() end
-    if flyout then flyout:Hide() end
-  end)
+  -- Popout arrows follow the EM sidecar by default. With the
+  -- "Always Show Equipment Slot Flyouts" option they follow the paperdoll
+  -- instead, so gear can be swapped without opening the equipment manager.
+  local function PopoutsActive()
+    if C.character.inventory.equipflyout == "1" then
+      return PaperDollFrame:IsShown()
+    end
+    return frame:IsShown()
+  end
+
+  function UpdatePopouts()
+    local show = PopoutsActive()
+    for _, b in ipairs(popoutButtons) do
+      if show then b:Show() else b:Hide() end
+    end
+    if not show then flyout:Hide() end
+  end
+
+  PaperDollFrame:HookScript("OnShow", UpdatePopouts)
+  PaperDollFrame:HookScript("OnHide", UpdatePopouts)

  -- ============================================================
  -- Refresh
@@ -41,8 +41,9 @@ pfUI:RegisterModule("farmmode", function ()
  pfUI.farmmap:RegisterForDrag("LeftButton")
  pfUI.farmmap:SetScript("OnMouseWheel", function()
    if IsControlKeyDown() then
-      this:SetWidth(this:GetWidth() + (arg1 > 0 and 10 or -10))
-      this:SetHeight(this:GetHeight() + (arg1 > 0 and 10 or -10))
+      local adjust = (arg1 > 0 and 10 or -10)
+      local width, height = this:GetSize()
+      this:SetSize(width + adjust, height + adjust)
      Minimap_ZoomIn()
      Minimap_ZoomOut()
    elseif IsShiftKeyDown() then
@@ -135,7 +136,7 @@ pfUI:RegisterModule("farmmode", function ()
    pfUI.farmmap.button.txt = pfUI.farmmap.button:CreateFontString("pfFarmMapText", "LOW", "GameFontWhite")
    pfUI.farmmap.button.txt:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
    pfUI.farmmap.button.txt:SetPoint("CENTER", 0, 0)
-    pfUI.farmmap.button.txt:SetText("|cff33ffcc FARM MODE")
+    pfUI.farmmap.button.txt:SetText("|cff33ffcc " .. T["FARM MODE"])
  end

  CreateBackdrop(pfUI.farmmap)
@@ -263,7 +263,7 @@ pfUI:RegisterModule("firstrun", function ()
    SkinCheckbox(f.checkbox, 18)

    f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
      pfUI.chat.SetupRightChat(f.checkbox:GetChecked())
    end

@@ -283,7 +283,7 @@ pfUI:RegisterModule("firstrun", function ()
    SkinCheckbox(f.checkbox, 18)

    f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
      if f.checkbox:GetChecked() then
        pfUI.chat.SetupPositions()
      end
@@ -305,7 +305,7 @@ pfUI:RegisterModule("firstrun", function ()
    SkinCheckbox(f.checkbox, 18)

    f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
      if f.checkbox:GetChecked() then
        pfUI.chat.SetupChannels()
      end
@@ -0,0 +1,93 @@
+-- Friend notes
+-- Client-side notes for friends via ClassicAPI's C_FriendList note API
+-- (SetFriendNotes / GetFriendInfo(.notes)). Adds an "Edit Note" entry to the
+-- friend right-click menu (the "FRIEND" UnitPopup) and shows the note in a
+-- tooltip when you hover a friend in the list.
+pfUI:RegisterModule("friendnotes", function ()
+  local EDIT_TOKEN = "PFUI_FRIEND_NOTE"
+
+  -- Note editor. In 1.12 StaticPopup, OnAccept runs with `this` = the OK
+  -- button (the dialog is this:GetParent()); the friend name arrives as the
+  -- data argument passed to StaticPopup_Show.
+  StaticPopupDialogs["PFUI_FRIEND_NOTE_EDIT"] = {
+    text = SET_FRIENDNOTE_LABEL,
+    button1 = SAVE,
+    button2 = CANCEL,
+    hasEditBox = 1,
+    maxLetters = 128,
+    OnAccept = function(name)
+      C_FriendList.SetFriendNotes(name, _G[this:GetParent():GetName().."EditBox"]:GetText())
+    end,
+    EditBoxOnEnterPressed = function(name)
+      C_FriendList.SetFriendNotes(name, this:GetText())
+      this:GetParent():Hide()
+    end,
+    EditBoxOnEscapePressed = function() this:GetParent():Hide() end,
+    timeout = 0, whileDead = 1, hideOnEscape = 1,
+  }
+
+  local function OpenNoteEditor(name)
+    if not name or name == "" then return end
+    local info = C_FriendList.GetFriendInfo(name)
+    local dialog = StaticPopup_Show("PFUI_FRIEND_NOTE_EDIT", name, nil, name)
+    if not dialog then return end
+    local editbox = _G[dialog:GetName().."EditBox"]
+    editbox:SetText((info and info.notes) or "")
+    editbox:HighlightText()
+    editbox:SetFocus()
+  end
+
+  -- Add "Edit Note" to the friend right-click menu, just before Cancel.
+  UnitPopupButtons[EDIT_TOKEN] = { text = SET_NOTE, dist = 0 }
+  local friendMenu = UnitPopupMenus["FRIEND"]
+  table.insert(friendMenu, table.getn(friendMenu), EDIT_TOKEN)
+
+  UnitPopupMenus["PFUI_FRIENDNOTE"] = { EDIT_TOKEN, "CANCEL" }
+  local function OfflineNoteDropDown_Initialize()
+    UnitPopup_ShowMenu(_G[UIDROPDOWNMENU_OPEN_MENU], "PFUI_FRIENDNOTE", nil, FriendsDropDown.name)
+  end
+  local FriendsFrame_ShowDropdown_orig = FriendsFrame_ShowDropdown
+  _G.FriendsFrame_ShowDropdown = function(name, connected)
+    if connected then return FriendsFrame_ShowDropdown_orig(name, connected) end
+    HideDropDownMenu(1)
+    FriendsDropDown.initialize = OfflineNoteDropDown_Initialize
+    FriendsDropDown.displayMode = "MENU"
+    FriendsDropDown.name = name
+    ToggleDropDownMenu(1, nil, FriendsDropDown, "cursor")
+  end
+
+  -- Route our entry to the editor and close the menu; delegate the rest. A
+  -- bare assignment lands on pfUI.env, so set the global explicitly.
+  local UnitPopup_OnClick_orig = UnitPopup_OnClick
+  _G.UnitPopup_OnClick = function()
+    if this and this.value == EDIT_TOKEN then
+      local dropdown = _G[UIDROPDOWNMENU_INIT_MENU]
+      local name = dropdown and dropdown.name
+      CloseDropDownMenus()
+      OpenNoteEditor(name)
+      return
+    end
+    return UnitPopup_OnClick_orig()
+  end
+
+  -- Show the note in a tooltip while hovering a friend in the list. Friend
+  -- buttons carry their friend index via SetID (see FriendsFrame_Update).
+  local function FriendButton_OnEnter()
+    local index = this:GetID()
+    if not index or index < 1 then return end
+    local info = C_FriendList.GetFriendInfoByIndex(index)
+    if not info or not info.notes or info.notes == "" then return end
+    GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+    GameTooltip:SetText(info.name or "")
+    GameTooltip:AddLine(info.notes, 1, 1, 1, 1)
+    GameTooltip:Show()
+  end
+
+  for i = 1, FRIENDS_TO_DISPLAY do
+    local button = _G["FriendsFrameFriendButton"..i]
+    if button then
+      button:HookScript("OnEnter", FriendButton_OnEnter)
+      button:HookScript("OnLeave", GameTooltip_Hide)
+    end
+  end
+end)
@@ -2240,7 +2240,6 @@ pfUI:RegisterModule("gui", function ()

        -- build config entries
        CreateConfig(U[c], T["Display Frame"] .. ": " .. t, C.unitframes[c], "visible", "checkbox")
-        CreateConfig(U[c], T["Enable Mouseover Tooltip"], C.unitframes[c], "showtooltip", "checkbox")
        CreateConfig(U[c], T["Default Transparency"], C.unitframes[c], "alpha_visible", "dropdown", pfUI.gui.dropdowns.percent_small)
        CreateConfig(U[c], T["Out Of Range Transparency"], C.unitframes[c], "alpha_outrange", "dropdown", pfUI.gui.dropdowns.percent_small)
        CreateConfig(U[c], T["Offline Transparency"], C.unitframes[c], "alpha_offline", "dropdown", pfUI.gui.dropdowns.percent_small)
@@ -2412,6 +2411,7 @@ pfUI:RegisterModule("gui", function ()

    CreateGUIEntry(T["Character"], T["Inventory"], function()
      CreateConfig(nil, T["Show Durability"], C.character.inventory, "durability", "checkbox")
+      CreateConfig(nil, T["Always Show Equipment Slot Flyouts"], C.character.inventory, "equipflyout", "checkbox")
    end)

    CreateGUIEntry(T["Character"], T["Reputation"], function()
@@ -2763,21 +2763,32 @@ pfUI:RegisterModule("gui", function ()
    end)

    CreateGUIEntry(T["Tooltip"], nil, function()
+      CreateConfig(nil, T["General"], nil, nil, "header")
      CreateConfig(nil, T["Tooltip Position"], C.tooltip, "position", "dropdown", pfUI.gui.dropdowns.tooltip_position)
      CreateConfig(nil, T["Tooltip Text Font"], C.tooltip, "font_tooltip", "dropdown", pfUI.gui.dropdowns.fonts)
      CreateConfig(nil, T["Tooltip Text Font Size"], C.tooltip, "font_tooltip_size")
      CreateConfig(nil, T["Cursor Tooltip Align"], C.tooltip, "cursoralign", "dropdown", pfUI.gui.dropdowns.tooltip_align)
      CreateConfig(nil, T["Cursor Tooltip Offset"], C.tooltip, "cursoroffset")
-      CreateConfig(nil, T["Enable Extended Guild Information"], C.tooltip, "extguild", "checkbox")
-      CreateConfig(nil, T["Always Show Health In Percent"], C.tooltip, "alwaysperc", "checkbox")
-      CreateConfig(nil, T["Show Item IDs"], C.tooltip, "itemid", "checkbox")
-      CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
      CreateConfig(nil, T["Custom Transparency"], C.tooltip, "alpha")
      CreateConfig(nil, T["Status Bar Texture"], C.tooltip.statusbar, "texture", "dropdown", pfUI.gui.dropdowns.uf_bartexture)
+
+      CreateConfig(nil, T["Items"], nil, nil, "header")
      CreateConfig(nil, T["Always Show Item Comparison"], C.tooltip.compare, "showalways", "checkbox")
      CreateConfig(nil, T["Always Show Extended Vendor Values"], C.tooltip.vendor, "showalways", "checkbox")
      CreateConfig(U["questitem"], T["Show Related Quest On Questitems"], C.tooltip.questitem, "showquest", "checkbox")
      CreateConfig(U["questitem"], T["Show Required Questitem Count"], C.tooltip.questitem, "showcount", "checkbox")
+      CreateConfig(nil, T["Show Item IDs"], C.tooltip, "itemid", "checkbox")
+
+      CreateConfig(nil, T["Spells"], nil, nil, "header")
+      CreateConfig(nil, T["Show Aura Caster"], C.tooltip, "aurasource", "checkbox")
+      CreateConfig(nil, T["Show Spell IDs"], C.tooltip, "spellid", "checkbox")
+
+      CreateConfig(nil, T["Units"], nil, nil, "header")
+      CreateConfig(nil, T["Enable Extended Guild Information"], C.tooltip, "extguild", "checkbox")
+      CreateConfig(nil, T["Always Show Health In Percent"], C.tooltip, "alwaysperc", "checkbox")
+      CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
+      CreateConfig(nil, T["Show Unit Buffs"], C.tooltip, "showbuffs", "checkbox")
+      CreateConfig(nil, T["Show Unit IDs"], C.tooltip, "unitid", "checkbox")
    end)

    CreateGUIEntry(T["Castbar"], T["General"], function()
@@ -2988,6 +2999,7 @@ pfUI:RegisterModule("gui", function ()
      CreateConfig(nil, T["Use Chat Colors for Meters"], C.thirdparty, "chatbg", "checkbox")
      CreateConfig(nil, "ShaguDPS (" .. T["Skin"] .. ")", C.thirdparty.shagudps, "skin", "checkbox")
      CreateConfig(nil, "ShaguDPS (" .. T["Dock"] .. ")", C.thirdparty.shagudps, "dock", "checkbox")
+      CreateConfig(nil, "GreedMeter (" .. T["Dock"] .. ")", C.thirdparty.greedmeter, "dock", "checkbox")
      CreateConfig(nil, "DPSMate (" .. T["Skin"] .. ")", C.thirdparty.dpsmate, "skin", "checkbox")
      CreateConfig(nil, "DPSMate (" .. T["Dock"] .. ")", C.thirdparty.dpsmate, "dock", "checkbox")
      CreateConfig(nil, "SWStats (" .. T["Skin"] .. ")", C.thirdparty.swstats, "skin", "checkbox")
@@ -1,10 +1,8 @@
 pfUI:RegisterModule("hunterbar", function ()
-  local _,class = UnitClass("player")
-  if class ~= "HUNTER" or C.bars.hunterbar == "0" then return end
+  if UnitClassBase("player") ~= "HUNTER" or C.bars.hunterbar == "0" then return end

  -- Wing Clip (any rank) and Arcane Shot (any rank) spell IDs.
-  -- IsSpellInRange(spellId) works with any spell ID via Nampower,
-  -- no actionbar slot needed.
+  -- C_Spell.IsSpellInRange works with any spell ID, no actionbar slot needed.
  local WINGCLIP_ID  = 2974   -- melee range indicator (~5 yd)
  local ARCANESHOT_ID = 3044  -- ranged range indicator (~35 yd)

@@ -12,22 +10,37 @@ pfUI:RegisterModule("hunterbar", function ()
  -- Only swap BACK to melee bar when Wing Clip is actually in range.
  -- This prevents rapid bar-flipping in the transition zone.

+  local THROTTLE = 0.02  -- seconds between range checks (was every frame)
+
  pfUI.hunterbar = CreateFrame("Frame", "pfHunterBar", UIParent)

  -- track which page we last forced so we don't spam ChangeActionBarPage()
  pfUI.hunterbar.lastPage = nil
+  pfUI.hunterbar.elapsed = 0
+
+  -- Idle until there's a live, attackable target. A hidden frame runs no
+  -- OnUpdate, so the range polling only ticks while it can matter.
+  pfUI.hunterbar:Hide()

  pfUI.hunterbar:SetScript("OnUpdate", function()
-    -- only act when there is a live, attackable target
+    this.elapsed = this.elapsed + arg1
+    if this.elapsed < THROTTLE then return end
+    this.elapsed = 0
+
+    -- Target died or turned unattackable without a target-change event
+    -- (it dropped to a corpse); stop ticking until the next target.
    if not UnitExists("target") or not UnitCanAttack("player", "target") then
+      this:Hide()
      return
    end

-    local wingclipInRange   = IsSpellInRange(WINGCLIP_ID,   "target")
-    local arcaneshotInRange = IsSpellInRange(ARCANESHOT_ID, "target")
+    -- C_Spell.IsSpellInRange returns true / false / nil (rangeless). The
+    -- explicit == true / == false tests leave the bar unchanged on nil.
+    local wingclipInRange   = C_Spell.IsSpellInRange(WINGCLIP_ID,   "target")
+    local arcaneshotInRange = C_Spell.IsSpellInRange(ARCANESHOT_ID, "target")

    -- swap to ranged bar: out of melee range AND arcane shot (8yd) in range
-    if wingclipInRange == 0 and arcaneshotInRange == 1 then
+    if wingclipInRange == false and arcaneshotInRange == true then
      if this.lastPage ~= 2 then
        this.lastPage = 2
        _G.CURRENT_ACTIONBAR_PAGE = 2
@@ -35,7 +48,7 @@ pfUI:RegisterModule("hunterbar", function ()
      end

    -- swap to melee bar: in melee range AND arcane shot (8yd) out of range
-    elseif wingclipInRange == 1 and arcaneshotInRange == 0 then
+    elseif wingclipInRange == true and arcaneshotInRange == false then
      if this.lastPage ~= 1 then
        this.lastPage = 1
        _G.CURRENT_ACTIONBAR_PAGE = 1
@@ -43,4 +56,16 @@ pfUI:RegisterModule("hunterbar", function ()
      end
    end
  end)
+
+  -- Start ticking only when we gain an attackable target.
+  pfUI.hunterbar:RegisterEvent("PLAYER_TARGET_CHANGED")
+  pfUI.hunterbar:RegisterEvent("PLAYER_ENTERING_WORLD")
+  pfUI.hunterbar:SetScript("OnEvent", function()
+    if UnitExists("target") and UnitCanAttack("player", "target") then
+      this.elapsed = THROTTLE  -- run the first check on the next frame
+      this:Show()
+    else
+      this:Hide()
+    end
+  end)
 end)
@@ -7,8 +7,7 @@ pfUI:RegisterModule("innervatecall", function ()
  if not GetNampowerVersion then return end

  -- Only load for druids
-  local _, playerClass = UnitClass("player")
-  if playerClass ~= "DRUID" then return end
+  if UnitClassBase("player") ~= "DRUID" then return end

  local INNERVATE_SPELLID = 29166

@@ -76,14 +75,14 @@ pfUI:RegisterModule("innervatecall", function ()

    SendChatMessage(">> Innervate casted on " .. targetName .. " <<", channel)

-    -- Schedule "ready" announcement when cooldown expires
-    -- Use GetSpellIdCooldown for precise remaining time, fallback to 360s
+    -- Schedule "ready" announcement when the cooldown expires. Read the
+    -- precise remaining time from C_Spell.GetSpellCooldown (startTime and
+    -- duration are seconds from the GetTime epoch); fall back to 360s.
    local cdRemaining = 360
-    if GetSpellIdCooldown then
-      local cd = GetSpellIdCooldown(INNERVATE_SPELLID)
-      if cd and cd.cooldownRemainingMs and cd.cooldownRemainingMs > 0 then
-        cdRemaining = cd.cooldownRemainingMs / 1000
-      end
+    local cd = C_Spell.GetSpellCooldown(INNERVATE_SPELLID)
+    if cd and cd.duration and cd.duration > 0 then
+      local remaining = cd.startTime + cd.duration - GetTime()
+      if remaining > 0 then cdRemaining = remaining end
    end

    C_Timer.After(cdRemaining, function()
@@ -26,10 +26,14 @@ pfUI:RegisterModule("itemcount", function ()
    if bank < 0 then bank = 0 end

    frame:AddLine(" ")
-    if bags > 0     then frame:AddDoubleLine("Bags:",     bags,     1, 1, 1, 1, 1, 1) end
-    if bank > 0     then frame:AddDoubleLine("Bank:",     bank,     1, 1, 1, 1, 1, 1) end
-    if equipped > 0 then frame:AddDoubleLine("Equipped:", equipped, 1, 1, 1, 1, 1, 1) end
-    frame:AddDoubleLine("Total:", total, 1, 1, 1, 1, 1, 1)
+    if bags > 0     then frame:AddDoubleLine(T["Bags"] .. ":",     bags,     1, 1, 1, 1, 1, 1) end
+    if bank > 0     then frame:AddDoubleLine(T["Bank"] .. ":",     bank,     1, 1, 1, 1, 1, 1) end
+    if equipped > 0 then frame:AddDoubleLine(T["Equipped"] .. ":", equipped, 1, 1, 1, 1, 1, 1) end
+
+    local sources = (bags > 0 and 1 or 0) + (bank > 0 and 1 or 0) + (equipped > 0 and 1 or 0)
+    if sources > 1 then
+      frame:AddDoubleLine(T["Total"] .. ":", total, 1, 1, 1, 1, 1, 1)
+    end
    frame:Show()
  end

@@ -77,9 +77,7 @@ pfUI:RegisterModule("loot", function ()
      if pfUI.loot.my_index or pfUI.loot.disenchanter_index or pfUI.loot.banker_index then
        info = wipe(info)
        info.text = T["Special Recipient"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.textHeight = 12
        info.hasArrow = 1
        info.notCheckable = 1
@@ -158,9 +156,7 @@ pfUI:RegisterModule("loot", function ()
    if level == 1 then
      info = wipe(info)
      info.text = T["Random"]
-      info.textR = NORMAL_FONT_COLOR.r
-      info.textG = NORMAL_FONT_COLOR.g
-      info.textB = NORMAL_FONT_COLOR.b
+      info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
      info.value = "PFRANDOM"
      info.textHeight = 12
      info.notCheckable = 1
@@ -170,9 +166,7 @@ pfUI:RegisterModule("loot", function ()

      info = wipe(info)
      info.text = T["Request Rolls"]
-      info.textR = NORMAL_FONT_COLOR.r
-      info.textG = NORMAL_FONT_COLOR.g
-      info.textB = NORMAL_FONT_COLOR.b
+      info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
      info.value = "PFROLLS"
      info.textHeight = 12
      info.hasArrow = 1
@@ -183,9 +177,7 @@ pfUI:RegisterModule("loot", function ()
      if UIDROPDOWNMENU_MENU_VALUE == "PFROLLS" then
        info = wipe(info)
        info.text = T["Clear Rolls"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.value = "PFCLEARROLLS"
        info.notCheckable = 1
        info.func = pfUI.loot.ClearRolls
@@ -193,9 +185,7 @@ pfUI:RegisterModule("loot", function ()

        info = wipe(info)
        info.text = T["Reroll Ties"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.value = "PFTIEROLL"
        info.notCheckable = 1
        info.arg1 = pfUI.loot.rollers_sorted
@@ -16,12 +16,6 @@ pfUI:RegisterModule("loothistory", function ()
  local WINMARK = "Interface\\Buttons\\UI-CheckBox-Check"
  local QUESTIONMARK = "Interface\\Icons\\INV_Misc_QuestionMark"

-  local function ClassColor(class)
-    local c = class and RAID_CLASS_COLORS[class]
-    if c then return c.r, c.g, c.b end
-    return 1, 1, 1
-  end
-
  -- Paint an item row's icon/name/quality from a loaded Item mixin.
  local function RenderItemVisual(f, item)
    local r, g, b = 1, 1, 1
@@ -277,7 +271,7 @@ pfUI:RegisterModule("loothistory", function ()
        if wroll and wroll > 0 then f.winroll:SetText(wroll) else f.winroll:SetText("") end
        f.winroll:Show()
        f.winname:SetText(wname or UNKNOWN)
-        f.winname:SetTextColor(ClassColor(wclass))
+        f.winname:SetTextColor(PFUI_CLASS_COLORS[wclass]:GetRGB())
        f.winname:Show()
      else
        -- nobody won: everyone passed
@@ -298,7 +292,7 @@ pfUI:RegisterModule("loothistory", function ()

  local function RenderPlayerFrame(pf, name, class, rollType, roll, isWinner)
    pf.name:SetText(name or UNKNOWN)
-    pf.name:SetTextColor(ClassColor(class))
+    pf.name:SetTextColor(PFUI_CLASS_COLORS[class]:GetRGB())

    pf.rollicon:SetTexture(ROLL_TEX[rollType] or ROLL_TEX[ROLL_PASS])
    if roll and roll > 0 then pf.rolltext:SetText(roll) else pf.rolltext:SetText("") end
@@ -0,0 +1,128 @@
+-- Macro icon picker
+-- Replaces Blizzard's MacroPopupFrame (the "name + icon" dialog opened by the
+-- New / Change-Icon buttons) with a pfUI-native picker driven by
+-- IconDataProviderMixin, so the full spell + item + loose icon set is
+-- available instead of the stock spell-only list. Saving goes through
+-- C_Macro.CreateMacro / C_Macro.EditMacro, which take the icon as a texture
+-- string -- so arbitrary icons (including index-less INV_* item icons) persist
+-- on both the modern (Turtle/Octo) and stock-vanilla macro UIs. The surrounding
+-- MacroFrame (list + body editor) is Blizzard's, already skinned elsewhere.
+pfUI:RegisterModule("macroicons", function ()
+  HookAddonOrVariable("Blizzard_MacroUI", function()
+    -- ============================================================
+    -- Popup frame
+    -- ============================================================
+
+    local picker = CreateFrame("Frame", "pfMacroIconPicker", UIParent)
+    picker:SetFrameStrata("DIALOG")
+    picker:SetSize(472, 484)
+    -- Starts anchored to the right of the macro panel (re-anchored at open
+    -- once the skin's backdrop exists); dragging pins it in place after.
+    picker:SetPoint("BOTTOMLEFT", MacroFrame, "BOTTOMRIGHT", 8, 0)
+    picker:Hide()
+    CreateBackdrop(picker, nil, nil, .9)
+    CreateBackdropShadow(picker)
+    picker:EnableMouse(true)
+    picker:SetMovable(true)
+    picker:RegisterForDrag("LeftButton")
+    picker:SetScript("OnDragStart", function() this:StartMoving() end)
+    picker:SetScript("OnDragStop", function()
+      this:StopMovingOrSizing()
+      this.userMoved = true
+    end)
+
+    -- Spellbook seed leads the grid with class-relevant spell/talent icons.
+    local iconPicker = CreateIconPicker("pfMacroIcon", picker,
+                                        IconDataProviderExtraType.Spellbook, MACRO_POPUP_TEXT)
+
+    -- ============================================================
+    -- Open / save
+    -- ============================================================
+
+    -- Blizzard's popup disables these while it is open; mirror that so the
+    -- underlying frame can't be double-driven, then let MacroFrame_Update
+    -- restore the correct states on close.
+    local function SetMacroButtons(enabled)
+      local m = enabled and "Enable" or "Disable"
+      MacroNewButton[m](MacroNewButton)
+      MacroEditButton[m](MacroEditButton)
+      MacroDeleteButton[m](MacroDeleteButton)
+    end
+
+    local function OpenMacroPopup(mode)
+      if mode == "edit" and MacroFrame.selectedMacro then
+        picker.mode = "edit"
+        local name, texture = GetMacroInfo(MacroFrame.selectedMacro)
+        picker.editbox:SetText(name or "")
+        iconPicker.SetIcon(texture)
+      else
+        picker.mode = "new"
+        picker.editbox:SetText("")
+        iconPicker.SetIcon(nil)
+      end
+      picker.search:SetText("")
+      if not picker.userMoved then
+        picker:ClearAllPoints()
+        picker:SetPoint("BOTTOMLEFT", MacroFrame.backdrop or MacroFrame, "BOTTOMRIGHT", 8, 0)
+      end
+      SetMacroButtons(false)
+      picker:Show()
+      picker.editbox:SetFocus()
+      iconPicker.Refresh()
+    end
+
+    local function SaveMacroPopup()
+      local text = picker.editbox:GetText()
+      if text == "" then return end
+
+      local icon = iconPicker.GetIcon()
+      if picker.mode == "edit" and MacroFrame.selectedMacro then
+        C_Macro.EditMacro(MacroFrame.selectedMacro, text, icon, nil)
+        MacroFrame_SelectMacro(MacroFrame.selectedMacro)
+      else
+        local idx = C_Macro.CreateMacro(text, icon, nil, (MacroFrame.macroBase or 0) > 0)
+        if idx then MacroFrame_SelectMacro(idx) end
+      end
+      picker:Hide()
+    end
+
+    picker:SetScript("OnHide", function() MacroFrame_Update() end)
+
+    picker.editbox:SetScript("OnEnterPressed", SaveMacroPopup)
+    picker.editbox:SetScript("OnEscapePressed", function() picker:Hide() end)
+
+    -- OK / Cancel
+    local okay = CreateFrame("Button", "pfMacroIconPickerOkay", picker, "UIPanelButtonTemplate")
+    okay:SetSize(80, 22)
+    okay:SetText(OKAY)
+    okay:SetScript("OnClick", SaveMacroPopup)
+    SkinButton(okay)
+
+    local cancel = CreateFrame("Button", "pfMacroIconPickerCancel", picker, "UIPanelButtonTemplate")
+    cancel:SetSize(80, 22)
+    cancel:SetText(CANCEL)
+    cancel:SetPoint("BOTTOMRIGHT", picker, "BOTTOMRIGHT", -14, 12)
+    cancel:SetScript("OnClick", function() picker:Hide() end)
+    SkinButton(cancel)
+
+    -- Okay | Cancel, both anchored to the bottom-right corner.
+    okay:SetPoint("BOTTOMRIGHT", cancel, "BOTTOMLEFT", -6, 0)
+
+    -- ============================================================
+    -- Take over the New / Change-Icon buttons; retire Blizzard's popup
+    -- ============================================================
+
+    MacroNewButton:SetScript("OnClick", function()
+      MacroFrame_SaveMacro()
+      OpenMacroPopup("new")
+    end)
+
+    MacroEditButton:SetScript("OnClick", function()
+      MacroFrame_SaveMacro()
+      OpenMacroPopup("edit")
+    end)
+
+    -- Closing the macro window takes the picker with it.
+    MacroFrame:HookScript("OnHide", function() picker:Hide() end)
+  end)
+end)
@@ -13,7 +13,8 @@ pfUI:RegisterModule("macrotweak", function ()
  end

  -- do not write macro calls into chat input history
-  if ChatFrameEditBox._AddHistoryLine then
+  -- (install once: _AddHistoryLine is our backup slot and is nil until we set it)
+  if not ChatFrameEditBox._AddHistoryLine then
    local userinput
    ChatFrameEditBox._AddHistoryLine = ChatFrameEditBox.AddHistoryLine
    ChatFrameEditBox.AddHistoryLine = function(self, text)
@@ -77,7 +77,13 @@ pfUI:RegisterModule("map", function ()
          if point == "TOPLEFT" and relpoint == "TOPLEFT" then
            offx = offx*oldscale/scale
            offy = offy*oldscale/scale
-            WorldMapFrame:SetPoint(point, rel, relpoint, offx, offy)
+            -- Anchor to the parent (3-arg SetPoint) rather than re-using the frame
+            -- GetPoint handed back. Re-anchoring to `rel` throws
+            -- "<unnamed> is dependent on this" as soon as anything else has anchored
+            -- itself to WorldMapFrame, which aborts the whole zoom handler. The
+            -- parent-relative form is also what LoadMovable/SaveMovable already
+            -- assume: SaveMovable stores only xpos/ypos, with no relative frame.
+            WorldMapFrame:SetPoint(point, offx, offy)
          end

          WorldMapFrame:SetScale(scale)
@@ -103,8 +109,8 @@ pfUI:RegisterModule("map", function ()

    WorldMapFrame:ClearAllPoints()
    WorldMapFrame:SetPoint("CENTER", UIParent, "CENTER", 0, 0)
-    WorldMapFrame:SetWidth(WorldMapButton:GetWidth() + 15)
-    WorldMapFrame:SetHeight(WorldMapButton:GetHeight() + 55)
+    local wmWidth, wmHeight = WorldMapButton:GetSize()
+    WorldMapFrame:SetSize(wmWidth + 15, wmHeight + 55)
    LoadMovable(WorldMapFrame)

    -- skin
@@ -126,8 +132,7 @@ pfUI:RegisterModule("map", function ()
      btn:SetHighlightTexture("")
      btn.text = _G["pfUI_map_autozoneswitchText"]
      CreateBackdrop(btn, nil, true)
-      btn:SetWidth(14)
-      btn:SetHeight(14)
+      btn:SetSize(14, 14)
      btn:SetPoint("RIGHT", WorldMapContinentDropDown, "LEFT", -8, 2)
      btn.text:ClearAllPoints()
      btn.text:SetPoint("RIGHT", btn, "LEFT", -4, 1)
@@ -165,8 +170,7 @@ pfUI:RegisterModule("map", function ()
      WorldMapButton.coords.text:SetJustifyH("RIGHT")

      WorldMapButton.coords:SetScript("OnUpdate", function()
-        local width  = WorldMapButton:GetWidth()
-        local height = WorldMapButton:GetHeight()
+        local width, height = WorldMapButton:GetSize()
        local mx, my = WorldMapButton:GetCenter()
        local scale  = WorldMapButton:GetEffectiveScale()
        local x, y   = GetCursorPosition()
@@ -85,7 +85,7 @@ pfUI:RegisterModule("mapcolors", function ()
  end

  local function ColorizeName(frame)
-    local _, class = UnitClass(frame.unit)
+    local class = UnitClassBase(frame.unit)
    local color = PFUI_CLASS_COLORS[class]
    frame.name = frame.name or UnitName(frame.unit)
    frame.name = '|c'..color.colorStr..frame.name..'|r'
@@ -52,19 +52,19 @@ pfUI:RegisterModule("mapreveal", function ()
    WorldMapTooltip:AddLine(this.name, 1, 1, 1)
    WorldMapTooltip:Show()

-    if not explorecaches[this.name] then return end
+    if not explorecaches[this.area] then return end
    if C.appearance.worldmap.mapreveal == "0" then return end
-    for texture in pairs(explorecaches[this.name]) do
+    for texture in pairs(explorecaches[this.area]) do
      texture:SetVertexColor(1,1,1,1)
    end
  end

  local exploreLeave = function()
    WorldMapTooltip:Hide()
-    if not explorecaches[this.name] then return end
+    if not explorecaches[this.area] then return end
    if C.appearance.worldmap.mapreveal == "0" then return end
    local r,g,b,a = GetStringColor(C.appearance.worldmap.mapreveal_color)
-    for texture in pairs(explorecaches[this.name]) do
+    for texture in pairs(explorecaches[this.area]) do
      texture:SetVertexColor(r,g,b,a)
    end
  end
@@ -120,6 +120,7 @@ pfUI:RegisterModule("mapreveal", function ()
      explore:EnableMouse(true)
      explore:SetFrameLevel(255)
      explore.name = mapFileName .. " (" .. name .. ")"
+      explore.area = name -- cache key: explorecaches is keyed by the plain area name
      explore.tex = explore.tex or explore:CreateTexture("", "OVERLAY")
      explore.tex:SetBlendMode("ADD")
      explore.tex:SetTexCoord(.08, .92, .08, .92)
@@ -1,57 +1,32 @@
 pfUI:RegisterModule("marktracking", function ()
-  -- Requires mark1-mark8 unit tokens (Turtle WoW / Nampower)
  if not UnitExists("mark1") and not UnitExists("mark8") then
    if not pcall(function() UnitExists("mark1") end) then return end
  end

  local rawborder, border = GetBorderSize()

-  -- Parse color strings "r,g,b,a" into components
-  local function ParseColor(str, dr, dg, db, da)
-    if not str or str == "" then return dr, dg, db, da end
-    local _, _, r, g, b, a = string.find(str, "([%d%.]+),([%d%.]+),([%d%.]+),([%d%.]+)")
-    if r then
-      return tonumber(r) or dr, tonumber(g) or dg, tonumber(b) or db, tonumber(a) or da
-    end
-    return dr, dg, db, da
-  end
-
  local markerOrder = { 8, 7, 6, 5, 4, 3, 2, 1 } -- skull, cross, square, moon, triangle, diamond, circle, star
  local markerTokens = {}
-  for i = 1, 8 do markerTokens[i] = "mark" .. i end
-
-  -- Default colors per marker
-  local defaultColors = {
-    [1] = { 1.0, 0.9, 0.0, 1 },    -- star: yellow
-    [2] = { 1.0, 0.5, 0.0, 1 },    -- circle: orange
-    [3] = { 0.8, 0.0, 0.8, 1 },    -- diamond: purple
-    [4] = { 0.0, 0.8, 0.0, 1 },    -- triangle: green
-    [5] = { 0.7, 0.7, 0.7, 1 },    -- moon: silver
-    [6] = { 0.0, 0.4, 0.9, 1 },    -- square: blue
-    [7] = { 0.9, 0.0, 0.0, 1 },    -- cross: red
-    [8] = { 1.0, 1.0, 1.0, 1 },    -- skull: white
-  }

  local markerConfigKeys = {
-    [1] = "raidmarkercolor_star",
-    [2] = "raidmarkercolor_circle",
-    [3] = "raidmarkercolor_diamond",
-    [4] = "raidmarkercolor_triangle",
-    [5] = "raidmarkercolor_moon",
-    [6] = "raidmarkercolor_square",
-    [7] = "raidmarkercolor_cross",
-    [8] = "raidmarkercolor_skull",
+    "raidmarkercolor_star",
+    "raidmarkercolor_circle",
+    "raidmarkercolor_diamond",
+    "raidmarkercolor_triangle",
+    "raidmarkercolor_moon",
+    "raidmarkercolor_square",
+    "raidmarkercolor_cross",
+    "raidmarkercolor_skull",
  }

  local markerColors = {}
-  for i = 1, 8 do
-    local d = defaultColors[i]
-    local r, g, b, a = ParseColor(C.unitframes[markerConfigKeys[i]], d[1], d[2], d[3], d[4])
-    markerColors[i] = { r, g, b, a }
+  for i, markKey in ipairs(markerConfigKeys) do
+    markerTokens[i] = "mark" .. i
+    local r, g, b, a = GetStringColor(C.unitframes[markKey])
+    markerColors[i] = { tonumber(r), tonumber(g), tonumber(b), tonumber(a) }
  end

  local FALLBACK_INTERVAL = 1.0  -- safety net for units that come into range after marker was set
-  local elapsed = 0
  local isUnlocked = false
  local ROW_HEIGHT = tonumber(C.unitframes.raidmarkerheight) or 14
  local BAR_WIDTH = tonumber(C.unitframes.raidmarkerwidth) or 80
@@ -125,19 +100,16 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
    local i = markerOrder[idx]

    local row = CreateFrame("Button", nil, pfUI.marktracking)
-    row:SetWidth(TOTAL_ROW_WIDTH)
-    row:SetHeight(ROW_HEIGHT)
+    row:SetSize(TOTAL_ROW_WIDTH, ROW_HEIGHT)
    row:Hide()

-    row:RegisterForClicks("LeftButtonUp")
-    row:SetScript("OnClick", function()
-      TargetUnit(markerTokens[this.markerIndex])
-    end)
+    row:RegisterForClicks("LeftButtonUp", "RightButtonUp")
+    row:SetAttribute("type1", "target")
+    row:SetAttribute("type2", "menu")

    -- raid icon
    row.icon = row:CreateTexture(nil, "ARTWORK")
-    row.icon:SetWidth(ROW_HEIGHT)
-    row.icon:SetHeight(ROW_HEIGHT)
+    row.icon:SetSize(ROW_HEIGHT, ROW_HEIGHT)
    row.icon:SetPoint("LEFT", row, "LEFT", 1, 0)
    local markTex = C.unitframes.blizzard_raidicons == "1" and "Interface\\TargetingFrame\\UI-RaidTargetingIcons" or pfUI.media["img:raidicons"]
    row.icon:SetTexture(markTex)
@@ -145,8 +117,7 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)

    -- portrait (right side)
    row.portrait = row:CreateTexture(nil, "ARTWORK")
-    row.portrait:SetWidth(PORTRAIT_SIZE)
-    row.portrait:SetHeight(PORTRAIT_SIZE)
+    row.portrait:SetSize(PORTRAIT_SIZE, PORTRAIT_SIZE)
    row.portrait:SetPoint("RIGHT", row, "RIGHT", -1, 0)
    row.portrait:SetTexCoord(.1, .9, .1, .9)
    if not rm_showportrait then row.portrait:Hide() end
@@ -204,8 +175,8 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
      local token = markerTokens[i]

      if UnitExists(token) and not UnitIsDead(token) then
-        local hp = UnitHealth(token)
-        local maxhp = UnitHealthMax(token)
+        local hp, maxhp = UnitHealth(token), UnitHealthMax(token)
+        row:SetAttribute('unit', token)

        if hp and maxhp and maxhp > 0 and hp > 0 then
          local pct = hp / maxhp
@@ -267,6 +238,27 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
    end
  end

+  -- Fast per-row refresh for a single mark's UNIT_HEALTH/UNIT_MAXHEALTH: moves
+  -- just the bar + hp text. If the mark's visibility flips (comes into range,
+  -- dies, hp crosses 0) the visible rows re-pack, so hand off to UpdateDisplay.
+  local function UpdateRow(i)
+    if isUnlocked then return end
+    local row = pfUI.marktracking.rows[i]
+    if not row then return end
+    local token = markerTokens[i]
+    local hp, maxhp = UnitHealth(token), UnitHealthMax(token)
+    local shouldShow = UnitExists(token) and not UnitIsDead(token)
+                       and hp and maxhp and maxhp > 0 and hp > 0 and true or false
+    if shouldShow ~= (row:IsShown() and true or false) then
+      UpdateDisplay()
+      return
+    end
+    if not shouldShow then return end
+    local pct = hp / maxhp
+    row.health:SetValue(pct)
+    if rm_showpct then row.hptext:SetText(math.ceil(pct * 100) .. "%") end
+  end
+
  -- Unlock mode: show fixed 1-row placeholder so positioning works correctly
  if pfUI.unlock then
    local origShow = pfUI.unlock:GetScript("OnShow")
@@ -292,24 +284,27 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
  -- Event-driven scanner frame
  local scanner = CreateFrame("Frame")

-  -- RAID_TARGET_UPDATE: fires when a raid marker is set/cleared
-  -- PLAYER_ENTERING_WORLD: fires on login, reload, and zone transitions
-  -- UNIT_HEALTH/UNIT_MAXHEALTH: fires on HP changes for real-time bar updates
+  -- RAID_TARGET_UPDATE: a raid marker was set/cleared -> full refresh
+  -- PLAYER_ENTERING_WORLD: login/reload/zone -> full refresh
+  -- UNIT_HEALTH/UNIT_MAXHEALTH: ClassicAPI fires these per token; with the mark
+  --   tokens observed they arrive as arg1 == "markN", so we refresh just that
+  --   one row (UpdateRow) instead of rescanning all eight.
  scanner:RegisterEvent("RAID_TARGET_UPDATE")
  scanner:RegisterEvent("PLAYER_ENTERING_WORLD")
  scanner:RegisterEvent("UNIT_HEALTH")
  scanner:RegisterEvent("UNIT_MAXHEALTH")

  scanner:SetScript("OnEvent", function()
+    if event == "UNIT_HEALTH" or event == "UNIT_MAXHEALTH" then
+      -- arg1 is the token; "markN" -> N, nil for any non-mark token.
+      local i = arg1 and tonumber(string.match(arg1, "^mark(%d)"))
+      if i then UpdateRow(i) end
+      return
+    end
    UpdateDisplay()
  end)

-  -- Fallback poll at 1s: catches units that come into range AFTER a marker was set
+  -- Fallback poll: catches units that come into range AFTER a marker was set
  -- (no event fires for that case, so we need this safety net)
-  scanner:SetScript("OnUpdate", function()
-    elapsed = elapsed + arg1
-    if elapsed < FALLBACK_INTERVAL then return end
-    elapsed = 0
-    UpdateDisplay()
-  end)
+  C_Timer.NewTicker(FALLBACK_INTERVAL, UpdateDisplay)
 end)
@@ -131,18 +131,16 @@ pfUI:RegisterModule("minimap", function ()

  -- Create coordinates text frame with location configurable
  pfUI.minimapCoordinates = CreateFrame("Frame", "pfMinimapCoord", pfUI.minimap)
-  pfUI.minimapCoordinates:SetScript("OnUpdate", function()
-    -- Throttle to update coords every 0.1 seconds
-    if ( this.tick or 0) > GetTime() then return end
-    this.tick = GetTime() + .1
-    
+  -- Update coords every 0.1 seconds
+  C_Timer.NewTicker(0.1, function()
    if C.appearance.minimap.coordstext == "off" then return end

-    this.posX, this.posY = GetPlayerMapPosition("player")
-    if this.posX ~= 0 and this.posY ~= 0 then
-      this.text:SetText(string.format("%.1f, %.1f", round(this.posX * 100, 1), round(this.posY * 100, 1)))
+    local coord = pfUI.minimapCoordinates
+    coord.posX, coord.posY = GetPlayerMapPosition("player")
+    if coord.posX ~= 0 and coord.posY ~= 0 then
+      coord.text:SetText(string.format("%.1f, %.1f", round(coord.posX * 100, 1), round(coord.posY * 100, 1)))
    else
-      this.text:SetText("|cffffaaaaN/A")
+      coord.text:SetText("|cffffaaaaN/A")
    end
  end)

@@ -4,7 +4,6 @@ pfUI:RegisterModule("nameplates", function ()

  -- Local function references for performance
  local GetTime = GetTime
-  local UnitExists = UnitExists
  local UnitName = UnitName
  local UnitClass = UnitClass
  local UnitLevel = UnitLevel
@@ -56,24 +55,29 @@ pfUI:RegisterModule("nameplates", function ()
  local savedHostileState = nil
  local savedFriendlyState = nil
  local inFriendlyZone = false
+  local myGuild = nil
  local platecount = 0
  local registry = {}
+  -- Subset of registry that currently has a unit assigned (between
+  -- NAME_PLATE_UNIT_ADDED and _REMOVED). The central loop iterates this instead
+  -- of the full pool so hidden pool slots aren't touched every tick.
+  local visiblePlates = {}

  local raidGuidCache = {}  -- guid -> name (rebuilt on RAID_ROSTER_UPDATE/PARTY_MEMBERS_CHANGED)
  
-  -- Per-GUID cast state, populated by nampower's SPELL_START_OTHER events and
-  -- cleared on SPELL_FAILED_OTHER / plate removal / expiry. This replaces the
-  -- old per-tick C_Spell poll on every visible plate: cast detection is now
-  -- event driven, and GetCastInfo just reads this cache.
+  -- Per-GUID cast state, populated from ClassicAPI's UNIT_SPELLCAST_* events
+  -- (which now fire for nameplate tokens) and cleared on STOP / plate removal /
+  -- expiry. This replaces the old per-tick C_Spell poll on every visible plate:
+  -- cast detection is event driven, and GetCastInfo just reads this cache.
  local castState = {}
  -- guid -> nameplate, maintained on NAME_PLATE_UNIT_ADDED/_REMOVED so a cast
  -- event can find its plate in O(1) and only cache casts we actually show.
  local plateByGuid = {}
-  local targetPlateGuid = nil

-  -- One-shot C_Spell poll. Only used to seed a plate that spawns while its
-  -- unit is already mid-cast (its SPELL_START_OTHER fired before the plate
-  -- existed). Never called per frame.
+  -- One-shot C_Spell poll. Builds the cast struct for a UNIT_SPELLCAST_* event
+  -- (the payload carries no timing) and seeds a plate that spawns while its unit
+  -- is already mid-cast (its START fired before the plate existed). Picks cast
+  -- vs channel itself. Never called per frame.
  local function PollCastInfo(unit)
    if not unit then return nil end
    local name, _, texture, startMs, endMs, _, _, _, spellID = C_Spell.UnitCastingInfo(unit)
@@ -113,7 +117,7 @@ pfUI:RegisterModule("nameplates", function ()
  local debuffDisplayBuf = {}  -- [i] = { effect, texture, stacks, dtype, duration, timeleft }
  for i = 1, 16 do debuffDisplayBuf[i] = {} end
  local threatMemory = {}   -- guid -> true if mob had player targeted
-  local debuffSeen = {}     -- reusable table for debuff tracking (avoid GC churn)
+  -- local debuffSeen = {}     -- reusable table for debuff tracking (avoid GC churn)

  -- PERF: visiblePlateCount maintained event-driven (NAME_PLATE_UNIT_ADDED/_REMOVED)
  local visiblePlateCount = 0
@@ -177,7 +181,6 @@ pfUI:RegisterModule("nameplates", function ()
  -- ============================================================================
  local frameState = {
    now = 0,
-    hasTarget = false,
    targetGuid = nil,
    mouseoverGuid = nil,
  }
@@ -280,15 +283,35 @@ pfUI:RegisterModule("nameplates", function ()
    end
  end

-  local function TotemPlate(name)
-    if C.nameplates.totemicons == "1" then
-      for totem, icon in pairs(L["totems"]) do
-        if string.find(name, totem) then return icon end
-      end
+  -- Numeric CreatureType.dbc id for the plate's unit (8 = Critter, 11 = Totem).
+  -- It's fixed per unit, so cache it and reset on plate reuse. nil while the GUID
+  -- can't resolve yet (incl. the no-SuperWoW case, where cachedGuid is empty).
+  -- Locale-proof and covers custom units for free -- no name tables needed.
+  local function CreatureType(plate)
+    local guid = plate.cachedGuid
+    if not guid or guid == "" then return nil end
+    if not plate.creatureType then
+      plate.creatureType = UnitCreatureTypeID(guid)  -- nil retries next call
    end
+    return plate.creatureType
  end

-  local function HidePlate(unittype, name, fullhp, target)
+  -- Totem icon, read straight from the game:
+  --   * Passive totems self-cast their provided buff, so they carry exactly one
+  --     aura whose icon IS the totem's icon (Totem::Summon TOTEM_PASSIVE).
+  --   * Active totems (Searing/Magma/Fire Nova) cast at enemies and hold no
+  --     self-aura, so their icon arrives via UNIT_SPELLCAST_SUCCEEDED (cached
+  --     into plate.totemIcon by the event handler); nil here until then.
+  local function TotemPlate(plate)
+    if C.nameplates.totemicons ~= "1" then return nil end
+    if CreatureType(plate) ~= 11 then return nil end
+    if plate.totemIcon then return plate.totemIcon end
+    local aura = C_UnitAuras.GetBuffDataByIndex(plate.cachedGuid, 1)
+    if aura then plate.totemIcon = aura.icon end
+    return plate.totemIcon
+  end
+
+  local function HidePlate(unittype, fullhp, target, plate)
    -- keep some plates always visible according to config
    if C.nameplates.fullhealth == "1" and not fullhp then return nil end
    if C.nameplates.target == "1" and target then return nil end
@@ -304,14 +327,10 @@ pfUI:RegisterModule("nameplates", function ()
      return true
    elseif C.nameplates.friendlyplayer == "1" and unittype == "FRIENDLY_PLAYER" then
      return true
-    elseif C.nameplates.critters == "1" and unittype == "NEUTRAL_NPC" then
-      for i, critter in pairs(L["critters"]) do
-        if string.lower(name) == string.lower(critter) then return true end
-      end
-    elseif C.nameplates.totems == "1" then
-      for totem in pairs(L["totems"]) do
-        if string.find(name, totem) then return true end
-      end
+    elseif C.nameplates.critters == "1" and CreatureType(plate) == 8 then
+      return true
+    elseif C.nameplates.totems == "1" and CreatureType(plate) == 11 then
+      return true
    end

    -- nothing to hide
@@ -448,8 +467,7 @@ pfUI:RegisterModule("nameplates", function ()
      nameplate.debuffs[i]:SetPoint(aligna, nameplate.debuffs[i-limit], alignb, 0, space)
    end

-    nameplate.debuffs[i]:SetWidth(tonumber(C.nameplates.debuffsize))
-    nameplate.debuffs[i]:SetHeight(tonumber(C.nameplates.debuffsize))
+    nameplate.debuffs[i]:SetSize(debuffsize, debuffsize)
    
    -- Update cooldown display settings
    if nameplate.debuffs[i].cd then
@@ -476,11 +494,13 @@ nameplates:RegisterEvent("NAME_PLATE_UNIT_ADDED")
 nameplates:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
 nameplates:RegisterEvent("UNIT_AURA")
 nameplates:RegisterEvent("UNIT_FLAGS")
-- nampower cast lifecycle for other units (gated by NP_EnableSpell{Start,Go}
-- Events, enabled by libdebuff). Drives castbars event-first instead of
-- polling C_Spell on every plate each tick. Mirrors castbar.lua's target bar.
-nameplates:RegisterEvent("SPELL_START_OTHER")
-nameplates:RegisterEvent("SPELL_FAILED_OTHER")
+nameplates:RegisterEvent("UPDATE_MOUSEOVER_UNIT")
+nameplates:RegisterEvent("UNIT_SPELLCAST_START")
+nameplates:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
+nameplates:RegisterEvent("UNIT_SPELLCAST_STOP")
+nameplates:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
+nameplates:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
+nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
  
  nameplates:SetScript("OnEvent", function()
    -- Stop event handling during logout to prevent crash 132
@@ -492,13 +512,17 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
        nameplates.mouselook:SetScript("OnUpdate", nil)
      end
      return
-      
+
+    elseif event == "PLAYER_GUILD_UPDATE" and arg1 == 'player' then
+      myGuild = GetGuildInfo("player")
+
    elseif event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED_NEW_AREA" then
      if event == "PLAYER_ENTERING_WORLD" then
        CacheConfig()
        this:SetGameVariables()
        RebuildRaidGuidCache()
-        targetPlateGuid = UnitExists("target") and UnitGUID("target") or nil
+        frameState.targetGuid = UnitGUID("target")
+        myGuild = GetGuildInfo("player")
      end
      
      -- Handle friendly zone nameplate disable feature
@@ -558,14 +582,17 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      -- token itself for token-based UnitX reads (stable per plate lifetime).
      local plate = C_NamePlate.GetNamePlateForUnit(arg1)
      if plate and plate.nameplate then
+        visiblePlates[plate] = plate
        local guid = UnitGUID(arg1)
        plate.nameplate.cachedGuid = guid
        plate.nameplate.unit = arg1
+        plate.nameplate.creatureType = nil  -- recompute for the new unit
+        plate.nameplate.totemIcon = nil
        if guid then
          plateByGuid[guid] = plate.nameplate
-          -- Seed: the unit may already be mid-cast (its SPELL_START_OTHER fired
-          -- before this plate existed). One poll here catches that; ongoing
-          -- casts arrive via the event.
+          -- Seed: the unit may already be mid-cast (its UNIT_SPELLCAST_START
+          -- fired before this plate existed). One poll here catches that;
+          -- ongoing casts arrive via the event.
          castState[guid] = PollCastInfo(arg1)
        end
        nameplates.OnShow(plate)
@@ -576,6 +603,8 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      visiblePlateCount = visiblePlateCount > 0 and visiblePlateCount - 1 or 0
      -- arg1 = "nameplateN" unit token; UnitGUID still resolves inside the
      -- handler (the slot is freed after dispatch returns)
+      local plate = C_NamePlate.GetNamePlateForUnit(arg1)
+      if plate then visiblePlates[plate] = nil end
      local guid = UnitGUID(arg1)
      if guid then
        if debuffCache[guid] then debuffCache[guid] = nil end
@@ -583,7 +612,6 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
        if combatColorCache[guid] then combatColorCache[guid] = nil end
        if castState[guid] then castState[guid] = nil end
        if plateByGuid[guid] then plateByGuid[guid] = nil end
-        local plate = C_NamePlate.GetNamePlateForUnit(arg1)
        if plate and plate.nameplate and plate.nameplate.cachedGuid == guid then
          plate.nameplate.cachedGuid = nil
          plate.nameplate.unit = nil
@@ -591,10 +619,6 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      end

    elseif event == "UNIT_FLAGS" then
-      -- ClassicAPI: fires with arg1 == "nameplateN" when a unit's flags change
-      -- (stun, combat enter/leave). Flag that plate for an immediate update,
-      -- bypassing the throttle. Guard on the token prefix -- UNIT_FLAGS also
-      -- fires for target/party/raid, which aren't ours to handle here.
      if arg1 and strfind(arg1, "^nameplate") then
        local plate = C_NamePlate.GetNamePlateForUnit(arg1)
        if plate and plate.nameplate then
@@ -602,39 +626,59 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
        end
      end

-    elseif event == "SPELL_START_OTHER" then
-      -- nampower: arg2=spellId, arg3=casterGuid, arg6=castTime(ms),
-      -- arg7=channel duration(ms, 0 if not a channel), arg8=spellType
-      -- (1 = channel). Cache the cast only for a unit we have a plate for, so
+    elseif event == "UPDATE_MOUSEOVER_UNIT" then
+      local new = UnitGUID("mouseover")
+      local old = frameState.mouseoverGuid
+      if new ~= old then
+        frameState.mouseoverGuid = new
+        local po = old and plateByGuid[old]
+        if po then po.eventcache = true end
+        local pn = new and plateByGuid[new]
+        if pn then pn.eventcache = true end
+      end
+
+    elseif event == "UNIT_SPELLCAST_START" or event == "UNIT_SPELLCAST_CHANNEL_START" then
+      -- ClassicAPI fires UNIT_SPELLCAST_* per unit token, including the caster's
+      -- "nameplateN". The payload has no timing, so poll it (PollCastInfo picks
+      -- cast vs channel) and cache -- only for a unit we have a plate for, so
      -- the table stays bounded to on-screen casters.
-      local casterGuid = arg3
-      local plate = casterGuid and plateByGuid[casterGuid]
-      if plate then
-        local isChannel = arg8 == 1
-        local durationMs = isChannel and arg7 or arg6
-        if durationMs and durationMs > 0 then
-          local spellId = arg2
-          local now = GetTime()
-          castState[casterGuid] = {
-            spellName = C_Spell.GetSpellName(spellId),
-            spellID   = spellId,
-            icon      = C_Spell.GetSpellTexture(spellId),
-            startTime = now,
-            endTime   = now + durationMs / 1000,
-            duration  = durationMs / 1000,
-            isChannel = isChannel,
-          }
-          plate.castUpdate = true  -- bypass the throttle so the bar shows now
+      if arg1 and strfind(arg1, "^nameplate") then
+        local guid = UnitGUID(arg1)
+        local plate = guid and plateByGuid[guid]
+        if plate then
+          castState[guid] = PollCastInfo(arg1)
+          if castState[guid] then
+            plate.castUpdate = true  -- bypass the throttle so the bar shows now
+          end
        end
      end

-    elseif event == "SPELL_FAILED_OTHER" then
-      -- nampower: arg1=casterGuid, arg2=spellId. Clear on interrupt/failure.
-      local casterGuid = arg1
-      if casterGuid and castState[casterGuid] then
-        castState[casterGuid] = nil
-        local plate = plateByGuid[casterGuid]
-        if plate then plate.castUpdate = true end
+    elseif event == "UNIT_SPELLCAST_STOP" or event == "UNIT_SPELLCAST_CHANNEL_STOP" then
+      -- Cast/channel ended (natural, interrupted, or cancelled -- the poll fires
+      -- STOP for all three). Clear the cached cast and refresh its plate.
+      if arg1 and strfind(arg1, "^nameplate") then
+        local guid = UnitGUID(arg1)
+        if guid and castState[guid] then
+          castState[guid] = nil
+          local plate = plateByGuid[guid]
+          if plate then plate.castUpdate = true end
+        end
+      end
+
+    elseif event == "UNIT_SPELLCAST_SUCCEEDED" then
+      -- Active totems (Searing/Magma/Fire Nova) carry no self-aura, so their
+      -- attack cast is the only icon source. Capture it once per totem, gated on
+      -- creature type so a normal caster's spell never styles it as a totem.
+      if arg1 and strfind(arg1, "^nameplate") then
+        local guid = UnitGUID(arg1)
+        local plate = guid and plateByGuid[guid]
+        if plate and not plate.totemIcon and arg3 and CreatureType(plate) == 11 then
+          local tex = C_Spell.GetSpellTexture(arg3)
+          if tex then
+            plate.totemIcon = tex
+            plate.castUpdate = true  -- re-render now so the icon shows
+          end
+        end
      end

    elseif event == "UNIT_AURA" then
@@ -652,7 +696,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      end

    elseif event == "PLAYER_TARGET_CHANGED" then
-      targetPlateGuid = UnitExists("target") and UnitGUID("target") or nil
+      frameState.targetGuid = UnitGUID('target')
      -- Flag the target's plate for update
      local plate = C_NamePlate.GetNamePlateForUnit("target")
      if plate and plate.nameplate then
@@ -681,21 +725,15 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    -- PERF: Cache GetTime() once per frame
    frameState.now = now
-    frameState.hasTarget, frameState.targetGuid = UnitExists("target")
-    frameState.mouseoverGuid = UnitGUID("mouseover")

-    -- propagate events to all nameplates
    if this.eventcache then
      this.eventcache = nil
-      for plate in pairs(registry) do
-        plate.eventcache = true
+      for plate in pairs(visiblePlates) do
+        plate.nameplate.eventcache = true
      end
    end

-    -- visiblePlateCount is maintained event-driven via NAME_PLATE_UNIT_ADDED/_REMOVED.
-
-    -- Central OnUpdate for all visible plates
-    for plate in pairs(registry) do
+    for plate in pairs(visiblePlates) do
      if plate:IsVisible() then
        nameplates.OnUpdate(plate, frameState)
      end
@@ -728,7 +766,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
  nameplates.OnCreate = function(frame)
    local parent = frame or this
    platecount = platecount + 1
-    platename = "pfNamePlate" .. platecount
+    local platename = "pfNamePlate" .. platecount

    -- create pfUI nameplate overlay
    local nameplate = CreateFrame("Button", platename, parent)
@@ -793,8 +831,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    nameplate.totem = CreateFrame("Frame", nil, nameplate)
    nameplate.totem:SetPoint("CENTER", nameplate, "CENTER", 0, 0)
-    nameplate.totem:SetHeight(32)
-    nameplate.totem:SetWidth(32)
+    nameplate.totem:SetSize(32, 32)
    nameplate.totem.icon = nameplate.totem:CreateTexture(nil, "OVERLAY")
    nameplate.totem.icon:SetTexCoord(.078, .92, .079, .937)
    nameplate.totem.icon:SetAllPoints()
@@ -882,11 +919,11 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    local plate_width = C.nameplates.width + 50
    local plate_height = C.nameplates.heighthealth + font_size + 5
-    local plate_height_cast = C.nameplates.heighthealth + font_size + 5 + C.nameplates.heightcast + 5
+    -- local plate_height_cast = C.nameplates.heighthealth + font_size + 5 + C.nameplates.heightcast + 5
    local combo_size = 5

-    local width = tonumber(C.nameplates.width)
-    local debuffsize = tonumber(C.nameplates.debuffsize)
+    -- local width = tonumber(C.nameplates.width)
+    -- local debuffsize = tonumber(C.nameplates.debuffsize)
    local healthoffset = tonumber(C.nameplates.health.offset)
    local orientation = C.nameplates.verticalhealth == "1" and "VERTICAL" or "HORIZONTAL"

@@ -952,7 +989,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
    -- Use the same castbar texture and color as the unit frame castbar (castbar.lua)
    local cbtexture = pfUI.media[C.appearance.castbar.texture]
    nameplate.castbar:SetStatusBarTexture(cbtexture or hptexture)
-    local cbr, cbg, cbb, cba = strsplit(",", C.appearance.castbar.castbarcolor)
+    local cbr, cbg, cbb, cba = GetStringColor(C.appearance.castbar.castbarcolor)
    nameplate.castbar:SetStatusBarColor(cbr, cbg, cbb, cba)
    -- reset endTime cache so color/texture refresh takes effect on next cast
    nameplate.castbar.lastEndTime = nil
@@ -1070,11 +1107,11 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
    end

    -- hide frames according to the configuration
-    local TotemIcon = TotemPlate(name)
+    local TotemIcon = TotemPlate(plate)

    if TotemIcon then
-      -- create totem icon
-      plate.totem.icon:SetTexture("Interface\\Icons\\" .. TotemIcon)
+      -- icon resolved from the totem's aura / attack cast (already a full path)
+      plate.totem.icon:SetTexture(TotemIcon)

      plate.glow:Hide()
      plate.level:Hide()
@@ -1082,7 +1119,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      plate.health:Hide()
      plate.guild:Hide()
      plate.totem:Show()
-    elseif HidePlate(unittype, name, (hpmax-hp == hpmin), target) then
+    elseif HidePlate(unittype, (hpmax-hp == hpmin), target, plate) then
      plate.level:SetPoint("RIGHT", plate.name, "LEFT", -3, 0)
      plate.name:SetParent(plate)
      plate.guild:SetPoint("BOTTOM", plate.name, "BOTTOM", -2, -(font_size + 2))
@@ -1125,7 +1162,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    if guild and C.nameplates.showguildname == "1" then
      plate.guild:SetText(guild)
-      if UnitIsInMyGuild(plate.unit) then
+      if guild == myGuild then
        plate.guild:SetTextColor(0, 0.9, 0, 1)
      else
        plate.guild:SetTextColor(0.8, 0.8, 0.8, 1)
@@ -1189,12 +1226,11 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    local r, g, b, a = unpack(unitcolors[unittype])

-    if class then
-      if unittype == "ENEMY_PLAYER" and C.nameplates["enemyclassc"] == "1" then
-        r, g, b, a = PFUI_CLASS_COLORS[class]:GetRGBA()
-      elseif unittype == "FRIENDLY_PLAYER" and C.nameplates["friendclassc"] == "1" then
-        r, g, b, a = PFUI_CLASS_COLORS[class]:GetRGBA()
-      end
+    if class and (
+      (unittype == "ENEMY_PLAYER" and C.nameplates["enemyclassc"] == "1") or
+      (unittype == "FRIENDLY_PLAYER" and C.nameplates["friendclassc"] == "1")
+    ) then
+      r, g, b, a = PFUI_CLASS_COLORS[class]:GetRGBA()
    end

    if unitstr and UnitIsTapped(unitstr) and not UnitIsTappedByPlayer(unitstr) then
@@ -1220,10 +1256,15 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
      plate.cache.namecolor = r + g + b
    end

-    -- update combopoints
-    for i=1, 5 do plate.combopoints[i]:Hide() end
    if target and C.nameplates.cpdisplay == "1" then
-      for i=1, GetComboPoints("target") do plate.combopoints[i]:Show() end
+      local cp = GetComboPoints("target")
+      if plate.cpShown ~= cp then
+        for i=1, 5 do plate.combopoints[i]:SetShown(i <= cp) end
+        plate.cpShown = cp
+      end
+    elseif plate.cpShown then
+      for i=1, 5 do plate.combopoints[i]:Hide() end
+      plate.cpShown = nil
    end

    -- update debuffs
@@ -1337,7 +1378,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
    -- and immediately correct on de-target (unlike istarget which updates one tick later)
    local targetGuid = state and state.targetGuid
    local target = (targetGuid and nameplate.cachedGuid and targetGuid == nameplate.cachedGuid) or
-                   (state and state.hasTarget and frame:GetAlpha() >= 0.99) or nil
+                   (state and state.targetGuid and frame:GetAlpha() >= 0.99) or nil
    -- Target plate castbar runs on its own dedicated frame (nameplates.castbarFrame).
    -- For non-target plates with castbar active, use castbar throttle to ensure
    -- smooth animation without overloading the central loop.
@@ -1451,7 +1492,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")

    -- Set non-target plate alpha
    local configAlpha = cfg.notargalpha or 0.5
-    local desiredAlpha = (target or not state.hasTarget) and 1 or configAlpha
+    local desiredAlpha = (target or not state.targetGuid) and 1 or configAlpha

    if nameplate.cachedAlpha ~= desiredAlpha then
      nameplate:SetAlpha(desiredAlpha)
@@ -1542,8 +1583,7 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
          nameplate.health.zoomTransition = true
        else
          if nameplate.health.zoomTransition then
-            nameplate.health:SetWidth(wc)
-            nameplate.health:SetHeight(hc)
+            nameplate.health:SetSize(wc, hc)
            nameplate.health.zoomTransition = nil
          end
          nameplate.health.zoomed = true
@@ -1668,8 +1708,8 @@ nameplates:RegisterEvent("SPELL_FAILED_OTHER")
  -- loop's nameplates_castbar gate.)
  nameplates.castbarFrame = CreateFrame("Frame", nil, UIParent)
  nameplates.castbarFrame:SetScript("OnUpdate", function()
-    if not cfg.showcastbar or not targetPlateGuid then return end
-    local nameplate = plateByGuid[targetPlateGuid]
+    if not cfg.showcastbar or not frameState.targetGuid then return end
+    local nameplate = plateByGuid[frameState.targetGuid]
    if not nameplate then return end
    nameplates.UpdateCastbar(nameplate, GetTime())
  end)
@@ -37,18 +37,12 @@ pfUI:RegisterModule("panel", function()
          return
        end
        if arg1 == "LeftButton" then
-          if widget.timerFrame:IsShown() then
-            widget.timerFrame:Hide()
-          else
-            widget.timerFrame:Show()
-          end
+          widget.timerFrame:SetShown(not widget.timerFrame:IsShown())
        elseif arg1 == "RightButton" then
          widget.timerFrame.Snapshot = GetTime()
        end
      end
-      widget:SetScript("OnUpdate",function()
-        if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + 1 end
-
+      C_Timer.NewTicker(1, function()
        local secondsenabled = C.panel.seconds == "1"
        local fmt
        if C.global.twentyfour == "0" then
@@ -62,8 +56,7 @@ pfUI:RegisterModule("panel", function()

      widget.timerFrame = CreateFrame("Frame", "pfUITimer", UIParent)
      widget.timerFrame:Hide()
-      widget.timerFrame:SetWidth(120)
-      widget.timerFrame:SetHeight(35)
+      widget.timerFrame:SetSize(120, 35)
      widget.timerFrame:SetPoint("TOP", 0, -100)
      UpdateMovable(widget.timerFrame)

@@ -103,11 +96,9 @@ pfUI:RegisterModule("panel", function()
          pfUI.panel:OutputPanel("combat", T["Combat"] .. ": " .. NOT_APPLICABLE)
        end
      end)
-      widget.combat:SetScript("OnUpdate", function()
-        if not this.tick then this.tick = GetTime() end
-        if GetTime() <= this.tick + 1 then return else this.tick = GetTime() end
-        if this.combat then
-          pfUI.panel:OutputPanel("combat", "|cffffaaaa" .. SecondsToTime(ceil(GetTime() - this.combat)))
+      C_Timer.NewTicker(1, function()
+        if widget.combat.combat then
+          pfUI.panel:OutputPanel("combat", "|cffffaaaa" .. SecondsToTime(ceil(GetTime() - widget.combat.combat)))
        end
      end)
    end
@@ -153,9 +144,7 @@ pfUI:RegisterModule("panel", function()
          pfUI.addons:Show()
        end
      end
-      widget:SetScript("OnUpdate",function()
-        if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + 1 end
-
+      C_Timer.NewTicker(1, function()
        fps = floor(GetFramerate())
        _, _, lag = GetNetStats()

@@ -307,18 +296,18 @@ pfUI:RegisterModule("panel", function()
        local playerzone  = GetRealZoneText()

        for friendIndex=1, all do
-          local friend_name, friend_level, friend_class, friend_area, friend_connected = GetFriendInfo(friendIndex)
-          if friend_connected and friend_class and friend_level then
+          local info = C_FriendList.GetFriendInfoByIndex(friendIndex)
+          if info and info.connected and info.classFilename and info.level then
            if not init then
              GameTooltip_SetDefaultAnchor(GameTooltip, this)
              GameTooltip:ClearLines()
              GameTooltip:AddLine("|cff555555" .. T["Friends Online"])
              init = true
            end
-            local ccolor = PFUI_CLASS_COLORS[L["class"][friend_class]] or { 1, 1, 1 }
-            local lcolor = GetDifficultyColor(tonumber(friend_level)) or { 1, 1, 1 }
-            local zcolor = friend_area == playerzone and "|cff33ffcc" or "|cffcccccc"
-            GameTooltip:AddDoubleLine(rgbhex(ccolor) .. friend_name .. rgbhex(lcolor) .. " [" .. friend_level .. "]", zcolor .. friend_area)
+            local ccolor = PFUI_CLASS_COLORS[info.classFilename]
+            local lcolor = GetDifficultyColor(tonumber(info.level)) or { 1, 1, 1 }
+            local zcolor = info.area == playerzone and "|cff33ffcc" or "|cffcccccc"
+            GameTooltip:AddDoubleLine(ccolor:WrapTextInColorCode(info.name) .. rgbhex(lcolor) .. " [" .. info.level .. "]", zcolor .. info.area)
          end
        end

@@ -326,15 +315,7 @@ pfUI:RegisterModule("panel", function()
      end
      widget.Click = function() ToggleFriendsFrame(1) end
      widget:SetScript("OnEvent", function()
-        local online = 0
-        local all = GetNumFriends()
-        for friendIndex=1, all do
-          local friend_name, friend_level, friend_class, friend_area, friend_connected = GetFriendInfo(friendIndex)
-          if ( friend_connected ) then
-            online = online + 1
-          end
-        end
-
+        local online = C_FriendList.GetNumOnlineFriends()
        pfUI.panel:OutputPanel("friends", FRIENDS .. ": " .. online, widget.Tooltip, widget.Click)
      end)
    end
@@ -346,7 +327,7 @@ pfUI:RegisterModule("panel", function()
      widget:RegisterEvent("PLAYER_GUILD_UPDATE")
      widget.Tooltip = function()
        -- skip without guild
-        if not GetGuildInfo("player") then return end
+        if not IsInGuild() then return end

        local raidparty = {}
        for i=1,4 do -- detect people in group
@@ -398,7 +379,7 @@ pfUI:RegisterModule("panel", function()
      end
      widget.Click = function() ToggleFriendsFrame(3) end
      widget:SetScript("OnEvent", function()
-        if GetGuildInfo("player") then
+        if IsInGuild() then
          local count = 0
          for i = 1, GetNumGuildMembers() do
            local _, _, _, _, _, _, _, _, online = GetGuildRosterInfo(i)
@@ -411,9 +392,8 @@ pfUI:RegisterModule("panel", function()
        end
      end)

-      widget:SetScript("OnUpdate",function()
-        if ( this.tick or 60) > GetTime() then return else this.tick = GetTime() + 60 end
-        if GetGuildInfo("player") then GuildRoster() end
+      C_Timer.NewTicker(60, function()
+        if IsInGuild() then GuildRoster() end
      end)
    end

@@ -492,11 +472,7 @@ pfUI:RegisterModule("panel", function()
        GameTooltip:Show()
      end
      widget.Click = function()
-        if WorldMapFrame:IsShown() then
-          WorldMapFrame:Hide()
-        else
-          WorldMapFrame:Show()
-        end
+        WorldMapFrame:SetShown(not WorldMapFrame:IsShown())
      end
      widget:SetScript("OnEvent", function()
        pfUI.panel:OutputPanel("zone", GetMinimapZoneText(), widget.Tooltip, widget.Click)
@@ -645,8 +621,7 @@ pfUI:RegisterModule("panel", function()
    local frame = CreateFrame("Button", nil, parent)
    frame:SetFrameLevel(0)
    frame:ClearAllPoints()
-    frame:SetWidth(width)
-    frame:SetHeight(parent:GetHeight())
+    frame:SetSize(width, parent:GetHeight())
    frame:SetPoint(location, 0, 0)
    frame.text = frame:CreateFontString("Status", "LOW", "GameFontNormal")
    frame.text:ClearAllPoints()
@@ -687,8 +662,7 @@ pfUI:RegisterModule("panel", function()
    local imgstring = "img:" .. leftright
    parent.texture:SetTexture(pfUI.media[imgstring])
    parent.texture:SetPoint("CENTER", 0, 0)
-    parent.texture:SetWidth(8)
-    parent.texture:SetHeight(8)
+    parent.texture:SetSize(8, 8)
    parent.texture:SetVertexColor(.25,.25,.25,1)
    return parent.texture
  end
@@ -710,7 +684,7 @@ pfUI:RegisterModule("panel", function()
  UpdateMovable(pfUI.panel.left)

  pfUI.panel.left.hide:SetScript("OnClick", function()
-    if pfUI.chat.left:IsShown() then pfUI.chat.left:Hide() else pfUI.chat.left:Show() end
+    pfUI.chat.left:SetShown(not pfUI.chat.left:IsShown())
  end)

  if not pfUI.chat then pfUI.panel.left.hide:Hide() end
@@ -747,7 +721,7 @@ pfUI:RegisterModule("panel", function()
  UpdateMovable(pfUI.panel.right)

  pfUI.panel.right.hide:SetScript("OnClick", function()
-    if pfUI.chat.right:IsShown() then pfUI.chat.right:Hide() else pfUI.chat.right:Show() end
+    pfUI.chat.right:SetShown(not pfUI.chat.right:IsShown())
  end)

  if not pfUI.chat then pfUI.panel.right.hide:Hide() end
@@ -796,8 +770,7 @@ pfUI:RegisterModule("panel", function()
    pfUI.panel.microbutton = CreateFrame("Frame", "pfPanelMicroButton", UIParent)
    pfUI.panel.microbutton:SetPoint("TOP", pfUI.panel.minimap, "BOTTOM", 0,  -2*default_border)
    UpdateMovable(pfUI.panel.microbutton)
-    pfUI.panel.microbutton:SetHeight(23)
-    pfUI.panel.microbutton:SetWidth(145)
+    pfUI.panel.microbutton:SetSize(145, 23)
    pfUI.panel.microbutton:SetFrameStrata("MEDIUM")

    for i=1,table.getn(MICRO_BUTTONS) do
@@ -34,22 +34,25 @@ pfUI:RegisterModule("player", function ()
    playerFrame.infoTopCenterText:SetHeight(14)
  end

-  local _, myclass = UnitClass("player")
+  local myclass = UnitClassBase("player")
  playerFrame.myclass = myclass
  playerFrame.isSpellCaster = myclass ~= "WARRIOR" and myclass ~= "ROGUE" and myclass ~= "HUNTER"

  -- Convert "r,g,b,a" config color string to a 6-char hex string, or nil if unset
-  local function cfgColorToHex(colorStr)
-    if not colorStr or colorStr == "" then return nil end
-    local r, g, b = strsplit(",", colorStr)
-    r, g, b = tonumber(r), tonumber(g), tonumber(b)
-    if not r or not g or not b then return nil end
-    return string.format("%02X%02X%02X", r * 255, g * 255, b * 255)
-  end
+  local cfgColorToHexTable = setmetatable({}, {
+    __index = function (t, colorStr)
+      if not colorStr or colorStr == "" then return nil end
+      local r, g, b = GetStringColor(colorStr)
+      if not r or not g or not b then return nil end
+      local hex = C_ColorUtil.GenerateTextColorCode({ r=r, g = g, b=b})
+      rawset(t, colorStr, hex)
+      return hex
+    end
+  })

  -- SP school colors indexed by GetSpellBonusDamage's 1-based school order
  -- (1=phys, 2=holy, 3=fire, 4=nature, 5=frost, 6=shadow, 7=arcane)
-  local spColors = { "FFFFFF", "FFFF80", "FF8000", "4DFF4D", "80FFFF", "9482C9", "FFFFFF" }
+  local spColors = { "FFFFFFFF", "FFFFFF80", "FFFF8000", "FF4DFF4D", "FF80FFFF", "FF9482C9", "FFFFFFFF" }

  -- Default SP school per class used as tiebreaker when multiple schools are equal
  local spDefaultSchool = {
@@ -68,42 +71,37 @@ pfUI:RegisterModule("player", function ()
    -- from UNIT_MOD_CAST_SPEED). Talent/spell-specific cast-time reductions
    -- show up in the actual cast bar via C_Spell.UnitCastingInfo; folding them
    -- in here too was mixing two different concepts into one number.
-    local showHaste = cfg.display_haste == "1"
-    local showSP = cfg.display_spellpower == "1"
-
    local isSpellCaster = playerFrame.isSpellCaster
-    if (not showHaste or not isSpellCaster) and not showSP then
+    local showHaste = isSpellCaster and cfg.display_haste == "1"
+    local showSP    = isSpellCaster and cfg.display_spellpower == "1"
+
+    if not showHaste and not showSP then
      playerFrame.infoTopCenterText:SetText("")
      return
    end

-    local haste = UnitSpellHaste("player")
-    local text = ""
+    local parts = {}

-    if showHaste and isSpellCaster and haste then
-      local hasteHex = cfgColorToHex(cfg.display_haste_color) or "FFFFFF"
-      text = string.format("|cff%s%.1f%%|r", hasteHex, haste)
+    if showHaste then
+      local hex = cfgColorToHexTable[cfg.display_haste_color] or "FFFFFFFF"
+      table.insert(parts, string.format("|c%s%.1f%%|r", hex, UnitSpellHaste("player")))
    end

-    if showSP and isSpellCaster then
-      local defSchool = spDefaultSchool[myclass] or 2
-      local maxSP = GetSpellBonusDamage(defSchool) or 0
-      local maxColor = spColors[defSchool]
-      for i = 2, 7 do  -- skip physical (1); default school seeds the tiebreak
+    if showSP then
+      local school = spDefaultSchool[myclass] or 2
+      local maxSP = GetSpellBonusDamage(school) or 0
+      for i = 2, 7 do  -- skip physical (1)
        local v = GetSpellBonusDamage(i) or 0
-        if v > maxSP then
-          maxSP = v
-          maxColor = spColors[i]
-        end
+        if v > maxSP then maxSP, school = v, i end
      end
+
      if maxSP > 0 then
-        local spHex = (cfg.display_sp_color_override == "1" and cfgColorToHex(cfg.display_sp_color)) or maxColor
-        if text ~= "" then text = text .. "    " end
-        text = text .. string.format("|cff%s+%d SP|r", spHex, maxSP)
+        local hex = (cfg.display_sp_color_override == "1" and cfgColorToHexTable[cfg.display_sp_color]) or spColors[school]
+        table.insert(parts, string.format("|c%s+%d SP|r", hex, maxSP))
      end
    end

-    playerFrame.infoTopCenterText:SetText(text)
+    playerFrame.infoTopCenterText:SetText(table.concat(parts, "    "))
  end

  -- Keep a reference to the generic UF UpdateConfig so we can chain it
@@ -4,7 +4,9 @@ pfUI:RegisterModule("raid", function ()

  -- tell RaidFrame.lua pfUI replaces party frames
  HookAddonOrVariable("Blizzard_RaidUI", function()
-    GROUP_REPLACE_PARTY = "1"
+    -- must reach _G: RaidFrame.lua reads this global, and pfUI.env has
+    -- __index but no __newindex, so a bare assignment stays in the sandbox
+    _G.GROUP_REPLACE_PARTY = "1"
  end)

  pfUI.uf.raid = CreateFrame("Frame", "pfRaidUpdater", UIParent)
@@ -7,8 +7,12 @@ pfUI:RegisterModule("roll", function ()
  local LOOT_ROLL_NEED = string.gsub(LOOT_ROLL_NEED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
  local LOOT_ROLL_PASSED = string.gsub(LOOT_ROLL_PASSED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")

-  -- try to detect the everyone string
-  local _, _, everyone, _ = strfind(LOOT_ROLL_ALL_PASSED, LOOT_ROLL_PASSED)
+  -- detect the "everyone passed" subject exactly as the loot scanner will capture
+  -- it: feed a dummy item into LOOT_ROLL_ALL_PASSED and run the same LOOT_ROLL_PASSED
+  -- match. (The old strfind had no captures, so `everyone` was always nil and
+  -- "Everyone has passed on: X" got counted as a fake roller.)
+  local everyoneSample = string.gsub(LOOT_ROLL_ALL_PASSED, "%%s", "x")
+  local everyone = cmatch(everyoneSample, LOOT_ROLL_PASSED)
  pfUI.roll.blacklist = { YOU, everyone }

  pfUI.roll.cache = {}
@@ -43,6 +47,7 @@ pfUI:RegisterModule("roll", function ()

    local _, _, itemLink = string.find(hyperlink, "(item:%d+:%d+:%d+:%d+)")
    local itemName = C_Item.GetItemInfo(itemLink)
+    if not itemName then return end -- uncached item: avoid cache[nil] "table index is nil"

    -- delete obsolete tables
    if pfUI.roll.cache[itemName] and pfUI.roll.cache[itemName]["TIMESTAMP"] < GetTime() - 60 then
@@ -234,7 +239,7 @@ pfUI:RegisterModule("roll", function ()
    f.time.bar:SetAllPoints(f.time)
    f.time.bar:SetStatusBarTexture(pfUI.media["img:bar"])
    f.time.bar:SetMinMaxValues(0, 100)
-    local r, g, b, a = strsplit(",", C.appearance.border.color)
+    local r, g, b, a = GetStringColor(C.appearance.border.color)
    f.time.bar:SetStatusBarColor(r, g, b)
    f.time.bar:SetValue(20)
    f.time.bar:SetScript("OnUpdate", function()
@@ -4,7 +4,7 @@ pfUI:RegisterModule("socialmod", function ()
  pfUI.socialmod:RegisterEvent("CHAT_MSG_SYSTEM")
  pfUI.socialmod:SetScript("OnEvent", function()
    local name = cmatch(arg1, _G.ERR_FRIEND_ONLINE_SS)
-    name = cmatch(arg1, _G.ERR_FRIEND_OFFLINE_S)
+    name = name or cmatch(arg1, _G.ERR_FRIEND_OFFLINE_S)
    if name and playerdb[name] and playerdb[name].cname then
      playerdb[name].lastseen = date("%a %d-%b-%Y")
    end
@@ -77,20 +77,19 @@ pfUI:RegisterModule("socialmod", function ()
      local off = FauxScrollFrame_GetOffset(FriendsFrameFriendsScrollFrame)

      for i=1, FRIENDS_TO_DISPLAY do
-        local name, level, class, zone, connected, status = GetFriendInfo(off + i)
-        if not name or name == _G.UNKNOWN then break end
+        local info = C_FriendList.GetFriendInfoByIndex(off + i)
+        if not info or not info.name or info.name == _G.UNKNOWN then break end
+        local name = info.name
        local friendName = _G["FriendsFrameFriendButton"..i.."ButtonTextName"]
        local friendLoc = _G["FriendsFrameFriendButton"..i..FRIENDS_NAME_LOCATION]
        local friendInfo = _G["FriendsFrameFriendButton"..i.."ButtonTextInfo"]
        local caption = friendName or friendLoc

-        if connected then
-          if not class or class == _G.UNKNOWN then break end
-          local ccolor = PFUI_CLASS_COLORS[L["class"][class]] or { 1, 1, 1 }
-          local lcolor = GetDifficultyColor(tonumber(level)) or { 1, 1, 1 }
-
-          zone = ( zone == playerzone and "|cffffffff" or "|cffcccccc" ) .. zone .. "|r"
-          local cname = rgbhex(ccolor) .. name .. "|r"
+        if info.connected then
+          local ccolor = PFUI_CLASS_COLORS[info.classFilename]
+          local status = info.afk and CHAT_FLAG_AFK or info.dnd and CHAT_FLAG_DND or ""
+          local zone = ( info.area == playerzone and "|cffffffff" or "|cffcccccc" ) .. info.area .. "|r"
+          local cname = ccolor:WrapTextInColorCode(name)
          if playerdb[name] then
            playerdb[name].lastseen = date("%a %d-%b-%Y")
            playerdb[name].cname = cname
@@ -103,7 +102,7 @@ pfUI:RegisterModule("socialmod", function ()
            friendLoc:SetText(format(TEXT(FRIENDS_LIST_TEMPLATE), cname, zone, status))
          end

-          friendInfo:SetText(format(TEXT(FRIENDS_LEVEL_TEMPLATE), level, class))
+          friendInfo:SetText(format(TEXT(FRIENDS_LEVEL_TEMPLATE), info.level, info.className))
          caption:SetVertexColor(1,1,1,.9)
          friendInfo:SetVertexColor(1,1,1,.9)
        else
@@ -124,74 +123,73 @@ pfUI:RegisterModule("socialmod", function ()

  do -- add colors to who list
    hooksecurefunc("WhoList_Update", function()
-      local num, max = GetNumWhoResults()
+      local num, max = C_FriendList.GetNumWhoResults()
      local off = FauxScrollFrame_GetOffset(WhoListScrollFrame)

      local playerzone  = GetRealZoneText()
      local playerrace  = UnitRace("player")
      local playerguild = GetGuildInfo("player")

+      if num + 1 >= MAX_WHOS_FROM_SERVER then
+        WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), max).."  |cffaaaaaa"..format(WHO_FRAME_SHOWN_TEMPLATE, MAX_WHOS_FROM_SERVER))
+      else
+        WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), num).."  |cffaaaaaa"..format(WHO_FRAME_SHOWN_TEMPLATE, num))
+      end
+
      for i=1, WHOS_TO_DISPLAY do
-        local name, guild, level, race, class, zone = GetWhoInfo(off + i)
-        local displayedText = ""
+        local info = C_FriendList.GetWhoInfo(off + i)
+        if info then
+          -- filename is the class token, so no L["class"] reversal is needed
+          local class = info.filename

-        if num + 1 >= MAX_WHOS_FROM_SERVER then
-          displayedText = format(WHO_FRAME_SHOWN_TEMPLATE, MAX_WHOS_FROM_SERVER)
-          WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), max).."  |cffaaaaaa"..displayedText)
-        else
-          displayedText = format(WHO_FRAME_SHOWN_TEMPLATE, num)
-          WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), num).."  |cffaaaaaa"..displayedText)
-        end
+          _G["WhoFrameButton"..i.."Name"]:SetTextColor(NORMAL_FONT_COLOR:GetRGB())

-        class = L["class"][class]
-
-        _G["WhoFrameButton"..i.."Name"]:SetTextColor(NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b)
-
-        if (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 1) then
-          if (zone == playerzone) then
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
-          else
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
-          end
-
-        elseif (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 2) then
-          if (guild == playerguild) then
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
-          else
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
-          end
-
-        elseif (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 3) then
-          if (race == playerrace) then
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
-          else
-            _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
-          end
-        end
-
-        if class then
-          local classicon = _G["WhoFrameButton"..i].classicon
-          local coords = CLASS_ICON_TCOORDS[class]
-          local color = PFUI_CLASS_COLORS[class]
-
-          -- do we have classicons? (skin enabled?)
-          if classicon then
-            _G["WhoFrameButton"..i.."Class"]:SetTextColor(0,0,0,0)
-            _G["WhoFrameButton"..i.."Name"]:SetTextColor(color.r,color.g,color.b,1)
-
-            if coords then
-              classicon:Show()
-              classicon:SetTexCoord(unpack(coords))
+          if (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 1) then
+            if (info.area == playerzone) then
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
            else
-              classicon:Hide()
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
            end
-          else
-            _G["WhoFrameButton"..i.."Class"]:SetTextColor(color.r,color.g,color.b,1)
-          end
-        end

-        local color = GetDifficultyColor(level)
-        _G["WhoFrameButton"..i.."Level"]:SetTextColor(color.r, color.g, color.b)
+          elseif (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 2) then
+            if (info.fullGuildName == playerguild) then
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
+            else
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
+            end
+
+          elseif (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 3) then
+            if (info.raceStr == playerrace) then
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(.5, 1, 1)
+            else
+              _G["WhoFrameButton"..i.."Variable"]:SetTextColor(1, 1, 1)
+            end
+          end
+
+          if class then
+            local classicon = _G["WhoFrameButton"..i].classicon
+            local coords = CLASS_ICON_TCOORDS[class]
+            local color = PFUI_CLASS_COLORS[class]
+
+            -- do we have classicons? (skin enabled?)
+            if classicon then
+              _G["WhoFrameButton"..i.."Class"]:SetTextColor(0,0,0,0)
+              _G["WhoFrameButton"..i.."Name"]:SetTextColor(color.r,color.g,color.b,1)
+
+              if coords then
+                classicon:Show()
+                classicon:SetTexCoord(unpack(coords))
+              else
+                classicon:Hide()
+              end
+            else
+              _G["WhoFrameButton"..i.."Class"]:SetTextColor(color.r,color.g,color.b,1)
+            end
+          end
+
+          local color = GetDifficultyColor(info.level)
+          _G["WhoFrameButton"..i.."Level"]:SetTextColor(color.r, color.g, color.b)
+        end
      end
    end)
  end
@@ -75,7 +75,10 @@ pfUI:RegisterModule("superwow", function ()
    DEFAULT_CHAT_FRAME:AddMessage("-> https://github.com/balakethelock/SuperWoW/releases/")
  end

-  if SUPERWOW_VERSION == "1.5" then
+  -- compare numerically: an exact string match silently drops this on any
+  -- SuperWoW release past 1.5
+  local swVersion = tonumber(SUPERWOW_VERSION)
+  if swVersion and swVersion >= 1.5 then
    QueueFunction(function()
      local pfCombatText_AddMessage = _G.CombatText_AddMessage
      _G.CombatText_AddMessage = function(message, a, b, c, d, e, f)
@@ -9,11 +9,6 @@ pfUI:RegisterModule("swingtimer", function ()
  local ON_SWING_QUEUED       = 0
  local ON_SWING_QUEUE_POPPED = 1

-  -- Spell.dbc bits used to mirror server-side swing-reset rules.
-  local FLAG_AUTOATTACK  = tonumber("0x08",   16)  -- SPELL_INTERRUPT_FLAG_AUTOATTACK
-  local ATTR_KEEP_SWINGS = tonumber("0x20000", 16) -- SPELL_ATTR_EX2_NOT_RESET_AUTO_ACTIONS
-  local ATTR_ON_NEXT_SWING = tonumber("0x04", 16)  -- SPELL_ATTR_ON_NEXT_SWING
-
  -- Consolidate state into a table to avoid Lua 5.0 upvalue limit (32 max)
  local S = {
    mhTimer = 0, mhTimerMax = 1,
@@ -43,12 +38,11 @@ pfUI:RegisterModule("swingtimer", function ()
  local WAND_SHOOT_SPELLID = 5019
  local THROW_SPELLID      = 2764  -- one-shot ranged, not auto-repeat

-  -- ATTR_ON_NEXT_SWING: spell replaces next auto-attack swing.
+  -- On-next-swing spells replace the next auto-attack swing.
  -- Covers Raptor Strike, Maul, Mongoose Bite, Holy Strike, etc. automatically.
  local function IsOnSwingSpell(spellId)
    if S.onSwingCache[spellId] ~= nil then return S.onSwingCache[spellId] end
-    local attr = GetSpellRecField(spellId, "attributes") or 0
-    local result = bit.band(attr, ATTR_ON_NEXT_SWING) ~= 0
+    local result = C_Spell.IsNextMeleeSpell(spellId)
    S.onSwingCache[spellId] = result
    return result
  end
@@ -82,7 +76,7 @@ pfUI:RegisterModule("swingtimer", function ()
  local ohR, ohG, ohB, ohA = ParseColor(C.unitframes.swingtimerohcolor, 0.3, 0.8, 0.3, 1)
  local raR, raG, raB, raA = ParseColor(C.unitframes.swingtimerrangedcolor, 0.3, 0.6, 1.0, 1)
  local rwR, rwG, rwB, rwA = ParseColor(C.unitframes.swingtimerrangedwarncolor, 0.9, 0.0, 0.0, 1)
-  local isHunter = UnitClass("player") == "Hunter"
+  local isHunter = UnitClassBase("player") == "HUNTER"
  local mhDefaultR, mhDefaultG, mhDefaultB = mhR, mhG, mhB


@@ -290,7 +284,9 @@ pfUI:RegisterModule("swingtimer", function ()
  UpdateMovable(pfUI.swingtimer.ranged)

  -- OH weapon detection
-  local OH_WEAPON_TYPES = { [13]=true, [21]=true }
+  -- OH weapon detection: slot 17 (off hand) accepts one-hand (13) and off-hand
+  -- weapons (22); main-hand-only (21) can never sit there.
+  local OH_WEAPON_TYPES = { [13]=true, [22]=true }
  local function HasOffhandWeapon()
    local l = GetInventoryItemLink("player", 17)
    if not l then return false end
@@ -734,13 +730,12 @@ pfUI:RegisterModule("swingtimer", function ()
    S.pendingCastSpellId = arg1
    -- Freeze the swing timer for cast-time spells that DON'T reset auto-
    -- attack on completion (Slam, Hammer of Wrath on Turtle, etc.) — those
-    -- let the swing resume from where it paused. Detect dynamically via the
-    -- absent AUTOATTACK interrupt flag (8); spells with that bit reset on
-    -- SPELL_GO_SELF so freezing isn't necessary. Subsumes the old hardcoded
-    -- swingDelaySpells list (no list maintenance for new Slam-style spells).
+    -- let the swing resume from where it paused. C_Spell.ResetsMeleeSwing
+    -- mirrors the server rule; spells that reset don't need freezing (they
+    -- reset on SPELL_GO_SELF). Subsumes the old hardcoded swingDelaySpells
+    -- list (no list maintenance for new Slam-style spells).
    if S.mhActive then
-      local iflags = GetSpellRecField(arg1, "interruptFlags") or 0
-      if bit.band(iflags, FLAG_AUTOATTACK) == 0 then
+      if not C_Spell.ResetsMeleeSwing(arg1) then
        S.mhFrozenAt = GetTime()
      end
    end
@@ -777,17 +772,13 @@ pfUI:RegisterModule("swingtimer", function ()
      S.hsQueued = false; S.cleaveQueued = false; S.maulQueued = false
      ResetMH()
    else
-      -- Mirror the server rule for "does this spell reset the auto-attack
-      -- swing" (Spell::IsMeleeAttackResetSpell in Turtle's core):
-      --   InterruptFlags has SPELL_INTERRUPT_FLAG_AUTOATTACK (0x08)
-      --   AND AttributesEx2 lacks NOT_RESET_AUTO_ACTIONS (0x20000).
-      -- If neither path resets and we're holding a frozen-swing-during-cast
-      -- (mhFrozenAt set by SPELL_START_SELF for non-AUTOATTACK spells), this
-      -- is a Slam-style cast — push the timer forward by the cast duration
-      -- so the bar resumes from where it paused.
-      local iflags = GetSpellRecField(spellId, "interruptFlags") or 0
-      if bit.band(iflags, FLAG_AUTOATTACK) ~= 0
-          and bit.band(GetSpellRecField(spellId, "attributesEx2") or 0, ATTR_KEEP_SWINGS) == 0 then
+      -- C_Spell.ResetsMeleeSwing mirrors the server rule (Turtle's
+      -- Spell::IsMeleeAttackResetSpell): InterruptFlags has AUTOATTACK and
+      -- AttributesEx2 lacks NOT_RESET_AUTO_ACTIONS. When the spell resets the
+      -- swing, snap the timers to full. Otherwise (elseif) a frozen-swing-
+      -- during-cast is a Slam-style cast — push the timer forward by the cast
+      -- duration so the bar resumes from where it paused.
+      if C_Spell.ResetsMeleeSwing(spellId) then
        if S.mhActive and S.mhSpeed > 0 then
          UpdateWeaponSpeeds()
          S.mhTimerMax = S.mhSpeed
@@ -908,7 +899,7 @@ pfUI:RegisterModule("swingtimer", function ()
      S.autoAttackActive = false

    elseif event == "PLAYER_ENTERING_WORLD" then
-      local _, class = UnitClass("player")
+      local class = UnitClassBase("player")
      S.isWarrior  = (class == "WARRIOR")
      S.isDruid    = (class == "DRUID")
      UpdateWeaponSpeeds()
@@ -100,10 +100,10 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
      CreateBackdropShadow(KLHTM_Frame)

      if C.thirdparty.chatbg == "1" and C.chat.global.custombg == "1" then
-        local r, g, b, a = strsplit(",", C.chat.global.background)
+        local r, g, b, a = GetStringColor(C.chat.global.background)
        KLHTM_Frame.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-        local r, g, b, a = strsplit(",", C.chat.global.border)
+        local r, g, b, a = GetStringColor(C.chat.global.border)
        KLHTM_Frame.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
      end

@@ -199,10 +199,10 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
      CreateBackdropShadow(TWTMain)

      if C.thirdparty.chatbg == "1" and C.chat.global.custombg == "1" then
-        local r, g, b, a = strsplit(",", C.chat.global.background)
+        local r, g, b, a = GetStringColor(C.chat.global.background)
        TWTMain.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-        local r, g, b, a = strsplit(",", C.chat.global.border)
+        local r, g, b, a = GetStringColor(C.chat.global.border)
        TWTMain.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
      end

@@ -328,10 +328,10 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
      CreateBackdropShadow(SW_BarFrame1)

      if C.thirdparty.chatbg == "1" and C.chat.global.custombg == "1" then
-        local r, g, b, a = strsplit(",", C.chat.global.background)
+        local r, g, b, a = GetStringColor(C.chat.global.background)
        SW_BarFrame1.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-        local r, g, b, a = strsplit(",", C.chat.global.border)
+        local r, g, b, a = GetStringColor(C.chat.global.border)
        SW_BarFrame1.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
      end

@@ -244,10 +244,10 @@ pfUI:RegisterModule("thirdparty", function()
            end

            if C.thirdparty.chatbg == "1" and C.chat.global.custombg == "1" then
-              local r, g, b, a = strsplit(",", C.chat.global.background)
+              local r, g, b, a = GetStringColor(C.chat.global.background)
              window.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-              local r, g, b, a = strsplit(",", C.chat.global.border)
+              local r, g, b, a = GetStringColor(C.chat.global.border)
              window.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
            end

@@ -277,6 +277,103 @@ pfUI:RegisterModule("thirdparty", function()
    end
  end)

+  -- GreedMeter Damage Meter
+  -- Vanilla: https://github.com/iGreed/GreedMeter
+  -- GreedMeter builds its windows lazily and supports several of them, so the
+  -- frames are resolved at call time. The primary window takes the "damage"
+  -- dock slot; a second window (GreedMeter.UI.frames[2]) takes the "threat"
+  -- slot so the two tile the panel side-by-side. Docking triggers a
+  -- LayoutBars/RefreshFrame so the bars refit the new width.
+  HookAddonOrVariable("GreedMeter", function()
+    local UI = GreedMeter.UI
+
+    local function frameAt(i)
+      return UI and UI.frames and UI.frames[i]
+    end
+    local function primary()
+      return (UI and UI.mainFrame) or getglobal("GreedMeterFrame1")
+    end
+    local function relayout(frame)
+      if not UI then return end
+      if UI.LayoutBars then UI:LayoutBars(frame) end
+      if UI.RefreshFrame then UI:RefreshFrame(frame) end
+    end
+
+    -- Builds a docktable for a window resolved through getframe(). left picks
+    -- the left half in split mode; the primary window uses the right half.
+    local function BuildDock(name, getframe, left)
+      return { "greedmeter", "GreedMeter", name,
+        function() -- single: fill the panel
+          local frame = getframe()
+          if not frame then return end
+          frame:ClearAllPoints()
+          frame:SetAllPoints(pfUI.chat.right)
+          frame:SetWidth(pfUI.chat.right:GetWidth())
+          relayout(frame)
+        end,
+        function() -- dual: take one half
+          local frame = getframe()
+          if not frame then return end
+          frame:ClearAllPoints()
+          if left then
+            frame:SetPoint("TOPLEFT", pfUI.chat.right, "TOPLEFT", 0, 0)
+            frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOM", 0, 0)
+          else
+            frame:SetPoint("TOPLEFT", pfUI.chat.right, "TOP", 0, 0)
+            frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, 0)
+          end
+          frame:SetWidth(pfUI.chat.right:GetWidth() / 2)
+          relayout(frame)
+        end,
+        function() -- show
+          local frame = getframe()
+          if frame then frame:Show() relayout(frame) end
+        end,
+        function() -- hide
+          local frame = getframe()
+          if frame then frame:Hide() end
+        end
+      }
+    end
+
+    local threatdock = BuildDock("GreedMeterFrame2", function() return frameAt(2) end, true)
+    pfUI.thirdparty.meters:RegisterMeter("damage", BuildDock("GreedMeterFrame1", primary, false))
+
+    -- pfUI's dock decides fill-vs-split by whether the threat slot is filled,
+    -- not by counting windows, so reconcile that slot whenever GreedMeter adds
+    -- or removes one. Only the first two windows fit; any beyond that float.
+    local function SyncSecond()
+      if not pfUI.thirdparty.meters.damage then return end -- dock disabled
+      local has2 = frameAt(2) ~= nil
+      if has2 and not pfUI.thirdparty.meters.threat then
+        pfUI.thirdparty.meters.threat = threatdock
+      elseif not has2 and pfUI.thirdparty.meters.threat == threatdock then
+        pfUI.thirdparty.meters.threat = nil
+      end
+      pfUI.thirdparty.meters:Resize()
+
+      -- match the second window's visibility to the panel (the primary tracks it)
+      local f1, f2 = primary(), frameAt(2)
+      if f2 then
+        if f1 and f1:IsShown() then f2:Show() relayout(f2) else f2:Hide() end
+      end
+    end
+
+    -- AddFrame and the login-time layout restore both go through
+    -- CreateMeterFrame; RemoveFrame handles closing a window.
+    local origCreate = UI.CreateMeterFrame
+    UI.CreateMeterFrame = function(self, isPrimary, copyFrom)
+      local frame = origCreate(self, isPrimary, copyFrom)
+      SyncSecond()
+      return frame
+    end
+    local origRemove = UI.RemoveFrame
+    UI.RemoveFrame = function(self, frame)
+      origRemove(self, frame)
+      SyncSecond()
+    end
+  end)
+
  -- DPSMate Damage Meter
  -- Vanilla: https://github.com/Geigerkind/DPSMate
  -- TBC: https://github.com/Geigerkind/DPSMateTBC
@@ -350,10 +447,10 @@ pfUI:RegisterModule("thirdparty", function()
          CreateBackdropShadow(frame)

          if C.thirdparty.chatbg == "1" and C.chat.global.custombg == "1" then
-            local r, g, b, a = strsplit(",", C.chat.global.background)
+            local r, g, b, a = GetStringColor(C.chat.global.background)
            frame.backdrop:SetBackdropColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))

-            local r, g, b, a = strsplit(",", C.chat.global.border)
+            local r, g, b, a = GetStringColor(C.chat.global.border)
            frame.backdrop:SetBackdropBorderColor(tonumber(r), tonumber(g), tonumber(b), tonumber(a))
          end
        end
@@ -185,14 +185,102 @@ pfUI:RegisterModule("tooltip", function ()
  GameTooltipStatusBar.SetStatusBarColor_orig = GameTooltipStatusBar.SetStatusBarColor
  GameTooltipStatusBar.SetStatusBarColor = function() return end

+  -- A row of buff icons anchored above the tooltip for mouseover units.
+  -- Icons come from a ClassicAPI object pool: ReleaseAll hides the whole
+  -- set each refresh, then we Acquire and re-anchor left-to-right.
+  local BUFF_SIZE, BUFF_SPACING, BUFF_MAX = 20, 2, 32
+  pfUI.tooltip.buffs = CreateFrame("Frame", "pfTooltipBuffs", GameTooltip)
+  pfUI.tooltip.buffs:SetPoint("BOTTOMLEFT", GameTooltipStatusBar, "TOPLEFT", 0, default_border + 2)
+  pfUI.tooltip.buffs:SetHeight(BUFF_SIZE)
+
+  local function CreateBuffIcon()
+    local icon = CreateFrame("Frame", nil, pfUI.tooltip.buffs)
+    icon:SetSize(BUFF_SIZE, BUFF_SIZE)
+    icon.texture = icon:CreateTexture(nil, "BACKGROUND")
+    icon.texture:SetTexCoord(.07, .93, .07, .93)
+    icon.texture:SetAllPoints(icon)
+    CreateBackdrop(icon)
+
+    icon.stacks = icon:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    icon.stacks:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 1, 0)
+    icon.stacks:SetFont(C.tooltip.font_tooltip, C.tooltip.font_tooltip_size, "OUTLINE")
+    icon.stacks:SetTextColor(1, 1, 1, 1)
+
+    icon.timer = icon:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    icon.timer:SetPoint("CENTER", icon, "CENTER", 0, 0)
+    icon.timer:SetFont(C.tooltip.font_tooltip, C.tooltip.font_tooltip_size, "OUTLINE")
+    icon.timer:SetTextColor(1, 1, 1, 1)
+    return icon
+  end
+
+  pfUI.tooltip.buffpool = CreateObjectPool(CreateBuffIcon, function(_, icon)
+    icon:Hide()
+    icon:ClearAllPoints()
+  end)
+
+  -- Tick the remaining-time text on the visible icons. OnUpdate only fires
+  -- while the row is shown, so it stops as soon as the tooltip hides.
+  pfUI.tooltip.buffs:SetScript("OnUpdate", function()
+    local now = GetTime()
+    if (this.tick or 0) > now then return end
+    this.tick = now + 0.1
+    for icon in pfUI.tooltip.buffpool:EnumerateActive() do
+      local timeleft = icon.expirationTime and icon.expirationTime > 0 and (icon.expirationTime - now) or 0
+      icon.timer:SetText(timeleft > 0 and GetColoredTimeString(timeleft) or "")
+    end
+  end)
+
+  function pfUI.tooltip:UpdateBuffs(unit)
+    pfUI.tooltip.buffpool:ReleaseAll()
+
+    if C.tooltip.showbuffs ~= "1" or not unit or unit == "none" then
+      pfUI.tooltip.buffs:Hide()
+      return
+    end
+
+    local prev, count = nil, 0
+    for i = 1, BUFF_MAX do
+      local aura = C_UnitAuras.GetBuffDataByIndex(unit, i)
+      if not aura then break end
+
+      count = count + 1
+      local icon = pfUI.tooltip.buffpool:Acquire()
+      icon.texture:SetTexture(aura.icon)
+      icon.stacks:SetText(aura.applications and aura.applications > 1 and aura.applications or "")
+
+      icon.expirationTime = aura.expirationTime
+      local timeleft = aura.expirationTime and aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or 0
+      icon.timer:SetText(timeleft > 0 and GetColoredTimeString(timeleft) or "")
+
+      if prev then
+        icon:SetPoint("LEFT", prev, "RIGHT", BUFF_SPACING, 0)
+      else
+        icon:SetPoint("BOTTOMLEFT", pfUI.tooltip.buffs, "BOTTOMLEFT", 0, 0)
+      end
+      icon:Show()
+      prev = icon
+    end
+
+    if count > 0 then
+      pfUI.tooltip.buffs:SetWidth(count * BUFF_SIZE + (count - 1) * BUFF_SPACING)
+      pfUI.tooltip.buffs:Show()
+    else
+      pfUI.tooltip.buffs:Hide()
+    end
+  end
+
  function pfUI.tooltip:Update()
      local unit = pfUI.tooltip:GetUnit()
+      pfUI.tooltip:UpdateBuffs(unit)
      if unit == "none" then
-        -- process item tooltips
        if C.tooltip.itemid == "1" and GameTooltip:HasItem() then
          local _, _, itemID = GameTooltip:GetItem()
          GameTooltip:AddLine(T["ItemID"] .. ": " .. itemID, .25,.5,1)
          GameTooltip:Show()
+        elseif C.tooltip.spellid == "1" and GameTooltip:HasSpell() then
+          local _, _, spellID = GameTooltip:GetSpell()
+          GameTooltip:AddLine(T["SpellID"] .. ": " .. spellID, .25,.5,1)
+          GameTooltip:Show()
        end

        return
@@ -201,7 +289,7 @@ pfUI:RegisterModule("tooltip", function ()
      local pvpname = UnitPVPName(unit)
      local name = UnitName(unit)
      local validTarget, target = pcall(UnitName, unit .. 'target')
-      local _, class = UnitClass(unit)
+      local class = UnitClassBase(unit)
      local guild, rankstr, rankid = GetGuildInfo(unit)
      local reaction = UnitReaction(unit, "player")
      local pvptitle = gsub(gsub(pvpname or name, name, "", 1), "^%s*(.-)%s*$", "%1")
@@ -236,7 +324,7 @@ pfUI:RegisterModule("tooltip", function ()
      end

      if validTarget and target then
-        local _, targetClass = UnitClass(unit .. "target")
+        local targetClass = UnitClassBase(unit .. "target")
        local targetReaction = UnitReaction("player",unit .. "target")
        if UnitIsPlayer(unit .. "target") and targetClass then
          local color = PFUI_CLASS_COLORS[targetClass]
@@ -259,6 +347,13 @@ pfUI:RegisterModule("tooltip", function ()
        end
      end

+      if C.tooltip.unitid == "1" and not UnitIsPlayer(unit) then
+        local npcID = C_CreatureInfo.GetCreatureID(UnitGUID(unit))
+        if npcID then
+          GameTooltip:AddLine(T["UnitID"] .. ": " .. npcID, .25,.5,1)
+        end
+      end
+
      if hp and hpm then
        if hp >= 1000 then hp = round(hp / 1000, 1) .. "k" end
        if hpm >= 1000 then hpm = round(hpm / 1000, 1) .. "k" end
@@ -266,4 +361,24 @@ pfUI:RegisterModule("tooltip", function ()
      end
      GameTooltip:Show()
    end
+
+  if C.tooltip.aurasource == "1" or C.tooltip.spellid == "1" then
+    hooksecurefunc(GameTooltip, "SetUnitAura", function(self, ...)
+      local aura = C_UnitAuras.GetAuraDataByIndex(unpack(arg))
+      if not aura then return end
+      if C.tooltip.aurasource == "1" then
+        local caster = aura.sourceUnit and UnitName(aura.sourceUnit)
+        if not caster and aura.sourceGUID then
+          caster = UnitNameFromGUID(aura.sourceGUID)
+        end
+        if caster and caster ~= "" then
+          self:AddLine(T["Cast by"] .. ": " .. caster, .25,.5,1)
+        end
+      end
+      if C.tooltip.spellid == "1" then
+        self:AddLine(T["SpellID"] .. ": " .. aura.spellId, .25,.5,1)
+      end
+      self:Show()
+    end)
+  end
 end)
@@ -128,7 +128,7 @@ pfUI:RegisterModule("tracking", function ()
  end)

  function pfUI.tracking:RefreshSpells()
-    local _, playerClass = UnitClass("player")
+    local playerClass = UnitClassBase("player")
    local isCatForm = pfUI.tracking:PlayerIsDruidInCatForm(playerClass)

    -- Build set of valid SpellIDs for this class
@@ -355,6 +355,25 @@ pfUI:RegisterModule("turtle-wow", function ()
    end
  end)

+  if C.disabled["macroicons"] == "1" then
+    HookAddonOrVariable("Blizzard_MacroUI", function()
+      if type(UpdateMacroIconFilenames) ~= "function" then return end
+      function _G.UpdateMacroIconFilenames()
+        wipe(MACRO_ICON_FILENAMES)
+        local provider = CreateAndInitFromMixin(IconDataProviderMixin, IconDataProviderExtraType.Spellbook)
+        local seen = {}
+        for i = 1, provider:GetNumIcons() do
+          -- uppercase, prefix-stripped basename, matching Blizzard's original
+          local icon = string.gsub(string.upper(provider:GetIconByIndex(i)), "INTERFACE\\ICONS\\", "")
+          if not seen[icon] then
+            seen[icon] = true
+            table.insert(MACRO_ICON_FILENAMES, icon)
+          end
+        end
+        provider:Release()
+      end
+    end)
+  end

  -- add turtle-wow sell values
  pfSellData = {
@@ -28,7 +28,7 @@ pfUI:RegisterModule("unitxp", function ()
      behindFrame.text:SetFont(pfUI.font_default, fontSize, "OUTLINE")
      behindFrame.text:SetPoint("RIGHT", behindFrame, "RIGHT", -1, 0)
      behindFrame.text:SetTextColor(0.3, 1, 0.3, 1)
-      behindFrame.text:SetText("BEHIND")
+      behindFrame.text:SetText(T["BEHIND"])
      behindFrame.text:Hide()

      local lastCheck = 0
@@ -62,7 +62,7 @@ pfUI:RegisterModule("unitxp", function ()
      losFrame.text:SetFont(pfUI.font_default, fontSize, "OUTLINE")
      losFrame.text:SetPoint("RIGHT", losFrame, "RIGHT", -1, -slot)
      losFrame.text:SetTextColor(1, 0.3, 0.3, 1)
-      losFrame.text:SetText("NO LOS")
+      losFrame.text:SetText(T["NO LOS"])
      losFrame.text:Hide()

      local lastCheck = 0
@@ -169,6 +169,9 @@ pfUI:RegisterModule("unitxp", function ()

          local throttle = 0
          local scanner = CreateFrame("Frame")
+          -- expose the poller frame so PLAYER_LOGOUT can stop its UnitXP OnUpdate
+          -- (it lives on this separate frame, not on distanceIndicator) -> crash 132
+          pfUI.uf.target.distanceScanner = scanner
          scanner:SetScript("OnUpdate", function()
            throttle = throttle + arg1
            if throttle < 0.05 then return end
@@ -236,6 +239,10 @@ pfUI:RegisterModule("unitxp", function ()
        if pfUI.uf.target.distanceIndicator then
          pfUI.uf.target.distanceIndicator:SetScript("OnUpdate", nil)
        end
+        -- free-frame mode polls from its own scanner frame, not the indicator
+        if pfUI.uf.target.distanceScanner then
+          pfUI.uf.target.distanceScanner:SetScript("OnUpdate", nil)
+        end
      end
      return
    end
@@ -268,7 +275,9 @@ pfUI:RegisterModule("unitxp", function ()
    -- Also notify on BG queue pop
    local origBattlefieldPortShow = BattlefieldFrame_Show
    if origBattlefieldPortShow then
-      BattlefieldFrame_Show = function()
+      -- pfUI.env has __index but no __newindex, so a bare global assignment
+      -- inside a RegisterModule closure never leaves the sandbox
+      _G.BattlefieldFrame_Show = function()
        pcall(UnitXP, "notify", "taskbarIcon")
        pcall(UnitXP, "notify", "systemSound")
        return origBattlefieldPortShow()
@@ -23,7 +23,7 @@ do
  -- ClassicAPI dependency check.
  -- pfUI relies pervasively on the modern C_* / SuperWoW / nameplate / focus
  -- API surface that ClassicAPI polyfills, so presence is required.
-  local PFUI_CLASSIC_API_MIN     = 10802  -- (X*10000 + Y*100 + Z)
+  local PFUI_CLASSIC_API_MIN     = 10906  -- (X*10000 + Y*100 + Z)
  local PFUI_CLASSIC_API_LATEST  = PFUI_CLASSIC_API_MIN
  local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI"
  local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest"
@@ -292,6 +292,7 @@ function pfUI:GetEnvironment()
  pfUI.env.C = pfUI_config
  pfUI.env.pfUI_throttle = _G.pfUI_throttle
  pfUI.env.L = (pfUI_locale[GetLocale()] or pfUI_locale["enUS"])
+  pfUI.env.L["class"] = pfUI.env.L["class"] or tInvert(LOCALIZED_CLASS_NAMES_MALE)

  return pfUI.env
 end
@@ -309,7 +310,7 @@ function pfUI:CheckNewModules()
  pfUI_init.seen_modules = pfUI_init.seen_modules or {}

  local pending = 0
-  local _, playerClass = UnitClass("player")
+  local playerClass = UnitClassBase("player")
  for _, entry in pairs(pfUI.new_modules) do
    if not pfUI_init.seen_modules[entry.name] and pfUI_init["finalize"] then
      if not entry.class or entry.class == playerClass then
@@ -425,7 +426,7 @@ pfUI:SetScript("OnEvent", function()
      pfUI.version.major, pfUI.version.minor, pfUI.version.fix = 0, 0, 0
      pfUI.version.string = "dev"
    else
-      local major, minor, fix = pfUI.api.strsplit(".", raw)
+      local major, minor, fix = pfUI.api.strsplit(".", string.gsub(raw, "^[vV]", ""))
      pfUI.version.major = tonumber(major) or 0
      pfUI.version.minor = tonumber(minor) or 0
      pfUI.version.fix   = tonumber(fix)   or 0
@@ -3,8 +3,8 @@ pfUI:RegisterSkin("Game Menu", function ()
  CreateBackdrop(GameMenuFrame, nil, true, .75)
  CreateBackdropShadow(GameMenuFrame)

-  GameMenuFrame:SetWidth(GameMenuFrame:GetWidth() - 30)
-  GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 6)
+  local menuWidth, menuHeight = GameMenuFrame:GetSize()
+  GameMenuFrame:SetSize(menuWidth - 30, menuHeight + 6)

  local title = GetNoNameObject(GameMenuFrame, "FontString", "ARTWORK", MAIN_MENU)
  title:SetTextColor(1,1,1,1)
@@ -60,33 +60,35 @@ pfUI:RegisterSkin("Macro", function ()
    MacroFrameScrollFrame:ClearAllPoints()
    MacroFrameScrollFrame:SetPoint("TOPLEFT", MacroFrameSelectedMacroBackground, "BOTTOMLEFT", 11, -13)

+    -- The macroicons module replaces MacroPopupFrame with its own picker.
+    -- Only skin the stock popup when that module is disabled.
+    if pfUI_config["disabled"] and pfUI_config["disabled"]["macroicons"] == "1" then
+      StripTextures(MacroPopupFrame)
+      CreateBackdrop(MacroPopupFrame, nil, nil, .75)
+      MacroPopupFrame:SetFrameStrata("DIALOG")
+      MacroPopupFrame:ClearAllPoints()
+      MacroPopupFrame:SetPoint("TOPLEFT", MacroFrame.backdrop, "TOPRIGHT", 2*border, 0)

+      StripTextures(MacroPopupScrollFrame)
+      SkinScrollbar(MacroPopupScrollFrameScrollBar)

-    StripTextures(MacroPopupFrame)
-    CreateBackdrop(MacroPopupFrame, nil, nil, .75)
-    MacroPopupFrame:SetFrameStrata("DIALOG")
-    MacroPopupFrame:ClearAllPoints()
-    MacroPopupFrame:SetPoint("TOPLEFT", MacroFrame.backdrop, "TOPRIGHT", 2*border, 0)
+      MacroPopupEditBox:DisableDrawLayer("BACKGROUND")
+      CreateBackdrop(MacroPopupEditBox, nil, true)
+      MacroPopupEditBox:SetScript("OnEscapePressed", function()
+        MacroPopupFrame:Hide()
+        MacroFrame_Update()
+      end)

-    StripTextures(MacroPopupScrollFrame)
-    SkinScrollbar(MacroPopupScrollFrameScrollBar)
-
-    MacroPopupEditBox:DisableDrawLayer("BACKGROUND")
-    CreateBackdrop(MacroPopupEditBox, nil, true)
-    MacroPopupEditBox:SetScript("OnEscapePressed", function()
-      MacroPopupFrame:Hide()
-      MacroFrame_Update()
-    end)
-
-    for i=1, NUM_MACRO_ICONS_SHOWN do
-      local button = _G["MacroPopupButton"..i]
-      local icon = _G["MacroPopupButton"..i..'Icon']
-      StripTextures(button)
-      SkinButton(button, nil, nil, nil, icon)
+      for i=1, NUM_MACRO_ICONS_SHOWN do
+        local button = _G["MacroPopupButton"..i]
+        local icon = _G["MacroPopupButton"..i..'Icon']
+        StripTextures(button)
+        SkinButton(button, nil, nil, nil, icon)
+      end
+      SkinButton(MacroPopupCancelButton)
+      SkinButton(MacroPopupOkayButton)
+      MacroPopupOkayButton:ClearAllPoints()
+      MacroPopupOkayButton:SetPoint("RIGHT", MacroPopupCancelButton, "LEFT", -2*bpad, 0)
    end
-    SkinButton(MacroPopupCancelButton)
-    SkinButton(MacroPopupOkayButton)
-    MacroPopupOkayButton:ClearAllPoints()
-    MacroPopupOkayButton:SetPoint("RIGHT", MacroPopupCancelButton, "LEFT", -2*bpad, 0)
  end)
 end)
@@ -105,7 +105,7 @@ pfUI:RegisterSkin("Options - New", function ()
        local er, eg, eb = pfUI.api.GetStringColor(pfUI_config.appearance.border.color)
        btn:SetBackdropColor(br, bg, bb, 0.75)
        btn:SetBackdropBorderColor(er, eg, eb, 1)
-        local _, class = UnitClass("player")
+        local class = UnitClassBase("player")
        local color = PFUI_CLASS_COLORS[class]
        SetHighlight(btn, color.r, color.g, color.b)
        btn:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE")