Gate the macro icon hook behind a config flag

Run the Blizzard_MacroUI hook only when C.disabled["macroicons"] is "1".
Add pfUI-native macro icon picker
2026-10-15 17:50:48 +00:00 · 2026-08-05 03:44:11 -05:00 · 2026-08-05 03:03:30 -05:00 · 2026-08-05 03:02:43 -05:00 · 2026-08-05 00:28:55 -05:00 · 2026-08-04 23:00:51 -05:00
49 changed files with 1086 additions and 892 deletions
@@ -2,9 +2,9 @@

 [![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.**

@@ -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
@@ -92,25 +92,24 @@ gfind = string.gmatch or string.gfind
 mod = math.mod or mod

 -- [ strsplit ]
-- Splits a string using a delimiter. Thin wrapper that delegates to
-- ClassicAPI's C-level strsplit, kept as a pfUI.api entry point for
-- backwards compatibility with addons that call pfUI.api.strsplit.
-- Note: unlike the old Lua implementation, empty fields are preserved
-- (e.g. "a,,b" -> "a", "", "b"), matching real strsplit semantics.
+-- Splits a string using a delimiter. Self-contained on purpose: it does NOT
+-- delegate to the global strsplit / string.split, because third-party addons
+-- clobber those (e.g. BigWigs' SpellRequests redefines string:split to return
+-- a table, which would make this return a single table instead of r,g,b,a and
+-- break color/version parsing depending on load order). Delimiter chars are
+-- treated as a set (any one char splits), and empty fields are preserved
+-- ("a,,b" -> "a", "", "b"), matching real strsplit semantics.
 -- 'delimiter'  [string]        characters that will be interpreted as delimiter
 --                              characters (bytes) in the string.
 -- 'subject'    [string]        String to split.
 -- return:      [list]          a list of strings.
-local stringsplit = _G.string.split
+local format, sgsub = string.format, string.gsub
 function pfUI.api.strsplit(delimiter, subject)
  if not subject then return nil end
-  delimiter = delimiter or ":"
-  if stringsplit then
-    return stringsplit(delimiter, subject)
-  end
  local fields = {}
-  local pattern = string.format("([^%s]+)", delimiter)
-  string.gsub(subject, pattern, function(c) fields[table.getn(fields)+1] = c end)
+  delimiter = delimiter or ":"
+  local pattern = format("([^%s]+)", delimiter)
+  sgsub(subject, pattern, function(c) fields[table.getn(fields)+1] = c end)
  return unpack(fields)
 end

@@ -232,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
@@ -378,22 +377,20 @@ 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 ]
@@ -998,16 +995,34 @@ end

 -- [ GetStringColor ]
 -- Queries the pfUI setting strings and extract its color codes
-- returns r,g,b,a
-local color_cache = {}
-function pfUI.api.GetStringColor(colorstr)
-  if not color_cache[colorstr] then
-    local r, g, b, a = pfUI.api.strsplit(",", colorstr)
-    color_cache[colorstr] = { r, g, b, a }
+-- returns r,g,b,a as strings
+local color_cache = setmetatable({}, {
+  __index = function(t, k)
+    local color = { pfUI.api.strsplit(",", k) }
+    rawset(t, k, color)
+    return color
  end
+})
+function pfUI.api.GetStringColor(colorstr)
  return unpack(color_cache[colorstr])
 end

+-- [ GetStringColorObject ]
+-- Like GetStringColor, but returns a cached ColorMixin instead of raw values.
+-- The object is a shared per-string singleton, so treat it as read-only.
+-- returns a ColorMixin
+local color_object_cache = setmetatable({}, {
+  __index = function(t, 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
+})
+function pfUI.api.GetStringColorObject(colorstr)
+  return color_object_cache[colorstr]
+end
+
 -- [ rgbhex ]
 -- Returns color format from color info
 -- 'r'          [table | number]  color table or r color component
@@ -1015,12 +1030,13 @@ end
 -- 'b'          [number]          optional b color component
 -- 'a'          [number]          optional alpha component
 -- returns color string in the form of '|caarrggbb'
-local _r, _g, _b, _a
+local rgbhex_cache = {}
 function pfUI.api.rgbhex(r, g, b, a)
+  local _r, _g, _b, _a
  if type(r) == "table" then
    if r.r then
      _r, _g, _b, _a = r.r, r.g, r.b, (r.a or 1)
-    elseif table.getn(r) >= 3 then
+    elseif r[3] ~= nil then
      _r, _g, _b, _a = r[1], r[2], r[3], (r[4] or 1)
    end
  elseif tonumber(r) then
@@ -1028,7 +1044,13 @@ function pfUI.api.rgbhex(r, g, b, a)
  end

  if _r and _g and _b and _a then
-    return CreateColor(_r, _g, _b, _a):GenerateHexColorMarkup()
+    local key = ((Round(_r*255)*256 + Round(_g*255))*256 + Round(_b*255))*256 + Round(_a*255)
+    local hex = rgbhex_cache[key]
+    if not hex then
+      hex = "|c" .. C_ColorUtil.GenerateTextColorCode({ r = _r, g = _g, b = _b, a = _a })
+      rgbhex_cache[key] = hex
+    end
+    return hex
  end

  return ""
@@ -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")
@@ -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
@@ -238,6 +238,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,8 +398,7 @@ 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)
@@ -790,8 +790,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 +1111,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 +1174,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

@@ -1272,13 +1212,12 @@ end
 function pfUI.uf:EnableScripts()
  local f = self

-  f:SetScript("OnClick", pfUI.uf.OnClick)
+  f:SetAttribute("type1", "target")
+  f:SetAttribute("type2", "menu")

  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
@@ -1307,7 +1246,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
@@ -1434,6 +1373,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 +1431,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 +1441,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 +1498,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 +1520,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 +1717,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 +1746,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 +2063,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 +2072,31 @@ 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(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 +2139,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 +2195,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 +2218,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 ]]--

@@ -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"/>
@@ -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
@@ -35,7 +35,7 @@ libthrottle.defaults = {
  nameplates_target    = "custom",
  nameplates_castbar   = "custom",
  nameplates_mass      = "custom",
-  tooltip_cursor       = "custom",
+  tooltip_cursor       = "fastest",
  chat_tab             = "custom",
  swingtimer           = "custom",
 }
@@ -160,7 +160,7 @@ libthrottle:SetScript("OnEvent", function()
    -- Set defaults for custom fields if missing
    if not _G.pfUI_throttle.nameplates_target_custom then _G.pfUI_throttle.nameplates_target_custom = "50" end
    if not _G.pfUI_throttle.nameplates_custom then _G.pfUI_throttle.nameplates_custom = "10" end
-    if not _G.pfUI_throttle.nameplates_castbar_custom then _G.pfUI_throttle.nameplates_castbar_custom = "50" end
+    if not _G.pfUI_throttle.nameplates_castbar_custom then _G.pfUI_throttle.nameplates_castbar_custom = "100" end
    if not _G.pfUI_throttle.nameplates_mass_custom then _G.pfUI_throttle.nameplates_mass_custom = "7" end
    if not _G.pfUI_throttle.tooltip_cursor_custom then _G.pfUI_throttle.tooltip_cursor_custom = "10" end
    if not _G.pfUI_throttle.chat_tab_custom then _G.pfUI_throttle.chat_tab_custom = "10" end
@@ -89,7 +89,7 @@ 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)
@@ -128,7 +128,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)
@@ -149,24 +149,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())
@@ -604,17 +600,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
@@ -996,13 +992,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 +1157,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 +1344,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 +1546,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 +1561,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)
@@ -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()
@@ -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()
@@ -1145,8 +1129,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 +1154,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")
@@ -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)
@@ -277,28 +277,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 +317,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)
@@ -162,8 +162,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 +171,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 +200,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 +222,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 +419,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 +442,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 +449,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 +467,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
@@ -90,12 +97,15 @@ pfUI:RegisterModule("castbar", function ()
    cb:SetAlpha(1)
    cb.fadeout = nil

-    cb.bar:SetStatusBarColor(strsplit(",", C.appearance.castbar[isChannel and "channelcolor" or "castbarcolor"]))
+    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)
@@ -103,8 +113,7 @@ pfUI:RegisterModule("castbar", function ()
    if tex and cb.showicon then
      local size = cb:GetHeight()
      cb.icon:Show()
-      cb.icon:SetHeight(size)
-      cb.icon:SetWidth(size)
+      cb.icon:SetSize(size, size)
      cb.icon.texture:SetTexture(tex)
      cb.bar:SetPoint("TOPLEFT", cb.icon, "TOPRIGHT", cb.spacing, 0)
    else
@@ -123,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)
@@ -150,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
@@ -169,8 +188,7 @@ pfUI:RegisterModule("castbar", function ()
    -- icon
    cb.icon = CreateFrame("Frame", nil, cb)
    cb.icon:SetPoint("TOPLEFT", 0, 0)
-    cb.icon:SetHeight(16)
-    cb.icon:SetWidth(16)
+    cb.icon:SetSize(16, 16)

    cb.icon.texture = cb.icon:CreateTexture(nil, "OVERLAY")
    cb.icon.texture:SetAllPoints()
@@ -296,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()
@@ -335,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)
@@ -419,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)
@@ -491,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
@@ -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,10 +1,10 @@
 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()
@@ -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

@@ -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
@@ -1,5 +1,5 @@
 pfUI:RegisterModule("hunterbar", function ()
-  local _,class = UnitClass("player")
+  local class = UnitClassBase("player")
  if class ~= "HUNTER" or C.bars.hunterbar == "0" then return end

  -- Wing Clip (any rank) and Arcane Shot (any rank) spell IDs.
@@ -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

@@ -0,0 +1,331 @@
+-- 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()
+    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
+
+    -- Shared picker state (forward-declared so the grid/filter closures below
+    -- can capture them before RefreshIconGrid is assigned).
+    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
+        -- Spellbook extra type leads with class-relevant spell/talent icons.
+        provider = CreateAndInitFromMixin(IconDataProviderMixin, IconDataProviderExtraType.Spellbook)
+      end
+    end
+
+    -- ============================================================
+    -- Popup frame
+    -- ============================================================
+
+    local picker = CreateFrame("Frame", "pfMacroIconPicker", UIParent)
+    picker:SetFrameStrata("DIALOG")
+    picker:SetSize(472, 498)
+    -- 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)
+
+    picker.title = picker:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    picker.title:SetPoint("TOP", picker, "TOP", 0, -10)
+
+    picker.nameLabel = picker:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    picker.nameLabel:SetPoint("TOPLEFT", picker, "TOPLEFT", 14, -34)
+    picker.nameLabel:SetText(MACRO_POPUP_TEXT)
+
+    picker.editbox = CreateFrame("EditBox", "pfMacroIconPickerName", picker, "InputBoxTemplate")
+    picker.editbox:SetSize(280, 20)
+    picker.editbox:SetPoint("TOPLEFT", picker, "TOPLEFT", 14, -52)
+    picker.editbox:SetAutoFocus(false)
+    picker.editbox:SetMaxLetters(16)
+    CreateBackdrop(picker.editbox)
+
+    picker.selectedPreview = CreateFrame("Frame", nil, picker)
+    picker.selectedPreview:SetSize(42, 42)
+    picker.selectedPreview:SetPoint("TOPRIGHT", picker, "TOPRIGHT", -14, -44)
+    CreateBackdrop(picker.selectedPreview)
+    picker.selectedPreview.tex = picker.selectedPreview:CreateTexture(nil, "ARTWORK")
+    picker.selectedPreview.tex:SetAllPoints(picker.selectedPreview)
+    picker.selectedPreview.tex:SetTexCoord(.08, .92, .08, .92)
+
+    picker.iconLabel = picker:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    picker.iconLabel:SetPoint("TOPLEFT", picker, "TOPLEFT", 14, -100)
+    picker.iconLabel:SetText(T["Choose an Icon:"] or "Choose an Icon:")
+
+    -- Icon grid + scroll
+    local iconScroll = CreateFrame("ScrollFrame", "pfMacroIconScroll", picker, "FauxScrollFrameTemplate")
+    iconScroll:SetPoint("TOPLEFT", picker, "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)
+
+    local scrollbar = _G["pfMacroIconScrollScrollBar"]
+    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", "pfMacroIconFilter", picker, "UIDropDownMenuTemplate")
+    filterDropdown:SetPoint("TOPRIGHT", picker, "TOPRIGHT", 0, -94)
+    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 = 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, picker)
+        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
+            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
+
+    -- Normalize a texture to an uppercase basename so selection matching
+    -- works across sources: GetMacroInfo returns "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
+
+    -- 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
+      picker.selectedPreview.tex:SetTexture(selectedIconPath)
+    end
+
+    iconScroll:SetScript("OnVerticalScroll", function()
+      FauxScrollFrame_OnVerticalScroll(ICON_BTN_SIZE + ICON_BTN_PAD, function() RefreshIconGrid() end)
+    end)
+
+    -- ============================================================
+    -- 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 "")
+        selectedIconPath = texture or QUESTION_MARK
+        picker.title:SetText(T["Edit Macro"] or "Edit Macro")
+      else
+        picker.mode = "new"
+        picker.editbox:SetText("")
+        selectedIconPath = QUESTION_MARK
+        picker.title:SetText(T["New Macro"] or "New Macro")
+      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()
+      RefreshIconGrid()
+    end
+
+    local function SaveMacroPopup()
+      local text = strtrim(picker.editbox:GetText())
+      if text == "" then return end
+
+      if picker.mode == "edit" and MacroFrame.selectedMacro then
+        C_Macro.EditMacro(MacroFrame.selectedMacro, text, selectedIconPath, nil)
+        MacroFrame_SelectMacro(MacroFrame.selectedMacro)
+      else
+        local idx = C_Macro.CreateMacro(text, selectedIconPath, nil, (MacroFrame.macroBase or 0) > 0)
+        if idx then MacroFrame_SelectMacro(idx) end
+      end
+      picker:Hide()
+    end
+
+    picker:SetScript("OnHide", function()
+      if provider then provider:Release(); provider = nil end
+      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)
+
+    -- Search box (bottom-left) filters the grid by icon name.
+    picker.searchLabel = picker:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    picker.searchLabel:SetPoint("BOTTOMLEFT", picker, "BOTTOMLEFT", 16, 18)
+    picker.searchLabel:SetText(SEARCH)
+
+    picker.search = CreateFrame("EditBox", "pfMacroIconSearch", picker, "InputBoxTemplate")
+    picker.search:SetSize(180, 20)
+    picker.search:SetPoint("LEFT", picker.searchLabel, "RIGHT", 10, 0)
+    picker.search:SetAutoFocus(false)
+    CreateBackdrop(picker.search)
+    picker.search:SetScript("OnEscapePressed", function() this:ClearFocus() end)
+    picker.search:SetScript("OnTextChanged", function()
+      searchText = strupper(strtrim(this:GetText()))
+      RebuildFilter()
+      scrollbar:SetValue(0)
+      RefreshIconGrid()
+    end)
+
+    -- ============================================================
+    -- 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)
@@ -103,8 +103,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 +126,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 +164,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'
@@ -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
@@ -58,14 +57,27 @@ pfUI:RegisterModule("nameplates", function ()
  local inFriendlyZone = false
  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)
  
-  -- Resolve a unit token to its cast/channel info via C_Spell. Returns a
-  -- compact struct (spellName / icon / startTime / endTime / duration /
-  -- isChannel) or nil when the unit isn't casting. Callers already hold the
-  -- nameplate token, so there's no GUID->token round-trip.
-  local function GetCastInfo(unit)
+  -- 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 = {}
+
+  -- 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)
    local isChannel
@@ -84,13 +96,27 @@ pfUI:RegisterModule("nameplates", function ()
      isChannel = isChannel,
    }
  end
+
+  -- Read a unit's current cast from the event-driven cache (keyed by GUID).
+  -- Returns the cached struct while the cast is still active, else nil (and
+  -- prunes the expired entry). Same struct shape and callers as before, minus
+  -- the per-tick poll.
+  local function GetCastInfo(unit)
+    if not unit then return nil end
+    local guid = UnitGUID(unit)
+    if not guid then return nil end
+    local info = castState[guid]
+    if info and info.endTime > GetTime() then return info end
+    if info then castState[guid] = nil end
+    return nil
+  end
  
  local debuffCache = {}    -- guid -> { [spellID] = { start, duration } }
  -- Reusable per-plate debuff display buffer (avoid GC churn from per-call table creation)
  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
@@ -154,9 +180,8 @@ pfUI:RegisterModule("nameplates", function ()
  -- ============================================================================
  local frameState = {
    now = 0,
-    hasTarget = false,
    targetGuid = nil,
-    hasMouseover = false,
+    mouseoverGuid = nil,
  }

  -- cache default border color
@@ -425,8 +450,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
@@ -453,6 +477,11 @@ nameplates:RegisterEvent("NAME_PLATE_UNIT_ADDED")
 nameplates:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
 nameplates:RegisterEvent("UNIT_AURA")
 nameplates:RegisterEvent("UNIT_FLAGS")
+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:SetScript("OnEvent", function()
    -- Stop event handling during logout to prevent crash 132
@@ -470,6 +499,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
        CacheConfig()
        this:SetGameVariables()
        RebuildRaidGuidCache()
+        frameState.targetGuid = UnitGUID("target")
      end
      
      -- Handle friendly zone nameplate disable feature
@@ -529,8 +559,17 @@ nameplates:RegisterEvent("UNIT_FLAGS")
      -- token itself for token-based UnitX reads (stable per plate lifetime).
      local plate = C_NamePlate.GetNamePlateForUnit(arg1)
      if plate and plate.nameplate then
-        plate.nameplate.cachedGuid = UnitGUID(arg1)
+        visiblePlates[plate] = plate
+        local guid = UnitGUID(arg1)
+        plate.nameplate.cachedGuid = guid
        plate.nameplate.unit = arg1
+        if guid then
+          plateByGuid[guid] = plate.nameplate
+          -- 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)
      end
      visiblePlateCount = visiblePlateCount + 1
@@ -539,12 +578,15 @@ nameplates:RegisterEvent("UNIT_FLAGS")
      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
        if threatMemory[guid] then threatMemory[guid] = nil end
        if combatColorCache[guid] then combatColorCache[guid] = nil end
-        local plate = C_NamePlate.GetNamePlateForUnit(arg1)
+        if castState[guid] then castState[guid] = nil end
+        if plateByGuid[guid] then plateByGuid[guid] = nil end
        if plate and plate.nameplate and plate.nameplate.cachedGuid == guid then
          plate.nameplate.cachedGuid = nil
          plate.nameplate.unit = nil
@@ -552,10 +594,6 @@ nameplates:RegisterEvent("UNIT_FLAGS")
      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
@@ -563,6 +601,45 @@ nameplates:RegisterEvent("UNIT_FLAGS")
        end
      end

+    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.
+      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 == "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_AURA" then
      -- ClassicAPI: fires with arg1 == "nameplateN" when a unit's aura set
      -- changes (add/remove/modify). Flag the matching plate so OnUpdate does a
@@ -578,6 +655,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
      end

    elseif event == "PLAYER_TARGET_CHANGED" then
+      frameState.targetGuid = UnitGUID('target')
      -- Flag the target's plate for update
      local plate = C_NamePlate.GetNamePlateForUnit("target")
      if plate and plate.nameplate then
@@ -606,21 +684,15 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    -- PERF: Cache GetTime() once per frame
    frameState.now = now
-    frameState.hasTarget, frameState.targetGuid = UnitExists("target")
-    frameState.hasMouseover = UnitExists("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
@@ -653,7 +725,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
  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)
@@ -718,8 +790,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    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()
@@ -807,11 +878,11 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    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"

@@ -824,8 +895,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    RebuildOfftanks()

-    nameplate:SetWidth(plate_width)
-    nameplate:SetHeight(plate_height)
+    nameplate:SetSize(plate_width, plate_height)
    nameplate:SetPoint("TOP", parent, "TOP", 0, 0)

    nameplate.name:SetFont(font, font_size, font_style)
@@ -854,23 +924,20 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    nameplate.guild:SetFont(font, font_size, font_style)

-    nameplate.glow:SetWidth(C.nameplates.width + 60)
-    nameplate.glow:SetHeight(C.nameplates.heighthealth + 30)
+    nameplate.glow:SetSize(C.nameplates.width + 60, C.nameplates.heighthealth + 30)
    nameplate.glow:SetVertexColor(glowr, glowg, glowb, glowa)

    nameplate.raidicon:ClearAllPoints()
    nameplate.raidicon:SetPoint("BOTTOM", nameplate.health, "TOP", C.nameplates.raidiconoffx, C.nameplates.raidiconoffy)
    nameplate.level:SetFont(font, font_size, font_style)
-    nameplate.raidicon:SetWidth(C.nameplates.raidiconsize)
-    nameplate.raidicon:SetHeight(C.nameplates.raidiconsize)
+    nameplate.raidicon:SetSize(C.nameplates.raidiconsize, C.nameplates.raidiconsize)

    for i=1,16 do
      UpdateDebuffConfig(nameplate, i)
    end

    for i=1,5 do
-      nameplate.combopoints[i]:SetWidth(combo_size)
-      nameplate.combopoints[i]:SetHeight(combo_size)
+      nameplate.combopoints[i]:SetSize(combo_size, combo_size)
      nameplate.combopoints[i]:SetPoint("TOPRIGHT", nameplate.health, "BOTTOMRIGHT", -(i-1)*(combo_size+default_border*3), -default_border*3)
      CreateBackdrop(nameplate.combopoints[i], default_border)
    end
@@ -881,7 +948,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
    -- 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
@@ -928,7 +995,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
    end

    local target = plate.istarget
-    local mouseover = UnitExists("mouseover") and plate.original.glow:IsShown() or nil
+    local mouseover = plate.cachedGuid and plate.cachedGuid == frameState.mouseoverGuid or nil
    local unitstr = target and "target" or mouseover and "mouseover" or plate.cachedGuid or nil

    -- resolve player vs npc from plate's own unit so libunitscan can't return
@@ -1266,7 +1333,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
    -- 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.
@@ -1316,7 +1383,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
    local update
    local original = nameplate.original
    local name = original.name:GetText()
-    local mouseover = state and state.hasMouseover and original.glow:IsShown() or nil
+    local mouseover = nameplate.cachedGuid and nameplate.cachedGuid == frameState.mouseoverGuid or nil

    -- trigger queued event update
    if hasEventUpdate then
@@ -1380,7 +1447,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")

    -- 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)
@@ -1471,8 +1538,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
          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
@@ -1570,7 +1636,7 @@ nameplates:RegisterEvent("UNIT_FLAGS")
      -- Relative 0..duration range to avoid float precision loss with large
      -- absolute timestamps.
      nameplate.castbar:SetMinMaxValues(0, duration)
-      nameplate.castbar:SetStatusBarColor(strsplit(",", C.appearance.castbar[(isChannel and "channelcolor" or "castbarcolor")]))
+      nameplate.castbar:SetStatusBarColor(GetStringColor(C.appearance.castbar[(isChannel and "channelcolor" or "castbarcolor")]))
      if castInfo.icon then
        nameplate.castbar.icon.tex:SetTexture(castInfo.icon)
        nameplate.castbar.icon.tex:SetTexCoord(.1,.9,.1,.9)
@@ -1590,20 +1656,17 @@ nameplates:RegisterEvent("UNIT_FLAGS")
    if not nameplate.castbar.isShown then nameplate.castbar.isShown = true; nameplate.castbar:Show() end
  end

-  -- Dedicated frame that updates ONLY the target plate castbar.
-  -- Uses nameplates_castbar throttle from libthrottle.
+  -- Dedicated frame that updates ONLY the target plate castbar. Unthrottled:
+  -- now that casts are event-driven, this just reads the cache + SetValue, so
+  -- it animates the fill every frame for the smoothest sweep on the bar the
+  -- player watches most. (Non-target plates stay throttled via the central
+  -- loop's nameplates_castbar gate.)
  nameplates.castbarFrame = CreateFrame("Frame", nil, UIParent)
  nameplates.castbarFrame:SetScript("OnUpdate", function()
-    if not cfg.showcastbar then return end
-    local now = GetTime()
-    local throttle = pfUI.throttle:Get("nameplates_castbar")
-    if (this.tick or 0) > now then return end
-    this.tick = now + throttle
-
-    local frame = C_NamePlate.GetNamePlateForUnit("target")
-    if not frame or not frame.nameplate then return end
-
-    nameplates.UpdateCastbar(frame.nameplate, now)
+    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)

  -- set nameplate game settings
@@ -4,7 +4,7 @@ pfUI:RegisterModule("newitem", function ()

  pfUI.newitem = {}

-  local color = CreateColor(strsplit(",", C.appearance.bags.newitem_color))
+  local r, g, b, a = pfUI.api.GetStringColor(C.appearance.bags.newitem_color)

  function pfUI.newitem:UpdateSlot(bag, slot)
    if bag < 0 or bag > 4 then return end
@@ -18,7 +18,7 @@ pfUI:RegisterModule("newitem", function ()
        local glow = frame:CreateTexture(nil, "OVERLAY")
        glow:SetTexture("Interface\\Buttons\\UI-ActionButton-Border")
        glow:SetBlendMode("ADD")
-        glow:SetVertexColor(color:GetRGBA())
+        glow:SetVertexColor(r, g, b, a)
        glow:SetPoint("CENTER", frame, "CENTER")
        glow:Hide()
        glow.RefreshSize = function(g)
@@ -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()

@@ -346,7 +335,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 +387,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 +400,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 +480,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 +629,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 +670,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 +692,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 +729,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 +778,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
@@ -234,7 +234,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()
@@ -82,7 +82,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


@@ -908,7 +908,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

@@ -350,10 +350,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
@@ -23,36 +23,54 @@ pfUI:RegisterModule("tooltip", function ()
  end

  if C.tooltip.position == "cursor" then
+    -- Cursor mode makes the tooltip follow the mouse. The client has no
+    -- mouse-move event, so following means polling GetCursorPosition() via an
+    -- invisible follower frame that the tooltip anchors to. The follower is
+    -- only shown while a tooltip is visible -- an OnUpdate fires only while its
+    -- frame is shown, so the poll stops the moment the tooltip hides instead
+    -- of running forever.
+    local follower, Reposition
+    if C.tooltip.cursoralign ~= "native" then
+      local size = tonumber(C.tooltip.cursoroffset) * 2
+      follower = CreateFrame("Frame", nil, UIParent)
+      follower:SetSize(size, size)
+      follower:Hide()
+
+      Reposition = function()
+        local scale = UIParent:GetScale()
+        local x, y = GetCursorPosition()
+        follower:SetPoint("CENTER", UIParent, "BOTTOMLEFT", x/scale, y/scale)
+        if C.tooltip.cursoralign == "top" then
+          follower:SetWidth(GameTooltip:GetWidth())
+        end
+      end
+
+      follower:SetScript("OnUpdate", function()
+        -- throttle - cursor following doesn't need to be every frame
+        if (this.tick or 0) > GetTime() then return end
+        this.tick = GetTime() + (pfUI.throttle and pfUI.throttle:Get("tooltip_cursor") or 0.1)
+        Reposition()
+      end)
+
+      -- stop polling as soon as the tooltip is gone
+      pfUI.tooltip:SetScript("OnHide", function() follower:Hide() end)
+    end
+
    function _G.GameTooltip_SetDefaultAnchor(tooltip, parent)
      tooltip:SetOwner(parent, "ANCHOR_CURSOR")
-      if C.tooltip.cursoralign ~= "native" then
-        -- create mouse follow frame
-        if not tooltip.cursor then
-          tooltip.cursor = CreateFrame("Frame", nil, UIParent)
-          local size = tonumber(C.tooltip.cursoroffset) * 2
-          tooltip.cursor:SetSize(size, size)
-          tooltip.cursor:SetScript("OnUpdate", function()
-            -- throttle - cursor following doesn't need to be every frame
-            if (this.tick or 0) > GetTime() then return end
-            this.tick = GetTime() + (pfUI.throttle and pfUI.throttle:Get("tooltip_cursor") or 0.1)
+      if not follower then return end

-            local scale = UIParent:GetScale()
-            local x, y = GetCursorPosition()
-            this:SetPoint("CENTER", UIParent, "BOTTOMLEFT", x/scale, y/scale)
-            if C.tooltip.cursoralign == "top" then
-              tooltip.cursor:SetWidth(tooltip:GetWidth())
-            end
-          end)
-        end
+      -- position the follower right away so the tooltip doesn't flash at a
+      -- stale spot before the first OnUpdate tick
+      follower:Show()
+      Reposition()

-        -- adjust tooltip to mouse frame
-        if C.tooltip.cursoralign == "top" then
-          tooltip:SetPoint("BOTTOMLEFT", tooltip.cursor, "TOPLEFT", 0, 0)
-        elseif C.tooltip.cursoralign == "left" then
-          tooltip:SetPoint("BOTTOMRIGHT", tooltip.cursor, "LEFT", 0, 0)
-        elseif C.tooltip.cursoralign == "right" then
-          tooltip:SetPoint("BOTTOMLEFT", tooltip.cursor, "RIGHT", 0, 0)
-        end
+      if C.tooltip.cursoralign == "top" then
+        tooltip:SetPoint("BOTTOMLEFT", follower, "TOPLEFT", 0, 0)
+      elseif C.tooltip.cursoralign == "left" then
+        tooltip:SetPoint("BOTTOMRIGHT", follower, "LEFT", 0, 0)
+      elseif C.tooltip.cursoralign == "right" then
+        tooltip:SetPoint("BOTTOMLEFT", follower, "RIGHT", 0, 0)
      end
    end
  end
@@ -183,7 +201,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")
@@ -218,7 +236,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]
@@ -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 = {
@@ -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     = 10900  -- (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"
@@ -309,7 +309,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
@@ -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")