From 4a968d37323c9382e6320bf4678b07016779fb4f Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 20 Apr 2018 21:28:51 +0200
Subject: [PATCH 01/82] Update TOC to 80000

---
 CHANGELOG.md                                | 17 ++++++++++++-----
 WeakAuras/WeakAuras.toc                     |  2 +-
 WeakAurasModelPaths/WeakAurasModelPaths.toc |  2 +-
 WeakAurasOptions/WeakAurasOptions.toc       |  2 +-
 WeakAurasTemplates/WeakAurasTemplates.toc   |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9351f755f..6fbe44eb89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,18 @@
 # WeakAuras 2
 
-## [2.5.10](https://github.com/WeakAuras/WeakAuras2/tree/2.5.10) (2018-04-07)
+## [2.5.10-3-g905d80f](https://github.com/WeakAuras/WeakAuras2/tree/905d80f6e47ae9176eda459d3305a3bf199da5cb) (2018-04-20)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.9...2.5.10)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...905d80f6e47ae9176eda459d3305a3bf199da5cb)
 
-Infus (2):
+Benjamin Staneck (1):
 
-- Add Timewalking Raids to Load conditions
-- Fix importing dynamic groups doesn't reset the offset
+- Update TOC to 80000
+
+Infus (1):
+
+- Setup fallback state so that it has no duration
+
+asakawa-k (1):
+
+- Add key bindings to open/close the options window (#385)
 
diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index e44081d9dc..9048f2dae2 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: WeakAuras 2
 ## Author: Mirrored and the WeakAuras Team
 ## Version: @project-version@
diff --git a/WeakAurasModelPaths/WeakAurasModelPaths.toc b/WeakAurasModelPaths/WeakAurasModelPaths.toc
index 7415419a3a..60e631cc05 100644
--- a/WeakAurasModelPaths/WeakAurasModelPaths.toc
+++ b/WeakAurasModelPaths/WeakAurasModelPaths.toc
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: WeakAuras Model Paths
 ## Author: Mirrored and the WeakAuras Team
 ## Version: @project-version@
diff --git a/WeakAurasOptions/WeakAurasOptions.toc b/WeakAurasOptions/WeakAurasOptions.toc
index 70a399ece5..3c3c8fac78 100644
--- a/WeakAurasOptions/WeakAurasOptions.toc
+++ b/WeakAurasOptions/WeakAurasOptions.toc
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: WeakAuras Options
 ## Author: Mirrored and the WeakAuras Team
 ## Version: @project-version@
diff --git a/WeakAurasTemplates/WeakAurasTemplates.toc b/WeakAurasTemplates/WeakAurasTemplates.toc
index 6e933660b4..8de607664b 100644
--- a/WeakAurasTemplates/WeakAurasTemplates.toc
+++ b/WeakAurasTemplates/WeakAurasTemplates.toc
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: WeakAuras Templates
 ## Author: Infus
 ## Version: @project-version@

From 14f80eeae4d24ae9cd2a8226c42721e4962e9ee9 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 20 Apr 2018 22:25:27 +0200
Subject: [PATCH 02/82] disable HereBeDragons integration for now

---
 CHANGELOG.md             |  7 ++++---
 WeakAuras/Prototypes.lua | 22 +++++++++++-----------
 WeakAuras/WeakAuras.lua  |  8 ++++----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fbe44eb89..98070c34da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # WeakAuras 2
 
-## [2.5.10-3-g905d80f](https://github.com/WeakAuras/WeakAuras2/tree/905d80f6e47ae9176eda459d3305a3bf199da5cb) (2018-04-20)
+## [2.5.10-4-g8700ba2](https://github.com/WeakAuras/WeakAuras2/tree/8700ba23d69a8323035db01df41bf96511f06848) (2018-04-20)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...905d80f6e47ae9176eda459d3305a3bf199da5cb)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...8700ba23d69a8323035db01df41bf96511f06848)
 
-Benjamin Staneck (1):
+Benjamin Staneck (2):
 
+- disable HereBeDragons integration for now
 - Update TOC to 80000
 
 Infus (1):
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 4fe9906388..3b3a5ff473 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -21,7 +21,7 @@ function WeakAuras.IsSpellInRange(spellId, unit)
   return SpellRange.IsSpellInRange(spellId, unit)
 end
 
-local HBD = LibStub("HereBeDragons-1.0")
+-- local HBD = LibStub("HereBeDragons-1.0")
 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
@@ -843,16 +843,16 @@ WeakAuras.load_prototype = {
       type = "string",
       init = "arg"
     },
-    {
-      name = "zoneId",
-      display = L["Zone ID"],
-      type = "string",
-      init = "arg",
-      desc = function()
-         return L["Zone ID List"] .. "\n" .. L["Current Zone ID:"] .. " " .. HBD:GetPlayerZone();
-       end,
-      test = "WeakAuras.CheckNumericIds([[%s]], zoneId)"
-    },
+    -- {
+    --   name = "zoneId",
+    --   display = L["Zone ID"],
+    --   type = "string",
+    --   init = "arg",
+    --   desc = function()
+    --      return L["Zone ID List"] .. "\n" .. L["Current Zone ID:"] .. " " .. HBD:GetPlayerZone();
+    --    end,
+    --   test = "WeakAuras.CheckNumericIds([[%s]], zoneId)"
+    -- },
     {
       name = "encounterid",
       display = L["Encounter ID"],
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index e8cc5c3e66..77557038fe 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -36,7 +36,7 @@ function WeakAurasTimers:ScheduleTimerFixed(func, delay, ...)
 end
 
 local LDB = LibStub:GetLibrary("LibDataBroker-1.1")
-local HBD = LibStub("HereBeDragons-1.0")
+-- local HBD = LibStub("HereBeDragons-1.0")
 
 local timer = WeakAurasTimers
 WeakAuras.timer = timer
@@ -1315,7 +1315,7 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   end
 
   local player, realm, spec, role, zone = UnitName("player"), GetRealmName(), GetSpecialization(), UnitGroupRolesAssigned("player"), GetRealZoneText();
-  local zoneId = HBD:GetPlayerZone();
+  -- local zoneId = HBD:GetPlayerZone();
   local _, race = UnitRace("player")
   local faction = UnitFactionGroup("player")
 
@@ -1439,8 +1439,8 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   for id, data in pairs(db.displays) do
     if (data and not data.controlledChildren) then
       local loadFunc = loadFuncs[id];
-      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role);
-      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role);
+      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, encounter_id, size, difficulty, role); --zoneId
+      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, encounter_id, size, difficulty, role); -- oneId
 
       if(shouldBeLoaded and not loaded[id]) then
         WeakAuras.LoadDisplay(id);

From 5225a91af02e85e55cf96c705a58bc8a476ff503 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 21 Apr 2018 04:58:40 +0200
Subject: [PATCH 03/82] the rank return from UnitAura has been removed

---
 CHANGELOG.md              | 7 ++++---
 WeakAuras/BuffTrigger.lua | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98070c34da..20ef46054a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # WeakAuras 2
 
-## [2.5.10-4-g8700ba2](https://github.com/WeakAuras/WeakAuras2/tree/8700ba23d69a8323035db01df41bf96511f06848) (2018-04-20)
+## [2.5.10-5-g7760785](https://github.com/WeakAuras/WeakAuras2/tree/7760785f21388326f68389c197b2c9353ca99647) (2018-04-21)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...8700ba23d69a8323035db01df41bf96511f06848)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...7760785f21388326f68389c197b2c9353ca99647)
 
-Benjamin Staneck (2):
+Benjamin Staneck (3):
 
+- the rank return from UnitAura has been removed
 - disable HereBeDragons integration for now
 - Update TOC to 80000
 
diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index e99a91812b..a0fd98d459 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -492,7 +492,7 @@ function WeakAuras.ScanAuras(unit)
               -- Update scan cache
               if(aura_scan_cache[unit][filter].up_to_date < index) then
                 -- Query aura data
-                name, _, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, index, filter);
+                name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, index, filter);
                 tooltip, debuffClass, tooltipSize = WeakAuras.GetAuraTooltipInfo(unit, index, filter);
                 aura_scan_cache[unit][filter][index] = aura_scan_cache[unit][filter][index] or {};
 
@@ -588,7 +588,7 @@ function WeakAuras.ScanAuras(unit)
 
             for index, checkname in pairs(data.names) do
               -- Fetch aura data
-              name, _, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, checkname, nil, filter);
+              name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, checkname, nil, filter);
               if (name) then
                 WeakAuras.SetDynamicIconCache(name, spellId, icon);
               end
@@ -960,7 +960,7 @@ do
       local updateTriggerState = false;
       for triggernum, data in pairs(triggers) do
         local filter = data.debuffType..(data.ownOnly and "|PLAYER" or "");
-        local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(unit, spellName, nil, filter);
+        local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(unit, spellName, nil, filter);
         if(name and (data.spellId == nil or data.spellId == spellId)) then
           data.GUIDs = data.GUIDs or {};
           data.GUIDs[destGUID] = data.GUIDs[destGUID] or {};
@@ -1119,7 +1119,7 @@ do
             local updateTriggerState = false;
             for triggernum, data in pairs(triggers) do
               local filter = data.debuffType..(data.ownOnly and "|PLAYER" or "");
-              local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(uid, spellName, nil, filter);
+              local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(uid, spellName, nil, filter);
               if(name) then
                 data.GUIDs = data.GUIDs or {};
                 data.GUIDs[guid] = data.GUIDs[guid] or {};

From 283a78b7fd248606756a626ccc38fc38fc070c96 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 21 Apr 2018 15:54:21 +0200
Subject: [PATCH 04/82] Mark disabled HBD with a TODO 8.0

Also readd Player ZoneId Load Condition by mark it as NYI
---
 WeakAuras/Prototypes.lua | 22 +++++++++++-----------
 WeakAuras/WeakAuras.lua  |  8 ++++----
 WeakAuras/embeds.xml     |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 3b3a5ff473..01bf1c99d3 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -21,7 +21,7 @@ function WeakAuras.IsSpellInRange(spellId, unit)
   return SpellRange.IsSpellInRange(spellId, unit)
 end
 
--- local HBD = LibStub("HereBeDragons-1.0")
+-- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
@@ -843,16 +843,16 @@ WeakAuras.load_prototype = {
       type = "string",
       init = "arg"
     },
-    -- {
-    --   name = "zoneId",
-    --   display = L["Zone ID"],
-    --   type = "string",
-    --   init = "arg",
-    --   desc = function()
-    --      return L["Zone ID List"] .. "\n" .. L["Current Zone ID:"] .. " " .. HBD:GetPlayerZone();
-    --    end,
-    --   test = "WeakAuras.CheckNumericIds([[%s]], zoneId)"
-    -- },
+    {
+      name = "zoneId",
+      display = L["Zone ID (NYI)"],
+      type = "string",
+      init = "arg",
+      desc = function()
+         return L["Zone ID List"] .. "\n" .. L["Current Zone ID:"] .. " "; --TODO 8.0.. HBD:GetPlayerZone();
+       end,
+      test = "WeakAuras.CheckNumericIds([[%s]], zoneId)"
+    },
     {
       name = "encounterid",
       display = L["Encounter ID"],
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 77557038fe..8794889d98 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -36,7 +36,7 @@ function WeakAurasTimers:ScheduleTimerFixed(func, delay, ...)
 end
 
 local LDB = LibStub:GetLibrary("LibDataBroker-1.1")
--- local HBD = LibStub("HereBeDragons-1.0")
+-- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
 
 local timer = WeakAurasTimers
 WeakAuras.timer = timer
@@ -1315,7 +1315,7 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   end
 
   local player, realm, spec, role, zone = UnitName("player"), GetRealmName(), GetSpecialization(), UnitGroupRolesAssigned("player"), GetRealZoneText();
-  -- local zoneId = HBD:GetPlayerZone();
+  local zoneId = nil; -- TODO 8.0 HBD:GetPlayerZone();
   local _, race = UnitRace("player")
   local faction = UnitFactionGroup("player")
 
@@ -1439,8 +1439,8 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   for id, data in pairs(db.displays) do
     if (data and not data.controlledChildren) then
       local loadFunc = loadFuncs[id];
-      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, encounter_id, size, difficulty, role); --zoneId
-      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, encounter_id, size, difficulty, role); -- oneId
+      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role); --zoneId
+      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role); -- oneId
 
       if(shouldBeLoaded and not loaded[id]) then
         WeakAuras.LoadDisplay(id);
diff --git a/WeakAuras/embeds.xml b/WeakAuras/embeds.xml
index 8c06ef600f..74f5c07479 100644
--- a/WeakAuras/embeds.xml
+++ b/WeakAuras/embeds.xml
@@ -18,7 +18,7 @@
 	<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
 	<Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua"/>
 	<Script file="Libs\LibSpellRange-1.0\LibSpellRange-1.0.lua"/>
-	<Script file="Libs\HereBeDragons-1.0\HereBeDragons-1.0.lua"/>
+	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-1.0.lua"/>-->
 	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
 	<!--@end-no-lib-strip@-->
 </Ui>

From d1b81f4052db6389e27e9df476187d3051865e24 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 21 Apr 2018 15:58:16 +0200
Subject: [PATCH 05/82] Disable LibRangeCheck-2.0 for now

---
 WeakAuras/Prototypes.lua | 8 ++++----
 WeakAuras/embeds.xml     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 01bf1c99d3..596fbc3342 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -22,14 +22,14 @@ function WeakAuras.IsSpellInRange(spellId, unit)
 end
 
 -- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
-local LibRangeCheck = LibStub("LibRangeCheck-2.0")
+-- TODO 8.0 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
-  return LibRangeCheck:GetRange(unit);
+  return 0, 8; -- TODO 8.0 LibRangeCheck:GetRange(unit);
 end
 
 function WeakAuras.CheckRange(unit, range, operator)
-  local min, max = LibRangeCheck:GetRange(unit);
+  local min, max = 0, 8; --TODO 8.0 LibRangeCheck:GetRange(unit);
   if (operator == "<=") then
     return max <= range;
   else
@@ -4224,7 +4224,7 @@ WeakAuras.event_prototypes = {
     events = {
       "FRAME_UPDATE",
     },
-    name = L["Range Check"],
+    name = L["Range Check (NYI)"],
     init = function(trigger)
       trigger.unit = trigger.unit or "target";
       local ret = [=[
diff --git a/WeakAuras/embeds.xml b/WeakAuras/embeds.xml
index 74f5c07479..b387ad136a 100644
--- a/WeakAuras/embeds.xml
+++ b/WeakAuras/embeds.xml
@@ -19,6 +19,6 @@
 	<Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua"/>
 	<Script file="Libs\LibSpellRange-1.0\LibSpellRange-1.0.lua"/>
 	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-1.0.lua"/>-->
-	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
+	<!-- TODO 8.0 <Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/> -->
 	<!--@end-no-lib-strip@-->
 </Ui>

From a559734e4746ae662f8a370195ae624d664c74b9 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 21 Apr 2018 17:29:14 +0200
Subject: [PATCH 06/82] Dry code PVP Talents

---
 WeakAuras/Prototypes.lua | 72 +++++++++++++++++++++++-----------------
 WeakAuras/Types.lua      | 25 +++++---------
 WeakAuras/WeakAuras.lua  | 21 +++++++-----
 3 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 596fbc3342..e7e6d167e8 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -16,6 +16,8 @@ local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitC
 local WeakAuras = WeakAuras
 local L = WeakAuras.L
 
+-- luacheck: globals C_SpecializationInfo
+
 local SpellRange = LibStub("SpellRange-1.0")
 function WeakAuras.IsSpellInRange(spellId, unit)
   return SpellRange.IsSpellInRange(spellId, unit)
@@ -479,10 +481,20 @@ function WeakAuras.CheckTalentByIndex(index)
 end
 
 function WeakAuras.CheckPvpTalentByIndex(index)
-  local tier = ceil(index / 3)
-  local column = (index - 1) % 3 + 1
-  local _, _, _, selected = GetPvpTalentInfo(tier, column, 1)
-  return selected
+  if (index <= 3) then
+    local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(1);
+    local checkTalentId = talentSlotInfo.availableTalentIDs[index];
+    return talentSlotInfo.selectedTalentID == checkTalentId;
+  else
+    local checkTalentId = C_SpecializationInfo.GetPvpTalentSlotInfo(2).availableTalentIDs[index - 3];
+    for i = 2, 4 do
+      local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(i);
+      if (talentSlotInfo.selectedTalentID == checkTalentId) then
+        return true;
+      end
+    end
+    return false;
+  end
 end
 
 function WeakAuras.CheckNumericIds(loadids, currentId)
@@ -753,59 +765,59 @@ WeakAuras.load_prototype = {
     },
     {
       name = "pvptalent",
-      display = L["PvP Talent selected"],
+      display = L["PvP Talent selected (NYI)"], -- TODO 8.0 dry coded, untested
       type = "multiselect",
       values = function(trigger)
         return function()
           local single_class;
           -- First check to use if the class load is on multi-select with only one class selected
           if(trigger.use_class == false and trigger.class and trigger.class.multi) then
-            local num_classes = 0;
-            for class in pairs(trigger.class.multi) do
-              single_class = class;
-              num_classes = num_classes + 1;
-            end
-            if(num_classes ~= 1) then
-              single_class = nil;
-            end
+           local num_classes = 0;
+           for class in pairs(trigger.class.multi) do
+             single_class = class;
+             num_classes = num_classes + 1;
+           end
+           if(num_classes ~= 1) then
+             single_class = nil;
+           end
           end
           -- If that is not the case, see if it is on single-select
           if((not single_class) and trigger.use_class and trigger.class and trigger.class.single) then
-            single_class = trigger.class.single
+           single_class = trigger.class.single
           end
 
           if (trigger.use_class == nil) then -- no class selected, fallback to current class
-            single_class = select(2, UnitClass("player"));
+           single_class = select(2, UnitClass("player"));
           end
 
           local single_spec;
           if (single_class) then
-            if(trigger.use_spec == false and trigger.spec and trigger.spec.multi) then
-              local num_specs = 0;
-              for spec in pairs(trigger.spec.multi) do
-                single_spec = spec;
-                num_specs = num_specs + 1;
-              end
-              if (num_specs ~= 1) then
-                single_spec = nil;
-              end
-            end
+           if(trigger.use_spec == false and trigger.spec and trigger.spec.multi) then
+             local num_specs = 0;
+             for spec in pairs(trigger.spec.multi) do
+               single_spec = spec;
+               num_specs = num_specs + 1;
+             end
+             if (num_specs ~= 1) then
+               single_spec = nil;
+             end
+           end
           end
           if ((not single_spec) and trigger.use_spec and trigger.spec and trigger.spec.single) then
-            single_spec = trigger.spec.single;
+           single_spec = trigger.spec.single;
           end
 
           if (trigger.use_spec == nil) then
-            single_spec = GetSpecialization();
+           single_spec = GetSpecialization();
           end
 
           -- print ("Using talent cache", single_class, single_spec);
           -- If a single specific class was found, load the specific list for it
           if(single_class and WeakAuras.pvp_talent_types_specific[single_class]
-            and single_spec and WeakAuras.pvp_talent_types_specific[single_class][single_spec]) then
-            return WeakAuras.pvp_talent_types_specific[single_class][single_spec];
+           and single_spec and WeakAuras.pvp_talent_types_specific[single_class][single_spec]) then
+           return WeakAuras.pvp_talent_types_specific[single_class][single_spec];
           else
-            return WeakAuras.pvp_talent_types;
+           return WeakAuras.pvp_talent_types;
           end
         end
       end,
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 0db55947a2..a1cf5d80ef 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -530,22 +530,15 @@ do
   end
 end
 
-WeakAuras.pvp_talent_types = {};
-do
-  local numTalents, numTiers, numColumns =  MAX_PVP_TALENT_TIERS * MAX_PVP_TALENT_COLUMNS, MAX_PVP_TALENT_TIERS, MAX_PVP_TALENT_COLUMNS
-  local talentId, tier, column = 1, 1, 1
-  while talentId <= numTalents do
-    while tier <= numTiers do
-      while column <= numColumns do
-        WeakAuras.pvp_talent_types[talentId] = L["Tier "]..tier.." - "..column
-        column = column + 1
-        talentId = talentId + 1
-      end
-      column = 1
-      tier = tier + 1
-    end
-    tier = 1
-  end
+WeakAuras.pvp_talent_types = {
+  select(2, GetPvpTalentInfoByID(3589)),
+  select(2, GetPvpTalentInfoByID(3588)),
+  select(2, GetPvpTalentInfoByID(3587)),
+  nil
+};
+
+for i = 1,10 do
+  tinsert(WeakAuras.pvp_talent_types, string.format(L["PvP Talent %i"], i));
 end
 
 -- GetTotemInfo() only works for the first 5 totems
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 8794889d98..52dbbf36d2 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -44,7 +44,7 @@ WeakAuras.timer = timer
 local L = WeakAuras.L
 
 -- luacheck: globals NamePlateDriverFrame CombatText_AddMessage COMBAT_TEXT_SCROLL_FUNCTION
--- luacheck: globals Lerp Saturate KuiNameplatesPlayerAnchor KuiNameplatesCore ElvUIPlayerNamePlateAnchor GTFO
+-- luacheck: globals Lerp Saturate KuiNameplatesPlayerAnchor KuiNameplatesCore ElvUIPlayerNamePlateAnchor GTFO C_SpecializationInfo
 
 local queueshowooc;
 
@@ -1005,6 +1005,7 @@ WeakAuras.talent_types_specific = {}
 WeakAuras.pvp_talent_types_specific = {}
 function WeakAuras.CreateTalentCache()
   local _, player_class = UnitClass("player")
+
   WeakAuras.talent_types_specific[player_class] = WeakAuras.talent_types_specific[player_class] or {};
   WeakAuras.pvp_talent_types_specific[player_class] = WeakAuras.pvp_talent_types_specific[player_class] or {};
   local spec = GetSpecialization()
@@ -1023,14 +1024,16 @@ function WeakAuras.CreateTalentCache()
     end
   end
 
-  for tier = 1, MAX_PVP_TALENT_TIERS do
-    for column = 1, MAX_PVP_TALENT_COLUMNS do
-      local _, talentName, talentIcon = GetPvpTalentInfo(tier, column, 1);
-      local talentId = (tier-1)*3+column
-      if (talentName and talentIcon) then
-        WeakAuras.pvp_talent_types_specific[player_class][spec][talentId] = "|T"..talentIcon..":0|t "..talentName
-      end
-    end
+  WeakAuras.pvp_talent_types_specific[player_class][spec] = {
+    select(2, GetPvpTalentInfoByID(3589)),
+    select(2, GetPvpTalentInfoByID(3588)),
+    select(2, GetPvpTalentInfoByID(3587)),
+    nil
+  };
+
+  local pvpSpecTalents = C_SpecializationInfo.GetPvpTalentSlotInfo(2).availableTalentIDs;
+  for i, talentId in ipairs(pvpSpecTalents) do
+    WeakAuras.pvp_talent_types_specific[player_class][spec][i + 3] = select(2, GetPvpTalentInfoByID(talentId));
   end
 end
 

From 79760334d4c7e8c67722fc443cbe5717f6540482 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 21 Apr 2018 18:03:46 +0200
Subject: [PATCH 07/82] ship a patched version of LibRangeCheck-2.0 for testing

---
 .gitignore                                    |    1 +
 CHANGELOG.md                                  |   12 +-
 .../LibRangeCheck-2.0/LibRangeCheck-2.0.lua   | 1375 +++++++++++++++++
 WeakAuras/Prototypes.lua                      |    8 +-
 WeakAuras/embeds.xml                          |    2 +-
 5 files changed, 1389 insertions(+), 9 deletions(-)
 create mode 100644 WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua

diff --git a/.gitignore b/.gitignore
index dd901fc142..0967cf3b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ WeakAuras_Options.lua
 WeakAuras_Templates.lua
 WeakAuras/Libs/
 .commit
+!WeakAuras/Libs/LibRangeCheck-2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20ef46054a..bee16b7213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,21 @@
 # WeakAuras 2
 
-## [2.5.10-5-g7760785](https://github.com/WeakAuras/WeakAuras2/tree/7760785f21388326f68389c197b2c9353ca99647) (2018-04-21)
+## [2.5.10-9-g06dc886](https://github.com/WeakAuras/WeakAuras2/tree/06dc8864c230cf3d7cea0b26892a70ef4532b93e) (2018-04-21)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...7760785f21388326f68389c197b2c9353ca99647)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...06dc8864c230cf3d7cea0b26892a70ef4532b93e)
 
-Benjamin Staneck (3):
+Benjamin Staneck (4):
 
+- ship a patched version of LibRangeCheck-2.0 for testing
 - the rank return from UnitAura has been removed
 - disable HereBeDragons integration for now
 - Update TOC to 80000
 
-Infus (1):
+Infus (4):
 
+- Dry code PVP Talents
+- Disable LibRangeCheck-2.0 for now
+- Mark disabled HBD with a TODO 8.0
 - Setup fallback state so that it has no duration
 
 asakawa-k (1):
diff --git a/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua b/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua
new file mode 100644
index 0000000000..29b8192d2a
--- /dev/null
+++ b/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua
@@ -0,0 +1,1375 @@
+--[[
+Name: LibRangeCheck-2.0
+Revision: $Revision$
+Author(s): mitch0
+Website: http://www.wowace.com/projects/librangecheck-2-0/
+Description: A range checking library based on interact distances and spell ranges
+Dependencies: LibStub
+License: Public Domain
+]]
+
+--- LibRangeCheck-2.0 provides an easy way to check for ranges and get suitable range checking functions for specific ranges.\\
+-- The checkers use spell and item range checks, or interact based checks for special units where those two cannot be used.\\
+-- The lib handles the refreshing of checker lists in case talents / spells change and in some special cases when equipment changes (for example some of the mage pvp gloves change the range of the Fire Blast spell), and also handles the caching of items used for item-based range checks.\\
+-- A callback is provided for those interested in checker changes.
+-- @usage
+-- local rc = LibStub("LibRangeCheck-2.0")
+-- 
+-- rc.RegisterCallback(self, rc.CHECKERS_CHANGED, function() print("need to refresh my stored checkers") end)
+-- 
+-- local minRange, maxRange = rc:GetRange('target')
+-- if not minRange then
+--     print("cannot get range estimate for target")
+-- elseif not maxRange then
+--     print("target is over " .. minRange .. " yards")
+-- else
+--     print("target is between " .. minRange .. " and " .. maxRange .. " yards")
+-- end
+-- 
+-- local meleeChecker = rc:GetFriendMaxChecker(rc.MeleeRange) -- 5 yds
+-- for i = 1, 4 do
+--     -- TODO: check if unit is valid, etc
+--     if meleeChecker("party" .. i) then
+--         print("Party member " .. i .. " is in Melee range")
+--     end
+-- end
+--
+-- local safeDistanceChecker = rc:GetHarmMinChecker(30)
+-- -- negate the result of the checker!
+-- local isSafelyAway = not safeDistanceChecker('target')
+--
+-- @class file
+-- @name LibRangeCheck-2.0
+local MAJOR_VERSION = "LibRangeCheck-2.0"
+local MINOR_VERSION = tonumber(("$Revision: 188$"):match("%d+")) + 100000
+
+local lib, oldminor = LibStub:NewLibrary(MAJOR_VERSION, MINOR_VERSION)
+if not lib then
+    return
+end
+
+-- << STATIC CONFIG
+
+local UpdateDelay = .5
+local ItemRequestTimeout = 10.0
+local FriendColor = 'ff22ff22'
+local HarmColor = 'ffff2222'
+
+-- interact distance based checks. ranges are based on my own measurements (thanks for all the folks who helped me with this)
+local DefaultInteractList = {
+    [3] = 8,
+--    [2] = 9,
+    [4] = 28,
+}
+
+-- interact list overrides for races
+local InteractLists = {
+    ["Tauren"] = {
+        [3] = 6,
+--        [2] = 7,
+        [4] = 25,
+    },
+    ["Scourge"] = {
+        [3] = 7,
+--        [2] = 8,
+        [4] = 27,
+    },
+}
+
+local MeleeRange = 5
+
+-- list of friendly spells that have different ranges
+local FriendSpells = {}
+-- list of harmful spells that have different ranges 
+local HarmSpells = {}
+
+FriendSpells["DEATHKNIGHT"] = {
+}
+HarmSpells["DEATHKNIGHT"] = {
+    49576, -- ["Death Grip"], -- 30
+}
+
+FriendSpells["DEMONHUNTER"] = {
+}
+HarmSpells["DEMONHUNTER"] = {
+    185123, -- ["Throw Glaive"], -- 30
+}
+
+FriendSpells["DRUID"] = {
+    774, -- ["Rejuvenation"], -- 40
+    2782, -- ["Remove Corruption"], -- 40
+}
+HarmSpells["DRUID"] = {
+    5176, -- ["Wrath"], -- 40
+    339, -- ["Entangling Roots"], -- 35
+    6795, -- ["Growl"], -- 30
+    33786, -- ["Cyclone"], -- 20
+    22568, -- ["Ferocious Bite"], -- 5
+}
+
+FriendSpells["HUNTER"] = {}
+HarmSpells["HUNTER"] = {
+    75, -- ["Auto Shot"], -- 40
+}
+
+FriendSpells["MAGE"] = {
+}
+HarmSpells["MAGE"] = {
+    44614, --["Frostfire Bolt"], -- 40
+    5019, -- ["Shoot"], -- 30
+}
+
+FriendSpells["MONK"] = {
+    115450, -- ["Detox"], -- 40
+    115546, -- ["Provoke"], -- 30
+}
+HarmSpells["MONK"] = {
+    115546, -- ["Provoke"], -- 30
+    115078, -- ["Paralysis"], -- 20
+    100780, -- ["Tiger Palm"], -- 5
+}
+
+FriendSpells["PALADIN"] = {
+    19750, -- ["Flash of Light"], -- 40
+}
+HarmSpells["PALADIN"] = {
+    62124, -- ["Reckoning"], -- 30
+    20271, -- ["Judgement"], -- 30
+    853, -- ["Hammer of Justice"], -- 10
+    35395, -- ["Crusader Strike"], -- 5
+} 
+
+FriendSpells["PRIEST"] = {
+    527, -- ["Purify"], -- 40
+    17, -- ["Power Word: Shield"], -- 40
+}
+HarmSpells["PRIEST"] = {
+    589, -- ["Shadow Word: Pain"], -- 40
+    5019, -- ["Shoot"], -- 30
+}
+
+FriendSpells["ROGUE"] = {}
+HarmSpells["ROGUE"] = {
+    2764, -- ["Throw"], -- 30
+    2094, -- ["Blind"], -- 15
+}
+
+FriendSpells["SHAMAN"] = {
+    8004, -- ["Healing Surge"], -- 40
+    546, -- ["Water Walking"], -- 30
+}
+HarmSpells["SHAMAN"] = {
+    403, -- ["Lightning Bolt"], -- 40
+    370, -- ["Purge"], -- 30
+    73899, -- ["Primal Strike"],. -- 5
+}
+
+FriendSpells["WARRIOR"] = {}
+HarmSpells["WARRIOR"] = {
+    355, -- ["Taunt"], -- 30
+    100, -- ["Charge"], -- 8-25
+    5246, -- ["Intimidating Shout"], -- 8
+}
+
+FriendSpells["WARLOCK"] = {
+    5697, -- ["Unending Breath"], -- 30
+}
+HarmSpells["WARLOCK"] = {
+    686, -- ["Shadow Bolt"], -- 40
+    5019, -- ["Shoot"], -- 30
+}
+
+-- Items [Special thanks to Maldivia for the nice list]
+
+local FriendItems  = {
+    [1] = {
+        90175, -- Gin-Ji Knife Set -- doesn't seem to work for pets (always returns nil)
+    },
+    [2] = {
+        37727, -- Ruby Acorn
+    },
+    [3] = {
+        42732, -- Everfrost Razor
+    },
+    [4] = {
+        129055, -- Shoe Shine Kit
+    },
+    [5] = {
+        8149, -- Voodoo Charm
+        136605, -- Solendra's Compassion
+        63427, -- Worgsaw
+    },
+    [7] = {
+        61323, -- Ruby Seeds
+    },
+    [8] = {
+        34368, -- Attuned Crystal Cores
+        33278, -- Burning Torch
+    },
+    [10] = {
+        32321, -- Sparrowhawk Net
+    },
+    [15] = {
+        1251, -- Linen Bandage
+        2581, -- Heavy Linen Bandage
+        3530, -- Wool Bandage
+        3531, -- Heavy Wool Bandage
+        6450, -- Silk Bandage
+        6451, -- Heavy Silk Bandage
+        8544, -- Mageweave Bandage
+        8545, -- Heavy Mageweave Bandage
+        14529, -- Runecloth Bandage
+        14530, -- Heavy Runecloth Bandage
+        21990, -- Netherweave Bandage
+        21991, -- Heavy Netherweave Bandage
+        34721, -- Frostweave Bandage
+        34722, -- Heavy Frostweave Bandage
+--        38643, -- Thick Frostweave Bandage
+--        38640, -- Dense Frostweave Bandage
+    },
+    [20] = {
+        21519, -- Mistletoe
+    },
+    [25] = {
+        31463, -- Zezzak's Shard
+    },
+    [30] = {
+        1180, -- Scroll of Stamina
+        1478, -- Scroll of Protection II
+        3012, -- Scroll of Agility
+        1712, -- Scroll of Spirit II
+        2290, -- Scroll of Intellect II
+        1711, -- Scroll of Stamina II
+        34191, -- Handful of Snowflakes
+    },
+    [35] = {
+        18904, -- Zorbin's Ultra-Shrinker
+    },
+    [38] = {
+        140786, -- Ley Spider Eggs
+    },
+    [40] = {
+        34471, -- Vial of the Sunwell
+    },
+    [45] = {
+        32698, -- Wrangling Rope
+    },
+    [50] = {
+        116139, -- Haunting Memento
+    },
+    [55] = {
+        74637, -- Kiryn's Poison Vial
+    },
+    [60] = {
+        32825, -- Soul Cannon
+        37887, -- Seeds of Nature's Wrath
+    },
+    [70] = {
+        41265, -- Eyesore Blaster
+    },
+    [80] = {
+        35278, -- Reinforced Net
+    },
+    [90] = {
+        133925, -- Fel Lash
+    },
+    [100] = {
+        41058, -- Hyldnir Harpoon
+    },
+    [150] = {
+        46954, -- Flaming Spears
+    },
+    [200] = {
+        75208, -- Rancher's Lariat
+    },
+}
+
+local HarmItems = {
+    [1] = {
+    },
+    [2] = {
+        37727, -- Ruby Acorn
+    },
+    [3] = {
+        42732, -- Everfrost Razor
+    },
+    [4] = {
+        129055, -- Shoe Shine Kit
+    },
+    [5] = {
+        8149, -- Voodoo Charm
+        136605, -- Solendra's Compassion
+        63427, -- Worgsaw
+    },
+    [7] = {
+        61323, -- Ruby Seeds
+    },
+    [8] = {
+        34368, -- Attuned Crystal Cores
+        33278, -- Burning Torch
+    },
+    [10] = {
+        32321, -- Sparrowhawk Net
+    },
+    [15] = {
+        33069, -- Sturdy Rope
+    },
+    [20] = {
+        10645, -- Gnomish Death Ray
+    },
+    [25] = {
+        24268, -- Netherweave Net
+        41509, -- Frostweave Net
+        31463, -- Zezzak's Shard
+    },
+    [30] = {
+        835, -- Large Rope Net
+        7734, -- Six Demon Bag
+        34191, -- Handful of Snowflakes
+    },
+    [35] = {
+        24269, -- Heavy Netherweave Net
+        18904, -- Zorbin's Ultra-Shrinker
+    },
+    [38] = {
+        140786, -- Ley Spider Eggs
+    },
+    [40] = {
+        28767, -- The Decapitator
+    },
+    [45] = {
+--        32698, -- Wrangling Rope
+        23836, -- Goblin Rocket Launcher
+    },
+    [50] = {
+        116139, -- Haunting Memento
+    },
+    [55] = {
+        74637, -- Kiryn's Poison Vial
+    },
+    [60] = {
+        32825, -- Soul Cannon
+        37887, -- Seeds of Nature's Wrath
+    },
+    [70] = {
+        41265, -- Eyesore Blaster
+    },
+    [80] = {
+        35278, -- Reinforced Net
+    },
+    [90] = {
+        133925, -- Fel Lash
+    },
+    [100] = {
+        33119, -- Malister's Frost Wand
+    },
+    [150] = {
+        46954, -- Flaming Spears
+    },
+    [200] = {
+        75208, -- Rancher's Lariat
+    },
+}
+
+-- This could've been done by checking player race as well and creating tables for those, but it's easier like this
+for k, v in pairs(FriendSpells) do
+    tinsert(v, 28880) -- ["Gift of the Naaru"]
+end
+
+-- >> END OF STATIC CONFIG
+
+-- cache
+
+local setmetatable = setmetatable
+local tonumber = tonumber
+local pairs = pairs
+local tostring = tostring
+local print = print
+local next = next
+local type = type
+local wipe = wipe
+local tinsert = tinsert
+local tremove = tremove
+local BOOKTYPE_SPELL = BOOKTYPE_SPELL
+local GetSpellInfo = GetSpellInfo
+local GetSpellBookItemName = GetSpellBookItemName
+local GetNumSpellTabs = GetNumSpellTabs
+local GetSpellTabInfo = GetSpellTabInfo
+local GetItemInfo = GetItemInfo
+local UnitAura = UnitAura
+local UnitCanAttack = UnitCanAttack
+local UnitCanAssist = UnitCanAssist
+local UnitExists = UnitExists
+local UnitIsDeadOrGhost = UnitIsDeadOrGhost
+local CheckInteractDistance = CheckInteractDistance
+local IsSpellInRange = IsSpellInRange
+local IsItemInRange = IsItemInRange
+local UnitClass = UnitClass
+local UnitRace = UnitRace
+local GetInventoryItemLink = GetInventoryItemLink
+local GetSpecialization = GetSpecialization
+local GetSpecializationInfo = GetSpecializationInfo
+local GetTime = GetTime
+local HandSlotId = GetInventorySlotInfo("HandsSlot")
+local math_floor = math.floor
+local UnitIsVisible = UnitIsVisible
+
+-- temporary stuff
+
+local itemRequestTimeoutAt
+local foundNewItems
+local cacheAllItems
+local friendItemRequests
+local harmItemRequests
+local lastUpdate = 0
+
+-- minRangeCheck is a function to check if spells with minimum range are really out of range, or fail due to range < minRange. See :init() for its setup
+local minRangeCheck = function(unit) return CheckInteractDistance(unit, 2) end
+
+local checkers_Spell = setmetatable({}, {
+    __index = function(t, spellIdx)
+        local func = function(unit)
+            if IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1 then
+                 return true
+            end
+        end
+        t[spellIdx] = func
+        return func
+    end
+})
+local checkers_SpellWithMin = setmetatable({}, {
+    __index = function(t, spellIdx)
+        local func = function(unit)
+            if IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1 then
+                return true
+            elseif minRangeCheck(unit) then
+                return true, true
+            end
+        end
+        t[spellIdx] = func
+        return func
+    end
+})
+local checkers_Item = setmetatable({}, {
+    __index = function(t, item)
+        local func = function(unit)
+            return IsItemInRange(item, unit)
+        end
+        t[item] = func
+        return func
+    end
+})
+local checkers_Interact = setmetatable({}, {
+    __index = function(t, index)
+        local func = function(unit)
+            if CheckInteractDistance(unit, index) then
+                 return true
+            end
+        end
+        t[index] = func
+        return func
+    end
+})
+
+-- helper functions
+
+local function copyTable(src, dst)
+    if type(dst) ~= "table" then dst = {} end
+    if type(src) == "table" then
+        for k, v in pairs(src) do
+            if type(v) == "table" then
+                v = copyTable(v, dst[k])
+            end
+            dst[k] = v
+        end
+    end
+    return dst
+end
+
+
+local function initItemRequests(cacheAll)
+    friendItemRequests = copyTable(FriendItems)
+    harmItemRequests = copyTable(HarmItems)
+    cacheAllItems = cacheAll
+    foundNewItems = nil
+end
+
+local function getNumSpells()
+    local _, _, offset, numSpells = GetSpellTabInfo(GetNumSpellTabs())
+    return offset + numSpells
+end
+
+-- return the spellIndex of the given spell by scanning the spellbook
+local function findSpellIdx(spellName)
+    if not spellName or spellName == "" then
+        return nil
+    end
+    for i = 1, getNumSpells() do
+        local spell, rank = GetSpellBookItemName(i, BOOKTYPE_SPELL)
+        if spell == spellName then return i end
+    end
+    return nil
+end
+
+-- minRange should be nil if there's no minRange, not 0
+local function addChecker(t, range, minRange, checker, info)
+    local rc = { ["range"] = range, ["minRange"] = minRange, ["checker"] = checker, ["info"] = info }
+    for i = 1, #t do
+        local v = t[i]
+        if rc.range == v.range then return end
+        if rc.range > v.range then
+            tinsert(t, i, rc)
+            return
+        end
+    end
+    tinsert(t, rc)
+end
+
+local function createCheckerList(spellList, itemList, interactList)
+    local res = {}
+    if itemList then
+        for range, items in pairs(itemList) do
+            for i = 1, #items do
+                local item = items[i]
+                if GetItemInfo(item) then
+                    addChecker(res, range, nil, checkers_Item[item], "item:" .. item)
+                    break
+                end
+            end
+        end
+    end
+    
+    if spellList then
+        for i = 1, #spellList do
+            local sid = spellList[i]
+            local name, _, _, _, minRange, range = GetSpellInfo(sid)
+            local spellIdx = findSpellIdx(name)
+            if spellIdx and range then
+                minRange = math_floor(minRange + 0.5)
+                range = math_floor(range + 0.5)
+                -- print("### spell: " .. tostring(name) .. ", " .. tostring(minRange) .. " - " ..  tostring(range))
+                if minRange == 0 then -- getRange() expects minRange to be nil in this case
+                    minRange = nil
+                end
+                if range == 0 then
+                    range = MeleeRange
+                end
+                if minRange then
+                    addChecker(res, range, minRange, checkers_SpellWithMin[spellIdx], "spell:" .. sid .. ":" .. tostring(name))
+                else
+                    addChecker(res, range, minRange, checkers_Spell[spellIdx], "spell:" .. sid .. ":" .. tostring(name))
+                end
+            end
+        end
+    end
+    
+    if interactList and not next(res) then
+        for index, range in pairs(interactList) do
+            addChecker(res, range, nil,  checkers_Interact[index], "interact:" .. index)
+        end
+    end
+
+    return res
+end
+
+-- returns minRange, maxRange  or nil
+local function getRange(unit, checkerList)
+    local lo, hi = 1, #checkerList
+    while lo <= hi do
+        local mid = math_floor((lo + hi) / 2)
+        local rc = checkerList[mid]
+        if rc.checker(unit) then
+            lo = mid + 1
+        else
+            hi = mid - 1
+        end
+    end
+    if lo > #checkerList then
+        return 0, checkerList[#checkerList].range
+    elseif lo <= 1 then
+        return checkerList[1].range, nil
+    else
+        return checkerList[lo].range, checkerList[lo - 1].range
+    end
+end
+
+local function updateCheckers(origList, newList)
+    if #origList ~= #newList then
+        wipe(origList)
+        copyTable(newList, origList)
+        return true
+    end
+    for i = 1, #origList do
+        if origList[i].range ~= newList[i].range or origList[i].checker ~= newList[i].checker then
+            wipe(origList)
+            copyTable(newList, origList)
+            return true
+        end
+    end
+end
+
+local function rcIterator(checkerList)
+    local curr = #checkerList
+    return function()
+        local rc = checkerList[curr]
+        if not rc then
+             return nil
+        end
+        curr = curr - 1
+        return rc.range, rc.checker
+    end
+end
+
+local function getMinChecker(checkerList, range)
+    local checker, checkerRange
+    for i = 1, #checkerList do
+        local rc = checkerList[i]
+        if rc.range < range then
+            return checker, checkerRange
+        end
+        checker, checkerRange = rc.checker, rc.range
+    end
+    return checker, checkerRange
+end
+
+local function getMaxChecker(checkerList, range)
+    for i = 1, #checkerList do
+        local rc = checkerList[i]
+        if rc.range <= range then
+            return rc.checker, rc.range
+        end
+    end
+end
+
+local function getChecker(checkerList, range)
+    for i = 1, #checkerList do
+        local rc = checkerList[i]
+        if rc.range == range then
+            return rc.checker
+        end
+    end
+end
+
+local function null()
+end
+
+local function createSmartChecker(friendChecker, harmChecker, miscChecker)
+    miscChecker = miscChecker or null
+    friendChecker = friendChecker or miscChecker
+    harmChecker = harmChecker or miscChecker
+    return function(unit)
+        if not UnitExists(unit) then
+            return nil
+        end
+        if UnitIsDeadOrGhost(unit) then
+            return miscChecker(unit)
+        end
+        if UnitCanAttack("player", unit) then
+            return harmChecker(unit)
+        elseif UnitCanAssist("player", unit) then
+            return friendChecker(unit)
+        else
+            return miscChecker(unit)
+        end
+    end
+end
+
+-- OK, here comes the actual lib
+
+-- pre-initialize the checkerLists here so that we can return some meaningful result even if
+-- someone manages to call us before we're properly initialized. miscRC should be independent of
+-- race/class/talents, so it's safe to initialize it here
+-- friendRC and harmRC will be properly initialized later when we have all the necessary data for them
+lib.checkerCache_Spell = lib.checkerCache_Spell or {}
+lib.checkerCache_Item = lib.checkerCache_Item or {}
+lib.miscRC = createCheckerList(nil, nil, DefaultInteractList)
+lib.friendRC = createCheckerList(nil, nil, DefaultInteractList)
+lib.harmRC = createCheckerList(nil, nil, DefaultInteractList)
+
+lib.failedItemRequests = {}
+
+-- << Public API
+
+--@do-not-package@
+-- this is here just for .docmeta
+--- A checker function. This type of function is returned by the various Get*Checker() calls.
+-- @param unit the unit to check range to.
+-- @return **true** if the unit is within the range for this checker.
+local function checker(unit)
+end
+
+--@end-do-not-package@ 
+
+--- The callback name that is fired when checkers are changed.
+-- @field
+lib.CHECKERS_CHANGED = "CHECKERS_CHANGED"
+-- "export" it, maybe someone will need it for formatting
+--- Constant for Melee range (5yd).
+-- @field
+lib.MeleeRange = MeleeRange
+
+function lib:findSpellIndex(spell)
+    if type(spell) == 'number' then
+        spell = GetSpellInfo(spell)
+    end
+    return findSpellIdx(spell)
+end
+
+-- returns the range estimate as a string
+-- deprecated, use :getRange(unit) instead and build your own strings
+-- @param checkVisible if set to true, then a UnitIsVisible check is made, and **nil** is returned if the unit is not visible
+function lib:getRangeAsString(unit, checkVisible, showOutOfRange)
+    local minRange, maxRange = self:getRange(unit, checkVisible)
+    if not minRange then return nil end
+    if not maxRange then
+        return showOutOfRange and minRange .. " +" or nil
+    end
+    return minRange .. " - " .. maxRange
+end
+
+-- initialize RangeCheck if not yet initialized or if "forced"
+function lib:init(forced)
+    if self.initialized and (not forced) then
+        return
+    end
+    self.initialized = true
+    local _, playerClass = UnitClass("player")
+    local _, playerRace = UnitRace("player")
+
+    minRangeCheck = nil
+    -- first try to find a nice item we can use for minRangeCheck
+    if HarmItems[15] then
+        local items = HarmItems[15]
+        for i = 1, #items do
+            local item = items[i]
+            if GetItemInfo(item) then
+                minRangeCheck = function(unit)
+                    return IsItemInRange(item, unit)
+                end
+                break
+            end
+        end
+    end
+    if not minRangeCheck then
+        -- ok, then try to find some class specific spell
+        if playerClass == "WARRIOR" then
+            -- for warriors, use Intimidating Shout if available
+            local name = GetSpellInfo(5246) -- ["Intimidating Shout"]
+            local spellIdx = findSpellIdx(name)
+            if spellIdx then
+                minRangeCheck = function(unit)
+                    return (IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1)
+                end
+            end
+        elseif playerClass == "ROGUE" then
+            -- for rogues, use Blind if available
+            local name = GetSpellInfo(2094) -- ["Blind"]
+            local spellIdx = findSpellIdx(name)
+            if spellIdx then
+                minRangeCheck = function(unit)
+                    return (IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1)
+                end
+            end
+        end
+    end
+    if not minRangeCheck then
+        -- fall back to interact distance checks
+        if playerClass == "HUNTER" or playerRace == "Tauren" then
+            -- for hunters, use interact4 as it's safer
+            -- for Taurens interact4 is actually closer than 25yd and interact3 is closer than 8yd, so we can't use that
+            minRangeCheck = checkers_Interact[4]
+        else
+            minRangeCheck = checkers_Interact[3]
+        end
+    end
+
+    local interactList = InteractLists[playerRace] or DefaultInteractList
+    self.handSlotItem = GetInventoryItemLink("player", HandSlotId)
+    local changed = false
+    if updateCheckers(self.friendRC, createCheckerList(FriendSpells[playerClass], FriendItems, interactList)) then
+        changed = true
+    end
+    if updateCheckers(self.harmRC, createCheckerList(HarmSpells[playerClass], HarmItems, interactList)) then
+        changed = true
+    end
+    if updateCheckers(self.miscRC, createCheckerList(nil, nil, interactList)) then
+        changed = true
+    end
+    if changed and self.callbacks then
+        self.callbacks:Fire(self.CHECKERS_CHANGED)
+    end
+end
+
+--- Return an iterator for checkers usable on friendly units as (**range**, **checker**) pairs.
+function lib:GetFriendCheckers()
+    return rcIterator(self.friendRC)
+end
+
+--- Return an iterator for checkers usable on enemy units as (**range**, **checker**) pairs.
+function lib:GetHarmCheckers()
+    return rcIterator(self.harmRC)
+end
+
+--- Return an iterator for checkers usable on miscellaneous units as (**range**, **checker**) pairs.  These units are neither enemy nor friendly, such as people in sanctuaries or corpses.
+function lib:GetMiscCheckers()
+    return rcIterator(self.miscRC)
+end
+
+--- Return a checker suitable for out-of-range checking on friendly units, that is, a checker whose range is equal or larger than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetFriendMinChecker(range)
+    return getMinChecker(self.friendRC, range)
+end
+
+--- Return a checker suitable for out-of-range checking on enemy units, that is, a checker whose range is equal or larger than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetHarmMinChecker(range)
+    return getMinChecker(self.harmRC, range)
+end
+
+--- Return a checker suitable for out-of-range checking on miscellaneous units, that is, a checker whose range is equal or larger than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetMiscMinChecker(range)
+    return getMinChecker(self.miscRC, range)
+end
+
+--- Return a checker suitable for in-range checking on friendly units, that is, a checker whose range is equal or smaller than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetFriendMaxChecker(range)
+    return getMaxChecker(self.friendRC, range)
+end
+
+--- Return a checker suitable for in-range checking on enemy units, that is, a checker whose range is equal or smaller than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetHarmMaxChecker(range)
+    return getMaxChecker(self.harmRC, range)
+end
+
+--- Return a checker suitable for in-range checking on miscellaneous units, that is, a checker whose range is equal or smaller than the requested range.
+-- @param range the range to check for.
+-- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
+function lib:GetMiscMaxChecker(range)
+    return getMaxChecker(self.miscRC, range)
+end
+
+--- Return a checker for the given range for friendly units.
+-- @param range the range to check for.
+-- @return **checker** function or **nil** if no suitable checker is available.
+function lib:GetFriendChecker(range)
+    return getChecker(self.friendRC, range)
+end
+
+--- Return a checker for the given range for enemy units.
+-- @param range the range to check for.
+-- @return **checker** function or **nil** if no suitable checker is available.
+function lib:GetHarmChecker(range)
+    return getChecker(self.harmRC, range)
+end
+
+--- Return a checker for the given range for miscellaneous units.
+-- @param range the range to check for.
+-- @return **checker** function or **nil** if no suitable checker is available.
+function lib:GetMiscChecker(range)
+    return getChecker(self.miscRC, range)
+end
+
+--- Return a checker suitable for out-of-range checking that checks the unit type and calls the appropriate checker (friend/harm/misc).
+-- @param range the range to check for.
+-- @return **checker** function.
+function lib:GetSmartMinChecker(range)
+    return createSmartChecker(
+        getMinChecker(self.friendRC, range),
+        getMinChecker(self.harmRC, range),
+        getMinChecker(self.miscRC, range))
+end
+
+--- Return a checker suitable for in-of-range checking that checks the unit type and calls the appropriate checker (friend/harm/misc).
+-- @param range the range to check for.
+-- @return **checker** function.
+function lib:GetSmartMaxChecker(range)
+    return createSmartChecker(
+        getMaxChecker(self.friendRC, range),
+        getMaxChecker(self.harmRC, range),
+        getMaxChecker(self.miscRC, range))
+end
+
+--- Return a checker for the given range that checks the unit type and calls the appropriate checker (friend/harm/misc).
+-- @param range the range to check for.
+-- @param fallback optional fallback function that gets called as fallback(unit) if a checker is not available for the given type (friend/harm/misc) at the requested range. The default fallback function return nil.
+-- @return **checker** function.
+function lib:GetSmartChecker(range, fallback)
+    return createSmartChecker(
+        getChecker(self.friendRC, range) or fallback,
+        getChecker(self.harmRC, range) or fallback,
+        getChecker(self.miscRC, range) or fallback)
+end
+
+--- Get a range estimate as **minRange**, **maxRange**.
+-- @param unit the target unit to check range to.
+-- @param checkVisible if set to true, then a UnitIsVisible check is made, and **nil** is returned if the unit is not visible
+-- @return **minRange**, **maxRange** pair if a range estimate could be determined, **nil** otherwise. **maxRange** is **nil** if **unit** is further away than the highest possible range we can check.
+-- Includes checks for unit validity and friendly/enemy status.
+-- @usage
+-- local rc = LibStub("LibRangeCheck-2.0")
+-- local minRange, maxRange = rc:GetRange('target')
+-- local minRangeIfVisible, maxRangeIfVisible = rc:GetRange('target', true)
+function lib:GetRange(unit, checkVisible)
+    if not UnitExists(unit) then
+        return nil
+    end
+    if checkVisible and not UnitIsVisible(unit) then
+        return nil
+    end
+    if UnitIsDeadOrGhost(unit) then
+        return getRange(unit, self.miscRC)
+    end
+    if UnitCanAttack("player", unit) then
+        return getRange(unit, self.harmRC)
+    elseif UnitCanAssist("player", unit) then
+        return getRange(unit, self.friendRC)
+    else
+        return getRange(unit, self.miscRC)
+    end
+end
+
+-- keep this for compatibility
+lib.getRange = lib.GetRange
+
+-- >> Public API
+
+function lib:OnEvent(event, ...)
+    if type(self[event]) == 'function' then
+        self[event](self, event, ...)
+    end
+end
+
+function lib:LEARNED_SPELL_IN_TAB()
+    self:scheduleInit()
+end
+
+function lib:CHARACTER_POINTS_CHANGED()
+    self:scheduleInit()
+end
+
+function lib:PLAYER_TALENT_UPDATE()
+    self:scheduleInit()
+end
+
+function lib:SPELLS_CHANGED()
+    self:scheduleInit()
+end
+
+function lib:UNIT_INVENTORY_CHANGED(event, unit)
+    if self.initialized and unit == "player" and self.handSlotItem ~= GetInventoryItemLink("player", HandSlotId) then
+        self:scheduleInit()
+    end
+end
+
+function lib:UNIT_AURA(event, unit)
+    if self.initialized and unit == "player" then
+        self:scheduleAuraCheck()
+    end
+end
+
+function lib:processItemRequests(itemRequests)
+    while true do
+        local range, items = next(itemRequests)
+        if not range then return end
+        while true do
+            local i, item = next(items)
+            if not i then
+                itemRequests[range] = nil
+                break
+            elseif self.failedItemRequests[item] then
+                tremove(items, i)
+            elseif GetItemInfo(item) then
+                if itemRequestTimeoutAt then
+                    foundNewItems = true
+                    itemRequestTimeoutAt = nil
+                end
+                if not cacheAllItems then
+                    itemRequests[range] = nil
+                    break
+                end
+                tremove(items, i)   
+            elseif not itemRequestTimeoutAt then
+                itemRequestTimeoutAt = GetTime() + ItemRequestTimeout
+                return true
+            elseif GetTime() > itemRequestTimeoutAt then
+                if cacheAllItems then
+                    print(MAJOR_VERSION .. ": timeout for item: " .. tostring(item))
+                end
+                self.failedItemRequests[item] = true
+                itemRequestTimeoutAt = nil
+                tremove(items, i)
+            else
+                return true -- still waiting for server response
+            end
+        end
+    end
+end
+
+function lib:initialOnUpdate()
+    self:init()
+    if friendItemRequests then
+        if self:processItemRequests(friendItemRequests) then return end
+        friendItemRequests = nil
+    end
+    if harmItemRequests then
+        if self:processItemRequests(harmItemRequests) then return end
+        harmItemRequests = nil
+    end
+    if foundNewItems then
+        self:init(true)
+        foundNewItems = nil
+    end
+    if cacheAllItems then
+        print(MAJOR_VERSION .. ": finished cache")
+        cacheAllItems = nil
+    end
+    self.frame:Hide()
+end
+
+function lib:scheduleInit()
+    self.initialized = nil
+    lastUpdate = 0
+    self.frame:Show()
+end
+
+function lib:scheduleAuraCheck()
+    lastUpdate = UpdateDelay
+    self.frame:Show()
+end
+
+--@do-not-package@
+-- << DEBUG STUFF
+
+local function pairsByKeys(t, f)
+    local a = {}
+    for n in pairs(t) do tinsert(a, n) end
+    table.sort(a, f)
+    local i = 0
+    local iter = function ()
+        i = i + 1
+        if a[i] == nil then
+            return nil
+        else
+            return a[i], t[a[i]]
+        end
+    end
+    return iter
+end
+
+function lib:cacheAllItems()
+    if (not self.initialized) or harmItemRequests then
+        print(MAJOR_VERSION .. ": init hasn't finished yet")
+        return
+    end
+    print(MAJOR_VERSION .. ": starting item cache")
+    initItemRequests(true)
+    self.frame:Show()
+end
+
+function lib:startMeasurement(unit, resultTable)
+    if (not self.initialized) or harmItemRequests then
+        print(MAJOR_VERSION .. ": init hasn't finished yet")
+        return
+    end
+    if self.measurements then
+        print(MAJOR_VERSION .. ": measurements already running")
+        return
+    end
+    print(MAJOR_VERSION .. ": starting measurements")
+    local _, playerClass = UnitClass("player")
+    local spellList
+    local itemList
+    if UnitCanAttack("player", unit) then
+        spellList = HarmSpells[playerClass]
+        itemList = HarmItems
+    elseif UnitCanAssist("player", unit) then
+        spellList = FriendSpells[playerClass]
+        itemList = FriendItems
+    end
+    self.spellsToMeasure = {}
+    if spellList then
+        for i = 1, #spellList do
+            local sid = spellList[i]
+            local name = GetSpellInfo(sid)
+            local spellIdx = findSpellIdx(name)
+            if spellIdx then
+                self.spellsToMeasure[name] = spellIdx
+            end
+        end
+    end
+    self.itemsToMeasure = {}
+    if itemList then
+        for range, items in pairs(itemList) do
+            for i = 1, #items do
+                local item = items[i]
+                local name = GetItemInfo(item)
+                if name then
+                    self.itemsToMeasure[name] = item
+                end
+            end
+        end
+    end
+    self.measurements = resultTable
+    self.measurementUnit = unit
+    self.measurementStart = GetTime()
+    self.lastMeasurements = {}
+    self:updateMeasurements()
+    self.frame:SetScript("OnUpdate", function(frame, elapsed) self:updateMeasurements() end)
+    self.frame:Show()
+end
+
+function lib:stopMeasurement()
+    print(MAJOR_VERSION .. ": stopping measurements")
+    self.frame:Hide()
+    self.frame:SetScript("OnUpdate", function(frame, elapsed)
+        lastUpdate = lastUpdate + elapsed
+        if lastUpdate < UpdateDelay then
+            return
+        end
+        lastUpdate = 0
+        self:initialOnUpdate()
+    end)
+    self.measurements = nil
+end
+
+function lib:checkItems(itemList, verbose, color)
+    if not itemList then return end
+    color = color or 'ffffffff'
+    for range, items in pairsByKeys(itemList) do
+        for i = 1, #items do
+            local item = items[i]
+            local name = GetItemInfo(item)
+            if not name then
+                print(MAJOR_VERSION .. ": |c" .. color .. tostring(item) .. "|r: " .. tostring(range) .. "yd: |cffeda500not in cache|r")
+            else
+                local res = IsItemInRange(item, "target") 
+                if res == nil or verbose then
+                    if res == nil then res = "|cffed0000nil|r" end
+                    print(MAJOR_VERSION .. ": |c" .. color .. tostring(item) .. ": " .. tostring(name) .. "|r: " .. tostring(range) .. "yd: " .. tostring(res))
+                end
+            end
+        end
+    end
+end
+
+function lib:checkSpells(spellList, verbose, color)
+    if not spellList then return end
+    color = color or 'ffffffff'
+    for i = 1, #spellList do 
+        local sid = spellList[i]
+        local name, _, _, _, minRange, range = GetSpellInfo(sid)
+        if (not name) or (name == "") or (not range) then
+            print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. "|r: " .. tostring(range) .. "yd: |cffeda500invalid spell id|r")
+        else
+            local spellIdx = self:findSpellIndex(sid)
+            if not spellIdx then
+                print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. ": " .. tostring(name) .. "|r: " .. tostring(minRange) .. "-" .. tostring(range) .. "yd: |cffeda500not in spellbook|r")
+            else
+                local res = IsSpellInRange(spellIdx, BOOKTYPE_SPELL, "target")
+                if res == nil or verbose then
+                    if res == nil then res = "|cffed0000nil|r" end
+                    print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. ": " .. tostring(name) .. "|r: " .. tostring(minRange) .. "-" .. tostring(range) .. "yd: " .. tostring(res))
+                end
+            end
+        end
+    end
+end
+
+function lib:checkAllItems()
+    print(MAJOR_VERSION .. ": Checking FriendItems...")
+    self:checkItems(FriendItems, true, FriendColor)
+    print(MAJOR_VERSION .. ": Checking HarmItems...")
+    self:checkItems(HarmItems, true, HarmColor)
+end
+
+function lib:checkAllSpells()
+    local _, playerClass = UnitClass("player")
+    print(MAJOR_VERSION .. ": Checking FriendSpells: " .. playerClass)
+    self:checkSpells(FriendSpells[playerClass], true, FriendColor)
+    print(MAJOR_VERSION .. ": Checking HarmSpells..." .. playerClass)
+    self:checkSpells(HarmSpells[playerClass], true, HarmColor)
+end
+
+local function dumpCheckerList(checkerList)
+    for _, rc in ipairs(checkerList) do
+        if rc.minRange then
+            print(rc.minRange .. "-" .. rc.range .. ": " .. rc.info)
+        else
+            print(rc.range .. ": " .. rc.info)
+        end
+    end
+end
+
+function lib:checkAllCheckers()
+    if not UnitExists("target") then
+        print(MAJOR_VERSION .. ": Invalid unit, cannot check")
+        return
+    end
+    local _, playerClass = UnitClass("player")
+    if UnitCanAttack("player", "target") then
+        print(MAJOR_VERSION .. ": Harm checker list: " .. playerClass)
+        dumpCheckerList(self.harmRC)
+        print(MAJOR_VERSION .. ": Checking HarmCheckers: " .. playerClass)
+        self:checkItems(HarmItems)
+        self:checkSpells(HarmSpells[playerClass])
+    elseif UnitCanAssist("player", "target") then
+        print(MAJOR_VERSION .. ": Friend checker list: " .. playerClass)
+        dumpCheckerList(self.friendRC)
+        print(MAJOR_VERSION .. ": Checking FriendCheckers: ")
+        self:checkItems(FriendItems)
+        self:checkSpells(FriendSpells[playerClass])
+    else
+        print(MAJOR_VERSION .. ": Misc checker list: " .. playerClass)
+        dumpCheckerList(self.miscRC)
+        print(MAJOR_VERSION .. ": Misc unit, cannot check")
+        return
+    end
+    print(MAJOR_VERSION .. ": done.")
+end
+
+local function logMeasurementChange(t, t0, key, last, curr)
+    local d = 0
+    local scale = 1240
+    if t0 then
+        local dx = scale * (t.x - t0.x)
+        local dy = scale * (t.y - t0.y)
+        d = _G.sqrt(dx * dx + dy * dy)
+    end
+    print(MAJOR_VERSION .. ": t=" .. ("%.4f"):format(t.stamp) .. ": d=" .. ("%.4f"):format(d) .. ": " .. tostring(key) .. ": " .. tostring(last) .. " ->  " .. tostring(curr))
+end
+
+local GetPlayerMapPosition = GetPlayerMapPosition
+function lib:updateMeasurements()
+    local now = GetTime() - self.measurementStart
+    local x, y = GetPlayerMapPosition("player")
+    local t0 = self.measurements[0]
+    local t = self.measurements[now]
+    local unit = self.measurementUnit
+    for name, id in pairs(self.spellsToMeasure) do
+        local key = 'spell: ' .. name
+        local last = self.lastMeasurements[key]
+        local curr = (IsSpellInRange(id, BOOKTYPE_SPELL, unit) == 1) and true or false
+        if last == nil or last ~= curr then
+            if not t then
+                t = {}
+                t.x, t.y, t.stamp, t.states = x, y, now, {}
+                self.measurements[now] = t
+            end
+            logMeasurementChange(t, t0, key, last, curr)
+            t.states[key]= curr
+            self.lastMeasurements[key] = curr
+        end
+    end
+    for name, item in pairs(self.itemsToMeasure) do
+        local key = 'item: ' .. name;
+        local last = self.lastMeasurements[key]
+        local curr = IsItemInRange(item, unit) and true or false
+        if last == nil or last ~= curr then
+            if not t then
+                t = {}
+                t.x, t.y, t.stamp, t.states = x, y, now, {}
+                self.measurements[now] = t
+            end
+            logMeasurementChange(t, t0, key, last, curr)
+            t.states[key]= curr
+            self.lastMeasurements[key] = curr
+        end
+    end
+    for i, v in pairs(DefaultInteractList) do
+        local key = 'interact: ' .. i
+        local last = self.lastMeasurements[key]
+        local curr = CheckInteractDistance(unit, i) and true or false
+        if last == nil or last ~= curr then
+            if not t then
+                t = {}
+                t.x, t.y, t.stamp, t.states = x, y, now, {}
+                self.measurements[now] = t
+            end
+            logMeasurementChange(t, t0, key, last, curr)
+            t.states[key] = curr
+            self.lastMeasurements[key] = curr
+        end
+    end
+end
+
+local debugprofilestop = debugprofilestop
+function lib:speedTest(numIterations)
+    if not UnitExists("target") then
+        print(MAJOR_VERSION .. ": Invalid unit, cannot check")
+        return
+    end
+    numIterations = numIterations or 10000
+    local start = debugprofilestop()
+    for i = 1, numIterations do
+        self:getRange("target")
+    end
+    local duration = debugprofilestop() - start
+    print("numIterations: " .. tostring(numIterations) .. ", time: " .. tostring(duration))
+end
+
+-- >> DEBUG STUFF
+--@end-do-not-package@ 
+
+-- << load-time initialization 
+
+function lib:activate()
+    if not self.frame then
+        local frame = CreateFrame("Frame")
+        self.frame = frame
+        frame:RegisterEvent("LEARNED_SPELL_IN_TAB")
+        frame:RegisterEvent("CHARACTER_POINTS_CHANGED")
+        frame:RegisterEvent("PLAYER_TALENT_UPDATE")
+        frame:RegisterEvent("SPELLS_CHANGED")
+        local _, playerClass = UnitClass("player")
+        if playerClass == "MAGE" or playerClass == "SHAMAN" then
+            -- Mage and Shaman gladiator gloves modify spell ranges
+            frame:RegisterUnitEvent("UNIT_INVENTORY_CHANGED", "player")
+        end
+    end
+    initItemRequests()
+    self.frame:SetScript("OnEvent", function(frame, ...) self:OnEvent(...) end)
+    self.frame:SetScript("OnUpdate", function(frame, elapsed)
+        lastUpdate = lastUpdate + elapsed
+        if lastUpdate < UpdateDelay then
+            return
+        end
+        lastUpdate = 0
+        self:initialOnUpdate()
+    end)
+    self:scheduleInit()
+end
+
+--- BEGIN CallbackHandler stuff
+
+do
+    local lib = lib -- to keep a ref even though later we nil lib
+    --- Register a callback to get called when checkers are updated
+    -- @class function
+    -- @name lib.RegisterCallback
+    -- @usage
+    -- rc.RegisterCallback(self, rc.CHECKERS_CHANGED, "myCallback")
+    -- -- or
+    -- rc.RegisterCallback(self, "CHECKERS_CHANGED", someCallbackFunction)
+    -- @see CallbackHandler-1.0 documentation for more details
+    lib.RegisterCallback = lib.RegisterCallback or function(...)
+        local CBH = LibStub("CallbackHandler-1.0")
+        lib.RegisterCallback = nil -- extra safety, we shouldn't get this far if CBH is not found, but better an error later than an infinite recursion now
+        lib.callbacks = CBH:New(lib)
+        -- ok, CBH hopefully injected or new shiny RegisterCallback
+        return lib.RegisterCallback(...)
+    end
+end
+
+--- END CallbackHandler stuff
+
+lib:activate()
+lib = nil
\ No newline at end of file
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index e7e6d167e8..4feebbb234 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -24,14 +24,14 @@ function WeakAuras.IsSpellInRange(spellId, unit)
 end
 
 -- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
--- TODO 8.0 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
+local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
-  return 0, 8; -- TODO 8.0 LibRangeCheck:GetRange(unit);
+  return LibRangeCheck:GetRange(unit);
 end
 
 function WeakAuras.CheckRange(unit, range, operator)
-  local min, max = 0, 8; --TODO 8.0 LibRangeCheck:GetRange(unit);
+  local min, max = LibRangeCheck:GetRange(unit);
   if (operator == "<=") then
     return max <= range;
   else
@@ -4236,7 +4236,7 @@ WeakAuras.event_prototypes = {
     events = {
       "FRAME_UPDATE",
     },
-    name = L["Range Check (NYI)"],
+    name = L["Range Check"],
     init = function(trigger)
       trigger.unit = trigger.unit or "target";
       local ret = [=[
diff --git a/WeakAuras/embeds.xml b/WeakAuras/embeds.xml
index b387ad136a..74f5c07479 100644
--- a/WeakAuras/embeds.xml
+++ b/WeakAuras/embeds.xml
@@ -19,6 +19,6 @@
 	<Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua"/>
 	<Script file="Libs\LibSpellRange-1.0\LibSpellRange-1.0.lua"/>
 	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-1.0.lua"/>-->
-	<!-- TODO 8.0 <Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/> -->
+	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
 	<!--@end-no-lib-strip@-->
 </Ui>

From 153c07f039e89ce732b2e2af0c4b7e3372a09b21 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 21 Apr 2018 18:33:05 +0200
Subject: [PATCH 08/82] Fix PVP Talent Cache generation

---
 WeakAuras/Prototypes.lua |  2 +-
 WeakAuras/WeakAuras.lua  | 44 ++++++++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 4feebbb234..8885739e83 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -765,7 +765,7 @@ WeakAuras.load_prototype = {
     },
     {
       name = "pvptalent",
-      display = L["PvP Talent selected (NYI)"], -- TODO 8.0 dry coded, untested
+      display = L["PvP Talent selected"],
       type = "multiselect",
       values = function(trigger)
         return function()
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 52dbbf36d2..900bec4db7 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -1007,10 +1007,8 @@ function WeakAuras.CreateTalentCache()
   local _, player_class = UnitClass("player")
 
   WeakAuras.talent_types_specific[player_class] = WeakAuras.talent_types_specific[player_class] or {};
-  WeakAuras.pvp_talent_types_specific[player_class] = WeakAuras.pvp_talent_types_specific[player_class] or {};
   local spec = GetSpecialization()
   WeakAuras.talent_types_specific[player_class][spec] = WeakAuras.talent_types_specific[player_class][spec] or {};
-  WeakAuras.pvp_talent_types_specific[player_class][spec] = WeakAuras.pvp_talent_types_specific[player_class][spec] or {};
 
   for tier = 1, MAX_TALENT_TIERS do
     for column = 1, NUM_TALENT_COLUMNS do
@@ -1023,17 +1021,38 @@ function WeakAuras.CreateTalentCache()
       end
     end
   end
+end
 
-  WeakAuras.pvp_talent_types_specific[player_class][spec] = {
-    select(2, GetPvpTalentInfoByID(3589)),
-    select(2, GetPvpTalentInfoByID(3588)),
-    select(2, GetPvpTalentInfoByID(3587)),
-    nil
-  };
+local pvpTalentsInitialized = false;
+function WeakAuras.CreatePvPTalentCache()
+  if (pvpTalentsInitialized) then return end;
+  local _, player_class = UnitClass("player")
+  local spec = GetSpecialization()
+
+  WeakAuras.pvp_talent_types_specific[player_class] = WeakAuras.pvp_talent_types_specific[player_class] or {};
+  WeakAuras.pvp_talent_types_specific[player_class][spec] = WeakAuras.pvp_talent_types_specific[player_class][spec] or {};
+
+  local function formatTalent(talentId)
+    local _, name, icon = GetPvpTalentInfoByID(talentId);
+    return "|T"..icon..":0|t "..name
+  end
+
+  local slotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(2);
+  if (slotInfo) then
+
+    WeakAuras.pvp_talent_types_specific[player_class][spec] = {
+      formatTalent(3589),
+      formatTalent(3588),
+      formatTalent(3587),
+      nil
+    };
+
+    local pvpSpecTalents = slotInfo.availableTalentIDs;
+    for i, talentId in ipairs(pvpSpecTalents) do
+      WeakAuras.pvp_talent_types_specific[player_class][spec][i + 3] = formatTalent(talentId);
+    end
 
-  local pvpSpecTalents = C_SpecializationInfo.GetPvpTalentSlotInfo(2).availableTalentIDs;
-  for i, talentId in ipairs(pvpSpecTalents) do
-    WeakAuras.pvp_talent_types_specific[player_class][spec][i + 3] = select(2, GetPvpTalentInfoByID(talentId));
+    pvpTalentsInitialized = true;
   end
 end
 
@@ -1048,6 +1067,7 @@ loadedFrame:RegisterEvent("PLAYER_ENTERING_WORLD");
 loadedFrame:RegisterEvent("LOADING_SCREEN_ENABLED");
 loadedFrame:RegisterEvent("LOADING_SCREEN_DISABLED");
 loadedFrame:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED");
+loadedFrame:RegisterEvent("PLAYER_PVP_TALENT_UPDATE");
 loadedFrame:SetScript("OnEvent", function(self, event, addon)
   if(event == "ADDON_LOADED") then
     if(addon == ADDON_NAME) then
@@ -1103,6 +1123,8 @@ loadedFrame:SetScript("OnEvent", function(self, event, addon)
     timer:ScheduleTimer(function() squelch_actions = false; end, db.login_squelch_time);      -- No sounds while loading
     WeakAuras.CreateTalentCache() -- It seems that GetTalentInfo might give info about whatever class was previously being played, until PLAYER_ENTERING_WORLD
     WeakAuras.UpdateCurrentInstanceType();
+  elseif(event == "PLAYER_PVP_TALENT_UPDATE") then
+    WeakAuras.CreatePvPTalentCache();
   elseif(event == "LOADING_SCREEN_ENABLED") then
     in_loading_screen = true;
   elseif(event == "LOADING_SCREEN_DISABLED") then

From ca515274e8639f5ef4268cb8896ca2abf854a9f2 Mon Sep 17 00:00:00 2001
From: Buds <mrbouyou@gmail.com>
Date: Sun, 22 Apr 2018 08:05:33 +0200
Subject: [PATCH 09/82] fix form_types (#387)

GetShapeshiftFormInfo() doesn't return name
---
 WeakAuras/Types.lua | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index a1cf5d80ef..b7b0c2baec 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -212,9 +212,12 @@ local function update_forms()
   wipe(WeakAuras.form_types);
   WeakAuras.form_types[0] = "0 - "..L["Humanoid"]
   for i = 1, GetNumShapeshiftForms() do
-    local _, name = GetShapeshiftFormInfo(i);
-    if(name) then
-      WeakAuras.form_types[i] = i.." - "..name
+    local _, _, _, id = GetShapeshiftFormInfo(i);
+    if(id) then
+      local name = GetSpellInfo(id);
+      if(name) then
+        WeakAuras.form_types[i] = i.." - "..name
+      end
     end
   end
 end

From c6097b4412b187ee955433ccad461807a329dbac Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <stephansundermann@gmail.com>
Date: Sun, 22 Apr 2018 10:25:48 +0200
Subject: [PATCH 10/82] Fix UnitAura (unit, spellName, ...)

UnitAura does not take a spell name anymore so we have to loop over
all auras.
---
 WeakAuras/BuffTrigger.lua | 44 +++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index a0fd98d459..45ab64ef42 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -588,8 +588,18 @@ function WeakAuras.ScanAuras(unit)
 
             for index, checkname in pairs(data.names) do
               -- Fetch aura data
-              name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, checkname, nil, filter);
-              if (name) then
+              -- TODO 8.0: Check if there is a better way than iterating all auras
+              local detected
+              for i = 1, _G.BUFF_MAX_DISPLAY do
+                name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, i, filter);
+                if not name then break end
+                if name == checkname then
+                  detected = true
+                  break
+                end
+              end
+
+              if (detected) then
                 WeakAuras.SetDynamicIconCache(name, spellId, icon);
               end
               checkPassed = false;
@@ -960,8 +970,19 @@ do
       local updateTriggerState = false;
       for triggernum, data in pairs(triggers) do
         local filter = data.debuffType..(data.ownOnly and "|PLAYER" or "");
-        local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(unit, spellName, nil, filter);
-        if(name and (data.spellId == nil or data.spellId == spellId)) then
+
+        -- TODO 8.0: Check if there is a better way than iterating all auras
+        local detected
+        for i = 1, _G.BUFF_MAX_DISPLAY do
+          local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(unit, i, filter);
+          if not name then break end
+          if name == spellName then
+            detected = true
+            break
+          end
+        end
+
+        if(detected and (data.spellId == nil or data.spellId == spellId)) then
           data.GUIDs = data.GUIDs or {};
           data.GUIDs[destGUID] = data.GUIDs[destGUID] or {};
           data.GUIDs[destGUID].name = spellName;
@@ -1119,8 +1140,19 @@ do
             local updateTriggerState = false;
             for triggernum, data in pairs(triggers) do
               local filter = data.debuffType..(data.ownOnly and "|PLAYER" or "");
-              local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(uid, spellName, nil, filter);
-              if(name) then
+
+              -- TODO 8.0: Check if there is a better way than iterating all auras
+              local detected
+              for i = 1, _G.BUFF_MAX_DISPLAY do
+                local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(uid, i, filter);
+                if not name then break end
+                if name == spellName then
+                  detected = true
+                  break
+                end
+              end
+
+              if(detected) then
                 data.GUIDs = data.GUIDs or {};
                 data.GUIDs[guid] = data.GUIDs[guid] or {};
                 data.GUIDs[guid].name = spellName;

From c3822d35d403bf8f7c4d0b579f4e38fd7bd71c7c Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 11:47:13 +0200
Subject: [PATCH 11/82] Fix a few bugs in BuffTrigger

---
 WeakAuras/BuffTrigger.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index 45ab64ef42..e086b55f91 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -64,6 +64,7 @@ Returns the potential conditions for a trigger
 -- Lua APIs
 local tinsert, wipe = table.insert, wipe
 local pairs, next, type = pairs, next, type
+local BUFF_MAX_DISPLAY = _G.BUFF_MAX_DISPLAY
 
 local WeakAuras = WeakAuras;
 local L = WeakAuras.L;
@@ -590,7 +591,7 @@ function WeakAuras.ScanAuras(unit)
               -- Fetch aura data
               -- TODO 8.0: Check if there is a better way than iterating all auras
               local detected
-              for i = 1, _G.BUFF_MAX_DISPLAY do
+              for i = 1, BUFF_MAX_DISPLAY do
                 name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, i, filter);
                 if not name then break end
                 if name == checkname then
@@ -973,8 +974,9 @@ do
 
         -- TODO 8.0: Check if there is a better way than iterating all auras
         local detected
-        for i = 1, _G.BUFF_MAX_DISPLAY do
-          local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(unit, i, filter);
+        local name, icon, count, duration, expirationTime, unitCaster, spellId
+        for i = 1, BUFF_MAX_DISPLAY do
+          name, icon, count, _, duration, expirationTime, unitCaster, _, _, spellId = UnitAura(unit, i, filter);
           if not name then break end
           if name == spellName then
             detected = true
@@ -1143,8 +1145,9 @@ do
 
               -- TODO 8.0: Check if there is a better way than iterating all auras
               local detected
+              local name, icon, count, duration, expirationTime, unitCaster
               for i = 1, _G.BUFF_MAX_DISPLAY do
-                local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId = UnitAura(uid, i, filter);
+                name, icon, count, _, duration, expirationTime, unitCaster = UnitAura(uid, i, filter);
                 if not name then break end
                 if name == spellName then
                   detected = true

From 1f7da9c4d37bedf5a7494c1c9381b6db1dc52dd8 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 11:55:21 +0200
Subject: [PATCH 12/82] Remvoe a unnecessary _G

Thanks Krazyito
---
 WeakAuras/BuffTrigger.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index e086b55f91..bce1012fa7 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -1146,7 +1146,7 @@ do
               -- TODO 8.0: Check if there is a better way than iterating all auras
               local detected
               local name, icon, count, duration, expirationTime, unitCaster
-              for i = 1, _G.BUFF_MAX_DISPLAY do
+              for i = 1, BUFF_MAX_DISPLAY do
                 name, icon, count, _, duration, expirationTime, unitCaster = UnitAura(uid, i, filter);
                 if not name then break end
                 if name == spellName then

From c25d33d4578979938499cba3f1a75c69777d0d52 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 13:51:51 +0200
Subject: [PATCH 13/82] Remove Legion Encounter IDs

---
 WeakAuras/Prototypes.lua | 46 +---------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 8885739e83..6e20244036 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -40,51 +40,7 @@ function WeakAuras.CheckRange(unit, range, operator)
 end
 
 WeakAuras.encounter_table = {
-  -- The Emerald Nightmare
-  [1703] = 1853, -- Nythendra
-  [1744] = 1876, -- Elerethe Renferal
-  [1738] = 1873, -- Il'gynoth, Heart of Corruption
-  [1667] = 1841, -- Ursoc
-  [1704] = 1854, -- Dragons of Nightmare
-  [1750] = 1877, -- Cenarius
-  [1726] = 1864, -- Xavius
-  -- The Nighthold
-  [1706] = 1849, -- Skorpyron,
-  [1725] = 1865, -- Chronomatic Anomaly
-  [1731] = 1867, -- Trilliax,
-  [1751] = 1871, -- Spellblade Aluriel
-  [1762] = 1862, -- Tichondrius
-  [1713] = 1842, -- Krosus
-  [1761] = 1886, -- High Botanist Tel'arn
-  [1732] = 1863, -- Star Augur Etraeus
-  [1743] = 1872, -- Grand Magistrix Elisande
-  [1737] = 1866, -- Gul'dan
-  -- Trial of Valor
-  [1819] = 1958, -- Odyn
-  [1830] = 1962, -- Guarm
-  [1829] = 2008, -- Helya
-  -- Tomb of Sargeras
-  [1862] = 2032, -- Goroth
-  [1867] = 2048, -- Demonic Inquisition
-  [1856] = 2036, -- Harjatan
-  [1861] = 2037, -- Mistress Sasszine
-  [1903] = 2050, -- Sisters of the Moon
-  [1896] = 2054, -- Desolate Host
-  [1897] = 2052, -- Maiden of Vigilance
-  [1873] = 2038, -- Fallen Avatar
-  [1898] = 2051, -- Kiljaeden
-  -- Antorus, the Burning Throne
-  [1984] = 2063, -- Aggramar
-  [1985] = 2064, -- Portal Keeper Hasabel
-  [1983] = 2069, -- Varimathras
-  [1997] = 2070, -- War Council
-  [1986] = 2073, -- The Coven of Shivarra
-  [1987] = 2074, -- Hounds of Sargeras
-  [2025] = 2075, -- Eonar, the Lifebinder
-  [1992] = 2076, -- Garothi Worldbreaker
-  [2009] = 2082, -- Imonar the Soulhunter
-  [2004] = 2088, -- Kin'garoth
-  [2031] = 2092, -- Argus the Unmaker
+  -- TODO 8.0 add Uldir
 }
 
 local function get_encounters_list()

From e093247dfe7ae81a5558b6df420de183477dbf8f Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 13:52:35 +0200
Subject: [PATCH 14/82] Replace Dungeon Role with Spec Role

This is useful in more situations than the dungeon role load
condition. And since it should be almost always the same as the dungeon
role, we probably don't need both.

Github-Issue: 381
---
 WeakAuras/Prototypes.lua |  2 +-
 WeakAuras/WeakAuras.lua  | 26 ++++----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 6e20244036..bde76056f8 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -846,7 +846,7 @@ WeakAuras.load_prototype = {
     },
     {
       name = "role",
-      display = L["Player Dungeon Role"],
+      display = L["Spec Role"],
       type = "multiselect",
       values = "role_types",
       init = "arg"
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 900bec4db7..864d06e9f3 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -1339,30 +1339,12 @@ function WeakAuras.ScanForLoads(self, event, arg1)
     WeakAuras.DestroyEncounterTable()
   end
 
-  local player, realm, spec, role, zone = UnitName("player"), GetRealmName(), GetSpecialization(), UnitGroupRolesAssigned("player"), GetRealZoneText();
+  local player, realm, spec, zone = UnitName("player"), GetRealmName(), GetSpecialization(), GetRealZoneText();
   local zoneId = nil; -- TODO 8.0 HBD:GetPlayerZone();
   local _, race = UnitRace("player")
   local faction = UnitFactionGroup("player")
 
-  if role == "NONE" then
-    if IsInRaid() then
-      for i=1,GetNumGroupMembers() do
-        if UnitIsUnit(WeakAuras.raidUnits[i],"player") then
-          local _, _, _, _, _, _, _, _, _, raid_role, _, spec_role = GetRaidRosterInfo(i)
-          if raid_role and raid_role == "MAINTANK" then role = "TANK" end
-          if role == "NONE" then
-            if spec and spec > 0 then
-              local tmprole = GetSpecializationRole(spec)
-              if type(tmprole) == "string" then
-                role = tmprole
-              end
-            end
-          end
-          break;
-        end
-      end
-    end
-  end
+  local role = select(5, GetSpecializationInfo(GetSpecialization()));
 
   local _, class = UnitClass("player");
   -- 0:none 1:5N 2:5H 3:10N 4:25N 5:10H 6:25H 7:LFR 8:5CH 9:40N
@@ -1464,8 +1446,8 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   for id, data in pairs(db.displays) do
     if (data and not data.controlledChildren) then
       local loadFunc = loadFuncs[id];
-      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role); --zoneId
-      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role); -- oneId
+      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", incombat, vehicle, vehicleUi, inpetbattle, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role);
+      couldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", true, vehicle, vehicleUi, true, group, player, realm, class, spec, race, faction, playerLevel, zone, zoneId, encounter_id, size, difficulty, role);
 
       if(shouldBeLoaded and not loaded[id]) then
         WeakAuras.LoadDisplay(id);

From 67803acefa13dad320aaa608db903e461de6258e Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 11:44:23 +0200
Subject: [PATCH 15/82] Fix RegisterEvent calls. We registered even our
 internal events

So split up our event lists into actual wow events and internal
events.
---
 WeakAuras/GenericTrigger.lua |  19 ++++++-
 WeakAuras/Prototypes.lua     | 104 +++++++++++++++++++++++------------
 2 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index f1250989e4..6ab765b8a8 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -706,6 +706,13 @@ function LoadEvent(id, triggernum, data)
       loaded_events[event][id][triggernum] = data;
     end
   end
+  if (data.internal_events) then
+    for index, event in pairs(data.internal_events) do
+      loaded_events[event] = loaded_events[event] or {};
+      loaded_events[event][id] = loaded_events[event][id] or {};
+      loaded_events[event][id][triggernum] = data;
+    end
+  end
 end
 
 function GenericTrigger.LoadDisplay(id)
@@ -750,6 +757,7 @@ function GenericTrigger.Add(data, region)
       if(triggerType == "status" or triggerType == "event" or triggerType == "custom") then
         local triggerFuncStr, triggerFunc, untriggerFuncStr, untriggerFunc, statesParameter;
         local trigger_events = {};
+        local internal_events = {};
         local force_events = false;
         local durationFunc, overlayFuncs, nameFunc, iconFunc, textureFunc, stacksFunc;
         if(triggerType == "status" or triggerType == "event") then
@@ -808,10 +816,14 @@ function GenericTrigger.Add(data, region)
             local prototype = event_prototypes[trigger.event];
             if(prototype) then
               trigger_events = prototype.events;
+              internal_events = prototype.internal_events;
               force_events = prototype.force_events;
               if (type(trigger_events) == "function") then
                 trigger_events = trigger_events(trigger, untrigger);
               end
+              if (type(internal_events) == "function") then
+                internal_events = internal_events(trigger, untrigger);
+              end
 
               for index, event in ipairs(trigger_events) do
                 if (event == "FRAME_UPDATE") then
@@ -903,6 +915,7 @@ function GenericTrigger.Add(data, region)
           statesParameter = statesParameter,
           event = trigger.event,
           events = trigger_events,
+          internal_events = internal_events,
           force_events = force_events,
           inverse = trigger.use_inverse,
           subevent = trigger.event == "Combat Log" and trigger.subeventPrefix and trigger.subeventSuffix and (trigger.subeventPrefix..trigger.subeventSuffix);
@@ -1294,7 +1307,6 @@ do
     cdReadyFrame:RegisterEvent("SPELL_UPDATE_COOLDOWN");
     cdReadyFrame:RegisterEvent("SPELL_UPDATE_CHARGES");
     cdReadyFrame:RegisterEvent("RUNE_POWER_UPDATE");
-    cdReadyFrame:RegisterEvent("RUNE_TYPE_UPDATE");
     cdReadyFrame:RegisterEvent("UNIT_SPELLCAST_SENT");
     cdReadyFrame:RegisterEvent("PLAYER_TALENT_UPDATE");
     cdReadyFrame:RegisterEvent("PLAYER_PVP_TALENT_UPDATE");
@@ -1303,12 +1315,13 @@ do
     cdReadyFrame:RegisterEvent("PLAYER_EQUIPMENT_CHANGED");
     cdReadyFrame:SetScript("OnEvent", function(self, event, ...)
       if(event == "SPELL_UPDATE_COOLDOWN" or event == "SPELL_UPDATE_CHARGES"
-        or event == "RUNE_POWER_UPDATE" or event == "RUNE_TYPE_UPDATE"
+        or event == "RUNE_POWER_UPDATE"
         or event == "PLAYER_TALENT_UPDATE" or event == "PLAYER_PVP_TALENT_UPDATE") then
         WeakAuras.CheckCooldownReady();
       elseif(event == "UNIT_SPELLCAST_SENT") then
-        local unit, name = ...;
+        local unit, guid, name = ...;
         if(unit == "player") then
+          name = GetSpellInfo(name);
           if(gcdSpellName ~= name) then
             local icon = GetSpellTexture(name);
             gcdSpellName = name;
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index bde76056f8..fe25081ac8 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -982,8 +982,6 @@ WeakAuras.event_prototypes = {
     events = function(trigger)
       local result = {
         "UNIT_HEALTH_FREQUENT",
-        "WA_UNIT_PET",
-        "WA_DELAYED_PLAYER_ENTERING_WORLD"
       };
       AddUnitChangeEvents(trigger.unit, result);
       if (trigger.use_showAbsorb) then
@@ -994,6 +992,7 @@ WeakAuras.event_prototypes = {
       end
       return result;
     end,
+    internal_events = { "WA_UNIT_PET", "WA_DELAYED_PLAYER_ENTERING_WORLD" },
     force_events = "WA_DELAYED_PLAYER_ENTERING_WORLD",
     name = L["Health"],
     init = function(trigger)
@@ -1119,7 +1118,6 @@ WeakAuras.event_prototypes = {
     events = function(trigger)
       local result = {
         "UNIT_POWER_FREQUENT",
-        "WA_DELAYED_PLAYER_ENTERING_WORLD",
         "UNIT_DISPLAYPOWER"
       };
       AddUnitChangeEvents(trigger.unit, result);
@@ -1133,6 +1131,7 @@ WeakAuras.event_prototypes = {
       end
       return result;
     end,
+    internal_events = { "WA_DELAYED_PLAYER_ENTERING_WORLD" },
     force_events = "WA_DELAYED_PLAYER_ENTERING_WORLD",
     name = L["Power"],
     init = function(trigger)
@@ -1742,6 +1741,8 @@ WeakAuras.event_prototypes = {
   ["Spell Activation Overlay"] = {
     type = "status",
     events = {
+    },
+    internal_events = {
       "WA_UPDATE_OVERLAY_GLOW"
     },
     force_events = "WA_UPDATE_OVERLAY_GLOW",
@@ -1771,7 +1772,10 @@ WeakAuras.event_prototypes = {
   },
   ["Cooldown Progress (Spell)"] = {
     type = "status",
-    events = function(trigger, untrigger)
+    events = {
+
+    },
+    internal_events = function(trigger, untrigger)
       local events = {
         "SPELL_COOLDOWN_READY",
         "SPELL_COOLDOWN_CHANGED",
@@ -1990,6 +1994,8 @@ WeakAuras.event_prototypes = {
   ["Cooldown Ready (Spell)"] = {
     type = "event",
     events = {
+    },
+    internal_events = {
       "SPELL_COOLDOWN_READY",
     },
     name = L["Cooldown Ready (Spell)"],
@@ -2081,11 +2087,13 @@ WeakAuras.event_prototypes = {
   ["Cooldown Progress (Item)"] = {
     type = "status",
     events = {
+      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
+    },
+    internal_events = {
       "ITEM_COOLDOWN_READY",
       "ITEM_COOLDOWN_CHANGED",
       "ITEM_COOLDOWN_STARTED",
       "COOLDOWN_REMAINING_CHECK",
-      "ITEM_INFO_UPDATED"
     },
     force_events = "ITEM_COOLDOWN_FORCE",
     name = L["Cooldown Progress (Item)"],
@@ -2174,12 +2182,13 @@ WeakAuras.event_prototypes = {
   },
   ["Cooldown Progress (Equipment Slot)"] = {
     type = "status",
-    events = {
-      "ITEM_SLOT_COOLDOWN_READY",
+    events = {},
+    internal_events = {
       "ITEM_SLOT_COOLDOWN_STARTED",
       "ITEM_SLOT_COOLDOWN_CHANGED",
       "COOLDOWN_REMAINING_CHECK",
-      "ITEM_SLOT_COOLDOWN_ITEM_CHANGED"
+      "ITEM_SLOT_COOLDOWN_ITEM_CHANGED",
+      "ITEM_SLOT_COOLDOWN_READY"
     },
     force_events = "ITEM_COOLDOWN_FORCE",
     name = L["Cooldown Progress (Equipment Slot)"],
@@ -2267,8 +2276,10 @@ WeakAuras.event_prototypes = {
   ["Cooldown Ready (Item)"] = {
     type = "event",
     events = {
+      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
+    },
+    internal_events = {
       "ITEM_COOLDOWN_READY",
-      "ITEM_INFO_UPDATED"
     },
     name = L["Cooldown Ready (Item)"],
     init = function(trigger)
@@ -2301,7 +2312,8 @@ WeakAuras.event_prototypes = {
   },
   ["Cooldown Ready (Equipment Slot)"] = {
     type = "event",
-    events = {
+    events = {},
+    internal_events = {
       "ITEM_SLOT_COOLDOWN_READY"
     },
     name = L["Cooldown Ready (Equipment Slot)"],
@@ -2562,7 +2574,8 @@ WeakAuras.event_prototypes = {
   -- BigWigs
   ["BigWigs Message"] = {
     type = "event",
-    events = {
+    events = {},
+    internal_events = {
       "BigWigs_Message"
     },
     name = L["BigWigs Message"],
@@ -2620,7 +2633,8 @@ WeakAuras.event_prototypes = {
   },
   ["BigWigs Timer"] = {
     type = "status",
-    events = {
+    events = {},
+    internal_events = {
       "BigWigs_StartBar", "BigWigs_StopBar", "BigWigs_Timer_Update",
     },
     force_events = "BigWigs_Timer_Force",
@@ -2761,7 +2775,8 @@ WeakAuras.event_prototypes = {
   },
   ["Global Cooldown"] = {
     type = "status",
-    events = {
+    events = {},
+    internal_events = {
       "GCD_START",
       "GCD_CHANGE",
       "GCD_END",
@@ -2809,6 +2824,8 @@ WeakAuras.event_prototypes = {
   ["Swing Timer"] = {
     type = "status",
     events = {
+    },
+    internal_events = {
       "SWING_TIMER_START",
       "SWING_TIMER_CHANGE",
       "SWING_TIMER_END"
@@ -2861,14 +2878,15 @@ WeakAuras.event_prototypes = {
   ["Action Usable"] = {
     type = "status",
     events = {
-      "SPELL_COOLDOWN_READY",
-      "SPELL_COOLDOWN_CHANGED",
-      "SPELL_COOLDOWN_STARTED",
       "SPELL_UPDATE_USABLE",
       "PLAYER_TARGET_CHANGED",
       "UNIT_POWER_FREQUENT",
       "RUNE_POWER_UPDATE",
-      "RUNE_TYPE_UPDATE"
+    },
+    internal_events = {
+      "SPELL_COOLDOWN_READY",
+      "SPELL_COOLDOWN_CHANGED",
+      "SPELL_COOLDOWN_STARTED",
     },
     force_events = "SPELL_UPDATE_USABLE",
     name = L["Action Usable"],
@@ -2959,9 +2977,11 @@ WeakAuras.event_prototypes = {
     type = "status",
     events = {
       "PLAYER_TOTEM_UPDATE",
-      "COOLDOWN_REMAINING_CHECK",
       "PLAYER_ENTERING_WORLD"
     },
+    internal_events = {
+      "COOLDOWN_REMAINING_CHECK",
+    },
     force_events = "PLAYER_ENTERING_WORLD",
     name = L["Totem"],
     statesParameter = "full",
@@ -3120,9 +3140,11 @@ WeakAuras.event_prototypes = {
     type = "status",
     events = {
       "BAG_UPDATE",
-      "ITEM_COUNT_UPDATE",
       "PLAYER_ENTERING_WORLD"
     },
+    internal_events = {
+      "ITEM_COUNT_UPDATE",
+    },
     force_events = "BAG_UPDATE",
     name = L["Item Count"],
     init = function(trigger)
@@ -3180,8 +3202,8 @@ WeakAuras.event_prototypes = {
     type = "status",
     events = {
       "UPDATE_SHAPESHIFT_FORM",
-      "WA_DELAYED_PLAYER_ENTERING_WORLD"
     },
+    internal_events = { "WA_DELAYED_PLAYER_ENTERING_WORLD" },
     force_events = "WA_DELAYED_PLAYER_ENTERING_WORLD",
     name = L["Stance/Form/Aura"],
     init = function(trigger)
@@ -3243,7 +3265,8 @@ WeakAuras.event_prototypes = {
   },
   ["Weapon Enchant"] = {
     type = "status",
-    events = {
+    events = { },
+    internal_events = {
       "MAINHAND_TENCH_UPDATE",
       "OFFHAND_TENCH_UPDATE"
     },
@@ -3440,7 +3463,8 @@ WeakAuras.event_prototypes = {
     type = "status",
     events = {
       "RUNE_POWER_UPDATE",
-      "RUNE_TYPE_UPDATE",
+    },
+    internal_events = {
       "RUNE_COOLDOWN_READY",
       "RUNE_COOLDOWN_CHANGED",
       "RUNE_COOLDOWN_STARTED",
@@ -3571,9 +3595,9 @@ WeakAuras.event_prototypes = {
     events = {
       "UNIT_INVENTORY_CHANGED",
       "PLAYER_EQUIPMENT_CHANGED",
-      "WA_DELAYED_PLAYER_ENTERING_WORLD",
-      "ITEM_INFO_UPDATED"
+      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
     },
+    internal_events = { "WA_DELAYED_PLAYER_ENTERING_WORLD", },
     force_events = "UNIT_INVENTORY_CHANGED",
     name = L["Item Equipped"],
     init = function(trigger)
@@ -3648,6 +3672,7 @@ WeakAuras.event_prototypes = {
         required = true,
         validate = WeakAuras.ValidateNumeric,
         desc = function()
+          -- TODO 8.0 doesn't seem to work
           local classFilter, specFilter = C_LootJournal.GetClassAndSpecFilters();
           local currentClass = select(3, UnitClass("player"));
           local specID = GetSpecializationInfo(GetSpecialization());
@@ -3689,8 +3714,8 @@ WeakAuras.event_prototypes = {
       "WEAR_EQUIPMENT_SET",
       "EQUIPMENT_SETS_CHANGED",
       "EQUIPMENT_SWAP_FINISHED",
-      "WA_DELAYED_PLAYER_ENTERING_WORLD"
     },
+    internal_events = {"WA_DELAYED_PLAYER_ENTERING_WORLD"},
     force_events = "PLAYER_EQUIPMENT_CHANGED",
     name = L["Equipment Set Equipped"],
     init = function(trigger)
@@ -3825,11 +3850,13 @@ WeakAuras.event_prototypes = {
         "UNIT_SPELLCAST_DELAYED",
         "UNIT_SPELLCAST_INTERRUPTIBLE",
         "UNIT_SPELLCAST_NOT_INTERRUPTIBLE",
-        "CAST_REMAINING_CHECK"
       };
       AddUnitChangeEvents(trigger.unit, result);
       return result;
     end,
+    internal_events = {
+      "CAST_REMAINING_CHECK"
+    },
     force_events = "CAST_REMAINING_CHECK",
     name = L["Cast"],
     init = function(trigger)
@@ -3921,9 +3948,9 @@ WeakAuras.event_prototypes = {
       }
     },
     durationFunc = function(trigger)
-      local _, _, _, _, startTime, endTime = UnitCastingInfo(trigger.unit);
+      local _, _, _, startTime, endTime = UnitCastingInfo(trigger.unit);
       if not(startTime) then
-        local _, _, _, _, startTime, endTime = UnitChannelInfo(trigger.unit);
+        local _, _, _, startTime, endTime = UnitChannelInfo(trigger.unit);
         if not(startTime) then
           return 0, math.huge;
         else
@@ -3966,7 +3993,6 @@ WeakAuras.event_prototypes = {
     type = "status",
     events = function(trigger, untrigger)
       local events = {};
-      tinsert(events,  "CONDITIONS_CHECK");
       if (trigger.use_incombat ~= nil) then
         tinsert(events, "PLAYER_REGEN_ENABLED");
         tinsert(events, "PLAYER_REGEN_DISABLED");
@@ -3990,19 +4016,25 @@ WeakAuras.event_prototypes = {
         tinsert(events, "PLAYER_UPDATE_RESTING");
       end
 
+      if (trigger.use_HasPet ~= nil) then
+        tinsert(events, "UNIT_PET");
+      end
+
+      return events;
+    end,
+    internal_events = function(trigger, untrigger)
+      local events = { "CONDITIONS_CHECK"};
       if (trigger.use_mounted ~= nil) then
         tinsert(events, "MOUNTED_UPDATE");
       end
 
       if (trigger.use_HasPet ~= nil) then
         tinsert(events, "PET_UPDATE");
-        tinsert(events, "UNIT_PET");
       end
 
       if (trigger.use_ismoving ~= nil) then
         tinsert(events, "PLAYER_MOVING_UPDATE");
       end
-
       return events;
     end,
     force_events = "CONDITIONS_CHECK",
@@ -4081,9 +4113,11 @@ WeakAuras.event_prototypes = {
   ["Spell Known"] = {
     type = "status",
     events = {
-      "WA_DELAYED_PLAYER_ENTERING_WORLD",
       "SPELLS_CHANGED",
       "UNIT_PET",
+    },
+    internal_events = {
+      "WA_DELAYED_PLAYER_ENTERING_WORLD",
       "WA_SPELL_CHECK"
     },
     force_events = "WA_SPELL_CHECK",
@@ -4126,6 +4160,8 @@ WeakAuras.event_prototypes = {
     events = {
       "PET_BAR_UPDATE",
       "UNIT_PET",
+    },
+    internal_events = {
       "WA_DELAYED_PLAYER_ENTERING_WORLD"
     },
     force_events = "WA_DELAYED_PLAYER_ENTERING_WORLD",
@@ -4134,12 +4170,12 @@ WeakAuras.event_prototypes = {
       local ret = [[
           local inverse = %s
           local check_behavior = %s
-          local name, i, active, exists
+          local name, i, active
           local activeIcon
           local behavior
           local index = 1
           repeat
-            name,_,i,_,active,_,_,exists = GetPetActionInfo(index);
+            name,i, _,active = GetPetActionInfo(index);
             if (active) then
               activeIcon = _G[i];
             end

From d193f593e2a93ecacdf15adedaa1da9b0d789ad9 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 16:08:51 +0200
Subject: [PATCH 16/82] Make _ local

---
 WeakAuras/BuffTrigger.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index bce1012fa7..43c1cdbd22 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -974,7 +974,7 @@ do
 
         -- TODO 8.0: Check if there is a better way than iterating all auras
         local detected
-        local name, icon, count, duration, expirationTime, unitCaster, spellId
+        local name, icon, count, duration, expirationTime, unitCaster, spellId, _
         for i = 1, BUFF_MAX_DISPLAY do
           name, icon, count, _, duration, expirationTime, unitCaster, _, _, spellId = UnitAura(unit, i, filter);
           if not name then break end
@@ -1145,7 +1145,7 @@ do
 
               -- TODO 8.0: Check if there is a better way than iterating all auras
               local detected
-              local name, icon, count, duration, expirationTime, unitCaster
+              local name, icon, count, duration, expirationTime, unitCaster, _
               for i = 1, BUFF_MAX_DISPLAY do
                 name, icon, count, _, duration, expirationTime, unitCaster = UnitAura(uid, i, filter);
                 if not name then break end

From 36ebc75331d6f3304b46d2b7d6b2deb228189208 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 22 Apr 2018 16:20:15 +0200
Subject: [PATCH 17/82] Adjust to Combat log event changes

---
 WeakAuras/BuffTrigger.lua    |  4 ++-
 WeakAuras/GenericTrigger.lua | 61 +++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index 43c1cdbd22..34a2c9c3ef 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -60,11 +60,13 @@ GetTriggerConditions(data, triggernum)
 Returns the potential conditions for a trigger
 ]]--
 
+-- luacheck: globals CombatLogGetCurrentEventInfo
 
 -- Lua APIs
 local tinsert, wipe = table.insert, wipe
 local pairs, next, type = pairs, next, type
 local BUFF_MAX_DISPLAY = _G.BUFF_MAX_DISPLAY
+local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
 
 local WeakAuras = WeakAuras;
 local L = WeakAuras.L;
@@ -1118,7 +1120,7 @@ do
 
   local function handleEvent(frame, event, ...)
     if(event == "COMBAT_LOG_EVENT_UNFILTERED") then
-      combatLog(...);
+      combatLog(CombatLogGetCurrentEventInfo());
     elseif(event == "UNIT_TARGET") then
       uidTrack(...);
     elseif(event == "PLAYER_FOCUS_CHANGED") then
diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 6ab765b8a8..4c9c8daf51 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -60,11 +60,13 @@ GetTriggerConditions(data, triggernum)
 Returns potential conditions that this trigger provides.
 ]]--
 
+-- luacheck: globals GTFO DBM BigWigsLoader CombatLogGetCurrentEventInfo
 
 -- Lua APIs
 local tinsert, tconcat, wipe = table.insert, table.concat, wipe
 local tostring, pairs, type = tostring, pairs, type
 local error, setmetatable = error, setmetatable
+local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo;
 
 -- WoW APIs
 local IsPlayerMoving = IsPlayerMoving
@@ -92,8 +94,6 @@ local specificBosses = WeakAuras.specificBosses;
 local LoadEvent, HandleEvent, TestForTriState, TestForToggle, TestForLongString, TestForMultiSelect
 local ConstructTest, ConstructFunction
 
--- luacheck: globals GTFO DBM BigWigsLoader
-
 function WeakAuras.split(input)
   input = input or "";
   local ret = {};
@@ -570,28 +570,43 @@ end
 
 function WeakAuras.ScanEvents(event, arg1, arg2, ...)
   local event_list = loaded_events[event];
-  if(event == "COMBAT_LOG_EVENT_UNFILTERED") then
-    event_list = event_list and event_list[arg2];
+  if (not event_list) then
+    return
   end
-  if(event_list) then
+  if(event == "COMBAT_LOG_EVENT_UNFILTERED") then
+    local arg1, arg2 = CombatLogGetCurrentEventInfo();
+
+    event_list = event_list[arg2];
+    if (not event_list) then
+      return;
+    end
+    WeakAuras.ScanEventsInternal(event_list, event, CombatLogGetCurrentEventInfo());
+
+  elseif (event == "COMBAT_LOG_EVENT_UNFILTERED_CUSTOM") then
     -- This reverts the COMBAT_LOG_EVENT_UNFILTERED_CUSTOM workaround so that custom triggers that check the event argument will work as expected
     if(event == "COMBAT_LOG_EVENT_UNFILTERED_CUSTOM") then
       event = "COMBAT_LOG_EVENT_UNFILTERED";
     end
-    for id, triggers in pairs(event_list) do
-      WeakAuras.ActivateAuraEnvironment(id);
-      local updateTriggerState = false;
-      for triggernum, data in pairs(triggers) do
-        local allStates = WeakAuras.GetTriggerStateForTrigger(id, triggernum);
-        if (RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2, ...)) then
-          updateTriggerState = true;
-        end
-      end
-      if (updateTriggerState) then
-        WeakAuras.UpdatedTriggerState(id);
+    WeakAuras.ScanEventsInternal(event_list, event, CombatLogGetCurrentEventInfo());
+  else
+    WeakAuras.ScanEventsInternal(event_list, event, arg1, arg2, ...);
+  end
+end
+
+function WeakAuras.ScanEventsInternal(event_list, event, arg1, arg2, ... )
+  for id, triggers in pairs(event_list) do
+    WeakAuras.ActivateAuraEnvironment(id);
+    local updateTriggerState = false;
+    for triggernum, data in pairs(triggers) do
+      local allStates = WeakAuras.GetTriggerStateForTrigger(id, triggernum);
+      if (RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2, ...)) then
+        updateTriggerState = true;
       end
-      WeakAuras.ActivateAuraEnvironment(nil);
     end
+    if (updateTriggerState) then
+      WeakAuras.UpdatedTriggerState(id);
+    end
+    WeakAuras.ActivateAuraEnvironment(nil);
   end
 end
 
@@ -624,18 +639,12 @@ end
 function HandleEvent(frame, event, arg1, arg2, ...)
   if not(WeakAuras.IsPaused()) then
     if(event == "COMBAT_LOG_EVENT_UNFILTERED") then
-      if(loaded_events[event] and loaded_events[event][arg2]) then
-        WeakAuras.ScanEvents(event, arg1, arg2, ...);
-      end
+      WeakAuras.ScanEvents(event);
       -- This triggers the scanning of "hacked" COMBAT_LOG_EVENT_UNFILTERED events that were renamed in order to circumvent
       -- the "proper" COMBAT_LOG_EVENT_UNFILTERED checks
-      if(loaded_events["COMBAT_LOG_EVENT_UNFILTERED_CUSTOM"]) then
-        WeakAuras.ScanEvents("COMBAT_LOG_EVENT_UNFILTERED_CUSTOM", arg1, arg2, ...);
-      end
+      WeakAuras.ScanEvents("COMBAT_LOG_EVENT_UNFILTERED_CUSTOM");
     else
-      if(loaded_events[event]) then
-        WeakAuras.ScanEvents(event, arg1, arg2, ...);
-      end
+      WeakAuras.ScanEvents(event, arg1, arg2, ...);
     end
   end
   if (event == "PLAYER_ENTERING_WORLD") then

From 073318f759f6d00bf3f8e56984daef907935a6c3 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Mon, 23 Apr 2018 01:39:10 +0200
Subject: [PATCH 18/82] Mark Swing Timer as NYI as apparently it doesn't work

---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index fe25081ac8..e5db639400 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2830,7 +2830,7 @@ WeakAuras.event_prototypes = {
       "SWING_TIMER_CHANGE",
       "SWING_TIMER_END"
     },
-    name = L["Swing Timer"],
+    name = L["Swing Timer (NYI)"], -- TODO 8.0
     init = function(trigger)
       trigger.hand = trigger.hand or "main";
       WeakAuras.InitSwingTimer();

From a5a5928e883bd37a15d2ceb15213a691b5d0e8fe Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Wed, 25 Apr 2018 14:56:09 +0200
Subject: [PATCH 19/82] no longer pull in LRC as long as we ship a fork

---
 .pkgmeta     |  2 --
 CHANGELOG.md | 22 ++++------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index 35c5e4e945..483165ffed 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -37,8 +37,6 @@ externals:
   url: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
  WeakAuras/Libs/HereBeDragons-1.0:
   url: https://repos.wowace.com/wow/herebedragons
- WeakAuras/Libs/LibRangeCheck-2.0:
-  url: https://repos.wowace.com/wow/librangecheck-2-0/trunk/LibRangeCheck-2.0
 
 enable-nolib-creation: no
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bee16b7213..7acc7c3b1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,10 @@
 # WeakAuras 2
 
-## [2.5.10-9-g06dc886](https://github.com/WeakAuras/WeakAuras2/tree/06dc8864c230cf3d7cea0b26892a70ef4532b93e) (2018-04-21)
+## [8.0-beta1-1-g288247e](https://github.com/WeakAuras/WeakAuras2/tree/288247e82309412dfdbf33639028f7c48f4867bc) (2018-04-25)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/2.5.10...06dc8864c230cf3d7cea0b26892a70ef4532b93e)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta1...288247e82309412dfdbf33639028f7c48f4867bc)
 
-Benjamin Staneck (4):
+Benjamin Staneck (1):
 
-- ship a patched version of LibRangeCheck-2.0 for testing
-- the rank return from UnitAura has been removed
-- disable HereBeDragons integration for now
-- Update TOC to 80000
-
-Infus (4):
-
-- Dry code PVP Talents
-- Disable LibRangeCheck-2.0 for now
-- Mark disabled HBD with a TODO 8.0
-- Setup fallback state so that it has no duration
-
-asakawa-k (1):
-
-- Add key bindings to open/close the options window (#385)
+- no longer pull in LRC as long as we ship a fork
 

From 0477a01e592c41615d6f7a0c80291f1626071830 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Wed, 25 Apr 2018 23:17:05 +0200
Subject: [PATCH 20/82] Fix DBM triggers

---
 WeakAuras/Prototypes.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index e5db639400..f98c6da73d 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2361,6 +2361,8 @@ WeakAuras.event_prototypes = {
   ["DBM Announce"] = {
     type = "event",
     events = {
+    },
+    internal_events = {
       "DBM_Announce"
     },
     name = L["DBM Announce"],
@@ -2406,6 +2408,9 @@ WeakAuras.event_prototypes = {
   ["DBM Timer"] = {
     type = "status",
     events = {
+
+    },
+    internal_events = {
       "DBM_TimerStart", "DBM_TimerStop", "DBM_TimerStopAll", "DBM_TimerUpdate", "DBM_TimerForce"
     },
     force_events = "DBM_TimerForce",

From e194d89be44583783d9ae0c1a004b3f78eee638b Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 00:19:48 +0200
Subject: [PATCH 21/82] Review the Official BfA Addon Changes document and port
 more stuff

---
 WeakAuras/Prototypes.lua                    | 10 +++++-----
 WeakAurasTemplates/TriggerTemplatesData.lua |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index f98c6da73d..aa9aa09ef0 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -1154,7 +1154,7 @@ WeakAuras.event_prototypes = {
       if (trigger.use_showCost) then
         ret = ret .. [[
           if (event == "UNIT_SPELLCAST_START" and unit == "player") then
-            local spellID = select(10, UnitCastingInfo("player"));
+            local spellID = select(9, UnitCastingInfo("player"));
             if spellID then
               local costTable = GetSpellPowerCost(spellID);
               for _, costInfo in pairs(costTable) do
@@ -3872,11 +3872,11 @@ WeakAuras.event_prototypes = {
         local spell, interruptible, _;
         local castType;
         local endTime;
-        spell, _, _, _, _, endTime, _, _, interruptible = UnitCastingInfo(unit)
+        spell, _, _, _, endTime, _, _, interruptible = UnitCastingInfo(unit)
         if(spell) then
           castType = "cast"
         else
-          spell, _, _, _, _, endTime, _, interruptible = UnitChannelInfo(unit)
+          spell, _, _, _, endTime, _, interruptible = UnitChannelInfo(unit)
           if(spell) then
             castType = "channel"
           end
@@ -3979,9 +3979,9 @@ WeakAuras.event_prototypes = {
       end
     end,
     iconFunc = function(trigger)
-      local _, _, _, icon = UnitCastingInfo(trigger.unit);
+      local _, _, icon = UnitCastingInfo(trigger.unit);
       if not(icon) then
-        local _, _, _, icon = UnitChannelInfo(trigger.unit);
+        local _, _, icon = UnitChannelInfo(trigger.unit);
         if not(icon) then
           return "Interface\\AddOns\\WeakAuras\\Media\\Textures\\icon";
         else
diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index 4063712616..0ace15ba2b 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -1,6 +1,6 @@
 local WeakAuras = WeakAuras
 local L = WeakAuras.L
-local GetSpellInfo, tinsert, GetItemInfo, GetSpellDescription, C_Timer = GetSpellInfo, tinsert, GetItemInfo, GetSpellDescription, C_Timer
+local GetSpellInfo, tinsert, GetItemInfo, GetSpellDescription, C_Timer, Spell = GetSpellInfo, tinsert, GetItemInfo, GetSpellDescription, C_Timer, Spell
 
 -- The templates tables are created on demand
 local templates =
@@ -4812,6 +4812,12 @@ local function handleItem(item)
       end
     end
     if (item.type ~= "item") then
+      local spell = Spell:CreateFromSpellID(item.spell);
+      if (not spell:IsSpellEmpty()) then
+        spell:ContinueOnSpellLoad(function()
+          item.description = GetSpellDescription(spell:GetSpellID());
+        end);
+      end
       item.description = GetSpellDescription(item.spell);
     end
   end

From 2543bd1ef41fc35cd163f8332f0a4c269712634e Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 00:40:09 +0200
Subject: [PATCH 22/82] Eat errors from RegisterEvent for custom auras

Having custom events there is not too uncommon, so just silently
ignore any errors from trying to register them with wow.
---
 WeakAuras/GenericTrigger.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 4c9c8daf51..79055ef14e 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -892,7 +892,7 @@ function GenericTrigger.Add(data, region)
                 trigger_events[index] = "COMBAT_LOG_EVENT_UNFILTERED_CUSTOM";
                 frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");
               else
-                frame:RegisterEvent(event);
+                xpcall(frame.RegisterEvent, trueFunction, frame, event);
                 aceEvents:RegisterMessage(event, HandleEvent, frame)
               end
               force_events = trigger.custom_type == "status";

From ae5aa3c986d62f0e35bddc96072288e5b82f772e Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 18:50:27 +0200
Subject: [PATCH 23/82] Fix Swing Timer Check

---
 WeakAuras/GenericTrigger.lua | 15 +++++++++------
 WeakAuras/Prototypes.lua     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 79055ef14e..b6770a2b01 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -1207,10 +1207,10 @@ do
     WeakAuras.ScanEvents("SWING_TIMER_END");
   end
 
-  local function swingTimerCheck(frame, event, _, message, _, sourceGUID, _, _, _, destGUID, ...)
+  local function swingTimerCheck(ts, event, _, sourceGUID, _, _, _, destGUID, _, _, _, ...)
     if(sourceGUID == selfGUID) then
-      if(message == "SWING_DAMAGE" or message == "SWING_MISSED") then
-        local isOffHand = select(message == "SWING_DAMAGE" and 13 or 5, ...);
+      if(event == "SWING_DAMAGE" or event == "SWING_MISSED") then
+        local isOffHand = select(event == "SWING_DAMAGE" and 10 or 2, ...);
 
         local event;
         local currentTime = GetTime();
@@ -1231,7 +1231,7 @@ do
         end
 
         WeakAuras.ScanEvents(event);
-      elseif(message == "RANGE_DAMAGE" or message == "RANGE_MISSED") then
+      elseif(event == "RANGE_DAMAGE" or event == "RANGE_MISSED") then
         local event;
         local currentTime = GetTime();
         local speed = UnitRangedDamage("player");
@@ -1247,7 +1247,7 @@ do
 
         WeakAuras.ScanEvents(event);
       end
-    elseif (destGUID == selfGUID and (select(4, ...) == "PARRY" or select(7, ...) == "PARRY")) then
+    elseif (destGUID == selfGUID and (select(1, ...) == "PARRY" or select(4, ...) == "PARRY")) then
       if (lastSwingMain) then
         local timeLeft = lastSwingMain + swingDurationMain - GetTime();
         if (timeLeft > 0.6 * swingDurationMain) then
@@ -1267,7 +1267,10 @@ do
     if not(swingTimerFrame) then
       swingTimerFrame = CreateFrame("frame");
       swingTimerFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");
-      swingTimerFrame:SetScript("OnEvent", swingTimerCheck);
+      swingTimerFrame:SetScript("OnEvent",
+        function()
+          swingTimerCheck(CombatLogGetCurrentEventInfo())
+        end);
       selfGUID = UnitGUID("player");
     end
   end
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index aa9aa09ef0..ed35ef62a1 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2835,7 +2835,7 @@ WeakAuras.event_prototypes = {
       "SWING_TIMER_CHANGE",
       "SWING_TIMER_END"
     },
-    name = L["Swing Timer (NYI)"], -- TODO 8.0
+    name = L["Swing Timer"],
     init = function(trigger)
       trigger.hand = trigger.hand or "main";
       WeakAuras.InitSwingTimer();

From 78bf173d0e9abb7f989e3e5a84e60ed97575fe4a Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 18:51:01 +0200
Subject: [PATCH 24/82] Remove ITEM_INFO_UPDATE.

Apparently that's neither a wow event nor a internal event.
---
 WeakAuras/Prototypes.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index ed35ef62a1..41dc3f7690 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2087,7 +2087,7 @@ WeakAuras.event_prototypes = {
   ["Cooldown Progress (Item)"] = {
     type = "status",
     events = {
-      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
+
     },
     internal_events = {
       "ITEM_COOLDOWN_READY",
@@ -2276,8 +2276,7 @@ WeakAuras.event_prototypes = {
   ["Cooldown Ready (Item)"] = {
     type = "event",
     events = {
-      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
-    },
+          },
     internal_events = {
       "ITEM_COOLDOWN_READY",
     },
@@ -3600,7 +3599,6 @@ WeakAuras.event_prototypes = {
     events = {
       "UNIT_INVENTORY_CHANGED",
       "PLAYER_EQUIPMENT_CHANGED",
-      -- TODO 8.0 "ITEM_INFO_UPDATE" ?
     },
     internal_events = { "WA_DELAYED_PLAYER_ENTERING_WORLD", },
     force_events = "UNIT_INVENTORY_CHANGED",

From 5006fb0b79273782bfcc863613698b66fe22a1db Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 18:51:46 +0200
Subject: [PATCH 25/82] Fix a small issue in the Item Set trigger

---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 41dc3f7690..eb7bf3bfab 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -3675,11 +3675,11 @@ WeakAuras.event_prototypes = {
         required = true,
         validate = WeakAuras.ValidateNumeric,
         desc = function()
-          -- TODO 8.0 doesn't seem to work
           local classFilter, specFilter = C_LootJournal.GetClassAndSpecFilters();
           local currentClass = select(3, UnitClass("player"));
           local specID = GetSpecializationInfo(GetSpecialization());
 
+          C_LootJournal.SetClassAndSpecFilters(currentClass, specID);
           local sets = C_LootJournal.GetFilteredItemSets();
           C_LootJournal.SetClassAndSpecFilters(classFilter, specFilter);
 

From b2333d9e51fa27d02140b6db6fabe32fab045c45 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 18:54:27 +0200
Subject: [PATCH 26/82] Add a comment to check if this workaround is still
 needed

---
 WeakAuras/RegionTypes/RegionPrototype.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WeakAuras/RegionTypes/RegionPrototype.lua b/WeakAuras/RegionTypes/RegionPrototype.lua
index 52942ef51b..742a3676fb 100644
--- a/WeakAuras/RegionTypes/RegionPrototype.lua
+++ b/WeakAuras/RegionTypes/RegionPrototype.lua
@@ -500,6 +500,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, id, cloneId,
 end
 
 -- WORKAROUND Texts don't get the right size by default in WoW 7.3
+-- TODO 8.0 check this ticket
 function WeakAuras.regionPrototype.SetTextOnText(text, str)
   text:SetWidth(0); -- This makes the text use its internal text size calculation
   text:SetText(str);

From 8571023750c3af5c84aeca38c8edd2e431daafa9 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 18:54:47 +0200
Subject: [PATCH 27/82] Remove note in the Model that a api will change
 behaviour in 7.3

---
 WeakAurasOptions/RegionOptions/Model.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAurasOptions/RegionOptions/Model.lua b/WeakAurasOptions/RegionOptions/Model.lua
index 979dce4d9c..b151cf7f4d 100644
--- a/WeakAurasOptions/RegionOptions/Model.lua
+++ b/WeakAurasOptions/RegionOptions/Model.lua
@@ -51,7 +51,7 @@ local function createOptions(id, data)
     },
     api = {
       type = "toggle",
-      name = L["Use SetTransform (will change behaviour in 7.3)"],
+      name = L["Use SetTransform"],
       order = 7,
       width = "double"
     },

From 742bc84bc5fe16fc378bb411a85c26d4a71ac6dd Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Thu, 26 Apr 2018 20:04:15 +0200
Subject: [PATCH 28/82] Prepare Templates for 8.0

By throwing away 90% of the data. To be refilled.
---
 WeakAurasTemplates/TriggerTemplatesData.lua | 3256 +------------------
 1 file changed, 116 insertions(+), 3140 deletions(-)

diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index 0ace15ba2b..c110948485 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -61,89 +61,28 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 1719, type = "buff", unit = "player"}, -- Battle Cry
-        { spell = 18499, type = "buff", unit = "player" }, -- Berserker Rage
-        { spell = 46924, type = "buff", unit = "player"}, -- Bladestorm
-        { spell = 60503, type = "buff", unit = "player", talent = 2}, -- Overpower!
-        { spell = 97463, type = "buff", unit = "player" }, -- Commanding Shout
-        { spell = 107574, type = "buff", unit = "player", talent = 9 }, -- Avatar
-        { spell = 118038, type = "buff", unit = "player" }, -- Die by the Sword
-        { spell = 188923, type = "buff", unit = "player" }, -- Cleave
-        { spell = 197690, type = "buff", unit = "player", talent = 12 }, -- Defensive Stance
-        { spell = 202164, type = "buff", unit = "player" }, -- Bounding Stride
-        { spell = 207982, type = "buff", unit = "player", talent = 18 }, -- Focused Rage
-        { spell = 209484, type = "buff", unit = "player" }, -- Tactical Advance
-        { spell = 209567, type = "buff", unit = "player" }, -- Corrupted Blood of Zakajz
-        { spell = 209706, type = "buff", unit = "player" }, -- Shattered Defenses
-        { spell = 227744, type = "buff", unit = "player", talent = 21 }, -- Ravager
-        { spell = 248622, type = "buff", unit = "player", talent = 17 }, -- In For The Kill
       },
       icon = 458972
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 355, type = "debuff", unit = "target" }, -- Taunt
-        { spell = 772, type = "debuff", unit = "target", talent = 8 }, -- Rend
-        { spell = 1715, type = "debuff", unit = "target" }, -- Hamstring
-        { spell = 5246, type = "debuff", unit = "target" }, -- Intimidating Shout
-        { spell = 105771, type = "debuff", unit = "target" }, -- Charge
-        { spell = 115804, type = "debuff", unit = "target" }, -- Mortal Wounds
-        { spell = 132168, type = "debuff", unit = "target", talent = 4 }, -- Shockwave
-        { spell = 132169, type = "debuff", unit = "target", talent = 5 }, -- Storm Bolt
-        { spell = 208086, type = "debuff", unit = "target" }, -- Colossus Smash
-        { spell = 209569, type = "debuff", unit = "target" }, -- Corrupted Blood of Zakajz
-        { spell = 215537, type = "debuff", unit = "target", talent = 7 }, -- Trauma
       },
       icon = 464973
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 100, type = "ability"}, -- Charge
-        { spell = 355, type = "ability"}, -- Taunt
-        { spell = 845, type = "ability"}, -- Cleave
-        { spell = 1719, type = "ability"}, -- Battle Cry
-        { spell = 5246, type = "ability"}, -- Intimidating Shout
-        { spell = 6544, type = "ability"}, -- Heroic Leap
-        { spell = 6552, type = "ability"}, -- Pummel
-        { spell = 12294, type = "ability"}, -- Mortal Strike
-        { spell = 18499, type = "ability"}, -- Berserker Rage
-        { spell = 34428, type = "ability"}, -- Victory Rush
-        { spell = 46924, type = "ability"}, -- Bladestorm
-        { spell = 46968, type = "ability", talent = 4}, -- Shockwave
-        { spell = 57755, type = "ability"}, -- Heroic Throw
-        { spell = 97462, type = "ability"}, -- Commanding Shout
-        { spell = 107570, type = "ability", talent = 5}, -- Storm Bolt
-        { spell = 107574, type = "ability", talent = 9}, -- Avatar
-        { spell = 118038, type = "ability"}, -- Die by the Sword
-        { spell = 152277, type = "ability", talent = 21}, -- Ravager
-        { spell = 167105, type = "ability"}, -- Colossus Smash
-        { spell = 197690, type = "ability", talent = 12}, -- Defensive Stance
-        { spell = 209577, type = "ability"}, -- Warbreaker
       },
       icon = 132355
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 225947, type = "buff", unit = "player", item = 137052}, -- Ayala's Stone Heart
-        { spell = 248145, type = "buff", unit = "player", item = 151823}, -- The Great Storm's Eye
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 253382, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 253383, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
         { spell = 198827, type = "debuff", unit = "target", pvptalent = 17}, -- Echo Slam
@@ -157,7 +96,7 @@ templates.class.WARRIOR = {
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -168,104 +107,34 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 1719, type = "buff", unit = "player" }, -- Battle Cry
-        { spell = 12292, type = "buff", unit = "player", talent = 16 }, -- Bloodbath
-        { spell = 18499, type = "buff", unit = "player" }, -- Berserker Rage
-        { spell = 46924, type = "buff", unit = "player", talent = 19 }, -- Bladestorm
-        { spell = 85739, type = "buff", unit = "player" }, -- Meat Cleaver
-        { spell = 97463, type = "buff", unit = "player" }, -- Commanding Shout
-        { spell = 107574, type = "buff", unit = "player", talent = 9 }, -- Avatar
-        { spell = 118000, type = "buff", unit = "player" }, -- Dragon Roar
-        { spell = 184362, type = "buff", unit = "player" }, -- Enrage
-        { spell = 184364, type = "buff", unit = "player" }, -- Enraged Regeneration
-        { spell = 200875, type = "buff", unit = "player" }, -- Juggernaut
-        { spell = 200953, type = "buff", unit = "player" }, -- Berserking
-        { spell = 200954, type = "buff", unit = "player" }, -- Battle Scars
-        { spell = 200977, type = "buff", unit = "player" }, -- Unrivaled Strength
-        { spell = 200979, type = "buff", unit = "player" }, -- Sense Death
-        { spell = 200986, type = "buff", unit = "player" }, -- Odyn's Champion
-        { spell = 202164, type = "buff", unit = "player" }, -- Bounding Stride
-        { spell = 202225, type = "buff", unit = "player" }, -- Furious Charge
-        { spell = 202539, type = "buff", unit = "player", talent = 17 }, -- Frenzy
-        { spell = 206316, type = "buff", unit = "player", talent = 13 }, -- Massacre
-        { spell = 206333, type = "buff", unit = "player" }, -- Taste for Blood
-        { spell = 215570, type = "buff", unit = "player", talent = 7 }, -- Wrecking Ball
-        { spell = 215557, type = "buff", unit = "player", talent = 1 }, -- War Machine
-        { spell = 215572, type = "buff", unit = "player", talent = 14 }, -- Frothing Berserker
       },
       icon = 136224
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 355, type = "debuff", unit = "target" }, -- Taunt
-        { spell = 5246, type = "debuff", unit = "target" }, -- Intimidating Shout
-        { spell = 12323, type = "debuff", unit = "target" }, -- Piercing Howl
-        { spell = 105771, type = "debuff", unit = "target" }, -- Charge
-        { spell = 113344, type = "debuff", unit = "target" }, -- Bloodbath
-        { spell = 132168, type = "debuff", unit = "target", talent = 4 }, -- Shockwave
-        { spell = 132169, type = "debuff", unit = "target", talent = 5 }, -- Storm Bolt
-        { spell = 205546, type = "debuff", unit = "target" }, -- Odyn's Fury
       },
       icon = 132154
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 100, type = "ability"}, -- Charge
-        { spell = 355, type = "ability"}, -- Taunt
-        { spell = 1719, type = "ability"}, -- Battle Cry
-        { spell = 5246, type = "ability"}, -- Intimidating Shout
-        { spell = 6544, type = "ability"}, -- Heroic Leap
-        { spell = 6552, type = "ability"}, -- Pummel
-        { spell = 12292, type = "ability", talent = 16}, -- Bloodbath
-        { spell = 18499, type = "ability"}, -- Berserker Rage
-        { spell = 23881, type = "ability"}, -- Bloodthirst
-        { spell = 46924, type = "ability", talent = 19}, -- Bladestorm
-        { spell = 46968, type = "ability", talent = 4}, -- Shockwave
-        { spell = 57755, type = "ability"}, -- Heroic Throw
-        { spell = 85288, type = "ability"}, -- Raging Blow
-        { spell = 97462, type = "ability"}, -- Commanding Shout
-        { spell = 107570, type = "ability", talent = 5}, -- Storm Bolt
-        { spell = 107574, type = "ability", talent = 9}, -- Avatar
-        { spell = 118000, type = "ability", talent = 21}, -- Dragon Roar
-        { spell = 184364, type = "ability"}, -- Enraged Regeneration
-        { spell = 205545, type = "ability"}, -- Odyn's Fury
       },
       icon = 136012
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 207776, type = "buff", unit = "player", item = 137053}, -- Kazzalax, Fujieda's Fury
-        { spell = 225947, type = "buff", unit = "player", item = 137052}, -- Ayala's Stone Heart
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 206333, type = "buff", unit = "player", titlePrefix = L["T19 2P Bonus - "]},
-        { spell = 242300, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253385, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 213858, type = "buff", unit = "group", pvptalent = 14}, -- Battle Trance
-        { spell = 199261, type = "ability", pvptalent = 18}, -- Death Wish
-        { spell = 199261, type = "buff", unit = "player", pvptalent = 18}, -- Death Wish
-        { spell = 236077, type = "debuff", unit = "target", titleSuffix = L["debuff"], pvptalent = 8 }, -- Disarm
-        { spell = 236077, type = "ability", titleSuffix = L["cooldown"], pvptalent = 8 }, -- Disarm
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -276,102 +145,34 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 871, type = "buff", unit = "player" }, -- Shield Wall
-        { spell = 12975, type = "buff", unit = "player" }, -- Last Stand
-        { spell = 18499, type = "buff", unit = "player" }, -- Berserker Rage
-        { spell = 23920, type = "buff", unit = "player" }, -- Spell Reflection
-        { spell = 107574, type = "buff", unit = "player", talent = 9 }, -- Avatar
-        { spell = 125565, type = "buff", unit = "player" }, -- Demoralizing Shout
-        { spell = 132404, type = "buff", unit = "player", fullscan = true }, -- Shield Block
-        { spell = 147833, type = "buff", unit = "target" }, -- Intervene
-        { spell = 188783, type = "buff", unit = "player" }, -- Might of the Vrykul
-        { spell = 189064, type = "buff", unit = "player" }, -- Scales of Earth
-        { spell = 190456, type = "buff", unit = "player" }, -- Ignore Pain
-        { spell = 202164, type = "buff", unit = "player", talent = 11 }, -- Bounding Stride
-        { spell = 202289, type = "buff", unit = "player" }, -- Renewed Fury
-        { spell = 202573, type = "buff", unit = "player", talent = 16 }, -- Vengeance: Revenge
-        { spell = 202574, type = "buff", unit = "player", talent = 16 }, -- Vengeance: Ignore Pain
-        { spell = 202602, type = "buff", unit = "player", talent = 17 }, -- Into the Fray
-        { spell = 203524, type = "buff", unit = "player" }, -- Neltharion's Fury
-        { spell = 203581, type = "buff", unit = "player" }, -- Dragon Scales
-        { spell = 223658, type = "buff", unit = "target", talent = 6 }, -- Safeguard
-        { spell = 227744, type = "buff", unit = "player", talent = 21 }, -- Ravager
       },
       icon = 1377132
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 355, type = "debuff", unit = "target" }, -- Taunt
-        { spell = 1160, type = "debuff", unit = "target" }, -- Demoralizing Shout
-        { spell = 6343, type = "debuff", unit = "target" }, -- Thunder Clap
-        { spell = 103828, type = "debuff", unit = "target" }, -- Warbringer
-        { spell = 115767, type = "debuff", unit = "target" }, -- Deep Wounds
-        { spell = 132168, type = "debuff", unit = "target", talent = 1 }, -- Shockwave
-        { spell = 132169, type = "debuff", unit = "target", talent = 2 }, -- Storm Bolt
       },
       icon = 132090
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 355, type = "ability"}, -- Taunt
-        { spell = 871, type = "ability"}, -- Shield Wall
-        { spell = 1160, type = "ability"}, -- Demoralizing Shout
-        { spell = 1719, type = "ability"}, -- Battle Cry
-        { spell = 2565, type = "ability"}, -- Shield Block
-        { spell = 6343, type = "ability"}, -- Thunder Clap
-        { spell = 6544, type = "ability"}, -- Heroic Leap
-        { spell = 6552, type = "ability"}, -- Pummel
-        { spell = 6572, type = "ability"}, -- Revenge
-        { spell = 12975, type = "ability"}, -- Last Stand
-        { spell = 18499, type = "ability"}, -- Berserker Rage
-        { spell = 23920, type = "ability"}, -- Spell Reflection
-        { spell = 23922, type = "ability"}, -- Shield Slam
-        { spell = 34428, type = "ability"}, -- Victory Rush
-        { spell = 46968, type = "ability", talent = 1}, -- Shockwave
-        { spell = 107570, type = "ability", talent = 2}, -- Storm Bolt
-        { spell = 107574, type = "ability", talent = 9}, -- Avatar
-        { spell = 202168, type = "ability", talent = 4}, -- Impending Victory
-        { spell = 203524, type = "ability"}, -- Neltharion's Fury
-        { spell = 152277, type = "ability", talent = 21}, -- Ravager
       },
       icon = 134951
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 207844, type = "buff", unit = "player", item = 137108}, -- Kakushan's Stormscale Gauntlets
-        { spell = 215157, type = "buff", unit = "player", item = 137018}, -- Destiny Driver
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 242303, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253428, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 254339, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 198912, type = "ability", pvptalent = 15}, -- Shield Bash
-        { spell = 198912, type = "debuff", unit = "target", pvptalent = 15}, -- Shield Bash
-        { spell = 199085, type = "debuff", unit = "target", pvptalent = 14}, -- Warpath
-        { spell = 206572, type = "ability", pvptalent = 18}, -- Dragon Charge
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -385,115 +186,35 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 498, type = "buff", unit = "player" }, -- Divine Protection
-        { spell = 642, type = "buff", unit = "player" }, -- Divine Shield
-        { spell = 1022, type = "buff", unit = "group" }, -- Blessing of Protection
-        { spell = 1044, type = "buff", unit = "group" }, -- Blessing of Freedom
-        { spell = 6940, type = "buff", unit = "group" }, -- Blessing of Sacrifice
-        { spell = 31821, type = "buff", unit = "player" }, -- Aura Mastery
-        { spell = 31842, type = "buff", unit = "player" }, -- Avenging Wrath
-        { spell = 53563, type = "buff", unit = "player" }, -- Beacon of Light
-        { spell = 54149, type = "buff", unit = "player" }, -- Infusion of Light
-        { spell = 105809, type = "buff", unit = "player", talent = 14 }, -- Holy Avenger
-        { spell = 156910, type = "buff", unit = "target", talent = 19 }, -- Beacon of Faith
-        { spell = 183415, type = "buff", unit = "player", talent = 12 }, -- Aura of Mercy
-        { spell = 183416, type = "buff", unit = "player", talent = 11 }, -- Aura of Sacrifice
-        { spell = 200025, type = "buff", unit = "player", talent = 21 }, -- Beacon of Virtue
-        { spell = 200376, type = "buff", unit = "player" }, -- Vindicator
-        { spell = 200652, type = "buff", unit = "player", fullscan = true, titleSuffix = L[" (Channeling)"] }, -- Tyr's Deliverance
-        { spell = 200654, type = "buff", unit = "player", fullscan = true, titleSuffix = L[" (Healing received increase)"] }, -- Tyr's Deliverance
-        { spell = 210320, type = "buff", unit = "player", talent = 10 }, -- Devotion Aura
-        { spell = 211210, type = "buff", unit = "player" }, -- Protection of Tyr
-        { spell = 211422, type = "buff", unit = "player" }, -- Knight of the Silver Hand
-        { spell = 214202, type = "buff", unit = "player", talent = 6 }, -- Rule of Law
-        { spell = 216413, type = "buff", unit = "player", talent = 13 }, -- Divine Purpose
-        { spell = 221886, type = "buff", unit = "player"}, -- Divine Steed
-        { spell = 223306, type = "buff", unit = "player", talent = 1 }, -- Bestow Faith
-        { spell = 223316, type = "buff", unit = "player", talent = 16 }, -- Fervent Martyr
       },
       icon = 236254
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 853, type = "debuff", unit = "target" }, -- Hammer of Justice
-        { spell = 20066, type = "debuff", unit = "multi", talent = 8 }, -- Repentance
-        { spell = 25771, type = "debuff", unit = "player" }, -- Forbearance
-        { spell = 62124, type = "debuff", unit = "target" }, -- Hand of Reckoning
-        { spell = 105421, type = "debuff", unit = "target", talent = 9 }, -- Blinding Light
-        { spell = 196941, type = "debuff", unit = "target", talent = 18 }, -- Judgment of Light
-        { spell = 204242, type = "debuff", unit = "target" }, -- Consecration
-        { spell = 214222, type = "debuff", unit = "target" }, -- Judgment
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 498, type = "ability"}, -- Divine Protection
-        { spell = 633, type = "ability"}, -- Lay on Hands
-        { spell = 642, type = "ability"}, -- Divine Shield
-        { spell = 853, type = "ability"}, -- Hammer of Justice
-        { spell = 1022, type = "ability"}, -- Blessing of Protection
-        { spell = 1044, type = "ability"}, -- Blessing of Freedom
-        { spell = 4987, type = "ability"}, -- Blessing of Freedom
-        { spell = 6940, type = "ability"}, -- Blessing of Sacrifice
-        { spell = 20066, type = "ability", talent = 8}, -- Repentance
-        { spell = 20271, type = "ability"}, -- Judgment
-        { spell = 20473, type = "ability"}, -- Holy Shock
-        { spell = 26573, type = "ability"}, -- Consecration
-        { spell = 31821, type = "ability"}, -- Aura Mastery
-        { spell = 31842, type = "ability"}, -- Avenging Wrath
-        { spell = 35395, type = "ability"}, -- Crusader Strike
-        { spell = 62124, type = "ability"}, -- Hand of Reckoning
-        { spell = 85222, type = "ability"}, -- Light of Dawn
-        { spell = 105809, type = "ability", talent = 14}, -- Holy Avenger
-        { spell = 114158, type = "ability", talent = 2}, -- Light's Hammer
-        { spell = 114165, type = "ability", talent = 15}, -- Holy Prism
-        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
-        { spell = 190784, type = "ability"}, -- Divine Steed
-        { spell = 200025, type = "ability", talent = 21}, -- Beacon of Virtue
-        { spell = 200652, type = "ability"}, -- Tyr's Deliverance
-        { spell = 214202, type = "ability", talent = 6}, -- Rule of Law
-        { spell = 223306, type = "ability", talent = 1}, -- Bestow Faith
+
       },
       icon = 135972
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 207589, type = "buff", unit = "player", item = 137046}, -- Ilterendi, Crown Jewel of Silvermoon
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
-        { spell = 234862, type = "buff", unit = "player", item = 144273}, -- Maraad's Dying Breath
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 247237, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-        { spell = 254332, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 216331, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Avenging Crusader
-        { spell = 216331, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Avenging Crusader
-        { spell = 210391, type = "buff", unit = "player", pvptalent = 15}, -- Darkest before the Dawn
-        { spell = 210294, type = "ability", pvptalent = 6, titleSuffix = L["cooldown"]}, -- Divine Favor
-        { spell = 210294, type = "buff", unit = "player", pvptalent = 6, titleSuffix = L["buff"]}, -- Divine Favor
-        { spell = 216328, type = "buff", unit = "player", pvptalent = 12}, -- Light's Grace
-        { spell = 195329, type = "buff", unit = "player", pvptalent = 4}, -- Defender of the Weak
-        { spell = 195488, type = "buff", unit = "player", pvptalent = 5}, -- Vim and Vigor
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -504,108 +225,34 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 642, type = "buff", unit = "player"}, -- Divine Shield
-        { spell = 1044, type = "buff", unit = "group"}, -- Blessing of Freedom
-        { spell = 6940, type = "buff", unit = "group"}, -- Blessing of Sacrifice
-        { spell = 31850, type = "buff", unit = "player" }, -- Ardent Defender
-        { spell = 31884, type = "buff", unit = "player" }, -- Avenging Wrath
-        { spell = 86659, type = "buff", unit = "player" }, -- Guardian of Ancient Kings
-        { spell = 132403, type = "buff", unit = "player" }, -- Shield of the Righteous
-        { spell = 152262, type = "buff", unit = "player", talent = 20 }, -- Seraphim
-        { spell = 188370, type = "buff", unit = "player" }, -- Consecration
-        { spell = 203797, type = "buff", unit = "player", talent = 12 }, -- Retribution Aura
-        { spell = 204013, type = "buff", unit = "group", talent = 11 }, -- Blessing of Salvation
-        { spell = 204018, type = "buff", unit = "group", talent = 10 }, -- Blessing of Spellwarding
-        { spell = 204150, type = "buff", unit = "player", talent = 16, fullscan = true }, -- Aegis of Light
-        { spell = 209332, type = "buff", unit = "player" }, -- Painful Truths
-        { spell = 209388, type = "buff", unit = "player" }, -- Bulwark of Order
-        { spell = 209540, type = "buff", unit = "player" }, -- Light of the Titans
-        { spell = 221886, type = "buff", unit = "player" }, -- Divine Steed
       },
       icon = 236265
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 853, type = "debuff", unit = "target" }, -- Hammer of Justice
-        { spell = 20066, type = "debuff", unit = "multi", talent = 8 }, -- Repentance
-        { spell = 25771, type = "debuff", unit = "player" }, -- Forbearance
-        { spell = 31935, type = "debuff", unit = "target" }, -- Avenger's Shield
-        { spell = 62124, type = "debuff", unit = "target" }, -- Hand of Reckoning
-        { spell = 105421, type = "debuff", unit = "target", talent = 9 }, -- Blinding Light
-        { spell = 196941, type = "debuff", unit = "target", talent = 17 }, -- Judgment of Light
-        { spell = 204079, type = "debuff", unit = "target", talent = 15 }, -- Final Stand
-        { spell = 204242, type = "debuff", unit = "target" }, -- Consecration
-        { spell = 209202, type = "debuff", unit = "target" }, -- Eye of Tyr
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 633, type = "ability"}, -- Lay on Hands
-        { spell = 642, type = "ability"}, -- Divine Shield
-        { spell = 853, type = "ability"}, -- Hammer of Justice
-        { spell = 1044, type = "ability"}, -- Blessing of Freedom
-        { spell = 6940, type = "ability"}, -- Blessing of Sacrifice
-        { spell = 20066, type = "ability", talent = 8}, -- Repentance
-        { spell = 20271, type = "ability"}, -- Judgment
-        { spell = 26573, type = "ability"}, -- Consecration
-        { spell = 31850, type = "ability"}, -- Ardent Defender
-        { spell = 31884, type = "ability"}, -- Avenging Wrath
-        { spell = 31935, type = "ability"}, -- Avenger's Shield
-        { spell = 53595, type = "ability"}, -- Hammer of the Righteous
-        { spell = 53600, type = "ability"}, -- Shield of the Righteous
-        { spell = 62124, type = "ability"}, -- Hand of Reckoning
-        { spell = 86659, type = "ability"}, -- Guardian of Ancient Kings
-        { spell = 96231, type = "ability"}, -- Rebuke
-        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
-        { spell = 152262, type = "ability", talent = 20}, -- Seraphim
-        { spell = 184092, type = "ability"}, -- Light of the Protector
-        { spell = 190784, type = "ability"}, -- Divine Steed
-        { spell = 204013, type = "ability", talent = 11}, -- Blessing of Salvation
-        { spell = 204018, type = "ability", talent = 10}, -- Blessing of Spellwarding
-        { spell = 204019, type = "ability", talent = 5}, -- Blessed Hammer
-        { spell = 204035, type = "ability", talent = 2}, -- Bastion of Light
-        { spell = 204150, type = "ability", talent = 16}, -- Aegis of Light
-        { spell = 209202, type = "ability"}, -- Eye of Tyr
-        { spell = 213644, type = "ability"}, -- Cleanse Toxins
-        { spell = 213652, type = "ability", talent = 13}, -- Hand of the Protector
       },
       icon = 135874
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 242265, type = "debuff", unit = "target", titlePrefix = L["T20 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 216857, type = "buff", unit = "player", pvptalent = 14}, -- Guarded by the Light
-        { spell = 228049, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Guardian of the Forgotten Queen
-        { spell = 228049, type = "buff", unit = "group", pvptalent = 18, titleSuffix = L["buff"]}, -- Guardian of the Forgotten Queen
-        { spell = 215652, type = "ability", pvptalent = 7, titleSuffix = L["cooldown"]}, -- Shield of Virtue
-        { spell = 215652, type = "buff", unit = "group", pvptalent = 7, titleSuffix = L["buff"]}, --Shield of Virtue
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
-        { spell = 236186, type = "ability", pvptalent = 11}, -- Cleansing Light
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -616,104 +263,34 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 642, type = "buff", unit = "player" }, -- Divine Shield
-        { spell = 1022, type = "buff", unit = "group" }, -- Blessing of Protection
-        { spell = 1044, type = "buff", unit = "group" }, -- Blessing of Freedom
-        { spell = 31884, type = "buff", unit = "player" }, -- Avenging Wrath
-        { spell = 184662, type = "buff", unit = "player" }, -- Shield of Vengeance
-        { spell = 203538, type = "buff", unit = "group" }, -- Greater Blessing of Kings
-        { spell = 203539, type = "buff", unit = "group" }, -- Greater Blessing of Wisdom
-        { spell = 205191, type = "buff", unit = "player", talent = 14 }, -- Eye for an Eye
-        { spell = 209785, type = "buff", unit = "player", talent = 4 }, -- The Fires of Justice
-        { spell = 217020, type = "buff", unit = "player", talent = 5 }, -- Zeal
-        { spell = 221886, type = "buff", unit = "player"}, -- Divine Steed
-        { spell = 223819, type = "buff", unit = "player" }, -- Divine Purpose
-        { spell = 224668, type = "buff", unit = "player", talent = 20 }, -- Crusade
       },
       icon = 135993
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 853, type = "debuff", unit = "target" }, -- Hammer of Justice
-        { spell = 20066, type = "debuff", unit = "multi", talent = 8 }, -- Repentance
-        { spell = 25771, type = "debuff", unit = "player" }, -- Forbearance
-        { spell = 62124, type = "debuff", unit = "target" }, -- Hand of Reckoning
-        { spell = 105421, type = "debuff", unit = "target", talent = 9 }, -- Blinding Light
-        { spell = 183218, type = "debuff", unit = "target" }, -- Hand of Hindrance
-        { spell = 196941, type = "debuff", unit = "target", talent = 18 }, -- Judgment of Light
-        { spell = 197277, type = "debuff", unit = "target" }, -- Judgment
-        { spell = 205273, type = "debuff", unit = "target" }, -- Wake of Ashes
-        { spell = 213757, type = "debuff", unit = "target", talent = 2 }, -- Execution Sentence
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 633, type = "ability"}, -- Lay on Hands
-        { spell = 642, type = "ability"}, -- Divine Shield
-        { spell = 853, type = "ability"}, -- Hammer of Justice
-        { spell = 1022, type = "ability"}, -- Blessing of Protection
-        { spell = 1044, type = "ability"}, -- Blessing of Freedom
-        { spell = 20066, type = "ability", talent = 8}, -- Repentance
-        { spell = 20271, type = "ability"}, -- Judgment
-        { spell = 31884, type = "ability"}, -- Avenging Wrath
-        { spell = 35395, type = "ability"}, -- Crusader Strike
-        { spell = 62124, type = "ability"}, -- Hand of Reckoning
-        { spell = 96231, type = "ability"}, -- Rebuke
-        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
-        { spell = 183218, type = "ability"}, -- Hand of Hindrance
-        { spell = 184575, type = "ability"}, -- Blade of Justice
-        { spell = 184662, type = "ability"}, -- Shield of Vengeance
-        { spell = 198034, type = "ability", talent = 12}, -- Divine Hammer
-        { spell = 190784, type = "ability"}, -- Divine Steed
-        { spell = 205191, type = "ability", talent = 14}, -- Eye for an Eye
-        { spell = 205228, type = "ability", talent = 3}, -- Consecration
-        { spell = 205273, type = "ability"}, -- Wake of Ashes
-        { spell = 210191, type = "ability", talent = 15}, -- Word of Glory
-        { spell = 210220, type = "ability", talent = 21}, -- Holy Wrath
-        { spell = 213644, type = "ability"}, -- Cleanse Toxins
-        { spell = 213757, type = "ability", talent = 2}, -- Execution Sentence
-        { spell = 217020, type = "ability", talent = 5}, -- Zeal
-        { spell = 224668, type = "ability", talent = 20}, -- Crusade
       },
       icon = 135891
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 207635, type = "buff", unit = "player", item = 137020}, -- Whisper of the Nathrezim
-        { spell = 248289, type = "buff", unit = "player", item = 151813}, -- Scarlet Inquisitor's Expurgation
-        { spell = 225056, type = "debuff", unit = "player", item = 140846}, -- Aegisjalmur, the Armguards of Awe
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246973, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-        { spell = 209785, type = "buff", unit = "player", titlePrefix = L["T19 4P Bonus - "]},
-        { spell = 253806, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 210324, type = "buff", unit = "player", pvptalent = 13}, -- Vengeance Aura
-        { spell = 210256, type = "ability", pvptalent = 14, titleSuffix = L["cooldown"]}, -- Blessing of Sanctuary
-        { spell = 210256, type = "buff", unit = "group", pvptalent = 14, titleSuffix = L["buff"]}, -- Blessing of Sanctuary
-        { spell = 204939, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Hammer of Reckoning
-        { spell = 204940, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Blessing of Sanctuary
-        { spell = 236186, type = "ability", pvptalent = 11}, -- Cleansing Light
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -727,107 +304,34 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 136, type = "buff", unit = "pet" }, -- Mend Pet
-        { spell = 5384, type = "buff", unit = "player" }, -- Feign Death
-        { spell = 6197, type = "buff", unit = "player" }, -- Eagle Eye
-        { spell = 19574, type = "buff", unit = "player" }, -- Bestial Wrath
-        { spell = 35079, type = "buff", unit = "player" }, -- Misdirection
-        { spell = 53478, type = "buff", unit = "pet", titleSuffix = L["(Pet)"] }, -- Last Stand
-        { spell = 53480, type = "buff", unit = "player" }, -- Roar of Sacrifice
-        { spell = 118455, type = "buff", unit = "pet" }, -- Beast Cleave
-        { spell = 118922, type = "buff", unit = "player", talent = 7 }, -- Posthaste
-        { spell = 120694, type = "buff", unit = "player" }, -- Dire Beast
-        { spell = 185791, type = "buff", unit = "player" }, -- Wild Call
-        { spell = 186257, type = "buff", unit = "player" }, -- Aspect of the Cheetah
-        { spell = 186265, type = "buff", unit = "player" }, -- Aspect of the Turtle
-        { spell = 191414, type = "buff", unit = "pet", talent = 21 }, -- Bestial Tenacity
-        { spell = 193530, type = "buff", unit = "player" }, -- Aspect of the Wild
-        { spell = 194386, type = "buff", unit = "player", talent = 18 }, -- Volley
-        { spell = 197161, type = "buff", unit = "player" }, -- Mimiron's Shell
-        { spell = 199921, type = "buff", unit = "player", talent = 9 }, -- Trailblazer
-        { spell = 211138, type = "buff", unit = "target" }, -- Hunter's Advantage
       },
       icon = 132242
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 2649, type = "debuff", unit = "target" }, -- Growl
-        { spell = 3355, type = "debuff", unit = "target" }, -- Freezing Trap
-        { spell = 5116, type = "debuff", unit = "target" }, -- Concussive Shot
-        { spell = 19386, type = "debuff", unit = "target", talent = 14 }, -- Wyvern Sting
-        { spell = 24394, type = "debuff", unit = "target", talent = 15 }, -- Intimidation
-        { spell = 117405, type = "debuff", unit = "target", talent = 13 }, -- Binding Shot
-        { spell = 131894, type = "debuff", unit = "target", talent = 16 }, -- A Murder of Crows
-        { spell = 135299, type = "debuff", unit = "target" }, -- Tar Trap
-        { spell = 191397, type = "debuff", unit = "target", talent = 21 }, -- Bestial Cunning
-        { spell = 191413, type = "debuff", unit = "target", talent = 21 }, -- Bestial Ferocity
       },
       icon = 135860
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 781, type = "ability"}, -- Disengage
-        { spell = 1543, type = "ability"}, -- Flare
-        { spell = 5116, type = "ability"}, -- Concussive Shot
-        { spell = 5384, type = "ability"}, -- Feign Death
-        { spell = 19386, type = "ability", talent = 14}, -- Wyvern Sting
-        { spell = 19574, type = "ability"}, -- Bestial Wrath
-        { spell = 19577, type = "ability", talent = 15}, -- Intimidation
-        { spell = 34026, type = "ability"}, -- Kill Command
-        { spell = 34477, type = "ability"}, -- Misdirection
-        { spell = 53209, type = "ability", talent = 6}, -- Chimaera Shot
-        { spell = 53478, type = "ability"}, -- Last Stand
-        { spell = 53480, type = "ability"}, -- Roar of Sacrifice
-        { spell = 55709, type = "ability"}, -- Heart of the Phoenix
-        { spell = 109248, type = "ability", talent = 13}, -- Binding Shot
-        { spell = 109304, type = "ability"}, -- Exhilaration
-        { spell = 120360, type = "ability", talent = 17}, -- Barrage
-        { spell = 120679, type = "ability"}, -- Dire Beast
-        { spell = 131894, type = "ability", talent = 16}, -- A Murder of Crows
-        { spell = 147362, type = "ability"}, -- Counter Shot
-        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
-        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
-        { spell = 187650, type = "ability"}, -- Freezing Trap
-        { spell = 187698, type = "ability"}, -- Tar Trap
-        { spell = 193530, type = "ability"}, -- Aspect of the Wild
-        { spell = 201430, type = "ability", talent = 19}, -- Stampede
-        { spell = 207068, type = "ability"}, -- Titan's Thunder
-        { spell = 217200, type = "ability", talent = 5}, -- Dire Frenzy
       },
       icon = 132176
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208888, type = "buff", unit = "player", item = 137064}, -- The Shadow Hunter's Voodoo Mask
-        { spell = 248085, type = "buff", unit = "player", item = 151805}, -- Parsel's Tongue
-        { spell = 247993, type = "buff", unit = "player", item = 144326}, -- The Mantle of Command
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 205691, type = "ability", pvptalent = 18}, -- Dire Beast: Basilisk
-        { spell = 208652, type = "ability", pvptalent = 17}, -- Dire Beast: Hawk
-        { spell = 213882, type = "buff", unit = "pet", pvptalent = 14},  -- Separation Anxiety
-        { spell = 204205, type = "buff", unit = "group", pvptalent = 15} -- Wild Protector
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -838,119 +342,34 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 136, type = "buff", unit = "pet" }, -- Mend Pet
-        { spell = 5384, type = "buff", unit = "player" }, -- Feign Death
-        { spell = 6197, type = "buff", unit = "player" }, -- Eagle Eye
-        { spell = 35079, type = "buff", unit = "player" }, -- Misdirection
-        { spell = 53478, type = "buff", unit = "pet", titleSuffix = L["(Pet)"] }, -- Last Stand
-        { spell = 53480, type = "buff", unit = "player" }, -- Roar of Sacrifice
-        { spell = 82921, type = "buff", unit = "player" }, -- Bombardment
-        { spell = 118922, type = "buff", unit = "player", talent = 7 }, -- Posthaste
-        { spell = 186257, type = "buff", unit = "player" }, -- Aspect of the Cheetah
-        { spell = 186258, type = "buff", unit = "player" }, -- Aspect of the Cheetah
-        { spell = 186265, type = "buff", unit = "player" }, -- Aspect of the Turtle
-        { spell = 190515, type = "buff", unit = "player" }, -- Survival of the Fittest
-        { spell = 191342, type = "buff", unit = "player" }, -- Rapid Killing
-        { spell = 193526, type = "buff", unit = "player" }, -- Trueshot
-        { spell = 193534, type = "buff", unit = "player", talent = 2 }, -- Steady Focus
-        { spell = 194386, type = "buff", unit = "player", talent = 18 }, -- Volley
-        { spell = 194594, type = "buff", unit = "player", talent = 4 }, -- Lock and Load
-        { spell = 199483, type = "buff", unit = "player", talent = 15 }, -- Camouflage
-        { spell = 199921, type = "buff", unit = "player", talent = 9 }, -- Trailblazer
-        { spell = 203924, type = "buff", unit = "player" }, -- Healing Shell
-        { spell = 204090, type = "buff", unit = "player" }, -- Bullseye
-        { spell = 204477, type = "buff", unit = "player" }, -- Windburst
-        { spell = 223138, type = "buff", unit = "player" }, -- Marking Targets
-        { spell = 227272, type = "buff", unit = "player" }, -- Trick Shot
       },
       icon = 461846
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 2649, type = "debuff", unit = "target" }, -- Growl
-        { spell = 3355, type = "debuff", unit = "target" }, -- Freezing Trap
-        { spell = 5116, type = "debuff", unit = "target" }, -- Concussive Shot
-        { spell = 19386, type = "debuff", unit = "target", talent = 14 }, -- Wyvern Sting
-        { spell = 63468, type = "debuff", unit = "target", talent = 3 }, -- Careful Aim
-        { spell = 117405, type = "debuff", unit = "target", talent = 13 }, -- Binding Shot
-        { spell = 131894, type = "debuff", unit = "target", talent = 16 }, -- A Murder of Crows
-        { spell = 135299, type = "debuff", unit = "target" }, -- Tar Trap
-        { spell = 185365, type = "debuff", unit = "target" }, -- Hunter's Mark
-        { spell = 187131, type = "debuff", unit = "target" }, -- Vulnerable
-        { spell = 194599, type = "debuff", unit = "target", talent = 5 }, -- Black Arrow
-        { spell = 199803, type = "debuff", unit = "target", talent = 6 }, -- True Aim
-        { spell = 204683, type = "debuff", unit = "target" }, -- Dark Whisper
-        { spell = 224729, type = "debuff", unit = "target" }, -- Bursting Shot
       },
       icon = 236188
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 781, type = "ability"}, -- Disengage
-        { spell = 1543, type = "ability"}, -- Flare
-        { spell = 5116, type = "ability"}, -- Concussive Shot
-        { spell = 5384, type = "ability"}, -- Feign Death
-        { spell = 19386, type = "ability", talent = 14}, -- Wyvern Sting
-        { spell = 34477, type = "ability"}, -- Misdirection
-        { spell = 53478, type = "ability"}, -- Last Stand
-        { spell = 53480, type = "ability"}, -- Roar of Sacrifice
-        { spell = 55709, type = "ability"}, -- Heart of the Phoenix
-        { spell = 109248, type = "ability", talent = 13}, -- Binding Shot
-        { spell = 109304, type = "ability"}, -- Exhilaration
-        { spell = 120360, type = "ability", talent = 17}, -- Barrage
-        { spell = 131894, type = "ability", talent = 4}, -- A Murder of Crows
-        { spell = 147362, type = "ability"}, -- Counter Shot
-        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
-        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
-        { spell = 186387, type = "ability"}, -- Bursting Shot
-        { spell = 187650, type = "ability"}, -- Freezing Trap
-        { spell = 187698, type = "ability"}, -- Tar Trap
-        { spell = 193526, type = "ability"}, -- Trueshot
-        { spell = 194599, type = "ability", talent = 5}, -- Black Arrow
-        { spell = 198670, type = "ability", talent = 20}, -- Piercing Shot
-        { spell = 199483, type = "ability", talent = 15}, -- Camouflage
-        { spell = 204147, type = "ability"}, -- Windburst
-        { spell = 206817, type = "ability", talent = 11}, -- Sentinel
-        { spell = 212431, type = "ability", talent = 10}, -- Explosive Shot
-        { spell = 214579, type = "ability", talent = 19}, -- Sidewinders
       },
       icon = 132329
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235712, type = "buff", unit = "player", item = 144303}, -- MKII Gyroscopic Stabilizer
-        { spell = 208888, type = "buff", unit = "player", item = 137064}, -- The Shadow Hunter's Voodoo Mask
-        { spell = 248088, type = "buff", unit = "player", item = 151803}, -- Celerity of the Windrunners
-        { spell = 208913, type = "buff", unit = "player", item = 137081}, -- War Belt of the Sentinel Army
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246153, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 209789, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Freezing Arrow
-        { spell = 209790, type = "debuff", unit = "target", pvptalent = 15, titleSuffix = L["debuff"]}, -- Freezing Arrow
-        { spell = 213691, type = "ability", pvptalent = 14, titleSuffix = L["cooldown"]}, -- Scatter Shot
-        { spell = 213691, type = "debuff", unit = "target", pvptalent = 14, titleSuffix = L["debuff"]}, -- Scatter Shot
-        { spell = 203155, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Sniper Shot
-        { spell = 203155, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Sniper Shot
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -961,119 +380,34 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 136, type = "buff", unit = "pet" }, -- Mend Pet
-        { spell = 5384, type = "buff", unit = "player" }, -- Feign Death
-        { spell = 53478, type = "buff", unit = "pet", titleSuffix = L["(Pet)"] }, -- Last Stand
-        { spell = 53480, type = "buff", unit = "player" }, -- Roar of Sacrifice
-        { spell = 118922, type = "buff", unit = "player", talent = 7 }, -- Posthaste
-        { spell = 186257, type = "buff", unit = "player" }, -- Aspect of the Cheetah
-        { spell = 186258, type = "buff", unit = "player" }, -- Aspect of the Cheetah
-        { spell = 186265, type = "buff", unit = "player" }, -- Aspect of the Turtle
-        { spell = 186289, type = "buff", unit = "player" }, -- Aspect of the Eagle
-        { spell = 190931, type = "buff", unit = "player" }, -- Mongoose Fury
-        { spell = 191414, type = "buff", unit = "pet", talent = 21 }, -- Bestial Tenacity
-        { spell = 194407, type = "buff", unit = "player" }, -- Spitting Cobra
-        { spell = 199483, type = "buff", unit = "player", talent = 15 }, -- Camouflage
-        { spell = 199921, type = "buff", unit = "player", talent = 9 }, -- Trailblazer
-        { spell = 201081, type = "buff", unit = "player", talent = 3 }, -- Mok'Nathal Tactics
-        { spell = 203927, type = "buff", unit = "player" }, -- Aspect of the Skylord2
       },
       icon = 1376044
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 2649, type = "debuff", unit = "target" }, -- Growl
-        { spell = 3355, type = "debuff", unit = "target" }, -- Freezing Trap
-        { spell = 13812, type = "debuff", unit = "target" }, -- Explosive Trap
-        { spell = 118253, type = "debuff", unit = "target", talent = 18 }, -- Serpent Sting
-        { spell = 135299, type = "debuff", unit = "target" }, -- Tar Trap
-        { spell = 162487, type = "debuff", unit = "target", talent = 12 }, -- Steel Trap
-        { spell = 185855, type = "debuff", unit = "target" }, -- Lacerate
-        { spell = 190927, type = "debuff", unit = "target" }, -- Harpoon
-        { spell = 191241, type = "debuff", unit = "target", talent = 13 }, -- Sticky Bomb
-        { spell = 191397, type = "debuff", unit = "target", talent = 21 }, -- Bestial Cunning
-        { spell = 191413, type = "debuff", unit = "target", talent = 21 }, -- Bestial Ferocity
-        { spell = 194279, type = "debuff", unit = "target", talent = 10 }, -- Caltrops
-        { spell = 194858, type = "debuff", unit = "target", talent = 17 }, -- Dragonsfire Grenade
-        { spell = 195645, type = "debuff", unit = "target" }, -- Wing Clip
-        { spell = 200108, type = "debuff", unit = "target", talent = 14, fullscan = true, titleSuffix = L["Rooted"] }, -- Ranger's Net
-        { spell = 201142, type = "debuff", unit = "target", talent = 20 }, -- Frozen Wake
-        { spell = 204081, type = "debuff", unit = "target" }, -- On the Trail
-        { spell = 206505, type = "debuff", unit = "target", talent = 4 }, -- A Murder of Crows
-        { spell = 206755, type = "debuff", unit = "target", talent = 14, fullscan = true, titleSuffix = L["Slowed"] }, -- Ranger's Net
       },
       icon = 132309
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 1543, type = "ability"}, -- Flare
-        { spell = 5384, type = "ability"}, -- Feign Death
-        { spell = 53478, type = "ability"}, -- Last Stand
-        { spell = 53480, type = "ability"}, -- Roar of Sacrifice
-        { spell = 55709, type = "ability"}, -- Heart of the Phoenix
-        { spell = 109304, type = "ability"}, -- Exhilaration
-        { spell = 162488, type = "ability", talent = 12}, -- Steel Trap
-        { spell = 185855, type = "ability"}, -- Lacerate
-        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
-        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
-        { spell = 186289, type = "ability"}, -- Aspect of the Eagle
-        { spell = 187650, type = "ability"}, -- Freezing Trap
-        { spell = 187698, type = "ability"}, -- Tar Trap
-        { spell = 187707, type = "ability"}, -- Muzzle
-        { spell = 190925, type = "ability"}, -- Harpoon
-        { spell = 190928, type = "ability"}, -- Mongoose Bite
-        { spell = 191241, type = "ability", talent = 13}, -- Sticky Bomb
-        { spell = 191433, type = "ability"}, -- Explosive Trap
-        { spell = 194277, type = "ability", talent = 10}, -- Caltrops
-        { spell = 194407, type = "ability", talent = 19}, -- Spitting Cobra
-        { spell = 194855, type = "ability", talent = 17}, -- Dragonsfire Grenade
-        { spell = 199483, type = "ability", talent = 15}, -- Camouflage
-        { spell = 200163, type = "ability", talent = 2}, -- Throwing Axes
-        { spell = 201078, type = "ability", talent = 6}, -- Snake Hunter
-        { spell = 202800, type = "ability"}, -- Flanking Strike
-        { spell = 203415, type = "ability"}, -- Fury of the Eagle
-        { spell = 206505, type = "ability", talent = 10}, -- A Murder of Crows
-        { spell = 212436, type = "ability", talent = 16}, -- Butchery
       },
       icon = 236184
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208888, type = "buff", unit = "player", item = 137064}, -- The Shadow Hunter's Voodoo Mask
-        { spell = 248212, type = "debuff", unit = "target", item = 151807}, -- Unseen Predator's Cloak
-        { spell = 236446, type = "buff", unit = "player", item = 144361}, -- Butcher's Bone Apron
-        { spell = 213156, type = "buff", unit = "player", item = 137082}, -- Helbrine, Rope of the Mist Marauder
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252094, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 252095, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 53271, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Master's Call
-        { spell = 62305, type = "buff", unit = "player", pvptalent = 15, titleSuffix = L["buff"]}, -- Master's Call
-        { spell = 212640, type = "ability", pvptalent = 14, titleSuffix = L["cooldown"]}, -- Mending Bandage
-        { spell = 212640, type = "buff", unit = "group", pvptalent = 14, titleSuffix = L["buff"]}, -- Mending Bandage
-        { spell = 203268, type = "debuff", unit = "target", pvptalent = 16}, -- Sticky Tar
-        { spell = 212638, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Tracker's Net
-        { spell = 212638, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["buff"]}, -- Tracker's Net
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1088,134 +422,34 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 1784, type = "buff", unit = "player" }, -- Stealth
-        { spell = 1966, type = "buff", unit = "player" }, -- Feint
-        { spell = 2823, type = "buff", unit = "player" }, -- Deadly Poison
-        { spell = 2983, type = "buff", unit = "player" }, -- Sprint
-        { spell = 3408, type = "buff", unit = "player" }, -- Crippling Poison
-        { spell = 5277, type = "buff", unit = "player" }, -- Evasion
-        { spell = 8679, type = "buff", unit = "player" }, -- Wound Poison
-        { spell = 11327, type = "buff", unit = "player" }, -- Vanish
-        { spell = 31224, type = "buff", unit = "player" }, -- Cloak of Shadows
-        { spell = 32645, type = "buff", unit = "player" }, -- Envenom
-        { spell = 36554, type = "buff", unit = "player" }, -- Shadowstep
-        { spell = 45182, type = "buff", unit = "player", talent = 12 }, -- Cheating Death
-        { spell = 57934, type = "buff", unit = "group"}, -- Tricks of the Trade
-        { spell = 108211, type = "buff", unit = "player", talent = 10 }, -- Leeching Poison
-        { spell = 114018, type = "buff", unit = "player" }, -- Shroud of Concealment
-        { spell = 115191, type = "buff", unit = "player" }, -- Stealth
-        { spell = 115192, type = "buff", unit = "player", talent = 5 }, -- Subterfuge
-        { spell = 115193, type = "buff", unit = "player" }, -- Vanish
-        { spell = 152150, type = "buff", unit = "player" }, -- Death from Above
-        { spell = 185311, type = "buff", unit = "player" }, -- Crimson Vial
-        { spell = 192432, type = "buff", unit = "player" }, -- From the Shadows
-        { spell = 193538, type = "buff", unit = "player", talent = 17 }, -- Alacrity
-        { spell = 193641, type = "buff", unit = "player", talent = 2 }, -- Elaborate Planning
-        { spell = 226364, type = "buff", unit = "player" }, -- Evasion
       },
       icon = 132290
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 408, type = "debuff", unit = "target" }, -- Kidney Shot
-        { spell = 703, type = "debuff", unit = "target" }, -- Garrote
-        { spell = 1833, type = "debuff", unit = "target" }, -- Cheap Shot
-        { spell = 1943, type = "debuff", unit = "target" }, -- Rupture
-        { spell = 2094, type = "debuff", unit = "multi" }, -- Blind
-        { spell = 2818, type = "debuff", unit = "target" }, -- Deadly Poison
-        { spell = 3409, type = "debuff", unit = "target" }, -- Crippling Poison
-        { spell = 6770, type = "debuff", unit = "multi" }, -- Sap
-        { spell = 8680, type = "debuff", unit = "target" }, -- Wound Poison
-        { spell = 16511, type = "debuff", unit = "target", talent = 3 }, -- Hemorrhage
-        { spell = 45181, type = "debuff", unit = "player", talent = 12 }, -- Cheated Death
-        { spell = 79140, type = "debuff", unit = "target" }, -- Vendetta
-        { spell = 137619, type = "debuff", unit = "target", talent = 20 }, -- Marked for Death
-        { spell = 154953, type = "debuff", unit = "target", talent = 15 }, -- Internal Bleeding
-        { spell = 192425, type = "debuff", unit = "target" }, -- Surge of Toxins
-        { spell = 192759, type = "debuff", unit = "target" }, -- Kingsbane
-        { spell = 192925, type = "debuff", unit = "target" }, -- Blood of the Assassinated
-        { spell = 245389, type = "debuff", unit = "target", talent = 16 }, -- Toxic Blade
       },
       icon = 132302
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 408, type = "ability"}, -- Kidney Shot
-        { spell = 703, type = "ability"}, -- Garrote
-        { spell = 1329, type = "ability"}, -- Mutilate
-        { spell = 1725, type = "ability"}, -- Distract
-        { spell = 1766, type = "ability"}, -- Kick
-        { spell = 1784, type = "ability"}, -- Stealth
-        { spell = 1833, type = "ability"}, -- Cheap Shot
-        { spell = 1856, type = "ability"}, -- Vanish
-        { spell = 1943, type = "ability"}, -- Rupture
-        { spell = 1966, type = "ability"}, -- Feint
-        { spell = 2094, type = "ability"}, -- Blind
-        { spell = 2983, type = "ability"}, -- Sprint
-        { spell = 5277, type = "ability"}, -- Evasion
-        { spell = 6770, type = "ability"}, -- Sap
-        { spell = 16511, type = "ability", talent = 3}, -- Hemorrhage
-        { spell = 31224, type = "ability"}, -- Cloak of Shadows
-        { spell = 32645, type = "ability"}, -- Envenom
-        { spell = 36554, type = "ability"}, -- Shadowstep
-        { spell = 51723, type = "ability"}, -- Fan of Knives
-        { spell = 57934, type = "ability"}, -- Tricks of the Trade
-        { spell = 79140, type = "ability"}, -- Vendetta
-        { spell = 114018, type = "ability"}, -- Shroud of Concealment
-        { spell = 115191, type = "ability"}, -- Stealth
-        { spell = 137619, type = "ability", talent = 20}, -- Marked for Death
-        { spell = 152150, type = "ability", talent = 21}, -- Death from Above
-        { spell = 185311, type = "ability"}, -- Crimson Vial
-        { spell = 185565, type = "ability"}, -- Poisoned Knife
-        { spell = 192759, type = "ability"}, -- Kingsbane
-        { spell = 200806, type = "ability", talent = 18}, -- Exsanguinate
-        { spell = 245388, type = "ability", talent = 16}, -- Toxic Blade
       },
       icon = 458726
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208403, type = "buff", unit = "player", item = 137069}, -- Will of Valeera
-        { spell = 228224, type = "buff", unit = "player", item = 137021}, -- The Dreadlord's Deceit
-        { spell = 235027, type = "buff", unit = "player", item = 144236}, -- Mantle of the Master Assassin
-        { spell = 248201, type = "buff", unit = "player", item = 151815}, -- The Empty Crown
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252277, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 209754, type = "buff", unit = "player", pvptalent = 8}, -- Boarding Party
-        { spell = 213995, type = "buff", unit = "player", pvptalent = 16}, -- Cheap Tricks
-        { spell = 207777, type = "ability", pvptalent = 17, titleSuffix = L["cooldown"]}, -- Dismantle
-        { spell = 207777, type = "debuff", unit = "target", pvptalent = 17, titleSuffix = L["debuff"]}, -- Dismantle
-        { spell = 212210, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Drink Up Me Hearties
-        {
-          title = L["Crimson Vial Item Count"],
-          icon = "Interface\\Icons\\inv_misc_potiona5",
-          pvptalent = 15,
-          triggers = { [0] = { trigger = { type = "status", event = "Item Count", use_itemName = true, itemName = "137222", unevent = "auto" }}}
-        },
-        { spell = 198529, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Plunder Armor
-        { spell = 198529, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["debuff"]}, -- Plunder Armor
-        { spell = 198368, type = "buff", unit = "group", pvptalent = 13}, -- Take Your Cut
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1226,120 +460,34 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 1784, type = "buff", unit = "player" }, -- Stealth
-        { spell = 1966, type = "buff", unit = "player" }, -- Feint
-        { spell = 2983, type = "buff", unit = "player" }, -- Sprint
-        { spell = 5171, type = "buff", unit = "player", talent = 19 }, -- Slice and Dice
-        { spell = 11327, type = "buff", unit = "player" }, -- Vanish
-        { spell = 13750, type = "buff", unit = "player" }, -- Adrenaline Rush
-        { spell = 13877, type = "buff", unit = "player" }, -- Blade Flurry
-        { spell = 31224, type = "buff", unit = "player" }, -- Cloak of Shadows
-        { spell = 45182, type = "buff", unit = "player", talent = 12 }, -- Cheating Death
-        { spell = 51690, type = "buff", unit = "player" }, -- Killing Spree
-        { spell = 114018, type = "buff", unit = "player" }, -- Shroud of Concealment
-        { spell = 152150, type = "buff", unit = "player" }, -- Death from Above
-        { spell = 185311, type = "buff", unit = "player" }, -- Crimson Vial
-        { spell = 193356, type = "buff", unit = "player" }, -- Broadsides
-        { spell = 193357, type = "buff", unit = "player" }, -- Shark Infested Waters
-        { spell = 193358, type = "buff", unit = "player" }, -- Grand Melee
-        { spell = 193359, type = "buff", unit = "player" }, -- True Bearing
-        { spell = 193538, type = "buff", unit = "player", talent = 17 }, -- Alacrity
-        { spell = 195627, type = "buff", unit = "player" }, -- Opportunity
-        { spell = 199600, type = "buff", unit = "player" }, -- Buried Treasure
-        { spell = 199603, type = "buff", unit = "player" }, -- Jolly Roger
-        { spell = 199754, type = "buff", unit = "player" }, -- Riposte
-        { spell = 202754, type = "buff", unit = "player" }, -- Hidden Blade
-        { spell = 202776, type = "buff", unit = "player" }, -- Blurred Time
       },
       icon = 132350
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 1776, type = "debuff", unit = "target" }, -- Gouge
-        { spell = 1833, type = "debuff", unit = "target" }, -- Cheap Shot
-        { spell = 2094, type = "debuff", unit = "multi" }, -- Blind
-        { spell = 6770, type = "debuff", unit = "multi" }, -- Sap
-        { spell = 45181, type = "debuff", unit = "player", talent = 12 }, -- Cheated Death
-        { spell = 199743, type = "debuff", unit = "multi", talent = 13 }, -- Parley
-        { spell = 137619, type = "debuff", unit = "target", talent = 20 }, -- Marked for Death
-        { spell = 185763, type = "debuff", unit = "target" }, -- Pistol Shot
-        { spell = 185778, type = "debuff", unit = "target", talent = 16 }, -- Shellshocked
-        { spell = 196937, type = "debuff", unit = "target", talent = 1 }, -- Ghostly Strike
-        { spell = 199740, type = "debuff", unit = "target" }, -- Bribe
-        { spell = 199804, type = "debuff", unit = "target" }, -- Between the Eyes
-        { spell = 202665, type = "debuff", unit = "player" }, -- Curse of the Dreadblades
       },
       icon = 1373908
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 1725, type = "ability"}, -- Distract
-        { spell = 1766, type = "ability"}, -- Kick
-        { spell = 1776, type = "ability"}, -- Gouge
-        { spell = 1784, type = "ability"}, -- Stealth
-        { spell = 1833, type = "ability"}, -- Cheap Shot
-        { spell = 1856, type = "ability"}, -- Vanish
-        { spell = 1966, type = "ability"}, -- Feint
-        { spell = 2094, type = "ability"}, -- Blind
-        { spell = 2098, type = "ability"}, -- Run Through
-        { spell = 2983, type = "ability"}, -- Sprint
-        { spell = 6770, type = "ability"}, -- Sap
-        { spell = 8676, type = "ability"}, -- Ambush
-        { spell = 13750, type = "ability"}, -- Adrenaline Rush
-        { spell = 13877, type = "ability"}, -- Blade Flurry
-        { spell = 31224, type = "ability"}, -- Cloak of Shadows
-        { spell = 51690, type = "ability", talent = 18}, -- Killing Spree
-        { spell = 114018, type = "ability"}, -- Shroud of Concealment
-        { spell = 137619, type = "ability", talent = 20}, -- Marked for Death
-        { spell = 152150, type = "ability", talent = 21}, -- Death from Above
-        { spell = 185311, type = "ability"}, -- Crimson Vial
-        { spell = 185763, type = "ability"}, -- Pistol Shot
-        { spell = 185767, type = "ability", talent = 16}, -- Cannonball Barrage
-        { spell = 193315, type = "ability"}, -- Saber Slash
-        { spell = 193316, type = "ability"}, -- Roll the Bones
-        { spell = 195457, type = "ability", talent = 4}, -- Grappling Hook
-        { spell = 199740, type = "ability"}, -- Bribe
-        { spell = 199743, type = "ability", talent = 13}, -- Parley
-        { spell = 199754, type = "ability"}, -- Riposte
-        { spell = 199804, type = "ability"}, -- Between the Eyes
-        { spell = 202665, type = "ability"}, -- Curse of the Dreadblades
       },
       icon = 135610
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208403, type = "buff", unit = "player", item = 137069}, -- Will of Valeera
-        { spell = 209423, type = "buff", unit = "player", item = 137099}, -- Greenskin's Waterlogged Wristcuffs
-        { spell = 226318, type = "buff", unit = "player", item = 141321}, -- Shivarran Symmetry
-        { spell = 235027, type = "buff", unit = "player", item = 144236}, -- Mantle of the Master Assassin
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 211669, type = "buff", unit = "player", titlePrefix = L["T19 4P Bonus - "]},
-        { spell = 252285, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 198097, type = "debuff", unit = "target", pvptalent = 16}, -- Creeping Venom
-        { spell = 206328, type = "ability", pvptalent = 15}, -- Shiv
-        { spell = 197091, type = "debuff", unit = "target", pvptalent = 15}, -- Neurotoxin
-        { spell = 198222, type = "debuff", unit = "target", pvptalent = 18}, -- System Shock
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1350,116 +498,34 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 1784, type = "buff", unit = "player" }, -- Stealth
-        { spell = 1966, type = "buff", unit = "player" }, -- Feint
-        { spell = 2983, type = "buff", unit = "player" }, -- Sprint
-        { spell = 5277, type = "buff", unit = "player" }, -- Evasion
-        { spell = 11327, type = "buff", unit = "player" }, -- Vanish
-        { spell = 31224, type = "buff", unit = "player" }, -- Cloak of Shadows
-        { spell = 31665, type = "buff", unit = "player" }, -- Master of Subtlety
-        { spell = 36554, type = "buff", unit = "player" }, -- Shadowstep
-        { spell = 45182, type = "buff", unit = "player", talent = 12 }, -- Cheating Death
-        { spell = 114018, type = "buff", unit = "player" }, -- Shroud of Concealment
-        { spell = 115191, type = "buff", unit = "player" }, -- Stealth
-        { spell = 115192, type = "buff", unit = "player", talent = 5 }, -- Subterfuge
-        { spell = 115193, type = "buff", unit = "player" }, -- Vanish
-        { spell = 121471, type = "buff", unit = "player" }, -- Shadow Blades
-        { spell = 152150, type = "buff", unit = "player", talent = 21 }, -- Death from Above
-        { spell = 185311, type = "buff", unit = "player" }, -- Crimson Vial
-        { spell = 185422, type = "buff", unit = "player" }, -- Shadow Dance
-        { spell = 193538, type = "buff", unit = "player", talent = 17 }, -- Alacrity
-        { spell = 197603, type = "buff", unit = "player" }, -- Embrace of Darkness
-        { spell = 212283, type = "buff", unit = "player" }, -- Symbols of Death
-        { spell = 220901, type = "buff", unit = "player" }, -- Goremaw's Bite
-        { spell = 227151, type = "buff", unit = "player" }, -- Death
       },
       icon = 376022
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 408, type = "debuff", unit = "target" }, -- Kidney Shot
-        { spell = 1833, type = "debuff", unit = "target" }, -- Cheap Shot
-        { spell = 2094, type = "debuff", unit = "target" }, -- Blind
-        { spell = 6770, type = "debuff", unit = "multi" }, -- Sap
-        { spell = 45181, type = "debuff", unit = "player", talent = 12 }, -- Cheated Death
-        { spell = 137619, type = "debuff", unit = "target", talent = 20 }, -- Marked for Death
-        { spell = 195452, type = "debuff", unit = "target" }, -- Nightblade
-        { spell = 196958, type = "debuff", unit = "target" }, -- Strike from the Shadows
-        { spell = 206760, type = "debuff", unit = "target" }, -- Night Terrors
-        { spell = 209786, type = "debuff", unit = "target" }, -- Goremaw's Bite
       },
       icon = 136175
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 408, type = "ability"}, -- Kidney Shot
-        { spell = 1725, type = "ability"}, -- Distract
-        { spell = 1766, type = "ability"}, -- Kick
-        { spell = 1784, type = "ability"}, -- Stealth
-        { spell = 1833, type = "ability"}, -- Cheap Shot
-        { spell = 1856, type = "ability"}, -- Vanish
-        { spell = 1966, type = "ability"}, -- Feint
-        { spell = 2094, type = "ability"}, -- Blind
-        { spell = 2983, type = "ability"}, -- Sprint
-        { spell = 5277, type = "ability"}, -- Evasion
-        { spell = 6770, type = "ability"}, -- Sap
-        { spell = 31224, type = "ability"}, -- Cloak of Shadows
-        { spell = 36554, type = "ability"}, -- Shadowstep
-        { spell = 114014, type = "ability"}, -- Shuriken Toss
-        { spell = 114018, type = "ability"}, -- Shroud of Concealment
-        { spell = 115191, type = "ability"}, -- Stealth
-        { spell = 121471, type = "ability"}, -- Shadow Blades
-        { spell = 137619, type = "ability", talent = 20}, -- Marked for Death
-        { spell = 152150, type = "ability", talent = 21}, -- Death from Above
-        { spell = 185311, type = "ability"}, -- Crimson Vial
-        { spell = 185313, type = "ability"}, -- Shadow Dance
-        { spell = 185438, type = "ability"}, -- Shadowstrike
-        { spell = 195452, type = "ability"}, -- Nightblade
-        { spell = 197393, type = "ability"}, -- Finality: Eviscerate
-        { spell = 197835, type = "ability"}, -- Shuriken Storm
-        { spell = 200758, type = "ability", talent = 3}, -- Gloomblade
-        { spell = 209782, type = "ability"}, -- Goremaw's Bite
-        { spell = 212283, type = "ability"}, -- Symbols of Death
       },
       icon = 236279
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208403, type = "buff", unit = "player", item = 137069}, -- Will of Valeera
-        { spell = 228224, type = "buff", unit = "player", item = 137021}, -- The Dreadlord's Deceit
-        { spell = 235027, type = "buff", unit = "player", item = 144236}, -- Mantle of the Master Assassin
-        { spell = 248210, type = "buff", unit = "player", item = 151818}, -- The First of the Dead
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 257945, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 213981, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Cold Blood
-        { spell = 213981, type = "buff", unit = "player", pvptalent = 15, titleSuffix = L["debuff"]}, -- Cold Blood
-        { spell = 198688, type = "debuff", unit = "target", pvptalent = 14}, -- Cold Blood
-        { spell = 207736, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Shadowy Duel
-        { spell = 207736, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["debuff"]}, -- Shadowy Duel
-        { spell = 212182, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Smoke Bomb
-        { spell = 212182, type = "debuff", unit = "player", pvptalent = 12, titleSuffix = L["debuff"]}, -- Smoke Bomb
-        { spell = 199027, type = "buff", unit = "player", pvptalent = 13}, -- Smoke Bomb
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1473,110 +539,34 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 17, type = "buff", unit = "group" }, -- Power Word: Shield
-        { spell = 586, type = "buff", unit = "player" }, -- Fade
-        { spell = 2096, type = "buff", unit = "player" }, -- Mind Vision
-        { spell = 10060, type = "buff", unit = "player", talent = 19 }, -- Power Infusion
-        { spell = 33206, type = "buff", unit = "group" }, -- Pain Suppression
-        { spell = 45243, type = "buff", unit = "player" }, -- Focused Will
-        { spell = 47536, type = "buff", unit = "player" }, -- Rapture
-        { spell = 65081, type = "buff", unit = "player", talent = 5 }, -- Body and Soul
-        { spell = 81782, type = "buff", unit = "group" }, -- Power Word: Barrier
-        { spell = 111759, type = "buff", unit = "player" }, -- Levitate
-        { spell = 121557, type = "buff", unit = "player", talent = 4 }, -- Angelic Feather
-        { spell = 123254, type = "buff", unit = "player", talent = 15 }, -- Angelic Feather
-        { spell = 152118, type = "buff", unit = "target", talent = 14 }, -- Clarity of Will
-        { spell = 193065, type = "buff", unit = "player", talent = 3 }, -- Masochism
-        { spell = 194384, type = "buff", unit = "group" }, -- Atonement
-        { spell = 197763, type = "buff", unit = "player" }, -- Borrowed Time
-        { spell = 197767, type = "buff", unit = "player" }, -- Speed of the Pious
-        { spell = 198069, type = "buff", unit = "player" }, -- Power of the Dark Side
-        { spell = 198076, type = "buff", unit = "player" }, -- Sins of the Many
-        { spell = 216135, type = "buff", unit = "player" }, -- Vestments of Discipline
-        { spell = 123254, type = "buff", unit = "player", talent = 1 }, -- Twist of Fate
       },
       icon = 458720
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 589, type = "debuff", unit = "target" }, -- Shadow Word: Pain
-        { spell = 605, type = "debuff", unit = "multi"}, -- Mind Control
-        { spell = 2096, type = "debuff", unit = "target" }, -- Mind Vision
-        { spell = 8122, type = "debuff", unit = "target" }, -- Psychic Scream
-        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
-        { spell = 204213, type = "debuff", unit = "target", talent = 16 }, -- Purge the Wicked
-        { spell = 208772, type = "debuff", unit = "target" }, -- Smite
-        { spell = 214621, type = "debuff", unit = "target", talent = 3 }, -- Schism
-        { spell = 219521, type = "debuff", unit = "player", talent = 15 }, -- Shadow Covenant
       },
       icon = 136207
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 17, type = "ability"}, -- Power Word: Shield
-        { spell = 527, type = "ability"}, -- Purify
-        { spell = 586, type = "ability"}, -- Fade
-        { spell = 8122, type = "ability"}, -- Psychic Scream
-        { spell = 9484, type = "ability" }, -- Shackle Undead
-        { spell = 10060, type = "ability", talent = 19}, -- Power Infusion
-        { spell = 32375, type = "ability"}, -- Mass Dispel
-        { spell = 33206, type = "ability"}, -- Pain Suppression
-        { spell = 34433, type = "ability"}, -- Shadowfiend
-        { spell = 47536, type = "ability"}, -- Rapture
-        { spell = 47540, type = "ability"}, -- Penance
-        { spell = 62618, type = "ability"}, -- Power Word: Barrier
-        { spell = 73325, type = "ability"}, -- Leap of Faith
-        { spell = 110744, type = "ability", talent = 17}, -- Divine Star
-        { spell = 120517, type = "ability", talent = 18}, -- Halo
-        { spell = 121536, type = "ability", talent = 4}, -- Angelic Feather
-        { spell = 123040, type = "ability", talent = 12}, -- Mindbender
-        { spell = 129250, type = "ability", talent = 10}, -- Power Word: Solace
-        { spell = 204263, type = "ability", talent = 7}, -- Shining Force
-        { spell = 207946, type = "ability"}, -- Light's Wrath
-        { spell = 214621, type = "ability", talent = 3}, -- Schism
-        { spell = 246287, type = "ability", talent = 21}, -- Evangelism
       },
       icon = 253400
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 214637, type = "buff", unit = "player", item = 132861}, -- Estel, Dejahna's Inspiration
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
-        { spell = 233997, type = "buff", unit = "player", item = 144244}, -- Kam Xi'raff
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246519, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-        { spell = 252848, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 197862, type = "ability", pvptalent = 17, titleSuffix = L["cooldown"]}, -- Archangel
-        { spell = 197862, type = "buff", unit = "player", pvptalent = 17, titleSuffix = L["buff"]}, -- Archangel
-        { spell = 197871, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Dark Archangel
-        { spell = 197871, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Dark Archangel
-        { spell = 211681, type = "buff", unit = "group", pvptalent = 16}, -- Power Word: Fortitude
-        { spell = 196440, type = "buff", unit = "target", pvptalent = 9}, -- Purified Resolve
-        { spell = 221660, type = "buff", unit = "player", pvptalent = 11}, -- Holy Concentration
-        { spell = 195329, type = "buff", unit = "player", pvptalent = 4}, -- Defender of the Weak
-        { spell = 195488, type = "buff", unit = "player", pvptalent = 5}, -- Vim and Vigor
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1587,113 +577,34 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 139, type = "buff", unit = "group" }, -- Renew
-        { spell = 586, type = "buff", unit = "player" }, -- Fade
-        { spell = 19236, type = "buff", unit = "player" }, -- Desperate Prayer
-        { spell = 41635, type = "buff", unit = "group" }, -- Prayer of Mending
-        { spell = 45243, type = "buff", unit = "player" }, -- Focused Will
-        { spell = 47788, type = "buff", unit = "group" }, -- Guardian Spirit
-        { spell = 64843, type = "buff", unit = "player", fullscan = true }, -- Divine Hymn
-        { spell = 64844, type = "buff", unit = "player", fullscan = true }, -- Divine Hymn
-        { spell = 64901, type = "buff", unit = "player", talent = 12 }, -- Symbol of Hope
-        { spell = 77489, type = "buff", unit = "player" }, -- Echo of Light
-        { spell = 111759, type = "buff", unit = "player" }, -- Levitate
-        { spell = 114255, type = "buff", unit = "player", talent = 13 }, -- Surge of Light
-        { spell = 121557, type = "buff", unit = "player", talent = 4 }, -- Angelic Feather
-        { spell = 196490, type = "buff", unit = "player" }, -- Power of the Naaru
-        { spell = 196644, type = "buff", unit = "player" }, -- Blessing of T'uure
-        { spell = 197030, type = "buff", unit = "player" }, -- Divinity
-        { spell = 200183, type = "buff", unit = "player", talent = 19 }, -- Apotheosis
-        { spell = 208065, type = "buff", unit = "player" }, -- Light of T'uure
-        { spell = 214121, type = "buff", unit = "player", talent = 5 }, -- Body and Mind
       },
       icon = 135953
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 605, type = "debuff", unit = "multi"}, -- Mind Control
-        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
-        { spell = 14914, type = "debuff", unit = "target" }, -- Holy Fire
-        { spell = 200196, type = "debuff", unit = "target" }, -- Holy Word: Chastise
-        { spell = 200200, type = "debuff", unit = "target" }, -- Holy Word: Chastise
       },
       icon = 135972
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 527, type = "ability"}, -- Purify
-        { spell = 586, type = "ability"}, -- Fade
-        { spell = 2050, type = "ability"}, -- Holy Word: Serenity
-        { spell = 9484, type = "ability" }, -- Shackle Undead
-        { spell = 14914, type = "ability"}, -- Holy Fire
-        { spell = 19236, type = "ability"}, -- Desperate Prayer
-        { spell = 32375, type = "ability"}, -- Mass Dispel
-        { spell = 33076, type = "ability"}, -- Prayer of Mending
-        { spell = 34861, type = "ability"}, -- Holy Word: Sanctify
-        { spell = 47788, type = "ability"}, -- Guardian Spirit
-        { spell = 64843, type = "ability"}, -- Divine Hymn
-        { spell = 64901, type = "ability", talent = 12}, -- Symbol of Hope
-        { spell = 73325, type = "ability" }, -- Leap of Faith
-        { spell = 88625, type = "ability"}, -- Holy Word: Chastise
-        { spell = 110744, type = "ability", talent = 17}, -- Divine Star
-        { spell = 120517, type = "ability", talent = 18}, -- Halo
-        { spell = 121536, type = "ability", talent = 4}, -- Angelic Feather
-        { spell = 200183, type = "ability", talent = 19}, -- Apotheosis
-        { spell = 204263, type = "ability", talent = 7}, -- Shining Force
-        { spell = 204883, type = "ability", talent = 21}, -- Circle of Healing
-        { spell = 208065, type = "ability"}, -- Light of T'uure
-        { spell = 214121, type = "ability", talent = 5}, -- Body and Mind
       },
       icon = 135937
     },
     [4] = {
-      title = L["Legendaries"],
-      args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 211319, type = "debuff", unit = "player", item = 137109, titleSuffix = L["debuff"]}, -- X'anshi, Shroud of Archbishop Benedictus
-        { spell = 211336, type = "buff", unit = "player", item = 137109, titleSuffix = L["buff"]}, -- X'anshi, Shroud of Archbishop Benedictus
-        { spell = 211442, type = "buff", unit = "player", fullscan = true, titleSuffix = L["- Holy Word: Sanctify"], item = 132445}, -- Al'maiesh, the Cord of Hope
-        { spell = 211440, type = "buff", unit = "player", fullscan = true, titleSuffix = L["- Holy Word: Serenity"], item = 132445}, -- Al'maiesh, the Cord of Hope
-        { spell = 211440, type = "buff", unit = "player", titleSuffix = L["- Any"], item = 132445}, -- Al'maiesh, the Cord of Hope
-        { spell = 211443, type = "buff", unit = "player", fullscan = true, titleSuffix = L["- Holy Word: Chastise"], item = 132445}, -- Al'maiesh, the Cord of Hope
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
-        { spell = 234711, type = "buff", unit = "target", item = 144247}, -- Rammal's Ulterior Motive
-        { spell = 234693, type = "buff", unit = "target", item = 132449}, -- Phyrix's Embrace
+      title = L["Azerite Traits"],
+      args = {
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 253437, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 253443, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 221660, type = "buff", unit = "player", pvptalent = 11}, -- Holy Concentration
-        { spell = 213602, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Greater Fade
-        { spell = 213602, type = "buff", unit = "player", pvptalent = 12, titleSuffix = L["buff"]}, -- Greater Fade
-        { spell = 213610, type = "ability", pvptalent = 9, titleSuffix = L["cooldown"]}, -- Holy Ward
-        { spell = 213610, type = "buff", unit = "group", pvptalent = 9, titleSuffix = L["buff"]}, -- Holy Ward
-        { spell = 196762, type = "ability", pvptalent = 6, titleSuffix = L["cooldown"]}, -- Inner Focus
-        { spell = 196762, type = "buff", unit = "player", pvptalent = 6, titleSuffix = L["buff"]}, -- Inner Focus
-        { spell = 197268, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Ray of Hope
-        { spell = 197268, type = "buff", unit = "group", pvptalent = 18, titleSuffix = L["buff"]}, -- Ray of Hope
-        { spell = 20711, type = "ability", pvptalent = 17}, -- Spirit of Redemption
-        { spell = 195329, type = "buff", unit = "player", pvptalent = 4}, -- Defender of the Weak
-        { spell = 195488, type = "buff", unit = "player", pvptalent = 5}, -- Vim and Vigor
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1704,106 +615,34 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 17, type = "buff", unit = "player" }, -- Power Word: Shield
-        { spell = 586, type = "buff", unit = "player" }, -- Fade
-        { spell = 2096, type = "buff", unit = "player" }, -- Mind Vision
-        { spell = 10060, type = "buff", unit = "player", talent = 16 }, -- Power Infusion
-        { spell = 15286, type = "buff", unit = "player" }, -- Vampiric Embrace
-        { spell = 15407, type = "buff", unit = "player" }, -- Mind Flay
-        { spell = 47585, type = "buff", unit = "player" }, -- Dispersion
-        { spell = 65081, type = "buff", unit = "player", talent = 5 }, -- Body and Soul
-        { spell = 111759, type = "buff", unit = "player" }, -- Levitate
-        { spell = 123254, type = "buff", unit = "player", talent = 1 }, -- Twist of Fate
-        { spell = 124430, type = "buff", unit = "player", talent = 15 }, -- Shadowy Insight
-        { spell = 193065, type = "buff", unit = "player", talent = 3 }, -- Masochism
-        { spell = 193223, type = "buff", unit = "player", talent = 21 }, -- Surrender to Madness
-        { spell = 194022, type = "buff", unit = "player" }, -- Mental Fortitude
-        { spell = 194025, type = "buff", unit = "player" }, -- Thrive in the Shadows
-        { spell = 194249, type = "buff", unit = "player" }, -- Voidform
-        { spell = 197937, type = "buff", unit = "player", talent = 10 }, -- Lingering Insanity
-        { spell = 205065, type = "buff", unit = "player" }, -- Void Torrent
-        { spell = 205372, type = "buff", unit = "player", talent = 12 }, -- Void Ray
-        { spell = 232698, type = "buff", unit = "player" }, -- Shadow Form
       },
       icon = 237566
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 589, type = "debuff", unit = "target" }, -- Shadow Word: Pain
-        { spell = 605, type = "debuff", unit = "multi"}, -- Mind Control
-        { spell = 2096, type = "debuff", unit = "target" }, -- Mind Vision
-        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
-        { spell = 15407, type = "debuff", unit = "target" }, -- Mind Flay
-        { spell = 15487, type = "debuff", unit = "target" }, -- Silence
-        { spell = 34914, type = "debuff", unit = "target" }, -- Vampiric Touch
-        { spell = 193473, type = "debuff", unit = "target" }, -- Mind Flay
-        { spell = 205065, type = "debuff", unit = "target" }, -- Void Torrent
-        { spell = 205369, type = "debuff", unit = "target" }, -- Mind Bomb
-        { spell = 212570, type = "debuff", unit = "player", talent = 21 }, -- Surrendered Soul
-        { spell = 217673, type = "debuff", unit = "target" }, -- Mind Spike
-        { spell = 226943, type = "debuff", unit = "target", talent = 7 }, -- Mind Bomb
       },
       icon = 136207
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 17, type = "ability"}, -- Power Word: Shield
-        { spell = 586, type = "ability"}, -- Fade
-        { spell = 8092, type = "ability"}, -- Mind Blast
-        { spell = 9484, type = "ability"}, -- Shackle Undead
-        { spell = 10060, type = "ability", talent = 16}, -- Power Infusion
-        { spell = 15286, type = "ability"}, -- Vampiric Embrace
-        { spell = 15487, type = "ability"}, -- Silence
-        { spell = 32375, type = "ability"}, -- Mass Dispel
-        { spell = 32379, type = "ability"}, -- Shadow Word: Death
-        { spell = 34433, type = "ability"}, -- Shadowfiend
-        { spell = 47585, type = "ability"}, -- Dispersion
-        { spell = 193223, type = "ability", talent = 21}, -- Surrender to Madness
-        { spell = 200174, type = "ability", talent = 18}, -- Mindbender
-        { spell = 205065, type = "ability"}, -- Void Torrent
-        { spell = 205351, type = "ability", talent = 3}, -- Shadow Word: Void
-        { spell = 205369, type = "ability", talent = 7}, -- Mind Bomb
-        { spell = 205385, type = "ability", talent = 20}, -- Shadow Crash
-        { spell = 205448, type = "ability"}, -- Void Bolt
-        { spell = 213634, type = "ability"}, -- Purify Diesease
       },
       icon = 136230
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 207724, type = "buff", unit = "player", item = 133973}, -- The Twins' Painful Touch
-        { spell = 215210, type = "buff", unit = "player", item = 132409}, -- Anund's Seared Shackles
-        { spell = 236546, type = "buff", unit = "player", item = 144438}, -- Zeks Exterminatus
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252909, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-        { spell = 247226, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 199412, type = "buff", unit = "player", pvptalent = 12}, -- Edge of Insanity
-        { spell = 199683, type = "debuff", unit = "target", pvptalent = 17}, -- Last Word
-        { spell = 211522, type = "ability", pvptalent = 16}, -- Psyfiend
-        { spell = 108968, type = "ability", pvptalent = 18}, -- Void Shift
-        { spell = 195640, type = "buff", unit = "player", pvptalent = 4}, -- Train of Thought
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1817,110 +656,34 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 546, type = "buff", unit = "player" }, -- Water Walking
-        { spell = 2645, type = "buff", unit = "player" }, -- Ghost Wolf
-        { spell = 6196, type = "buff", unit = "player" }, -- Far Sight
-        { spell = 16166, type = "buff", unit = "player", talent = 16}, -- Elemental Mastery
-        { spell = 16246, type = "buff", unit = "player"}, -- Elemental Focus
-        { spell = 77762, type = "buff", unit = "player" }, -- Lava Surge
-        { spell = 108271, type = "buff", unit = "player" }, -- Astral Shift
-        { spell = 108281, type = "buff", unit = "player", talent = 5 }, -- Ancestral Guidance
-        { spell = 114050, type = "buff", unit = "player", talent = 19 }, -- Ascendance
-        { spell = 118522, type = "buff", unit = "player", talent = 10 }, -- Elemental Blast: Critical Strike
-        { spell = 157384, type = "buff", unit = "player" }, -- Eye of the Storm
-        { spell = 173183, type = "buff", unit = "player", talent = 10 }, -- Elemental Blast: Haste
-        { spell = 173184, type = "buff", unit = "player", talent = 10 }, -- Elemental Blast: Mastery
-        { spell = 191877, type = "buff", unit = "player" }, -- Power of the Maelstrom
-        { spell = 192082, type = "buff", unit = "player", talent = 6 }, -- Wind Rush
-        { spell = 202192, type = "buff", unit = "player", talent = 1 }, -- Resonance Totem
-        { spell = 205495, type = "buff", unit = "player" }, -- Stormkeeper
-        { spell = 210652, type = "buff", unit = "player", talent = 1 }, -- Storm Totem
-        { spell = 210658, type = "buff", unit = "player", talent = 1 }, -- Ember Totem
-        { spell = 210659, type = "buff", unit = "player", talent = 1 }, -- Tailwind Totem
-        { spell = 210714, type = "buff", unit = "player", talent = 21 }, -- Icefury
       },
       icon = 451169
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 51490, type = "debuff", unit = "target" }, -- Thunderstorm
-        { spell = 51514, type = "debuff", unit = "multi"}, -- Hex
-        { spell = 64695, type = "debuff", unit = "target", talent = 8 }, -- Earthgrab
-        { spell = 77505, type = "debuff", unit = "target" }, -- Earthquake
-        { spell = 116947, type = "debuff", unit = "target" }, -- Earthbind
-        { spell = 118297, type = "debuff", unit = "target" }, -- Immolate
-        { spell = 118345, type = "debuff", unit = "target" }, -- Pulverize
-        { spell = 118905, type = "debuff", unit = "target", talent = 7 }, -- Static Charge
-        { spell = 157375, type = "debuff", unit = "target" }, -- Gale Force
-        { spell = 182387, type = "debuff", unit = "target" }, -- Earthquake
-        { spell = 188389, type = "debuff", unit = "target" }, -- Flame Shock
-        { spell = 196840, type = "debuff", unit = "target" }, -- Frost Shock
-        { spell = 197209, type = "debuff", unit = "multi", talent = 20 }, -- Lightning Rod
       },
       icon = 135813
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 2825, type = "ability"}, -- Bloodlust
-        { spell = 16166, type = "ability", talent = 16}, -- Elemental Mastery
-        { spell = 51485, type = "ability", talent = 8}, -- Earthgrab Totem
-        { spell = 51490, type = "ability"}, -- Thunderstorm
-        { spell = 51505, type = "ability"}, -- Lava Burst
-        { spell = 51514, type = "ability"}, -- Hex
-        { spell = 51886, type = "ability"}, -- Cleanse Spirit
-        { spell = 57994, type = "ability"}, -- Wind Shear
-        { spell = 108271, type = "ability"}, -- Astral Shift
-        { spell = 108281, type = "ability", talent = 5}, -- Ancestral Guidance
-        { spell = 114050, type = "ability", talent = 19}, -- Ascendance
-        { spell = 117014, type = "ability", talent = 10}, -- Elemental Blast
-        { spell = 192058, type = "ability", talent = 7}, -- Lightning Surge Totem
-        { spell = 192063, type = "ability", talent = 4}, -- Gust of Wind
-        { spell = 192077, type = "ability", talent = 6}, -- Wind Rush Totem
-        { spell = 192222, type = "ability", talent = 21}, -- Liquid Magma Totem
-        { spell = 192249, type = "ability", talent = 17}, -- Storm Elemental
-        { spell = 196932, type = "ability", talent = 9}, -- Voodoo Totem
-        { spell = 198067, type = "ability"}, -- Fire Elemental
-        { spell = 198103, type = "ability"}, -- Earth Elemental
-        { spell = 205495, type = "ability"}, -- Stormkeeper
-        { spell = 210714, type = "ability", talent = 15}, -- Icefury
       },
       icon = 135790
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208723, type = "buff", unit = "player", item = 137074}, -- Echoes of the Great Sundering
-        { spell = 224852, type = "debuff", unit = "target", item = 137083}, -- Pristine Proto-Scale Girdle
-        { spell = 207995, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 207998, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 207999, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246594, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 252141, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 204399, type = "debuff", unit = "target", pvptalent = 16}, -- Earthfury
-        { spell = 204437, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Lightning Lasso
-        { spell = 204437, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["debuff"]}, -- Lightning Lasso
-        { spell = 195640, type = "buff", unit = "player", pvptalent = 4}, -- Train of Thought
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -1931,112 +694,34 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 546, type = "buff", unit = "player" }, -- Water Walking
-        { spell = 2645, type = "buff", unit = "player" }, -- Ghost Wolf
-        { spell = 6196, type = "buff", unit = "player" }, -- Far Sight
-        { spell = 58875, type = "buff", unit = "player" }, -- Spirit Walk
-        { spell = 108271, type = "buff", unit = "player" }, -- Astral Shift
-        { spell = 114051, type = "buff", unit = "player", talent = 19 }, -- Ascendance
-        { spell = 187878, type = "buff", unit = "player" }, -- Crash Lightning
-        { spell = 192082, type = "buff", unit = "player", talent = 6 }, -- Wind Rush
-        { spell = 192106, type = "buff", unit = "player" }, -- Lightning Shield
-        { spell = 194084, type = "buff", unit = "player" }, -- Flametongue
-        { spell = 195222, type = "buff", unit = "player" }, -- Stormlash
-        { spell = 196834, type = "buff", unit = "player" }, -- Frostbrand
-        { spell = 197211, type = "buff", unit = "player" }, -- Fury of Air
-        { spell = 198249, type = "buff", unit = "player" }, -- Elemental Healing
-        { spell = 198293, type = "buff", unit = "player" }, -- Wind Strikes
-        { spell = 198300, type = "buff", unit = "player" }, -- Gathering Storms
-        { spell = 199055, type = "buff", unit = "player" }, -- Unleash Doom
-        { spell = 201846, type = "buff", unit = "player" }, -- Stormbringer
-        { spell = 201898, type = "buff", unit = "player", talent = 1 }, -- Windsong
-        { spell = 202004, type = "buff", unit = "player", talent = 3 }, -- Landslide
-        { spell = 204945, type = "buff", unit = "player" }, -- Doom Winds
-        { spell = 215785, type = "buff", unit = "player", talent = 2 }, -- Hot Hand
-        { spell = 215864, type = "buff", unit = "player", talent = 4 }, -- Rainfall
       },
       icon = 136099
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 51514, type = "debuff", unit = "multi"}, -- Hex
-        { spell = 64695, type = "debuff", unit = "target", talent = 8 }, -- Earthgrab
-        { spell = 116947, type = "debuff", unit = "target" }, -- Earthbind
-        { spell = 118905, type = "debuff", unit = "target", talent = 7 }, -- Static Charge
-        { spell = 147732, type = "debuff", unit = "target" }, -- Frostbrand Attack
-        { spell = 188089, type = "debuff", unit = "target", talent = 21 }, -- Earthen Spike
-        { spell = 197214, type = "debuff", unit = "target" }, -- Sundering
-        { spell = 197385, type = "debuff", unit = "target", talent = 17 }, -- Fury of Air
-        { spell = 224125, type = "debuff", unit = "target" }, -- Fiery Jaws
-        { spell = 224127, type = "debuff", unit = "target" }, -- Crackling Surge
       },
       icon = 462327
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 2825, type = "ability", talent = 3}, -- Bloodlust
-        { spell = 17364, type = "ability"}, -- Stormstrike
-        { spell = 51485, type = "ability", talent = 8}, -- Earthgrab Totem
-        { spell = 51514, type = "ability"}, -- Hex
-        { spell = 51886, type = "ability"}, -- Cleanse Spirit
-        { spell = 57994, type = "ability"}, -- Wind Shear
-        { spell = 58875, type = "ability"}, -- Spirit Walk
-        { spell = 108271, type = "ability"}, -- Astral Shift
-        { spell = 114051, type = "ability", talent = 19}, -- Ascendance
-        { spell = 187837, type = "ability", talent = 14}, -- Lightning Bolt
-        { spell = 187874, type = "ability"}, -- Crash Lightning
-        { spell = 188089, type = "ability", talent = 21}, -- Earthen Spike
-        { spell = 192058, type = "ability", talent = 7}, -- Lightning Surge Totem
-        { spell = 192077, type = "ability", talent = 6}, -- Wind Rush Totem
-        { spell = 193786, type = "ability"}, -- Rock Biter
-        { spell = 193796, type = "ability"}, -- Flametongue
-        { spell = 196884, type = "ability", talent = 5}, -- Feral Lunge
-        { spell = 196932, type = "ability", talent = 9}, -- Voodoo Totem
-        { spell = 197214, type = "ability", talent =18}, -- Sundering
-        { spell = 198506, type = "ability"}, -- Feral Spirit
-        { spell = 201898, type = "ability", talent = 1}, -- Windsong
-        { spell = 204945, type = "ability"}, -- Doom Winds
-        { spell = 215864, type = "ability", talent = 4}, -- Rainfall
       },
       icon = 1370984
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208742, type = "buff", unit = "player", item = 137616}, -- Emalon's Charged Core
-        { spell = 214265, type = "debuff", unit = "target", item = 137103}, -- Storm Tempests
-        { spell = 207995, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 207998, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 207999, type = "buff", unit = "player", item = 137050}, -- Eye of the Twisting Nether
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 254308, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 252151, type = "debuff", unit = "target", titlePrefix = L["T21 4P Bonus - "]},
-        { spell = 242284, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 242286, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 210918, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Ethereal Form
-        { spell = 210918, type = "buff", unit = "player", pvptalent = 12, titleSuffix = L["buff"]}, -- Ethereal Form
-        { spell = 204366, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Thundercharge
-        { spell = 204366, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Thundercharge
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2047,110 +732,34 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 546, type = "buff", unit = "player" }, -- Water Walking
-        { spell = 2645, type = "buff", unit = "player" }, -- Ghost Wolf
-        { spell = 6196, type = "buff", unit = "player" }, -- Far Sight
-        { spell = 53390, type = "buff", unit = "player" }, -- Tidal Waves
-        { spell = 61295, type = "buff", unit = "player" }, -- Riptide
-        { spell = 73685, type = "buff", unit = "player", talent = 2 }, -- Unleash Life
-        { spell = 73920, type = "buff", unit = "player" }, -- Healing Rain
-        { spell = 77762, type = "buff", unit = "player" }, -- Lava Surge
-        { spell = 79206, type = "buff", unit = "player" }, -- Spiritwalker's Grace
-        { spell = 98007, type = "buff", unit = "player" }, -- Spirit Link Totem
-        { spell = 108271, type = "buff", unit = "player" }, -- Astral Shift
-        { spell = 108281, type = "buff", unit = "player", talent = 11 }, -- Ancestral Guidance
-        { spell = 114052, type = "buff", unit = "player", talent = 19 }, -- Ascendance
-        { spell = 157504, type = "buff", unit = "player" }, -- Cloudburst Totem
-        { spell = 192082, type = "buff", unit = "player", talent = 6 }, -- Wind Rush
-        { spell = 201633, type = "buff", unit = "player", talent = 14 }, -- Earthen Shield
-        { spell = 207288, type = "buff", unit = "player" }, -- Queen Ascendant
-        { spell = 207400, type = "buff", unit = "target" }, -- Ancestral Vigor
-        { spell = 207495, type = "buff", unit = "target", talent = 13 }, -- Ancestral Protection
-        { spell = 207527, type = "buff", unit = "player" }, -- Ghost in the Mist
-        { spell = 207778, type = "buff", unit = "player" }, -- Gift of the Queen
-        { spell = 208205, type = "buff", unit = "player" }, -- Cumulative Upkeep
-        { spell = 208416, type = "buff", unit = "player" }, -- Sense of Urgency
-        { spell = 208899, type = "buff", unit = "player" }, -- Queen's Decree
-        { spell = 209950, type = "buff", unit = "player" }, -- Caress of the Tidemother
-        { spell = 216251, type = "buff", unit = "player", talent = 1 }, -- Undulation
       },
       icon = 252995
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 51514, type = "debuff", unit = "multi"}, -- Hex
-        { spell = 64695, type = "debuff", unit = "target", talent = 8 }, -- Earthgrab
-        { spell = 116947, type = "debuff", unit = "target" }, -- Earthbind
-        { spell = 118905, type = "debuff", unit = "target", talent = 7 }, -- Static Charge
-        { spell = 188838, type = "debuff", unit = "target" }, -- Flame Shock
       },
       icon = 135813
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 2825, type = "ability"}, -- Bloodlust
-        { spell = 5394, type = "ability"}, -- Healing Stream Totem
-        { spell = 51485, type = "ability", talent = 8}, -- Earthgrab Totem
-        { spell = 51505, type = "ability"}, -- Lava Burst
-        { spell = 51514, type = "ability"}, -- Hex
-        { spell = 57994, type = "ability"}, -- Wind Shear
-        { spell = 61295, type = "ability"}, -- Riptide
-        { spell = 73685, type = "ability", talent = 2}, -- Unleash Life
-        { spell = 73920, type = "ability"}, -- Healing Rain
-        { spell = 77130, type = "ability"}, -- Purify Spirit
-        { spell = 79206, type = "ability"}, -- Spiritwalker's Grace
-        { spell = 98008, type = "ability"}, -- Spirit Link Totem
-        { spell = 108271, type = "ability"}, -- Astral Shift
-        { spell = 108280, type = "ability"}, -- Healing Tide Totem
-        { spell = 108281, type = "ability", talent = 11}, -- Ancestral Guidance
-        { spell = 114052, type = "ability", talent = 19}, -- Ascendance
-        { spell = 157153, type = "ability", talent = 17}, -- Cloudburst Totem
-        { spell = 188838, type = "ability"}, -- Flame Shock
-        { spell = 192058, type = "ability", talent = 7}, -- Lightning Surge Totem
-        { spell = 192063, type = "ability", talent = 4}, -- Gust of Wind
-        { spell = 192077, type = "ability", talent = 6}, -- Wind Rush Totem
-        { spell = 196932, type = "ability", talent = 9}, -- Voodoo Totem
-        { spell = 197995, type = "ability", talent = 20}, -- Wellspring
-        { spell = 198838, type = "ability", talent = 14}, -- Earthen Shield Totem
-        { spell = 207399, type = "ability", talent = 13}, -- Ancestral Protection Totem
-        { spell = 207778, type = "ability"}, -- Gift of the Queen
       },
       icon = 135127
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208764, type = "buff", unit = "player", item = 137104}, -- Nobundo's Redemption
-        { spell = 210607, type = "buff", unit = "player", item = 137051}, -- Focuser of Jonat, the Elder
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246729, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 246771, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 204288, type = "ability", pvptalent = 17, titleSuffix = L["cooldown"]}, -- Earth Shield
-        { spell = 204288, type = "buff", unit = "group", pvptalent = 17, titleSuffix = L["buff"]}, -- Earth Shield
-        { spell = 204336, type = "ability", pvptalent = 15}, -- Grounding Totem
-        { spell = 204293, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Spirit Link
-        { spell = 204293, type = "buff", unit = "group", pvptalent = 18, titleSuffix = L["buff"]}, -- Spirit Link
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2164,93 +773,34 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 130, type = "buff", unit = "player" }, -- Slow Fall
-        { spell = 12042, type = "buff", unit = "player" }, -- Arcane Power
-        { spell = 12051, type = "buff", unit = "player" }, -- Evocation
-        { spell = 45438, type = "buff", unit = "player" }, -- Ice Block
-        { spell = 79683, type = "buff", unit = "player" }, -- Arcane Missiles!
-        { spell = 110960, type = "buff", unit = "player", fullscan = true }, -- Greater Invisibility
-        { spell = 116267, type = "buff", unit = "player", talent = 9 }, -- Incanter's Flow
-        { spell = 205025, type = "buff", unit = "player" }, -- Presence of Mind
-        { spell = 210126, type = "buff", unit = "player", talent = 1 }, -- Arcane Familiar
-        { spell = 212799, type = "buff", unit = "player" }, -- Displacement Beacon
-        { spell = 235450, type = "buff", unit = "player" }, -- Prismatic Barrier
-        { spell = 236298, type = "buff", unit = "player", talent = 13 }, -- Chrono Shift
       },
       icon = 136096
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
-        { spell = 122, type = "debuff", unit = "target" }, -- Frost Nova
-        { spell = 31589, type = "debuff", unit = "target" }, -- Slow
-        { spell = 41425, type = "debuff", unit = "player" }, -- Hypothermia
-        { spell = 82691, type = "debuff", unit = "target", talent = 14 }, -- Ring of Frost
-        { spell = 114923, type = "debuff", unit = "target", talent = 16 }, -- Nether Tempest
-        { spell = 210134, type = "debuff", unit = "target", talent = 18 }, -- Erosion
-        { spell = 210824, type = "debuff", unit = "target" }, -- Touch of the Magi
-        { spell = 236299, type = "buff", unit = "player", talent = 13 }, -- Chrono Shift
       },
       icon = 135848
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 122, type = "ability"}, -- Frost Nova
-        { spell = 1953, type = "ability"}, -- Blink
-        { spell = 2139, type = "ability"}, -- Counterspell
-        { spell = 11426, type = "ability"}, -- Ice Barrier
-        { spell = 12042, type = "ability"}, -- Arcane Power
-        { spell = 12051, type = "ability"}, -- Evocation
-        { spell = 44425, type = "ability"}, -- Arcane Barrage
-        { spell = 45438, type = "ability"}, -- Ice Block
-        { spell = 55342, type = "ability", talent = 7}, -- Mirror Image
-        { spell = 80353, type = "ability"}, -- Time Warp
-        { spell = 110959, type = "ability"}, -- Greater Invisibility
-        { spell = 113724, type = "ability", talent = 14}, -- Ring of Frost
-        { spell = 116011, type = "ability", talent = 8}, -- Rune of Power
-        { spell = 153626, type = "ability", talent = 21}, -- Arcane Orb
-        { spell = 157980, type = "ability", talent = 10}, -- Supernova
-        { spell = 195676, type = "ability"}, -- Displacement
-        { spell = 205022, type = "ability", talent = 1}, -- Arcane Familiar
-        { spell = 205025, type = "ability"}, -- Presence of Mind
-        { spell = 205032, type = "ability", talent = 11}, -- Charged Up
-        { spell = 212653, type = "ability", talent = 4}, -- Shimmer
       },
       icon = 136075
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207283, type = "buff", unit = "player", item = 133977}, -- Belo'vir's Final Stand
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208081, type = "buff", unit = "player", item = 132413}, -- Rhonin's Assaulting Armwraps
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 209316, type = "buff", unit = "player", item = 132442}, -- Cord of Infinity
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246224, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253299, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-        { spell = 253262, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 198158, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Mass Invisibility
-        { spell = 198158, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Mass Invisibility
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2261,100 +811,34 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 66, type = "buff", unit = "player" }, -- Invisibility
-        { spell = 130, type = "buff", unit = "player" }, -- Slow Fall
-        { spell = 11426, type = "buff", unit = "player" }, -- Ice Barrier
-        { spell = 32612, type = "buff", unit = "player" }, -- Invisibility
-        { spell = 45438, type = "buff", unit = "player" }, -- Ice Block
-        { spell = 48107, type = "buff", unit = "player" }, -- Heating Up
-        { spell = 48108, type = "buff", unit = "player" }, -- Hot Streak!
-        { spell = 116267, type = "buff", unit = "player", talent = 9 }, -- Incanter's Flow
-        { spell = 157644, type = "buff", unit = "player" }, -- Enhanced Pyrotechnics
-        { spell = 190319, type = "buff", unit = "player" }, -- Combustion
-        { spell = 194316, type = "buff", unit = "player" }, -- Cauterizing Blink
-        { spell = 194329, type = "buff", unit = "player" }, -- Pyretic Incantation
-        { spell = 227482, type = "buff", unit = "player" }, -- Scorched Earth
-        { spell = 235313, type = "buff", unit = "player" }, -- Blazing Barrier
-        { spell = 236060, type = "buff", unit = "player", talent = 13 }, -- Frenetic Speed
       },
       icon = 1035045
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
-        { spell = 122, type = "debuff", unit = "target" }, -- Frost Nova
-        { spell = 2120, type = "debuff", unit = "target" }, -- Flamestrike
-        { spell = 12654, type = "debuff", unit = "target" }, -- Ignite
-        { spell = 31661, type = "debuff", unit = "target" }, -- Dragon's Breath
-        { spell = 41425, type = "debuff", unit = "player" }, -- Hypothermia
-        { spell = 82691, type = "debuff", unit = "target", talent = 14 }, -- Ring of Frost
-        { spell = 87023, type = "debuff", unit = "player" }, -- Cauterize
-        { spell = 87024, type = "debuff", unit = "player" }, -- Cauterized
-        { spell = 155158, type = "debuff", unit = "target", talent = 21 }, -- Meteor Burn
-        { spell = 194432, type = "debuff", unit = "target" }, -- Aftershocks
-        { spell = 194522, type = "debuff", unit = "target" }, -- Blast Furnace
-        { spell = 217694, type = "debuff", unit = "target", talent = 16 }, -- Living Bomb
-        { spell = 226757, type = "debuff", unit = "target", talent = 2 }, -- Conflagration
       },
       icon = 135818
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 66, type = "ability"}, -- Invisibility
-        { spell = 122, type = "ability"}, -- Frost Nova
-        { spell = 1953, type = "ability"}, -- Blink
-        { spell = 2139, type = "ability"}, -- Counterspell
-        { spell = 11426, type = "ability"}, -- Ice Barrier
-        { spell = 31661, type = "ability"}, -- Dragon's Breath
-        { spell = 44457, type = "ability", talent = 16}, -- Living Bomb
-        { spell = 45438, type = "ability"}, -- Ice Block
-        { spell = 55342, type = "ability", talent = 7}, -- Mirror Image
-        { spell = 80353, type = "ability"}, -- Time Warp
-        { spell = 108853, type = "ability"}, -- Inferno Blast
-        { spell = 113724, type = "ability", talent = 14}, -- Ring of Frost
-        { spell = 116011, type = "ability", talent = 8}, -- Rune of Power
-        { spell = 153561, type = "ability", talent = 21}, -- Meteor
-        { spell = 190319, type = "ability"}, -- Combustion
-        { spell = 194466, type = "ability"}, -- Phoenix's Flames
-        { spell = 198929, type = "ability", talent = 20}, -- Cinderstorm
-        { spell = 212653, type = "ability", talent = 4}, -- Shimmer
-        { spell = 235313, type = "ability"}, -- Blazing Barrier
       },
       icon = 610633
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207283, type = "buff", unit = "player", item = 133977}, -- Belo'vir's Final Stand
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 209455, type = "buff", unit = "player", item = 132406}, -- Marquee Bindings of the Sun King
-        { spell = 248146, type = "buff", unit = "player", item = 151809}, -- Contained Infernal Core
-        { spell = 248147, type = "buff", unit = "player", item = 151809}, -- Contained Infernal Core
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246261, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253220, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 203285, type = "buff", unit = "player", pvptalent = 17}, -- Flamecannon
-        { spell = 203278, type = "buff", unit = "player", pvptalent = 13}, -- Tinder
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2365,105 +849,34 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 66, type = "buff", unit = "player" }, -- Invisibility
-        { spell = 130, type = "buff", unit = "player" }, -- Slow Fall
-        { spell = 12472, type = "buff", unit = "player" }, -- Icy Veins
-        { spell = 44544, type = "buff", unit = "player" }, -- Fingers of Frost
-        { spell = 45438, type = "buff", unit = "player" }, -- Ice Block
-        { spell = 108839, type = "buff", unit = "player"}, -- Ice Floes
-        { spell = 116267, type = "buff", unit = "player", talent = 9 }, -- Incanter's Flow
-        { spell = 190446, type = "buff", unit = "player" }, -- Brainfreeze
-        { spell = 195391, type = "buff", unit = "player" }, -- Jouster
-        { spell = 195418, type = "buff", unit = "player" }, -- Chain Reaction
-        { spell = 195446, type = "buff", unit = "player" }, -- Chilled to the Core
-        { spell = 205473, type = "buff", unit = "player" }, -- Icicles
-        { spell = 205766, type = "buff", unit = "player", talent = 3 }, -- Bone Chilling
-        { spell = 208166, type = "buff", unit = "player", fullscan = true }, -- Ray of Frost
       },
       icon = 236227
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
-        { spell = 122, type = "debuff", unit = "target" }, -- Frost Nova
-        { spell = 41425, type = "debuff", unit = "player" }, -- Hypothermia
-        { spell = 59638, type = "debuff", unit = "target" }, -- Frostbolt
-        { spell = 82691, type = "debuff", unit = "target", talent = 14 }, -- Ring of Frost
-        { spell = 87023, type = "debuff", unit = "player", talent = 5 }, -- Cauterize
-        { spell = 87024, type = "debuff", unit = "player", talent = 5 }, -- Cauterized
-        { spell = 112948, type = "debuff", unit = "target", talent = 16 }, -- Frost Bomb
-        { spell = 135029, type = "debuff", unit = "target" }, -- Water Jet
-        { spell = 157997, type = "debuff", unit = "target" }, -- Ice Nova
-        { spell = 199786, type = "debuff", unit = "target", talent = 20 }, -- Glacial Spike
-        { spell = 205021, type = "debuff", unit = "target", talent = 1 }, -- Ray of Frost
-        { spell = 205708, type = "debuff", unit = "target" }, -- Chilled
-        { spell = 212792, type = "debuff", unit = "target" }, -- Cone of Cold
       },
       icon = 236208
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 66, type = "ability"}, -- Invisibility
-        { spell = 120, type = "ability"}, -- Cone of Cold
-        { spell = 122, type = "ability"}, -- Frost Nova
-        { spell = 1953, type = "ability"}, -- Blink
-        { spell = 12472, type = "ability"}, -- Icy Veins
-        { spell = 31687, type = "ability"}, -- Summon Water Elemental
-        { spell = 33395, type = "ability", titleSuffix = L["(Water Elemental)"]}, -- Freeze
-        { spell = 45438, type = "ability"}, -- Ice Block
-        { spell = 55342, type = "ability", talent = 7}, -- Mirror Image
-        { spell = 80353, type = "ability"}, -- Time Warp
-        { spell = 84714, type = "ability"}, -- Frozen Orb
-        { spell = 108839, type = "ability"}, -- Ice Floes
-        { spell = 113724, type = "ability", talent = 14}, -- Ring of Frost
-        { spell = 116011, type = "ability", talent = 8}, -- Rune of Power
-        { spell = 135029, type = "ability", titleSuffix = L["(Water Elemental)"]}, -- Freeze
-        { spell = 153595, type = "ability", talent = 21}, -- Comet Storm
-        { spell = 157997, type = "ability", talent = 10}, -- Ice Nova
-        { spell = 190356, type = "ability"}, -- Blizzard
-        { spell = 205021, type = "ability", talent = 1}, -- Ray of Frost
-        { spell = 212653, type = "ability", talent = 4}, -- Shimmer
-        { spell = 214634, type = "ability"}, -- Ebonbolt
-        { spell = 235219, type = "ability"}, -- Cold Snap
       },
       icon = 629077
     },
     [4] = {
-      title = L["Legendaries"],
-      args = {
-        { spell = 207283, type = "buff", unit = "player", item = 133977}, -- Belo'vir's Final Stand
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 214404, type = "buff", unit = "player", item = 138140}, -- Magtheridon's Banished Bracers
-        { spell = 226852, type = "buff", unit = "player", item = 133970}, -- Zann'esu Journey
-        { spell = 248176, type = "buff", unit = "player", item = 151810}, -- Shattered Fragments of Sindragosa
-        { spell = 248177, type = "buff", unit = "player", item = 151810}, -- Shattered Fragments of Sindragosa
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
+      title = L["Azerite Traits"],
+      args = {
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 242253, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253257, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 206432, type = "buff", unit = "player", pvptalent = 17}, -- Burst of Cold
-        { spell = 198121, type = "debuff", unit = "target", pvptalent = 14}, -- Frostbite
-        { spell = 198144, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Ice Form
-        { spell = 198144, type = "buff", unit = "player", pvptalent = 18, titleSuffix = L["buff"]}, -- Ice Form
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2478,109 +891,34 @@ templates.class.WARLOCK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 126, type = "buff", unit = "player" }, -- Eye of Kilrogg
-        { spell = 5697, type = "buff", unit = "player" }, -- Unending Breath
-        { spell = 20707, type = "buff", unit = "group" }, -- Soulstone
-        { spell = 48018, type = "buff", unit = "player", talent = 7 }, -- Demonic Circle
-        { spell = 104773, type = "buff", unit = "player" }, -- Unending Resolve
-        { spell = 108366, type = "buff", unit = "player" }, -- Soul Leech
-        { spell = 108416, type = "buff", unit = "player", talent = 15 }, -- Dark Pact
-        { spell = 111400, type = "buff", unit = "player", talent = 14 }, -- Burning Rush
-        { spell = 119899, type = "buff", unit = "player" }, -- Cauterize Master
-        { spell = 196098, type = "buff", unit = "player", talent = 12 }, -- Soul Harvest
-        { spell = 196099, type = "buff", unit = "player", talent = 18 }, -- Demonic Power
-        { spell = 199281, type = "buff", unit = "player" }, -- Compound Interest
-        { spell = 199646, type = "buff", unit = "player" }, -- Wrath of Consumption
-        { spell = 216695, type = "buff", unit = "player" }, -- Tormented Souls
-        { spell = 216708, type = "buff", unit = "player" }, -- Deadwind Harvester
-        { spell = 235156, type = "buff", unit = "player", talent = 6 }, -- Empowered Life Tap
       },
       icon = 136150
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 710, type = "debuff", unit = "multi" }, -- Banish
-        { spell = 980, type = "debuff", unit = "target" }, -- Agony
-        { spell = 5484, type = "debuff", unit = "target", talent = 9 }, -- Howl of Terror
-        { spell = 6789, type = "debuff", unit = "target", talent = 8 }, -- Mortal Coil
-        { spell = 17735, type = "debuff", unit = "target" }, -- Suffering
-        { spell = 22703, type = "debuff", unit = "target" }, -- Infernal Awakening
-        { spell = 27243, type = "debuff", unit = "target" }, -- Seed of Corruption
-        { spell = 30108, type = "debuff", unit = "target" }, -- Unstable Affliction
-        { spell = 48181, type = "debuff", unit = "target", talent = 1 }, -- Haunt
-        { spell = 63106, type = "debuff", unit = "target", talent = 20 }, -- Siphon Life
-        { spell = 113942, type = "debuff", unit = "player" }, -- Demonic Gateway
-        { spell = 118699, type = "debuff", unit = "target" }, -- Fear
-        { spell = 146739, type = "debuff", unit = "target" }, -- Corruption
-        { spell = 168501, type = "debuff", unit = "multi" }, -- Enslave Demon
-        { spell = 170995, type = "debuff", unit = "target" }, -- Cripple
-        { spell = 171014, type = "debuff", unit = "target" }, -- Seethe
-        { spell = 171017, type = "debuff", unit = "target" }, -- Meteor Strike
-        { spell = 198590, type = "debuff", unit = "target" }, -- Drain Soul
-        { spell = 205179, type = "debuff", unit = "target", talent = 10 }, -- Phantom Singularity
       },
       icon = 136139
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 698, type = "ability"}, -- Ritual of Summoning
-        { spell = 1122, type = "ability"}, -- Summon Infernal
-        { spell = 5484, type = "ability", talent = 9}, -- Howl of Terror
-        { spell = 6789, type = "ability", talent = 8}, -- Mortal Coil
-        { spell = 18540, type = "ability"}, -- Summon Doomguard
-        { spell = 20707, type = "ability"}, -- Soulstone
-        { spell = 29893, type = "ability"}, -- Create Soulwell
-        { spell = 48020, type = "ability", talent = 7}, -- Demonic Circle
-        { spell = 48181, type = "ability", talent = 1}, -- Haunt
-        { spell = 104773, type = "ability"}, -- Unending Resolve
-        { spell = 108416, type = "ability", talent = 15}, -- Dark Pact
-        { spell = 108503, type = "ability", talent = 18}, -- Grimoire of Sacrifice
-        { spell = 111771, type = "ability"}, -- Demonic Gateway
-        { spell = 119905, type = "ability"}, -- Cauterize Master
-        { spell = 119909, type = "ability"}, -- Whiplash
-        { spell = 119910, type = "ability"}, -- Spell Lock
-        { spell = 171140, type = "ability"}, -- Shadow Lock
-        { spell = 171152, type = "ability"}, -- Meteor Strike
-        { spell = 196098, type = "ability", talent = 12}, -- Soul Harvest
-        { spell = 205179, type = "ability", talent = 10}, -- Phantom Singularity
-        { spell = 6358, type = "ability", L["(Pet)"]}, -- Seduction
-        { spell = 17735, type = "ability", L["(Pet)"]}, -- Suffering
-        { spell = 19647, type = "ability", L["(Pet)"]}, -- Shadow Bulwark
-        { spell = 89808, type = "ability", L["(Pet)"]}, -- Singe Magic
       },
       icon = 615103
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 208822, type = "buff", unit = "player", item = 132381}, -- Streten's Sleepless Shackles
-        { spell = 217551, type = "debuff", unit = "player", item = 132357}, -- Pillars of the Dark Portal
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 242292, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-        { spell = 252938, type = "debuff", unit = "target", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 75015, type = "debuff", unit = "target", pvptalent = 18}, -- Curse of Shadows
-        { spell = 212921, type = "buff", unit = "player", pvptalent = 14}, -- Soulshatter
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2591,108 +929,34 @@ templates.class.WARLOCK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 5697, type = "buff", unit = "player" }, -- Unending Breath
-        { spell = 20707, type = "buff", unit = "group" }, -- Soulstone
-        { spell = 48018, type = "buff", unit = "player", talent = 7 }, -- Demonic Circle
-        { spell = 104773, type = "buff", unit = "player" }, -- Unending Resolve
-        { spell = 108366, type = "buff", unit = "player" }, -- Soul Leech
-        { spell = 108416, type = "buff", unit = "player", talent = 18 }, -- Dark Pact
-        { spell = 111400, type = "buff", unit = "player", talent = 17 }, -- Burning Rush
-        { spell = 119899, type = "buff", unit = "player" }, -- Cauterize Master
-        { spell = 171982, type = "buff", unit = "player", talent = 18 }, -- Demonic Synergy
-        { spell = 193440, type = "buff", unit = "player" }, -- Demonwrath
-        { spell = 196098, type = "buff", unit = "player", talent = 12 }, -- Soul Harvest
-        { spell = 196606, type = "buff", unit = "player", talent = 1 }, -- Shadowy Inspiration
-        { spell = 199281, type = "buff", unit = "player" }, -- Compound Interest
-        { spell = 205146, type = "buff", unit = "player", talent = 3 }, -- Demonic Calling
-        { spell = 216695, type = "buff", unit = "player" }, -- Tormented Souls
       },
       icon = 1378284
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 603, type = "debuff", unit = "target" }, -- Doom
-        { spell = 710, type = "debuff", unit = "multi" }, -- Banish
-        { spell = 6789, type = "debuff", unit = "target", talent = 8}, -- Mortal Coil
-        { spell = 17735, type = "debuff", unit = "target" }, -- Suffering
-        { spell = 30213, type = "debuff", unit = "target" }, -- Legion Strike
-        { spell = 30283, type = "debuff", unit = "target", talent = 9 }, -- Shadowfury
-        { spell = 89766, type = "debuff", unit = "target" }, -- Axe Toss
-        { spell = 113942, type = "debuff", unit = "player" }, -- Demonic Gateway
-        { spell = 118699, type = "debuff", unit = "target" }, -- Fear
-        { spell = 146739, type = "debuff", unit = "target" }, -- Corruption
-        { spell = 168501, type = "debuff", unit = "multi" }, -- Enslave Demon
-        { spell = 198590, type = "debuff", unit = "target" }, -- Drain Soul
-        { spell = 205181, type = "debuff", unit = "target", talent = 2 }, -- Shadowflame
       },
       icon = 136122
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 698, type = "ability"}, -- Ritual of Summoning
-        { spell = 1122, type = "ability"}, -- Summon Infernal
-        { spell = 6789, type = "ability", talent = 8}, -- Mortal Coil
-        { spell = 18540, type = "ability"}, -- Summon Doomguard
-        { spell = 20707, type = "ability"}, -- Soulstone
-        { spell = 29893, type = "ability"}, -- Create Soulwell
-        { spell = 30283, type = "ability", talent = 9}, -- Shadowfury
-        { spell = 48020, type = "ability", talent = 7}, -- Demonic Circle
-        { spell = 104316, type = "ability"}, -- Call Dreadstalkers
-        { spell = 104773, type = "ability"}, -- Unending Resolve
-        { spell = 108416, type = "ability", talent = 15}, -- Dark Pact
-        { spell = 111771, type = "ability"}, -- Demonic Gateway
-        { spell = 119905, type = "ability"}, -- Cauterize Master
-        { spell = 119909, type = "ability"}, -- Whiplash
-        { spell = 119910, type = "ability"}, -- Spell Lock
-        { spell = 119914, type = "ability"}, -- Felstorm
-        { spell = 196098, type = "ability", talent = 12}, -- Soul Harvest
-        { spell = 205180, type = "ability", talent = 19}, -- Summon Darkglare
-        { spell = 205181, type = "ability", talent = 2}, -- Shadowflame
-        { spell = 211714, type = "ability"}, -- Thal'kiel's Consumption
-        { spell = 6358, type = "ability", L["(Pet)"]}, -- Seduction
-        { spell = 17735, type = "ability", L["(Pet)"]}, -- Shadow Bulwark
-        { spell = 19647, type = "ability", L["(Pet)"]}, -- Shadow Bulwark
-        { spell = 89808, type = "ability", L["(Pet)"]}, -- Singe Magic
-        { spell = 89751, type = "ability", L["(Pet)"]}, -- Felstorm
-        { spell = 89766, type = "ability", L["(Pet)"]}, -- Axe Toss
       },
       icon = 1378282
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 208871, type = "buff", unit = "player", item = 132379, titleSuffix = L["buff"]}, -- Sin'dorei Spite
-        { spell = 242690, type = "debuff", unit = "player", item = 132379, titleSuffix = L["debuff"]}, -- Sin'dorei Spite
-        { spell = 236200, type = "buff", unit = "player", item = 144385}, -- Wakener's Loyalty
-        { spell = 217551, type = "debuff", unit = "player", item = 132357}, -- Pillars of the Dark Portal
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 257926, type = "buff", unit = "player", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 246962, type = "buff", unit = "player", titlePrefix = L["T20 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 212459, type = "ability", pvptalent = 17}, -- Call Fel Lord
-        { spell = 212619, type = "ability", pvptalent = 14}, -- Call Felhunter
-        { spell = 201996, type = "ability", pvptalent = 18}, -- Call Observer
-        { spell = 212623, type = "ability", pvptalent = 15}, -- Singe Magic
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2703,105 +967,34 @@ templates.class.WARLOCK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 126, type = "buff", unit = "player" }, -- Eye of Kilrogg
-        { spell = 5697, type = "buff", unit = "player" }, -- Unending Breath
-        { spell = 20707, type = "buff", unit = "group" }, -- Soulstone
-        { spell = 48018, type = "buff", unit = "player", talent = 7 }, -- Demonic Circle
-        { spell = 104773, type = "buff", unit = "player" }, -- Unending Resolve
-        { spell = 108366, type = "buff", unit = "player" }, -- Soul Leech
-        { spell = 108416, type = "buff", unit = "player", talent = 15 }, -- Dark Pact
-        { spell = 111400, type = "buff", unit = "player", talent = 14 }, -- Burning Rush
-        { spell = 117828, type = "buff", unit = "player", talent = 1 }, -- Backdraft
-        { spell = 196098, type = "buff", unit = "player", talent = 12 }, -- Soul Harvest
-        { spell = 196099, type = "buff", unit = "player", talent = 18 }, -- Demonic Power
-        { spell = 196304, type = "buff", unit = "player" }, -- Eternal Struggle
-        { spell = 196546, type = "buff", unit = "player" }, -- Conflagration of Chaos
-        { spell = 215165, type = "buff", unit = "player" }, -- Devourer of Life
-        { spell = 216695, type = "buff", unit = "player" }, -- Tormented Souls
-        { spell = 235156, type = "buff", unit = "player", talent = 6 }, -- Empowered Life Tap
       },
       icon = 136150
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 710, type = "debuff", unit = "multi" }, -- Banish
-        { spell = 6789, type = "debuff", unit = "target", talent = 8 }, -- Mortal Coil
-        { spell = 22703, type = "debuff", unit = "target" }, -- Infernal Awakening
-        { spell = 30283, type = "debuff", unit = "target", talent = 9 }, -- Shadowfury
-        { spell = 80240, type = "debuff", unit = "target" }, -- Havoc
-        { spell = 89766, type = "debuff", unit = "player" }, -- Axe Toss
-        { spell = 113942, type = "debuff", unit = "player" }, -- Demonic Gateway
-        { spell = 118699, type = "debuff", unit = "target" }, -- Fear
-        { spell = 146739, type = "debuff", unit = "target" }, -- Corruption
-        { spell = 157736, type = "debuff", unit = "target" }, -- Immolate
-        { spell = 168501, type = "debuff", unit = "multi" }, -- Enslave Demon
-        { spell = 196414, type = "debuff", unit = "target", talent = 10 }, -- Eradication
-        { spell = 198590, type = "debuff", unit = "target" }, -- Drain Soul
-        { spell = 226802, type = "debuff", unit = "player" }, -- Lord of Flames
       },
       icon = 135817
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 698, type = "ability"}, -- Ritual of Summoning
-        { spell = 1122, type = "ability"}, -- Summon Infernal
-        { spell = 6789, type = "ability", talent = 8}, -- Mortal Coil
-        { spell = 17962, type = "ability"}, -- Conflagrate
-        { spell = 18540, type = "ability"}, -- Summon Doomguard
-        { spell = 20707, type = "ability"}, -- Soulstone
-        { spell = 29893, type = "ability"}, -- Create Soulwell
-        { spell = 30283, type = "ability", talent = 9}, -- Shadowfury
-        { spell = 48020, type = "ability", talent = 7}, -- Demonic Circle
-        { spell = 80240, type = "ability"}, -- Havoc
-        { spell = 104773, type = "ability"}, -- Unending Resolve
-        { spell = 108416, type = "ability", talent = 15}, -- Dark Pact
-        { spell = 108503, type = "ability", talent = 18}, -- Grimoire of Sacrific
-        { spell = 111771, type = "ability"}, -- Demonic Gatewaye
-        { spell = 152108, type = "ability", talent = 10}, -- Cataclysm
-        { spell = 196098, type = "ability", talent = 12}, -- Soul Harvest
-        { spell = 196447, type = "ability", talent = 20}, -- Channel Demonfire
-        { spell = 196586, type = "ability"}, -- Dimensional Rift
-        { spell = 6358, type = "ability", L["(Pet)"]}, -- Seduction
-        { spell = 17735, type = "ability", L["(Pet)"]}, -- Shadow Bulwark
-        { spell = 19647, type = "ability", L["(Pet)"]}, -- Shadow Bulwark
-        { spell = 89808, type = "ability", L["(Pet)"]}, -- Singe Magic
       },
       icon = 135807
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 205675, type = "debuff", unit = "target", item = 132460}, -- Alythess's Pyrogenics
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208215, type = "buff", unit = "player", item = 132455}, -- Norgannon's Foresight
-        { spell = 236176, type = "buff", unit = "player", item = 144369}, -- Lessons of Space-Time
-        { spell = 217551, type = "debuff", unit = "player", item = 132357}, -- Pillars of the Dark Portal
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 253092, type = "debuff", unit = "target", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 212019, type = "buff", unit = "player", titlePrefix = L["T19 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 212269, type = "debuff", unit = "target", pvptalent = 17, titleSuffix = L["debuff"]}, -- Fel Fissure
-        { spell = 212284, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Firestone
-        { spell = 212284, type = "buff", unit = "player", pvptalent = 15, titleSuffix = L["buff"]}, -- Firestone
-        { spell = 233582, type = "debuff", unit = "target", pvptalent = 16, titleSuffix = L["buff"]}, -- Firestone
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2815,119 +1008,34 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 101643, type = "buff", unit = "player" }, -- Transcendence
-        { spell = 116841, type = "buff", unit = "player", talent = 5 }, -- Tiger's Lust
-        { spell = 116844, type = "buff", unit = "player", talent = 10 }, -- Ring of Peace
-        { spell = 116847, type = "buff", unit = "player" }, -- Rushing Jade Wind
-        { spell = 119085, type = "buff", unit = "player", talent = 4 }, -- Chi Torpedo
-        { spell = 120954, type = "buff", unit = "player" }, -- Fortifying Brew
-        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
-        { spell = 195630, type = "buff", unit = "player" }, -- Elusive Brawler
-        { spell = 196608, type = "buff", unit = "player", talent = 2 }, -- Eye of the Tiger
-        { spell = 196739, type = "buff", unit = "player", talent = 19 }, -- Elusive Dance
-        { spell = 213177, type = "buff", unit = "player" }, -- Swift as a Coursing River
-        { spell = 213341, type = "buff", unit = "player" }, -- Fortification
-        { spell = 214373, type = "buff", unit = "player" }, -- Brew-Stache
-        { spell = 215479, type = "buff", unit = "player" }, -- Ironskin Brew
-        { spell = 228563, type = "buff", unit = "player", talent = 20 }, -- Blackout Combo
-        { spell = 227678, type = "buff", unit = "player" }, -- Gifted Student
       },
       icon = 613398
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 115078, type = "debuff", unit = "multi" }, -- Paralysis
-        { spell = 116189, type = "debuff", unit = "target" }, -- Provoke
-        { spell = 117952, type = "debuff", unit = "target" }, -- Crackling Jade Lightning
-        { spell = 119381, type = "debuff", unit = "target", talent = 12 }, -- Leg Sweep
-        { spell = 121253, type = "debuff", unit = "target" }, -- Keg Smash
-        { spell = 123725, type = "debuff", unit = "target" }, -- Breath of Fire
-        { spell = 124273, type = "debuff", unit = "player" }, -- Heavy Stagger
-        { spell = 124274, type = "debuff", unit = "player" }, -- Moderate Stagger
-        { spell = 124275, type = "debuff", unit = "player" }, -- Light Stagger
-        { spell = 115069, type = "debuff", unit = "player",
-          spellIds = {124275, 124274, 124273} }, -- Any Stagger
-        { spell = 196608, type = "debuff", unit = "target", talent = 2 }, -- Eye of the Tiger
-        { spell = 196727, type = "debuff", unit = "target" }, -- Provoke
-        { spell = 213063, type = "debuff", unit = "target" }, -- Dark Side of the Moon
-        { spell = 214326, type = "debuff", unit = "target" }, -- Exploding Keg
       },
       icon = 611419
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 101643, type = "ability"}, -- Transcendence
-        { spell = 109132, type = "ability"}, -- Roll
-        { spell = 115008, type = "ability", talent = 4}, -- Chi Torpedo
-        { spell = 115078, type = "ability"}, -- Paralysis
-        { spell = 115098, type = "ability", talent = 3}, -- Chi Wave
-        { spell = 115176, type = "ability"}, -- Zen Meditation
-        { spell = 115181, type = "ability"}, -- Breath of Fire
-        { spell = 115203, type = "ability"}, -- Fortifying Brew
-        { spell = 115308, type = "ability"}, -- Ironskin Brew
-        { spell = 115315, type = "ability", talent = 11}, -- Summon Black Ox Statue
-        { spell = 115399, type = "ability", talent = 8}, -- Black Ox Brew
-        { spell = 115546, type = "ability"}, -- Provoke
-        { spell = 116705, type = "ability"}, -- Spear Hand Strike
-        { spell = 116841, type = "ability", talent = 5}, -- Tiger's Lust
-        { spell = 116844, type = "ability", talent = 10}, -- Ring of Peace
-        { spell = 116847, type = "ability", talent = 16}, -- Rushing Jade Wind
-        { spell = 119381, type = "ability", talent = 12}, -- Leg Sweep
-        { spell = 119582, type = "ability"}, -- Purifying Brew
-        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
-        { spell = 121253, type = "ability"}, -- Keg Smash
-        { spell = 122278, type = "ability"}, -- Dampen Harm
-        { spell = 122281, type = "ability", talent = 13}, -- Healing Elixir
-        { spell = 123986, type = "ability", talent = 1}, -- Chi Burst
-        { spell = 132578, type = "ability", talent = 17}, -- Invoke Niuzao, the Black Ox
-        { spell = 205523, type = "ability"}, -- Blackout Strike
-        { spell = 214326, type = "ability"}, -- Exploding Keg
-        { spell = 218164, type = "ability"}, -- Detox
       },
       icon = 133701
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 202335, type = "ability", pvptalent = 17, titleSuffix = L["cooldown"]}, -- Double Barrel
-        { spell = 202335, type = "buff", unit = "player", pvptalent = 17, titleSuffix = L["buff"]}, -- Double Barrel
-        { spell = 202346, type = "debuff", unit = "target", pvptalent = 17, titleSuffix = L["debuff"]}, -- Double Barrel
-        { spell = 202162, type = "ability", pvptalent = 13, titleSuffix = L["cooldown"]}, -- Guard
-        { spell = 202162, type = "buff", unit = "player", pvptalent = 13, titleSuffix = L["buff"]}, -- Guard
-        { spell = 202370, type = "ability", pvptalent = 18}, -- Mighty Ox Kick
-        { spell = 213658, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Craft: Nimble Brew
-        {
-          title = L["Nimble Brew Item Count"],
-          icon = "Interface\\Icons\\spell_monk_nimblebrew",
-          pvptalent = 15,
-          triggers = { [0] = { trigger = { type = "status", event = "Item Count", use_itemName = true, itemName = "137648", unevent = "auto" }}}
-        },
-        { spell = 213664, type = "buff", unit = "player", pvptalent = 15, titleSuffix = L["buff"]}, -- Nimble Brew
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -2938,119 +1046,34 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 101546, type = "buff", unit = "player" }, -- Spinning Crane Kick
-        { spell = 101643, type = "buff", unit = "player" }, -- Transcendence
-        { spell = 115175, type = "buff", unit = "player" }, -- Soothing Mist
-        { spell = 116680, type = "buff", unit = "player" }, -- Thunder Focus Tea
-        { spell = 116841, type = "buff", unit = "player", talent = 5 }, -- Tiger's Lust
-        { spell = 116844, type = "buff", unit = "player", talent = 10 }, -- Ring of Peace
-        { spell = 116849, type = "buff", unit = "group" }, -- Life Cocoon
-        { spell = 119085, type = "buff", unit = "player", talent = 4 }, -- Chi Torpedo
-        { spell = 119611, type = "buff", unit = "player" }, -- Renewing Mist
-        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
-        { spell = 122783, type = "buff", unit = "player", talent = 14 }, -- Diffuse Magic
-        { spell = 124682, type = "buff", unit = "player" }, -- Enveloping Mist
-        { spell = 191840, type = "buff", unit = "player" }, -- Essence Font
-        { spell = 196725, type = "buff", unit = "player" }, -- Refreshing Jade Wind
-        { spell = 197206, type = "buff", unit = "player" }, -- Uplifting Trance
-        { spell = 197908, type = "buff", unit = "player" }, -- Mana Tea
-        { spell = 197916, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Vivify)
-        { spell = 197919, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Enveloping Mist)
-        { spell = 198533, type = "buff", unit = "player" }, -- Soothing Mist
-        { spell = 199407, type = "buff", unit = "player" }, -- Light on Your Feet
-        { spell = 199668, type = "buff", unit = "player" }, -- Blessings of Yu'lon
-        { spell = 199888, type = "buff", unit = "player" }, -- The Mists of Sheilun
-        { spell = 202090, type = "buff", unit = "player", talent = 8 }, -- Teachings of the Monastery
-        { spell = 214478, type = "buff", unit = "player" }, -- Shroud of Mist
       },
       icon = 627487
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 115078, type = "debuff", unit = "multi" }, -- Paralysis
-        { spell = 116189, type = "debuff", unit = "target" }, -- Provoke
-        { spell = 117952, type = "debuff", unit = "target" }, -- Crackling Jade Lightning
-        { spell = 198909, type = "debuff", unit = "target", talent = 11 }, -- Song of Chi-Ji
-        { spell = 199387, type = "debuff", unit = "target" }, -- Spirit Tether
-        { spell = 214411, type = "debuff", unit = "player" }, -- Celestial Breath
       },
       icon = 629534
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 100784, type = "ability"}, -- Blackout Kick
-        { spell = 101643, type = "ability"}, -- Transcendence
-        { spell = 107428, type = "ability"}, -- Rising Sun Kick
-        { spell = 115008, type = "ability", talent = 4}, -- Chi Torpedo
-        { spell = 115078, type = "ability"}, -- Paralysis
-        { spell = 115098, type = "ability", talent = 3}, -- Chi Wave
-        { spell = 115151, type = "ability"}, -- Renewing Mist
-        { spell = 115310, type = "ability"}, -- Revival
-        { spell = 115313, type = "ability", talent = 18}, -- Summon Jade Serpent Statue
-        { spell = 115450, type = "ability"}, -- Detox
-        { spell = 115546, type = "ability"}, -- Provoke
-        { spell = 116680, type = "ability"}, -- Thunder Focus Tea
-        { spell = 116841, type = "ability", talent = 5}, -- Tiger's Lust
-        { spell = 116844, type = "ability", talent = 10}, -- Ring of Peace
-        { spell = 116849, type = "ability"}, -- Life Cocoon
-        { spell = 119381, type = "ability", talent = 12}, -- Leg Sweep
-        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
-        { spell = 122278, type = "ability", talent = 15}, -- Dampen Harm
-        { spell = 122281, type = "ability", talent = 13}, -- Healing Elixir
-        { spell = 122783, type = "ability", talent = 14}, -- Diffuse Magic
-        { spell = 123986, type = "ability", talent = 1}, -- Chi Burst
-        { spell = 124081, type = "ability", talent = 2}, -- Zen Pulse
-        { spell = 191837, type = "ability"}, -- Essence Font
-        { spell = 196725, type = "ability", talent = 16}, -- Refreshing Jade Wind
-        { spell = 197908, type = "ability", talent = 19}, -- Mana Tea
-        { spell = 197945, type = "ability", talent = 3}, -- Mistwalk
-        { spell = 198664, type = "ability", talent = 17}, -- Invoke Chi-Ji, the Red Crane
-        { spell = 198898, type = "ability", talent = 11}, -- Song of Chi-Ji
       },
       icon = 627485
     },
     [4] = {
-      title = L["Legendaries"],
-      args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 217474, type = "buff", unit = "player", item = 137045}, -- Eye of Collidus the Warp-Watcher
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
-        { spell = 216509, type = "buff", unit = "player", item = 137068, titleSuffix = L["Renewing Mist"]}, -- Leggings of The Black Flame
-        { spell = 216995, type = "buff", unit = "player", item = 137068, titleSuffix = L["Enveloping Mist"]}, -- Leggings of The Black Flame
-        { spell = 216992, type = "buff", unit = "player", item = 137068, titleSuffix = L["Effuse"]}, -- Leggings of The Black Flame
-        { spell = 217006, type = "buff", unit = "player", item = 137068, titleSuffix = L["Vivify"]}, -- Leggings of The Black Flame
-        { spell = 217000, type = "buff", unit = "player", item = 137068, titleSuffix = L["Essence Font"]}, -- Leggings of The Black Flame
-        { spell = 217642, type = "buff", unit = "target", item = 138879}, -- Ovyd's Winter Wrap
+      title = L["Azerite Traits"],
+      args = {
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 246328, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253448, type = "buff", unit = "target", titlePrefix = L["T21 2P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 201318, type = "ability", pvptalent = 11, titleSuffix = L["cooldown"]}, -- Fortifying Elixir
-        { spell = 201318, type = "buff", unit = "player", pvptalent = 11, titleSuffix = L["buff"]}, -- Fortifying Elixir
-        { spell = 201447, type = "buff", unit = "player", pvptalent = 15}, -- Ride the Wind
-        { spell = 202077, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Spinning Fire Blossom
-        { spell = 123407, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["debuff"]}, -- Spinning Fire Blossom
-        { spell = 201233, type = "buff", unit = "player", pvptalent = 10}, -- Whirling Kicks
-        { spell = 201325, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Zen Meditation
-        { spell = 201325, type = "buff", unit = "player", pvptalent = 12, titleSuffix = L["buff"]}, -- Zen Meditation
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -3061,115 +1084,34 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 101546, type = "buff", unit = "player" }, -- Spinning Crane Kick
-        { spell = 101643, type = "buff", unit = "player" }, -- Transcendence
-        { spell = 116768, type = "buff", unit = "player" }, -- Blackout Kick!
-        { spell = 116841, type = "buff", unit = "player", talent = 5 }, -- Tiger's Lust
-        { spell = 116844, type = "buff", unit = "player", talent = 10 }, -- Ring of Peace
-        { spell = 116847, type = "buff", unit = "player", talent = 16 }, -- Rushing Jade Wind
-        { spell = 119085, type = "buff", unit = "player", talent = 4 }, -- Chi Torpedo
-        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
-        { spell = 122783, type = "buff", unit = "player", talent = 14 }, -- Diffuse Magic
-        { spell = 125174, type = "buff", unit = "player" }, -- Touch of Karma
-        { spell = 129914, type = "buff", unit = "player", talent = 9 }, -- Power Strikes
-        { spell = 137639, type = "buff", unit = "player" }, -- Storm, Earth, and Fire
-        { spell = 152173, type = "buff", unit = "player", talent = 21 }, -- Serenity
-        { spell = 195312, type = "buff", unit = "player" }, -- Good Karma
-        { spell = 195321, type = "buff", unit = "player" }, -- Transfer the Power
-        { spell = 195381, type = "buff", unit = "player" }, -- Healing Winds
-        { spell = 196608, type = "buff", unit = "player", talent = 2 }, -- Eye of the Tiger
-        { spell = 196741, type = "buff", unit = "player", talent = 18 }, -- Hit Combo
       },
       icon = 611420
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 115078, type = "debuff", unit = "multi" }, -- Paralysis
-        { spell = 115080, type = "debuff", unit = "target" }, -- Touch of Death
-        { spell = 115804, type = "debuff", unit = "target" }, -- Mortal Wounds
-        { spell = 116095, type = "debuff", unit = "target" }, -- Disable
-        { spell = 116189, type = "debuff", unit = "target" }, -- Provoke
-        { spell = 117952, type = "debuff", unit = "target" }, -- Crackling Jade Lightning
-        { spell = 119381, type = "debuff", unit = "target", talent = 12 }, -- Leg Sweep
-        { spell = 122470, type = "debuff", unit = "target" }, -- Touch of Karma
-        { spell = 196608, type = "debuff", unit = "target", talent = 2 }, -- Eye of the Tiger
-        { spell = 205320, type = "debuff", unit = "target" }, -- Strike of the Windlord
       },
       icon = 629534
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 101545, type = "ability"}, -- Flying Serpent Kick
-        { spell = 101643, type = "ability"}, -- Transcendence
-        { spell = 107428, type = "ability"}, -- Rising Sun Kick
-        { spell = 109132, type = "ability"}, -- Roll
-        { spell = 113656, type = "ability"}, -- Fists of Fury
-        { spell = 115008, type = "ability", talent = 4}, -- Chi Torpedo
-        { spell = 115078, type = "ability"}, -- Paralysis
-        { spell = 115080, type = "ability"}, -- Touch of Death
-        { spell = 115098, type = "ability", talent = 3}, -- Chi Wave
-        { spell = 115288, type = "ability", talent = 7}, -- Energizing Elixir
-        { spell = 115315, type = "ability", talent = 11}, -- Summon Black Ox Statue
-        { spell = 115546, type = "ability"}, -- Provoke
-        { spell = 116705, type = "ability"}, -- Spear Hand Strike
-        { spell = 116841, type = "ability", talent = 5}, -- Tiger's Lust
-        { spell = 116844, type = "ability", talent = 10}, -- Ring of Peace
-        { spell = 116847, type = "ability", talent = 16}, -- Rushing Jade Wind
-        { spell = 119381, type = "ability", talent = 12}, -- Leg Sweep
-        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
-        { spell = 122278, type = "ability", talent = 15}, -- Dampen Harm
-        { spell = 122281, type = "ability", talent = 13}, -- Healing Elixir
-        { spell = 122470, type = "ability"}, -- Touch of Karma
-        { spell = 122783, type = "ability", talent = 14}, -- Diffuse Magic
-        { spell = 123904, type = "ability", talent = 17}, -- Invoke Xuen, the White Tiger
-        { spell = 123986, type = "ability", talent = 1}, -- Chi Burst
-        { spell = 137639, type = "ability"}, -- Storm, Earth, and Fire
-        { spell = 152173, type = "ability", talent = 21}, -- Serenity
-        { spell = 152175, type = "ability", talent = 20}, -- Whirling Dragon Punch
-        { spell = 205320, type = "ability"}, -- Strike of the Windlord
-        { spell = 218164, type = "ability"}, -- Detox
       },
       icon = 627606
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235054, type = "buff", unit = "player", item = 144239}, -- The Emperor's Capacitor
-        { spell = 213114, type = "buff", unit = "player", item = 137057}, -- Hidden Master's Forbidden Touch
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 205655, type = "buff", unit = "target", pvptalent = 15}, -- Dome of Mist
-        { spell = 216915, type = "buff", unit = "target", pvptalent = 16}, -- Fortune Turned
-        { spell = 205234, type = "ability", pvptalent = 18}, -- Fortune Turned
-        { spell = 233759, type = "ability", pvptalent = 17, titleSuffix = L["cooldown"]}, -- Grapple Weapon
-        { spell = 233759, type = "debuff", unit = "target", pvptalent = 17, titleSuffix = L["buff"]}, -- Grapple Weapon
-        { spell = 216113, type = "ability", pvptalent = 11, titleSuffix = L["cooldown"]}, -- Way of the Crane
-        { spell = 216113, type = "buff", unit = "player", pvptalent = 11, titleSuffix = L["buff"]}, -- Way of the Crane
-        { spell = 124488, type = "buff", unit = "player", pvptalent = 11, titleSuffix = L["buff"]}, -- Zen Focus
-        { spell = 195329, type = "buff", unit = "player", pvptalent = 4}, -- Defender of the Weak
-        { spell = 195488, type = "buff", unit = "player", pvptalent = 5}, -- Vim and Vigor
-        { spell = 201325, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Zen Moment
-        { spell = 201325, type = "buff", unit = "player", pvptalent = 12, titleSuffix = L["buff"]}, -- Zen Moment
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -3183,115 +1125,34 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
-        { spell = 1850, type = "buff", unit = "player" }, -- Dash
-        { spell = 5215, type = "buff", unit = "player" }, -- Prowl
-        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
-        { spell = 22812, type = "buff", unit = "player" }, -- Barkskin
-        { spell = 22842, type = "buff", unit = "player", talent = 8 }, -- Frenzied Regeneration
-        { spell = 24858, type = "buff", unit = "player" }, -- Moonkin Form
-        { spell = 29166, type = "buff", unit = "group" }, -- Innervate
-        { spell = 102560, type = "buff", unit = "player", talent = 14 }, -- Incarnation: Chosen of Elune
-        { spell = 137452, type = "buff", unit = "player", talent = 5 }, -- Displacer Beast
-        { spell = 157228, type = "buff", unit = "player"}, -- Owlkin Frenzy
-        { spell = 164545, type = "buff", unit = "player" }, -- Solar Empowerment
-        { spell = 164547, type = "buff", unit = "player" }, -- Lunar Empowerment
-        { spell = 191034, type = "buff", unit = "player" }, -- Starfall
-        { spell = 192081, type = "buff", unit = "player", talent = 8 }, -- Ironfur
-        { spell = 194223, type = "buff", unit = "player" }, -- Celestial Alignment
-        { spell = 202425, type = "buff", unit = "player", talent = 2 }, -- Warrior of Elune
-        { spell = 202461, type = "buff", unit = "player" }, -- Stellar Drift
-        { spell = 202737, type = "buff", unit = "player", talent = 18 }, -- Blessing of Elune
-        { spell = 202739, type = "buff", unit = "player", talent = 18 }, -- Blessing of An'she
-        { spell = 202770, type = "buff", unit = "player", talent = 19 }, -- Fury of Elune
-        { spell = 202942, type = "buff", unit = "player" }, -- Star Power
       },
       icon = 535045
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 339, type = "debuff", unit = "target" }, -- Entangling Roots
-        { spell = 1079, type = "debuff", unit = "target", talent = 7 }, -- Rip
-        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
-        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
-        { spell = 81261, type = "debuff", unit = "target" }, -- Solar Beam
-        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 155722, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Bleed"] }, -- Rake
-        { spell = 163505, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Stun"] }, -- Rake
-        { spell = 164812, type = "debuff", unit = "target" }, -- Moonfire
-        { spell = 164815, type = "debuff", unit = "target" }, -- Sunfire
-        { spell = 197637, type = "debuff", unit = "target" }, -- Stellar Empowerment
-        { spell = 202347, type = "debuff", unit = "target", talent = 15 }, -- Stellar Flare
-        { spell = 205644, type = "debuff", unit = "target" }, -- Force of Nature
-
       },
       icon = 236216
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 1850, type = "ability"}, -- Dash
-        { spell = 2782, type = "ability"}, -- Remove Corruption
-        { spell = 5211, type = "ability", talent = 10}, -- Mighty Bash
-        { spell = 5215, type = "ability"}, -- Prowl
-        { spell = 6795, type = "ability"}, -- Growl
-        { spell = 18562, type = "ability", talent = 9}, -- Swiftmend
-        { spell = 20484, type = "ability"}, -- Rebirth
-        { spell = 22812, type = "ability"}, -- Barkskin
-        { spell = 22842, type = "ability", talent = 8}, -- Frenzied Regeneration
-        { spell = 29166, type = "ability"}, -- Innervate
-        { spell = 33917, type = "ability", talent = 8}, -- Mangle
-        { spell = 78675, type = "ability"}, -- Solar Beam
-        { spell = 102280, type = "ability", talent = 5}, -- Displacer Beast
-        { spell = 102359, type = "ability", talent = 11}, -- Mass Entanglement
-        { spell = 102383, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 102560, type = "ability", talent = 14}, -- Incarnation: Chosen of Elune
-        { spell = 108238, type = "ability", talent = 4}, -- Renewal
-        { spell = 132469, type = "ability", talent = 12}, -- Typhoon
-        { spell = 194223, type = "ability"}, -- Celestial Alignment
-        { spell = 202359, type = "ability", talent = 17}, -- Astral Communion
-        { spell = 202360, type = "ability", talent = 18}, -- Blessing of the Ancients
-        { spell = 202425, type = "ability", talent = 2}, -- Warrior of Elune
-        { spell = 202767, type = "ability"}, -- New Moon
-        { spell = 202770, type = "ability", talent = 19}, -- Fury of Elune
-        { spell = 205636, type = "ability", talent = 1}, -- Force of Nature
       },
       icon = 136060
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208284, type = "buff", unit = "player", item = 137023}, -- Promise of Elune, the Moon Goddess
-        { spell = 209406, type = "buff", unit = "player", item = 137092}, -- Oneth's Intuition
-        { spell = 209407, type = "buff", unit = "player", item = 137092}, -- Oneth's Intuition
-        { spell = 224706, type = "buff", unit = "player", item = 137062}, -- The Emerald Dreamcatcher
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252767, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 209753, type = "ability", pvptalent = 16, titleSuffix = L["cooldown"]}, -- Cyclone
-        { spell = 209753, type = "debuff", unit = "target", pvptalent = 16, titleSuffix = L["debuff"]}, -- Cyclone
-        { spell = 209749, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Faerie Swarm
-        { spell = 209749, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["debuff"]}, -- Faerie Swarm
-        { spell = 209746, type = "buff", unit = "group", pvptalent = 15}, -- Moonkin Aura
-        { spell = 195640, type = "buff", unit = "player", pvptalent = 4}, -- Train of Thought
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources and Shapeshift Form"],
       args = {
       },
@@ -3302,121 +1163,34 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
-        { spell = 1850, type = "buff", unit = "player" }, -- Dash
-        { spell = 5215, type = "buff", unit = "player" }, -- Prowl
-        { spell = 5217, type = "buff", unit = "player" }, -- Tiger's Fury
-        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
-        { spell = 22842, type = "buff", unit = "player", talent = 8 }, -- Frenzied Regeneration
-        { spell = 52610, type = "buff", unit = "player", talent = 18 }, -- Savage Roar
-        { spell = 61336, type = "buff", unit = "player" }, -- Survival Instincts
-        { spell = 69369, type = "buff", unit = "player" }, -- Predatory Swiftness
-        { spell = 102543, type = "buff", unit = "player", talent = 14 }, -- Incarnation: King of the Jungle
-        { spell = 102547, type = "buff", unit = "player" }, -- Prowl
-        { spell = 106898, type = "buff", unit = "player" }, -- Stampeding Roar
-        { spell = 106951, type = "buff", unit = "player" }, -- Berserk
-        { spell = 135700, type = "buff", unit = "player" }, -- Clearcasting
-        { spell = 137452, type = "buff", unit = "player", talent = 5 }, -- Displacer Beast
-        { spell = 145152, type = "buff", unit = "player", talent = 20 }, -- Bloodtalons
-        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
-        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
-        { spell = 192081, type = "buff", unit = "player", talent = 8 }, -- Ironfur
-        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
-        { spell = 202737, type = "buff", unit = "player" }, -- Blessing of Elune
-        { spell = 210583, type = "buff", unit = "player" }, -- Ashamane's Energy
-        { spell = 210649, type = "buff", unit = "player" }, -- Feral Instinct
-        { spell = 210655, type = "buff", unit = "player" }, -- Protection of Ashamane
-        { spell = 210664, type = "buff", unit = "player" }, -- Scent of Blood
       },
       icon = 136170
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 339, type = "debuff", unit = "target" }, -- Entangling Roots
-        { spell = 1079, type = "debuff", unit = "target" }, -- Rip
-        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
-        { spell = 6795, type = "debuff", unit = "target" }, -- Growl
-        { spell = 50259, type = "debuff", unit = "target" }, -- Dazed
-        { spell = 58180, type = "debuff", unit = "target" }, -- Infected Wounds
-        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
-        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 106830, type = "debuff", unit = "target" }, -- Thrash
-        { spell = 155625, type = "debuff", unit = "target" }, -- Moonfire
-        { spell = 155722, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Bleed"] }, -- Rake
-        { spell = 163505, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Stun"] }, -- Rake
-        { spell = 164812, type = "debuff", unit = "target" }, -- Moonfire
-        { spell = 164815, type = "debuff", unit = "target", talent = 7 }, -- Sunfire
-        { spell = 192090, type = "debuff", unit = "target" }, -- Thrash
-        { spell = 203123, type = "debuff", unit = "target" }, -- Maim
-        { spell = 210670, type = "debuff", unit = "target" }, -- Open Wounds
-        { spell = 210705, type = "debuff", unit = "target" }, -- Ashamane's Rip
-        { spell = 210723, type = "debuff", unit = "target" }, -- Ashamane's Frenzy
       },
       icon = 132152
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 1850, type = "ability"}, -- Dash
-        { spell = 2782, type = "ability"}, -- Remove Corruption
-        { spell = 5211, type = "ability", talent = 10}, -- Mighty Bash
-        { spell = 5215, type = "ability"}, -- Prowl
-        { spell = 5217, type = "ability"}, -- Tiger's Fury
-        { spell = 6795, type = "ability"}, -- Growl
-        { spell = 18562, type = "ability", talent = 9}, -- Swiftmend
-        { spell = 20484, type = "ability"}, -- Rebirth
-        { spell = 22570, type = "ability"}, -- Maim
-        { spell = 22842, type = "ability", talent = 8}, -- Frenzied Regeneration
-        { spell = 33917, type = "ability", talent = 8}, -- Mangle
-        { spell = 49376, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 61336, type = "ability"}, -- Survival Instincts
-        { spell = 77758, type = "ability"}, -- Thrash
-        { spell = 102280, type = "ability", talent = 5}, -- Displacer Beast
-        { spell = 102359, type = "ability", talent = 11}, -- Mass Entanglement
-        { spell = 102401, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 102543, type = "ability", talent = 14}, -- Incarnation: King of the Jungle
-        { spell = 102547, type = "ability"}, -- Prowl
-        { spell = 106839, type = "ability"}, -- Skull Bash
-        { spell = 106898, type = "ability"}, -- Stampeding Roar
-        { spell = 106951, type = "ability"}, -- Berserk
-        { spell = 108238, type = "ability", talent = 4}, -- Renewal
-        { spell = 132469, type = "ability", talent = 12}, -- Typhoon
-        { spell = 197625, type = "ability", talent = 7}, -- Moonkin Form
-        { spell = 197626, type = "ability", talent = 7}, -- Starsurge
-        { spell = 202028, type = "ability", talent = 19}, -- Brutal Slash
-        { spell = 202060, type = "ability", talent = 18}, -- Elune's Guidance
-        { spell = 210722, type = "ability"}, -- Ashamane's Frenzy
       },
       icon = 236149
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 236757, type = "buff", unit = "player", item = 144354}, -- Fiery Red Maimers
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252752, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 203199, type = "buff", unit = "player", pvptalent = 15}, -- Fury Swipes
-        { spell = 202812, type = "buff", unit = "player", pvptalent = 12}, -- Primal Vitality
-        { spell = 203242, type = "ability", pvptalent = 18}, -- Rip and Tear
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources and Shapeshift Form"],
       args = {
       },
@@ -3427,118 +1201,34 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
-        { spell = 1850, type = "buff", unit = "player" }, -- Dash
-        { spell = 5215, type = "buff", unit = "player" }, -- Prowl
-        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
-        { spell = 22812, type = "buff", unit = "player" }, -- Barkskin
-        { spell = 22842, type = "buff", unit = "player" }, -- Frenzied Regeneration
-        { spell = 61336, type = "buff", unit = "player" }, -- Survival Instincts
-        { spell = 93622, type = "buff", unit = "player" }, -- Mangle!
-        { spell = 102558, type = "buff", unit = "player", talent = 14 }, -- Incarnation: Guardian of Ursoc
-        { spell = 106898, type = "buff", unit = "player" }, -- Stampeding Roar
-        { spell = 155835, type = "buff", unit = "player", talent = 2 }, -- Bristling Fur
-        { spell = 158792, type = "buff", unit = "player", talent = 21 }, -- Pulverize
-        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
-        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
-        { spell = 192081, type = "buff", unit = "player" }, -- Ironfur
-        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
-        { spell = 200851, type = "buff", unit = "player" }, -- Rage of the Sleeper
-        { spell = 201671, type = "buff", unit = "player" }, -- Gory Fur
-        { spell = 203975, type = "buff", unit = "player", talent = 16 }, -- Earthwarden
-        { spell = 200850, type = "buff", unit = "player" }, -- Adaptive Fur
-        { spell = 213680, type = "buff", unit = "player", talent = 17 }, -- Guardian of Elune
-        { spell = 213708, type = "buff", unit = "player", talent = 15 }, -- Galactic Guardian
-        { spell = 214998, type = "buff", unit = "player" }, -- Roar of the Crowd
       },
       icon = 1378702
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 99, type = "debuff", unit = "target" }, -- Incapacitating Roar
-        { spell = 339, type = "debuff", unit = "target" }, -- Entangling Roots
-        { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
-        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
-        { spell = 6795, type = "debuff", unit = "target" }, -- Growl
-        { spell = 45334, type = "debuff", unit = "target" }, -- Immobilized
-        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
-        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 155722, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Bleed"] }, -- Rake
-        { spell = 163505, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Stun"] }, -- Rake
-        { spell = 164812, type = "debuff", unit = "target", talent = 15 }, -- Moonfire
-        { spell = 164815, type = "debuff", unit = "target", talent = 7 }, -- Sunfire
-        { spell = 192090, type = "debuff", unit = "target" }, -- Thrash
-        { spell = 214995, type = "debuff", unit = "target" }, -- Bloody Paws
       },
       icon = 451161
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 99, type = "ability"}, -- Incapacitating Roar
-        { spell = 1850, type = "ability"}, -- Dash
-        { spell = 2782, type = "ability"}, -- Remove Corruption
-        { spell = 20484, type = "ability"}, -- Rebirth
-        { spell = 5211, type = "ability", talent = 10}, -- Mighty Bash
-        { spell = 5215, type = "ability"}, -- Prowl
-        { spell = 6795, type = "ability"}, -- Growl
-        { spell = 6807, type = "ability"}, -- Maul
-        { spell = 16979, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 18562, type = "ability", talent = 9}, -- Swiftmend
-        { spell = 22812, type = "ability"}, -- Barkskin
-        { spell = 33917, type = "ability"}, -- Mangle
-        { spell = 61336, type = "ability"}, -- Survival Instincts
-        { spell = 77758, type = "ability"}, -- Thrash
-        { spell = 102359, type = "ability", talent = 11}, -- Mass Entanglement
-        { spell = 102401, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 102558, type = "ability", talent = 14}, -- Incarnation: Guardian of Ursoc
-        { spell = 106839, type = "ability"}, -- Skull Bash
-        { spell = 106898, type = "ability"}, -- Stampeding Roar
-        { spell = 132469, type = "ability", talent = 12}, -- Typhoon
-        { spell = 155835, type = "ability", talent = 2}, -- Bristling Fur
-        { spell = 197626, type = "ability", talent = 7}, -- Starsurge
-        { spell = 200851, type = "ability"}, -- Rage of the Sleeper
-        { spell = 204066, type = "ability", talent = 20}, -- Lunar Beam
-        { spell = 236748, type = "ability", talent = 5}, -- Intimidating Roar
       },
       icon = 236169
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 208218, type = "buff", unit = "player", item = 137025}, -- Skysec's Hold
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
-        { spell = 236479, type = "buff", unit = "player", item = 144432}, -- Oakheart's Puny Quods
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 211160, type = "buff", unit = "player", titlePrefix = L["T19 4P Bonus - "]},
-        { spell = 253575, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 201664, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}, -- Demoralizing Roar
-        { spell = 201664, type = "debuff", unit = "target", pvptalent = 12, titleSuffix = L["debuff"]}, -- Demoralizing Roar
-        { spell = 339, type = "ability", pvptalent = 17}, -- Entangling Claws
-        { spell = 202246, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["debuff"]}, -- Overrun
-        { spell = 202246, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Overrun
-        { spell = 202043, type = "buff", unit = "player", pvptalent = 11}, -- Protector of the Pack
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources and Shapeshift Form"],
       args = {
       },
@@ -3549,122 +1239,34 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 774, type = "buff", unit = "group" }, -- Rejuvenation
-        { spell = 1850, type = "buff", unit = "player" }, -- Dash
-        { spell = 5215, type = "buff", unit = "player" }, -- Prowl
-        { spell = 8936, type = "buff", unit = "player" }, -- Regrowth
-        { spell = 16870, type = "buff", unit = "player" }, -- Clearcasting
-        { spell = 22812, type = "buff", unit = "player" }, -- Barkskin
-        { spell = 22842, type = "buff", unit = "player", talent = 9 }, -- Frenzied Regeneration
-        { spell = 29166, type = "buff", unit = "group" }, -- Innervate
-        { spell = 33763, type = "buff", unit = "group" }, -- Lifebloom
-        { spell = 33891, type = "buff", unit = "player", talent = 14 }, -- Incarnation: Tree of Life
-        { spell = 48438, type = "buff", unit = "player" }, -- Wild Growth
-        { spell = 48504, type = "buff", unit = "player" }, -- Living Seed
-        { spell = 102342, type = "buff", unit = "group" }, -- Ironbark
-        { spell = 102351, type = "buff", unit = "group", talent = 2 }, -- Cenarion Ward
-        { spell = 114108, type = "buff", unit = "player" }, -- Soul of the Forest
-        { spell = 117679, type = "buff", unit = "player", talent = 16 }, -- Incarnation
-        { spell = 137452, type = "buff", unit = "player", talent = 5 }, -- Displacer Beast
-        { spell = 155777, type = "buff", unit = "group", talent = 18 }, -- Rejuvenation (Germination)
-        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
-        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
-        { spell = 186370, type = "buff", unit = "player" }, -- Mark of Shifting
-        { spell = 189877, type = "buff", unit = "player" }, -- Power of the Archdruid
-        { spell = 192081, type = "buff", unit = "player", talent = 9 }, -- Ironfur
-        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
-        { spell = 200389, type = "buff", unit = "group", talent = 15 }, -- Cultivation
-        { spell = 207386, type = "buff", unit = "group", talent = 16 }, -- Spring Blossoms
-        { spell = 207640, type = "buff", unit = "player", talent = 3 }, -- Abundance
-        { spell = 208253, type = "buff", unit = "group" }, -- Essence of G'Hanir
       },
       icon = 136081
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 339, type = "debuff", unit = "target" }, -- Entangling Roots
-        { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
-        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
-        { spell = 6795, type = "debuff", unit = "target" }, -- Growl
-        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
-        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 127797, type = "debuff", unit = "target" }, -- Ursol's Vortex
-        { spell = 155722, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Bleed"] }, -- Rake
-        { spell = 163505, type = "debuff", unit = "target", fullscan = "true", titleSuffix = L["Stun"] }, -- Rake
-        { spell = 164812, type = "debuff", unit = "target" }, -- Moonfire
-        { spell = 164815, type = "debuff", unit = "target" }, -- Sunfire
-        { spell = 192090, type = "debuff", unit = "target" }, -- Thrash
       },
       icon = 236216
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 740, type = "ability"}, -- Tranquility
-        { spell = 1850, type = "ability"}, -- Dash
-        { spell = 2782, type = "ability"}, -- Remove Corruption
-        { spell = 5211, type = "ability", talent = 10}, -- Mighty Bash
-        { spell = 5215, type = "ability"}, -- Prowl
-        { spell = 6795, type = "ability"}, -- Growl
-        { spell = 16979, type = "ability"}, -- Wild Charge
-        { spell = 18562, type = "ability"}, -- Swiftmend
-        { spell = 20484, type = "ability"}, -- Rebirth
-        { spell = 22812, type = "ability"}, -- Barkskin
-        { spell = 29166, type = "ability"}, -- Innervate
-        { spell = 33891, type = "ability", talent = 14}, -- Incarnation: Tree of Life
-        { spell = 33917, type = "ability", talent = 9}, -- Mangle
-        { spell = 48438, type = "ability"}, -- Wild Growth
-        { spell = 77758, type = "ability"}, -- Thrash
-        { spell = 88423, type = "ability"}, -- Nature's Cure
-        { spell = 102280, type = "ability", talent = 5}, -- Displacer Beast
-        { spell = 102342, type = "ability"}, -- Ironbark
-        { spell = 102351, type = "ability"}, -- Cenarion Ward
-        { spell = 102359, type = "ability", talent = 11}, -- Mass Entanglement
-        { spell = 102383, type = "ability", talent = 6}, -- Wild Charge
-        { spell = 102793, type = "ability"}, -- Ursol's Vortex
-        { spell = 108238, type = "ability", talent = 4}, -- Renewal
-        { spell = 132469, type = "ability", talent = 12}, -- Typhoon
-        { spell = 197626, type = "ability", talent = 7}, -- Starsurge
-        { spell = 197721, type = "ability", talent = 21}, -- Flourish
-        { spell = 208253, type = "ability"}, -- Essence of G'Hanir
       },
       icon = 236153
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret#
-        { spell = 235966, type = "buff", unit = "player", item = 144258, titleSuffix = L["buff"]}, -- Velen's Future Sight
-        { spell = 144258, type = "item", titleSuffix = L["cooldown"]}, -- Velen's Future Sight
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 253432, type = "buff", unit = "target", titlePrefix = L["T21 2P Bonus - "]},
-        { spell = 253434, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 33786, type = "ability", pvptalent = 10, titleSuffix = L["cooldown"]}, -- Cyclone
-        { spell = 33786, type = "debuff", unit = "target", pvptalent = 10, titleSuffix = L["debuff"]}, -- Cyclone
-        { spell = 200947, type = "debuff", unit = "target", pvptalent = 11}, -- Encroaching Vines
-        { spell = 203554, type = "buff", unit = "target", pvptalent = 16}, -- Focused Growth
-        { spell = 203651, type = "ability", pvptalent = 18}, -- Overgrowth
-        { spell = 203727, type = "ability", pvptalent = 8, titleSuffix = L["cooldown"]}, -- Thorns
-        { spell = 203727, type = "debuff", unit = "target", pvptalent = 8, titleSuffix = L["buff"]}, -- Thorns
-        { spell = 195329, type = "buff", unit = "player", pvptalent = 4}, -- Defender of the Weak
-        { spell = 195488, type = "buff", unit = "player", pvptalent = 5}, -- Vim and Vigor
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources and Shapeshift Form"],
       args = {
       },
@@ -3678,90 +1280,34 @@ templates.class.DEMONHUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 131347, type = "buff", unit = "player" }, -- Glide
-        { spell = 162264, type = "buff", unit = "player" }, -- Metamorphosis
-        { spell = 188499, type = "buff", unit = "player" }, -- Blade Dance
-        { spell = 188501, type = "buff", unit = "player" }, -- Spectral Sight
-        { spell = 196555, type = "buff", unit = "player" }, -- Netherwalk
-        { spell = 203650, type = "buff", unit = "player" }, -- Prepared
-        { spell = 208614, type = "buff", unit = "player", talent = 15 }, -- Nemesis
-        { spell = 208628, type = "buff", unit = "player", talent = 13 }, -- Momentum
-        { spell = 209426, type = "buff", unit = "player" }, -- Darkness
-        { spell = 210152, type = "buff", unit = "player" }, -- Death Sweep
-        { spell = 211048, type = "buff", unit = "player" }, -- Chaos Blades
-        { spell = 211053, type = "buff", unit = "player" }, -- Fel Barrage
-        { spell = 212800, type = "buff", unit = "player" }, -- Blur
       },
       icon = 1247266
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 179057, type = "debuff", unit = "target" }, -- Chaos Nova
-        { spell = 198813, type = "debuff", unit = "target" }, -- Vengeful Retreat
-        { spell = 200166, type = "debuff", unit = "target" }, -- Metamorphosis
-        { spell = 202443, type = "debuff", unit = "target" }, -- Anguish
-        { spell = 206491, type = "debuff", unit = "target", talent = 15 }, -- Nemesis
-        { spell = 207690, type = "debuff", unit = "target" }, -- Bloodlet
-        { spell = 211053, type = "debuff", unit = "target" }, -- Fel Barrage
-        { spell = 217832, type = "debuff", unit = "multi" }, -- Imprison
-        { spell = 211881, type = "debuff", unit = "target" }, -- Fel Eruption
       },
       icon = 1392554
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 179057, type = "ability"}, -- Chaos Nova
-        { spell = 183752, type = "ability"}, -- Consume Magic
-        { spell = 185123, type = "ability"}, -- Throw Glaive
-        { spell = 188499, type = "ability"}, -- Blade Dance
-        { spell = 188501, type = "ability"}, -- Spectral Sight
-        { spell = 191427, type = "ability"}, -- Metamorphosis
-        { spell = 195072, type = "ability"}, -- Fel Rush
-        { spell = 196555, type = "ability", talent = 8}, -- Netherwalk
-        { spell = 196718, type = "ability"}, -- Darkness
-        { spell = 198013, type = "ability"}, -- Eye Beam
-        { spell = 198589, type = "ability"}, -- Blur
-        { spell = 198793, type = "ability"}, -- Vengeful Retreat
-        { spell = 201467, type = "ability"}, -- Fury of the Illidari
-        { spell = 206491, type = "ability", talent = 15}, -- Nemesis
-        { spell = 210152, type = "ability"}, -- Death Sweep
-        { spell = 211048, type = "ability", talent = 19}, -- Chaos Blades
-        { spell = 211053, type = "ability", talent = 20}, -- Fel Barrage
-        { spell = 211881, type = "ability", talent = 14}, -- Fel Eruption
-        { spell = 213241, type = "ability", talent = 7}, -- Felblade
-        { spell = 217832, type = "ability"}, -- Imprison
       },
       icon = 1305156
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 216758, type = "buff", unit = "player", item = 137014}, -- Achor, the Eternal Hunger
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 252165, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 203704, type = "ability", pvptalent = 18}, -- Mana Break
-        { spell = 206803, type = "ability", pvptalent = 17}, -- Rain from Above
-        { spell = 235903, type = "ability", pvptalent = 14}, -- Mana Rift
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -3772,98 +1318,34 @@ templates.class.DEMONHUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 131347, type = "buff", unit = "player" }, -- Glide
-        { spell = 178740, type = "buff", unit = "player" }, -- Immolation Aura
-        { spell = 187827, type = "buff", unit = "player" }, -- Metamorphosis
-        { spell = 188501, type = "buff", unit = "player" }, -- Spectral Sight
-        { spell = 203819, type = "buff", unit = "player" }, -- Demon Spikes
-        { spell = 203981, type = "buff", unit = "player" }, -- Soul Fragments
-        { spell = 207709, type = "buff", unit = "player", talent = 17 }, -- Blade Turning
-        { spell = 209426, type = "buff", unit = "player" }, -- Darkness
-        { spell = 212988, type = "buff", unit = "player" }, -- Painbringer
-        { spell = 218256, type = "buff", unit = "player" }, -- Empower Wards
-        { spell = 227225, type = "buff", unit = "player" }, -- Soul Barrier
-        { spell = 227330, type = "buff", unit = "player", talent = 9 }, -- Gluttony
       },
       icon = 1247263
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 185245, type = "debuff", unit = "target" }, -- Torment
-        { spell = 204490, type = "debuff", unit = "target" }, -- Sigil of Silence
-        { spell = 204598, type = "debuff", unit = "target" }, -- Sigil of Flame
-        { spell = 204843, type = "debuff", unit = "target" }, -- Sigil of Chains
-        { spell = 207407, type = "debuff", unit = "target" }, -- Soul Carver
-        { spell = 207685, type = "debuff", unit = "target" }, -- Sigil of Misery
-        { spell = 207744, type = "debuff", unit = "target" }, -- Fiery Brand
-        { spell = 209261, type = "debuff", unit = "player", talent = 19 }, -- Uncontained Fel
-        { spell = 210003, type = "debuff", unit = "target", talent = 3 }, -- Razor Spikes
-        { spell = 211881, type = "debuff", unit = "target", talent = 14 }, -- Fel Eruption
-        { spell = 217832, type = "debuff", unit = "multi" }, -- Imprison
-        { spell = 212818, type = "debuff", unit = "target" }, -- Fiery Demise
-        { spell = 224509, type = "debuff", unit = "target" }, -- Frailty
       },
       icon = 1344647
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 178740, type = "ability"}, -- Immolation Aura
-        { spell = 183752, type = "ability"}, -- Consume Magic
-        { spell = 185245, type = "ability"}, -- Torment
-        { spell = 187827, type = "ability"}, -- Metamorphosis
-        { spell = 188501, type = "ability"}, -- Spectral Sight
-        { spell = 196718, type = "ability"}, -- Darkness
-        { spell = 202137, type = "ability"}, -- Sigil of Silence
-        { spell = 202138, type = "ability"}, -- Sigil of Chains
-        { spell = 203720, type = "ability"}, -- Demon Spikes
-        { spell = 204021, type = "ability"}, -- Fiery Brand
-        { spell = 204157, type = "ability"}, -- Throw Glaive
-        { spell = 204596, type = "ability"}, -- Sigil of Flame
-        { spell = 207407, type = "ability"}, -- Soul Carver
-        { spell = 207684, type = "ability"}, -- Sigil of Misery
-        { spell = 211881, type = "ability", talent = 14}, -- Fel Eruption
-        { spell = 212084, type = "ability", talent = 16}, -- Fel Devastation
-        { spell = 213241, type = "ability", talent = 7}, -- Felblade
-        { spell = 217832, type = "ability"}, -- Imprison
-        { spell = 218256, type = "ability"}, -- Empower Wards
-        { spell = 227225, type = "ability", talent = 21}, -- Soul Barrier
-        { spell = 236189, type = "ability", talent = 20}, -- Demonic Infusion
       },
       icon = 1344650
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
-        { spell = 235543, type = "buff", unit = "player", item = 144292}, -- Spirit of the Darkness Flame
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 205629, type = "ability", pvptalent = 17}, -- Demonic Trample
-        { spell = 208769, type = "buff", unit = "player", pvptalent = 13}, -- Everlasting Hunt
-        { spell = 205630, type = "ability", pvptalent = 18, titleSuffix = L["cooldown"]}, -- Illidan's Grasp
-        { spell = 205630, type = "debuff", unit = "target", pvptalent = 18, titleSuffix = L["buff"]}, -- Illidan's Grasp
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -3877,110 +1359,34 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 3714, type = "buff", unit = "player" }, -- Path of Frost
-        { spell = 48707, type = "buff", unit = "player" }, -- Anti-Magic Shell
-        { spell = 48792, type = "buff", unit = "player" }, -- Icebound Fortitude
-        { spell = 53365, type = "buff", unit = "player" }, -- Unholy Strength
-        { spell = 55233, type = "buff", unit = "player" }, -- Vampiric Blood
-        { spell = 77535, type = "buff", unit = "player" }, -- Blood Shield
-        { spell = 81141, type = "buff", unit = "player" }, -- Crimson Scourge
-        { spell = 81256, type = "buff", unit = "player" }, -- Dancing Rune Weapon
-        { spell = 188290, type = "buff", unit = "player" }, -- Death and Decay
-        { spell = 193320, type = "buff", unit = "player", fullscan = true }, -- Umbilicus Eternus
-        { spell = 194679, type = "buff", unit = "player" }, -- Rune Tap
-        { spell = 194844, type = "buff", unit = "player" }, -- Bonestorm
-        { spell = 195181, type = "buff", unit = "player" }, -- Bone Shield
-        { spell = 205725, type = "buff", unit = "player" }, -- Anti-Magic Barrier
-        { spell = 206977, type = "buff", unit = "player" }, -- Blood Mirror
-        { spell = 212552, type = "buff", unit = "player" }, -- Wraith Walk
-        { spell = 219788, type = "buff", unit = "player", talent = 7 }, -- Ossuary
-        { spell = 219809, type = "buff", unit = "player" }, -- Tombstone
       },
       icon = 237517
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 51399, type = "debuff", unit = "target" }, -- Death Grip
-        { spell = 51714, type = "debuff", unit = "target" }, -- Razorice
-        { spell = 55078, type = "debuff", unit = "target" }, -- Blood Plague
-        { spell = 56222, type = "debuff", unit = "target" }, -- Dark Command
-        { spell = 111673, type = "debuff", unit = "multi"}, -- Control Undead
-        { spell = 114556, type = "debuff", unit = "player", talent = 21 }, -- Purgatory
-        { spell = 193261, type = "debuff", unit = "target" }, -- Bleeding Profusely
-        { spell = 206930, type = "debuff", unit = "target" }, -- Heart Strike
-        { spell = 206931, type = "debuff", unit = "target", talent = 3 }, -- Blooddrinker
-        { spell = 206940, type = "debuff", unit = "target", talent = 10 }, -- Mark of Blood
-        { spell = 206961, type = "debuff", unit = "target", talent = 14 }, -- Tremble Before Me
-        { spell = 206977, type = "debuff", unit = "target", talent = 20 }, -- Blood Mirror
-        { spell = 221562, type = "debuff", unit = "target" }, -- Asphyxiate
       },
       icon = 237514
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 3714, type = "ability"}, -- Path of Frost
-        { spell = 43265, type = "ability"}, -- Death and Decay
-        { spell = 47528, type = "ability"}, -- Mind Freeze
-        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
-        { spell = 48792, type = "ability"}, -- Icebound Fortitude
-        { spell = 49028, type = "ability"}, -- Dancing Rune Weapon
-        { spell = 49576, type = "ability"}, -- Death Grip
-        { spell = 50842, type = "ability"}, -- Blood Boil
-        { spell = 55233, type = "ability"}, -- Vampiric Blood
-        { spell = 56222, type = "ability"}, -- Dark Command
-        { spell = 61999, type = "ability"}, -- Raise Ally
-        { spell = 108199, type = "ability"}, -- Gorefiend's Grasp
-        { spell = 111673, type = "ability"}, -- Control Undead
-        { spell = 194679, type = "ability", talent = 17}, -- Rune Tap
-        { spell = 194844, type = "ability", talent = 19}, -- Bonestorm
-        { spell = 195182, type = "ability"}, -- Marrowrend
-        { spell = 195292, type = "ability"}, -- Death's Caress
-        { spell = 205223, type = "ability"}, -- Consumption
-        { spell = 206930, type = "ability"}, -- Heart Strike
-        { spell = 206931, type = "ability", talent = 3}, -- Blooddrinker
-        { spell = 206977, type = "ability", talent = 20}, -- Blood Mirror
-        { spell = 212552, type = "ability"}, -- Wraith Walk
-        { spell = 219809, type = "ability", talent = 12}, -- Tombstone
-        { spell = 221562, type = "ability"}, -- Asphyxiate
-        { spell = 221699, type = "ability"}, -- Blood Tap
       },
       icon = 136120
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235559, type = "buff", unit = "player", item = 144281}, -- Skullflower's Haemostasis
-        { spell = 235169, type = "buff", unit = "player", item = 144249, titleSuffix = L["buff"]}, -- Archimonde's Hatred Reborn
-        { spell = 144249, type = "item", titleSuffix = L["cooldown"]}, -- Archimonde's Hatred Reborn
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-        { spell = 242010, type = "buff", unit = "player", titlePrefix = L["T20 2P Bonus - "]},
-        { spell = 253381, type = "buff", unit = "player", titlePrefix = L["T21 4P Bonus - "]},
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 203173, type = "buff", unit = "player", pvptalent = 18}, -- Death Chain
-        { spell = 47476, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Strangulate
-        { spell = 47476, type = "debuff", unit = "target", pvptalent = 15, titleSuffix = L["buff"]}, -- Strangulate
-        { spell = 212610, type = "debuff", unit = "target", pvptalent = 14}, -- Walking Dead
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Murderous Intent
-        { spell = 195336, type = "buff", unit = "player", pvptalent = 4}, -- Relentless Assault
-        { spell = 206891, type = "debuff", unit = "target", pvptalent = 5}, -- Intimated
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -3991,101 +1397,34 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 3714, type = "buff", unit = "player" }, -- Path of Frost
-        { spell = 48707, type = "buff", unit = "player" }, -- Anti-Magic Shell
-        { spell = 48792, type = "buff", unit = "player" }, -- Icebound Fortitude
-        { spell = 51124, type = "buff", unit = "player" }, -- Killing Machine
-        { spell = 51271, type = "buff", unit = "player" }, -- Pillar of Frost
-        { spell = 53365, type = "buff", unit = "player" }, -- Unholy Strength
-        { spell = 59052, type = "buff", unit = "player" }, -- Rime
-        { spell = 152279, type = "buff", unit = "player", talent = 20 }, -- Breath of Sindragosa
-        { spell = 194879, type = "buff", unit = "player", talent = 2 }, -- Icy Talons
-        { spell = 178819, type = "buff", unit = "player" }, -- Dark Succor
-        { spell = 196770, type = "buff", unit = "player" }, -- Remorseless Winter
-        { spell = 204957, type = "buff", unit = "player" }, -- Frozen Soul
-        { spell = 207127, type = "buff", unit = "player", talent = 8 }, -- Hungering Rune Weapon
-        { spell = 207203, type = "buff", unit = "player", talent = 14 }, -- Frost Shield
-        { spell = 207256, type = "buff", unit = "player", talent = 19 }, -- Obliteration
-        { spell = 211805, type = "buff", unit = "player", talent = 18 }, -- Gathering Storm
-        { spell = 212552, type = "buff", unit = "player" }, -- Wraith Walk
       },
       icon = 135305
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 45524, type = "debuff", unit = "target" }, -- Chains of Ice
-        { spell = 51399, type = "debuff", unit = "target" }, -- Death Grip
-        { spell = 51714, type = "debuff", unit = "target" }, -- Razorice
-        { spell = 55095, type = "debuff", unit = "target" }, -- Frost Fever
-        { spell = 56222, type = "debuff", unit = "target" }, -- Dark Command
-        { spell = 111673, type = "debuff", unit = "multi"}, -- Control Undead
-        { spell = 190780, type = "debuff", unit = "target" }, -- Frost Breath
-        { spell = 207165, type = "debuff", unit = "target", talent = 10 }, -- Abomination's Might
-        { spell = 207167, type = "debuff", unit = "target", talent = 11 }, -- Blinding Sleet
-        { spell = 207171, type = "debuff", unit = "target" }, -- Winter is Coming
-        { spell = 211793, type = "debuff", unit = "target" }, -- Remorseless Winter
-        { spell = 211794, type = "debuff", unit = "target", talent = 12 }, -- Winter is Coming
-        { spell = 212764, type = "debuff", unit = "target", talent = 15 }, -- White Walker
       },
       icon = 237522
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 3714, type = "ability"}, -- Path of Frost
-        { spell = 45524, type = "ability"}, -- Chains of Ice
-        { spell = 47528, type = "ability"}, -- Mind Freeze
-        { spell = 47568, type = "ability"}, -- Empower Rune Weapon
-        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
-        { spell = 48792, type = "ability"}, -- Icebound Fortitude
-        { spell = 49020, type = "ability", talent = 1}, -- Obliterate
-        { spell = 49184, type = "ability"}, -- Howling Blast
-        { spell = 49576, type = "ability"}, -- Death Grip
-        { spell = 51271, type = "ability"}, -- Pillar of Frost
-        { spell = 56222, type = "ability"}, -- Dark Command
-        { spell = 57330, type = "ability", talent = 6}, -- Horn of Winter
-        { spell = 61999, type = "ability"}, -- Raise Ally
-        { spell = 111673, type = "ability"}, -- Control Undead
-        { spell = 152279, type = "ability", talent = 20}, -- Breath of Sindragosa
-        { spell = 190778, type = "ability"}, -- Sindragosa's Fury
-        { spell = 194913, type = "ability", talent = 21}, -- Glacial Advance
-        { spell = 196770, type = "ability"}, -- Remorseless Winter
-        { spell = 207127, type = "ability", talent = 8}, -- Hungering Rune Weapon
-        { spell = 207167, type = "ability", talent = 11}, -- Blinding Sleet
-        { spell = 207230, type = "ability", talent = 16}, -- Frostscythe
-        { spell = 207256, type = "ability", talent = 19}, -- Obliteration
-        { spell = 212552, type = "ability"}, -- Wraith Walk
       },
       icon = 135372
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235599, type = "buff", unit = "player", item = 151796, titleSuffix = L["buff"]}, -- Cold Heart
-        { spell = 248406, type = "debuff", unit = "target", item = 151796, titleSuffix = L["debuff"]}, -- Cold Heart
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 204160, type = "ability", pvptalent = 18}, -- Chill Streak
-        { spell = 222178, type = "buff", unit = "player", pvptalent = 15}, -- Delirium
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -4096,110 +1435,34 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 3714, type = "buff", unit = "player" }, -- Path of Frost
-        { spell = 42650, type = "buff", unit = "player" }, -- Army of the Dead
-        { spell = 48707, type = "buff", unit = "player" }, -- Anti-Magic Shell
-        { spell = 48792, type = "buff", unit = "player" }, -- Icebound Fortitude
-        { spell = 51460, type = "buff", unit = "player" }, -- Runic Corruption
-        { spell = 53365, type = "buff", unit = "player" }, -- Unholy Strength
-        { spell = 81340, type = "buff", unit = "player" }, -- Sudden Doom
-        { spell = 178819, type = "buff", unit = "player" }, -- Dark Succor
-        { spell = 188290, type = "buff", unit = "player" }, -- Death and Decay
-        { spell = 194918, type = "buff", unit = "player" }, -- Blighted Rune Weapon
-        { spell = 207290, type = "buff", unit = "player", talent = 7 }, -- Unholy Frenzy
-        { spell = 207319, type = "buff", unit = "player", talent = 14 }, -- Corpse Shield
-        { spell = 212552, type = "buff", unit = "player" }, -- Wraith Walk
-        { spell = 215711, type = "buff", unit = "player", talent = 21 }, -- Soul Reaper
-        { spell = 216974, type = "buff", unit = "player" }, -- Necrosis
-        { spell = 218100, type = "buff", unit = "player", talent = 20 }, -- Defile
       },
       icon = 136181
     },
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 45524, type = "debuff", unit = "target" }, -- Chains of Ice
-        { spell = 51399, type = "debuff", unit = "target" }, -- Death Grip
-        { spell = 51714, type = "debuff", unit = "target" }, -- Razorice
-        { spell = 56222, type = "debuff", unit = "target" }, -- Dark Command
-        { spell = 91800, type = "debuff", unit = "target" }, -- Gnaw
-        { spell = 111673, type = "debuff", unit = "multi"}, -- Control Undead
-        { spell = 130736, type = "debuff", unit = "target", talent = 21 }, -- Soul Reaper
-        { spell = 156004, type = "debuff", unit = "target", talent = 20 }, -- Defile
-        { spell = 191587, type = "debuff", unit = "target" }, -- Virulent Plague
-        { spell = 191748, type = "debuff", unit = "target" }, -- Scourge of Worlds
-        { spell = 194310, type = "debuff", unit = "target" }, -- Festering Wound
-        { spell = 196782, type = "debuff", unit = "target" }, -- Outbreak
-        { spell = 208278, type = "debuff", unit = "target", talent = 12 }, -- Debilitating Infestation
-        { spell = 212332, type = "debuff", unit = "target" }, -- Smash
-        { spell = 221562, type = "debuff", unit = "target", talent = 11 }, -- Asphyxiate
       },
       icon = 1129420
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-        { spell = 3714, type = "ability"}, -- Path of Frost
-        { spell = 42650, type = "ability"}, -- Army of the Dead
-        { spell = 43265, type = "ability"}, -- Death and Decay
-        { spell = 45524, type = "ability"}, -- Chains of Ice
-        { spell = 46584, type = "ability"}, -- Raise Dead
-        { spell = 47528, type = "ability"}, -- Mind Freeze
-        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
-        { spell = 48792, type = "ability"}, -- Icebound Fortitude
-        { spell = 49206, type = "ability"}, -- Summon Gargoyle
-        { spell = 49576, type = "ability"}, -- Death Grip
-        { spell = 55090, type = "ability"}, -- Scourge Strike
-        { spell = 56222, type = "ability"}, -- Dark Command
-        { spell = 61999, type = "ability"}, -- Raise Ally
-        { spell = 63560, type = "ability"}, -- Dark Transformation
-        { spell = 77575, type = "ability"}, -- Outbreak
-        { spell = 85948, type = "ability"}, -- Festering Strike
-        { spell = 111673, type = "ability"}, -- Control Undead
-        { spell = 130736, type = "ability", talent = 21}, -- Soul Reaper
-        { spell = 152280, type = "ability", talent = 20}, -- Defile
-        { spell = 194918, type = "ability"}, -- Blighted Rune Weapon
-        { spell = 207311, type = "ability"}, -- Clawing Shadows
-        { spell = 207317, type = "ability", talent = 4}, -- Epidemic
-        { spell = 207319, type = "ability"}, -- Corpse Shield
-        { spell = 207349, type = "ability", talent = 19}, -- Dark Arbiter
-        { spell = 212552, type = "ability"}, -- Wraith Walk
-        { spell = 220143, type = "ability"}, -- Apocalypse
-        { spell = 221562, type = "ability", talent = 11}, -- Asphyxiate
-        { spell = 47482, type = "ability", titleSuffix = L["(Pet)"]}, -- Leap
-        { spell = 47484, type = "ability", titleSuffix = L["(Pet)"]}, -- Huddle
       },
       icon = 136144
     },
     [4] = {
-      title = L["Legendaries"],
+      title = L["Azerite Traits"],
       args = {
-        { spell = 207472, type = "buff", unit = "player", item = 132444}, -- Prydaz, Xavaric's Magnum Opus
-        { spell = 208052, type = "buff", unit = "player", item = 132452}, -- Sephuz's Secret
-        { spell = 235599, type = "buff", unit = "player", item = 151796, titleSuffix = L["buff"]}, -- Cold Heart
-        { spell = 248406, type = "debuff", unit = "target", item = 151796, titleSuffix = L["debuff"]}, -- Cold Heart
-        { spell = 144259, type = "item", titleSuffix = L["cooldown"]}, -- Kil'Jaeden's Burning Wish
       },
       icon = 135349
     },
     [5] = {
-      title = L["Set Bonus"],
-      args = {
-
-      },
-      icon = 136031
-    },
-    [6] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 204160, type = "ability", pvptalent = 18}, -- Necrotic Strike
-        { spell = 223929, type = "debuff", unit = "target", pvptalent = 18}, -- Necrotic Strike
-        { spell = 210128, type = "ability", pvptalent = 17}, -- Reanimation
-        { spell = 199725, type = "ability", pvptalent = 15, titleSuffix = L["cooldown"]}, -- Wandering Plague
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
-    [7] = {
+    [6] = {
       title = L["Resources"],
       args = {
       },
@@ -4239,190 +1502,38 @@ tinsert(templates.general.args, {
 
 tinsert(templates.general.args, { spell = 2825, type = "buff", unit = "player",
   overideTitle = L["Bloodlust/Heroism"],
-  spellIds = {2825, 32182, 80353, 90355, 160452} }
-);
-
-tinsert(templates.general.args, { spell = 243096, type = "buff", unit = "player",
-  overideTitle = L["Concordance of the Legionfall"],
-  spellIds = {243096, 242583, 242584, 242586} }
+  spellIds = {2825, 32182, 80353, 90355, 160452} } -- TODO 8.0
 );
 
 -- Items section
 templates.items[1] = {
-  title = L["Pantheon Trinkets"],
+  title = L["Enchants"], -- TODO
   args = {
-    { spell = 256816, type = "buff", unit = "player"},
-    { spell = 256818, type = "buff", unit = "player"},
-    { spell = 256826, type = "buff", unit = "player"},
-    { spell = 256828, type = "buff", unit = "player"},
-
-    { spell = 256831, type = "buff", unit = "player", titleSuffix = L["Secondary Effect"]},
-    { spell = 256832, type = "buff", unit = "player", titleSuffix = L["Secondary Effect"]},
-    { spell = 256833, type = "buff", unit = "player", titleSuffix = L["Secondary Effect"]},
-    { spell = 256835, type = "buff", unit = "player", titleSuffix = L["Secondary Effect"]},
-    { spell = 256836, type = "buff", unit = "player", titleSuffix = L["Secondary Effect"]},
-
-    { spell = 257475, type = "buff", unit = "player", titleSuffix = L["Shaman"]},
-    { spell = 257470, type = "buff", unit = "player", titleSuffix = L["Druid"]},
-    { spell = 257471, type = "buff", unit = "player", titleSuffix = L["Monk"]},
-    { spell = 257472, type = "buff", unit = "player", titleSuffix = L["Paladin"]},
-    { spell = 257473, type = "buff", unit = "player", titleSuffix = L["Discipline Priest"]},
-    { spell = 257474, type = "buff", unit = "player", titleSuffix = L["Holy Priest"]},
-    { spell = 257444, type = "buff", unit = "target", titleSuffix = L["Absorb Shield"]},
-
   }
 }
 
 templates.items[2] = {
-  title = L["Netherlight Crucible"],
-  args = {
-    { spell = 252907, type = "debuff", unit = "target"},
-    { spell = 252208, type = "buff", unit = "player"},
-    { spell = 253216, type = "buff", unit = "player"},
-    { spell = 253072, type = "buff", unit = "player"},
-    { spell = 252921, type = "debuff", unit = "target"},
-  }
-}
-
-
-templates.items[3] = {
-  title = L["Enchants"],
-  args = {
-    { spell = 190909, type = "buff", unit = "player"}, -- Mark of the Claw
-    { spell = 228399, type = "buff", unit = "player"}, -- Mark of the Heavy Hide
-  }
-}
-
-templates.items[4] = {
   title = L["Tank Trinkets"],
   args = {
-    -- T19
-    { spell = 140789, type = "item"},
-    { spell = 140797, type = "item"},
-    { spell = 140807, type = "item"},
-    { spell = 139327, type = "item"},
-    { spell = 221695, type = "buff", unit = "player", titleItemPrefix = 139327},
-    { spell = 222209, type = "debuff", unit = "target", titleItemPrefix = 139335},
-    { spell = 222479, type = "buff", unit = "player", titleItemPrefix = 138225},
-    { spell = 225033, type = "buff", unit = "player", titleItemPrefix = 140789},
-    { spell = 225130, type = "buff", unit = "player", titleItemPrefix = 140797},
-    { spell = 225720, type = "buff", unit = "player", titleItemPrefix = 140791},
-    { spell = 225140, type = "buff", unit = "player", titleItemPrefix = 140807},
-    -- T20
-    { spell = 242609, type = "buff", unit = "player", titleItemPrefix = 147024},
-    { spell = 242209, type = "buff", unit = "player", titleItemPrefix = 147022},
-    { spell = 242630, type = "buff", unit = "player", titleItemPrefix = 147026},
-    { spell = 242617, type = "buff", unit = "player", titleItemPrefix = 147025},
-    { spell = 242536, type = "debuff", unit = "target", titleItemPrefix = 147023},
-    -- T21
-    { spell = 251940, type = "debuff", unit = "target", titleItemPrefix = 151977},
-    { spell = 251941, type = "buff", unit = "player", titleItemPrefix = 151977},
-    { spell = 251938, type = "buff", unit = "player", titleItemPrefix = 151976},
-    { spell = 252545, type = "buff", unit = "player", titleItemPrefix = 151976},
-    { spell = 252550, type = "buff", unit = "player", titleItemPrefix = 151976},
-
-    { spell = 251946, type = "buff", unit = "player", titleItemPrefix = 151978},
-    { spell = 251952, type = "buff", unit = "player", titleItemPrefix = 151975},
-
   }
 }
 
-templates.items[5] = {
+templates.items[3] = {
   title = L["Damage Trinkets"],
   args = {
-    -- T19
-    { spell = 139320, type = "item"},
-    { spell = 139326, type = "item"},
-    { spell = 140799, type = "item"},
-    { spell = 140800, type = "item"},
-    { spell = 140808, type = "item"},
-    { spell = 141584, type = "item"},
-    { spell = 222705, type = "debuff", unit = "target", titleItemPrefix = 139336},
-    { spell = 222046, type = "buff", unit = "player", titleItemPrefix = 139326},
-    { spell = 221767, type = "debuff", unit = "target", titleItemPrefix = 139328},
-    { spell = 227869, type = "debuff", unit = "target", titleItemPrefix = 141585},
-    { spell = 221786, type = "buff", unit = "player", titleItemPrefix = 139329},
-    { spell = 221812, type = "debuff", unit = "target", titleItemPrefix = 139321},
-    { spell = 222166, type = "buff", unit = "player", titleItemPrefix = 139325},
-    { spell = 225141, type = "buff", unit = "player", titleItemPrefix = 140808},
-    { spell = 225719, type = "buff", unit = "player", titleItemPrefix = 140792},
-    { spell = 225731, type = "buff", unit = "target", titleItemPrefix = 140798},
-    { spell = 225736, type = "buff", unit = "player", titleItemPrefix = 140802},
-    { spell = 225774, type = "buff", unit = "player", titleItemPrefix = 140809},
-    -- T20
-    { spell = 243644, type = "buff", unit = "player", titleItemPrefix = 147018},
-    { spell = 242570, type = "buff", unit = "player", titleItemPrefix = 147017},
-    -- T21
-    { spell = 253327, type = "buff", unit = "player", titleItemPrefix = 152093},
-    { spell = 253308, type = "buff", unit = "player", titleItemPrefix = 151968},
-    { spell = 253307, type = "buff", unit = "player", titleItemPrefix = 151968},
-    { spell = 253261, type = "buff", unit = "player", titleItemPrefix = 151955},
-    { spell = 255742, type = "buff", unit = "player", titleItemPrefix = 151955},
-    { spell = 255744, type = "buff", unit = "player", titleItemPrefix = 151955},
-    { spell = 253258, type = "buff", unit = "player", titleItemPrefix = 151970},
-    { spell = 255870, type = "debuff", unit = "target", titleItemPrefix = 151971},
-    { spell = 255856, type = "buff", unit = "player", titleItemPrefix = 151971},
-    { spell = 253260, type = "buff", unit = "player", titleItemPrefix = 151955},
   }
 }
 
-templates.items[6] = {
+templates.items[4] = {
   title = L["Healer Trinkets"],
   args = {
-    -- T19
-    { spell = 139322, type = "item"},
-    { spell = 140793, type = "item"},
-    { spell = 139333, type = "item"},
-    { spell = 221748, type = "buff", unit = "player", titleItemPrefix = 139330},
-    { spell = 225723, type = "buff", unit = "player", titleItemPrefix = 140793},
-    { spell = 225724, type = "buff", unit = "player", titleItemPrefix = 140795},
-    { spell = 225766, type = "buff", unit = "player", titleItemPrefix = 140805},
-    { spell = 221873, type = "buff", unit = "target", titleItemPrefix = 138222},
-    { spell = 221837, type = "buff", unit = "target", titleItemPrefix = 139322},
-    -- T20
-    { spell = 242619, type = "buff", unit = "target", titleItemPrefix = 147006},
-    { spell = 242458, type = "buff", unit = "target", titleItemPrefix = 147002},
-    -- T21
-    { spell = 253277, type = "buff", unit = "target", titleItemPrefix = 151957},
-    { spell = 253287, type = "buff", unit = "target", titleItemPrefix = 152289},
-    { spell = 253284, type = "debuff", unit = "target", titleItemPrefix = 151960},
-    { spell = 253269, type = "buff", unit = "player", titleItemPrefix = 151956},
-    { spell = 253258, type = "buff", unit = "player", titleItemPrefix = 151970},
   }
 }
 
 
-templates.items[7] = {
-  title = L["PVP Set"],
-  args = {
-    { spell = 165638, type = "buff", unit = "player", titlePrefix = L["Warrior 2P Bonus - "]},
-    { spell = 166062, type = "buff", unit = "player", titlePrefix = L["Death Knight Unholy 4P Bonus - "]},
-    { spell = 166021, type = "buff", unit = "player", titlePrefix = L["Death Knight 2P Bonus - "]},
-    { spell = 171380, type = "buff", unit = "player", titlePrefix = L["Warlock Affliction 4P/Demonology 2P Bonus - "]},
-    { spell = 181744, type = "buff", unit = "player", titlePrefix = L["Monk Windwalker 4P Bonus - "]},
-    { spell = 170882, type = "buff", unit = "player", titlePrefix = L["Rogue Assassination/Outlaw 4P Bonus - "]},
-    { spell = 170879, type = "buff", unit = "player", titlePrefix = L["Rogue Subtlety 4P Bonus - "]},
-    { spell = 165909, type = "debuff", unit = "target", titlePrefix = L["Paladin Protection 2P Bonus - "]},
-    { spell = 165889, type = "debuff", unit = "target", titlePrefix = L["Paladin Retribution 2P Bonus - "]},
-    { spell = 171114, type = "buff", unit = "player", titlePrefix = L["Shaman Enhancement 2P Bonus - "]},
-    { spell = 166100, type = "buff", unit = "player", titlePrefix = L["Shaman Elemental 4P Bonus - "]},
-  }
-}
-
-templates.items[8] = {
+templates.items[5] = {
   title = L["PVP Trinkets"],
   args = {
-    { spell = 136146, type = "item"}, -- Vindictive Gladiator's Emblem of Cruelty
-    { spell = 136147, type = "item"}, -- Vindictive Gladiator's Emblem of Tenacity
-    { spell = 136148, type = "item"}, -- Vindictive Gladiator's Emblem of Meditation
-    { spell = 136149, type = "item"}, -- Vindictive Gladiator's Badge of Dominance
-    { spell = 136152, type = "item"}, -- Vindictive Gladiator's Badge of Victory
-    { spell = 136155, type = "item"}, -- Vindictive Gladiator's Badge of Adaptation
-    { spell = 136256, type = "item"}, -- Vindictive Gladiator's Badge of Conquest
-    { spell = 190028, type = "buff", unit = "player"},
-    { spell = 190029, type = "buff", unit = "player"},
-    { spell = 190030, type = "buff", unit = "player"},
-    { spell = 170397, type = "buff", unit = "player"},
   }
 }
 
@@ -4454,99 +1565,12 @@ end
 
 for _, class in pairs(templates.class) do
   for _, spec in pairs(class) do
-    tinsert(spec[6].args, { spell = 195710, type = "ability"}) -- Honorable Medallion
-    tinsert(spec[6].args, { spell = 208683, type = "ability", pvptalent = 1}) -- Gladiator's Medallion
+    -- TODO 8.0
+    -- tinsert(spec[5].args, { spell = 195710, type = "ability"}) -- Honorable Medallion
+    -- tinsert(spec[5].args, { spell = 208683, type = "ability", pvptalent = 1}) -- Gladiator's Medallion
   end
 end
 
--- Death Knight
-for i = 1, 3 do
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 213726, type = "debuff", unit = "player", pvptalent = 7}); -- Cadaverous Pallor
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 77606, type = "ability", pvptalent = 8, titleSuffix = L["cooldown"]}); -- Dark Simulacrum
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 77606, type = "debuff", unit = "target", pvptalent = 8, titleSuffix = L["buff"]}); -- Dark Simulacrum
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 51052, type = "ability", pvptalent = 9}); -- Anti Magic Zone
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 199720, type = "debuff", unit = "target", pvptalent = 10}); -- Decomposing Aura
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 199719, type = "debuff", unit = "target", pvptalent = 11}); -- Hearthstop Aura
-  tinsert(templates.class.DEATHKNIGHT[i][6].args, { spell = 199642, type = "debuff", unit = "target", pvptalent = 12}); -- Necrotic Aura
-end
-
--- Demon Hunter
-for i = 1, 2 do
-  tinsert(templates.class.DEMONHUNTER[i][6].args, { spell = 206649, type = "debuff", unit = "target", pvptalent = 12, titleSuffix = L["debuff"]}); -- Eye of Leotheras
-  tinsert(templates.class.DEMONHUNTER[i][6].args, { spell = 206649, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}); -- Eye of Leotheras
-  tinsert(templates.class.DEMONHUNTER[i][6].args, { spell = 205604, type = "ability", pvptalent = 11, titleSuffix = L["cooldown"]}); -- Reverse Magic
-end
-
--- Druid
-for i = 1, 4 do
-  tinsert(templates.class.DRUID[i][6].args, { spell = 209731, type = "buff", unit = "player", pvptalent = 7}); -- Protector of the Grove
-end
-
--- Hunter
-for i = 1, 3 do
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 202627, type = "buff", unit = "player", pvptalent = 8}); -- Catlike Reflexes
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 202900, type = "debuff", unit = "target", pvptalent = 11}); -- Scorpid Sting
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 202914, type = "debuff", unit = "target", pvptalent = 12, titleSuffix = L["debuff"]}); -- Spider Sting
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 202914, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}); -- Spider Sting
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 202797, type = "debuff", unit = "target", pvptalent = 10}); -- Viper Sting
-  tinsert(templates.class.HUNTER[i][6].args, { spell = 195638, type = "buff", unit = "player", pvptalent = 4}); -- Focused Fire
-end
-
--- Mage
-for i = 1, 3 do
-  tinsert(templates.class.MAGE[i][6].args, { spell = 221404, type = "buff", unit = "player", pvptalent = 8}); -- Burning Determination
-  tinsert(templates.class.MAGE[i][6].args, { spell = 198065, type = "buff", unit = "player", pvptalent = 9}); -- Prismatic Cloak
-  tinsert(templates.class.MAGE[i][6].args, { spell = 198111, type = "ability", pvptalent = 10, titleSuffix = L["cooldown"]}); -- Temporal Shield
-  tinsert(templates.class.MAGE[i][6].args, { spell = 198111, type = "buff", unit = "player", pvptalent = 10, titleSuffix = L["buff"]}); -- Temporal Shield
-  tinsert(templates.class.MAGE[i][6].args, { spell = 195640, type = "buff", unit = "player", pvptalent = 4}); -- Train of Thought
-end
-
--- Monk
-for i = 1, 3 do
-  tinsert(templates.class.MAGE[i][6].args, { spell = 201198, type = "buff", unit = "player", pvptalent = 9}); -- Fast Feet
-end
-
--- Rogue
-for i = 1, 3 do
-  tinsert(templates.class.ROGUE[i][6].args, { spell = 198027, type = "buff", unit = "player", pvptalent = 10}); -- Turn the Tables
-  tinsert(templates.class.ROGUE[i][6].args, { spell = 209417, type = "buff", unit = "player", pvptalent = 12}); -- Unfair Advantage
-  tinsert(templates.class.ROGUE[i][6].args, { spell = 197023, type = "buff", unit = "player", pvptalent = 9}); -- Cutting to the Chase
-end
-
--- Shaman
-for i = 1, 3 do
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 204330, type = "ability", pvptalent = 7, titleSuffix = L["cooldown"]}); -- Skyfury Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 208963, type = "buff", unit = "player", pvptalent = 7, titleSuffix = L["buff"]}); -- Skyfury Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 204331, type = "ability", pvptalent = 8, titleSuffix = L["cooldown"]}); -- Counterstrike Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 208997, type = "debuff", unit = "target", pvptalent = 8, titleSuffix = L["debuff"]}); -- Counterstrike Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 204332, type = "ability", pvptalent = 9, titleSuffix = L["cooldown"]}); -- Windfury Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 78158, type = "buff", unit = "player", pvptalent = 9, titleSuffix = L["buff"]}); -- Windfury Totem
-  tinsert(templates.class.SHAMAN[i][6].args, { spell = 204262, type = "buff", unit = "player", pvptalent = 11}); -- Spectral Recovery
-  tinsert(templates.class.SHAMAN[i][6].args, {spell = 204330, type = "totem", pvptalent = 7, titleSuffix = L["Totem"]}); -- Skyfury Totem
-  tinsert(templates.class.SHAMAN[i][6].args, {spell = 204331, type = "totem", pvptalent = 8, titleSuffix = L["Totem"]}); -- Counterstrike Totem
-  tinsert(templates.class.SHAMAN[i][6].args, {spell = 204332, type = "totem", pvptalent = 9, titleSuffix = L["Totem"]}); -- Windfury Totem
-end
-
--- Warlock
-for i = 1, 3 do
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199890, type = "ability", pvptalent = 7, titleSuffix = L["cooldown"]}); -- Curse of Tongues
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199890, type = "debuff", unit = "multi", pvptalent = 7, titleSuffix = L["debuff"]}); -- Curse of Tongues
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199892, type = "ability", pvptalent = 8, titleSuffix = L["cooldown"]}); -- Curse of Weakness
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199892, type = "debuff", unit = "multi", pvptalent = 8, titleSuffix = L["debuff"]}); -- Curse of Weakness
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199954, type = "ability", pvptalent = 9, titleSuffix = L["cooldown"]}); -- Curse of Fragility
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 199954, type = "debuff", unit = "multi", pvptalent = 9, titleSuffix = L["debuff"]}); -- Curse of Fragility
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 221703, type = "ability", pvptalent = 11, titleSuffix = L["cooldown"]}); -- Casting Circle
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 221705, type = "buff", unit = "player", pvptalent = 11, titleSuffix = L["buff"]}); -- Casting Circle
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 212295, type = "ability", pvptalent = 12, titleSuffix = L["cooldown"]}); -- Nether Ward
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 212295, type = "buff", unit = "player", pvptalent = 12, titleSuffix = L["buff"]}); -- Nether Ward
-  tinsert(templates.class.WARLOCK[i][6].args, { spell = 195640, type = "buff", unit = "player", pvptalent = 4}); -- Train of Thought
-end
-
--- Warrior
-for i = 1, 3 do
-  tinsert(templates.class.WARRIOR[i][6].args, { spell = 216890, type = "ability", pvptalent = 11, titleSuffix = L["cooldown"]}); -- Spell Reflection
-  tinsert(templates.class.WARRIOR[i][6].args, { spell = 216890, type = "buff", unit = "player", pvptalent = 11, titleSuffix = L["buff"]}); -- Spell Reflection
-end
 
 ------------------------------
 -- Hardcoded trigger templates
@@ -4554,128 +1578,83 @@ end
 
 -- Warrior
 for i = 1, 3 do
-  tinsert(templates.class.WARRIOR[i][7].args, createSimplePowerTemplate(1));
+  tinsert(templates.class.WARRIOR[i][6].args, createSimplePowerTemplate(1));
 end
 
 -- Paladin
-tinsert(templates.class.PALADIN[3][7].args, createSimplePowerTemplate(9));
+tinsert(templates.class.PALADIN[3][6].args, createSimplePowerTemplate(9));
 for i = 1, 3 do
-  tinsert(templates.class.PALADIN[i][7].args, createSimplePowerTemplate(0));
+  tinsert(templates.class.PALADIN[i][6].args, createSimplePowerTemplate(0));
 end
 
 -- Hunter
 for i = 1, 3 do
-  tinsert(templates.class.HUNTER[i][7].args, createSimplePowerTemplate(2));
+  tinsert(templates.class.HUNTER[i][6].args, createSimplePowerTemplate(2));
 end
 
 -- Rogue
 for i = 1, 3 do
-  tinsert(templates.class.ROGUE[i][7].args, createSimplePowerTemplate(3));
-  tinsert(templates.class.ROGUE[i][7].args, createSimplePowerTemplate(4));
+  tinsert(templates.class.ROGUE[i][6].args, createSimplePowerTemplate(3));
+  tinsert(templates.class.ROGUE[i][6].args, createSimplePowerTemplate(4));
 end
 
 -- Priest
 for i = 1, 3 do
-  tinsert(templates.class.PRIEST[i][7].args, createSimplePowerTemplate(0));
+  tinsert(templates.class.PRIEST[i][6].args, createSimplePowerTemplate(0));
 end
-tinsert(templates.class.PRIEST[3][7].args, createSimplePowerTemplate(13));
+tinsert(templates.class.PRIEST[3][6].args, createSimplePowerTemplate(13));
 
 -- Shaman
 for i = 1, 3 do
-  tinsert(templates.class.SHAMAN[i][7].args, createSimplePowerTemplate(0));
+  tinsert(templates.class.SHAMAN[i][6].args, createSimplePowerTemplate(0));
 
-  templates.class.SHAMAN[i][8] = {
+  templates.class.SHAMAN[i][7] = {
     title = L["Totems"],
     args = {
-      {spell = 226772, type = "totem", talent = 3}, -- Totem Mastery
-      {spell = 192078, type = "totem", talent = 6}, -- Wind Rush Totem
-      {spell = 192058, type = "totem", talent = 7}, -- Lightning Surge
-      {spell = 51485, type = "totem", talent = 8}, -- Earthgrab Totem
-      {spell = 196935, type = "totem", talent = 9}, -- Voodoo Totem
-      {spell = 192223, type = "totem", talent = 21}, -- Liquid Magma Totem
     },
     icon = 538575,
   };
 end
 
 for i = 1, 2 do
-  tinsert(templates.class.SHAMAN[i][7].args, createSimplePowerTemplate(11));
+  tinsert(templates.class.SHAMAN[i][6].args, createSimplePowerTemplate(11));
 end
 
 -- Mage
-tinsert(templates.class.MAGE[1][7].args, createSimplePowerTemplate(16));
+tinsert(templates.class.MAGE[1][6].args, createSimplePowerTemplate(16));
 for i = 1, 3 do
-  tinsert(templates.class.MAGE[i][7].args, createSimplePowerTemplate(0));
-end
-
-local runeOfPower =
-  {
-    title = GetSpellInfo(116011),
-    icon = select(3, GetSpellInfo(116011)),
-    talent = 8,
-    triggers = {
-      [0] = {
-        trigger = {
-          type = "status",
-          event = "Totem",
-          use_totemType = true,
-          totemType = 1,
-          unevent = "auto"
-        }
-      },
-      [1] = {
-        trigger = {
-          type = "aura",
-          spellIds = { 116014 },
-          unit = "player",
-          use_unit = true,
-          debuffType = "HELPFUL",
-          unevent = "auto",
-          ownOnly = true
-        }
-      }
-    },
-    disjunctive = "all"
-  }
-
-for i = 1, 3 do
-  local tmpTable = {};
-  WeakAuras.DeepCopy(runeOfPower, tmpTable);
-  tinsert(templates.class.MAGE[i][1].args, tmpTable);
+  tinsert(templates.class.MAGE[i][6].args, createSimplePowerTemplate(0));
 end
 
 -- Warlock
 for i = 1, 3 do
-  tinsert(templates.class.WARLOCK[i][7].args, createSimplePowerTemplate(0));
-  tinsert(templates.class.WARLOCK[i][7].args, createSimplePowerTemplate(7));
+  tinsert(templates.class.WARLOCK[i][6].args, createSimplePowerTemplate(0));
+  tinsert(templates.class.WARLOCK[i][6].args, createSimplePowerTemplate(7));
 end
 
 -- Monk
-tinsert(templates.class.MONK[1][7].args, createSimplePowerTemplate(3));
-tinsert(templates.class.MONK[2][7].args, createSimplePowerTemplate(0));
-tinsert(templates.class.MONK[3][7].args, createSimplePowerTemplate(3));
-tinsert(templates.class.MONK[3][7].args, createSimplePowerTemplate(12));
+tinsert(templates.class.MONK[1][6].args, createSimplePowerTemplate(3));
+tinsert(templates.class.MONK[2][6].args, createSimplePowerTemplate(0));
+tinsert(templates.class.MONK[3][6].args, createSimplePowerTemplate(3));
+tinsert(templates.class.MONK[3][6].args, createSimplePowerTemplate(12));
 
-templates.class.MONK[1][8] = {
+templates.class.MONK[1][7] = {
   title = L["Ability Charges"],
   args = {
-    { spell = 115072, type = "ability", showOn = "showAlways"}, -- Expel Harm
   },
   icon = 627486,
 };
 
-templates.class.MONK[2][8] = {
+templates.class.MONK[2][7] = {
   title = L["Ability Charges"],
   args = {
-    { spell = 205406, type = "ability", showOn = "showAlways"}, -- Sheilun's Gift
   },
   icon = 1242282,
 };
 
-templates.class.MONK[3][8] = {
+templates.class.MONK[3][7] = {
   title = L["Ability Charges"],
   args = {
-    { spell = 101546, type = "ability", showOn = "showAlways"}, -- Spinning Crane Kick
   },
   icon = 606543,
 };
@@ -4683,7 +1662,7 @@ templates.class.MONK[3][8] = {
 -- Druid
 for i = 1, 4 do
   -- Shapeshift Form
-  tinsert(templates.class.DRUID[i][7].args, {
+  tinsert(templates.class.DRUID[i][6].args, {
     title = L["Shapeshift Form"],
     icon = 132276,
     triggers = {[0] = { trigger = { type = "status", event = "Stance/Form/Aura", unevent = "auto"}}}
@@ -4691,27 +1670,24 @@ for i = 1, 4 do
 end
 
 -- Astral Power
-tinsert(templates.class.DRUID[1][7].args, createSimplePowerTemplate(8));
+tinsert(templates.class.DRUID[1][6].args, createSimplePowerTemplate(8));
 
 for i = 1, 4 do
-  tinsert(templates.class.DRUID[i][7].args, createSimplePowerTemplate(0)); -- Mana
-  tinsert(templates.class.DRUID[i][7].args, createSimplePowerTemplate(1)); -- Rage
-  tinsert(templates.class.DRUID[i][7].args, createSimplePowerTemplate(3)); -- Energy
-  tinsert(templates.class.DRUID[i][7].args, createSimplePowerTemplate(4)); -- Combo Points
+  tinsert(templates.class.DRUID[i][6].args, createSimplePowerTemplate(0)); -- Mana
+  tinsert(templates.class.DRUID[i][6].args, createSimplePowerTemplate(1)); -- Rage
+  tinsert(templates.class.DRUID[i][6].args, createSimplePowerTemplate(3)); -- Energy
+  tinsert(templates.class.DRUID[i][6].args, createSimplePowerTemplate(4)); -- Combo Points
 end
 
--- Efflorescence aka Mushroom
-tinsert(templates.class.DRUID[4][3].args,  {spell = 145205, type = "totem"});
-
 -- Demon Hunter
-tinsert(templates.class.DEMONHUNTER[1][7].args, createSimplePowerTemplate(17));
-tinsert(templates.class.DEMONHUNTER[2][7].args, createSimplePowerTemplate(18));
+tinsert(templates.class.DEMONHUNTER[1][6].args, createSimplePowerTemplate(17));
+tinsert(templates.class.DEMONHUNTER[2][6].args, createSimplePowerTemplate(18));
 
 -- Death Knight
 for i = 1, 3 do
-  tinsert(templates.class.DEATHKNIGHT[i][7].args, createSimplePowerTemplate(6));
+  tinsert(templates.class.DEATHKNIGHT[i][6].args, createSimplePowerTemplate(6));
 
-  tinsert(templates.class.DEATHKNIGHT[i][7].args, {
+  tinsert(templates.class.DEATHKNIGHT[i][6].args, {
     title = L["Runes"],
     icon = "Interface\\Icons\\spell_deathknight_frozenruneweapon",
     triggers = {[0] = { trigger = { type = "status", event = "Death Knight Rune", unevent = "auto"}}}

From 5298245ee1c82b81f791890ef12a218bf9fee1a9 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 27 Apr 2018 01:39:39 +0200
Subject: [PATCH 29/82] update changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7acc7c3b1c..5356087d71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
 # WeakAuras 2
 
-## [8.0-beta1-1-g288247e](https://github.com/WeakAuras/WeakAuras2/tree/288247e82309412dfdbf33639028f7c48f4867bc) (2018-04-25)
+## [8.0-beta3-1-g40e68ad](https://github.com/WeakAuras/WeakAuras2/tree/40e68adfe6b2167196b2754d5dc00e91a30d306c) (2018-04-27)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta1...288247e82309412dfdbf33639028f7c48f4867bc)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta3...40e68adfe6b2167196b2754d5dc00e91a30d306c)
 
 Benjamin Staneck (1):
 
-- no longer pull in LRC as long as we ship a fork
+- update changelog
 

From 90146d48b81a25bcdabdcb09b908192662495654 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Fri, 27 Apr 2018 17:58:12 +0200
Subject: [PATCH 30/82] Also force trigger state updater triggers

---
 WeakAuras/GenericTrigger.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 0d137a9259..18575c5c16 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -914,7 +914,7 @@ function GenericTrigger.Add(data, region)
                 xpcall(frame.RegisterEvent, trueFunction, frame, event);
                 aceEvents:RegisterMessage(event, HandleEvent, frame)
               end
-              force_events = trigger.custom_type == "status";
+              force_events = trigger.custom_type == "status" or trigger.custom_type == "stateupdate";
             end
           end
           if (trigger.custom_type == "stateupdate") then

From b2328aae24faca5fc98f28eb207c4ed436de6d97 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Fri, 27 Apr 2018 18:05:18 +0200
Subject: [PATCH 31/82] Replace pcalls with xpcalls everywhere where user code
 is called

Ensures that the eror dialog is shown.
---
 WeakAuras/GenericTrigger.lua      | 24 ++++++++++++------------
 WeakAuras/RegionTypes/AuraBar.lua |  2 +-
 WeakAuras/RegionTypes/Icon.lua    |  2 +-
 WeakAuras/RegionTypes/Text.lua    |  2 +-
 WeakAuras/Transmission.lua        |  2 +-
 WeakAuras/WeakAuras.lua           | 16 ++++++++--------
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 18575c5c16..81ab0329da 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -323,7 +323,7 @@ local function RunOverlayFuncs(event, state)
   for i, overlayFunc in ipairs(event.overlayFuncs) do
     state.additionalProgress[i] = state.additionalProgress[i] or {};
     local additionalProgress = state.additionalProgress[i];
-    local ok, a, b, c = pcall(overlayFunc, event.trigger, state);
+    local ok, a, b, c = xpcall(overlayFunc, geterrorhandler(), event.trigger, state);
     if (not ok) then
       additionalProgress.min = nil;
       additionalProgress.max = nil;
@@ -505,12 +505,12 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
   if(data.triggerFunc) then
     local untriggerCheck = false;
     if (data.statesParameter == "full") then
-      local ok, returnValue = pcall(data.triggerFunc, allStates, event, arg1, arg2, ...);
+      local ok, returnValue = xpcall(data.triggerFunc, geterrorhandler(), allStates, event, arg1, arg2, ...);
       if (ok and returnValue) then
         updateTriggerState = true;
       end
     elseif (data.statesParameter == "all") then
-      local ok, returnValue = pcall(data.triggerFunc, allStates, event, arg1, arg2, ...);
+      local ok, returnValue = xpcall(data.triggerFunc, geterrorhandler(), allStates, event, arg1, arg2, ...);
       if( (ok and returnValue) or optionsEvent) then
         for id, state in pairs(allStates) do
           if (state.changed) then
@@ -525,7 +525,7 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
     elseif (data.statesParameter == "one") then
       allStates[""] = allStates[""] or {};
       local state = allStates[""];
-      local ok, returnValue = pcall(data.triggerFunc, state, event, arg1, arg2, ...);
+      local ok, returnValue = xpcall(data.triggerFunc, geterrorhandler(), state, event, arg1, arg2, ...);
       if( (ok and returnValue) or optionsEvent) then
         if(WeakAuras.ActivateEvent(id, triggernum, data, state)) then
           updateTriggerState = true;
@@ -534,7 +534,7 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
         untriggerCheck = true;
       end
     else
-      local ok, returnValue = pcall(data.triggerFunc, event, arg1, arg2, ...);
+      local ok, returnValue = xpcall(data.triggerFunc, geterrorhandler(), event, arg1, arg2, ...);
       if( (ok and returnValue) or optionsEvent) then
         allStates[""] = allStates[""] or {};
         local state = allStates[""];
@@ -548,7 +548,7 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
     if (untriggerCheck and not optionsEvent) then
       if (data.statesParameter == "all") then
         if(data.untriggerFunc) then
-          local ok, returnValue = pcall(data.untriggerFunc, allStates, event, arg1, arg2, ...);
+          local ok, returnValue = xpcall(data.untriggerFunc, geterrorhandler(), allStates, event, arg1, arg2, ...);
           if(ok and returnValue) then
             for id, state in pairs(allStates) do
               if (state.changed) then
@@ -563,7 +563,7 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
         allStates[""] = allStates[""] or {};
         local state = allStates[""];
         if(data.untriggerFunc) then
-          local ok, returnValue = pcall(data.untriggerFunc, state, event, arg1, arg2, ...);
+          local ok, returnValue = xpcall(data.untriggerFunc, geterrorhandler(), state, event, arg1, arg2, ...);
           if (ok and returnValue) then
             if (WeakAuras.EndEvent(id, triggernum, nil, state)) then
               updateTriggerState = true;
@@ -572,7 +572,7 @@ local function RunTriggerFunc(allStates, data, id, triggernum, event, arg1, arg2
         end
       else
         if(data.untriggerFunc) then
-          local ok, returnValue = pcall(data.untriggerFunc, event, arg1, arg2, ...);
+          local ok, returnValue = xpcall(data.untriggerFunc, geterrorhandler(), event, arg1, arg2, ...);
           if(ok and returnValue) then
             allStates[""] = allStates[""] or {};
             local state = allStates[""];
@@ -2856,16 +2856,16 @@ function GenericTrigger.CreateFallbackState(data, triggernum, state)
 
   WeakAuras.ActivateAuraEnvironment(data.id, "", state);
   if (event.nameFunc) then
-    local ok, name = pcall(event.nameFunc, data.trigger);
+    local ok, name = xpcall(event.nameFunc, geterrorhandler(), data.trigger);
     state.name = ok and name or nil;
   end
   if (event.iconFunc) then
-    local ok, icon = pcall(event.iconFunc, data.trigger);
+    local ok, icon = xpcall(event.iconFunc, geterrorhandler(), data.trigger);
     state.icon = ok and icon or nil;
   end
 
   if (event.textureFunc ) then
-    local ok, texture = pcall(event.textureFunc, data.trigger);
+    local ok, texture = xpcall(event.textureFunc, geterrorhandler(), data.trigger);
     state.texture = ok and texture or nil;
   end
 
@@ -2875,7 +2875,7 @@ function GenericTrigger.CreateFallbackState(data, triggernum, state)
   end
 
   if (event.durationFunc) then
-    local ok, arg1, arg2, arg3, inverse = pcall(event.durationFunc, data.trigger);
+    local ok, arg1, arg2, arg3, inverse = xpcall(event.durationFunc, geterrorhandler(), data.trigger);
     if (not ok) then
       state.progressType = "timed";
       state.duration = 0;
diff --git a/WeakAuras/RegionTypes/AuraBar.lua b/WeakAuras/RegionTypes/AuraBar.lua
index 84261c547a..297bdb128d 100644
--- a/WeakAuras/RegionTypes/AuraBar.lua
+++ b/WeakAuras/RegionTypes/AuraBar.lua
@@ -1275,7 +1275,7 @@ local function modify(parent, region, data)
     region.UpdateCustomText = function()
       -- Evaluate and update text
       WeakAuras.ActivateAuraEnvironment(region.id, region.cloneId, region.state);
-      local ok, custom = pcall(customTextFunc, region.expirationTime, region.duration,
+      local ok, custom = xpcall(customTextFunc, geterrorhandler(), region.expirationTime, region.duration,
         values.progress, values.duration, values.name, values.icon, values.stacks);
       if (not ok) then
         custom = "";
diff --git a/WeakAuras/RegionTypes/Icon.lua b/WeakAuras/RegionTypes/Icon.lua
index 70443c6483..172935a629 100644
--- a/WeakAuras/RegionTypes/Icon.lua
+++ b/WeakAuras/RegionTypes/Icon.lua
@@ -394,7 +394,7 @@ local function modify(parent, region, data)
     local values = region.values;
     region.UpdateCustomText = function()
       WeakAuras.ActivateAuraEnvironment(region.id, region.cloneId, region.state);
-      local ok, custom = pcall(customTextFunc, region.expirationTime, region.duration,
+      local ok, custom = xpcall(customTextFunc, geterrorhandler(), region.expirationTime, region.duration,
         values.progress, values.duration, values.name, values.icon, values.stacks);
       if (not ok) then
         custom = "";
diff --git a/WeakAuras/RegionTypes/Text.lua b/WeakAuras/RegionTypes/Text.lua
index eab2eb90dd..3107b4c593 100644
--- a/WeakAuras/RegionTypes/Text.lua
+++ b/WeakAuras/RegionTypes/Text.lua
@@ -167,7 +167,7 @@ local function modify(parent, region, data)
     local values = region.values;
     region.UpdateCustomText = function()
       WeakAuras.ActivateAuraEnvironment(region.id, region.cloneId, region.state);
-      local ok, custom = pcall(customTextFunc, region.expirationTime, region.duration,
+      local ok, custom = xpcall(customTextFunc, geterrorhandler(), region.expirationTime, region.duration,
         values.progress, values.duration, values.name, values.icon, values.stacks);
       if (not ok) then custom = ""; end
       WeakAuras.ActivateAuraEnvironment(nil);
diff --git a/WeakAuras/Transmission.lua b/WeakAuras/Transmission.lua
index 325450efcc..c9100af2de 100644
--- a/WeakAuras/Transmission.lua
+++ b/WeakAuras/Transmission.lua
@@ -1136,7 +1136,7 @@ function WeakAuras.ShowDisplayTooltip(data, children, icon, icons, import, compr
       LoadAddOn('WeakAurasOptions')
     end
 
-    local ok,thumbnail = pcall(regionOptions[regionType].createThumbnail,thumbnail_frame, regionTypes[regionType].create);
+    local ok,thumbnail = pcall(regionOptions[regionType].createThumbnail, thumbnail_frame, regionTypes[regionType].create);
     if not ok then
       error("Error creating thumbnail", 2)
     end
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 8b36af0111..878be9d1d2 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -2786,24 +2786,24 @@ function WeakAuras.UpdateAnimations()
     WeakAuras.ActivateAuraEnvironment(anim.name, anim.cloneId, anim.region.state);
     if(anim.translateFunc) then
       if (anim.region.SetOffsetAnim) then
-        local ok, x, y = pcall(anim.translateFunc, progress, 0, 0, anim.dX, anim.dY);
+        local ok, x, y = xpcall(anim.translateFunc, geterrorhandler(), progress, 0, 0, anim.dX, anim.dY);
         anim.region:SetOffsetAnim(x, y);
       else
         anim.region:ClearAllPoints();
-        local ok, x, y = pcall(anim.translateFunc, progress, anim.startX, anim.startY, anim.dX, anim.dY);
+        local ok, x, y = xpcall(anim.translateFunc, geterrorhandler(), progress, anim.startX, anim.startY, anim.dX, anim.dY);
         if (ok) then
           anim.region:SetPoint(anim.selfPoint, anim.anchor, anim.anchorPoint, x, y);
         end
       end
     end
     if(anim.alphaFunc) then
-      local ok, alpha = pcall(anim.alphaFunc, progress, anim.startAlpha, anim.dAlpha);
+      local ok, alpha = xpcall(anim.alphaFunc, geterrorhandler(), progress, anim.startAlpha, anim.dAlpha);
       if (ok) then
         anim.region:SetAlpha(alpha);
       end
     end
     if(anim.scaleFunc) then
-      local ok, scaleX, scaleY = pcall(anim.scaleFunc, progress, 1, 1, anim.scaleX, anim.scaleY);
+      local ok, scaleX, scaleY = xpcall(anim.scaleFunc, geterrorhandler(), progress, 1, 1, anim.scaleX, anim.scaleY);
       if (ok) then
         if(anim.region.Scale) then
           anim.region:Scale(scaleX, scaleY);
@@ -2814,7 +2814,7 @@ function WeakAuras.UpdateAnimations()
       end
     end
     if(anim.rotateFunc and anim.region.Rotate) then
-      local ok, rotate = pcall(anim.rotateFunc, progress, anim.startRotation, anim.rotate);
+      local ok, rotate = xpcall(anim.rotateFunc, geterrorhandler(), progress, anim.startRotation, anim.rotate);
       if (ok) then
         anim.region:Rotate(rotate);
       end
@@ -2822,7 +2822,7 @@ function WeakAuras.UpdateAnimations()
     if(anim.colorFunc and anim.region.ColorAnim) then
       local startR, startG, startB, startA = anim.region:GetColor();
       startR, startG, startB, startA = startR or 1, startG or 1, startB or 1, startA or 1;
-      local ok, r, g, b, a = pcall(anim.colorFunc, progress, startR, startG, startB, startA, anim.colorR, anim.colorG, anim.colorB, anim.colorA);
+      local ok, r, g, b, a = xpcall(anim.colorFunc, geterrorhandler(), progress, startR, startG, startB, startA, anim.colorR, anim.colorG, anim.colorB, anim.colorA);
       if (ok) then
         anim.region:ColorAnim(r, g, b, a);
       end
@@ -3826,7 +3826,7 @@ local function evaluateTriggerStateTriggers(id)
     result = true;
   else
     if (triggerState[id].disjunctive == "custom" and triggerState[id].triggerLogicFunc) then
-      local ok, returnValue = pcall(triggerState[id].triggerLogicFunc, triggerState[id].triggers);
+      local ok, returnValue = xpcall(triggerState[id].triggerLogicFunc, geterrorhandler(), triggerState[id].triggers);
       result = ok and returnValue;
     end
   end
@@ -3990,7 +3990,7 @@ local function ReplaceValuePlaceHolders(textStr, region, customFunc)
   if (textStr == "%c" and customFunc) then
     WeakAuras.ActivateAuraEnvironment(region.id, region.cloneId, region.state);
     local _;
-    _, value = pcall(customFunc, region.expirationTime, region.duration, regionValues.progress, regionValues.duration, regionValues.name, regionValues.icon, regionValues.stacks);
+    _, value = xpcall(customFunc, geterrorhandler(), region.expirationTime, region.duration, regionValues.progress, regionValues.duration, regionValues.name, regionValues.icon, regionValues.stacks);
     WeakAuras.ActivateAuraEnvironment(nil);
     value = value or "";
   else

From 471103124c1099a483d72addddde28145de95f57 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Mon, 30 Apr 2018 16:05:17 +0200
Subject: [PATCH 32/82] Add another pixel to the font string automatic size
 calculation

The ticket accurately describes how to reproduce the issue.
For me, it showed up at font size 23. So it seems the workaround
is still needed for 8.0

Ticket-Nr: 1117
---
 WeakAuras/RegionTypes/RegionPrototype.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WeakAuras/RegionTypes/RegionPrototype.lua b/WeakAuras/RegionTypes/RegionPrototype.lua
index 987096c24d..2ee59875d9 100644
--- a/WeakAuras/RegionTypes/RegionPrototype.lua
+++ b/WeakAuras/RegionTypes/RegionPrototype.lua
@@ -500,11 +500,10 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, id, cloneId,
 end
 
 -- WORKAROUND Texts don't get the right size by default in WoW 7.3
--- TODO 8.0 check this ticket
 function WeakAuras.regionPrototype.SetTextOnText(text, str)
   text:SetWidth(0); -- This makes the text use its internal text size calculation
   text:SetText(str);
   local w = text:GetWidth();
-  w = w + max(4, w / 40);
+  w = w + max(5, w / 40);
   text:SetWidth(w); -- But that internal text size calculation is wrong, see ticket 1014
 end

From e95c20a34c8e78d813add3aa8276c83c7f6c0280 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 30 Apr 2018 16:39:55 +0200
Subject: [PATCH 33/82] prepare switch to HereBeDragons-2.0

---
 .pkgmeta                 | 2 +-
 WeakAuras/Prototypes.lua | 2 +-
 WeakAuras/WeakAuras.lua  | 2 +-
 WeakAuras/WeakAuras.toc  | 2 +-
 WeakAuras/embeds.xml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index 483165ffed..801d54d214 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -35,7 +35,7 @@ externals:
   url: https://repos.wowace.com/wow/libbuttonglow-1-0
  WeakAuras/Libs/LibSpellRange-1.0:
   url: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
- WeakAuras/Libs/HereBeDragons-1.0:
+ WeakAuras/Libs/HereBeDragons:
   url: https://repos.wowace.com/wow/herebedragons
 
 enable-nolib-creation: no
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index d292b61046..69d2bd46a0 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -23,7 +23,7 @@ function WeakAuras.IsSpellInRange(spellId, unit)
   return SpellRange.IsSpellInRange(spellId, unit)
 end
 
--- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
+-- TODO 8.0 local HBD = LibStub("HereBeDragons-2.0")
 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 878be9d1d2..c6c45e9f9a 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -36,7 +36,7 @@ function WeakAurasTimers:ScheduleTimerFixed(func, delay, ...)
 end
 
 local LDB = LibStub:GetLibrary("LibDataBroker-1.1")
--- TODO 8.0 local HBD = LibStub("HereBeDragons-1.0")
+-- TODO 8.0 local HBD = LibStub("HereBeDragons-2.0")
 
 local timer = WeakAurasTimers
 WeakAuras.timer = timer
diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index 9048f2dae2..bc25846aa9 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -13,7 +13,7 @@
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
 ## SavedVariables: WeakAurasSaved
-## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibChatAnims, LibBabble-Race-3.0, LibButtonGlow-1.0, LibSpellRange-1.0, HereBeDragons-1.0, LibRangeCheck-2.0
+## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibChatAnims, LibBabble-Race-3.0, LibButtonGlow-1.0, LibSpellRange-1.0, HereBeDragons, LibRangeCheck-2.0
 
 embeds.xml
 Init.lua
diff --git a/WeakAuras/embeds.xml b/WeakAuras/embeds.xml
index 74f5c07479..3db9b47718 100644
--- a/WeakAuras/embeds.xml
+++ b/WeakAuras/embeds.xml
@@ -18,7 +18,7 @@
 	<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
 	<Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua"/>
 	<Script file="Libs\LibSpellRange-1.0\LibSpellRange-1.0.lua"/>
-	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-1.0.lua"/>-->
+	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-2.0.lua"/>-->
 	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
 	<!--@end-no-lib-strip@-->
 </Ui>

From e775a409daa79d05c1c10744ec710162309d7854 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 1 May 2018 21:23:49 +0200
Subject: [PATCH 34/82] update changelog

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96482c684e..b4e40259f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # WeakAuras 2
 
-## [8.0-beta4-12-g61c14cb](https://github.com/WeakAuras/WeakAuras2/tree/61c14cbbaf0432683da9fbc031c00832cf59042b) (2018-05-04)
+## [8.0-beta4-13-g0f89830](https://github.com/WeakAuras/WeakAuras2/tree/0f898308b918657c5390dc660848bbc8642c710d) (2018-05-01)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta4...61c14cbbaf0432683da9fbc031c00832cf59042b)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta4...0f898308b918657c5390dc660848bbc8642c710d)
 
-Benjamin Staneck (4):
+Benjamin Staneck (5):
 
+- update changelog
 - add a prettyPrint function and use it in a few places
 - add names to the profiling keybinds
 - add prints to pstart and pstop

From f0b2334e9c1a62e2bb0a54d4920928045f9ec2c1 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 4 May 2018 21:40:09 +0200
Subject: [PATCH 35/82] fix bindings.xml, only need to create header once

---
 WeakAuras/Bindings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WeakAuras/Bindings.xml b/WeakAuras/Bindings.xml
index a346a34e63..3f013772cb 100644
--- a/WeakAuras/Bindings.xml
+++ b/WeakAuras/Bindings.xml
@@ -2,13 +2,13 @@
 	<Binding name="WEAKAURASTOGGLE" header="WEAKAURAS" Category="ADDONS">
 		WeakAuras.OpenOptions()
 	</Binding>
-	<Binding name="WEAKAURASSTARTPROFILING" header="WEAKAURAS" Category="ADDONS">
+	<Binding name="WEAKAURASSTARTPROFILING" Category="ADDONS">
 		WeakAuras.StartProfile()
 	</Binding>
-	<Binding name="WEAKAURASSTOPPROFILING" header="WEAKAURAS" Category="ADDONS">
+	<Binding name="WEAKAURASSTOPPROFILING" Category="ADDONS">
 		WeakAuras.StopProfile()
 	</Binding>
-	<Binding name="WEAKAURASPRINTPROFILING" header="WEAKAURAS" Category="ADDONS">
+	<Binding name="WEAKAURASPRINTPROFILING" Category="ADDONS">
 		WeakAuras.PrintProfile()
 	</Binding>
 </Bindings>

From 33ddb5e986231f366366b6f2ddafb0117ce56662 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 4 May 2018 22:57:53 +0200
Subject: [PATCH 36/82] move prints to their function

---
 WeakAuras/WeakAuras.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index aba5d96086..f3fc7b8614 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -84,11 +84,9 @@ function SlashCmdList.WEAKAURAS(msg)
   if (msg) then
     if (msg == "pstart") then
       WeakAuras.StartProfile();
-      prettyPrint(L["Profiling started."])
       return;
     elseif (msg == "pstop") then
       WeakAuras.StopProfile();
-      prettyPrint(L["Profiling stopped."])
       return;
     elseif(msg == "pprint") then
       WeakAuras.PrintProfile();
@@ -4652,6 +4650,7 @@ function WeakAuras.ProfileRenameAura(oldid, id)
 end
 
 function WeakAuras.StartProfile()
+  prettyPrint(L["Profiling started."])
   if (profileData.systems.time and profileData.systems.time.count == 1) then
     prettyPrint(L["Profiling already started."]);
     return;
@@ -4673,6 +4672,7 @@ local function doNothing()
 end
 
 function WeakAuras.StopProfile()
+  prettyPrint(L["Profiling stopped."])
   if (not profileData.systems.time or not profileData.systems.time.count == 1) then
     prettyPrint(L["Profiling not running."]);
     return;

From f3eb389a6d75f2315a2ca86c5e4dc3002aee665c Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Fri, 4 May 2018 23:06:00 +0200
Subject: [PATCH 37/82] fix missing orgEvent assignment

---
 WeakAuras/GenericTrigger.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 8159f83724..636a5fec00 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -615,6 +615,7 @@ function WeakAuras.ScanEvents(event, arg1, arg2, ...)
 end
 
 function WeakAuras.ScanEventsInternal(event_list, event, arg1, arg2, ... )
+  local orgEvent = event;
   for id, triggers in pairs(event_list) do
     WeakAuras.StartProfileAura(id);
     WeakAuras.ActivateAuraEnvironment(id);

From 576c6244a11134c62b5ca730eca914f8e9b7cbf8 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 5 May 2018 18:24:14 +0200
Subject: [PATCH 38/82] Fix GCD trigger after UNIT_SPELLCAST_SENT change

Blizzard going back on forth on what the events delivers.

Github-Issue: 401
---
 WeakAuras/GenericTrigger.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 636a5fec00..8e470d181f 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -1369,7 +1369,7 @@ do
         or event == "PLAYER_TALENT_UPDATE" or event == "PLAYER_PVP_TALENT_UPDATE") then
         WeakAuras.CheckCooldownReady();
       elseif(event == "UNIT_SPELLCAST_SENT") then
-        local unit, guid, name = ...;
+        local unit, guid, castGUID, name = ...;
         if(unit == "player") then
           name = GetSpellInfo(name);
           if(gcdSpellName ~= name) then

From 09cc7043e22ad0188da5e2eb342eee59762ff832 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 7 May 2018 00:23:38 +0200
Subject: [PATCH 39/82] add Uldir encounter ids

---
 WeakAuras/Prototypes.lua | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 8d4c433a82..3bfb4a4dad 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -40,7 +40,14 @@ function WeakAuras.CheckRange(unit, range, operator)
 end
 
 WeakAuras.encounter_table = {
-  -- TODO 8.0 add Uldir
+  [2168] = 2144, -- Taloc the Corrupted
+  [2167] = 2141, -- MOTHER
+  [2146] = 2128, -- Fetid Devourer
+  [2169] = 2136, -- Zek'voz, Herald of N'zoth
+  [2195] = 2145, -- TODO Needs checking-- Zul, Reborn
+  [2194] = 2135, -- Mythrax the Unraveler
+  [2166] = 2134, -- Vectis
+  [2147] = 2122, -- G'huun
 }
 
 local function get_encounters_list()
@@ -70,7 +77,7 @@ local function get_encounters_list()
     encounter_list = encounter_list .. "\n"
   end
 
-  return encounter_list:sub(1, -2)
+  return encounter_list:sub(1, -4)
 end
 
 WeakAuras.function_strings = {

From 7eb18d120eb5a7a5e7d810a54b1381538f955fb8 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 7 May 2018 23:30:34 +0200
Subject: [PATCH 40/82] update changelog

---
 CHANGELOG.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4e40259f9..4c23679f64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,25 @@
 # WeakAuras 2
 
-## [8.0-beta4-13-g0f89830](https://github.com/WeakAuras/WeakAuras2/tree/0f898308b918657c5390dc660848bbc8642c710d) (2018-05-01)
+## [8.0-beta5](https://github.com/WeakAuras/WeakAuras2/tree/8.0-beta5) (2018-05-07)
 
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta4...0f898308b918657c5390dc660848bbc8642c710d)
+[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta4...8.0-beta5)
 
-Benjamin Staneck (5):
+Benjamin Staneck (9):
 
+- add Uldir encounter ids
+- fix missing orgEvent assignment
+- move prints to their function
+- fix bindings.xml, only need to create header once
 - update changelog
 - add a prettyPrint function and use it in a few places
 - add names to the profiling keybinds
 - add prints to pstart and pstop
 - Update changelog
 
-Infus (7):
+Infus (9):
 
+- Fix Load conditions for encounter ids
+- Fix GCD trigger after UNIT_SPELLCAST_SENT change
 - Fix a few bugs, remove TODOs
 - Don't early return if before potentially enabling rune watching
 - Fix Overlay colors not resetting after Condition

From f94f16725c98ed504e1e95a33d6ab2394e25f249 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 8 May 2018 23:57:45 +0200
Subject: [PATCH 41/82] use the new STAT_STAGGER constant to translate Stagger

---
 WeakAuras/Types.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index b7b0c2baec..89fd6790d4 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -6,7 +6,7 @@ local LibBabbleRace = LibStub("LibBabble-Race-3.0");
 local LBR_Locale = LibBabbleRace:GetUnstrictLookupTable()
 local LBR_Base = LibBabbleRace:GetBaseLookupTable();
 
--- luacheck: globals POWER_TYPE_MANA POWER_TYPE_RED_POWER POWER_TYPE_FOCUS POWER_TYPE_ENERGY POWER_TYPE_COMBO_POINTS POWER_TYPE_RUNIC_POWER SOUL_SHARDS_POWER POWER_TYPE_LUNAR_POWER POWER_TYPE_HOLY_POWER POWER_TYPE_MAELSTROM POWER_TYPE_CHI POWER_TYPE_INSANITY POWER_TYPE_ARCANE_CHARGES POWER_TYPE_FURY_DEMONHUNTER POWER_TYPE_PAIN
+-- luacheck: globals POWER_TYPE_MANA POWER_TYPE_RED_POWER POWER_TYPE_FOCUS POWER_TYPE_ENERGY POWER_TYPE_COMBO_POINTS POWER_TYPE_RUNIC_POWER SOUL_SHARDS_POWER POWER_TYPE_LUNAR_POWER POWER_TYPE_HOLY_POWER POWER_TYPE_MAELSTROM POWER_TYPE_CHI POWER_TYPE_INSANITY POWER_TYPE_ARCANE_CHARGES POWER_TYPE_FURY_DEMONHUNTER POWER_TYPE_PAIN STAT_STAGGER
 
 local wipe, tinsert = wipe, tinsert
 local GetNumShapeshiftForms, GetShapeshiftFormInfo = GetNumShapeshiftForms, GetShapeshiftFormInfo
@@ -421,7 +421,7 @@ WeakAuras.power_types_with_stagger = {
   [16] = POWER_TYPE_ARCANE_CHARGES,
   [17] = POWER_TYPE_FURY_DEMONHUNTER,
   [18] = POWER_TYPE_PAIN,
-  [99] = L["Stagger"]
+  [99] = STAT_STAGGER
 }
 
 WeakAuras.miss_types = {

From 7795f4d8d8232873e6434b91773d7de694ae0e20 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 12 May 2018 02:37:52 +0200
Subject: [PATCH 42/82] change to simpler url format in pkgmeta since we don't
 use the other options anyway.

---
 .pkgmeta | 53 +++++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index 801d54d214..7f99dcf258 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -1,42 +1,23 @@
 package-as: WeakAuras
 
 externals:
- WeakAuras/Libs/LibStub:
-  url: https://repos.wowace.com/wow/libstub/trunk
- WeakAuras/Libs/CallbackHandler-1.0:
-  url: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
- WeakAuras/Libs/AceConfig-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
- WeakAuras/Libs/AceConsole-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
- WeakAuras/Libs/AceGUI-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
- WeakAuras/Libs/AceEvent-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
- WeakAuras/Libs/AceGUI-3.0-SharedMediaWidgets:
-  url: https://repos.wowace.com/wow/ace-gui-3-0-shared-media-widgets/trunk/AceGUI-3.0-SharedMediaWidgets
- WeakAuras/Libs/AceTimer-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
- WeakAuras/Libs/AceSerializer-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceSerializer-3.0
- WeakAuras/Libs/AceComm-3.0:
-  url: https://repos.wowace.com/wow/ace3/trunk/AceComm-3.0
- WeakAuras/Libs/LibSharedMedia-3.0:
-  url: https://repos.wowace.com/wow/libsharedmedia-3-0/trunk/LibSharedMedia-3.0
- WeakAuras/Libs/LibDataBroker-1.1:
-  url: git://github.com/tekkub/libdatabroker-1-1.git
- WeakAuras/Libs/LibCompress:
-  url: https://repos.wowace.com/wow/libcompress/trunk
- WeakAuras/Libs/LibChatAnims:
-  url: https://repos.wowace.com/wow/libchatanims/trunk/LibChatAnims
- WeakAuras/Libs/LibBabble-Race-3.0:
-  url: https://repos.wowace.com/wow/libbabble-race-3-0/trunk
- WeakAuras/Libs/LibButtonGlow-1.0:
-  url: https://repos.wowace.com/wow/libbuttonglow-1-0
- WeakAuras/Libs/LibSpellRange-1.0:
-  url: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
- WeakAuras/Libs/HereBeDragons:
-  url: https://repos.wowace.com/wow/herebedragons
+ WeakAuras/Libs/LibStub: https://repos.wowace.com/wow/libstub/trunk
+ WeakAuras/Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
+ WeakAuras/Libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
+ WeakAuras/Libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
+ WeakAuras/Libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
+ WeakAuras/Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
+ WeakAuras/Libs/AceGUI-3.0-SharedMediaWidgets: https://repos.wowace.com/wow/ace-gui-3-0-shared-media-widgets/trunk/AceGUI-3.0-SharedMediaWidgets
+ WeakAuras/Libs/AceTimer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
+ WeakAuras/Libs/AceSerializer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceSerializer-3.0
+ WeakAuras/Libs/AceComm-3.0: https://repos.wowace.com/wow/ace3/trunk/AceComm-3.0
+ WeakAuras/Libs/LibSharedMedia-3.0: https://repos.wowace.com/wow/libsharedmedia-3-0/trunk/LibSharedMedia-3.0
+ WeakAuras/Libs/LibDataBroker-1.1: git://github.com/tekkub/libdatabroker-1-1.git
+ WeakAuras/Libs/LibCompress: https://repos.wowace.com/wow/libcompress/trunk
+ WeakAuras/Libs/LibBabble-Race-3.0: https://repos.wowace.com/wow/libbabble-race-3-0/trunk
+ WeakAuras/Libs/LibButtonGlow-1.0: https://repos.wowace.com/wow/libbuttonglow-1-0
+ WeakAuras/Libs/LibSpellRange-1.0: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
+ WeakAuras/Libs/HereBeDragons: https://repos.wowace.com/wow/herebedragons
 
 enable-nolib-creation: no
 

From f3974160736ac5a87681188aabb3b04a91f93e7b Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 12 May 2018 02:38:56 +0200
Subject: [PATCH 43/82] remove LibChatAnims

---
 WeakAuras/WeakAuras.toc | 2 +-
 WeakAuras/embeds.xml    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index bc25846aa9..d453018d05 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -13,7 +13,7 @@
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
 ## SavedVariables: WeakAurasSaved
-## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibChatAnims, LibBabble-Race-3.0, LibButtonGlow-1.0, LibSpellRange-1.0, HereBeDragons, LibRangeCheck-2.0
+## OptionalDeps: Ace3, LibCompress, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, Masque, GTFO, LibBabble-Race-3.0, LibButtonGlow-1.0, LibSpellRange-1.0, HereBeDragons, LibRangeCheck-2.0
 
 embeds.xml
 Init.lua
diff --git a/WeakAuras/embeds.xml b/WeakAuras/embeds.xml
index 3db9b47718..dbbc86c644 100644
--- a/WeakAuras/embeds.xml
+++ b/WeakAuras/embeds.xml
@@ -3,7 +3,6 @@
 	<!--@no-lib-strip@-->
 	<Script file="Libs\LibStub\LibStub.lua"/>
 	<Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
-	<Include file="Libs\LibChatAnims\LibChatAnims.xml"/>
 	<Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
 	<Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
 	<Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
@@ -18,7 +17,7 @@
 	<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
 	<Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua"/>
 	<Script file="Libs\LibSpellRange-1.0\LibSpellRange-1.0.lua"/>
-	<!-- TODO 8.0 <Script file="Libs\HereBeDragons-1.0\HereBeDragons-2.0.lua"/>-->
+	<!-- TODO 8.0 <Script file="Libs\HereBeDragons\HereBeDragons-2.0.lua"/>-->
 	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
 	<!--@end-no-lib-strip@-->
 </Ui>

From 0fe6a266bfad4af9b94fb5ef42da9a0ed4ae4018 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 12 May 2018 16:26:10 +0200
Subject: [PATCH 44/82] package 8.0 branch tags using the BigWigs packager

---
 .travis.yml             | 24 +++++++++++++-----------
 CHANGELOG.md            | 30 ------------------------------
 WeakAuras/WeakAuras.toc |  1 +
 generate_changelog.sh   |  2 +-
 4 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.travis.yml b/.travis.yml
index ae6611cea5..bf70a93024 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,22 +5,24 @@ addons:
     packages:
     - luarocks
 
-install:
-  - eval $(luarocks path --bin)
-  - luarocks install --local luacheck
+install: luarocks install --local luacheck
 
 before_script: /home/travis/.luarocks/bin/luacheck . --no-color -qo "011"
 
-script: if [[ "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then ./wowace_translations.sh; fi
-
-after_script: ./generate_changelog.sh
+script:
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then ./wowace_translations.sh; fi
+  - |
+    if [[ "$TRAVIS_TAG" == "8.0-"* ]]; then
+      ./generate_changelog.sh
+      curl -s https://raw.githubusercontent.com/BigWigsMods/packager/master/release.sh | bash -s -- -o -p 65387 -g 8.0.1
+    fi
+  # - |
+  #   if [[ "$TRAVIS_TAG" != "8.0-"* ]]; then
+  #     ./generate_changelog.sh
+  #     curl -s https://raw.githubusercontent.com/BigWigsMods/packager/master/release.sh | bash -s -- -o -p 65387
+  #   fi
 
 notifications:
   email:
     on_failure: always
     on_success: never
-
-cache:
-  apt: true
-  directories:
-    - $HOME/.luarocks
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 4c23679f64..0000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# WeakAuras 2
-
-## [8.0-beta5](https://github.com/WeakAuras/WeakAuras2/tree/8.0-beta5) (2018-05-07)
-
-[Full Changelog](https://github.com/WeakAuras/WeakAuras2/compare/8.0-beta4...8.0-beta5)
-
-Benjamin Staneck (9):
-
-- add Uldir encounter ids
-- fix missing orgEvent assignment
-- move prints to their function
-- fix bindings.xml, only need to create header once
-- update changelog
-- add a prettyPrint function and use it in a few places
-- add names to the profiling keybinds
-- add prints to pstart and pstop
-- Update changelog
-
-Infus (9):
-
-- Fix Load conditions for encounter ids
-- Fix GCD trigger after UNIT_SPELLCAST_SENT change
-- Fix a few bugs, remove TODOs
-- Don't early return if before potentially enabling rune watching
-- Fix Overlay colors not resetting after Condition
-- Fix issues with profiling and some animations
-- Add a "loadFunc" to Prototypes which is called on loading a aura
-- Add Profiling Support to WeakAuras
-- Merge RegionOptions on multi selection
-
diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index d453018d05..db1efcafca 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -10,6 +10,7 @@
 ## X-Category: Interface Enhancements
 ## Globe-Post: WeakAurasOptions, WeakAurasModelPaths, WeakAurasTemplates
 ## X-Website: https://www.curseforge.com/wow/addons/weakauras-2
+## X-Curse-Project-ID: 65387
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
 ## SavedVariables: WeakAurasSaved
diff --git a/generate_changelog.sh b/generate_changelog.sh
index 536fd1931c..2644f832d5 100755
--- a/generate_changelog.sh
+++ b/generate_changelog.sh
@@ -12,7 +12,7 @@ else
 fi
 
 date=$( git log -1 --date=short --format="%ad" )
-url=$( git remote get-url github | sed -e 's/^git@\(.*\):/https:\/\/\1\//' -e 's/\.git$//' )
+url=$( git remote get-url origin | sed -e 's/^git@\(.*\):/https:\/\/\1\//' -e 's/\.git$//' )
 #title='# '${url##*/}
 title="# WeakAuras 2"
 

From ec7cf77031d555f0c34a502294dc1178cb18f518 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 15 May 2018 02:03:19 +0200
Subject: [PATCH 45/82] re-enable zone id load condition by using the new map
 API

---
 WeakAuras/Prototypes.lua | 7 +++----
 WeakAuras/WeakAuras.lua  | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 3bfb4a4dad..8cb85e0802 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -16,14 +16,13 @@ local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitC
 local WeakAuras = WeakAuras
 local L = WeakAuras.L
 
--- luacheck: globals C_SpecializationInfo
+-- luacheck: globals C_SpecializationInfo C_Map
 
 local SpellRange = LibStub("SpellRange-1.0")
 function WeakAuras.IsSpellInRange(spellId, unit)
   return SpellRange.IsSpellInRange(spellId, unit)
 end
 
--- TODO 8.0 local HBD = LibStub("HereBeDragons-2.0")
 local LibRangeCheck = LibStub("LibRangeCheck-2.0")
 
 function WeakAuras.GetRange(unit)
@@ -820,11 +819,11 @@ WeakAuras.load_prototype = {
     },
     {
       name = "zoneId",
-      display = L["Zone ID (NYI)"],
+      display = L["Zone ID"],
       type = "string",
       init = "arg",
       desc = function()
-         return L["Zone ID List"] .. "\n" .. L["Current Zone ID:"] .. " "; --TODO 8.0.. HBD:GetPlayerZone();
+         return L["Supports multiple entries, separated by commas\n"] .. L["Current Zone ID: "] .. C_Map.GetBestMapForUnit("player")
        end,
       test = "WeakAuras.CheckNumericIds([[%s]], zoneId)"
     },
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 4b11390a2d..331e59ad6a 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -38,14 +38,14 @@ function WeakAurasTimers:ScheduleTimerFixed(func, delay, ...)
 end
 
 local LDB = LibStub:GetLibrary("LibDataBroker-1.1")
--- TODO 8.0 local HBD = LibStub("HereBeDragons-2.0")
+-- TODO 8.0 - Use for user data upgrades? local HBD = LibStub("HereBeDragons-2.0")
 
 local timer = WeakAurasTimers
 WeakAuras.timer = timer
 
 local L = WeakAuras.L
 
--- luacheck: globals NamePlateDriverFrame CombatText_AddMessage COMBAT_TEXT_SCROLL_FUNCTION
+-- luacheck: globals NamePlateDriverFrame CombatText_AddMessage COMBAT_TEXT_SCROLL_FUNCTION C_Map
 -- luacheck: globals Lerp Saturate KuiNameplatesPlayerAnchor KuiNameplatesCore ElvUIPlayerNamePlateAnchor GTFO C_SpecializationInfo
 
 local queueshowooc;
@@ -1360,7 +1360,7 @@ function WeakAuras.ScanForLoads(self, event, arg1)
   end
 
   local player, realm, spec, zone = UnitName("player"), GetRealmName(), GetSpecialization(), GetRealZoneText();
-  local zoneId = nil; -- TODO 8.0 HBD:GetPlayerZone();
+  local zoneId = C_Map.GetBestMapForUnit("player")
   local _, race = UnitRace("player")
   local faction = UnitFactionGroup("player")
 

From 3edfdbf65765283026b323314f99d0ab6d2f3780 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 15 May 2018 02:19:27 +0200
Subject: [PATCH 46/82] clarify that a few load conditions support more than
 one entry

---
 WeakAuras/Prototypes.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 8cb85e0802..cc484ca9cc 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -76,7 +76,7 @@ local function get_encounters_list()
     encounter_list = encounter_list .. "\n"
   end
 
-  return encounter_list:sub(1, -4)
+  return encounter_list:sub(1, -4) .. L["\nSupports multiple entries, separated by commas\n"]
 end
 
 WeakAuras.function_strings = {
@@ -813,13 +813,13 @@ WeakAuras.load_prototype = {
     },
     {
       name = "zone",
-      display = L["Zone"],
+      display = L["Zone Name"],
       type = "string",
       init = "arg"
     },
     {
       name = "zoneId",
-      display = L["Zone ID"],
+      display = L["Zone ID(s)"],
       type = "string",
       init = "arg",
       desc = function()
@@ -829,7 +829,7 @@ WeakAuras.load_prototype = {
     },
     {
       name = "encounterid",
-      display = L["Encounter ID"],
+      display = L["Encounter ID(s)"],
       type = "string",
       init = "arg",
       desc = get_encounters_list,

From 3bca7ea67a66e04197b5440d749cd23549f22523 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 15 May 2018 14:31:31 +0200
Subject: [PATCH 47/82] Pull LibRangeCheck in via pkgmeta again since it was
 updated.

---
 .gitignore                                    |    2 -
 .pkgmeta                                      |    1 +
 .../LibRangeCheck-2.0/LibRangeCheck-2.0.lua   | 1375 -----------------
 3 files changed, 1 insertion(+), 1377 deletions(-)
 delete mode 100644 WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua

diff --git a/.gitignore b/.gitignore
index 0967cf3b2e..39075f4bcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,3 @@ WeakAuras_Main.lua
 WeakAuras_Options.lua
 WeakAuras_Templates.lua
 WeakAuras/Libs/
-.commit
-!WeakAuras/Libs/LibRangeCheck-2.0
diff --git a/.pkgmeta b/.pkgmeta
index 7f99dcf258..76e8410cf6 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -18,6 +18,7 @@ externals:
  WeakAuras/Libs/LibButtonGlow-1.0: https://repos.wowace.com/wow/libbuttonglow-1-0
  WeakAuras/Libs/LibSpellRange-1.0: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
  WeakAuras/Libs/HereBeDragons: https://repos.wowace.com/wow/herebedragons
+ WeakAuras/Libs/LibRangeCheck-2.0: https://repos.wowace.com/wow/librangecheck-2-0/trunk/LibRangeCheck-2.0
 
 enable-nolib-creation: no
 
diff --git a/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua b/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua
deleted file mode 100644
index 29b8192d2a..0000000000
--- a/WeakAuras/Libs/LibRangeCheck-2.0/LibRangeCheck-2.0.lua
+++ /dev/null
@@ -1,1375 +0,0 @@
---[[
-Name: LibRangeCheck-2.0
-Revision: $Revision$
-Author(s): mitch0
-Website: http://www.wowace.com/projects/librangecheck-2-0/
-Description: A range checking library based on interact distances and spell ranges
-Dependencies: LibStub
-License: Public Domain
-]]
-
---- LibRangeCheck-2.0 provides an easy way to check for ranges and get suitable range checking functions for specific ranges.\\
--- The checkers use spell and item range checks, or interact based checks for special units where those two cannot be used.\\
--- The lib handles the refreshing of checker lists in case talents / spells change and in some special cases when equipment changes (for example some of the mage pvp gloves change the range of the Fire Blast spell), and also handles the caching of items used for item-based range checks.\\
--- A callback is provided for those interested in checker changes.
--- @usage
--- local rc = LibStub("LibRangeCheck-2.0")
--- 
--- rc.RegisterCallback(self, rc.CHECKERS_CHANGED, function() print("need to refresh my stored checkers") end)
--- 
--- local minRange, maxRange = rc:GetRange('target')
--- if not minRange then
---     print("cannot get range estimate for target")
--- elseif not maxRange then
---     print("target is over " .. minRange .. " yards")
--- else
---     print("target is between " .. minRange .. " and " .. maxRange .. " yards")
--- end
--- 
--- local meleeChecker = rc:GetFriendMaxChecker(rc.MeleeRange) -- 5 yds
--- for i = 1, 4 do
---     -- TODO: check if unit is valid, etc
---     if meleeChecker("party" .. i) then
---         print("Party member " .. i .. " is in Melee range")
---     end
--- end
---
--- local safeDistanceChecker = rc:GetHarmMinChecker(30)
--- -- negate the result of the checker!
--- local isSafelyAway = not safeDistanceChecker('target')
---
--- @class file
--- @name LibRangeCheck-2.0
-local MAJOR_VERSION = "LibRangeCheck-2.0"
-local MINOR_VERSION = tonumber(("$Revision: 188$"):match("%d+")) + 100000
-
-local lib, oldminor = LibStub:NewLibrary(MAJOR_VERSION, MINOR_VERSION)
-if not lib then
-    return
-end
-
--- << STATIC CONFIG
-
-local UpdateDelay = .5
-local ItemRequestTimeout = 10.0
-local FriendColor = 'ff22ff22'
-local HarmColor = 'ffff2222'
-
--- interact distance based checks. ranges are based on my own measurements (thanks for all the folks who helped me with this)
-local DefaultInteractList = {
-    [3] = 8,
---    [2] = 9,
-    [4] = 28,
-}
-
--- interact list overrides for races
-local InteractLists = {
-    ["Tauren"] = {
-        [3] = 6,
---        [2] = 7,
-        [4] = 25,
-    },
-    ["Scourge"] = {
-        [3] = 7,
---        [2] = 8,
-        [4] = 27,
-    },
-}
-
-local MeleeRange = 5
-
--- list of friendly spells that have different ranges
-local FriendSpells = {}
--- list of harmful spells that have different ranges 
-local HarmSpells = {}
-
-FriendSpells["DEATHKNIGHT"] = {
-}
-HarmSpells["DEATHKNIGHT"] = {
-    49576, -- ["Death Grip"], -- 30
-}
-
-FriendSpells["DEMONHUNTER"] = {
-}
-HarmSpells["DEMONHUNTER"] = {
-    185123, -- ["Throw Glaive"], -- 30
-}
-
-FriendSpells["DRUID"] = {
-    774, -- ["Rejuvenation"], -- 40
-    2782, -- ["Remove Corruption"], -- 40
-}
-HarmSpells["DRUID"] = {
-    5176, -- ["Wrath"], -- 40
-    339, -- ["Entangling Roots"], -- 35
-    6795, -- ["Growl"], -- 30
-    33786, -- ["Cyclone"], -- 20
-    22568, -- ["Ferocious Bite"], -- 5
-}
-
-FriendSpells["HUNTER"] = {}
-HarmSpells["HUNTER"] = {
-    75, -- ["Auto Shot"], -- 40
-}
-
-FriendSpells["MAGE"] = {
-}
-HarmSpells["MAGE"] = {
-    44614, --["Frostfire Bolt"], -- 40
-    5019, -- ["Shoot"], -- 30
-}
-
-FriendSpells["MONK"] = {
-    115450, -- ["Detox"], -- 40
-    115546, -- ["Provoke"], -- 30
-}
-HarmSpells["MONK"] = {
-    115546, -- ["Provoke"], -- 30
-    115078, -- ["Paralysis"], -- 20
-    100780, -- ["Tiger Palm"], -- 5
-}
-
-FriendSpells["PALADIN"] = {
-    19750, -- ["Flash of Light"], -- 40
-}
-HarmSpells["PALADIN"] = {
-    62124, -- ["Reckoning"], -- 30
-    20271, -- ["Judgement"], -- 30
-    853, -- ["Hammer of Justice"], -- 10
-    35395, -- ["Crusader Strike"], -- 5
-} 
-
-FriendSpells["PRIEST"] = {
-    527, -- ["Purify"], -- 40
-    17, -- ["Power Word: Shield"], -- 40
-}
-HarmSpells["PRIEST"] = {
-    589, -- ["Shadow Word: Pain"], -- 40
-    5019, -- ["Shoot"], -- 30
-}
-
-FriendSpells["ROGUE"] = {}
-HarmSpells["ROGUE"] = {
-    2764, -- ["Throw"], -- 30
-    2094, -- ["Blind"], -- 15
-}
-
-FriendSpells["SHAMAN"] = {
-    8004, -- ["Healing Surge"], -- 40
-    546, -- ["Water Walking"], -- 30
-}
-HarmSpells["SHAMAN"] = {
-    403, -- ["Lightning Bolt"], -- 40
-    370, -- ["Purge"], -- 30
-    73899, -- ["Primal Strike"],. -- 5
-}
-
-FriendSpells["WARRIOR"] = {}
-HarmSpells["WARRIOR"] = {
-    355, -- ["Taunt"], -- 30
-    100, -- ["Charge"], -- 8-25
-    5246, -- ["Intimidating Shout"], -- 8
-}
-
-FriendSpells["WARLOCK"] = {
-    5697, -- ["Unending Breath"], -- 30
-}
-HarmSpells["WARLOCK"] = {
-    686, -- ["Shadow Bolt"], -- 40
-    5019, -- ["Shoot"], -- 30
-}
-
--- Items [Special thanks to Maldivia for the nice list]
-
-local FriendItems  = {
-    [1] = {
-        90175, -- Gin-Ji Knife Set -- doesn't seem to work for pets (always returns nil)
-    },
-    [2] = {
-        37727, -- Ruby Acorn
-    },
-    [3] = {
-        42732, -- Everfrost Razor
-    },
-    [4] = {
-        129055, -- Shoe Shine Kit
-    },
-    [5] = {
-        8149, -- Voodoo Charm
-        136605, -- Solendra's Compassion
-        63427, -- Worgsaw
-    },
-    [7] = {
-        61323, -- Ruby Seeds
-    },
-    [8] = {
-        34368, -- Attuned Crystal Cores
-        33278, -- Burning Torch
-    },
-    [10] = {
-        32321, -- Sparrowhawk Net
-    },
-    [15] = {
-        1251, -- Linen Bandage
-        2581, -- Heavy Linen Bandage
-        3530, -- Wool Bandage
-        3531, -- Heavy Wool Bandage
-        6450, -- Silk Bandage
-        6451, -- Heavy Silk Bandage
-        8544, -- Mageweave Bandage
-        8545, -- Heavy Mageweave Bandage
-        14529, -- Runecloth Bandage
-        14530, -- Heavy Runecloth Bandage
-        21990, -- Netherweave Bandage
-        21991, -- Heavy Netherweave Bandage
-        34721, -- Frostweave Bandage
-        34722, -- Heavy Frostweave Bandage
---        38643, -- Thick Frostweave Bandage
---        38640, -- Dense Frostweave Bandage
-    },
-    [20] = {
-        21519, -- Mistletoe
-    },
-    [25] = {
-        31463, -- Zezzak's Shard
-    },
-    [30] = {
-        1180, -- Scroll of Stamina
-        1478, -- Scroll of Protection II
-        3012, -- Scroll of Agility
-        1712, -- Scroll of Spirit II
-        2290, -- Scroll of Intellect II
-        1711, -- Scroll of Stamina II
-        34191, -- Handful of Snowflakes
-    },
-    [35] = {
-        18904, -- Zorbin's Ultra-Shrinker
-    },
-    [38] = {
-        140786, -- Ley Spider Eggs
-    },
-    [40] = {
-        34471, -- Vial of the Sunwell
-    },
-    [45] = {
-        32698, -- Wrangling Rope
-    },
-    [50] = {
-        116139, -- Haunting Memento
-    },
-    [55] = {
-        74637, -- Kiryn's Poison Vial
-    },
-    [60] = {
-        32825, -- Soul Cannon
-        37887, -- Seeds of Nature's Wrath
-    },
-    [70] = {
-        41265, -- Eyesore Blaster
-    },
-    [80] = {
-        35278, -- Reinforced Net
-    },
-    [90] = {
-        133925, -- Fel Lash
-    },
-    [100] = {
-        41058, -- Hyldnir Harpoon
-    },
-    [150] = {
-        46954, -- Flaming Spears
-    },
-    [200] = {
-        75208, -- Rancher's Lariat
-    },
-}
-
-local HarmItems = {
-    [1] = {
-    },
-    [2] = {
-        37727, -- Ruby Acorn
-    },
-    [3] = {
-        42732, -- Everfrost Razor
-    },
-    [4] = {
-        129055, -- Shoe Shine Kit
-    },
-    [5] = {
-        8149, -- Voodoo Charm
-        136605, -- Solendra's Compassion
-        63427, -- Worgsaw
-    },
-    [7] = {
-        61323, -- Ruby Seeds
-    },
-    [8] = {
-        34368, -- Attuned Crystal Cores
-        33278, -- Burning Torch
-    },
-    [10] = {
-        32321, -- Sparrowhawk Net
-    },
-    [15] = {
-        33069, -- Sturdy Rope
-    },
-    [20] = {
-        10645, -- Gnomish Death Ray
-    },
-    [25] = {
-        24268, -- Netherweave Net
-        41509, -- Frostweave Net
-        31463, -- Zezzak's Shard
-    },
-    [30] = {
-        835, -- Large Rope Net
-        7734, -- Six Demon Bag
-        34191, -- Handful of Snowflakes
-    },
-    [35] = {
-        24269, -- Heavy Netherweave Net
-        18904, -- Zorbin's Ultra-Shrinker
-    },
-    [38] = {
-        140786, -- Ley Spider Eggs
-    },
-    [40] = {
-        28767, -- The Decapitator
-    },
-    [45] = {
---        32698, -- Wrangling Rope
-        23836, -- Goblin Rocket Launcher
-    },
-    [50] = {
-        116139, -- Haunting Memento
-    },
-    [55] = {
-        74637, -- Kiryn's Poison Vial
-    },
-    [60] = {
-        32825, -- Soul Cannon
-        37887, -- Seeds of Nature's Wrath
-    },
-    [70] = {
-        41265, -- Eyesore Blaster
-    },
-    [80] = {
-        35278, -- Reinforced Net
-    },
-    [90] = {
-        133925, -- Fel Lash
-    },
-    [100] = {
-        33119, -- Malister's Frost Wand
-    },
-    [150] = {
-        46954, -- Flaming Spears
-    },
-    [200] = {
-        75208, -- Rancher's Lariat
-    },
-}
-
--- This could've been done by checking player race as well and creating tables for those, but it's easier like this
-for k, v in pairs(FriendSpells) do
-    tinsert(v, 28880) -- ["Gift of the Naaru"]
-end
-
--- >> END OF STATIC CONFIG
-
--- cache
-
-local setmetatable = setmetatable
-local tonumber = tonumber
-local pairs = pairs
-local tostring = tostring
-local print = print
-local next = next
-local type = type
-local wipe = wipe
-local tinsert = tinsert
-local tremove = tremove
-local BOOKTYPE_SPELL = BOOKTYPE_SPELL
-local GetSpellInfo = GetSpellInfo
-local GetSpellBookItemName = GetSpellBookItemName
-local GetNumSpellTabs = GetNumSpellTabs
-local GetSpellTabInfo = GetSpellTabInfo
-local GetItemInfo = GetItemInfo
-local UnitAura = UnitAura
-local UnitCanAttack = UnitCanAttack
-local UnitCanAssist = UnitCanAssist
-local UnitExists = UnitExists
-local UnitIsDeadOrGhost = UnitIsDeadOrGhost
-local CheckInteractDistance = CheckInteractDistance
-local IsSpellInRange = IsSpellInRange
-local IsItemInRange = IsItemInRange
-local UnitClass = UnitClass
-local UnitRace = UnitRace
-local GetInventoryItemLink = GetInventoryItemLink
-local GetSpecialization = GetSpecialization
-local GetSpecializationInfo = GetSpecializationInfo
-local GetTime = GetTime
-local HandSlotId = GetInventorySlotInfo("HandsSlot")
-local math_floor = math.floor
-local UnitIsVisible = UnitIsVisible
-
--- temporary stuff
-
-local itemRequestTimeoutAt
-local foundNewItems
-local cacheAllItems
-local friendItemRequests
-local harmItemRequests
-local lastUpdate = 0
-
--- minRangeCheck is a function to check if spells with minimum range are really out of range, or fail due to range < minRange. See :init() for its setup
-local minRangeCheck = function(unit) return CheckInteractDistance(unit, 2) end
-
-local checkers_Spell = setmetatable({}, {
-    __index = function(t, spellIdx)
-        local func = function(unit)
-            if IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1 then
-                 return true
-            end
-        end
-        t[spellIdx] = func
-        return func
-    end
-})
-local checkers_SpellWithMin = setmetatable({}, {
-    __index = function(t, spellIdx)
-        local func = function(unit)
-            if IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1 then
-                return true
-            elseif minRangeCheck(unit) then
-                return true, true
-            end
-        end
-        t[spellIdx] = func
-        return func
-    end
-})
-local checkers_Item = setmetatable({}, {
-    __index = function(t, item)
-        local func = function(unit)
-            return IsItemInRange(item, unit)
-        end
-        t[item] = func
-        return func
-    end
-})
-local checkers_Interact = setmetatable({}, {
-    __index = function(t, index)
-        local func = function(unit)
-            if CheckInteractDistance(unit, index) then
-                 return true
-            end
-        end
-        t[index] = func
-        return func
-    end
-})
-
--- helper functions
-
-local function copyTable(src, dst)
-    if type(dst) ~= "table" then dst = {} end
-    if type(src) == "table" then
-        for k, v in pairs(src) do
-            if type(v) == "table" then
-                v = copyTable(v, dst[k])
-            end
-            dst[k] = v
-        end
-    end
-    return dst
-end
-
-
-local function initItemRequests(cacheAll)
-    friendItemRequests = copyTable(FriendItems)
-    harmItemRequests = copyTable(HarmItems)
-    cacheAllItems = cacheAll
-    foundNewItems = nil
-end
-
-local function getNumSpells()
-    local _, _, offset, numSpells = GetSpellTabInfo(GetNumSpellTabs())
-    return offset + numSpells
-end
-
--- return the spellIndex of the given spell by scanning the spellbook
-local function findSpellIdx(spellName)
-    if not spellName or spellName == "" then
-        return nil
-    end
-    for i = 1, getNumSpells() do
-        local spell, rank = GetSpellBookItemName(i, BOOKTYPE_SPELL)
-        if spell == spellName then return i end
-    end
-    return nil
-end
-
--- minRange should be nil if there's no minRange, not 0
-local function addChecker(t, range, minRange, checker, info)
-    local rc = { ["range"] = range, ["minRange"] = minRange, ["checker"] = checker, ["info"] = info }
-    for i = 1, #t do
-        local v = t[i]
-        if rc.range == v.range then return end
-        if rc.range > v.range then
-            tinsert(t, i, rc)
-            return
-        end
-    end
-    tinsert(t, rc)
-end
-
-local function createCheckerList(spellList, itemList, interactList)
-    local res = {}
-    if itemList then
-        for range, items in pairs(itemList) do
-            for i = 1, #items do
-                local item = items[i]
-                if GetItemInfo(item) then
-                    addChecker(res, range, nil, checkers_Item[item], "item:" .. item)
-                    break
-                end
-            end
-        end
-    end
-    
-    if spellList then
-        for i = 1, #spellList do
-            local sid = spellList[i]
-            local name, _, _, _, minRange, range = GetSpellInfo(sid)
-            local spellIdx = findSpellIdx(name)
-            if spellIdx and range then
-                minRange = math_floor(minRange + 0.5)
-                range = math_floor(range + 0.5)
-                -- print("### spell: " .. tostring(name) .. ", " .. tostring(minRange) .. " - " ..  tostring(range))
-                if minRange == 0 then -- getRange() expects minRange to be nil in this case
-                    minRange = nil
-                end
-                if range == 0 then
-                    range = MeleeRange
-                end
-                if minRange then
-                    addChecker(res, range, minRange, checkers_SpellWithMin[spellIdx], "spell:" .. sid .. ":" .. tostring(name))
-                else
-                    addChecker(res, range, minRange, checkers_Spell[spellIdx], "spell:" .. sid .. ":" .. tostring(name))
-                end
-            end
-        end
-    end
-    
-    if interactList and not next(res) then
-        for index, range in pairs(interactList) do
-            addChecker(res, range, nil,  checkers_Interact[index], "interact:" .. index)
-        end
-    end
-
-    return res
-end
-
--- returns minRange, maxRange  or nil
-local function getRange(unit, checkerList)
-    local lo, hi = 1, #checkerList
-    while lo <= hi do
-        local mid = math_floor((lo + hi) / 2)
-        local rc = checkerList[mid]
-        if rc.checker(unit) then
-            lo = mid + 1
-        else
-            hi = mid - 1
-        end
-    end
-    if lo > #checkerList then
-        return 0, checkerList[#checkerList].range
-    elseif lo <= 1 then
-        return checkerList[1].range, nil
-    else
-        return checkerList[lo].range, checkerList[lo - 1].range
-    end
-end
-
-local function updateCheckers(origList, newList)
-    if #origList ~= #newList then
-        wipe(origList)
-        copyTable(newList, origList)
-        return true
-    end
-    for i = 1, #origList do
-        if origList[i].range ~= newList[i].range or origList[i].checker ~= newList[i].checker then
-            wipe(origList)
-            copyTable(newList, origList)
-            return true
-        end
-    end
-end
-
-local function rcIterator(checkerList)
-    local curr = #checkerList
-    return function()
-        local rc = checkerList[curr]
-        if not rc then
-             return nil
-        end
-        curr = curr - 1
-        return rc.range, rc.checker
-    end
-end
-
-local function getMinChecker(checkerList, range)
-    local checker, checkerRange
-    for i = 1, #checkerList do
-        local rc = checkerList[i]
-        if rc.range < range then
-            return checker, checkerRange
-        end
-        checker, checkerRange = rc.checker, rc.range
-    end
-    return checker, checkerRange
-end
-
-local function getMaxChecker(checkerList, range)
-    for i = 1, #checkerList do
-        local rc = checkerList[i]
-        if rc.range <= range then
-            return rc.checker, rc.range
-        end
-    end
-end
-
-local function getChecker(checkerList, range)
-    for i = 1, #checkerList do
-        local rc = checkerList[i]
-        if rc.range == range then
-            return rc.checker
-        end
-    end
-end
-
-local function null()
-end
-
-local function createSmartChecker(friendChecker, harmChecker, miscChecker)
-    miscChecker = miscChecker or null
-    friendChecker = friendChecker or miscChecker
-    harmChecker = harmChecker or miscChecker
-    return function(unit)
-        if not UnitExists(unit) then
-            return nil
-        end
-        if UnitIsDeadOrGhost(unit) then
-            return miscChecker(unit)
-        end
-        if UnitCanAttack("player", unit) then
-            return harmChecker(unit)
-        elseif UnitCanAssist("player", unit) then
-            return friendChecker(unit)
-        else
-            return miscChecker(unit)
-        end
-    end
-end
-
--- OK, here comes the actual lib
-
--- pre-initialize the checkerLists here so that we can return some meaningful result even if
--- someone manages to call us before we're properly initialized. miscRC should be independent of
--- race/class/talents, so it's safe to initialize it here
--- friendRC and harmRC will be properly initialized later when we have all the necessary data for them
-lib.checkerCache_Spell = lib.checkerCache_Spell or {}
-lib.checkerCache_Item = lib.checkerCache_Item or {}
-lib.miscRC = createCheckerList(nil, nil, DefaultInteractList)
-lib.friendRC = createCheckerList(nil, nil, DefaultInteractList)
-lib.harmRC = createCheckerList(nil, nil, DefaultInteractList)
-
-lib.failedItemRequests = {}
-
--- << Public API
-
---@do-not-package@
--- this is here just for .docmeta
---- A checker function. This type of function is returned by the various Get*Checker() calls.
--- @param unit the unit to check range to.
--- @return **true** if the unit is within the range for this checker.
-local function checker(unit)
-end
-
---@end-do-not-package@ 
-
---- The callback name that is fired when checkers are changed.
--- @field
-lib.CHECKERS_CHANGED = "CHECKERS_CHANGED"
--- "export" it, maybe someone will need it for formatting
---- Constant for Melee range (5yd).
--- @field
-lib.MeleeRange = MeleeRange
-
-function lib:findSpellIndex(spell)
-    if type(spell) == 'number' then
-        spell = GetSpellInfo(spell)
-    end
-    return findSpellIdx(spell)
-end
-
--- returns the range estimate as a string
--- deprecated, use :getRange(unit) instead and build your own strings
--- @param checkVisible if set to true, then a UnitIsVisible check is made, and **nil** is returned if the unit is not visible
-function lib:getRangeAsString(unit, checkVisible, showOutOfRange)
-    local minRange, maxRange = self:getRange(unit, checkVisible)
-    if not minRange then return nil end
-    if not maxRange then
-        return showOutOfRange and minRange .. " +" or nil
-    end
-    return minRange .. " - " .. maxRange
-end
-
--- initialize RangeCheck if not yet initialized or if "forced"
-function lib:init(forced)
-    if self.initialized and (not forced) then
-        return
-    end
-    self.initialized = true
-    local _, playerClass = UnitClass("player")
-    local _, playerRace = UnitRace("player")
-
-    minRangeCheck = nil
-    -- first try to find a nice item we can use for minRangeCheck
-    if HarmItems[15] then
-        local items = HarmItems[15]
-        for i = 1, #items do
-            local item = items[i]
-            if GetItemInfo(item) then
-                minRangeCheck = function(unit)
-                    return IsItemInRange(item, unit)
-                end
-                break
-            end
-        end
-    end
-    if not minRangeCheck then
-        -- ok, then try to find some class specific spell
-        if playerClass == "WARRIOR" then
-            -- for warriors, use Intimidating Shout if available
-            local name = GetSpellInfo(5246) -- ["Intimidating Shout"]
-            local spellIdx = findSpellIdx(name)
-            if spellIdx then
-                minRangeCheck = function(unit)
-                    return (IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1)
-                end
-            end
-        elseif playerClass == "ROGUE" then
-            -- for rogues, use Blind if available
-            local name = GetSpellInfo(2094) -- ["Blind"]
-            local spellIdx = findSpellIdx(name)
-            if spellIdx then
-                minRangeCheck = function(unit)
-                    return (IsSpellInRange(spellIdx, BOOKTYPE_SPELL, unit) == 1)
-                end
-            end
-        end
-    end
-    if not minRangeCheck then
-        -- fall back to interact distance checks
-        if playerClass == "HUNTER" or playerRace == "Tauren" then
-            -- for hunters, use interact4 as it's safer
-            -- for Taurens interact4 is actually closer than 25yd and interact3 is closer than 8yd, so we can't use that
-            minRangeCheck = checkers_Interact[4]
-        else
-            minRangeCheck = checkers_Interact[3]
-        end
-    end
-
-    local interactList = InteractLists[playerRace] or DefaultInteractList
-    self.handSlotItem = GetInventoryItemLink("player", HandSlotId)
-    local changed = false
-    if updateCheckers(self.friendRC, createCheckerList(FriendSpells[playerClass], FriendItems, interactList)) then
-        changed = true
-    end
-    if updateCheckers(self.harmRC, createCheckerList(HarmSpells[playerClass], HarmItems, interactList)) then
-        changed = true
-    end
-    if updateCheckers(self.miscRC, createCheckerList(nil, nil, interactList)) then
-        changed = true
-    end
-    if changed and self.callbacks then
-        self.callbacks:Fire(self.CHECKERS_CHANGED)
-    end
-end
-
---- Return an iterator for checkers usable on friendly units as (**range**, **checker**) pairs.
-function lib:GetFriendCheckers()
-    return rcIterator(self.friendRC)
-end
-
---- Return an iterator for checkers usable on enemy units as (**range**, **checker**) pairs.
-function lib:GetHarmCheckers()
-    return rcIterator(self.harmRC)
-end
-
---- Return an iterator for checkers usable on miscellaneous units as (**range**, **checker**) pairs.  These units are neither enemy nor friendly, such as people in sanctuaries or corpses.
-function lib:GetMiscCheckers()
-    return rcIterator(self.miscRC)
-end
-
---- Return a checker suitable for out-of-range checking on friendly units, that is, a checker whose range is equal or larger than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetFriendMinChecker(range)
-    return getMinChecker(self.friendRC, range)
-end
-
---- Return a checker suitable for out-of-range checking on enemy units, that is, a checker whose range is equal or larger than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetHarmMinChecker(range)
-    return getMinChecker(self.harmRC, range)
-end
-
---- Return a checker suitable for out-of-range checking on miscellaneous units, that is, a checker whose range is equal or larger than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetMiscMinChecker(range)
-    return getMinChecker(self.miscRC, range)
-end
-
---- Return a checker suitable for in-range checking on friendly units, that is, a checker whose range is equal or smaller than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetFriendMaxChecker(range)
-    return getMaxChecker(self.friendRC, range)
-end
-
---- Return a checker suitable for in-range checking on enemy units, that is, a checker whose range is equal or smaller than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetHarmMaxChecker(range)
-    return getMaxChecker(self.harmRC, range)
-end
-
---- Return a checker suitable for in-range checking on miscellaneous units, that is, a checker whose range is equal or smaller than the requested range.
--- @param range the range to check for.
--- @return **checker**, **range** pair or **nil** if no suitable checker is available. **range** is the actual range the returned **checker** checks for.
-function lib:GetMiscMaxChecker(range)
-    return getMaxChecker(self.miscRC, range)
-end
-
---- Return a checker for the given range for friendly units.
--- @param range the range to check for.
--- @return **checker** function or **nil** if no suitable checker is available.
-function lib:GetFriendChecker(range)
-    return getChecker(self.friendRC, range)
-end
-
---- Return a checker for the given range for enemy units.
--- @param range the range to check for.
--- @return **checker** function or **nil** if no suitable checker is available.
-function lib:GetHarmChecker(range)
-    return getChecker(self.harmRC, range)
-end
-
---- Return a checker for the given range for miscellaneous units.
--- @param range the range to check for.
--- @return **checker** function or **nil** if no suitable checker is available.
-function lib:GetMiscChecker(range)
-    return getChecker(self.miscRC, range)
-end
-
---- Return a checker suitable for out-of-range checking that checks the unit type and calls the appropriate checker (friend/harm/misc).
--- @param range the range to check for.
--- @return **checker** function.
-function lib:GetSmartMinChecker(range)
-    return createSmartChecker(
-        getMinChecker(self.friendRC, range),
-        getMinChecker(self.harmRC, range),
-        getMinChecker(self.miscRC, range))
-end
-
---- Return a checker suitable for in-of-range checking that checks the unit type and calls the appropriate checker (friend/harm/misc).
--- @param range the range to check for.
--- @return **checker** function.
-function lib:GetSmartMaxChecker(range)
-    return createSmartChecker(
-        getMaxChecker(self.friendRC, range),
-        getMaxChecker(self.harmRC, range),
-        getMaxChecker(self.miscRC, range))
-end
-
---- Return a checker for the given range that checks the unit type and calls the appropriate checker (friend/harm/misc).
--- @param range the range to check for.
--- @param fallback optional fallback function that gets called as fallback(unit) if a checker is not available for the given type (friend/harm/misc) at the requested range. The default fallback function return nil.
--- @return **checker** function.
-function lib:GetSmartChecker(range, fallback)
-    return createSmartChecker(
-        getChecker(self.friendRC, range) or fallback,
-        getChecker(self.harmRC, range) or fallback,
-        getChecker(self.miscRC, range) or fallback)
-end
-
---- Get a range estimate as **minRange**, **maxRange**.
--- @param unit the target unit to check range to.
--- @param checkVisible if set to true, then a UnitIsVisible check is made, and **nil** is returned if the unit is not visible
--- @return **minRange**, **maxRange** pair if a range estimate could be determined, **nil** otherwise. **maxRange** is **nil** if **unit** is further away than the highest possible range we can check.
--- Includes checks for unit validity and friendly/enemy status.
--- @usage
--- local rc = LibStub("LibRangeCheck-2.0")
--- local minRange, maxRange = rc:GetRange('target')
--- local minRangeIfVisible, maxRangeIfVisible = rc:GetRange('target', true)
-function lib:GetRange(unit, checkVisible)
-    if not UnitExists(unit) then
-        return nil
-    end
-    if checkVisible and not UnitIsVisible(unit) then
-        return nil
-    end
-    if UnitIsDeadOrGhost(unit) then
-        return getRange(unit, self.miscRC)
-    end
-    if UnitCanAttack("player", unit) then
-        return getRange(unit, self.harmRC)
-    elseif UnitCanAssist("player", unit) then
-        return getRange(unit, self.friendRC)
-    else
-        return getRange(unit, self.miscRC)
-    end
-end
-
--- keep this for compatibility
-lib.getRange = lib.GetRange
-
--- >> Public API
-
-function lib:OnEvent(event, ...)
-    if type(self[event]) == 'function' then
-        self[event](self, event, ...)
-    end
-end
-
-function lib:LEARNED_SPELL_IN_TAB()
-    self:scheduleInit()
-end
-
-function lib:CHARACTER_POINTS_CHANGED()
-    self:scheduleInit()
-end
-
-function lib:PLAYER_TALENT_UPDATE()
-    self:scheduleInit()
-end
-
-function lib:SPELLS_CHANGED()
-    self:scheduleInit()
-end
-
-function lib:UNIT_INVENTORY_CHANGED(event, unit)
-    if self.initialized and unit == "player" and self.handSlotItem ~= GetInventoryItemLink("player", HandSlotId) then
-        self:scheduleInit()
-    end
-end
-
-function lib:UNIT_AURA(event, unit)
-    if self.initialized and unit == "player" then
-        self:scheduleAuraCheck()
-    end
-end
-
-function lib:processItemRequests(itemRequests)
-    while true do
-        local range, items = next(itemRequests)
-        if not range then return end
-        while true do
-            local i, item = next(items)
-            if not i then
-                itemRequests[range] = nil
-                break
-            elseif self.failedItemRequests[item] then
-                tremove(items, i)
-            elseif GetItemInfo(item) then
-                if itemRequestTimeoutAt then
-                    foundNewItems = true
-                    itemRequestTimeoutAt = nil
-                end
-                if not cacheAllItems then
-                    itemRequests[range] = nil
-                    break
-                end
-                tremove(items, i)   
-            elseif not itemRequestTimeoutAt then
-                itemRequestTimeoutAt = GetTime() + ItemRequestTimeout
-                return true
-            elseif GetTime() > itemRequestTimeoutAt then
-                if cacheAllItems then
-                    print(MAJOR_VERSION .. ": timeout for item: " .. tostring(item))
-                end
-                self.failedItemRequests[item] = true
-                itemRequestTimeoutAt = nil
-                tremove(items, i)
-            else
-                return true -- still waiting for server response
-            end
-        end
-    end
-end
-
-function lib:initialOnUpdate()
-    self:init()
-    if friendItemRequests then
-        if self:processItemRequests(friendItemRequests) then return end
-        friendItemRequests = nil
-    end
-    if harmItemRequests then
-        if self:processItemRequests(harmItemRequests) then return end
-        harmItemRequests = nil
-    end
-    if foundNewItems then
-        self:init(true)
-        foundNewItems = nil
-    end
-    if cacheAllItems then
-        print(MAJOR_VERSION .. ": finished cache")
-        cacheAllItems = nil
-    end
-    self.frame:Hide()
-end
-
-function lib:scheduleInit()
-    self.initialized = nil
-    lastUpdate = 0
-    self.frame:Show()
-end
-
-function lib:scheduleAuraCheck()
-    lastUpdate = UpdateDelay
-    self.frame:Show()
-end
-
---@do-not-package@
--- << DEBUG STUFF
-
-local function pairsByKeys(t, f)
-    local a = {}
-    for n in pairs(t) do tinsert(a, n) end
-    table.sort(a, f)
-    local i = 0
-    local iter = function ()
-        i = i + 1
-        if a[i] == nil then
-            return nil
-        else
-            return a[i], t[a[i]]
-        end
-    end
-    return iter
-end
-
-function lib:cacheAllItems()
-    if (not self.initialized) or harmItemRequests then
-        print(MAJOR_VERSION .. ": init hasn't finished yet")
-        return
-    end
-    print(MAJOR_VERSION .. ": starting item cache")
-    initItemRequests(true)
-    self.frame:Show()
-end
-
-function lib:startMeasurement(unit, resultTable)
-    if (not self.initialized) or harmItemRequests then
-        print(MAJOR_VERSION .. ": init hasn't finished yet")
-        return
-    end
-    if self.measurements then
-        print(MAJOR_VERSION .. ": measurements already running")
-        return
-    end
-    print(MAJOR_VERSION .. ": starting measurements")
-    local _, playerClass = UnitClass("player")
-    local spellList
-    local itemList
-    if UnitCanAttack("player", unit) then
-        spellList = HarmSpells[playerClass]
-        itemList = HarmItems
-    elseif UnitCanAssist("player", unit) then
-        spellList = FriendSpells[playerClass]
-        itemList = FriendItems
-    end
-    self.spellsToMeasure = {}
-    if spellList then
-        for i = 1, #spellList do
-            local sid = spellList[i]
-            local name = GetSpellInfo(sid)
-            local spellIdx = findSpellIdx(name)
-            if spellIdx then
-                self.spellsToMeasure[name] = spellIdx
-            end
-        end
-    end
-    self.itemsToMeasure = {}
-    if itemList then
-        for range, items in pairs(itemList) do
-            for i = 1, #items do
-                local item = items[i]
-                local name = GetItemInfo(item)
-                if name then
-                    self.itemsToMeasure[name] = item
-                end
-            end
-        end
-    end
-    self.measurements = resultTable
-    self.measurementUnit = unit
-    self.measurementStart = GetTime()
-    self.lastMeasurements = {}
-    self:updateMeasurements()
-    self.frame:SetScript("OnUpdate", function(frame, elapsed) self:updateMeasurements() end)
-    self.frame:Show()
-end
-
-function lib:stopMeasurement()
-    print(MAJOR_VERSION .. ": stopping measurements")
-    self.frame:Hide()
-    self.frame:SetScript("OnUpdate", function(frame, elapsed)
-        lastUpdate = lastUpdate + elapsed
-        if lastUpdate < UpdateDelay then
-            return
-        end
-        lastUpdate = 0
-        self:initialOnUpdate()
-    end)
-    self.measurements = nil
-end
-
-function lib:checkItems(itemList, verbose, color)
-    if not itemList then return end
-    color = color or 'ffffffff'
-    for range, items in pairsByKeys(itemList) do
-        for i = 1, #items do
-            local item = items[i]
-            local name = GetItemInfo(item)
-            if not name then
-                print(MAJOR_VERSION .. ": |c" .. color .. tostring(item) .. "|r: " .. tostring(range) .. "yd: |cffeda500not in cache|r")
-            else
-                local res = IsItemInRange(item, "target") 
-                if res == nil or verbose then
-                    if res == nil then res = "|cffed0000nil|r" end
-                    print(MAJOR_VERSION .. ": |c" .. color .. tostring(item) .. ": " .. tostring(name) .. "|r: " .. tostring(range) .. "yd: " .. tostring(res))
-                end
-            end
-        end
-    end
-end
-
-function lib:checkSpells(spellList, verbose, color)
-    if not spellList then return end
-    color = color or 'ffffffff'
-    for i = 1, #spellList do 
-        local sid = spellList[i]
-        local name, _, _, _, minRange, range = GetSpellInfo(sid)
-        if (not name) or (name == "") or (not range) then
-            print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. "|r: " .. tostring(range) .. "yd: |cffeda500invalid spell id|r")
-        else
-            local spellIdx = self:findSpellIndex(sid)
-            if not spellIdx then
-                print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. ": " .. tostring(name) .. "|r: " .. tostring(minRange) .. "-" .. tostring(range) .. "yd: |cffeda500not in spellbook|r")
-            else
-                local res = IsSpellInRange(spellIdx, BOOKTYPE_SPELL, "target")
-                if res == nil or verbose then
-                    if res == nil then res = "|cffed0000nil|r" end
-                    print(MAJOR_VERSION .. ": |c" .. color .. tostring(sid) .. ": " .. tostring(name) .. "|r: " .. tostring(minRange) .. "-" .. tostring(range) .. "yd: " .. tostring(res))
-                end
-            end
-        end
-    end
-end
-
-function lib:checkAllItems()
-    print(MAJOR_VERSION .. ": Checking FriendItems...")
-    self:checkItems(FriendItems, true, FriendColor)
-    print(MAJOR_VERSION .. ": Checking HarmItems...")
-    self:checkItems(HarmItems, true, HarmColor)
-end
-
-function lib:checkAllSpells()
-    local _, playerClass = UnitClass("player")
-    print(MAJOR_VERSION .. ": Checking FriendSpells: " .. playerClass)
-    self:checkSpells(FriendSpells[playerClass], true, FriendColor)
-    print(MAJOR_VERSION .. ": Checking HarmSpells..." .. playerClass)
-    self:checkSpells(HarmSpells[playerClass], true, HarmColor)
-end
-
-local function dumpCheckerList(checkerList)
-    for _, rc in ipairs(checkerList) do
-        if rc.minRange then
-            print(rc.minRange .. "-" .. rc.range .. ": " .. rc.info)
-        else
-            print(rc.range .. ": " .. rc.info)
-        end
-    end
-end
-
-function lib:checkAllCheckers()
-    if not UnitExists("target") then
-        print(MAJOR_VERSION .. ": Invalid unit, cannot check")
-        return
-    end
-    local _, playerClass = UnitClass("player")
-    if UnitCanAttack("player", "target") then
-        print(MAJOR_VERSION .. ": Harm checker list: " .. playerClass)
-        dumpCheckerList(self.harmRC)
-        print(MAJOR_VERSION .. ": Checking HarmCheckers: " .. playerClass)
-        self:checkItems(HarmItems)
-        self:checkSpells(HarmSpells[playerClass])
-    elseif UnitCanAssist("player", "target") then
-        print(MAJOR_VERSION .. ": Friend checker list: " .. playerClass)
-        dumpCheckerList(self.friendRC)
-        print(MAJOR_VERSION .. ": Checking FriendCheckers: ")
-        self:checkItems(FriendItems)
-        self:checkSpells(FriendSpells[playerClass])
-    else
-        print(MAJOR_VERSION .. ": Misc checker list: " .. playerClass)
-        dumpCheckerList(self.miscRC)
-        print(MAJOR_VERSION .. ": Misc unit, cannot check")
-        return
-    end
-    print(MAJOR_VERSION .. ": done.")
-end
-
-local function logMeasurementChange(t, t0, key, last, curr)
-    local d = 0
-    local scale = 1240
-    if t0 then
-        local dx = scale * (t.x - t0.x)
-        local dy = scale * (t.y - t0.y)
-        d = _G.sqrt(dx * dx + dy * dy)
-    end
-    print(MAJOR_VERSION .. ": t=" .. ("%.4f"):format(t.stamp) .. ": d=" .. ("%.4f"):format(d) .. ": " .. tostring(key) .. ": " .. tostring(last) .. " ->  " .. tostring(curr))
-end
-
-local GetPlayerMapPosition = GetPlayerMapPosition
-function lib:updateMeasurements()
-    local now = GetTime() - self.measurementStart
-    local x, y = GetPlayerMapPosition("player")
-    local t0 = self.measurements[0]
-    local t = self.measurements[now]
-    local unit = self.measurementUnit
-    for name, id in pairs(self.spellsToMeasure) do
-        local key = 'spell: ' .. name
-        local last = self.lastMeasurements[key]
-        local curr = (IsSpellInRange(id, BOOKTYPE_SPELL, unit) == 1) and true or false
-        if last == nil or last ~= curr then
-            if not t then
-                t = {}
-                t.x, t.y, t.stamp, t.states = x, y, now, {}
-                self.measurements[now] = t
-            end
-            logMeasurementChange(t, t0, key, last, curr)
-            t.states[key]= curr
-            self.lastMeasurements[key] = curr
-        end
-    end
-    for name, item in pairs(self.itemsToMeasure) do
-        local key = 'item: ' .. name;
-        local last = self.lastMeasurements[key]
-        local curr = IsItemInRange(item, unit) and true or false
-        if last == nil or last ~= curr then
-            if not t then
-                t = {}
-                t.x, t.y, t.stamp, t.states = x, y, now, {}
-                self.measurements[now] = t
-            end
-            logMeasurementChange(t, t0, key, last, curr)
-            t.states[key]= curr
-            self.lastMeasurements[key] = curr
-        end
-    end
-    for i, v in pairs(DefaultInteractList) do
-        local key = 'interact: ' .. i
-        local last = self.lastMeasurements[key]
-        local curr = CheckInteractDistance(unit, i) and true or false
-        if last == nil or last ~= curr then
-            if not t then
-                t = {}
-                t.x, t.y, t.stamp, t.states = x, y, now, {}
-                self.measurements[now] = t
-            end
-            logMeasurementChange(t, t0, key, last, curr)
-            t.states[key] = curr
-            self.lastMeasurements[key] = curr
-        end
-    end
-end
-
-local debugprofilestop = debugprofilestop
-function lib:speedTest(numIterations)
-    if not UnitExists("target") then
-        print(MAJOR_VERSION .. ": Invalid unit, cannot check")
-        return
-    end
-    numIterations = numIterations or 10000
-    local start = debugprofilestop()
-    for i = 1, numIterations do
-        self:getRange("target")
-    end
-    local duration = debugprofilestop() - start
-    print("numIterations: " .. tostring(numIterations) .. ", time: " .. tostring(duration))
-end
-
--- >> DEBUG STUFF
---@end-do-not-package@ 
-
--- << load-time initialization 
-
-function lib:activate()
-    if not self.frame then
-        local frame = CreateFrame("Frame")
-        self.frame = frame
-        frame:RegisterEvent("LEARNED_SPELL_IN_TAB")
-        frame:RegisterEvent("CHARACTER_POINTS_CHANGED")
-        frame:RegisterEvent("PLAYER_TALENT_UPDATE")
-        frame:RegisterEvent("SPELLS_CHANGED")
-        local _, playerClass = UnitClass("player")
-        if playerClass == "MAGE" or playerClass == "SHAMAN" then
-            -- Mage and Shaman gladiator gloves modify spell ranges
-            frame:RegisterUnitEvent("UNIT_INVENTORY_CHANGED", "player")
-        end
-    end
-    initItemRequests()
-    self.frame:SetScript("OnEvent", function(frame, ...) self:OnEvent(...) end)
-    self.frame:SetScript("OnUpdate", function(frame, elapsed)
-        lastUpdate = lastUpdate + elapsed
-        if lastUpdate < UpdateDelay then
-            return
-        end
-        lastUpdate = 0
-        self:initialOnUpdate()
-    end)
-    self:scheduleInit()
-end
-
---- BEGIN CallbackHandler stuff
-
-do
-    local lib = lib -- to keep a ref even though later we nil lib
-    --- Register a callback to get called when checkers are updated
-    -- @class function
-    -- @name lib.RegisterCallback
-    -- @usage
-    -- rc.RegisterCallback(self, rc.CHECKERS_CHANGED, "myCallback")
-    -- -- or
-    -- rc.RegisterCallback(self, "CHECKERS_CHANGED", someCallbackFunction)
-    -- @see CallbackHandler-1.0 documentation for more details
-    lib.RegisterCallback = lib.RegisterCallback or function(...)
-        local CBH = LibStub("CallbackHandler-1.0")
-        lib.RegisterCallback = nil -- extra safety, we shouldn't get this far if CBH is not found, but better an error later than an infinite recursion now
-        lib.callbacks = CBH:New(lib)
-        -- ok, CBH hopefully injected or new shiny RegisterCallback
-        return lib.RegisterCallback(...)
-    end
-end
-
---- END CallbackHandler stuff
-
-lib:activate()
-lib = nil
\ No newline at end of file

From 03f83f527dbf26dcf1fc112e72cb299f10344469 Mon Sep 17 00:00:00 2001
From: emptyrivers <emptyrivers@users.noreply.github.com>
Date: Fri, 18 May 2018 07:22:14 -0500
Subject: [PATCH 48/82] [Feature] Add HSV color animations (#408)

Add HSV color animations and rename old ones
---
 WeakAuras/Prototypes.lua | 45 ++++++++++++++++++++++++++++++++++++++++
 WeakAuras/Types.lua      |  6 ++++--
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index cc484ca9cc..31e174ba67 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -106,6 +106,39 @@ WeakAuras.function_strings = {
   ]]
 };
 
+local hsvFrame = CreateFrame("Colorselect")
+
+-- HSV transition, for a much prettier color transition in many cases
+-- see http://www.wowinterface.com/forums/showthread.php?t=48236
+function WeakAuras.GetHSVTransition(perc, r1, g1, b1, a1, r2, g2, b2, a2)
+  --get hsv color for colorA
+  hsvFrame:SetColorRGB(r1, g1, b1)
+  local h1, s1, v1 = hsvFrame:GetColorHSV() -- hue, saturation, value
+  --get hsv color for colorB
+  hsvFrame:SetColorRGB(r2, g2, b2)
+  local h2, s2, v2 = hsvFrame:GetColorHSV() -- hue, saturation, value
+  local h3 = floor(h1 - (h1 - h2) * perc)
+  -- find the shortest arc through the color circle, then interpolate
+  local diff = h2 - h1
+  if diff < -180 then
+    diff = diff + 360
+  elseif diff > 180 then
+    diff = diff - 360
+  end
+
+  local h3 = (h1 + perc * diff) % 360
+  local s3 = s1 - ( s1 - s2 ) * perc
+  local v3 = v1 - ( v1 - v2 ) * perc
+  --get the RGB values of the new color
+  hsvFrame:SetColorHSV(h3, s3, v3)
+  local r, g, b = hsvFrame:GetColorRGB()
+  --interpolate alpha
+  local a = a1 - ( a1 - a2 ) * perc
+  --return the new color
+  return r, g, b, a
+end
+
+
 WeakAuras.anim_function_strings = {
   straight = [[
     function(progress, start, delta)
@@ -127,6 +160,11 @@ WeakAuras.anim_function_strings = {
       return r1 + (progress * (r2 - r1)), g1 + (progress * (g2 - g1)), b1 + (progress * (b2 - b1)), a1 + (progress * (a2 - a1))
     end
   ]],
+  straightHSV = [[
+    function(progress, r1, g1, b1, a1, r2, g2, b2, a2)
+      return WeakAuras.GetHSVTransition(progress, r1, g1, b1, a1, r2, g2, b2, a2)
+    end
+  ]],
   circle = [[
     function(progress, startX, startY, deltaX, deltaY)
       local angle = progress * 2 * math.pi
@@ -211,6 +249,13 @@ WeakAuras.anim_function_strings = {
            a1 + (newProgress * (a2 - a1))
     end
   ]],
+  pulseHSV = [[
+    function(progress, r1, g1, b1, a1, r2, g2, b2, a2)
+      local angle = (progress * 2 * math.pi) - (math.pi / 2)
+      local newProgress = ((math.sin(angle) + 1)/2);
+      return WeakAuras.GetHSVTransition(newProgress, r1, g1, b1, a1, r2, g2, b2, a2)
+    end
+  ]],
   fauxspin = [[
     function(progress, startX, startY, scaleX, scaleY)
       local angle = progress * 2 * math.pi
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 89fd6790d4..b588be4b24 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -1153,8 +1153,10 @@ WeakAuras.anim_rotate_types = {
 }
 
 WeakAuras.anim_color_types = {
-  straightColor = L["Gradient"],
-  pulseColor = L["Gradient Pulse"],
+  straightColor = L["Legacy RGB Gradient"],
+  straightHSV = L["Gradient"],
+  pulseColor = L["Legacy RGB Gradient Pulse"],
+  pulseHSV = L["Gradient Pulse"],
   custom = L["Custom Function"]
 }
 

From e3cf0295ca749983831482188afd020755f86d1e Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Wed, 16 May 2018 21:14:11 +0200
Subject: [PATCH 49/82] change some print formats

---
 WeakAuras/WeakAuras.lua                         | 2 +-
 WeakAurasOptions/OptionsFrames/OptionsFrame.lua | 2 +-
 WeakAurasOptions/WeakAurasOptions.lua           | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index e27137f039..cc166484f8 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -65,7 +65,7 @@ function WeakAuras.LoadOptions(msg)
     else
       local loaded, reason = LoadAddOn("WeakAurasOptions");
       if not(loaded) then
-        print("|cff9900FF".."WeakAuras Options"..FONT_COLOR_CODE_CLOSE.." could not be loaded: "..RED_FONT_COLOR_CODE.._G["ADDON_"..reason]);
+        print(WeakAuras.printPrefix .. "Options could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
         return false;
       end
     end
diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index 7e0a9683bb..a960de2e57 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -332,7 +332,7 @@ function WeakAuras.CreateFrame()
       if not(IsAddOnLoaded("WeakAurasTutorials")) then
         local loaded, reason = LoadAddOn("WeakAurasTutorials");
         if not(loaded) then
-          print("|cff9900FF".."WeakAurasTutorials"..FONT_COLOR_CODE_CLOSE.." could not be loaded: "..RED_FONT_COLOR_CODE.._G["ADDON_"..reason]);
+          print(WeakAuras.printPrefix .. "Tutorials could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
           return;
         end
       end
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 621332c84b..85ae7df609 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -20,7 +20,6 @@ local L = WeakAuras.L
 local ADDON_NAME = "WeakAurasOptions";
 local prettyPrint = WeakAuras.prettyPrint
 
-local font_close,yellow_font,red_font = FONT_COLOR_CODE_CLOSE,YELLOW_FONT_COLOR_CODE,RED_FONT_COLOR_CODE
 local ValidateNumeric = function(info,val)
   if not tonumber(val) then
     return false;
@@ -4190,7 +4189,7 @@ function WeakAuras.OpenModelPicker(data, field)
   if not(IsAddOnLoaded("WeakAurasModelPaths")) then
     local loaded, reason = LoadAddOn("WeakAurasModelPaths");
     if not(loaded) then
-      print("|cff9900FF".."WeakAurasModelPaths"..FONT_COLOR_CODE_CLOSE.." could not be loaded: "..RED_FONT_COLOR_CODE.._G["ADDON_"..reason]);
+      print(WeakAuras.printPrefix .. "ModelPaths could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
       WeakAuras.ModelPaths = {};
     end
     frame.modelPicker.modelTree:SetTree(WeakAuras.ModelPaths);
@@ -4210,7 +4209,7 @@ function WeakAuras.OpenTriggerTemplate(data)
   if not(IsAddOnLoaded("WeakAurasTemplates")) then
     local loaded, reason = LoadAddOn("WeakAurasTemplates");
     if not(loaded) then
-      print("|cff9900FF".."WeakAurasTemplates"..FONT_COLOR_CODE_CLOSE.." could not be loaded: "..RED_FONT_COLOR_CODE.._G["ADDON_"..reason]);
+      print(WeakAuras.printPrefix .. "Templates could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
       return;
     end
     frame.newView = WeakAuras.CreateTemplateView(frame);

From 7fc6a990b690903882989056ddb0bbb01190d5be Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sun, 20 May 2018 00:59:24 +0200
Subject: [PATCH 50/82] make the "cannot load addon" messages a bit nicer

---
 WeakAuras/WeakAuras.lua                         | 3 ++-
 WeakAurasOptions/OptionsFrames/OptionsFrame.lua | 3 ++-
 WeakAurasOptions/WeakAurasOptions.lua           | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index cc166484f8..f2f05979fe 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -64,8 +64,9 @@ function WeakAuras.LoadOptions(msg)
       return false;
     else
       local loaded, reason = LoadAddOn("WeakAurasOptions");
+      reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
       if not(loaded) then
-        print(WeakAuras.printPrefix .. "Options could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
+        print(WeakAuras.printPrefix .. "Options could not be loaded, the addon is " .. reason);
         return false;
       end
     end
diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index a960de2e57..3678ee8070 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -331,8 +331,9 @@ function WeakAuras.CreateFrame()
     tutorialbutton:SetScript("OnClick", function()
       if not(IsAddOnLoaded("WeakAurasTutorials")) then
         local loaded, reason = LoadAddOn("WeakAurasTutorials");
+        reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
         if not(loaded) then
-          print(WeakAuras.printPrefix .. "Tutorials could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
+          print(WeakAuras.printPrefix .. "Tutorials could not be loaded, the addon is " .. reason);
           return;
         end
       end
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 85ae7df609..8cecbdc5ac 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -4188,8 +4188,9 @@ end
 function WeakAuras.OpenModelPicker(data, field)
   if not(IsAddOnLoaded("WeakAurasModelPaths")) then
     local loaded, reason = LoadAddOn("WeakAurasModelPaths");
+    reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
-      print(WeakAuras.printPrefix .. "ModelPaths could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
+      print(WeakAuras.printPrefix .. "ModelPaths could not be loaded, the addon is " .. reason]);
       WeakAuras.ModelPaths = {};
     end
     frame.modelPicker.modelTree:SetTree(WeakAuras.ModelPaths);
@@ -4208,8 +4209,9 @@ end
 function WeakAuras.OpenTriggerTemplate(data)
   if not(IsAddOnLoaded("WeakAurasTemplates")) then
     local loaded, reason = LoadAddOn("WeakAurasTemplates");
+    reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
-      print(WeakAuras.printPrefix .. "Templates could not be loaded: " .. RED_FONT_COLOR_CODE .. _G["ADDON_" .. reason]);
+      print(WeakAuras.printPrefix .. "Templates could not be loaded, the addon is " .. reason]);
       return;
     end
     frame.newView = WeakAuras.CreateTemplateView(frame);

From 76d554c17f1976fc4e0119e1513727248cde174b Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 26 May 2018 00:02:49 +0200
Subject: [PATCH 51/82] oops

---
 WeakAurasOptions/WeakAurasOptions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 8cecbdc5ac..7d3343e025 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -4190,7 +4190,7 @@ function WeakAuras.OpenModelPicker(data, field)
     local loaded, reason = LoadAddOn("WeakAurasModelPaths");
     reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
-      print(WeakAuras.printPrefix .. "ModelPaths could not be loaded, the addon is " .. reason]);
+      print(WeakAuras.printPrefix .. "ModelPaths could not be loaded, the addon is " .. reason);
       WeakAuras.ModelPaths = {};
     end
     frame.modelPicker.modelTree:SetTree(WeakAuras.ModelPaths);

From 601c8f4ff00626440923d622e10679e5de919454 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 26 May 2018 00:50:20 +0200
Subject: [PATCH 52/82] oops 2

---
 WeakAurasOptions/WeakAurasOptions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 7d3343e025..12303f22d2 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -4211,7 +4211,7 @@ function WeakAuras.OpenTriggerTemplate(data)
     local loaded, reason = LoadAddOn("WeakAurasTemplates");
     reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
-      print(WeakAuras.printPrefix .. "Templates could not be loaded, the addon is " .. reason]);
+      print(WeakAuras.printPrefix .. "Templates could not be loaded, the addon is " .. reason);
       return;
     end
     frame.newView = WeakAuras.CreateTemplateView(frame);

From a8ad15d9b61850ead787233be3849963cf8cb0e7 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Wed, 30 May 2018 15:29:21 +0200
Subject: [PATCH 53/82] Fix nil error

Closes #433
---
 WeakAuras/WeakAuras.lua                         | 2 +-
 WeakAurasOptions/OptionsFrames/OptionsFrame.lua | 2 +-
 WeakAurasOptions/WeakAurasOptions.lua           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index f2f05979fe..8844d604df 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -64,8 +64,8 @@ function WeakAuras.LoadOptions(msg)
       return false;
     else
       local loaded, reason = LoadAddOn("WeakAurasOptions");
-      reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
       if not(loaded) then
+        reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
         print(WeakAuras.printPrefix .. "Options could not be loaded, the addon is " .. reason);
         return false;
       end
diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index 3678ee8070..ef189aa730 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -331,8 +331,8 @@ function WeakAuras.CreateFrame()
     tutorialbutton:SetScript("OnClick", function()
       if not(IsAddOnLoaded("WeakAurasTutorials")) then
         local loaded, reason = LoadAddOn("WeakAurasTutorials");
-        reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
         if not(loaded) then
+          reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
           print(WeakAuras.printPrefix .. "Tutorials could not be loaded, the addon is " .. reason);
           return;
         end
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 12303f22d2..81530d0390 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -4209,8 +4209,8 @@ end
 function WeakAuras.OpenTriggerTemplate(data)
   if not(IsAddOnLoaded("WeakAurasTemplates")) then
     local loaded, reason = LoadAddOn("WeakAurasTemplates");
-    reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
+      reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
       print(WeakAuras.printPrefix .. "Templates could not be loaded, the addon is " .. reason);
       return;
     end

From d700cdee009f78d19e9ab0c2cf5ec9c719172892 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sun, 3 Jun 2018 22:00:03 +0200
Subject: [PATCH 54/82] Fix tooltip truncation

Fixes #435
---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index c9ebfe3b35..938e03abd6 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -77,7 +77,7 @@ local function get_encounters_list()
     encounter_list = encounter_list .. "\n"
   end
 
-  return encounter_list:sub(1, -4) .. L["\nSupports multiple entries, separated by commas\n"]
+  return encounter_list:sub(1, -3) .. L["\n\nSupports multiple entries, separated by commas\n"]
 end
 
 WeakAuras.function_strings = {

From 789acd76f9fc4dbdf8742e71957e1dc4cb1134e2 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 9 Jun 2018 12:26:13 +0200
Subject: [PATCH 55/82] Fix charges Changed trigger

---
 WeakAuras/Prototypes.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 938e03abd6..8ff284ae9c 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2099,6 +2099,8 @@ WeakAuras.event_prototypes = {
   ["Charges Changed (Spell)"] = {
     type = "event",
     events = {
+    },
+    internal_events = {
       "SPELL_CHARGES_CHANGED",
     },
     name = L["Charges Changed (Spell)"],

From 372be07d7ef6b7ba8613163ed3d889dbca29acc3 Mon Sep 17 00:00:00 2001
From: emptyrivers <emptyrivers@users.noreply.github.com>
Date: Wed, 13 Jun 2018 00:49:32 -0500
Subject: [PATCH 56/82] Ignore Load tab when copying display

fixes #445
---
 .../AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua b/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
index 70dbd8ada3..677ab7888e 100644
--- a/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
+++ b/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
@@ -18,6 +18,7 @@ local ignoreForCopyingDisplay = {
   trigger = true,
   untrigger = true,
   conditions = true,
+  load = true,
   actions = true,
   animation = true,
   id = true,

From 3a38bd0bd40cda83d981836d7cbd904ccb531b24 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Thu, 14 Jun 2018 21:19:24 +0200
Subject: [PATCH 57/82] fix variable shadowing

---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 9e0a0b8edb..5c30a00ddd 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -127,7 +127,7 @@ function WeakAuras.GetHSVTransition(perc, r1, g1, b1, a1, r2, g2, b2, a2)
     diff = diff - 360
   end
 
-  local h3 = (h1 + perc * diff) % 360
+  h3 = (h1 + perc * diff) % 360
   local s3 = s1 - ( s1 - s2 ) * perc
   local v3 = v1 - ( v1 - v2 ) * perc
   --get the RGB values of the new color

From d1a72c21400e4440757213ecd7f651fd5938e8d1 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sun, 17 Jun 2018 17:07:06 +0200
Subject: [PATCH 58/82] Fix nil value error

Fixes #451
---
 WeakAurasOptions/WeakAurasOptions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 81530d0390..c8fcdc5aeb 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -4188,8 +4188,8 @@ end
 function WeakAuras.OpenModelPicker(data, field)
   if not(IsAddOnLoaded("WeakAurasModelPaths")) then
     local loaded, reason = LoadAddOn("WeakAurasModelPaths");
-    reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
     if not(loaded) then
+      reason = string.lower("|cffff2020" .. _G["ADDON_" .. reason] .. "|r.")
       print(WeakAuras.printPrefix .. "ModelPaths could not be loaded, the addon is " .. reason);
       WeakAuras.ModelPaths = {};
     end

From d1d1a13a79ad34f643f17cd0baef48aab01bf457 Mon Sep 17 00:00:00 2001
From: Buds <mrbouyou@gmail.com>
Date: Wed, 20 Jun 2018 02:01:00 +0200
Subject: [PATCH 59/82] fix CheckPvpTalentByIndex nil index error (#453)

check C_SpecializationInfo.GetPvpTalentSlotInfo doesn't return nil
---
 WeakAuras/Prototypes.lua | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 5c30a00ddd..7bdf616ae5 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -491,14 +491,18 @@ end
 function WeakAuras.CheckPvpTalentByIndex(index)
   if (index <= 3) then
     local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(1);
+    if not talentSlotInfo then return false end
     local checkTalentId = talentSlotInfo.availableTalentIDs[index];
     return talentSlotInfo.selectedTalentID == checkTalentId;
   else
-    local checkTalentId = C_SpecializationInfo.GetPvpTalentSlotInfo(2).availableTalentIDs[index - 3];
-    for i = 2, 4 do
-      local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(i);
-      if (talentSlotInfo.selectedTalentID == checkTalentId) then
-        return true;
+    local checkTalentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(2)
+    if checkTalentSlotInfo then
+      local checkTalentId = talentSlotInfo.availableTalentIDs[index - 3];
+      for i = 2, 4 do
+        local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(i);
+        if talentSlotInfo and (talentSlotInfo.selectedTalentID == checkTalentId) then
+          return true;
+        end
       end
     end
     return false;

From f459135de548463ebe546dcd3e18b681eabdd7cc Mon Sep 17 00:00:00 2001
From: Buds <mrbouyou@gmail.com>
Date: Fri, 22 Jun 2018 01:55:41 +0200
Subject: [PATCH 60/82] oops

---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 7bdf616ae5..96af258dbb 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -497,7 +497,7 @@ function WeakAuras.CheckPvpTalentByIndex(index)
   else
     local checkTalentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(2)
     if checkTalentSlotInfo then
-      local checkTalentId = talentSlotInfo.availableTalentIDs[index - 3];
+      local checkTalentId = checkTalentSlotInfo.availableTalentIDs[index - 3];
       for i = 2, 4 do
         local talentSlotInfo = C_SpecializationInfo.GetPvpTalentSlotInfo(i);
         if talentSlotInfo and (talentSlotInfo.selectedTalentID == checkTalentId) then

From 56cba6a261b19f65fbb8c0eb0c082f57ace9bcca Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 23 Jun 2018 13:39:39 +0200
Subject: [PATCH 61/82] Fix Charges not updating on talent changes

Github-Issue: 458
---
 WeakAuras/Prototypes.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 96af258dbb..e0532458e8 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -1886,6 +1886,10 @@ WeakAuras.event_prototypes = {
             state.resort = true;
             state.changed = true;
           end
+          if (state.stacks ~= charges) then
+            state.changed = true;
+            state.stacks = charges;
+          end
           state.progressType = 'timed';
         ]=];
       else
@@ -1936,6 +1940,10 @@ WeakAuras.event_prototypes = {
             state.total = nil;
             state.progressType = 'timed';
           end
+          if (state.stacks ~= charges) then
+            state.changed = true;
+            state.stacks = charges;
+          end
         ]=];
         local trackedCharge = tonumber(trigger.trackcharge or 1) or 1;
         ret = ret .. ret2:format(trackedCharge - 1);
@@ -2054,9 +2062,6 @@ WeakAuras.event_prototypes = {
       end
       return icon;
     end,
-    stacksFunc = function(trigger)
-      return WeakAuras.GetSpellCharges(trigger.realSpellName);
-    end,
     hasSpellID = true,
     automaticrequired = true,
     automaticAutoHide = false

From 339e756fa7aca0781f981f8f05fe3075d7feac0b Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 23 Jun 2018 15:05:41 +0200
Subject: [PATCH 62/82] Fix tooltip scanning and improve the functionality

The tooltip text region is now at 5 instead of 11.

Additionally the tooltip now longer contains the debuffClass, so
use the one from UnitAura instead.

Implement a getting one of the first three numbers out of the tooltip.
Though the user has to choose.

Github-Issue: 459
---
 WeakAuras/BuffTrigger.lua        | 10 +++++++---
 WeakAuras/Types.lua              |  6 ++++++
 WeakAuras/WeakAuras.lua          | 32 ++++++++++++--------------------
 WeakAurasOptions/BuffTrigger.lua |  9 +++++++++
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index 29d49369d9..bd0fcbb986 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -496,8 +496,10 @@ function WeakAuras.ScanAuras(unit)
               -- Update scan cache
               if(aura_scan_cache[unit][filter].up_to_date < index) then
                 -- Query aura data
-                name, icon, count, _, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, index, filter);
-                tooltip, debuffClass, tooltipSize = WeakAuras.GetAuraTooltipInfo(unit, index, filter);
+                name, icon, count, debuffClass, duration, expirationTime, unitCaster, isStealable, _, spellId = UnitAura(unit, index, filter);
+                local tooltipSize1, tooltipSize2, tooltipSize3;
+                tooltip, _, tooltipSize1, tooltipSize2, tooltipSize3 = WeakAuras.GetAuraTooltipInfo(unit, index, filter);
+                tooltipSize = {tooltipSize1, tooltipSize2, tooltipSize3}
                 aura_scan_cache[unit][filter][index] = aura_scan_cache[unit][filter][index] or {};
 
                 -- Save aura data to cache
@@ -542,7 +544,8 @@ function WeakAuras.ScanAuras(unit)
 
               -- Aura conforms to trigger options?
               if(data.subcount) then
-                count = tooltipSize;
+                local index = data.subcountCount or 1;
+                count = tooltipSize[index];
               end
               if(name and ((not data.count) or data.count(count)) and (data.ownOnly ~= false or not UnitIsUnit("player", unitCaster or "")) and data.scanFunc(name, tooltip, isStealable, spellId, debuffClass)) then
                 -- Show display and handle clones
@@ -1505,6 +1508,7 @@ function BuffTrigger.Add(data)
           autoclone = trigger.autoclone,
           groupclone = trigger.groupclone,
           subcount = trigger.subcount,
+          subcountCount = trigger.subcountCount,
           scanFunc = scanFunc,
           debuffType = trigger.debuffType,
           names = trigger.names,
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 7510a493a8..7ebe194aba 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -111,6 +111,12 @@ WeakAuras.debuff_types = {
   HARMFUL = L["Debuff"]
 }
 
+WeakAuras.tooltip_count = {
+  [1] = L["First"],
+  [2] = L["Second"],
+  [3] = L["Third"]
+}
+
 WeakAuras.aura_types = {
   BUFF = L["Buff"],
   DEBUFF = L["Debuff"]
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index d6d9e4a2ea..38746ccdcc 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -3392,31 +3392,23 @@ end
 function WeakAuras.GetAuraTooltipInfo(unit, index, filter)
   local tooltip = WeakAuras.GetHiddenTooltip();
   tooltip:SetUnitAura(unit, index, filter);
-  local debuffTypeLine, tooltipTextLine = select(11, tooltip:GetRegions())
+  local tooltipTextLine = select(5, tooltip:GetRegions())
+
   local tooltipText = tooltipTextLine and tooltipTextLine:GetObjectType() == "FontString" and tooltipTextLine:GetText() or "";
-  local debuffType = debuffTypeLine and debuffTypeLine:GetObjectType() == "FontString" and debuffTypeLine:GetText() or "";
+  local debuffType = "none";
   local found = false;
-  for i,v in pairs(WeakAuras.debuff_class_types) do
-    if(v == debuffType) then
-      found = true;
-      debuffType = i;
-      break;
-    end
-  end
-  if not(found) then
-    debuffType = "none";
-  end
-  local tooltipSize,_;
+  local tooltipSize = {};
   if(tooltipText) then
-    local n2
-    _, _, tooltipSize, n2 = tooltipText:find("(%d+),(%d%d%d)")  -- Blizzard likes american digit grouping, e.g. "9123="9,123"   /mikk
-    if tooltipSize then
-      tooltipSize = tooltipSize..n2
-    else
-      _, _, tooltipSize = tooltipText:find("(%d+)")
+    for t in tooltipText:gmatch("(%d[%d%.,]*)") do
+      tinsert(tooltipSize, tonumber(t));
     end
   end
-  return tooltipText, debuffType, tonumber(tooltipSize) or 0;
+
+  if (#tooltipSize) then
+    return tooltipText, debuffType, unpack(tooltipSize);
+  else
+    return tooltipText, debuffType, 0;
+  end
 end
 
 local function tooltip_draw()
diff --git a/WeakAurasOptions/BuffTrigger.lua b/WeakAurasOptions/BuffTrigger.lua
index 3a35a3297f..29aa682d08 100644
--- a/WeakAurasOptions/BuffTrigger.lua
+++ b/WeakAurasOptions/BuffTrigger.lua
@@ -2,6 +2,7 @@ local L = WeakAuras.L;
 
 local operator_types = WeakAuras.operator_types;
 local debuff_types = WeakAuras.debuff_types;
+local tooltip_count = WeakAuras.tooltip_count;
 local unit_types = WeakAuras.unit_types;
 local actual_unit_types_with_specific = WeakAuras.actual_unit_types_with_specific;
 local group_aura_name_info_types = WeakAuras.group_aura_name_info_types;
@@ -784,6 +785,14 @@ function WeakAuras.GetBuffTriggerOptions(data, trigger)
       hidden = function() return not (trigger.type == "aura" and trigger.fullscan) end,
       order = 55
     },
+    subcountCount = {
+      type = "select",
+      values = tooltip_count,
+      width = "double",
+      name = L["Use nth value from tooltip:"],
+      hidden = function() return not (trigger.type == "aura" and trigger.fullscan and trigger.subcount) end,
+      order = 55.5
+    },
     useRem = {
       type = "toggle",
       name = L["Remaining Time"],

From 540c16b29fb958e511c3495cb68a665c35642835 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 25 Jun 2018 15:31:49 +0200
Subject: [PATCH 63/82] Bring back accidently deleted charges function

---
 WeakAuras/Prototypes.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index e0532458e8..d7d4222eb5 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2062,6 +2062,9 @@ WeakAuras.event_prototypes = {
       end
       return icon;
     end,
+    stacksFunc = function(trigger)
+      return WeakAuras.GetSpellCharges(trigger.realSpellName);
+    end,
     hasSpellID = true,
     automaticrequired = true,
     automaticAutoHide = false

From ee9b30192da90be7ee5514c6d278008b242e3f7d Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Wed, 27 Jun 2018 17:24:47 +0200
Subject: [PATCH 64/82] clean up a few unused upvalues

---
 WeakAuras/Prototypes.lua                      |  2 +-
 WeakAuras/WeakAuras.lua                       | 16 ++++++++--------
 WeakAurasOptions/OptionsFrames/MoverSizer.lua |  6 ------
 WeakAurasOptions/WeakAurasOptions.lua         |  5 ++---
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index d7d4222eb5..f20de5a490 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -5,7 +5,7 @@ local select, pairs, type = select, pairs, type
 local ceil, min = ceil, min
 
 -- WoW APIs
-local GetPvpTalentInfo, GetTalentInfo = GetPvpTalentInfo, GetTalentInfo
+local GetTalentInfo = GetTalentInfo
 local GetNumSpecializationsForClassID, GetSpecialization = GetNumSpecializationsForClassID, GetSpecialization
 local UnitClass, UnitHealth, UnitHealthMax, UnitName, UnitStagger, UnitPower, UnitPowerMax = UnitClass, UnitHealth, UnitHealthMax, UnitName, UnitStagger, UnitPower, UnitPowerMax
 local UnitAlternatePowerInfo, UnitAlternatePowerTextureInfo = UnitAlternatePowerInfo, UnitAlternatePowerTextureInfo
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 38746ccdcc..a91be9f834 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -4,20 +4,20 @@ local internalVersion = 3;
 local tinsert, tconcat, tremove, tContains, wipe = table.insert, table.concat, table.remove, tContains, wipe
 local fmt, tostring, select, pairs, next, type = string.format, tostring, select, pairs, next, type
 local loadstring, assert, error = loadstring, assert, error
-local setmetatable, getmetatable = setmetatable, getmetatable
+local setmetatable = setmetatable
 local coroutine =  coroutine
 local _G = _G
 
 -- WoW APIs
-local GetTalentInfo, GetPvpTalentInfo, IsAddOnLoaded, InCombatLockdown = GetTalentInfo, GetPvpTalentInfo, IsAddOnLoaded, InCombatLockdown
-local LoadAddOn, setfenv, UnitName, GetRealmName, UnitGroupRolesAssigned, UnitRace, UnitFactionGroup, IsInRaid
-  = LoadAddOn, setfenv, UnitName, GetRealmName, UnitGroupRolesAssigned, UnitRace, UnitFactionGroup, IsInRaid
+local GetTalentInfo, IsAddOnLoaded, InCombatLockdown = GetTalentInfo, IsAddOnLoaded, InCombatLockdown
+local LoadAddOn, setfenv, UnitName, GetRealmName, UnitRace, UnitFactionGroup, IsInRaid
+  = LoadAddOn, setfenv, UnitName, GetRealmName, UnitRace, UnitFactionGroup, IsInRaid
 local UnitClass, UnitExists, UnitGUID, UnitAffectingCombat, GetInstanceInfo, IsInInstance
   = UnitClass, UnitExists, UnitGUID, UnitAffectingCombat, GetInstanceInfo, IsInInstance
-local GetNumGroupMembers, UnitIsUnit, GetRaidRosterInfo, GetSpecialization, GetSpecializationRole, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
-  = GetNumGroupMembers, UnitIsUnit, GetRaidRosterInfo, GetSpecialization, GetSpecializationRole, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
-local SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, PlaySoundFile, PlaySound, GetTime, GetSpellLink, GetItemInfo
-  = SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, PlaySoundFile, PlaySound, GetTime, GetSpellLink, GetItemInfo
+local UnitIsUnit, GetRaidRosterInfo, GetSpecialization, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
+  = UnitIsUnit, GetRaidRosterInfo, GetSpecialization, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
+local SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, GetTime, GetSpellLink, GetItemInfo
+  = SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, GetTime, GetSpellLink, GetItemInfo
 local CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, random, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
   = CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, random, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
 local debugstack, IsSpellKnown = debugstack, IsSpellKnown
diff --git a/WeakAurasOptions/OptionsFrames/MoverSizer.lua b/WeakAurasOptions/OptionsFrames/MoverSizer.lua
index 800b76736b..4165accbbe 100644
--- a/WeakAurasOptions/OptionsFrames/MoverSizer.lua
+++ b/WeakAurasOptions/OptionsFrames/MoverSizer.lua
@@ -7,17 +7,11 @@ local IsShiftKeyDown, CreateFrame =  IsShiftKeyDown, CreateFrame
 local AceConfigDialog = LibStub("AceConfigDialog-3.0")
 
 local WeakAuras = WeakAuras
-local L = WeakAuras.L
 
 local moversizer
 local mover
 
-local displayButtons = WeakAuras.displayButtons
-local displayOptions = WeakAuras.displayOptions
-local loaded = WeakAuras.loaded
-local regionOptions = WeakAuras.regionOptions
 local savedVars = WeakAuras.savedVars
-local tempGroup = WeakAuras.tempGroup
 
 local function EnsureTexture(self, texture)
   if(texture) then
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index c8fcdc5aeb..7f850afb2c 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -9,11 +9,10 @@ local _G = _G
 -- WoW APIs
 local InCombatLockdown = InCombatLockdown
 local GetSpellInfo, GetItemInfo, GetItemIcon, UnitName = GetSpellInfo, GetItemInfo, GetItemIcon, UnitName
-local GetScreenWidth, GetScreenHeight, GetBuildInfo, GetLocale, GetTime, PlaySoundFile, PlaySound, CreateFrame, IsAddOnLoaded, LoadAddOn
-  = GetScreenWidth, GetScreenHeight, GetBuildInfo, GetLocale, GetTime, PlaySoundFile, PlaySound, CreateFrame, IsAddOnLoaded, LoadAddOn
+local GetScreenWidth, GetScreenHeight, GetBuildInfo, GetLocale, GetTime, CreateFrame, IsAddOnLoaded, LoadAddOn
+  = GetScreenWidth, GetScreenHeight, GetBuildInfo, GetLocale, GetTime, CreateFrame, IsAddOnLoaded, LoadAddOn
 
 local AceGUI = LibStub("AceGUI-3.0")
-local AceConfigDialog = LibStub("AceConfigDialog-3.0")
 
 local WeakAuras = WeakAuras
 local L = WeakAuras.L

From 182a439ddcbe57c418b51653f6597bcb87e75c5d Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Fri, 29 Jun 2018 22:57:42 +0200
Subject: [PATCH 65/82] AuraBar: Add Icon Desaturate to Conditions

Just because someone asked for it.

Ticket-Nr: 1129
---
 WeakAuras/RegionTypes/AuraBar.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WeakAuras/RegionTypes/AuraBar.lua b/WeakAuras/RegionTypes/AuraBar.lua
index 089de4db3d..f0433fe591 100644
--- a/WeakAuras/RegionTypes/AuraBar.lua
+++ b/WeakAuras/RegionTypes/AuraBar.lua
@@ -82,6 +82,11 @@ local properties = {
     setter = "SetIconColor",
     type = "color"
   },
+  desaturate = {
+    display = L["Icon Desaturate"],
+    setter = "SetIconDesaturated",
+    type = "bool",
+  },
   backgroundColor = {
     display = L["Background Color"],
     setter = "SetBackgroundColor",
@@ -1434,6 +1439,10 @@ local function modify(parent, region, data)
     self.icon:SetVertexColor(r, g, b, a);
   end
 
+  function region:SetIconDesaturated(b)
+    self.icon:SetDesaturated(b);
+  end
+
   function region:SetBackgroundColor(r, g, b, a)
     self.bar:SetBackgroundColor(r, g, b, a);
   end

From a9333b74b7ed05eb1956de9f5a88cbfb6834918c Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Fri, 29 Jun 2018 23:02:22 +0200
Subject: [PATCH 66/82] Add Bar Alpha to Conditions

Github-Issue: 390
---
 WeakAuras/RegionTypes/AuraBar.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WeakAuras/RegionTypes/AuraBar.lua b/WeakAuras/RegionTypes/AuraBar.lua
index f0433fe591..99a4186fb2 100644
--- a/WeakAuras/RegionTypes/AuraBar.lua
+++ b/WeakAuras/RegionTypes/AuraBar.lua
@@ -92,6 +92,15 @@ local properties = {
     setter = "SetBackgroundColor",
     type = "color"
   },
+  alpha = {
+    display = L["Bar Alpha"],
+    setter = "SetBarAlpha",
+    type = "number",
+    min = 0,
+    max = 1,
+    bigStep = 0.01,
+    isPercent = true
+  },
   sparkColor = {
     display = L["Spark Color"],
     setter = "SetSparkColor",
@@ -1447,6 +1456,10 @@ local function modify(parent, region, data)
     self.bar:SetBackgroundColor(r, g, b, a);
   end
 
+  function region:SetBarAlpha(alpha)
+    self:SetAlpha(alpha);
+  end
+
   function region:SetSparkColor(r, g, b, a)
     self.bar.spark:SetVertexColor(r, g, b, a);
   end

From 72c9c1d3a3214b2c77daec17d940e83e65ecfade Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Fri, 29 Jun 2018 23:53:57 +0200
Subject: [PATCH 67/82] Fix display options for multi-selection and overlays

Overlays are special in that their name for the same option can actually
vary. The code in nameAll handling that was apparently never tested.
Replace it with a "combined" name.

Github-Issue: 464
---
 WeakAurasOptions/WeakAurasOptions.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 7f850afb2c..7b21664e37 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -1973,6 +1973,7 @@ local function replaceNameDescFuncs(intable, data)
   local function nameAll(info)
     local combinedName;
     local first = true;
+    local foundNames = {};
     for index, childId in ipairs(data.controlledChildren) do
       local childData = WeakAuras.GetData(childId);
       if(childData) then
@@ -1985,11 +1986,15 @@ local function replaceNameDescFuncs(intable, data)
           else
             name = childOption.name;
           end
-          if(first) then
+          if (not name) then
+            -- Do nothing
+          elseif(first) then
             combinedName = name;
             first = false;
-          elseif not(combinedName == name) then
-            return childOption.name("default");
+            foundNames[name] = true;
+          elseif not(foundNames[name]) then
+            combinedName = combinedName .. "/" .. name;
+            foundNames[name] = true;
           end
         end
       end

From 04b7a334ec9622686dd7a09e7e6d1afe6b3e440a Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 30 Jun 2018 13:09:30 +0200
Subject: [PATCH 68/82] Add initial templates for some classes

Needs a bit of curating, e.g. contains a few duplicates.
Also m,issing Warlock, Monk, Druid and Demon Hunter.
---
 WeakAurasTemplates/TriggerTemplatesData.lua | 1205 ++++++++++++++++++-
 1 file changed, 1196 insertions(+), 9 deletions(-)

diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index cff07a64b0..21b8d20bf5 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -61,18 +61,66 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 248622, type = "buff", unit = "player", talent = 16}, -- In For The Kill
+        { spell = 197690, type = "buff", unit = "player", talent = 12}, -- Defensive Stance
+        { spell = 118038, type = "buff", unit = "player"}, -- Die by the Sword
+        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 107574, type = "buff", unit = "player", talent = 17}, -- Avatar
+        { spell = 262228, type = "buff", unit = "player", talent = 18}, -- Deadly Calm
+        { spell = 32216, type = "buff", unit = "player", talent = 5}, -- Victorious
+        { spell = 227847, type = "buff", unit = "player"}, -- Bladestorm
+        { spell = 52437, type = "buff", unit = "player", talent = 2}, -- Sudden Death
+        { spell = 18499, type = "buff", unit = "player"}, -- Berserker Rage
+        { spell = 202164, type = "buff", unit = "player", talent = 11}, -- Bounding Stride
+        { spell = 7384, type = "buff", unit = "player"}, -- Overpower
+        { spell = 262232, type = "buff", unit = "player", talent = 1}, -- War Machine
+        { spell = 97463, type = "buff", unit = "player"}, -- Rallying Cry
+        { spell = 260708, type = "buff", unit = "player"}, -- Sweeping Strikes
       },
       icon = 458972
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 115804, type = "debuff", unit = "target"}, -- Mortal Wounds
+        { spell = 772, type = "debuff", unit = "target", talent = 9}, -- Rend
+        { spell = 208086, type = "debuff", unit = "target"}, -- Colossus Smash
+        { spell = 105771, type = "debuff", unit = "target"}, -- Charge
+        { spell = 5246, type = "debuff", unit = "target"}, -- Intimidating Shout
+        { spell = 1715, type = "debuff", unit = "target"}, -- Hamstring
+        { spell = 355, type = "debuff", unit = "target"}, -- Taunt
+        { spell = 262115, type = "debuff", unit = "target"}, -- Deep Wounds
+        { spell = 132169, type = "debuff", unit = "target", talent = 6}, -- Storm Bolt
       },
       icon = 464973
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 100, type = "ability"}, -- Charge
+        { spell = 355, type = "ability"}, -- Taunt
+        { spell = 845, type = "ability", talent = 15}, -- Cleave
+        { spell = 5246, type = "ability"}, -- Intimidating Shout
+        { spell = 6544, type = "ability"}, -- Heroic Leap
+        { spell = 6552, type = "ability"}, -- Pummel
+        { spell = 6673, type = "ability"}, -- Battle Shout
+        { spell = 7384, type = "ability"}, -- Overpower
+        { spell = 12294, type = "ability"}, -- Mortal Strike
+        { spell = 18499, type = "ability"}, -- Berserker Rage
+        { spell = 57755, type = "ability"}, -- Heroic Throw
+        { spell = 97462, type = "ability"}, -- Rallying Cry
+        { spell = 107570, type = "ability", talent = 6}, -- Storm Bolt
+        { spell = 107574, type = "ability", talent = 17}, -- Avatar
+        { spell = 118038, type = "ability"}, -- Die by the Sword
+        { spell = 152277, type = "ability", talent = 21}, -- Ravager
+        { spell = 167105, type = "ability"}, -- Colossus Smash
+        { spell = 202168, type = "ability"}, -- Impending Victory
+        { spell = 212520, type = "ability", talent = 12}, -- Defensive Stance
+        { spell = 227847, type = "ability"}, -- Bladestorm
+        { spell = 260643, type = "ability", talent = 3}, -- Skullsplitter
+        { spell = 260708, type = "ability"}, -- Sweeping Strikes
+        { spell = 262161, type = "ability", talent = 14}, -- Warbreaker
+        { spell = 262228, type = "ability", talent = 18}, -- Deadly Calm
       },
       icon = 132355
     },
@@ -85,14 +133,6 @@ templates.class.WARRIOR = {
     [5] = {
       title = L["PvP Talents"],
       args = {
-        { spell = 198827, type = "debuff", unit = "target", pvptalent = 17}, -- Echo Slam
-        { spell = 198760, type = "buff", unit = "group", pvptalent = 13}, -- Intercept
-        { spell = 198817, type = "ability", pvptalent = 18}, -- Spell Reflection
-        { spell = 236077, type = "debuff", unit = "target", titleSuffix = L["debuff"], pvptalent = 8 }, -- Disarm
-        { spell = 236077, type = "ability", titleSuffix = L["cooldown"], pvptalent = 8 }, -- Disarm
-        { spell = 236273, type = "debuff", unit = "target", titleSuffix = L["debuff"], pvptalent = 14 }, -- Duel
-        { spell = 236273, type = "ability", titleSuffix = L["cooldown"], pvptalent = 14 }, -- Duel
-        { spell = 236320, type = "ability", pvptalent = 15 }, -- War Banner
       },
       icon = "Interface\\Icons\\Achievement_BG_winWSG",
     },
@@ -107,18 +147,58 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 262232, type = "buff", unit = "player", talent = 1}, -- War Machine
+        { spell = 32216, type = "buff", unit = "player", talent = 5}, -- Victorious
+        { spell = 215572, type = "buff", unit = "player", talent = 15}, -- Frothing Berserker
+        { spell = 202539, type = "buff", unit = "player", talent = 9}, -- Furious Slash
+        { spell = 18499, type = "buff", unit = "player"}, -- Berserker Rage
+        { spell = 1719, type = "buff", unit = "player"}, -- Recklessness
+        { spell = 46924, type = "buff", unit = "player", talent = 18}, -- Bladestorm
+        { spell = 202164, type = "buff", unit = "player", talent = 11}, -- Bounding Stride
+        { spell = 85739, type = "buff", unit = "player"}, -- Whirlwind
+        { spell = 280776, type = "buff", unit = "player", talent = 8}, -- Sudden Death
+        { spell = 202225, type = "buff", unit = "player", talent = 10}, -- Furious Charge
+        { spell = 184362, type = "buff", unit = "player"}, -- Enrage
+        { spell = 184364, type = "buff", unit = "player"}, -- Enraged Regeneration
+        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 97463, type = "buff", unit = "player"}, -- Rallying Cry
       },
       icon = 136224
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 132169, type = "debuff", unit = "target", talent = 6}, -- Storm Bolt
+        { spell = 118000, type = "debuff", unit = "target", talent = 17}, -- Dragon Roar
+        { spell = 280773, type = "debuff", unit = "target", talent = 21}, -- Siegebreaker
+        { spell = 105771, type = "debuff", unit = "target"}, -- Charge
+        { spell = 355, type = "debuff", unit = "target"}, -- Taunt
       },
       icon = 132154
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 100, type = "ability"}, -- Charge
+        { spell = 355, type = "ability"}, -- Taunt
+        { spell = 1719, type = "ability"}, -- Recklessness
+        { spell = 5246, type = "ability"}, -- Intimidating Shout
+        { spell = 5308, type = "ability"}, -- Execute
+        { spell = 6544, type = "ability"}, -- Heroic Leap
+        { spell = 6552, type = "ability"}, -- Pummel
+        { spell = 6673, type = "ability"}, -- Battle Shout
+        { spell = 18499, type = "ability"}, -- Berserker Rage
+        { spell = 23881, type = "ability"}, -- Bloodthirst
+        { spell = 46924, type = "ability", talent = 18}, -- Bladestorm
+        { spell = 57755, type = "ability"}, -- Heroic Throw
+        { spell = 85288, type = "ability"}, -- Raging Blow
+        { spell = 97462, type = "ability"}, -- Rallying Cry
+        { spell = 107570, type = "ability", talent = 6}, -- Storm Bolt
+        { spell = 118000, type = "ability", talent = 17}, -- Dragon Roar
+        { spell = 184364, type = "ability"}, -- Enraged Regeneration
+        { spell = 202168, type = "ability", talent = 5}, -- Impending Victory
+        { spell = 280772, type = "ability", talent = 21}, -- Siegebreaker
+
       },
       icon = 136012
     },
@@ -145,18 +225,68 @@ templates.class.WARRIOR = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 12975, type = "buff", unit = "player"}, -- Last Stand
+        { spell = 202164, type = "buff", unit = "player", talent = 5}, -- Bounding Stride
+        { spell = 18499, type = "buff", unit = "player"}, -- Berserker Rage
+        { spell = 202573, type = "buff", unit = "player", talent = 17}, -- Vengeance: Revenge
+        { spell = 871, type = "buff", unit = "player"}, -- Shield Wall
+        { spell = 227744, type = "buff", unit = "player", talent = 21}, -- Ravager
+        { spell = 202574, type = "buff", unit = "player", talent = 17}, -- Vengeance: Ignore Pain
+        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 132404, type = "buff", unit = "player"}, -- Shield Block
+        { spell = 202602, type = "buff", unit = "player", talent = 1}, -- Into the Fray
+        { spell = 97463, type = "buff", unit = "player"}, -- Rallying Cry
+        { spell = 190456, type = "buff", unit = "player"}, -- Ignore Pain
+        { spell = 23920, type = "buff", unit = "player"}, -- Spell Reflection
+        { spell = 107574, type = "buff", unit = "player"}, -- Avatar
+        { spell = 147833, type = "buff", unit = "target"}, -- Intervene
+        { spell = 223658, type = "buff", unit = "target", talent = 6}, -- Safeguard
+
       },
       icon = 1377132
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 115767, type = "debuff", unit = "target"}, -- Deep Wounds
+        { spell = 1160, type = "debuff", unit = "target"}, -- Demoralizing Shout
+        { spell = 355, type = "debuff", unit = "target"}, -- Taunt
+        { spell = 132169, type = "debuff", unit = "target", talent = 15}, -- Storm Bolt
+        { spell = 105771, type = "debuff", unit = "target"}, -- Charge
+        { spell = 5246, type = "debuff", unit = "target"}, -- Intimidating Shout
+        { spell = 6343, type = "debuff", unit = "target"}, -- Thunder Clap
+        { spell = 132168, type = "debuff", unit = "target"}, -- Shockwave
+        { spell = 275335, type = "debuff", unit = "target", talent = 2}, -- Punish
       },
       icon = 132090
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 355, type = "ability"}, -- Taunt
+        { spell = 871, type = "ability"}, -- Shield Wall
+        { spell = 1160, type = "ability"}, -- Demoralizing Shout
+        { spell = 2565, type = "ability"}, -- Shield Block
+        { spell = 5246, type = "ability"}, -- Intimidating Shout
+        { spell = 6343, type = "ability"}, -- Thunder Clap
+        { spell = 6544, type = "ability"}, -- Heroic Leap
+        { spell = 6552, type = "ability"}, -- Pummel
+        { spell = 6572, type = "ability"}, -- Revenge
+        { spell = 6673, type = "ability"}, -- Battle Shout
+        { spell = 12975, type = "ability"}, -- Last Stand
+        { spell = 18499, type = "ability"}, -- Berserker Rage
+        { spell = 23920, type = "ability"}, -- Spell Reflection
+        { spell = 23922, type = "ability"}, -- Shield Slam
+        { spell = 46968, type = "ability"}, -- Shockwave
+        { spell = 57755, type = "ability"}, -- Heroic Throw
+        { spell = 97462, type = "ability"}, -- Rallying Cry
+        { spell = 107570, type = "ability", talent = 15}, -- Storm Bolt
+        { spell = 107574, type = "ability"}, -- Avatar
+        { spell = 118000, type = "ability", talent = 9}, -- Dragon Roar
+        { spell = 198304, type = "ability"}, -- Intercept
+        { spell = 202168, type = "ability", talent = 3}, -- Impending Victory
+        { spell = 228920, type = "ability", talent = 21}, -- Ravager
+
       },
       icon = 134951
     },
@@ -186,19 +316,67 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 1022, type = "buff", unit = "group"}, -- Blessing of Protection
+        { spell = 53563, type = "buff", unit = "group"}, -- Beacon of Light
+        { spell = 6940, type = "buff", unit = "group"}, -- Blessing of Sacrifice
+        { spell = 31821, type = "buff", unit = "player"}, -- Aura Mastery
+        { spell = 183415, type = "buff", unit = "player", talent = 12}, -- Aura of Mercy
+        { spell = 31884, type = "buff", unit = "player"}, -- Avenging Wrath
+        { spell = 498, type = "buff", unit = "player"}, -- Divine Protection
+        { spell = 210320, type = "buff", unit = "player", talent = 10}, -- Devotion Aura
+        { spell = 642, type = "buff", unit = "player"}, -- Divine Shield
+        { spell = 200025, type = "buff", unit = "group", talent = 21}, -- Beacon of Virtue
+        { spell = 156910, type = "buff", unit = "group", talent = 20}, -- Beacon of Faith
+        { spell = 54149, type = "buff", unit = "player"}, -- Infusion of Light
+        { spell = 105809, type = "buff", unit = "player"}, -- Holy Avenger
+        { spell = 216331, type = "buff", unit = "player", talent = 17}, -- Avenging Crusader
+        { spell = 214202, type = "buff", unit = "player"}, -- Rule of Law
+        { spell = 183416, type = "buff", unit = "player", talent = 11}, -- Aura of Sacrifice
+        { spell = 1044, type = "buff", unit = "group"}, -- Blessing of Freedom
+        { spell = 221883, type = "buff", unit = "player"}, -- Divine Steed
+        { spell = 223306, type = "buff", unit = "target", talent = 2}, -- Bestow Faith
       },
       icon = 236254
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 204242, type = "debuff", unit = "target"}, -- Consecration
+        { spell = 105421, type = "debuff", unit = "target", talent = 9}, -- Blinding Light
+        { spell = 853, type = "debuff", unit = "target"}, -- Hammer of Justice
+        { spell = 214222, type = "debuff", unit = "target"}, -- Judgment
+        { spell = 196941, type = "debuff", unit = "target", talent = 13}, -- Judgment of Light
+        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
-
+        { spell = 498, type = "ability"}, -- Divine Protection
+        { spell = 633, type = "ability"}, -- Lay on Hands
+        { spell = 642, type = "ability"}, -- Divine Shield
+        { spell = 853, type = "ability"}, -- Hammer of Justice
+        { spell = 1022, type = "ability"}, -- Blessing of Protection
+        { spell = 1044, type = "ability"}, -- Blessing of Freedom
+        { spell = 6940, type = "ability"}, -- Blessing of Sacrifice
+        { spell = 20066, type = "ability", talent = 8}, -- Repentance
+        { spell = 20473, type = "ability"}, -- Holy Shock
+        { spell = 26573, type = "ability"}, -- Consecration
+        { spell = 31821, type = "ability"}, -- Aura Mastery
+        { spell = 31884, type = "ability"}, -- Avenging Wrath
+        { spell = 35395, type = "ability"}, -- Crusader Strike
+        { spell = 85222, type = "ability"}, -- Light of Dawn
+        { spell = 105809, type = "ability", talent = 15}, -- Holy Avenger
+        { spell = 114158, type = "ability", talent = 3}, -- Light's Hammer
+        { spell = 114165, type = "ability", talent = 14}, -- Holy Prism
+        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
+        { spell = 190784, type = "ability"}, -- Divine Steed
+        { spell = 200025, type = "ability", talent = 21}, -- Beacon of Virtue
+        { spell = 214202, type = "ability"}, -- Rule of Law
+        { spell = 216331, type = "ability"}, -- Avenging Crusader
+        { spell = 223306, type = "ability", talent = 2}, -- Bestow Faith
+        { spell = 275773, type = "ability"}, -- Judgment
       },
       icon = 135972
     },
@@ -225,18 +403,69 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 203797, type = "buff", unit = "player", talent = 10}, -- Retribution Aura
+        { spell = 132403, type = "buff", unit = "player"}, -- Shield of the Righteous
+        { spell = 197561, type = "buff", unit = "player"}, -- Avenger's Valor
+        { spell = 1044, type = "buff", unit = "player"}, -- Blessing of Freedom
+        { spell = 6940, type = "buff", unit = "group"}, -- Blessing of Sacrifice
+        { spell = 188370, type = "buff", unit = "player"}, -- Consecration
+        { spell = 204150, type = "buff", unit = "player", talent = 18}, -- Aegis of Light
+        { spell = 31850, type = "buff", unit = "player"}, -- Ardent Defender
+        { spell = 31884, type = "buff", unit = "player"}, -- Avenging Wrath
+        { spell = 204018, type = "buff", unit = "player", talent = 12}, -- Blessing of Spellwarding
+        { spell = 152262, type = "buff", unit = "player", talent = 21}, -- Seraphim
+        { spell = 86659, type = "buff", unit = "player"}, -- Guardian of Ancient Kings
+        { spell = 1022, type = "buff", unit = "player"}, -- Blessing of Protection
+        { spell = 221883, type = "buff", unit = "player"}, -- Divine Steed
+        { spell = 204335, type = "buff", unit = "player"}, -- Aegis of Light
+        { spell = 642, type = "buff", unit = "player"}, -- Divine Shield
       },
       icon = 236265
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 62124, type = "debuff", unit = "target"}, -- Hand of Reckoning
+        { spell = 204242, type = "debuff", unit = "target"}, -- Consecration
+        { spell = 196941, type = "debuff", unit = "target", talent = 16}, -- Judgment of Light
+        { spell = 105421, type = "debuff", unit = "target", talent = 9}, -- Blinding Light
+        { spell = 853, type = "debuff", unit = "target"}, -- Hammer of Justice
+        { spell = 204301, type = "debuff", unit = "target"}, -- Blessed Hammer
+        { spell = 204079, type = "debuff", unit = "target", talent = 13}, -- Final Stand
+        { spell = 31935, type = "debuff", unit = "target"}, -- Avenger's Shield
+        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 633, type = "ability"}, -- Lay on Hands
+        { spell = 642, type = "ability"}, -- Divine Shield
+        { spell = 853, type = "ability"}, -- Hammer of Justice
+        { spell = 1022, type = "ability"}, -- Blessing of Protection
+        { spell = 1044, type = "ability"}, -- Blessing of Freedom
+        { spell = 6940, type = "ability"}, -- Blessing of Sacrifice
+        { spell = 20066, type = "ability", talent = 8}, -- Repentance
+        { spell = 26573, type = "ability"}, -- Consecration
+        { spell = 31850, type = "ability"}, -- Ardent Defender
+        { spell = 31884, type = "ability"}, -- Avenging Wrath
+        { spell = 31935, type = "ability"}, -- Avenger's Shield
+        { spell = 53595, type = "ability"}, -- Hammer of the Righteous
+        { spell = 53600, type = "ability"}, -- Shield of the Righteous
+        { spell = 62124, type = "ability"}, -- Hand of Reckoning
+        { spell = 86659, type = "ability"}, -- Guardian of Ancient Kings
+        { spell = 96231, type = "ability"}, -- Rebuke
+        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
+        { spell = 152262, type = "ability", talent = 21}, -- Seraphim
+        { spell = 184092, type = "ability"}, -- Light of the Protector
+        { spell = 190784, type = "ability"}, -- Divine Steed
+        { spell = 204018, type = "ability", talent = 12}, -- Blessing of Spellwarding
+        { spell = 204019, type = "ability"}, -- Blessed Hammer
+        { spell = 204035, type = "ability"}, -- Bastion of Light
+        { spell = 204150, type = "ability"}, -- Aegis of Light
+        { spell = 213652, type = "ability"}, -- Hand of the Protector
+        { spell = 275779, type = "ability"}, -- Judgment
       },
       icon = 135874
     },
@@ -263,18 +492,65 @@ templates.class.PALADIN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 267611, type = "buff", unit = "player", talent = 2}, -- Righteous Verdict
+        { spell = 205191, type = "buff", unit = "player", talent = 15}, -- Eye for an Eye
+        { spell = 1022, type = "buff", unit = "group"}, -- Blessing of Protection
+        { spell = 184662, type = "buff", unit = "player"}, -- Shield of Vengeance
+        { spell = 271581, type = "buff", unit = "player", talent = 10}, -- Divine Judgment
+        { spell = 84963, type = "buff", unit = "player", talent = 21}, -- Inquisition
+        { spell = 203538, type = "buff", unit = "group"}, -- Greater Blessing of Kings
+        { spell = 221883, type = "buff", unit = "player"}, -- Divine Steed
+        { spell = 642, type = "buff", unit = "player"}, -- Divine Shield
+        { spell = 203539, type = "buff", unit = "group"}, -- Greater Blessing of Wisdom
+        { spell = 114250, type = "buff", unit = "player", talent = 16}, -- Selfless Healer
+        { spell = 31884, type = "buff", unit = "player"}, -- Avenging Wrath
+        { spell = 269571, type = "buff", unit = "player", talent = 1}, -- Zeal
+        { spell = 281178, type = "buff", unit = "player", talent = 5}, -- Blade of Wrath
+        { spell = 1044, type = "buff", unit = "group"}, -- Blessing of Freedom
+        { spell = 209785, type = "buff", unit = "player", talent = 4}, -- Fires of Justice
       },
       icon = 135993
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 62124, type = "debuff", unit = "target"}, -- Hand of Reckoning
+        { spell = 197277, type = "debuff", unit = "target"}, -- Judgment
+        { spell = 267799, type = "debuff", unit = "target", talent = 3}, -- Execution Sentence
+        { spell = 105421, type = "debuff", unit = "target"}, -- Blinding Light
+        { spell = 853, type = "debuff", unit = "target"}, -- Hammer of Justice
+        { spell = 183218, type = "debuff", unit = "target"}, -- Hand of Hindrance
+        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
+        { spell = 255937, type = "debuff", unit = "target", talent = 12}, -- Wake of Ashes
+
       },
       icon = 135952
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 633, type = "ability"}, -- Lay on Hands
+        { spell = 642, type = "ability"}, -- Divine Shield
+        { spell = 853, type = "ability"}, -- Hammer of Justice
+        { spell = 1022, type = "ability"}, -- Blessing of Protection
+        { spell = 1044, type = "ability"}, -- Blessing of Freedom
+        { spell = 20066, type = "ability", talent = 8}, -- Repentance
+        { spell = 20271, type = "ability"}, -- Judgment
+        { spell = 24275, type = "ability", talent = 6}, -- Hammer of Wrath
+        { spell = 31884, type = "ability"}, -- Avenging Wrath
+        { spell = 35395, type = "ability"}, -- Crusader Strike
+        { spell = 62124, type = "ability"}, -- Hand of Reckoning
+        { spell = 96231, type = "ability"}, -- Rebuke
+        { spell = 115750, type = "ability", talent = 9}, -- Blinding Light
+        { spell = 183218, type = "ability"}, -- Hand of Hindrance
+        { spell = 184575, type = "ability"}, -- Blade of Justice
+        { spell = 184662, type = "ability"}, -- Shield of Vengeance
+        { spell = 190784, type = "ability"}, -- Divine Steed
+        { spell = 205191, type = "ability", talent = 15}, -- Eye for an Eye
+        { spell = 205228, type = "ability", talent = 11}, -- Consecration
+        { spell = 210191, type = "ability", talent = 18}, -- Word of Glory
+        { spell = 255937, type = "ability", talent = 11}, -- Wake of Ashes
+        { spell = 267798, type = "ability", talent = 3}, -- Execution Sentence
       },
       icon = 135891
     },
@@ -304,18 +580,81 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 246851, type = "buff", unit = "player"}, -- Barbed Shot
+        { spell = 35079, type = "buff", unit = "player"}, -- Misdirection
+        { spell = 231390, type = "buff", unit = "player", talent = 7}, -- Trailblazer
+        { spell = 186258, type = "buff", unit = "player"}, -- Aspect of the Cheetah
+        { spell = 264667, type = "buff", unit = "player"}, -- Primal Rage
+        { spell = 257946, type = "buff", unit = "player"}, -- Thrill of the Hunt
+        { spell = 19574, type = "buff", unit = "player"}, -- Bestial Wrath
+        { spell = 268877, type = "buff", unit = "player"}, -- Beast Cleave
+        { spell = 264663, type = "buff", unit = "player"}, -- Predator's Thirst
+        { spell = 118922, type = "buff", unit = "player", talent = 14}, -- Posthaste
+        { spell = 193530, type = "buff", unit = "player"}, -- Aspect of the Wild
+        { spell = 5384, type = "buff", unit = "player"}, -- Feign Death
+        { spell = 199483, type = "buff", unit = "player"}, -- Camouflage
+        { spell = 186257, type = "buff", unit = "player"}, -- Aspect of the Cheetah
+        { spell = 281036, type = "buff", unit = "player", talent = 3}, -- Dire Beast
+        { spell = 186265, type = "buff", unit = "player"}, -- Aspect of the Turtle
+        { spell = 6197, type = "buff", unit = "player"}, -- Eagle Eye
+        { spell = 246152, type = "buff", unit = "player"}, -- Barbed Shot
+        { spell = 264663, type = "buff", unit = "target"}, -- Predator's Thirst
+        { spell = 34477, type = "buff", unit = "target"}, -- Misdirection
+        { spell = 24450, type = "buff", unit = "pet"}, -- Prowl
+        { spell = 264663, type = "buff", unit = "pet"}, -- Predator's Thirst
+        { spell = 118455, type = "buff", unit = "pet"}, -- Beast Cleave
+        { spell = 193530, type = "buff", unit = "pet"}, -- Aspect of the Wild
+        { spell = 272790, type = "buff", unit = "pet"}, -- Frenzy
+        { spell = 186254, type = "buff", unit = "pet"}, -- Bestial Wrath
+        { spell = 199483, type = "buff", unit = "pet", talent = 9}, -- Camouflage
+        { spell = 136, type = "buff", unit = "pet"}, -- Mend Pet
+        { spell = 34477, type = "buff", unit = "pet"}, -- Misdirection
       },
       icon = 132242
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 135299, type = "debuff", unit = "target"}, -- Tar Trap
+        { spell = 217200, type = "debuff", unit = "target"}, -- Barbed Shot
+        { spell = 117405, type = "debuff", unit = "target", talent = 15}, -- Binding Shot
+        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 2649, type = "debuff", unit = "target"}, -- Growl
+        { spell = 24394, type = "debuff", unit = "target"}, -- Intimidation
+        { spell = 5116, type = "debuff", unit = "target"}, -- Concussive Shot
       },
       icon = 135860
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+      { spell = 781, type = "ability"}, -- Disengage
+        { spell = 1543, type = "ability"}, -- Flare
+        { spell = 2649, type = "ability"}, -- Growl
+        { spell = 5116, type = "ability"}, -- Concussive Shot
+        { spell = 5384, type = "ability"}, -- Feign Death
+        { spell = 16827, type = "ability"}, -- Claw
+        { spell = 19574, type = "ability"}, -- Bestial Wrath
+        { spell = 19577, type = "ability"}, -- Intimidation
+        { spell = 24450, type = "ability"}, -- Prowl
+        { spell = 34026, type = "ability"}, -- Kill Command
+        { spell = 34477, type = "ability"}, -- Misdirection
+        { spell = 53209, type = "ability", talent = 6}, -- Chimaera Shot
+        { spell = 109248, type = "ability", talent = 15}, -- Binding Shot
+        { spell = 109304, type = "ability"}, -- Exhilaration
+        { spell = 120360, type = "ability", talent = 17}, -- Barrage
+        { spell = 120679, type = "ability", talent = 3}, -- Dire Beast
+        { spell = 131894, type = "ability", talent = 12}, -- A Murder of Crows
+        { spell = 147362, type = "ability"}, -- Counter Shot
+        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
+        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
+        { spell = 187650, type = "ability"}, -- Freezing Trap
+        { spell = 187698, type = "ability"}, -- Tar Trap
+        { spell = 193530, type = "ability"}, -- Aspect of the Wild
+        { spell = 199483, type = "ability", talent = 9}, -- Camouflage
+        { spell = 201430, type = "ability", talent = 18}, -- Stampede
+        { spell = 217200, type = "ability"}, -- Barbed Shot
+        { spell = 264667, type = "ability"}, -- Primal Rage
       },
       icon = 132176
     },
@@ -342,18 +681,80 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 35079, type = "buff", unit = "player"}, -- Misdirection
+        { spell = 231390, type = "buff", unit = "player", talent = 7}, -- Trailblazer
+        { spell = 186258, type = "buff", unit = "player"}, -- Aspect of the Cheetah
+        { spell = 264667, type = "buff", unit = "player"}, -- Primal Rage
+        { spell = 260395, type = "buff", unit = "player", talent = 16}, -- Lethal Shots
+        { spell = 194594, type = "buff", unit = "player", talent = 20}, -- Lock and Load
+        { spell = 257044, type = "buff", unit = "player"}, -- Rapid Fire
+        { spell = 164273, type = "buff", unit = "player"}, -- Lone Wolf
+        { spell = 6197, type = "buff", unit = "player"}, -- Eagle Eye
+        { spell = 257622, type = "buff", unit = "player"}, -- Trick Shots
+        { spell = 193526, type = "buff", unit = "player"}, -- Trueshot
+        { spell = 260242, type = "buff", unit = "player"}, -- Precise Shots
+        { spell = 5384, type = "buff", unit = "player"}, -- Feign Death
+        { spell = 260402, type = "buff", unit = "player", talent = 18}, -- Double Tap
+        { spell = 186257, type = "buff", unit = "player"}, -- Aspect of the Cheetah
+        { spell = 118922, type = "buff", unit = "player", talent = 14}, -- Posthaste
+        { spell = 186265, type = "buff", unit = "player"}, -- Aspect of the Turtle
+        { spell = 193534, type = "buff", unit = "player", talent = 10}, -- Steady Focus
+        { spell = 264663, type = "buff", unit = "player"}, -- Predator's Thirst
+        { spell = 199483, type = "buff", unit = "player", talent = 9}, -- Camouflage
+        { spell = 24450, type = "buff", unit = "target"}, -- Prowl
+        { spell = 264663, type = "buff", unit = "target"}, -- Predator's Thirst
+        { spell = 34477, type = "buff", unit = "target"}, -- Misdirection
+        { spell = 264663, type = "buff", unit = "pet"}, -- Predator's Thirst
+        { spell = 24450, type = "buff", unit = "pet"}, -- Prowl
+        { spell = 136, type = "buff", unit = "pet"}, -- Mend Pet
+
       },
       icon = 461846
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 135299, type = "debuff", unit = "target"}, -- Tar Trap
+        { spell = 5116, type = "debuff", unit = "target"}, -- Concussive Shot
+        { spell = 186387, type = "debuff", unit = "target"}, -- Bursting Shot
+        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 271788, type = "debuff", unit = "target"}, -- Serpent Sting
+        { spell = 257284, type = "debuff", unit = "target", talent = 12}, -- Hunter's Mark
+        { spell = 131894, type = "debuff", unit = "target", talent = 3}, -- A Murder of Crows
+
       },
       icon = 236188
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 781, type = "ability"}, -- Disengage
+        { spell = 1543, type = "ability"}, -- Flare
+        { spell = 5116, type = "ability"}, -- Concussive Shot
+        { spell = 5384, type = "ability"}, -- Feign Death
+        { spell = 19434, type = "ability"}, -- Aimed Shot
+        { spell = 34477, type = "ability"}, -- Misdirection
+        { spell = 109248, type = "ability", talent = 15}, -- Binding Shot
+        { spell = 109304, type = "ability"}, -- Exhilaration
+        { spell = 120360, type = "ability", talent = 17}, -- Barrage
+        { spell = 131894, type = "ability", talent = 3}, -- A Murder of Crows
+        { spell = 147362, type = "ability"}, -- Counter Shot
+        { spell = 185358, type = "ability"}, -- Arcane Shot
+        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
+        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
+        { spell = 186387, type = "ability"}, -- Bursting Shot
+        { spell = 187650, type = "ability"}, -- Freezing Trap
+        { spell = 187698, type = "ability"}, -- Tar Trap
+        { spell = 193526, type = "ability"}, -- Trueshot
+        { spell = 198670, type = "ability", talent = 21}, -- Piercing Shot
+        { spell = 199483, type = "ability", talent = 9}, -- Camouflage
+        { spell = 212431, type = "ability", talent = 6}, -- Explosive Shot
+        { spell = 257044, type = "ability"}, -- Rapid Fire
+        { spell = 257620, type = "ability"}, -- Multi-Shot
+        { spell = 260402, type = "ability", talent = 18}, -- Double Tap
+        { spell = 264667, type = "ability"}, -- Primal Rage
+        { spell = 272678, type = "ability"}, -- Primal Rage
+
       },
       icon = 132329
     },
@@ -422,18 +823,77 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 121153, type = "buff", unit = "player"}, -- Blindside
+        { spell = 5277, type = "buff", unit = "player"}, -- Evasion
+        { spell = 8679, type = "buff", unit = "player"}, -- Wound Poison
+        { spell = 57934, type = "buff", unit = "player"}, -- Tricks of the Trade
+        { spell = 108211, type = "buff", unit = "player", talent = 10}, -- Leeching Poison
+        { spell = 2823, type = "buff", unit = "player"}, -- Deadly Poison
+        { spell = 193641, type = "buff", unit = "player", talent = 2}, -- Elaborate Planning
+        { spell = 115192, type = "buff", unit = "player", talent = 5}, -- Subterfuge
+        { spell = 114018, type = "buff", unit = "player"}, -- Shroud of Concealment
+        { spell = 32645, type = "buff", unit = "player"}, -- Envenom
+        { spell = 36554, type = "buff", unit = "player"}, -- Shadowstep
+        { spell = 185311, type = "buff", unit = "player"}, -- Crimson Vial
+        { spell = 270070, type = "buff", unit = "player", talent = 20}, -- Hidden Blades
+        { spell = 256735, type = "buff", unit = "player", talent = 6}, -- Master Assassin
+        { spell = 1966, type = "buff", unit = "player"}, -- Feint
+        { spell = 1784, type = "buff", unit = "player"}, -- Stealth
+        { spell = 31224, type = "buff", unit = "player"}, -- Cloak of Shadows
+        { spell = 11327, type = "buff", unit = "player"}, -- Vanish
+        { spell = 3408, type = "buff", unit = "player"}, -- Crippling Poison
+        { spell = 2983, type = "buff", unit = "player"}, -- Sprint
+        { spell = 45182, type = "buff", unit = "player", talent = 11 }, -- Cheating Death
       },
       icon = 132290
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 137619, type = "debuff", unit = "target", talent = 9}, -- Marked for Death
+        { spell = 1330, type = "debuff", unit = "target"}, -- Garrote - Silence
+        { spell = 256148, type = "debuff", unit = "target", talent = 14}, -- Iron Wire
+        { spell = 154953, type = "debuff", unit = "target", talent = 13}, -- Internal Bleeding
+        { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
+        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 255909, type = "debuff", unit = "target", talent = 15}, -- Prey on the Weak
+        { spell = 703, type = "debuff", unit = "target"}, -- Garrote
+        { spell = 245389, type = "debuff", unit = "target", talent = 17}, -- Toxic Blade
+        { spell = 2818, type = "debuff", unit = "target"}, -- Deadly Poison
+        { spell = 3409, type = "debuff", unit = "target"}, -- Crippling Poison
+        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 408, type = "debuff", unit = "target"}, -- Kidney Shot
+        { spell = 121411, type = "debuff", unit = "target", talent = 21}, -- Crimson Tempest
+        { spell = 79140, type = "debuff", unit = "target"}, -- Vendetta
+        { spell = 1943, type = "debuff", unit = "target"}, -- Rupture
+        { spell = 8680, type = "debuff", unit = "target"}, -- Wound Poison
+        { spell = 45181, type = "debuff", unit = "player", talent = 11 }, -- Cheated Death
       },
       icon = 132302
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 408, type = "ability"}, -- Kidney Shot
+        { spell = 703, type = "ability"}, -- Garrote
+        { spell = 1725, type = "ability"}, -- Distract
+        { spell = 1766, type = "ability"}, -- Kick
+        { spell = 1784, type = "ability"}, -- Stealth
+        { spell = 1856, type = "ability"}, -- Vanish
+        { spell = 1966, type = "ability"}, -- Feint
+        { spell = 2094, type = "ability"}, -- Blind
+        { spell = 2983, type = "ability"}, -- Sprint
+        { spell = 5277, type = "ability"}, -- Evasion
+        { spell = 31224, type = "ability"}, -- Cloak of Shadows
+        { spell = 36554, type = "ability"}, -- Shadowstep
+        { spell = 79140, type = "ability"}, -- Vendetta
+        { spell = 114018, type = "ability"}, -- Shroud of Concealment
+        { spell = 115191, type = "ability"}, -- Stealth
+        { spell = 137619, type = "ability", talent = 9}, -- Marked for Death
+        { spell = 185311, type = "ability"}, -- Crimson Vial
+        { spell = 200806, type = "ability", talent = 18}, -- Exsanguinate
+        { spell = 245388, type = "ability", talent = 17}, -- Toxic Blade
+        { spell = 57934, type = "ability"}, -- Tricks of the Trade
       },
       icon = 458726
     },
@@ -460,18 +920,73 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 193357, type = "buff", unit = "player"}, -- Ruthless Precision
+        { spell = 199600, type = "buff", unit = "player"}, -- Buried Treasure
+        { spell = 193358, type = "buff", unit = "player"}, -- Grand Melee
+        { spell = 51690, type = "buff", unit = "player", talent = 21}, -- Killing Spree
+        { spell = 114018, type = "buff", unit = "player"}, -- Shroud of Concealment
+        { spell = 271896, type = "buff", unit = "player", talent = 20}, -- Blade Rush
+        { spell = 5171, type = "buff", unit = "player", talent = 18}, -- Slice and Dice
+        { spell = 13750, type = "buff", unit = "player"}, -- Adrenaline Rush
+        { spell = 193359, type = "buff", unit = "player"}, -- True Bearing
+        { spell = 199603, type = "buff", unit = "player"}, -- Skull and Crossbones
+        { spell = 199754, type = "buff", unit = "player"}, -- Riposte
+        { spell = 185311, type = "buff", unit = "player"}, -- Crimson Vial
+        { spell = 2983, type = "buff", unit = "player"}, -- Sprint
+        { spell = 1966, type = "buff", unit = "player"}, -- Feint
+        { spell = 193538, type = "buff", unit = "player", talent = 17}, -- Alacrity
+        { spell = 1784, type = "buff", unit = "player"}, -- Stealth
+        { spell = 31224, type = "buff", unit = "player"}, -- Cloak of Shadows
+        { spell = 195627, type = "buff", unit = "player"}, -- Opportunity
+        { spell = 11327, type = "buff", unit = "player"}, -- Vanish
+        { spell = 13877, type = "buff", unit = "player"}, -- Blade Flurry
+        { spell = 193356, type = "buff", unit = "player"}, -- Broadside
+        { spell = 57934, type = "buff", unit = "player"}, -- Tricks of the Trade
+        { spell = 45182, type = "buff", unit = "player", talent = 11 }, -- Cheating Death
       },
       icon = 132350
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 255909, type = "debuff", unit = "target", talent = 15}, -- Prey on the Weak
+        { spell = 199804, type = "debuff", unit = "target"}, -- Between the Eyes
+        { spell = 185763, type = "debuff", unit = "target"}, -- Pistol Shot
+        { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
+        { spell = 196937, type = "debuff", unit = "target", talent = 3}, -- Ghostly Strike
+        { spell = 137619, type = "debuff", unit = "target", talent = 9}, -- Marked for Death
+        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 1776, type = "debuff", unit = "target"}, -- Gouge
+        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 45181, type = "debuff", unit = "player", talent = 11 }, -- Cheated Death
       },
       icon = 1373908
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 1725, type = "ability"}, -- Distract
+        { spell = 1766, type = "ability"}, -- Kick
+        { spell = 1776, type = "ability"}, -- Gouge
+        { spell = 1784, type = "ability"}, -- Stealth
+        { spell = 1856, type = "ability"}, -- Vanish
+        { spell = 1966, type = "ability"}, -- Feint
+        { spell = 2094, type = "ability"}, -- Blind
+        { spell = 2983, type = "ability"}, -- Sprint
+        { spell = 13750, type = "ability"}, -- Adrenaline Rush
+        { spell = 13877, type = "ability"}, -- Blade Flurry
+        { spell = 31224, type = "ability"}, -- Cloak of Shadows
+        { spell = 51690, type = "ability", talent = 21}, -- Killing Spree
+        { spell = 79096, type = "ability"}, -- Restless Blades
+        { spell = 114018, type = "ability"}, -- Shroud of Concealment
+        { spell = 137619, type = "ability", talent = 9}, -- Marked for Death
+        { spell = 185311, type = "ability"}, -- Crimson Vial
+        { spell = 195457, type = "ability"}, -- Grappling Hook
+        { spell = 196937, type = "ability", talent = 3}, -- Ghostly Strike
+        { spell = 199754, type = "ability"}, -- Riposte
+        { spell = 199804, type = "ability"}, -- Between the Eyes
+        { spell = 271877, type = "ability", talent = 20}, -- Blade Rush
+        { spell = 57934, type = "ability"}, -- Tricks of the Trade
       },
       icon = 135610
     },
@@ -498,18 +1013,70 @@ templates.class.ROGUE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 196980, type = "buff", unit = "player", talent = 19}, -- Master of Shadows
+        { spell = 5277, type = "buff", unit = "player"}, -- Evasion
+        { spell = 121471, type = "buff", unit = "player"}, -- Shadow Blades
+        { spell = 212283, type = "buff", unit = "player"}, -- Symbols of Death
+        { spell = 185422, type = "buff", unit = "player"}, -- Shadow Dance
+        { spell = 115192, type = "buff", unit = "player", talent = 4}, -- Subterfuge
+        { spell = 114018, type = "buff", unit = "player"}, -- Shroud of Concealment
+        { spell = 257506, type = "buff", unit = "player"}, -- Shot in the Dark
+        { spell = 185311, type = "buff", unit = "player"}, -- Crimson Vial
+        { spell = 277925, type = "buff", unit = "player", talent = 21}, -- Shuriken Tornado
+        { spell = 1966, type = "buff", unit = "player"}, -- Feint
+        { spell = 193538, type = "buff", unit = "player", talent = 17}, -- Alacrity
+        { spell = 1784, type = "buff", unit = "player"}, -- Stealth
+        { spell = 31224, type = "buff", unit = "player"}, -- Cloak of Shadows
+        { spell = 115191, type = "buff", unit = "player"}, -- Stealth
+        { spell = 11327, type = "buff", unit = "player"}, -- Vanish
+        { spell = 245640, type = "buff", unit = "player"}, -- Shuriken Combo
+        { spell = 2983, type = "buff", unit = "player"}, -- Sprint
+        { spell = 57934, type = "buff", unit = "player"}, -- Tricks of the Trade
+        { spell = 45182, type = "buff", unit = "player", talent = 11 }, -- Cheating Death
       },
       icon = 376022
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 255909, type = "debuff", unit = "target", talent = 15}, -- Prey on the Weak
+        { spell = 91021, type = "debuff", unit = "target", talent = 2}, -- Find Weakness
+        { spell = 195452, type = "debuff", unit = "target"}, -- Nightblade
+        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 137619, type = "debuff", unit = "target"}, -- Marked for Death
+        { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
+        { spell = 206760, type = "debuff", unit = "target", talent = 14}, -- Shadow's Grasp
+        { spell = 408, type = "debuff", unit = "target"}, -- Kidney Shot
+        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 45181, type = "debuff", unit = "player", talent = 11 }, -- Cheated Death
       },
       icon = 136175
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 408, type = "ability"}, -- Kidney Shot
+        { spell = 1725, type = "ability"}, -- Distract
+        { spell = 1766, type = "ability"}, -- Kick
+        { spell = 1784, type = "ability"}, -- Stealth
+        { spell = 1856, type = "ability"}, -- Vanish
+        { spell = 1966, type = "ability"}, -- Feint
+        { spell = 2094, type = "ability"}, -- Blind
+        { spell = 2983, type = "ability"}, -- Sprint
+        { spell = 5277, type = "ability"}, -- Evasion
+        { spell = 31224, type = "ability"}, -- Cloak of Shadows
+        { spell = 36554, type = "ability"}, -- Shadowstep
+        { spell = 114018, type = "ability"}, -- Shroud of Concealment
+        { spell = 115191, type = "ability"}, -- Stealth
+        { spell = 121471, type = "ability"}, -- Shadow Blades
+        { spell = 137619, type = "ability", talent = 9}, -- Marked for Death
+        { spell = 185311, type = "ability"}, -- Crimson Vial
+        { spell = 185313, type = "ability"}, -- Shadow Dance
+        { spell = 212283, type = "ability"}, -- Symbols of Death
+        { spell = 277925, type = "ability", talent = 21}, -- Shuriken Tornado
+        { spell = 280719, type = "ability", talent = 20}, -- Secret Technique
+        { spell = 57934, type = "ability"}, -- Tricks of the Trade
+
       },
       icon = 236279
     },
@@ -539,18 +1106,66 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 586, type = "buff", unit = "player"}, -- Fade
+        { spell = 198069, type = "buff", unit = "player"}, -- Power of the Dark Side
+        { spell = 194384, type = "buff", unit = "player"}, -- Atonement
+        { spell = 17, type = "buff", unit = "player"}, -- Power Word: Shield
+        { spell = 265258, type = "buff", unit = "player", talent = 2}, -- Twist of Fate
+        { spell = 271466, type = "buff", unit = "player", talent = 20}, -- Luminous Barrier
+        { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
+        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 81782, type = "buff", unit = "player"}, -- Power Word: Barrier
+        { spell = 33206, type = "buff", unit = "player"}, -- Pain Suppression
+        { spell = 193065, type = "buff", unit = "player", talent = 5}, -- Masochism
+        { spell = 65081, type = "buff", unit = "player", talent = 4}, -- Body and Soul
+        { spell = 47536, type = "buff", unit = "player"}, -- Rapture
+        { spell = 121557, type = "buff", unit = "player", talent = 6}, -- Angelic Feather
+        { spell = 2096, type = "buff", unit = "player"}, -- Mind Vision
+        { spell = 111759, type = "buff", unit = "player"}, -- Levitate
+        { spell = 45243, type = "buff", unit = "player" }, -- Focused Will
       },
       icon = 458720
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 8122, type = "debuff", unit = "target"}, -- Psychic Scream
+        { spell = 204263, type = "debuff", unit = "target", talent = 12}, -- Shining Force
+        { spell = 208772, type = "debuff", unit = "target"}, -- Smite
+        { spell = 204213, type = "debuff", unit = "target", talent = 16}, -- Purge the Wicked
+        { spell = 2096, type = "debuff", unit = "target"}, -- Mind Vision
+        { spell = 214621, type = "debuff", unit = "target", talent = 3}, -- Schism
+        { spell = 589, type = "debuff", unit = "target"}, -- Shadow Word: Pain
+        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
       },
       icon = 136207
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 527, type = "ability"}, -- Purify
+        { spell = 586, type = "ability"}, -- Fade
+        { spell = 8122, type = "ability"}, -- Psychic Scream
+        { spell = 19236, type = "ability"}, -- Desperate Prayer
+        { spell = 32375, type = "ability"}, -- Mass Dispel
+        { spell = 33206, type = "ability"}, -- Pain Suppression
+        { spell = 34433, type = "ability"}, -- Shadowfiend
+        { spell = 47536, type = "ability"}, -- Rapture
+        { spell = 47540, type = "ability"}, -- Penance
+        { spell = 62618, type = "ability"}, -- Power Word: Barrier
+        { spell = 73325, type = "ability" }, -- Leap of Faith
+        { spell = 110744, type = "ability", talent = 17}, -- Divine Star
+        { spell = 120517, type = "ability", talent = 18}, -- Halo
+        { spell = 121536, type = "ability", talent = 6}, -- Angelic Feather
+        { spell = 123040, type = "ability", talent = 8}, -- Mindbender
+        { spell = 129250, type = "ability", talent = 9}, -- Power Word: Solace
+        { spell = 194509, type = "ability"}, -- Power Word: Radiance
+        { spell = 204065, type = "ability", talent = 15}, -- Shadow Covenant
+        { spell = 204263, type = "ability", talent = 12}, -- Shining Force
+        { spell = 214621, type = "ability", talent = 3}, -- Schism
+        { spell = 246287, type = "ability"}, -- Evangelism
+        { spell = 271466, type = "ability", talent = 21}, -- Luminous Barrier
+
       },
       icon = 253400
     },
@@ -577,18 +1192,66 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 47788, type = "buff", unit = "target"}, -- Guardian Spirit
+        { spell = 64901, type = "buff", unit = "player"}, -- Symbol of Hope
+        { spell = 139, type = "buff", unit = "player"}, -- Renew
+        { spell = 2096, type = "buff", unit = "player"}, -- Mind Vision
+        { spell = 64843, type = "buff", unit = "player"}, -- Divine Hymn
+        { spell = 64844, type = "buff", unit = "player"}, -- Divine Hymn
+        { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
+        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 111759, type = "buff", unit = "player"}, -- Levitate
+        { spell = 200183, type = "buff", unit = "player", talent = 20}, -- Apotheosis
+        { spell = 27827, type = "buff", unit = "player"}, -- Spirit of Redemption
+        { spell = 77489, type = "buff", unit = "target"}, -- Echo of Light
+        { spell = 114255, type = "buff", unit = "player", talent = 13}, -- Surge of Light
+        { spell = 121557, type = "buff", unit = "player", talent = 6}, -- Angelic Feather
+        { spell = 586, type = "buff", unit = "player"}, -- Fade
+        { spell = 41635, type = "buff", unit = "group"}, -- Prayer of Mending
+        { spell = 139, type = "buff", unit = "target"}, -- Renew
+        { spell = 45243, type = "buff", unit = "player" }, -- Focused Will
       },
       icon = 135953
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 8122, type = "debuff", unit = "target"}, -- Psychic Scream
+        { spell = 200196, type = "debuff", unit = "target"}, -- Holy Word: Chastise
+        { spell = 14914, type = "debuff", unit = "target"}, -- Holy Fire
+        { spell = 2096, type = "debuff", unit = "target"}, -- Mind Vision
+        { spell = 204263, type = "debuff", unit = "target"}, -- Shining Force
+        { spell = 200200, type = "debuff", unit = "target"}, -- Holy Word: Chastise
+        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
       },
       icon = 135972
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 527, type = "ability"}, -- Purify
+        { spell = 586, type = "ability"}, -- Fade
+        { spell = 2050, type = "ability"}, -- Holy Word: Serenity
+        { spell = 2061, type = "ability"}, -- Flash Heal
+        { spell = 8122, type = "ability"}, -- Psychic Scream
+        { spell = 14914, type = "ability"}, -- Holy Fire
+        { spell = 19236, type = "ability"}, -- Desperate Prayer
+        { spell = 32375, type = "ability"}, -- Mass Dispel
+        { spell = 33076, type = "ability"}, -- Prayer of Mending
+        { spell = 34861, type = "ability"}, -- Holy Word: Sanctify
+        { spell = 47788, type = "ability"}, -- Guardian Spirit
+        { spell = 64843, type = "ability"}, -- Divine Hymn
+        { spell = 64901, type = "ability"}, -- Symbol of Hope
+        { spell = 73325, type = "ability" }, -- Leap of Faith
+        { spell = 88625, type = "ability"}, -- Holy Word: Chastise
+        { spell = 110744, type = "ability", talent = 17}, -- Divine Star
+        { spell = 120517, type = "ability", talent = 18}, -- Halo
+        { spell = 121536, type = "ability", talent = 6}, -- Angelic Feather
+        { spell = 200183, type = "ability", talent = 20}, -- Apotheosis
+        { spell = 204263, type = "ability", talent = 12}, -- Shining Force
+        { spell = 204883, type = "ability", talent = 15}, -- Circle of Healing
+        { spell = 265202, type = "ability", talent = 21}, -- Holy Word: Salvation
+
       },
       icon = 135937
     },
@@ -615,18 +1278,68 @@ templates.class.PRIEST = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 193223, type = "buff", unit = "player", talent = 21}, -- Surrender to Madness
+        { spell = 263165, type = "buff", unit = "player", talent = 18}, -- Void Torrent
+        { spell = 586, type = "buff", unit = "player"}, -- Fade
+        { spell = 2096, type = "buff", unit = "player"}, -- Mind Vision
+        { spell = 15286, type = "buff", unit = "player"}, -- Vampiric Embrace
+        { spell = 124430, type = "buff", unit = "player", talent = 2}, -- Shadowy Insight
+        { spell = 17, type = "buff", unit = "player"}, -- Power Word: Shield
+        { spell = 65081, type = "buff", unit = "player", talent = 4}, -- Body and Soul
+        { spell = 197937, type = "buff", unit = "player", talent = 16}, -- Lingering Insanity
+        { spell = 194249, type = "buff", unit = "player"}, -- Voidform
+        { spell = 47585, type = "buff", unit = "player"}, -- Dispersion
+        { spell = 232698, type = "buff", unit = "player"}, -- Shadowform
+        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 111759, type = "buff", unit = "player"}, -- Levitate
+        { spell = 123254, type = "buff", unit = "player", talent = 7 }, -- Twist of Fate
       },
       icon = 237566
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 15407, type = "debuff", unit = "target"}, -- Mind Flay
+        { spell = 48045, type = "debuff", unit = "target"}, -- Mind Sear
+        { spell = 2096, type = "debuff", unit = "target"}, -- Mind Vision
+        { spell = 205369, type = "debuff", unit = "target", talent = 11}, -- Mind Bomb
+        { spell = 226943, type = "debuff", unit = "target", talent = 11}, -- Mind Bomb
+        { spell = 263165, type = "debuff", unit = "target", talent = 18}, -- Void Torrent
+        { spell = 15487, type = "debuff", unit = "target"}, -- Silence
+        { spell = 589, type = "debuff", unit = "target"}, -- Shadow Word: Pain
+        { spell = 8122, type = "debuff", unit = "target"}, -- Psychic Scream
+        { spell = 34914, type = "debuff", unit = "target"}, -- Vampiric Touch
+        { spell = 9484, type = "debuff", unit = "multi" }, -- Shackle Undead
       },
       icon = 136207
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 17, type = "ability"}, -- Power Word: Shield
+        { spell = 586, type = "ability"}, -- Fade
+        { spell = 8092, type = "ability"}, -- Mind Blast
+        { spell = 8122, type = "ability"}, -- Psychic Scream
+        { spell = 15286, type = "ability"}, -- Vampiric Embrace
+        { spell = 15487, type = "ability"}, -- Silence
+        { spell = 32375, type = "ability"}, -- Mass Dispel
+        { spell = 32379, type = "ability", talent = 14}, -- Shadow Word: Death
+        { spell = 34433, type = "ability"}, -- Shadowfiend
+        { spell = 47585, type = "ability"}, -- Dispersion
+        { spell = 64044, type = "ability", talent = 12}, -- Psychic Horror
+        { spell = 73325, type = "ability" }, -- Leap of Faith
+        { spell = 193223, type = "ability", talent = 21}, -- Surrender to Madness
+        { spell = 200174, type = "ability", talent = 17}, -- Mindbender
+        { spell = 205351, type = "ability", talent = 3}, -- Shadow Word: Void
+        { spell = 205369, type = "ability", talent = 11}, -- Mind Bomb
+        { spell = 205385, type = "ability", talent = 15}, -- Shadow Crash
+        { spell = 205448, type = "ability"}, -- Void Bolt
+        { spell = 213634, type = "ability"}, -- Purify Disease
+        { spell = 228260, type = "ability"}, -- Void Eruption
+        { spell = 263165, type = "ability", talent = 18}, -- Void Torrent
+        { spell = 263346, type = "ability", talent = 9}, -- Dark Void
+        { spell = 280711, type = "ability", talent = 20}, -- Dark Ascension
+
       },
       icon = 136230
     },
@@ -656,18 +1369,76 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 263806, type = "buff", unit = "player", talent = 11}, -- Wind Gust
+        { spell = 192082, type = "buff", unit = "player", talent = 15}, -- Wind Rush
+        { spell = 202192, type = "buff", unit = "player", talent = 6}, -- Resonance Totem
+        { spell = 210659, type = "buff", unit = "player", talent = 6}, -- Tailwind Totem
+        { spell = 173184, type = "buff", unit = "player", talent = 3}, -- Elemental Blast: Mastery
+        { spell = 108271, type = "buff", unit = "player"}, -- Astral Shift
+        { spell = 210652, type = "buff", unit = "player", talent = 6}, -- Storm Totem
+        { spell = 272737, type = "buff", unit = "player", talent = 19}, -- Unlimited Power
+        { spell = 108281, type = "buff", unit = "player", talent = 14}, -- Ancestral Guidance
+        { spell = 546, type = "buff", unit = "player"}, -- Water Walking
+        { spell = 114050, type = "buff", unit = "player", talent = 21}, -- Ascendance
+        { spell = 210714, type = "buff", unit = "player", talent = 17}, -- Icefury
+        { spell = 260881, type = "buff", unit = "player"}, -- Spirit Wolf
+        { spell = 260734, type = "buff", unit = "player", talent = 5}, -- Master of the Elements
+        { spell = 191634, type = "buff", unit = "player", talent = 20}, -- Stormkeeper
+        { spell = 118337, type = "buff", unit = "player", talent = 16}, -- Harden Skin
+        { spell = 974, type = "buff", unit = "player", talent = 8}, -- Earth Shield
+        { spell = 6196, type = "buff", unit = "player"}, -- Far Sight
+        { spell = 210658, type = "buff", unit = "player", talent = 6}, -- Ember Totem
+        { spell = 173183, type = "buff", unit = "player", talent = 3}, -- Elemental Blast: Haste
+        { spell = 77762, type = "buff", unit = "player"}, -- Lava Surge
+        { spell = 2645, type = "buff", unit = "player"}, -- Ghost Wolf
+        { spell = 118522, type = "buff", unit = "player", talent = 3}, -- Elemental Blast: Critical Strike
+        { spell = 157348, type = "buff", unit = "pet"}, -- Call Lightning
+
       },
       icon = 451169
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 269808, type = "debuff", unit = "target", talent = 1}, -- Exposed Elements
+        { spell = 118905, type = "debuff", unit = "target"}, -- Static Charge
+        { spell = 182387, type = "debuff", unit = "target"}, -- Earthquake
+        { spell = 188389, type = "debuff", unit = "target"}, -- Flame Shock
+        { spell = 51490, type = "debuff", unit = "target"}, -- Thunderstorm
+        { spell = 196840, type = "debuff", unit = "target"}, -- Frost Shock
+        { spell = 118297, type = "debuff", unit = "target"}, -- Immolate
+        { spell = 3600, type = "debuff", unit = "target"}, -- Earthbind
+        { spell = 157375, type = "debuff", unit = "target"}, -- Eye of the Storm
+        { spell = 118345, type = "debuff", unit = "target"}, -- Pulverize
+
       },
       icon = 135813
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 556, type = "ability"}, -- Astral Recall
+        { spell = 2484, type = "ability"}, -- Earthbind Totem
+        { spell = 8143, type = "ability"}, -- Tremor Totem
+        { spell = 32182, type = "ability"}, -- Heroism
+        { spell = 51490, type = "ability"}, -- Thunderstorm
+        { spell = 51505, type = "ability"}, -- Lava Burst
+        { spell = 51514, type = "ability"}, -- Hex
+        { spell = 51886, type = "ability"}, -- Cleanse Spirit
+        { spell = 57994, type = "ability"}, -- Wind Shear
+        { spell = 108271, type = "ability"}, -- Astral Shift
+        { spell = 108281, type = "ability"}, -- Ancestral Guidance
+        { spell = 114050, type = "ability", talent = 21}, -- Ascendance
+        { spell = 117014, type = "ability", talent = 3}, -- Elemental Blast
+        { spell = 188389, type = "ability"}, -- Flame Shock
+        { spell = 191634, type = "ability", talent = 20}, -- Stormkeeper
+        { spell = 192058, type = "ability"}, -- Capacitor Totem
+        { spell = 192077, type = "ability", talent = 15}, -- Wind Rush Totem
+        { spell = 192222, type = "ability", talent = 12}, -- Liquid Magma Totem
+        { spell = 192249, type = "ability", talent = 11}, -- Storm Elemental
+        { spell = 198067, type = "ability"}, -- Fire Elemental
+        { spell = 198103, type = "ability"}, -- Earth Elemental
+        { spell = 210714, type = "ability", talent = 17}, -- Icefury
       },
       icon = 135790
     },
@@ -694,18 +1465,77 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 273323, type = "buff", unit = "player", talent = 3 }, -- Lightning Shield Overcharge
+        { spell = 192082, type = "buff", unit = "player", talent = 15 }, -- Wind Rush
+        { spell = 974, type = "buff", unit = "player", talent = 8 }, -- Earth Shield
+        { spell = 262652, type = "buff", unit = "player", talent = 5 }, -- Forceful Winds
+        { spell = 187878, type = "buff", unit = "player"}, -- Crash Lightning
+        { spell = 262397, type = "buff", unit = "player", talent = 6 }, -- Storm Totem
+        { spell = 192106, type = "buff", unit = "player", talent = 3 }, -- Lightning Shield
+        { spell = 108271, type = "buff", unit = "player"}, -- Astral Shift
+        { spell = 6196, type = "buff", unit = "player"}, -- Far Sight
+        { spell = 196834, type = "buff", unit = "player"}, -- Frostbrand
+        { spell = 224126, type = "buff", unit = "player", talent = 19 }, -- Icy Edge
+        { spell = 546, type = "buff", unit = "player"}, -- Water Walking
+        { spell = 114051, type = "buff", unit = "player", talent = 21 }, -- Ascendance
+        { spell = 224125, type = "buff", unit = "player", talent = 19 }, -- Molten Weapon
+        { spell = 202004, type = "buff", unit = "player", talent = 4 }, -- Landslide
+        { spell = 262400, type = "buff", unit = "player", talent = 6 }, -- Tailwind Totem
+        { spell = 58875, type = "buff", unit = "player"}, -- Spirit Walk
+        { spell = 32182, type = "buff", unit = "player"}, -- Heroism
+        { spell = 198300, type = "buff", unit = "player"}, -- Gathering Storms
+        { spell = 224127, type = "buff", unit = "player", talent = 19 }, -- Crackling Surge
+        { spell = 197211, type = "buff", unit = "player", talent = 17 }, -- Fury of Air
+        { spell = 201846, type = "buff", unit = "player"}, -- Stormbringer
+        { spell = 260881, type = "buff", unit = "player", talent = 7 }, -- Spirit Wolf
+        { spell = 262417, type = "buff", unit = "player", talent = 6 }, -- Resonance Totem
+        { spell = 262399, type = "buff", unit = "player", talent = 6 }, -- Ember Totem
+        { spell = 2645, type = "buff", unit = "player"}, -- Ghost Wolf
+        { spell = 215785, type = "buff", unit = "player", talent = 2 }, -- Hot Hand
+        { spell = 194084, type = "buff", unit = "player"}, -- Flametongue
       },
       icon = 136099
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 118905, type = "debuff", unit = "target"}, -- Static Charge
+        { spell = 197214, type = "debuff", unit = "target", talent = 18 }, -- Sundering
+        { spell = 147732, type = "debuff", unit = "target"}, -- Frostbrand
+        { spell = 271924, type = "debuff", unit = "target", talent = 19 }, -- Molten Weapon
+        { spell = 3600, type = "debuff", unit = "target"}, -- Earthbind
+        { spell = 188089, type = "debuff", unit = "target", talent = 20 }, -- Earthen Spike
+        { spell = 197385, type = "debuff", unit = "target", talent = 17 }, -- Fury of Air
+        { spell = 268429, type = "debuff", unit = "target", talent = 10 }, -- Searing Assault
       },
       icon = 462327
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 556, type = "ability"}, -- Astral Recall
+        { spell = 2484, type = "ability"}, -- Earthbind Totem
+        { spell = 8143, type = "ability"}, -- Tremor Totem
+        { spell = 17364, type = "ability"}, -- Stormstrike
+        { spell = 32182, type = "ability"}, -- Heroism
+        { spell = 51514, type = "ability"}, -- Hex
+        { spell = 51533, type = "ability"}, -- Feral Spirit
+        { spell = 51886, type = "ability"}, -- Cleanse Spirit
+        { spell = 57994, type = "ability"}, -- Wind Shear
+        { spell = 58875, type = "ability"}, -- Spirit Walk
+        { spell = 108271, type = "ability"}, -- Astral Shift
+        { spell = 114051, type = "ability", talent = 21 }, -- Ascendance
+        { spell = 115356, type = "ability", talent = 21 }, -- Windstrike
+        { spell = 187837, type = "ability", talent = 12 }, -- Lightning Bolt
+        { spell = 187874, type = "ability"}, -- Crash Lightning
+        { spell = 188089, type = "ability", talent = 20 }, -- Earthen Spike
+        { spell = 192058, type = "ability"}, -- Capacitor Totem
+        { spell = 192077, type = "ability", talent = 15 }, -- Wind Rush Totem
+        { spell = 193786, type = "ability"}, -- Rockbiter
+        { spell = 193796, type = "ability"}, -- Flametongue
+        { spell = 196884, type = "ability", talent = 14 }, -- Feral Lunge
+        { spell = 197214, type = "ability", talent = 18 }, -- Sundering
+        { spell = 198103, type = "ability"}, -- Earth Elemental
       },
       icon = 1370984
     },
@@ -732,18 +1562,71 @@ templates.class.SHAMAN = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 79206, type = "buff", unit = "player"}, -- Spiritwalker's Grace
+        { spell = 114052, type = "buff", unit = "player", talent = 21 }, -- Ascendance
+        { spell = 974, type = "buff", unit = "group", talent = 6 }, -- Earth Shield
+        { spell = 216251, type = "buff", unit = "player", talent = 2 }, -- Undulation
+        { spell = 108271, type = "buff", unit = "player"}, -- Astral Shift
+        { spell = 6196, type = "buff", unit = "player"}, -- Far Sight
+        { spell = 207498, type = "buff", unit = "player", talent = 12 }, -- Ancestral Protection
+        { spell = 73685, type = "buff", unit = "player", talent = 3 }, -- Unleash Life
+        { spell = 546, type = "buff", unit = "player"}, -- Water Walking
+        { spell = 157504, type = "buff", unit = "player", talent = 18 }, -- Cloudburst Totem
+        { spell = 260881, type = "buff", unit = "player", talent = 7 }, -- Spirit Wolf
+        { spell = 32182, type = "buff", unit = "player"}, -- Heroism
+        { spell = 61295, type = "buff", unit = "player"}, -- Riptide
+        { spell = 98007, type = "buff", unit = "player"}, -- Spirit Link Totem
+        { spell = 77762, type = "buff", unit = "player"}, -- Lava Surge
+        { spell = 207400, type = "buff", unit = "player", talent = 10 }, -- Ancestral Vigor
+        { spell = 201633, type = "buff", unit = "player", talent = 11 }, -- Earthen Wall
+        { spell = 73920, type = "buff", unit = "player"}, -- Healing Rain
+        { spell = 280615, type = "buff", unit = "player", talent = 16 }, -- Flash Flood
+        { spell = 2645, type = "buff", unit = "player"}, -- Ghost Wolf
+        { spell = 53390, type = "buff", unit = "player"}, -- Tidal Waves
       },
       icon = 252995
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 118905, type = "debuff", unit = "target"}, -- Static Charge
+        { spell = 64695, type = "debuff", unit = "target", talent = 0 }, -- Earthgrab
+        { spell = 3600, type = "debuff", unit = "target"}, -- Earthbind
+        { spell = 116947, type = "debuff", unit = "target", talent = 0 }, -- Earthbind
+        { spell = 188838, type = "debuff", unit = "target"}, -- Flame Shock
+
       },
       icon = 135813
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 556, type = "ability"}, -- Astral Recall
+        { spell = 2484, type = "ability"}, -- Earthbind Totem
+        { spell = 5394, type = "ability"}, -- Healing Stream Totem
+        { spell = 8143, type = "ability"}, -- Tremor Totem
+        { spell = 32182, type = "ability"}, -- Heroism
+        { spell = 51485, type = "ability", talent = 8 }, -- Earthgrab Totem
+        { spell = 51505, type = "ability"}, -- Lava Burst
+        { spell = 51514, type = "ability"}, -- Hex
+        { spell = 57994, type = "ability"}, -- Wind Shear
+        { spell = 61295, type = "ability"}, -- Riptide
+        { spell = 73685, type = "ability", talent = 0 }, -- Unleash Life
+        { spell = 73920, type = "ability"}, -- Healing Rain
+        { spell = 79206, type = "ability"}, -- Spiritwalker's Grace
+        { spell = 98008, type = "ability"}, -- Spirit Link Totem
+        { spell = 108271, type = "ability"}, -- Astral Shift
+        { spell = 108280, type = "ability"}, -- Healing Tide Totem
+        { spell = 114052, type = "ability", talent = 21 }, -- Ascendance
+        { spell = 157153, type = "ability", talent = 18 }, -- Cloudburst Totem
+        { spell = 188838, type = "ability"}, -- Flame Shock
+        { spell = 192058, type = "ability"}, -- Capacitor Totem
+        { spell = 192077, type = "ability", talent = 15 }, -- Wind Rush Totem
+        { spell = 197995, type = "ability", talent = 20 }, -- Wellspring
+        { spell = 198103, type = "ability"}, -- Earth Elemental
+        { spell = 198838, type = "ability", talent = 11 }, -- Earthen Wall Totem
+        { spell = 207399, type = "ability", talent = 12 }, -- Ancestral Protection Totem
+        { spell = 207778, type = "ability", talent = 17 }, -- Downpour
       },
       icon = 135127
     },
@@ -773,18 +1656,66 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
+        { spell = 110960, type = "buff", unit = "player"}, -- Greater Invisibility
+        { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
+        { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
+        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
+        { spell = 212799, type = "buff", unit = "player"}, -- Displacement Beacon
+        { spell = 210126, type = "buff", unit = "player", talent = 3 }, -- Arcane Familiar
+        { spell = 236298, type = "buff", unit = "player", talent = 13 }, -- Chrono Shift
+        { spell = 116014, type = "buff", unit = "player", talent = 9 }, -- Rune of Power
+        { spell = 130, type = "buff", unit = "player"}, -- Slow Fall
+        { spell = 263725, type = "buff", unit = "player"}, -- Clearcasting
+        { spell = 235450, type = "buff", unit = "player"}, -- Prismatic Barrier
+        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
+        { spell = 12051, type = "buff", unit = "player"}, -- Evocation
+        { spell = 205025, type = "buff", unit = "player"}, -- Presence of Mind
+        { spell = 264774, type = "buff", unit = "player", talent = 2 }, -- Rule of Threes
+        { spell = 113862, type = "buff", unit = "player"}, -- Greater Invisibility
+        { spell = 12042, type = "buff", unit = "player"}, -- Arcane Power
+
       },
       icon = 136096
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 82691, type = "debuff", unit = "target", talent = 15 }, -- Ring of Frost
+        { spell = 114923, type = "debuff", unit = "target", talent = 18 }, -- Nether Tempest
+        { spell = 210824, type = "debuff", unit = "target", talent = 17 }, -- Touch of the Magi
+        { spell = 236299, type = "debuff", unit = "target", talent = 13 }, -- Chrono Shift
+        { spell = 31589, type = "debuff", unit = "target"}, -- Slow
+        { spell = 122, type = "debuff", unit = "target"}, -- Frost Nova
+        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
       },
       icon = 135848
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 122, type = "ability"}, -- Frost Nova
+        { spell = 475, type = "ability"}, -- Remove Curse
+        { spell = 1953, type = "ability"}, -- Blink
+        { spell = 2139, type = "ability"}, -- Counterspell
+        { spell = 12042, type = "ability"}, -- Arcane Power
+        { spell = 12051, type = "ability"}, -- Evocation
+        { spell = 44425, type = "ability"}, -- Arcane Barrage
+        { spell = 45438, type = "ability"}, -- Ice Block
+        { spell = 55342, type = "ability", talent = 8 }, -- Mirror Image
+        { spell = 80353, type = "ability"}, -- Time Warp
+        { spell = 110959, type = "ability"}, -- Greater Invisibility
+        { spell = 113724, type = "ability", talent = 15 }, -- Ring of Frost
+        { spell = 116011, type = "ability", talent = 9 }, -- Rune of Power
+        { spell = 153626, type = "ability", talent = 21 }, -- Arcane Orb
+        { spell = 157980, type = "ability", talent = 12 }, -- Supernova
+        { spell = 190336, type = "ability"}, -- Conjure Refreshment
+        { spell = 195676, type = "ability"}, -- Displacement
+        { spell = 205022, type = "ability", talent = 3 }, -- Arcane Familiar
+        { spell = 205025, type = "ability"}, -- Presence of Mind
+        { spell = 205032, type = "ability", talent = 11 }, -- Charged Up
+        { spell = 212653, type = "ability", talent = 5 }, -- Shimmer
+        { spell = 235450, type = "ability"}, -- Prismatic Barrier
       },
       icon = 136075
     },
@@ -811,18 +1742,64 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 236060, type = "buff", unit = "player", talent = 13 }, -- Frenetic Speed
+        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
+        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
+        { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
+        { spell = 269651, type = "buff", unit = "player", talent = 20 }, -- Pyroclasm
+        { spell = 45444, type = "buff", unit = "player"}, -- Bonfire's Blessing
+        { spell = 48107, type = "buff", unit = "player"}, -- Heating Up
+        { spell = 116014, type = "buff", unit = "player", talent = 9 }, -- Rune of Power
+        { spell = 235313, type = "buff", unit = "player"}, -- Blazing Barrier
+        { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
+        { spell = 157644, type = "buff", unit = "player"}, -- Enhanced Pyrotechnics
+        { spell = 190319, type = "buff", unit = "player"}, -- Combustion
+        { spell = 66, type = "buff", unit = "player"}, -- Invisibility
+        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
+        { spell = 130, type = "buff", unit = "player"}, -- Slow Fall
+        { spell = 48108, type = "buff", unit = "player"}, -- Hot Streak!
       },
       icon = 1035045
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 31661, type = "debuff", unit = "target"}, -- Dragon's Breath
+        { spell = 2120, type = "debuff", unit = "target"}, -- Flamestrike
+        { spell = 155158, type = "debuff", unit = "target", talent = 21 }, -- Meteor Burn
+        { spell = 157981, type = "debuff", unit = "target", talent = 6 }, -- Blast Wave
+        { spell = 226757, type = "debuff", unit = "target", talent = 17 }, -- Conflagration
+        { spell = 217694, type = "debuff", unit = "target", talent = 18 }, -- Living Bomb
+        { spell = 12654, type = "debuff", unit = "target"}, -- Ignite
+        { spell = 82691, type = "debuff", unit = "target", talent = 15 }, -- Ring of Frost
+        { spell = 87023, type = "debuff", unit = "player" }, -- Cauterize
+        { spell = 87024, type = "debuff", unit = "player" }, -- Cauterized
+        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
       },
       icon = 135818
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 66, type = "ability"}, -- Invisibility
+        { spell = 475, type = "ability"}, -- Remove Curse
+        { spell = 1953, type = "ability"}, -- Blink
+        { spell = 2139, type = "ability"}, -- Counterspell
+        { spell = 31661, type = "ability"}, -- Dragon's Breath
+        { spell = 44457, type = "ability", talent = 18 }, -- Living Bomb
+        { spell = 45438, type = "ability"}, -- Ice Block
+        { spell = 55342, type = "ability", talent = 8 }, -- Mirror Image
+        { spell = 80353, type = "ability"}, -- Time Warp
+        { spell = 108853, type = "ability"}, -- Fire Blast
+        { spell = 113724, type = "ability", talent = 15 }, -- Ring of Frost
+        { spell = 116011, type = "ability", talent = 9 }, -- Rune of Power
+        { spell = 153561, type = "ability", talent = 21 }, -- Meteor
+        { spell = 157981, type = "ability", talent = 6 }, -- Blast Wave
+        { spell = 190319, type = "ability"}, -- Combustion
+        { spell = 190336, type = "ability"}, -- Conjure Refreshment
+        { spell = 212653, type = "ability", talent = 5 }, -- Shimmer
+        { spell = 235313, type = "ability"}, -- Blazing Barrier
+        { spell = 257541, type = "ability", talent = 12 }, -- Phoenix Flames
       },
       icon = 610633
     },
@@ -849,18 +1826,73 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
+        { spell = 199844, type = "buff", unit = "player", talent = 21 }, -- Glacial Spike!
+        { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
+        { spell = 66, type = "buff", unit = "player"}, -- Invisibility
+        { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
+        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
+        { spell = 32612, type = "buff", unit = "player"}, -- Invisibility
+        { spell = 108839, type = "buff", unit = "player", talent = 6 }, -- Ice Floes
+        { spell = 278310, type = "buff", unit = "player", talent = 11 }, -- Chain Reaction
+        { spell = 12472, type = "buff", unit = "player"}, -- Icy Veins
+        { spell = 11426, type = "buff", unit = "player"}, -- Ice Barrier
+        { spell = 130, type = "buff", unit = "player"}, -- Slow Fall
+        { spell = 205473, type = "buff", unit = "player"}, -- Icicles
+        { spell = 270232, type = "buff", unit = "player", talent = 16 }, -- Freezing Rain
+        { spell = 190446, type = "buff", unit = "player"}, -- Brain Freeze
+        { spell = 116014, type = "buff", unit = "player", talent = 9 }, -- Rune of Power
+        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
+        { spell = 44544, type = "buff", unit = "player"}, -- Fingers of Frost
+        { spell = 205766, type = "buff", unit = "player", talent = 1 }, -- Bone Chilling
       },
       icon = 236227
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 228354, type = "debuff", unit = "target"}, -- Flurry
+        { spell = 205708, type = "debuff", unit = "target"}, -- Chilled
+        { spell = 228600, type = "debuff", unit = "target", talent = 21 }, -- Glacial Spike
+        { spell = 157997, type = "debuff", unit = "target", talent = 3 }, -- Ice Nova
+        { spell = 228358, type = "debuff", unit = "target"}, -- Winter's Chill
+        { spell = 205021, type = "debuff", unit = "target", talent = 20 }, -- Ray of Frost
+        { spell = 122, type = "debuff", unit = "target"}, -- Frost Nova
+        { spell = 82691, type = "debuff", unit = "target", talent = 15 }, -- Ring of Frost
+        { spell = 212792, type = "debuff", unit = "target"}, -- Cone of Cold
+        { spell = 118, type = "debuff", unit = "multi" }, -- Polymorph
       },
       icon = 236208
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 66, type = "ability"}, -- Invisibility
+        { spell = 120, type = "ability"}, -- Cone of Cold
+        { spell = 122, type = "ability"}, -- Frost Nova
+        { spell = 475, type = "ability"}, -- Remove Curse
+        { spell = 1953, type = "ability"}, -- Blink
+        { spell = 2139, type = "ability"}, -- Counterspell
+        { spell = 11426, type = "ability"}, -- Ice Barrier
+        { spell = 12472, type = "ability"}, -- Icy Veins
+        { spell = 30455, type = "ability"}, -- Ice Lance
+        { spell = 31687, type = "ability"}, -- Summon Water Elemental
+        { spell = 31707, type = "ability"}, -- Waterbolt
+        { spell = 45438, type = "ability"}, -- Ice Block
+        { spell = 55342, type = "ability", talent = 8 }, -- Mirror Image
+        { spell = 80353, type = "ability"}, -- Time Warp
+        { spell = 84714, type = "ability"}, -- Frozen Orb
+        { spell = 108839, type = "ability", talent = 6 }, -- Ice Floes
+        { spell = 113724, type = "ability", talent = 15 }, -- Ring of Frost
+        { spell = 116011, type = "ability", talent = 9 }, -- Rune of Power
+        { spell = 153595, type = "ability", talent = 18 }, -- Comet Storm
+        { spell = 157997, type = "ability", talent = 3 }, -- Ice Nova
+        { spell = 190336, type = "ability"}, -- Conjure Refreshment
+        { spell = 190356, type = "ability"}, -- Blizzard
+        { spell = 205021, type = "ability", talent = 20 }, -- Ray of Frost
+        { spell = 212653, type = "ability", talent = 5 }, -- Shimmer
+        { spell = 235219, type = "ability"}, -- Cold Snap
+        { spell = 257537, type = "ability", talent = 12 }, -- Ebonbolt
       },
       icon = 629077
     },
@@ -1359,18 +2391,70 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 81256, type = "buff", unit = "player"}, -- Dancing Rune Weapon
+        { spell = 55233, type = "buff", unit = "player"}, -- Vampiric Blood
+        { spell = 3714, type = "buff", unit = "player"}, -- Path of Frost
+        { spell = 194679, type = "buff", unit = "player", talent = 12}, -- Rune Tap
+        { spell = 48265, type = "buff", unit = "player"}, -- Death's Advance
+        { spell = 219809, type = "buff", unit = "player", talent = 9}, -- Tombstone
+        { spell = 188290, type = "buff", unit = "player"}, -- Death and Decay
+        { spell = 273947, type = "buff", unit = "player", talent = 5}, -- Hemostasis
+        { spell = 48707, type = "buff", unit = "player"}, -- Anti-Magic Shell
+        { spell = 81141, type = "buff", unit = "player"}, -- Crimson Scourge
+        { spell = 195181, type = "buff", unit = "player"}, -- Bone Shield
+        { spell = 194844, type = "buff", unit = "player", talent = 21}, -- Bonestorm
+        { spell = 274009, type = "buff", unit = "player", talent = 16}, -- Voracious
+        { spell = 53365, type = "buff", unit = "player"}, -- Unholy Strength
+        { spell = 77535, type = "buff", unit = "player"}, -- Blood Shield
+        { spell = 212552, type = "buff", unit = "player", talent = 15}, -- Wraith Walk
+        { spell = 48792, type = "buff", unit = "player"}, -- Icebound Fortitude
       },
       icon = 237517
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 206930, type = "debuff", unit = "target"}, -- Heart Strike
+        { spell = 206931, type = "debuff", unit = "target", talent = 2}, -- Blooddrinker
+        { spell = 221562, type = "debuff", unit = "target"}, -- Asphyxiate
+        { spell = 273977, type = "debuff", unit = "target", talent = 13}, -- Grip of the Dead
+        { spell = 55078, type = "debuff", unit = "target"}, -- Blood Plague
+        { spell = 56222, type = "debuff", unit = "target"}, -- Dark Command
+        { spell = 51399, type = "debuff", unit = "target"}, -- Death Grip
+        { spell = 114556, type = "debuff", unit = "player", talent = 19 }, -- Purgatory
       },
       icon = 237514
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 3714, type = "ability"}, -- Path of Frost
+        { spell = 43265, type = "ability"}, -- Death and Decay
+        { spell = 47528, type = "ability"}, -- Mind Freeze
+        { spell = 48265, type = "ability"}, -- Death's Advance
+        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
+        { spell = 48792, type = "ability"}, -- Icebound Fortitude
+        { spell = 49028, type = "ability"}, -- Dancing Rune Weapon
+        { spell = 49576, type = "ability"}, -- Death Grip
+        { spell = 50842, type = "ability"}, -- Blood Boil
+        { spell = 50977, type = "ability"}, -- Death Gate
+        { spell = 55233, type = "ability"}, -- Vampiric Blood
+        { spell = 56222, type = "ability"}, -- Dark Command
+        { spell = 61999, type = "ability"}, -- Raise Ally
+        { spell = 108199, type = "ability"}, -- Gorefiend's Grasp
+        { spell = 111673, type = "ability"}, -- Control Undead
+        { spell = 194679, type = "ability", talent = 12}, -- Rune Tap
+        { spell = 194844, type = "ability", talent = 21}, -- Bonestorm
+        { spell = 195182, type = "ability"}, -- Marrowrend
+        { spell = 195292, type = "ability"}, -- Death's Caress
+        { spell = 206930, type = "ability"}, -- Heart Strike
+        { spell = 206931, type = "ability", talent = 2}, -- Blooddrinker
+        { spell = 206940, type = "ability", talent = 18}, -- Mark of Blood
+        { spell = 210764, type = "ability", talent = 3}, -- Rune Strike
+        { spell = 212552, type = "ability", talent = 15}, -- Wraith Walk
+        { spell = 219809, type = "ability", talent = 9}, -- Tombstone
+        { spell = 221562, type = "ability"}, -- Asphyxiate
+        { spell = 274156, type = "ability", talent = 6}, -- Consumption
       },
       icon = 136120
     },
@@ -1397,18 +2481,66 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 3714, type = "buff", unit = "player"}, -- Path of Frost
+        { spell = 207203, type = "buff", unit = "player"}, -- Frost Shield
+        { spell = 152279, type = "buff", unit = "player", talent = 21}, -- Breath of Sindragosa
+        { spell = 59052, type = "buff", unit = "player"}, -- Rime
+        { spell = 48265, type = "buff", unit = "player"}, -- Death's Advance
+        { spell = 281209, type = "buff", unit = "player", talent = 3}, -- Cold Heart
+        { spell = 51124, type = "buff", unit = "player"}, -- Killing Machine
+        { spell = 48707, type = "buff", unit = "player"}, -- Anti-Magic Shell
+        { spell = 211805, type = "buff", unit = "player", talent = 16}, -- Gathering Storm
+        { spell = 51271, type = "buff", unit = "player"}, -- Pillar of Frost
+        { spell = 212552, type = "buff", unit = "player", talent = 14}, -- Wraith Walk
+        { spell = 53365, type = "buff", unit = "player"}, -- Unholy Strength
+        { spell = 196770, type = "buff", unit = "player"}, -- Remorseless Winter
+        { spell = 47568, type = "buff", unit = "player"}, -- Empower Rune Weapon
+        { spell = 194879, type = "buff", unit = "player", talent = 2}, -- Icy Talons
+        { spell = 48792, type = "buff", unit = "player"}, -- Icebound Fortitude
+        { spell = 253595, type = "buff", unit = "player", talent = 1}, -- Inexorable Assault
+        { spell = 178819, type = "buff", unit = "player" }, -- Dark Succor
       },
       icon = 135305
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 207167, type = "debuff", unit = "target", talent = 9}, -- Blinding Sleet
+        { spell = 45524, type = "debuff", unit = "target"}, -- Chains of Ice
+        { spell = 51714, type = "debuff", unit = "target"}, -- Razorice
+        { spell = 56222, type = "debuff", unit = "target"}, -- Dark Command
+        { spell = 211793, type = "debuff", unit = "target"}, -- Remorseless Winter
+        { spell = 55095, type = "debuff", unit = "target"}, -- Frost Fever
+
       },
       icon = 237522
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 3714, type = "ability"}, -- Path of Frost
+        { spell = 45524, type = "ability"}, -- Chains of Ice
+        { spell = 47528, type = "ability"}, -- Mind Freeze
+        { spell = 47568, type = "ability"}, -- Empower Rune Weapon
+        { spell = 48265, type = "ability", talent = 15}, -- Death's Advance
+        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
+        { spell = 48743, type = "ability"}, -- Death Pact
+        { spell = 48792, type = "ability"}, -- Icebound Fortitude
+        { spell = 49020, type = "ability"}, -- Obliterate
+        { spell = 49184, type = "ability"}, -- Howling Blast
+        { spell = 50977, type = "ability"}, -- Death Gate
+        { spell = 51271, type = "ability"}, -- Pillar of Frost
+        { spell = 56222, type = "ability"}, -- Dark Command
+        { spell = 57330, type = "ability", talent = 6}, -- Horn of Winter
+        { spell = 61999, type = "ability"}, -- Raise Ally
+        { spell = 111673, type = "ability"}, -- Control Undead
+        { spell = 152279, type = "ability", talent = 21}, -- Breath of Sindragosa
+        { spell = 194913, type = "ability"}, -- Glacial Advance
+        { spell = 196770, type = "ability"}, -- Remorseless Winter
+        { spell = 207167, type = "ability", talent = 9}, -- Blinding Sleet
+        { spell = 207230, type = "ability", talent = 12}, -- Frostscythe
+        { spell = 212552, type = "ability", talent = 14}, -- Wraith Walk
+        { spell = 279302, type = "ability", talent = 18}, -- Frostwyrm's Fury
       },
       icon = 135372
     },
@@ -1435,18 +2567,73 @@ templates.class.DEATHKNIGHT = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 3714, type = "buff", unit = "player"}, -- Path of Frost
+        { spell = 212552, type = "buff", unit = "player", talent = 14}, -- Wraith Walk
+        { spell = 48707, type = "buff", unit = "player"}, -- Anti-Magic Shell
+        { spell = 53365, type = "buff", unit = "player"}, -- Unholy Strength
+        { spell = 207289, type = "buff", unit = "player"}, -- Unholy Frenzy
+        { spell = 188290, type = "buff", unit = "player"}, -- Death and Decay
+        { spell = 115989, type = "buff", unit = "player", talent = 6}, -- Unholy Blight
+        { spell = 48792, type = "buff", unit = "player"}, -- Icebound Fortitude
+        { spell = 42650, type = "buff", unit = "player"}, -- Army of the Dead
+        { spell = 81340, type = "buff", unit = "player"}, -- Sudden Doom
+        { spell = 48265, type = "buff", unit = "player"}, -- Death's Advance
+        { spell = 51460, type = "buff", unit = "player"}, -- Runic Corruption
+        { spell = 63560, type = "buff", unit = "pet"}, -- Dark Transformation
+        { spell = 3714, type = "buff", unit = "pet"}, -- Path of Frost
+        { spell = 178819, type = "buff", unit = "player" }, -- Dark Succor
       },
       icon = 136181
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 45524, type = "debuff", unit = "target"}, -- Chains of Ice
+        { spell = 115994, type = "debuff", unit = "target", talent = 6}, -- Unholy Blight
+        { spell = 91800, type = "debuff", unit = "target"}, -- Gnaw
+        { spell = 194310, type = "debuff", unit = "target"}, -- Festering Wound
+        { spell = 56222, type = "debuff", unit = "target"}, -- Dark Command
+        { spell = 196782, type = "debuff", unit = "target"}, -- Outbreak
+        { spell = 108194, type = "debuff", unit = "target", talent = 9}, -- Asphyxiate
+        { spell = 273977, type = "debuff", unit = "target"}, -- Grip of the Dead
+        { spell = 130736, type = "debuff", unit = "target", talent = 12}, -- Soul Reaper
+        { spell = 191587, type = "debuff", unit = "target"}, -- Virulent Plague
       },
       icon = 1129420
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 3714, type = "ability"}, -- Path of Frost
+        { spell = 42650, type = "ability"}, -- Army of the Dead
+        { spell = 43265, type = "ability"}, -- Death and Decay
+        { spell = 45524, type = "ability"}, -- Chains of Ice
+        { spell = 46584, type = "ability"}, -- Raise Dead
+        { spell = 47468, type = "ability"}, -- Claw
+        { spell = 47481, type = "ability"}, -- Gnaw
+        { spell = 47484, type = "ability"}, -- Huddle
+        { spell = 47528, type = "ability"}, -- Mind Freeze
+        { spell = 48265, type = "ability"}, -- Death's Advance
+        { spell = 48707, type = "ability"}, -- Anti-Magic Shell
+        { spell = 48743, type = "ability"}, -- Death Pact
+        { spell = 48792, type = "ability"}, -- Icebound Fortitude
+        { spell = 49206, type = "ability", talent = 21}, -- Summon Gargoyle
+        { spell = 50977, type = "ability"}, -- Death Gate
+        { spell = 55090, type = "ability"}, -- Scourge Strike
+        { spell = 56222, type = "ability"}, -- Dark Command
+        { spell = 61999, type = "ability"}, -- Raise Ally
+        { spell = 63560, type = "ability"}, -- Dark Transformation
+        { spell = 77575, type = "ability"}, -- Outbreak
+        { spell = 85948, type = "ability"}, -- Festering Strike
+        { spell = 108194, type = "ability", talent = 9}, -- Asphyxiate
+        { spell = 111673, type = "ability"}, -- Control Undead
+        { spell = 115989, type = "ability", talent = 6}, -- Unholy Blight
+        { spell = 130736, type = "ability", talent = 12}, -- Soul Reaper
+        { spell = 152280, type = "ability", talent = 17}, -- Defile
+        { spell = 207289, type = "ability", talent = 20}, -- Unholy Frenzy
+        { spell = 207311, type = "ability"}, -- Clawing Shadows
+        { spell = 212552, type = "ability", talent = 14}, -- Wraith Walk
+        { spell = 275699, type = "ability"}, -- Apocalypse
       },
       icon = 136144
     },

From a24e77d78f9f44caa0b79ac0b62315e2ef14a78a Mon Sep 17 00:00:00 2001
From: emptyrivers <afaure6@gmail.com>
Date: Sun, 17 Jun 2018 03:59:50 -0500
Subject: [PATCH 69/82] include maghar orc in race_types

---
 WeakAuras/Types.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 7ebe194aba..25fdf47e81 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -204,7 +204,8 @@ WeakAuras.race_types = {
   HighmountainTauren = LBR("Highmountain Tauren"),
   Nightborne = LBR("Nightborne"),
   DarkIronDwarf = LBR("Dark Iron Dwarf"),
-  ZandalariTroll = LBR("Zandalari Troll")
+  ZandalariTroll = LBR("Zandalari Troll"),
+  MagharOrc = LBR("Mag'har Orc"),
 }
 
 WeakAuras.faction_group = {

From c8beddc31dbc602b081fd761897ff5ea20c63864 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sat, 7 Jul 2018 22:59:10 +0200
Subject: [PATCH 70/82] Update templates for BfA

Missing PVP Talents and Azerite stuff.
---
 WeakAurasTemplates/TriggerTemplatesData.lua | 860 +++++++++++++++++++-
 1 file changed, 831 insertions(+), 29 deletions(-)

diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index 21b8d20bf5..7c655cbb69 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -593,22 +593,13 @@ templates.class.HUNTER = {
         { spell = 193530, type = "buff", unit = "player"}, -- Aspect of the Wild
         { spell = 5384, type = "buff", unit = "player"}, -- Feign Death
         { spell = 199483, type = "buff", unit = "player"}, -- Camouflage
-        { spell = 186257, type = "buff", unit = "player"}, -- Aspect of the Cheetah
         { spell = 281036, type = "buff", unit = "player", talent = 3}, -- Dire Beast
         { spell = 186265, type = "buff", unit = "player"}, -- Aspect of the Turtle
         { spell = 6197, type = "buff", unit = "player"}, -- Eagle Eye
         { spell = 246152, type = "buff", unit = "player"}, -- Barbed Shot
-        { spell = 264663, type = "buff", unit = "target"}, -- Predator's Thirst
-        { spell = 34477, type = "buff", unit = "target"}, -- Misdirection
         { spell = 24450, type = "buff", unit = "pet"}, -- Prowl
-        { spell = 264663, type = "buff", unit = "pet"}, -- Predator's Thirst
-        { spell = 118455, type = "buff", unit = "pet"}, -- Beast Cleave
-        { spell = 193530, type = "buff", unit = "pet"}, -- Aspect of the Wild
         { spell = 272790, type = "buff", unit = "pet"}, -- Frenzy
-        { spell = 186254, type = "buff", unit = "pet"}, -- Bestial Wrath
-        { spell = 199483, type = "buff", unit = "pet", talent = 9}, -- Camouflage
         { spell = 136, type = "buff", unit = "pet"}, -- Mend Pet
-        { spell = 34477, type = "buff", unit = "pet"}, -- Misdirection
       },
       icon = 132242
     },
@@ -695,16 +686,11 @@ templates.class.HUNTER = {
         { spell = 260242, type = "buff", unit = "player"}, -- Precise Shots
         { spell = 5384, type = "buff", unit = "player"}, -- Feign Death
         { spell = 260402, type = "buff", unit = "player", talent = 18}, -- Double Tap
-        { spell = 186257, type = "buff", unit = "player"}, -- Aspect of the Cheetah
         { spell = 118922, type = "buff", unit = "player", talent = 14}, -- Posthaste
         { spell = 186265, type = "buff", unit = "player"}, -- Aspect of the Turtle
         { spell = 193534, type = "buff", unit = "player", talent = 10}, -- Steady Focus
         { spell = 264663, type = "buff", unit = "player"}, -- Predator's Thirst
         { spell = 199483, type = "buff", unit = "player", talent = 9}, -- Camouflage
-        { spell = 24450, type = "buff", unit = "target"}, -- Prowl
-        { spell = 264663, type = "buff", unit = "target"}, -- Predator's Thirst
-        { spell = 34477, type = "buff", unit = "target"}, -- Misdirection
-        { spell = 264663, type = "buff", unit = "pet"}, -- Predator's Thirst
         { spell = 24450, type = "buff", unit = "pet"}, -- Prowl
         { spell = 136, type = "buff", unit = "pet"}, -- Mend Pet
 
@@ -753,7 +739,6 @@ templates.class.HUNTER = {
         { spell = 257620, type = "ability"}, -- Multi-Shot
         { spell = 260402, type = "ability", talent = 18}, -- Double Tap
         { spell = 264667, type = "ability"}, -- Primal Rage
-        { spell = 272678, type = "ability"}, -- Primal Rage
 
       },
       icon = 132329
@@ -781,18 +766,98 @@ templates.class.HUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 199483, type = "buff", unit = "player", talent = 9}, -- Camouflage
+        { spell = 35079, type = "buff", unit = "player"}, -- Misdirection
+        { spell = 231390, type = "buff", unit = "player", talent = 7 }, -- Trailblazer
+        { spell = 186258, type = "buff", unit = "player"}, -- Aspect of the Cheetah
+        { spell = 264667, type = "buff", unit = "player"}, -- Primal Rage
+        { spell = 259388, type = "buff", unit = "player", talent = 17 }, -- Mongoose Fury
+        { spell = 225788, type = "buff", unit = "player"}, -- Sign of the Emissary
+        { spell = 268552, type = "buff", unit = "player", talent = 1 }, -- Viper's Venom
+        { spell = 260249, type = "buff", unit = "player"}, -- Predator
+        { spell = 6197, type = "buff", unit = "player"}, -- Eagle Eye
+        { spell = 264663, type = "buff", unit = "player"}, -- Predator's Thirst
+        { spell = 266779, type = "buff", unit = "player"}, -- Coordinated Assault
+        { spell = 5384, type = "buff", unit = "player"}, -- Feign Death
+        { spell = 260286, type = "buff", unit = "player", talent = 16 }, -- Tip of the Spear
+        { spell = 186265, type = "buff", unit = "player"}, -- Aspect of the Turtle
+        { spell = 118922, type = "buff", unit = "player", talent = 14 }, -- Posthaste
+        { spell = 265898, type = "buff", unit = "player", talent = 2 }, -- Terms of Engagement
+        { spell = 186289, type = "buff", unit = "player"}, -- Aspect of the Eagle
+        { spell = 264663, type = "buff", unit = "pet"}, -- Predator's Thirst
+        { spell = 266779, type = "buff", unit = "pet"}, -- Coordinated Assault
+        { spell = 263892, type = "buff", unit = "pet"}, -- Catlike Reflexes
+        { spell = 61684, type = "buff", unit = "pet"}, -- Dash
+        { spell = 136, type = "buff", unit = "pet"}, -- Mend Pet
+        { spell = 260249, type = "buff", unit = "pet"}, -- Predator
+        { spell = 24450, type = "buff", unit = "pet"}, -- Prowl
+
       },
       icon = 1376044
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 270339, type = "debuff", unit = "target", talent = 20 }, -- Shrapnel Bomb
+        { spell = 270332, type = "debuff", unit = "target", talent = 20 }, -- Pheromone Bomb
+        { spell = 24394, type = "debuff", unit = "target"}, -- Intimidation
+        { spell = 135299, type = "debuff", unit = "target"}, -- Tar Trap
+        { spell = 270343, type = "debuff", unit = "target"}, -- Internal Bleeding
+        { spell = 195645, type = "debuff", unit = "target"}, -- Wing Clip
+        { spell = 269747, type = "debuff", unit = "target"}, -- Wildfire Bomb
+        { spell = 162487, type = "debuff", unit = "target", talent = 11 }, -- Steel Trap
+        { spell = 131894, type = "debuff", unit = "target", talent = 12 }, -- A Murder of Crows
+        { spell = 259277, type = "debuff", unit = "target", talent = 10 }, -- Kill Command
+        { spell = 190927, type = "debuff", unit = "target"}, -- Harpoon
+        { spell = 162480, type = "debuff", unit = "target"}, -- Steel Trap
+        { spell = 2649, type = "debuff", unit = "target"}, -- Growl
+        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 259491, type = "debuff", unit = "target"}, -- Serpent Sting
+        { spell = 271049, type = "debuff", unit = "target"}, -- Volatile Bomb
+        { spell = 117405, type = "debuff", unit = "target", talent = 15 }, -- Binding Shot
+
       },
       icon = 132309
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 781, type = "ability"}, -- Disengage
+        { spell = 1543, type = "ability"}, -- Flare
+        { spell = 2649, type = "ability"}, -- Growl
+        { spell = 5384, type = "ability"}, -- Feign Death
+        { spell = 16827, type = "ability"}, -- Claw
+        { spell = 19434, type = "ability"}, -- Aimed Shot
+        { spell = 19577, type = "ability"}, -- Intimidation
+        { spell = 24450, type = "ability"}, -- Prowl
+        { spell = 34477, type = "ability"}, -- Misdirection
+        { spell = 61684, type = "ability"}, -- Dash
+        { spell = 109248, type = "ability"}, -- Binding Shot
+        { spell = 109304, type = "ability"}, -- Exhilaration
+        { spell = 131894, type = "ability", talent = 12}, -- A Murder of Crows
+        { spell = 162488, type = "ability", talent = 11}, -- Steel Trap
+        { spell = 186257, type = "ability"}, -- Aspect of the Cheetah
+        { spell = 186265, type = "ability"}, -- Aspect of the Turtle
+        { spell = 186289, type = "ability"}, -- Aspect of the Eagle
+        { spell = 187650, type = "ability"}, -- Freezing Trap
+        { spell = 187698, type = "ability"}, -- Tar Trap
+        { spell = 187707, type = "ability"}, -- Muzzle
+        { spell = 187708, type = "ability"}, -- Carve
+        { spell = 190925, type = "ability"}, -- Harpoon
+        { spell = 199483, type = "ability", talent = 9}, -- Camouflage
+        { spell = 212436, type = "ability", talent = 6 }, -- Butchery
+        { spell = 259391, type = "ability", talent = 21 }, -- Chakrams
+        { spell = 259489, type = "ability"}, -- Kill Command
+        { spell = 259495, type = "ability"}, -- Wildfire Bomb
+        { spell = 263892, type = "ability"}, -- Catlike Reflexes
+        { spell = 264667, type = "ability"}, -- Primal Rage
+        { spell = 266779, type = "ability"}, -- Coordinated Assault
+        { spell = 269751, type = "ability", talent = 18 }, -- Flanking Strike
+        { spell = 270323, type = "ability", talent = 20 }, -- Pheromone Bomb
+        { spell = 270335, type = "ability", talent = 20}, -- Shrapnel Bomb
+        { spell = 271045, type = "ability", talent = 20}, -- Volatile Bomb
+        { spell = 272678, type = "ability"}, -- Primal Rage
+
       },
       icon = 236184
     },
@@ -817,7 +882,6 @@ templates.class.HUNTER = {
   },
 }
 
-
 templates.class.ROGUE = {
   [1] = { -- Assassination
     [1] = {
@@ -1482,7 +1546,6 @@ templates.class.SHAMAN = {
         { spell = 202004, type = "buff", unit = "player", talent = 4 }, -- Landslide
         { spell = 262400, type = "buff", unit = "player", talent = 6 }, -- Tailwind Totem
         { spell = 58875, type = "buff", unit = "player"}, -- Spirit Walk
-        { spell = 32182, type = "buff", unit = "player"}, -- Heroism
         { spell = 198300, type = "buff", unit = "player"}, -- Gathering Storms
         { spell = 224127, type = "buff", unit = "player", talent = 19 }, -- Crackling Surge
         { spell = 197211, type = "buff", unit = "player", talent = 17 }, -- Fury of Air
@@ -1573,7 +1636,6 @@ templates.class.SHAMAN = {
         { spell = 546, type = "buff", unit = "player"}, -- Water Walking
         { spell = 157504, type = "buff", unit = "player", talent = 18 }, -- Cloudburst Totem
         { spell = 260881, type = "buff", unit = "player", talent = 7 }, -- Spirit Wolf
-        { spell = 32182, type = "buff", unit = "player"}, -- Heroism
         { spell = 61295, type = "buff", unit = "player"}, -- Riptide
         { spell = 98007, type = "buff", unit = "player"}, -- Spirit Link Totem
         { spell = 77762, type = "buff", unit = "player"}, -- Lava Surge
@@ -1590,9 +1652,8 @@ templates.class.SHAMAN = {
       title = L["Debuffs"],
       args = {
         { spell = 118905, type = "debuff", unit = "target"}, -- Static Charge
-        { spell = 64695, type = "debuff", unit = "target", talent = 0 }, -- Earthgrab
+        { spell = 64695, type = "debuff", unit = "target", talent = 8 }, -- Earthgrab
         { spell = 3600, type = "debuff", unit = "target"}, -- Earthbind
-        { spell = 116947, type = "debuff", unit = "target", talent = 0 }, -- Earthbind
         { spell = 188838, type = "debuff", unit = "target"}, -- Flame Shock
 
       },
@@ -1611,7 +1672,7 @@ templates.class.SHAMAN = {
         { spell = 51514, type = "ability"}, -- Hex
         { spell = 57994, type = "ability"}, -- Wind Shear
         { spell = 61295, type = "ability"}, -- Riptide
-        { spell = 73685, type = "ability", talent = 0 }, -- Unleash Life
+        { spell = 73685, type = "ability", talent = 3 }, -- Unleash Life
         { spell = 73920, type = "ability"}, -- Healing Rain
         { spell = 79206, type = "ability"}, -- Spiritwalker's Grace
         { spell = 98008, type = "ability"}, -- Spirit Link Totem
@@ -1656,7 +1717,6 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
         { spell = 110960, type = "buff", unit = "player"}, -- Greater Invisibility
         { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
         { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
@@ -1668,7 +1728,6 @@ templates.class.MAGE = {
         { spell = 130, type = "buff", unit = "player"}, -- Slow Fall
         { spell = 263725, type = "buff", unit = "player"}, -- Clearcasting
         { spell = 235450, type = "buff", unit = "player"}, -- Prismatic Barrier
-        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
         { spell = 12051, type = "buff", unit = "player"}, -- Evocation
         { spell = 205025, type = "buff", unit = "player"}, -- Presence of Mind
         { spell = 264774, type = "buff", unit = "player", talent = 2 }, -- Rule of Threes
@@ -1743,8 +1802,6 @@ templates.class.MAGE = {
       title = L["Buffs"],
       args = {
         { spell = 236060, type = "buff", unit = "player", talent = 13 }, -- Frenetic Speed
-        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
-        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
         { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
         { spell = 269651, type = "buff", unit = "player", talent = 20 }, -- Pyroclasm
         { spell = 45444, type = "buff", unit = "player"}, -- Bonfire's Blessing
@@ -1826,7 +1883,6 @@ templates.class.MAGE = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 186401, type = "buff", unit = "player"}, -- Sign of the Skirmisher
         { spell = 199844, type = "buff", unit = "player", talent = 21 }, -- Glacial Spike!
         { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
         { spell = 66, type = "buff", unit = "player"}, -- Invisibility
@@ -1842,7 +1898,6 @@ templates.class.MAGE = {
         { spell = 270232, type = "buff", unit = "player", talent = 16 }, -- Freezing Rain
         { spell = 190446, type = "buff", unit = "player"}, -- Brain Freeze
         { spell = 116014, type = "buff", unit = "player", talent = 9 }, -- Rune of Power
-        { spell = 80353, type = "buff", unit = "player"}, -- Time Warp
         { spell = 44544, type = "buff", unit = "player"}, -- Fingers of Frost
         { spell = 205766, type = "buff", unit = "player", talent = 1 }, -- Bone Chilling
       },
@@ -1917,24 +1972,91 @@ templates.class.MAGE = {
   },
 }
 
-
 templates.class.WARLOCK = {
   [1] = { -- Affliction
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 196099, type = "buff", unit = "player", talent = 18 }, -- Grimoire of Sacrifice
+        { spell = 104773, type = "buff", unit = "player"}, -- Unending Resolve
+        { spell = 126, type = "buff", unit = "player"}, -- Eye of Kilrogg
+        { spell = 113860, type = "buff", unit = "player", talent = 21 }, -- Dark Soul: Misery
+        { spell = 48018, type = "buff", unit = "player", talent = 15 }, -- Demonic Circle
+        { spell = 108416, type = "buff", unit = "player", talent = 9 }, -- Dark Pact
+        { spell = 6307, type = "buff", unit = "player"}, -- Blood Pact
+        { spell = 108366, type = "buff", unit = "player"}, -- Soul Leech
+        { spell = 5697, type = "buff", unit = "player"}, -- Unending Breath
+        { spell = 264571, type = "buff", unit = "player", talent = 1 }, -- Nightfall
+        { spell = 111400, type = "buff", unit = "player", talent = 8 }, -- Burning Rush
+        { spell = 20707, type = "buff", unit = "group"}, -- Soulstone
+        { spell = 7870, type = "buff", unit = "pet"}, -- Lesser Invisibility
+        { spell = 112042, type = "buff", unit = "pet"}, -- Threatening Presence
+        { spell = 17767, type = "buff", unit = "pet"}, -- Shadow Bulwark
+        { spell = 755, type = "buff", unit = "pet"}, -- Health Funnel
       },
       icon = 136150
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 233490, type = "debuff", unit = "target"}, -- Unstable Affliction
+        { spell = 27243, type = "debuff", unit = "target"}, -- Seed of Corruption
+        { spell = 710, type = "debuff", unit = "target"}, -- Banish
+        { spell = 234153, type = "debuff", unit = "target"}, -- Drain Life
+        { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
+        { spell = 30283, type = "debuff", unit = "target"}, -- Shadowfury
+        { spell = 6789, type = "debuff", unit = "target", talent = 14 }, -- Mortal Coil
+        { spell = 118699, type = "debuff", unit = "target"}, -- Fear
+        { spell = 198590, type = "debuff", unit = "target", talent = 2 }, -- Drain Soul
+        { spell = 17735, type = "debuff", unit = "target"}, -- Suffering
+        { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
+        { spell = 278350, type = "debuff", unit = "target", talent = 12 }, -- Vile Taint
+        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 48181, type = "debuff", unit = "target", talent = 17 }, -- Haunt
+        { spell = 32390, type = "debuff", unit = "target", talent = 16 }, -- Shadow Embrace
+        { spell = 146739, type = "debuff", unit = "target"}, -- Corruption
+        { spell = 205179, type = "debuff", unit = "target", talent = 11 }, -- Phantom Singularity
+        { spell = 63106, type = "debuff", unit = "target", talent = 6 }, -- Siphon Life
+        { spell = 980, type = "debuff", unit = "target"}, -- Agony
       },
       icon = 136139
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 698, type = "ability"}, -- Ritual of Summoning
+        { spell = 3110, type = "ability"}, -- Firebolt
+        { spell = 3716, type = "ability"}, -- Consuming Shadows
+        { spell = 6358, type = "ability"}, -- Seduction
+        { spell = 6360, type = "ability"}, -- Whiplash
+        { spell = 6789, type = "ability", talent = 15 }, -- Mortal Coil
+        { spell = 7814, type = "ability"}, -- Lash of Pain
+        { spell = 7870, type = "ability"}, -- Lesser Invisibility
+        { spell = 17735, type = "ability"}, -- Suffering
+        { spell = 17767, type = "ability"}, -- Shadow Bulwark
+        { spell = 19505, type = "ability"}, -- Devour Magic
+        { spell = 19647, type = "ability"}, -- Spell Lock
+        { spell = 20707, type = "ability"}, -- Soulstone
+        { spell = 29893, type = "ability"}, -- Create Soulwell
+        { spell = 30283, type = "ability"}, -- Shadowfury
+        { spell = 48018, type = "ability", talent = 15 }, -- Demonic Circle
+        { spell = 48020, type = "ability", talent = 15 }, -- Demonic Circle: Teleport
+        { spell = 48181, type = "ability", talent = 17 }, -- Haunt
+        { spell = 54049, type = "ability"}, -- Shadow Bite
+        { spell = 89792, type = "ability" }, -- Flee
+        { spell = 89808, type = "ability"}, -- Singe Magic
+        { spell = 104773, type = "ability"}, -- Unending Resolve
+        { spell = 108416, type = "ability", talent = 9 }, -- Dark Pact
+        { spell = 108503, type = "ability", talent = 18 }, -- Grimoire of Sacrifice
+        { spell = 111771, type = "ability"}, -- Demonic Gateway
+        { spell = 112042, type = "ability"}, -- Threatening Presence
+        { spell = 113860, type = "ability", talent = 21 }, -- Dark Soul: Misery
+        { spell = 119910, type = "ability"}, -- Spell Lock
+        { spell = 205179, type = "ability", talent = 11 }, -- Phantom Singularity
+        { spell = 205180, type = "ability"}, -- Summon Darkglare
+        { spell = 264106, type = "ability", talent = 3 }, -- Deathbolt
+        { spell = 264993, type = "ability"}, -- Shadow Shield
+        { spell = 278350, type = "ability", talent = 12 }, -- Vile Taint
       },
       icon = 615103
     },
@@ -1961,18 +2083,88 @@ templates.class.WARLOCK = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 104773, type = "buff", unit = "player"}, -- Unending Resolve
+        { spell = 126, type = "buff", unit = "player"}, -- Eye of Kilrogg
+        { spell = 267218, type = "buff", unit = "player", talent = 21 }, -- Nether Portal
+        { spell = 48018, type = "buff", unit = "player", talent = 15 }, -- Demonic Circle
+        { spell = 108416, type = "buff", unit = "player", talent = 9 }, -- Dark Pact
+        { spell = 6307, type = "buff", unit = "player"}, -- Blood Pact
+        { spell = 108366, type = "buff", unit = "player"}, -- Soul Leech
+        { spell = 205146, type = "buff", unit = "player", talent = 4 }, -- Demonic Calling
+        { spell = 5697, type = "buff", unit = "player"}, -- Unending Breath
+        { spell = 265273, type = "buff", unit = "player"}, -- Demonic Power
+        { spell = 111400, type = "buff", unit = "player", talent = 8 }, -- Burning Rush
+        { spell = 20707, type = "buff", unit = "group"}, -- Soulstone
+        { spell = 264173, type = "buff", unit = "player"}, -- Demonic Core
+        { spell = 134477, type = "buff", unit = "pet"}, -- Threatening Presence
+        { spell = 30151, type = "buff", unit = "pet"}, -- Pursuit
+        { spell = 267171, type = "buff", unit = "pet", talent = 2 }, -- Demonic Strength
+        { spell = 17767, type = "buff", unit = "pet"}, -- Shadow Bulwark
+        { spell = 89751, type = "buff", unit = "pet"}, -- Felstorm
+        { spell = 755, type = "buff", unit = "pet"}, -- Health Funnel
       },
       icon = 1378284
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 270569, type = "debuff", unit = "target", talent = 10 }, -- From the Shadows
+        { spell = 267997, type = "debuff", unit = "target", talent = 3 }, -- Bile Spit
+        { spell = 17735, type = "debuff", unit = "target"}, -- Suffering
+        { spell = 118699, type = "debuff", unit = "target"}, -- Fear
+        { spell = 30283, type = "debuff", unit = "target"}, -- Shadowfury
+        { spell = 89766, type = "debuff", unit = "target"}, -- Axe Toss
+        { spell = 6789, type = "debuff", unit = "target", talent = 14 }, -- Mortal Coil
+        { spell = 234153, type = "debuff", unit = "target"}, -- Drain Life
+        { spell = 30213, type = "debuff", unit = "target"}, -- Legion Strike
+        { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
+        { spell = 265412, type = "debuff", unit = "target", talent = 6 }, -- Doom
+        { spell = 710, type = "debuff", unit = "target"}, -- Banish
+        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
       },
       icon = 136122
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 698, type = "ability"}, -- Ritual of Summoning
+        { spell = 3716, type = "ability"}, -- Consuming Shadows
+        { spell = 6360, type = "ability"}, -- Whiplash
+        { spell = 6789, type = "ability", talent = 14 }, -- Mortal Coil
+        { spell = 7814, type = "ability"}, -- Lash of Pain
+        { spell = 7870, type = "ability"}, -- Lesser Invisibility
+        { spell = 17735, type = "ability"}, -- Suffering
+        { spell = 17767, type = "ability"}, -- Shadow Bulwark
+        { spell = 19505, type = "ability"}, -- Devour Magic
+        { spell = 19647, type = "ability"}, -- Spell Lock
+        { spell = 20707, type = "ability"}, -- Soulstone
+        { spell = 29893, type = "ability"}, -- Create Soulwell
+        { spell = 30151, type = "ability"}, -- Pursuit
+        { spell = 30213, type = "ability"}, -- Legion Strike
+        { spell = 30283, type = "ability"}, -- Shadowfury
+        { spell = 48018, type = "ability", talent = 15 }, -- Demonic Circle
+        { spell = 48020, type = "ability", talent = 15 }, -- Demonic Circle: Teleport
+        { spell = 54049, type = "ability"}, -- Shadow Bite
+        { spell = 89751, type = "ability"}, -- Felstorm
+        { spell = 89766, type = "ability"}, -- Axe Toss
+        { spell = 89792, type = "ability"}, -- Flee
+        { spell = 89808, type = "ability"}, -- Singe Magic
+        { spell = 104316, type = "ability"}, -- Call Dreadstalkers
+        { spell = 104773, type = "ability"}, -- Unending Resolve
+        { spell = 108416, type = "ability", talent = 9 }, -- Dark Pact
+        { spell = 111771, type = "ability"}, -- Demonic Gateway
+        { spell = 111898, type = "ability", talent = 18 }, -- Grimoire: Felguard
+        { spell = 112042, type = "ability"}, -- Threatening Presence
+        { spell = 264057, type = "ability", talent = 11 }, -- Soul Strike
+        { spell = 264119, type = "ability", talent = 12 }, -- Summon Vilefiend
+        { spell = 264130, type = "ability", talent = 5 }, -- Power Siphon
+        { spell = 264993, type = "ability"}, -- Shadow Shield
+        { spell = 265187, type = "ability"}, -- Summon Demonic Tyrant
+        { spell = 267171, type = "ability", talent = 2 }, -- Demonic Strength
+        { spell = 267211, type = "ability", talent = 3 }, -- Bilescourge Bombers
+        { spell = 267217, type = "ability", talent = 21 }, -- Nether Portal
+        { spell = 6358, type = "ability"}, -- Seduction
       },
       icon = 1378282
     },
@@ -1999,18 +2191,85 @@ templates.class.WARLOCK = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 104773, type = "buff", unit = "player"}, -- Unending Resolve
+        { spell = 126, type = "buff", unit = "player"}, -- Eye of Kilrogg
+        { spell = 113858, type = "buff", unit = "player", talent = 21 }, -- Dark Soul: Instability
+        { spell = 196099, type = "buff", unit = "player", talent = 18 }, -- Grimoire of Sacrifice
+        { spell = 6307, type = "buff", unit = "player"}, -- Blood Pact
+        { spell = 266091, type = "buff", unit = "player", talent = 17 }, -- Grimoire of Supremacy
+        { spell = 108366, type = "buff", unit = "player"}, -- Soul Leech
+        { spell = 266030, type = "buff", unit = "player", talent = 4 }, -- Reverse Entropy
+        { spell = 5697, type = "buff", unit = "player"}, -- Unending Breath
+        { spell = 48018, type = "buff", unit = "player", talent = 15 }, -- Demonic Circle
+        { spell = 111400, type = "buff", unit = "player", talent = 8 }, -- Burning Rush
+        { spell = 20707, type = "buff", unit = "group"}, -- Soulstone
+        { spell = 108416, type = "buff", unit = "player", talent = 9 }, -- Dark Pact
+        { spell = 117828, type = "buff", unit = "player"}, -- Backdraft
+        { spell = 7870, type = "buff", unit = "pet"}, -- Lesser Invisibility
+        { spell = 112042, type = "buff", unit = "pet"}, -- Threatening Presence
+        { spell = 17767, type = "buff", unit = "pet"}, -- Shadow Bulwark
+        { spell = 108366, type = "buff", unit = "pet"}, -- Soul Leech
+        { spell = 755, type = "buff", unit = "pet"}, -- Health Funnel
       },
       icon = 136150
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 157736, type = "debuff", unit = "target"}, -- Immolate
+        { spell = 22703, type = "debuff", unit = "target"}, -- Infernal Awakening
+        { spell = 265931, type = "debuff", unit = "target"}, -- Conflagrate
+        { spell = 17735, type = "debuff", unit = "target"}, -- Suffering
+        { spell = 118699, type = "debuff", unit = "target"}, -- Fear
+        { spell = 80240, type = "debuff", unit = "target"}, -- Havoc
+        { spell = 6789, type = "debuff", unit = "target", talent = 14 }, -- Mortal Coil
+        { spell = 196414, type = "debuff", unit = "target", talent = 2 }, -- Eradication
+        { spell = 234153, type = "debuff", unit = "target"}, -- Drain Life
+        { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
+        { spell = 30283, type = "debuff", unit = "target"}, -- Shadowfury
+        { spell = 710, type = "debuff", unit = "target"}, -- Banish
+        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
+
       },
       icon = 135817
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 698, type = "ability"}, -- Ritual of Summoning
+        { spell = 1122, type = "ability"}, -- Summon Infernal
+        { spell = 3110, type = "ability"}, -- Firebolt
+        { spell = 3716, type = "ability"}, -- Consuming Shadows
+        { spell = 6353, type = "ability", talent = 3 }, -- Soul Fire
+        { spell = 6360, type = "ability"}, -- Whiplash
+        { spell = 6789, type = "ability", talent = 14 }, -- Mortal Coil
+        { spell = 7814, type = "ability"}, -- Lash of Pain
+        { spell = 7870, type = "ability"}, -- Lesser Invisibility
+        { spell = 17735, type = "ability"}, -- Suffering
+        { spell = 17767, type = "ability"}, -- Shadow Bulwark
+        { spell = 17877, type = "ability", talent = 6 }, -- Shadowburn
+        { spell = 17962, type = "ability"}, -- Conflagrate
+        { spell = 19647, type = "ability"}, -- Spell Lock
+        { spell = 20707, type = "ability"}, -- Soulstone
+        { spell = 29893, type = "ability"}, -- Create Soulwell
+        { spell = 30283, type = "ability"}, -- Shadowfury
+        { spell = 48018, type = "ability", talent = 15 }, -- Demonic Circle
+        { spell = 48020, type = "ability", talent = 15 }, -- Demonic Circle: Teleport
+        { spell = 54049, type = "ability"}, -- Shadow Bite
+        { spell = 80240, type = "ability"}, -- Havoc
+        { spell = 89792, type = "ability"}, -- Flee
+        { spell = 89808, type = "ability"}, -- Singe Magic
+        { spell = 104773, type = "ability"}, -- Unending Resolve
+        { spell = 108416, type = "ability", talent = 9 }, -- Dark Pact
+        { spell = 108503, type = "ability", talent = 18 }, -- Grimoire of Sacrifice
+        { spell = 111771, type = "ability"}, -- Demonic Gateway
+        { spell = 112042, type = "ability"}, -- Threatening Presence
+        { spell = 113858, type = "ability", talent = 21 }, -- Dark Soul: Instability
+        { spell = 152108, type = "ability", talent = 12 }, -- Cataclysm
+        { spell = 196447, type = "ability", talent = 20 }, -- Channel Demonfire
+        { spell = 264993, type = "ability"}, -- Shadow Shield
+        { spell = 6358, type = "ability"}, -- Seduction
       },
       icon = 135807
     },
@@ -2040,18 +2299,71 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 116847, type = "buff", unit = "player", talent = 17 }, -- Rushing Jade Wind
+        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
+        { spell = 119085, type = "buff", unit = "player", talent = 5 }, -- Chi Torpedo
+        { spell = 195630, type = "buff", unit = "player"}, -- Elusive Brawler
+        { spell = 228563, type = "buff", unit = "player", talent = 21 }, -- Blackout Combo
+        { spell = 215479, type = "buff", unit = "player"}, -- Ironskin Brew
+        { spell = 115176, type = "buff", unit = "player"}, -- Zen Meditation
+        { spell = 115295, type = "buff", unit = "player", talent = 20 }, -- Guard
+        { spell = 116841, type = "buff", unit = "player", talent = 6 }, -- Tiger's Lust
+        { spell = 120954, type = "buff", unit = "player"}, -- Fortifying Brew
+        { spell = 196608, type = "buff", unit = "player", talent = 1 }, -- Eye of the Tiger
+        { spell = 101643, type = "buff", unit = "player"}, -- Transcendence
+        { spell = 2479, type = "buff", unit = "player"}, -- Honorless Target
+
       },
       icon = 613398
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 119381, type = "debuff", unit = "target"}, -- Leg Sweep
+        { spell = 196608, type = "debuff", unit = "target", talent = 1 }, -- Eye of the Tiger
+        { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
+        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 117952, type = "debuff", unit = "target"}, -- Crackling Jade Lightning
+        { spell = 121253, type = "debuff", unit = "target"}, -- Keg Smash
+        { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
+        { spell = 124273, type = "debuff", unit = "player" }, -- Heavy Stagger
+        { spell = 124274, type = "debuff", unit = "player" }, -- Moderate Stagger
+        { spell = 124275, type = "debuff", unit = "player" }, -- Light Stagger
       },
       icon = 611419
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 101643, type = "ability"}, -- Transcendence
+        { spell = 107079, type = "ability"}, -- Quaking Palm
+        { spell = 109132, type = "ability"}, -- Roll
+        { spell = 115008, type = "ability", talent = 5 }, -- Chi Torpedo
+        { spell = 115078, type = "ability"}, -- Paralysis
+        { spell = 115098, type = "ability", talent = 2 }, -- Chi Wave
+        { spell = 115176, type = "ability"}, -- Zen Meditation
+        { spell = 115181, type = "ability"}, -- Breath of Fire
+        { spell = 115203, type = "ability"}, -- Fortifying Brew
+        { spell = 115295, type = "ability", talent = 20 }, -- Guard
+        { spell = 115308, type = "ability"}, -- Ironskin Brew
+        { spell = 115315, type = "ability", talent = 11 }, -- Summon Black Ox Statue
+        { spell = 115399, type = "ability", talent = 9 }, -- Black Ox Brew
+        { spell = 115546, type = "ability"}, -- Provoke
+        { spell = 116705, type = "ability"}, -- Spear Hand Strike
+        { spell = 116841, type = "ability", talent = 3 }, -- Tiger's Lust
+        { spell = 116844, type = "ability", talent = 12 }, -- Ring of Peace
+        { spell = 116847, type = "ability", talent = 17 }, -- Rushing Jade Wind
+        { spell = 119381, type = "ability"}, -- Leg Sweep
+        { spell = 119582, type = "ability"}, -- Purifying Brew
+        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
+        { spell = 121253, type = "ability"}, -- Keg Smash
+        { spell = 122278, type = "ability", talent = 15 }, -- Dampen Harm
+        { spell = 122281, type = "ability", talent = 14 }, -- Healing Elixir
+        { spell = 123986, type = "ability", talent = 3 }, -- Chi Burst
+        { spell = 126892, type = "ability"}, -- Zen Pilgrimage
+        { spell = 132578, type = "ability", talent = 18 }, -- Invoke Niuzao, the Black Ox
+        { spell = 205523, type = "ability"}, -- Blackout Strike
+
       },
       icon = 133701
     },
@@ -2078,18 +2390,71 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 119611, type = "buff", unit = "player"}, -- Renewing Mist
+        { spell = 196725, type = "buff", unit = "player", talent = 17 }, -- Refreshing Jade Wind
+        { spell = 122783, type = "buff", unit = "player", talent = 14 }, -- Diffuse Magic
+        { spell = 116680, type = "buff", unit = "player"}, -- Thunder Focus Tea
+        { spell = 243435, type = "buff", unit = "player"}, -- Fortifying Brew
+        { spell = 124682, type = "buff", unit = "player"}, -- Enveloping Mist
+        { spell = 116841, type = "buff", unit = "player", talent = 6 }, -- Tiger's Lust
+        { spell = 197908, type = "buff", unit = "player", talent = 9 }, -- Mana Tea
+        { spell = 191840, type = "buff", unit = "player"}, -- Essence Font
+        { spell = 115175, type = "buff", unit = "player"}, -- Soothing Mist
+        { spell = 119085, type = "buff", unit = "player", talent = 5 }, -- Chi Torpedo
+        { spell = 202090, type = "buff", unit = "player"}, -- Teachings of the Monastery
+        { spell = 198533, type = "buff", unit = "player" }, -- Soothing Mist
+        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
+        { spell = 197919, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Enveloping Mist)
+        { spell = 116849, type = "buff", unit = "player"}, -- Life Cocoon
+        { spell = 101643, type = "buff", unit = "player"}, -- Transcendence
+        { spell = 197916, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Vivify)
+
       },
       icon = 627487
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 119381, type = "debuff", unit = "target"}, -- Leg Sweep
+        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 117952, type = "debuff", unit = "target"}, -- Crackling Jade Lightning
+        { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
+        { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
       },
       icon = 629534
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 100784, type = "ability"}, -- Blackout Kick
+        { spell = 101643, type = "ability"}, -- Transcendence
+        { spell = 107079, type = "ability"}, -- Quaking Palm
+        { spell = 107428, type = "ability"}, -- Rising Sun Kick
+        { spell = 109132, type = "ability"}, -- Roll
+        { spell = 115008, type = "ability", talent = 5 }, -- Chi Torpedo
+        { spell = 115078, type = "ability"}, -- Paralysis
+        { spell = 115098, type = "ability", talent = 2 }, -- Chi Wave
+        { spell = 115151, type = "ability"}, -- Renewing Mist
+        { spell = 115310, type = "ability"}, -- Revival
+        { spell = 115313, type = "ability", talent = 16 }, -- Summon Jade Serpent Statue
+        { spell = 115546, type = "ability"}, -- Provoke
+        { spell = 116680, type = "ability"}, -- Thunder Focus Tea
+        { spell = 116841, type = "ability", talent = 6 }, -- Tiger's Lust
+        { spell = 116844, type = "ability", talent = 12 }, -- Ring of Peace
+        { spell = 116849, type = "ability"}, -- Life Cocoon
+        { spell = 119381, type = "ability"}, -- Leg Sweep
+        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
+        { spell = 122278, type = "ability", talent = 15 }, -- Dampen Harm
+        { spell = 122281, type = "ability", talent = 13 }, -- Healing Elixir
+        { spell = 122783, type = "ability", talent = 14 }, -- Diffuse Magic
+        { spell = 123986, type = "ability", talent = 3 }, -- Chi Burst
+        { spell = 126892, type = "ability"}, -- Zen Pilgrimage
+        { spell = 191837, type = "ability"}, -- Essence Font
+        { spell = 196725, type = "ability", talent = 17 }, -- Refreshing Jade Wind
+        { spell = 197908, type = "ability", talent = 9 }, -- Mana Tea
+        { spell = 198664, type = "ability", talent = 18 }, -- Invoke Chi-Ji, the Red Crane
+        { spell = 198898, type = "ability", talent = 11 }, -- Song of Chi-Ji
+        { spell = 243435, type = "ability"}, -- Fortifying Brew
       },
       icon = 627485
     },
@@ -2116,18 +2481,74 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
+        { spell = 125174, type = "buff", unit = "player"}, -- Touch of Karma
+        { spell = 119085, type = "buff", unit = "player", talent = 5 }, -- Chi Torpedo
+        { spell = 152173, type = "buff", unit = "player", talent = 21 }, -- Serenity
+        { spell = 261715, type = "buff", unit = "player", talent = 17 }, -- Rushing Jade Wind
+        { spell = 101643, type = "buff", unit = "player"}, -- Transcendence
+        { spell = 261769, type = "buff", unit = "player", talent = 13 }, -- Inner Strength
+        { spell = 116841, type = "buff", unit = "player", talent = 6 }, -- Tiger's Lust
+        { spell = 122783, type = "buff", unit = "player", talent = 14 }, -- Diffuse Magic
+        { spell = 137639, type = "buff", unit = "player"}, -- Storm, Earth, and Fire
+        { spell = 196741, type = "buff", unit = "player", talent = 16 }, -- Hit Combo
+        { spell = 196608, type = "buff", unit = "player", talent = 1 }, -- Eye of the Tiger
+        { spell = 166646, type = "buff", unit = "player" }, -- Windwalking
+        { spell = 116768, type = "buff", unit = "player"}, -- Blackout Kick!
       },
       icon = 611420
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
+        { spell = 115080, type = "debuff", unit = "target"}, -- Touch of Death
+        { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
+        { spell = 228287, type = "debuff", unit = "target"}, -- Mark of the Crane
+        { spell = 115804, type = "debuff", unit = "target"}, -- Mortal Wounds
+        { spell = 116706, type = "debuff", unit = "target"}, -- Disable
+        { spell = 117952, type = "debuff", unit = "target"}, -- Crackling Jade Lightning
+        { spell = 196608, type = "debuff", unit = "target", talent = 1 }, -- Eye of the Tiger
+        { spell = 122470, type = "debuff", unit = "target"}, -- Touch of Karma
+        { spell = 119381, type = "debuff", unit = "target"}, -- Leg Sweep
+        { spell = 123586, type = "debuff", unit = "target"}, -- Flying Serpent Kick
+
       },
       icon = 629534
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 100784, type = "ability"}, -- Blackout Kick
+        { spell = 101545, type = "ability"}, -- Flying Serpent Kick
+        { spell = 101546, type = "ability"}, -- Spinning Crane Kick
+        { spell = 101643, type = "ability"}, -- Transcendence
+        { spell = 107428, type = "ability"}, -- Rising Sun Kick
+        { spell = 109132, type = "ability"}, -- Roll
+        { spell = 113656, type = "ability"}, -- Fists of Fury
+        { spell = 115008, type = "ability", talent = 5 }, -- Chi Torpedo
+        { spell = 115078, type = "ability"}, -- Paralysis
+        { spell = 115080, type = "ability"}, -- Touch of Death
+        { spell = 115098, type = "ability", talent = 2 }, -- Chi Wave
+        { spell = 115288, type = "ability", talent = 9 }, -- Energizing Elixir
+        { spell = 115546, type = "ability"}, -- Provoke
+        { spell = 116705, type = "ability"}, -- Spear Hand Strike
+        { spell = 116841, type = "ability", talent = 6 }, -- Tiger's Lust
+        { spell = 116844, type = "ability", talent = 12 }, -- Ring of Peace
+        { spell = 119381, type = "ability"}, -- Leg Sweep
+        { spell = 119996, type = "ability"}, -- Transcendence: Transfer
+        { spell = 122278, type = "ability", talent = 15 }, -- Dampen Harm
+        { spell = 122470, type = "ability"}, -- Touch of Karma
+        { spell = 122783, type = "ability", talent = 14 }, -- Diffuse Magic
+        { spell = 123904, type = "ability", talent = 18 }, -- Invoke Xuen, the White Tiger
+        { spell = 123986, type = "ability", talent = 3 }, -- Chi Burst
+        { spell = 126892, type = "ability"}, -- Zen Pilgrimage
+        { spell = 137639, type = "ability"}, -- Storm, Earth, and Fire
+        { spell = 152173, type = "ability", talent = 21 }, -- Serenity
+        { spell = 152175, type = "ability", talent = 20 }, -- Whirling Dragon Punch
+        { spell = 261715, type = "ability", talent = 17 }, -- Rushing Jade Wind
+        { spell = 261947, type = "ability", talent = 8 }, -- Fist of the White Tiger
       },
       icon = 627606
     },
@@ -2157,18 +2578,91 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 279709, type = "buff", unit = "player", talent = 14 }, -- Starlord
+        { spell = 22842, type = "buff", unit = "player", talent = 7 }, -- Frenzied Regeneration
+        { spell = 24858, type = "buff", unit = "player"}, -- Moonkin Form
+        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
+        { spell = 202425, type = "buff", unit = "player", talent = 2 }, -- Warrior of Elune
+        { spell = 164547, type = "buff", unit = "player"}, -- Lunar Empowerment
+        { spell = 5487, type = "buff", unit = "player"}, -- Bear Form
+        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
+        { spell = 252216, type = "buff", unit = "player", talent = 4 }, -- Tiger Dash
+        { spell = 194223, type = "buff", unit = "player"}, -- Celestial Alignment
+        { spell = 191034, type = "buff", unit = "player"}, -- Starfall
+        { spell = 102560, type = "buff", unit = "player", talent = 15 }, -- Incarnation: Chosen of Elune
+        { spell = 164545, type = "buff", unit = "player"}, -- Solar Empowerment
+        { spell = 783, type = "buff", unit = "player"}, -- Travel Form
+        { spell = 768, type = "buff", unit = "player"}, -- Cat Form
+        { spell = 202461, type = "buff", unit = "player", talent = 18 }, -- Stellar Drift
+        { spell = 48438, type = "buff", unit = "player", talent = 9 }, -- Wild Growth
+        { spell = 192081, type = "buff", unit = "player", talent = 8 }, -- Ironfur
+        { spell = 22812, type = "buff", unit = "player"}, -- Barkskin
+        { spell = 1850, type = "buff", unit = "player"}, -- Dash
+        { spell = 5215, type = "buff", unit = "player"}, -- Prowl
+        { spell = 29166, type = "buff", unit = "group"}, -- Innervate
       },
       icon = 535045
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 155722, type = "debuff", unit = "target", talent = 7 }, -- Rake
+        { spell = 205644, type = "debuff", unit = "target", talent = 3 }, -- Force of Nature
+        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
+        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
+        { spell = 1079, type = "debuff", unit = "target", talent = 7 }, -- Rip
+        { spell = 164815, type = "debuff", unit = "target"}, -- Sunfire
+        { spell = 202347, type = "debuff", unit = "target", talent = 18 }, -- Stellar Flare
+        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
+        { spell = 192090, type = "debuff", unit = "target", talent = 8 }, -- Thrash
+        { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
+        { spell = 6795, type = "debuff", unit = "target"}, -- Growl
+        { spell = 81261, type = "debuff", unit = "target"}, -- Solar Beam
+        { spell = 2637, type = "debuff", unit = "multi"}, -- Hibernate
       },
       icon = 236216
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 768, type = "ability"}, -- Cat Form
+        { spell = 783, type = "ability"}, -- Travel Form
+        { spell = 1850, type = "ability"}, -- Dash
+        { spell = 2782, type = "ability"}, -- Remove Corruption
+        { spell = 2908, type = "ability"}, -- Soothe
+        { spell = 5211, type = "ability", talent = 6 }, -- Mighty Bash
+        { spell = 5215, type = "ability"}, -- Prowl
+        { spell = 5487, type = "ability"}, -- Bear Form
+        { spell = 6795, type = "ability"}, -- Growl
+        { spell = 16979, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 18562, type = "ability", talent = 9 }, -- Swiftmend
+        { spell = 20484, type = "ability"}, -- Rebirth
+        { spell = 22812, type = "ability"}, -- Barkskin
+        { spell = 22842, type = "ability", talent = 8 }, -- Frenzied Regeneration
+        { spell = 24858, type = "ability"}, -- Moonkin Form
+        { spell = 29166, type = "ability"}, -- Innervate
+        { spell = 33917, type = "ability"}, -- Mangle
+        { spell = 48438, type = "ability", talent = 9 }, -- Wild Growth
+        { spell = 49376, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 77758, type = "ability", talent = 8 }, -- Thrash
+        { spell = 78675, type = "ability"}, -- Solar Beam
+        { spell = 102359, type = "ability", talent = 11 }, -- Mass Entanglement
+        { spell = 102383, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102401, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102560, type = "ability", talent = 15 }, -- Incarnation: Chosen of Elune
+        { spell = 108238, type = "ability", talent = 9 }, -- Renewal
+        { spell = 132469, type = "ability", talent = 12 }, -- Typhoon
+        { spell = 192081, type = "ability", talent = 8 }, -- Ironfur
+        { spell = 194153, type = "ability"}, -- Lunar Strike
+        { spell = 194223, type = "ability"}, -- Celestial Alignment
+        { spell = 202425, type = "ability", talent = 2 }, -- Warrior of Elune
+        { spell = 202770, type = "ability", talent = 20 }, -- Fury of Elune
+        { spell = 205636, type = "ability", talent = 3 }, -- Force of Nature
+        { spell = 252216, type = "ability", talent = 4 }, -- Tiger Dash
+        { spell = 274281, type = "ability", talent = 21 }, -- New Moon
+        { spell = 274282, type = "ability", talent = 21 }, -- Half Moon
+        { spell = 274283, type = "ability", talent = 21 }, -- Full Moon
       },
       icon = 136060
     },
@@ -2195,18 +2689,91 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 106951, type = "buff", unit = "player"}, -- Berserk
+        { spell = 61336, type = "buff", unit = "player"}, -- Survival Instincts
+        { spell = 22842, type = "buff", unit = "player", talent = 8 }, -- Frenzied Regeneration
+        { spell = 5215, type = "buff", unit = "player"}, -- Prowl
+        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
+        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
+        { spell = 5487, type = "buff", unit = "player"}, -- Bear Form
+        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
+        { spell = 145152, type = "buff", unit = "player", talent = 20 }, -- Bloodtalons
+        { spell = 252216, type = "buff", unit = "player", talent = 4 }, -- Tiger Dash
+        { spell = 52610, type = "buff", unit = "player", talent = 18 }, -- Savage Roar
+        { spell = 48438, type = "buff", unit = "player", talent = 9 }, -- Wild Growth
+        { spell = 106898, type = "buff", unit = "player"}, -- Stampeding Roar
+        { spell = 5217, type = "buff", unit = "player"}, -- Tiger's Fury
+        { spell = 252071, type = "buff", unit = "player", talent = 15 }, -- Jungle Stalker
+        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
+        { spell = 783, type = "buff", unit = "player"}, -- Travel Form
+        { spell = 768, type = "buff", unit = "player"}, -- Cat Form
+        { spell = 69369, type = "buff", unit = "player"}, -- Predatory Swiftness
+        { spell = 135700, type = "buff", unit = "player"}, -- Clearcasting
+        { spell = 102543, type = "buff", unit = "player", talent = 15 }, -- Incarnation: King of the Jungle
+        { spell = 192081, type = "buff", unit = "player", talent = 8 }, -- Ironfur
+        { spell = 1850, type = "buff", unit = "player"}, -- Dash
+        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
       },
       icon = 136170
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
+        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
+        { spell = 106830, type = "debuff", unit = "target"}, -- Thrash
+        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 274838, type = "debuff", unit = "target", talent = 21 }, -- Feral Frenzy
+        { spell = 58180, type = "debuff", unit = "target"}, -- Infected Wounds
+        { spell = 1079, type = "debuff", unit = "target"}, -- Rip
+        { spell = 164815, type = "debuff", unit = "target", talent = 7 }, -- Sunfire
+        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
+        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
+        { spell = 155625, type = "debuff", unit = "target", talent = 7 }, -- Moonfire
+        { spell = 203123, type = "debuff", unit = "target"}, -- Maim
+        { spell = 6795, type = "debuff", unit = "target"}, -- Growl
+        { spell = 155722, type = "debuff", unit = "target"}, -- Rake
+        { spell = 2637, type = "debuff", unit = "multi"}, -- Hibernate
       },
       icon = 132152
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 768, type = "ability"}, -- Cat Form
+        { spell = 783, type = "ability"}, -- Travel Form
+        { spell = 1850, type = "ability"}, -- Dash
+        { spell = 2782, type = "ability"}, -- Remove Corruption
+        { spell = 2908, type = "ability"}, -- Soothe
+        { spell = 5211, type = "ability", talent = 10 }, -- Mighty Bash
+        { spell = 5215, type = "ability"}, -- Prowl
+        { spell = 5217, type = "ability"}, -- Tiger's Fury
+        { spell = 5487, type = "ability"}, -- Bear Form
+        { spell = 6795, type = "ability"}, -- Growl
+        { spell = 16979, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 18562, type = "ability", talent = 9 }, -- Swiftmend
+        { spell = 20484, type = "ability"}, -- Rebirth
+        { spell = 22570, type = "ability"}, -- Maim
+        { spell = 22842, type = "ability", talent = 8 }, -- Frenzied Regeneration
+        { spell = 33917, type = "ability"}, -- Mangle
+        { spell = 48438, type = "ability", talent = 9 }, -- Wild Growth
+        { spell = 49376, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 61336, type = "ability"}, -- Survival Instincts
+        { spell = 77758, type = "ability"}, -- Thrash
+        { spell = 102359, type = "ability", talent = 11 }, -- Mass Entanglement
+        { spell = 102401, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102543, type = "ability", talent = 15 }, -- Incarnation: King of the Jungle
+        { spell = 106839, type = "ability"}, -- Skull Bash
+        { spell = 106898, type = "ability"}, -- Stampeding Roar
+        { spell = 106951, type = "ability"}, -- Berserk
+        { spell = 108238, type = "ability", talent = 5 }, -- Renewal
+        { spell = 132469, type = "ability", talent = 12 }, -- Typhoon
+        { spell = 192081, type = "ability", talent = 8 }, -- Ironfur
+        { spell = 197625, type = "ability", talent = 7 }, -- Moonkin Form
+        { spell = 197626, type = "ability", talent = 7 }, -- Starsurge
+        { spell = 202028, type = "ability", talent = 17 }, -- Brutal Slash
+        { spell = 252216, type = "ability", talent = 4 }, -- Tiger Dash
+        { spell = 274837, type = "ability", talent = 21 }, -- Feral Frenzy
       },
       icon = 236149
     },
@@ -2233,18 +2800,88 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 155835, type = "buff", unit = "player", talent = 3 }, -- Bristling Fur
+        { spell = 61336, type = "buff", unit = "player"}, -- Survival Instincts
+        { spell = 22842, type = "buff", unit = "player"}, -- Frenzied Regeneration
+        { spell = 5215, type = "buff", unit = "player"}, -- Prowl
+        { spell = 774, type = "buff", unit = "player", talent = 9 }, -- Rejuvenation
+        { spell = 203975, type = "buff", unit = "player", talent = 16 }, -- Earthwarden
+        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
+        { spell = 5487, type = "buff", unit = "player"}, -- Bear Form
+        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
+        { spell = 93622, type = "buff", unit = "player"}, -- Gore
+        { spell = 158792, type = "buff", unit = "player", talent = 21 }, -- Pulverize
+        { spell = 213680, type = "buff", unit = "player", talent = 18 }, -- Guardian of Elune
+        { spell = 102558, type = "buff", unit = "player", talent = 15 }, -- Incarnation: Guardian of Ursoc
+        { spell = 213708, type = "buff", unit = "player", talent = 14 }, -- Galactic Guardian
+        { spell = 48438, type = "buff", unit = "player", talent = 9 }, -- Wild Growth
+        { spell = 77764, type = "buff", unit = "player"}, -- Stampeding Roar
+        { spell = 783, type = "buff", unit = "player"}, -- Travel Form
+        { spell = 192081, type = "buff", unit = "player"}, -- Ironfur
+        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
+        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
+        { spell = 252216, type = "buff", unit = "player", talent = 4 }, -- Tiger Dash
+        { spell = 22812, type = "buff", unit = "player"}, -- Barkskin
+        { spell = 1850, type = "buff", unit = "player"}, -- Dash
+        { spell = 768, type = "buff", unit = "player"}, -- Cat Form
       },
       icon = 1378702
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
+        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
+        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
+        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
+        { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
+        { spell = 164815, type = "debuff", unit = "target", talent = 7 }, -- Sunfire
+        { spell = 45334, type = "debuff", unit = "target", talent = 6 }, -- Immobilized
+        { spell = 155722, type = "debuff", unit = "target", talent = 8 }, -- Rake
+        { spell = 99, type = "debuff", unit = "target"}, -- Incapacitating Roar
+        { spell = 236748, type = "debuff", unit = "target", talent = 5 }, -- Intimidating Roar
+        { spell = 6795, type = "debuff", unit = "target"}, -- Growl
+        { spell = 192090, type = "debuff", unit = "target"}, -- Thrash
       },
       icon = 451161
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 99, type = "ability"}, -- Incapacitating Roar
+        { spell = 768, type = "ability"}, -- Cat Form
+        { spell = 783, type = "ability"}, -- Travel Form
+        { spell = 1850, type = "ability"}, -- Dash
+        { spell = 2782, type = "ability"}, -- Remove Corruption
+        { spell = 5211, type = "ability", talent = 10 }, -- Mighty Bash
+        { spell = 5215, type = "ability"}, -- Prowl
+        { spell = 5487, type = "ability"}, -- Bear Form
+        { spell = 6795, type = "ability"}, -- Growl
+        { spell = 16979, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 18562, type = "ability", talent = 9 }, -- Swiftmend
+        { spell = 20484, type = "ability"}, -- Rebirth
+        { spell = 22812, type = "ability"}, -- Barkskin
+        { spell = 22842, type = "ability"}, -- Frenzied Regeneration
+        { spell = 33917, type = "ability"}, -- Mangle
+        { spell = 48438, type = "ability", talent = 9 }, -- Wild Growth
+        { spell = 49376, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 61336, type = "ability"}, -- Survival Instincts
+        { spell = 77758, type = "ability"}, -- Thrash
+        { spell = 102359, type = "ability", talent = 11 }, -- Mass Entanglement
+        { spell = 102383, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102401, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102558, type = "ability", talent = 15 }, -- Incarnation: Guardian of Ursoc
+        { spell = 106839, type = "ability"}, -- Skull Bash
+        { spell = 106898, type = "ability"}, -- Stampeding Roar
+        { spell = 132469, type = "ability", talent = 12 }, -- Typhoon
+        { spell = 155835, type = "ability", talent = 3 }, -- Bristling Fur
+        { spell = 192081, type = "ability"}, -- Ironfur
+        { spell = 197625, type = "ability", talent = 7 }, -- Moonkin Form
+        { spell = 197626, type = "ability", talent = 7 }, -- Starsurge
+        { spell = 204066, type = "ability", talent = 20 }, -- Lunar Beam
+        { spell = 236748, type = "ability", talent = 5 }, -- Intimidating Roar
+        { spell = 252216, type = "ability", talent = 4 }, -- Tiger Dash
       },
       icon = 236169
     },
@@ -2271,18 +2908,91 @@ templates.class.DRUID = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 207640, type = "buff", unit = "player", talent = 1 }, -- Abundance
+        { spell = 157982, type = "buff", unit = "player"}, -- Tranquility
+        { spell = 29166, type = "buff", unit = "player"}, -- Innervate
+        { spell = 200389, type = "buff", unit = "player", talent = 14 }, -- Cultivation
+        { spell = 5215, type = "buff", unit = "player"}, -- Prowl
+        { spell = 774, type = "buff", unit = "player"}, -- Rejuvenation
+        { spell = 155777, type = "buff", unit = "player", talent = 20 }, -- Rejuvenation (Germination)
+        { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
+        { spell = 197721, type = "buff", unit = "player", talent = 21 }, -- Flourish
+        { spell = 117679, type = "buff", unit = "player", talent = 15 }, -- Incarnation
+        { spell = 5487, type = "buff", unit = "player"}, -- Bear Form
+        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
+        { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
+        { spell = 207386, type = "buff", unit = "player", talent = 18 }, -- Spring Blossoms
+        { spell = 252216, type = "buff", unit = "player", talent = 4 }, -- Tiger Dash
+        { spell = 22812, type = "buff", unit = "player"}, -- Barkskin
+        { spell = 33763, type = "buff", unit = "player"}, -- Lifebloom
+        { spell = 102401, type = "buff", unit = "player", talent = 6 }, -- Wild Charge
+        { spell = 192081, type = "buff", unit = "player", talent = 9 }, -- Ironfur
+        { spell = 22842, type = "buff", unit = "player", talent = 9 }, -- Frenzied Regeneration
+        { spell = 33891, type = "buff", unit = "player", talent = 15 }, -- Incarnation: Tree of Life
+        { spell = 164545, type = "buff", unit = "player", talent = 7 }, -- Solar Empowerment
+        { spell = 783, type = "buff", unit = "player"}, -- Travel Form
+        { spell = 16870, type = "buff", unit = "player"}, -- Clearcasting
+        { spell = 102351, type = "buff", unit = "player", talent = 3 }, -- Cenarion Ward
+        { spell = 102342, type = "buff", unit = "player"}, -- Ironbark
+        { spell = 1850, type = "buff", unit = "player"}, -- Dash
+        { spell = 114108, type = "buff", unit = "player", talent = 13 }, -- Soul of the Forest
+        { spell = 48438, type = "buff", unit = "player"}, -- Wild Growth
+        { spell = 768, type = "buff", unit = "player"}, -- Cat Form
+
       },
       icon = 136081
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 127797, type = "debuff", unit = "target"}, -- Ursol's Vortex
+        { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
+        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
+        { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
+        { spell = 164815, type = "debuff", unit = "target"}, -- Sunfire
+        { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
+        { spell = 192090, type = "debuff", unit = "target", talent = 9 }, -- Thrash
+        { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
+        { spell = 6795, type = "debuff", unit = "target"}, -- Growl
+        { spell = 155722, type = "debuff", unit = "target", talent = 8 }, -- Rake
+        { spell = 2637, type = "debuff", unit = "multi"}, -- Hibernate
       },
       icon = 236216
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 740, type = "ability"}, -- Tranquility
+        { spell = 768, type = "ability"}, -- Cat Form
+        { spell = 783, type = "ability"}, -- Travel Form
+        { spell = 1850, type = "ability"}, -- Dash
+        { spell = 2908, type = "ability"}, -- Soothe
+        { spell = 5211, type = "ability", talent = 10 }, -- Mighty Bash
+        { spell = 5215, type = "ability"}, -- Prowl
+        { spell = 5487, type = "ability"}, -- Bear Form
+        { spell = 6795, type = "ability"}, -- Growl
+        { spell = 18562, type = "ability"}, -- Swiftmend
+        { spell = 20484, type = "ability"}, -- Rebirth
+        { spell = 22812, type = "ability"}, -- Barkskin
+        { spell = 22842, type = "ability", talent = 9 }, -- Frenzied Regeneration
+        { spell = 29166, type = "ability"}, -- Innervate
+        { spell = 33891, type = "ability", talent = 15 }, -- Incarnation: Tree of Life
+        { spell = 33917, type = "ability"}, -- Mangle
+        { spell = 48438, type = "ability"}, -- Wild Growth
+        { spell = 77758, type = "ability", talent = 9 }, -- Thrash
+        { spell = 102342, type = "ability"}, -- Ironbark
+        { spell = 102351, type = "ability", talent = 3 }, -- Cenarion Ward
+        { spell = 102359, type = "ability", talent = 11 }, -- Mass Entanglement
+        { spell = 102401, type = "ability", talent = 6 }, -- Wild Charge
+        { spell = 102793, type = "ability"}, -- Ursol's Vortex
+        { spell = 108238, type = "ability", talent = 5 }, -- Renewal
+        { spell = 132469, type = "ability", talent = 12 }, -- Typhoon
+        { spell = 192081, type = "ability", talent = 9 }, -- Ironfur
+        { spell = 197625, type = "ability", talent = 7 }, -- Moonkin Form
+        { spell = 197626, type = "ability", talent = 7 }, -- Starsurge
+        { spell = 197721, type = "ability", talent = 21 }, -- Flourish
+        { spell = 252216, type = "ability", talent = 4 }, -- Tiger Dash
       },
       icon = 236153
     },
@@ -2312,18 +3022,63 @@ templates.class.DEMONHUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 208628, type = "buff", unit = "player", talent = 20 }, -- Momentum
+        { spell = 162264, type = "buff", unit = "player"}, -- Metamorphosis
+        { spell = 203650, type = "buff", unit = "player", talent = 20 }, -- Prepared
+        { spell = 188499, type = "buff", unit = "player"}, -- Blade Dance
+        { spell = 212800, type = "buff", unit = "player"}, -- Blur
+        { spell = 196555, type = "buff", unit = "player", talent = 12 }, -- Netherwalk
+        { spell = 258920, type = "buff", unit = "player", talent = 6 }, -- Immolation Aura
+        { spell = 131347, type = "buff", unit = "player"}, -- Glide
+        { spell = 188501, type = "buff", unit = "player"}, -- Spectral Sight
+        { spell = 209426, type = "buff", unit = "player"}, -- Darkness
       },
       icon = 1247266
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 1490, type = "debuff", unit = "target"}, -- Chaos Brand
+        { spell = 258883, type = "debuff", unit = "target", talent = 7}, -- Trail of Ruin
+        { spell = 213405, type = "debuff", unit = "target", talent = 17 }, -- Master of the Glaive
+        { spell = 179057, type = "debuff", unit = "target"}, -- Chaos Nova
+        { spell = 281854, type = "debuff", unit = "target"}, -- Torment
+        { spell = 200166, type = "debuff", unit = "target"}, -- Metamorphosis
+        { spell = 206491, type = "debuff", unit = "target", talent = 21 }, -- Nemesis
+        { spell = 198813, type = "debuff", unit = "target"}, -- Vengeful Retreat
+        { spell = 258860, type = "debuff", unit = "target", talent = 15 }, -- Dark Slash
+        { spell = 211881, type = "debuff", unit = "target", talent = 18 }, -- Fel Eruption
+
       },
       icon = 1392554
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 131347, type = "ability"}, -- Glide
+        { spell = 179057, type = "ability"}, -- Chaos Nova
+        { spell = 183752, type = "ability"}, -- Disrupt
+        { spell = 185123, type = "ability"}, -- Throw Glaive
+        { spell = 188499, type = "ability"}, -- Blade Dance
+        { spell = 188501, type = "ability"}, -- Spectral Sight
+        { spell = 191427, type = "ability"}, -- Metamorphosis
+        { spell = 195072, type = "ability"}, -- Fel Rush
+        { spell = 196555, type = "ability", talent = 12 }, -- Netherwalk
+        { spell = 196718, type = "ability"}, -- Darkness
+        { spell = 198013, type = "ability"}, -- Eye Beam
+        { spell = 198589, type = "ability"}, -- Blur
+        { spell = 198793, type = "ability"}, -- Vengeful Retreat
+        { spell = 206491, type = "ability", talent = 21 }, -- Nemesis
+        { spell = 210152, type = "ability"}, -- Death Sweep
+        { spell = 211881, type = "ability", talent = 18 }, -- Fel Eruption
+        { spell = 217832, type = "ability"}, -- Imprison
+        { spell = 232893, type = "ability", talent = 3 }, -- Felblade
+        { spell = 258860, type = "ability", talent = 15 }, -- Dark Slash
+        { spell = 258920, type = "ability", talent = 6 }, -- Immolation Aura
+        { spell = 258925, type = "ability", talent = 9 }, -- Fel Barrage
+        { spell = 278326, type = "ability"}, -- Consume Magic
+        { spell = 281854, type = "ability"}, -- Torment
+
       },
       icon = 1305156
     },
@@ -2350,18 +3105,62 @@ templates.class.DEMONHUNTER = {
     [1] = {
       title = L["Buffs"],
       args = {
+        { spell = 187827, type = "buff", unit = "player"}, -- Metamorphosis
+        { spell = 263648, type = "buff", unit = "player", talent = 21 }, -- Soul Barrier
+        { spell = 207693, type = "buff", unit = "player", talent = 4}, -- Feast of Souls
+        { spell = 131347, type = "buff", unit = "player"}, -- Glide
+        { spell = 203981, type = "buff", unit = "player"}, -- Soul Fragments
+        { spell = 188501, type = "buff", unit = "player"}, -- Spectral Sight
+        { spell = 203819, type = "buff", unit = "player"}, -- Demon Spikes
+        { spell = 178740, type = "buff", unit = "player"}, -- Immolation Aura
+
       },
       icon = 1247263
     },
     [2] = {
       title = L["Debuffs"],
       args = {
+        { spell = 207744, type = "debuff", unit = "target"}, -- Fiery Brand
+        { spell = 1490, type = "debuff", unit = "target"}, -- Chaos Brand
+        { spell = 204598, type = "debuff", unit = "target"}, -- Sigil of Flame
+        { spell = 268178, type = "debuff", unit = "target", talent = 20 }, -- Void Reaver
+        { spell = 204490, type = "debuff", unit = "target"}, -- Sigil of Silence
+        { spell = 204843, type = "debuff", unit = "target", talent = 15 }, -- Sigil of Chains
+        { spell = 207771, type = "debuff", unit = "target", talent = 6 }, -- Fiery Brand
+        { spell = 247456, type = "debuff", unit = "target", talent = 17 }, -- Frailty
+        { spell = 210003, type = "debuff", unit = "target", talent = 3 }, -- Razor Spikes
+        { spell = 207685, type = "debuff", unit = "target"}, -- Sigil of Misery
+        { spell = 185245, type = "debuff", unit = "target"}, -- Torment
+
       },
       icon = 1344647
     },
     [3] = {
       title = L["Cooldowns"],
       args = {
+        { spell = 131347, type = "ability"}, -- Glide
+        { spell = 178740, type = "ability"}, -- Immolation Aura
+        { spell = 183752, type = "ability"}, -- Disrupt
+        { spell = 185245, type = "ability"}, -- Torment
+        { spell = 187827, type = "ability"}, -- Metamorphosis
+        { spell = 188501, type = "ability"}, -- Spectral Sight
+        { spell = 189110, type = "ability"}, -- Infernal Strike
+        { spell = 202137, type = "ability"}, -- Sigil of Silence
+        { spell = 202138, type = "ability", talent = 15 }, -- Sigil of Chains
+        { spell = 202140, type = "ability"}, -- Sigil of Misery
+        { spell = 203720, type = "ability"}, -- Demon Spikes
+        { spell = 204021, type = "ability"}, -- Fiery Brand
+        { spell = 204157, type = "ability"}, -- Throw Glaive
+        { spell = 204513, type = "ability"}, -- Sigil of Flame
+        { spell = 212084, type = "ability", talent = 18 }, -- Fel Devastation
+        { spell = 217832, type = "ability"}, -- Imprison
+        { spell = 228477, type = "ability"}, -- Soul Cleave
+        { spell = 232893, type = "ability", talent = 9 }, -- Felblade
+        { spell = 247454, type = "ability", talent = 17 }, -- Spirit Bomb
+        { spell = 263642, type = "ability", talent = 12 }, -- Fracture
+        { spell = 263648, type = "ability", talent = 21 }, -- Soul Barrier
+        { spell = 278326, type = "ability"}, -- Consume Magic
+
       },
       icon = 1344650
     },
@@ -2580,7 +3379,6 @@ templates.class.DEATHKNIGHT = {
         { spell = 48265, type = "buff", unit = "player"}, -- Death's Advance
         { spell = 51460, type = "buff", unit = "player"}, -- Runic Corruption
         { spell = 63560, type = "buff", unit = "pet"}, -- Dark Transformation
-        { spell = 3714, type = "buff", unit = "pet"}, -- Path of Frost
         { spell = 178819, type = "buff", unit = "player" }, -- Dark Succor
       },
       icon = 136181
@@ -2828,6 +3626,7 @@ tinsert(templates.class.MONK[3][6].args, createSimplePowerTemplate(12));
 templates.class.MONK[1][7] = {
   title = L["Ability Charges"],
   args = {
+    { spell = 115072, type = "ability", showOn = "showAlways"}, -- Expel Harm
   },
   icon = 627486,
 };
@@ -2866,6 +3665,9 @@ for i = 1, 4 do
   tinsert(templates.class.DRUID[i][6].args, createSimplePowerTemplate(4)); -- Combo Points
 end
 
+-- Efflorescence aka Mushroom
+tinsert(templates.class.DRUID[4][3].args,  {spell = 145205, type = "totem"});
+
 -- Demon Hunter
 tinsert(templates.class.DEMONHUNTER[1][6].args, createSimplePowerTemplate(17));
 tinsert(templates.class.DEMONHUNTER[2][6].args, createSimplePowerTemplate(18));

From 08fbcb5790900cb4c46d3ad6d8ab5f12b2cf585d Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sun, 8 Jul 2018 13:03:05 +0200
Subject: [PATCH 71/82] LibSpellRange-1.0 is now on GitHub

---
 .pkgmeta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pkgmeta b/.pkgmeta
index 76e8410cf6..48f7feeca4 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -16,7 +16,7 @@ externals:
  WeakAuras/Libs/LibCompress: https://repos.wowace.com/wow/libcompress/trunk
  WeakAuras/Libs/LibBabble-Race-3.0: https://repos.wowace.com/wow/libbabble-race-3-0/trunk
  WeakAuras/Libs/LibButtonGlow-1.0: https://repos.wowace.com/wow/libbuttonglow-1-0
- WeakAuras/Libs/LibSpellRange-1.0: https://repos.curseforge.com/wow/libspellrange-1-0/trunk
+ WeakAuras/Libs/LibSpellRange-1.0: git://github.com/ascott18/LibSpellRange-1.0.git
  WeakAuras/Libs/HereBeDragons: https://repos.wowace.com/wow/herebedragons
  WeakAuras/Libs/LibRangeCheck-2.0: https://repos.wowace.com/wow/librangecheck-2-0/trunk/LibRangeCheck-2.0
 

From b9ce0077a93d03bb03a00a6b5e06a6c8583d06a8 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 8 Jul 2018 13:11:23 +0200
Subject: [PATCH 72/82] Fine tune templates

Crowd Control abilities should be "multi", so that they work while
the cc target is not the target.

Group buffing abilities are either "group" or "target" depending on
how many are expected to be up at the same time
---
 WeakAurasTemplates/TriggerTemplatesData.lua | 97 ++++++++++-----------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index 7c655cbb69..fc2097b8db 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -346,7 +346,7 @@ templates.class.PALADIN = {
         { spell = 853, type = "debuff", unit = "target"}, -- Hammer of Justice
         { spell = 214222, type = "debuff", unit = "target"}, -- Judgment
         { spell = 196941, type = "debuff", unit = "target", talent = 13}, -- Judgment of Light
-        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
+        { spell = 20066, type = "debuff", unit = "multi", talent = 8}, -- Repentance
       },
       icon = 135952
     },
@@ -406,7 +406,7 @@ templates.class.PALADIN = {
         { spell = 203797, type = "buff", unit = "player", talent = 10}, -- Retribution Aura
         { spell = 132403, type = "buff", unit = "player"}, -- Shield of the Righteous
         { spell = 197561, type = "buff", unit = "player"}, -- Avenger's Valor
-        { spell = 1044, type = "buff", unit = "player"}, -- Blessing of Freedom
+        { spell = 1044, type = "buff", unit = "group"}, -- Blessing of Freedom
         { spell = 6940, type = "buff", unit = "group"}, -- Blessing of Sacrifice
         { spell = 188370, type = "buff", unit = "player"}, -- Consecration
         { spell = 204150, type = "buff", unit = "player", talent = 18}, -- Aegis of Light
@@ -415,7 +415,7 @@ templates.class.PALADIN = {
         { spell = 204018, type = "buff", unit = "player", talent = 12}, -- Blessing of Spellwarding
         { spell = 152262, type = "buff", unit = "player", talent = 21}, -- Seraphim
         { spell = 86659, type = "buff", unit = "player"}, -- Guardian of Ancient Kings
-        { spell = 1022, type = "buff", unit = "player"}, -- Blessing of Protection
+        { spell = 1022, type = "buff", unit = "group"}, -- Blessing of Protection
         { spell = 221883, type = "buff", unit = "player"}, -- Divine Steed
         { spell = 204335, type = "buff", unit = "player"}, -- Aegis of Light
         { spell = 642, type = "buff", unit = "player"}, -- Divine Shield
@@ -433,7 +433,7 @@ templates.class.PALADIN = {
         { spell = 204301, type = "debuff", unit = "target"}, -- Blessed Hammer
         { spell = 204079, type = "debuff", unit = "target", talent = 13}, -- Final Stand
         { spell = 31935, type = "debuff", unit = "target"}, -- Avenger's Shield
-        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
+        { spell = 20066, type = "debuff", unit = "multi", talent = 8}, -- Repentance
       },
       icon = 135952
     },
@@ -520,7 +520,7 @@ templates.class.PALADIN = {
         { spell = 105421, type = "debuff", unit = "target"}, -- Blinding Light
         { spell = 853, type = "debuff", unit = "target"}, -- Hammer of Justice
         { spell = 183218, type = "debuff", unit = "target"}, -- Hand of Hindrance
-        { spell = 20066, type = "debuff", unit = "target", talent = 8}, -- Repentance
+        { spell = 20066, type = "debuff", unit = "multi", talent = 8}, -- Repentance
         { spell = 255937, type = "debuff", unit = "target", talent = 12}, -- Wake of Ashes
 
       },
@@ -609,7 +609,7 @@ templates.class.HUNTER = {
         { spell = 135299, type = "debuff", unit = "target"}, -- Tar Trap
         { spell = 217200, type = "debuff", unit = "target"}, -- Barbed Shot
         { spell = 117405, type = "debuff", unit = "target", talent = 15}, -- Binding Shot
-        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 3355, type = "debuff", unit = "multi"}, -- Freezing Trap
         { spell = 2649, type = "debuff", unit = "target"}, -- Growl
         { spell = 24394, type = "debuff", unit = "target"}, -- Intimidation
         { spell = 5116, type = "debuff", unit = "target"}, -- Concussive Shot
@@ -703,7 +703,7 @@ templates.class.HUNTER = {
         { spell = 135299, type = "debuff", unit = "target"}, -- Tar Trap
         { spell = 5116, type = "debuff", unit = "target"}, -- Concussive Shot
         { spell = 186387, type = "debuff", unit = "target"}, -- Bursting Shot
-        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 3355, type = "debuff", unit = "multi"}, -- Freezing Trap
         { spell = 271788, type = "debuff", unit = "target"}, -- Serpent Sting
         { spell = 257284, type = "debuff", unit = "target", talent = 12}, -- Hunter's Mark
         { spell = 131894, type = "debuff", unit = "target", talent = 3}, -- A Murder of Crows
@@ -811,7 +811,7 @@ templates.class.HUNTER = {
         { spell = 190927, type = "debuff", unit = "target"}, -- Harpoon
         { spell = 162480, type = "debuff", unit = "target"}, -- Steel Trap
         { spell = 2649, type = "debuff", unit = "target"}, -- Growl
-        { spell = 3355, type = "debuff", unit = "target"}, -- Freezing Trap
+        { spell = 3355, type = "debuff", unit = "multi"}, -- Freezing Trap
         { spell = 259491, type = "debuff", unit = "target"}, -- Serpent Sting
         { spell = 271049, type = "debuff", unit = "target"}, -- Volatile Bomb
         { spell = 117405, type = "debuff", unit = "target", talent = 15 }, -- Binding Shot
@@ -919,13 +919,13 @@ templates.class.ROGUE = {
         { spell = 256148, type = "debuff", unit = "target", talent = 14}, -- Iron Wire
         { spell = 154953, type = "debuff", unit = "target", talent = 13}, -- Internal Bleeding
         { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
-        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 6770, type = "debuff", unit = "multi"}, -- Sap
         { spell = 255909, type = "debuff", unit = "target", talent = 15}, -- Prey on the Weak
         { spell = 703, type = "debuff", unit = "target"}, -- Garrote
         { spell = 245389, type = "debuff", unit = "target", talent = 17}, -- Toxic Blade
         { spell = 2818, type = "debuff", unit = "target"}, -- Deadly Poison
         { spell = 3409, type = "debuff", unit = "target"}, -- Crippling Poison
-        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 2094, type = "debuff", unit = "multi"}, -- Blind
         { spell = 408, type = "debuff", unit = "target"}, -- Kidney Shot
         { spell = 121411, type = "debuff", unit = "target", talent = 21}, -- Crimson Tempest
         { spell = 79140, type = "debuff", unit = "target"}, -- Vendetta
@@ -1019,9 +1019,9 @@ templates.class.ROGUE = {
         { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
         { spell = 196937, type = "debuff", unit = "target", talent = 3}, -- Ghostly Strike
         { spell = 137619, type = "debuff", unit = "target", talent = 9}, -- Marked for Death
-        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 2094, type = "debuff", unit = "multi"}, -- Blind
         { spell = 1776, type = "debuff", unit = "target"}, -- Gouge
-        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 6770, type = "debuff", unit = "multi"}, -- Sap
         { spell = 45181, type = "debuff", unit = "player", talent = 11 }, -- Cheated Death
       },
       icon = 1373908
@@ -1106,12 +1106,12 @@ templates.class.ROGUE = {
         { spell = 255909, type = "debuff", unit = "target", talent = 15}, -- Prey on the Weak
         { spell = 91021, type = "debuff", unit = "target", talent = 2}, -- Find Weakness
         { spell = 195452, type = "debuff", unit = "target"}, -- Nightblade
-        { spell = 2094, type = "debuff", unit = "target"}, -- Blind
+        { spell = 2094, type = "debuff", unit = "multi"}, -- Blind
         { spell = 137619, type = "debuff", unit = "target"}, -- Marked for Death
         { spell = 1833, type = "debuff", unit = "target"}, -- Cheap Shot
         { spell = 206760, type = "debuff", unit = "target", talent = 14}, -- Shadow's Grasp
         { spell = 408, type = "debuff", unit = "target"}, -- Kidney Shot
-        { spell = 6770, type = "debuff", unit = "target"}, -- Sap
+        { spell = 6770, type = "debuff", unit = "multi"}, -- Sap
         { spell = 45181, type = "debuff", unit = "player", talent = 11 }, -- Cheated Death
       },
       icon = 136175
@@ -1173,13 +1173,13 @@ templates.class.PRIEST = {
         { spell = 586, type = "buff", unit = "player"}, -- Fade
         { spell = 198069, type = "buff", unit = "player"}, -- Power of the Dark Side
         { spell = 194384, type = "buff", unit = "player"}, -- Atonement
-        { spell = 17, type = "buff", unit = "player"}, -- Power Word: Shield
+        { spell = 17, type = "buff", unit = "target"}, -- Power Word: Shield
         { spell = 265258, type = "buff", unit = "player", talent = 2}, -- Twist of Fate
         { spell = 271466, type = "buff", unit = "player", talent = 20}, -- Luminous Barrier
         { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
         { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
-        { spell = 81782, type = "buff", unit = "player"}, -- Power Word: Barrier
-        { spell = 33206, type = "buff", unit = "player"}, -- Pain Suppression
+        { spell = 81782, type = "buff", unit = "target"}, -- Power Word: Barrier
+        { spell = 33206, type = "buff", unit = "group"}, -- Pain Suppression
         { spell = 193065, type = "buff", unit = "player", talent = 5}, -- Masochism
         { spell = 65081, type = "buff", unit = "player", talent = 4}, -- Body and Soul
         { spell = 47536, type = "buff", unit = "player"}, -- Rapture
@@ -1258,10 +1258,9 @@ templates.class.PRIEST = {
       args = {
         { spell = 47788, type = "buff", unit = "target"}, -- Guardian Spirit
         { spell = 64901, type = "buff", unit = "player"}, -- Symbol of Hope
-        { spell = 139, type = "buff", unit = "player"}, -- Renew
+        { spell = 139, type = "buff", unit = "target"}, -- Renew
         { spell = 2096, type = "buff", unit = "player"}, -- Mind Vision
         { spell = 64843, type = "buff", unit = "player"}, -- Divine Hymn
-        { spell = 64844, type = "buff", unit = "player"}, -- Divine Hymn
         { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
         { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
         { spell = 111759, type = "buff", unit = "player"}, -- Levitate
@@ -1272,7 +1271,6 @@ templates.class.PRIEST = {
         { spell = 121557, type = "buff", unit = "player", talent = 6}, -- Angelic Feather
         { spell = 586, type = "buff", unit = "player"}, -- Fade
         { spell = 41635, type = "buff", unit = "group"}, -- Prayer of Mending
-        { spell = 139, type = "buff", unit = "target"}, -- Renew
         { spell = 45243, type = "buff", unit = "player" }, -- Focused Will
       },
       icon = 135953
@@ -1636,10 +1634,10 @@ templates.class.SHAMAN = {
         { spell = 546, type = "buff", unit = "player"}, -- Water Walking
         { spell = 157504, type = "buff", unit = "player", talent = 18 }, -- Cloudburst Totem
         { spell = 260881, type = "buff", unit = "player", talent = 7 }, -- Spirit Wolf
-        { spell = 61295, type = "buff", unit = "player"}, -- Riptide
+        { spell = 61295, type = "buff", unit = "target"}, -- Riptide
         { spell = 98007, type = "buff", unit = "player"}, -- Spirit Link Totem
         { spell = 77762, type = "buff", unit = "player"}, -- Lava Surge
-        { spell = 207400, type = "buff", unit = "player", talent = 10 }, -- Ancestral Vigor
+        { spell = 207400, type = "buff", unit = "target", talent = 10 }, -- Ancestral Vigor
         { spell = 201633, type = "buff", unit = "player", talent = 11 }, -- Earthen Wall
         { spell = 73920, type = "buff", unit = "player"}, -- Healing Rain
         { spell = 280615, type = "buff", unit = "player", talent = 16 }, -- Flash Flood
@@ -1655,7 +1653,6 @@ templates.class.SHAMAN = {
         { spell = 64695, type = "debuff", unit = "target", talent = 8 }, -- Earthgrab
         { spell = 3600, type = "debuff", unit = "target"}, -- Earthbind
         { spell = 188838, type = "debuff", unit = "target"}, -- Flame Shock
-
       },
       icon = 135813
     },
@@ -2001,7 +1998,7 @@ templates.class.WARLOCK = {
       args = {
         { spell = 233490, type = "debuff", unit = "target"}, -- Unstable Affliction
         { spell = 27243, type = "debuff", unit = "target"}, -- Seed of Corruption
-        { spell = 710, type = "debuff", unit = "target"}, -- Banish
+        { spell = 710, type = "debuff", unit = "multi"}, -- Banish
         { spell = 234153, type = "debuff", unit = "target"}, -- Drain Life
         { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
         { spell = 30283, type = "debuff", unit = "target"}, -- Shadowfury
@@ -2011,7 +2008,7 @@ templates.class.WARLOCK = {
         { spell = 17735, type = "debuff", unit = "target"}, -- Suffering
         { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
         { spell = 278350, type = "debuff", unit = "target", talent = 12 }, -- Vile Taint
-        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 1098, type = "debuff", unit = "multi"}, -- Enslave Demon
         { spell = 48181, type = "debuff", unit = "target", talent = 17 }, -- Haunt
         { spell = 32390, type = "debuff", unit = "target", talent = 16 }, -- Shadow Embrace
         { spell = 146739, type = "debuff", unit = "target"}, -- Corruption
@@ -2119,8 +2116,8 @@ templates.class.WARLOCK = {
         { spell = 30213, type = "debuff", unit = "target"}, -- Legion Strike
         { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
         { spell = 265412, type = "debuff", unit = "target", talent = 6 }, -- Doom
-        { spell = 710, type = "debuff", unit = "target"}, -- Banish
-        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 710, type = "debuff", unit = "multi"}, -- Banish
+        { spell = 1098, type = "debuff", unit = "multi"}, -- Enslave Demon
         { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
       },
       icon = 136122
@@ -2227,8 +2224,8 @@ templates.class.WARLOCK = {
         { spell = 234153, type = "debuff", unit = "target"}, -- Drain Life
         { spell = 6360, type = "debuff", unit = "target"}, -- Whiplash
         { spell = 30283, type = "debuff", unit = "target"}, -- Shadowfury
-        { spell = 710, type = "debuff", unit = "target"}, -- Banish
-        { spell = 1098, type = "debuff", unit = "target"}, -- Enslave Demon
+        { spell = 710, type = "debuff", unit = "multi"}, -- Banish
+        { spell = 1098, type = "debuff", unit = "multi"}, -- Enslave Demon
         { spell = 6358, type = "debuff", unit = "target"}, -- Seduction
 
       },
@@ -2322,7 +2319,7 @@ templates.class.MONK = {
         { spell = 119381, type = "debuff", unit = "target"}, -- Leg Sweep
         { spell = 196608, type = "debuff", unit = "target", talent = 1 }, -- Eye of the Tiger
         { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
-        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 115078, type = "debuff", unit = "multi"}, -- Paralysis
         { spell = 117952, type = "debuff", unit = "target"}, -- Crackling Jade Lightning
         { spell = 121253, type = "debuff", unit = "target"}, -- Keg Smash
         { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
@@ -2390,22 +2387,21 @@ templates.class.MONK = {
     [1] = {
       title = L["Buffs"],
       args = {
-        { spell = 119611, type = "buff", unit = "player"}, -- Renewing Mist
+        { spell = 119611, type = "buff", unit = "target"}, -- Renewing Mist
         { spell = 196725, type = "buff", unit = "player", talent = 17 }, -- Refreshing Jade Wind
         { spell = 122783, type = "buff", unit = "player", talent = 14 }, -- Diffuse Magic
         { spell = 116680, type = "buff", unit = "player"}, -- Thunder Focus Tea
         { spell = 243435, type = "buff", unit = "player"}, -- Fortifying Brew
-        { spell = 124682, type = "buff", unit = "player"}, -- Enveloping Mist
+        { spell = 124682, type = "buff", unit = "target"}, -- Enveloping Mist
         { spell = 116841, type = "buff", unit = "player", talent = 6 }, -- Tiger's Lust
         { spell = 197908, type = "buff", unit = "player", talent = 9 }, -- Mana Tea
         { spell = 191840, type = "buff", unit = "player"}, -- Essence Font
-        { spell = 115175, type = "buff", unit = "player"}, -- Soothing Mist
+        { spell = 115175, type = "buff", unit = "target"}, -- Soothing Mist
         { spell = 119085, type = "buff", unit = "player", talent = 5 }, -- Chi Torpedo
         { spell = 202090, type = "buff", unit = "player"}, -- Teachings of the Monastery
-        { spell = 198533, type = "buff", unit = "player" }, -- Soothing Mist
         { spell = 122278, type = "buff", unit = "player", talent = 15 }, -- Dampen Harm
         { spell = 197919, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Enveloping Mist)
-        { spell = 116849, type = "buff", unit = "player"}, -- Life Cocoon
+        { spell = 116849, type = "buff", unit = "target"}, -- Life Cocoon
         { spell = 101643, type = "buff", unit = "player"}, -- Transcendence
         { spell = 197916, type = "buff", unit = "player", talent = 7 }, -- Lifecycles (Vivify)
 
@@ -2416,7 +2412,7 @@ templates.class.MONK = {
       title = L["Debuffs"],
       args = {
         { spell = 119381, type = "debuff", unit = "target"}, -- Leg Sweep
-        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 115078, type = "debuff", unit = "multi"}, -- Paralysis
         { spell = 117952, type = "debuff", unit = "target"}, -- Crackling Jade Lightning
         { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
         { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
@@ -2501,7 +2497,7 @@ templates.class.MONK = {
     [2] = {
       title = L["Debuffs"],
       args = {
-        { spell = 115078, type = "debuff", unit = "target"}, -- Paralysis
+        { spell = 115078, type = "debuff", unit = "multi"}, -- Paralysis
         { spell = 116189, type = "debuff", unit = "target"}, -- Provoke
         { spell = 115080, type = "debuff", unit = "target"}, -- Touch of Death
         { spell = 113746, type = "debuff", unit = "target"}, -- Mystic Touch
@@ -2609,7 +2605,7 @@ templates.class.DRUID = {
         { spell = 155722, type = "debuff", unit = "target", talent = 7 }, -- Rake
         { spell = 205644, type = "debuff", unit = "target", talent = 3 }, -- Force of Nature
         { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 339, type = "debuff", unit = "multi"}, -- Entangling Roots
         { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
         { spell = 1079, type = "debuff", unit = "target", talent = 7 }, -- Rip
         { spell = 164815, type = "debuff", unit = "target"}, -- Sunfire
@@ -2722,7 +2718,7 @@ templates.class.DRUID = {
         { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
         { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
         { spell = 106830, type = "debuff", unit = "target"}, -- Thrash
-        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 339, type = "debuff", unit = "multi"}, -- Entangling Roots
         { spell = 274838, type = "debuff", unit = "target", talent = 21 }, -- Feral Frenzy
         { spell = 58180, type = "debuff", unit = "target"}, -- Infected Wounds
         { spell = 1079, type = "debuff", unit = "target"}, -- Rip
@@ -2832,7 +2828,7 @@ templates.class.DRUID = {
       args = {
         { spell = 164812, type = "debuff", unit = "target"}, -- Moonfire
         { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 339, type = "debuff", unit = "multi"}, -- Entangling Roots
         { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
         { spell = 61391, type = "debuff", unit = "target", talent = 12 }, -- Typhoon
         { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
@@ -2913,18 +2909,18 @@ templates.class.DRUID = {
         { spell = 29166, type = "buff", unit = "player"}, -- Innervate
         { spell = 200389, type = "buff", unit = "player", talent = 14 }, -- Cultivation
         { spell = 5215, type = "buff", unit = "player"}, -- Prowl
-        { spell = 774, type = "buff", unit = "player"}, -- Rejuvenation
-        { spell = 155777, type = "buff", unit = "player", talent = 20 }, -- Rejuvenation (Germination)
+        { spell = 774, type = "buff", unit = "target"}, -- Rejuvenation
+        { spell = 155777, type = "buff", unit = "target", talent = 20 }, -- Rejuvenation (Germination)
         { spell = 164547, type = "buff", unit = "player", talent = 7 }, -- Lunar Empowerment
-        { spell = 197721, type = "buff", unit = "player", talent = 21 }, -- Flourish
+        { spell = 197721, type = "buff", unit = "target", talent = 21 }, -- Flourish
         { spell = 117679, type = "buff", unit = "player", talent = 15 }, -- Incarnation
         { spell = 5487, type = "buff", unit = "player"}, -- Bear Form
-        { spell = 8936, type = "buff", unit = "player"}, -- Regrowth
+        { spell = 8936, type = "buff", unit = "target"}, -- Regrowth
         { spell = 197625, type = "buff", unit = "player", talent = 7 }, -- Moonkin Form
-        { spell = 207386, type = "buff", unit = "player", talent = 18 }, -- Spring Blossoms
+        { spell = 207386, type = "buff", unit = "target", talent = 18 }, -- Spring Blossoms
         { spell = 252216, type = "buff", unit = "player", talent = 4 }, -- Tiger Dash
-        { spell = 22812, type = "buff", unit = "player"}, -- Barkskin
-        { spell = 33763, type = "buff", unit = "player"}, -- Lifebloom
+        { spell = 22812, type = "buff", unit = "target"}, -- Barkskin
+        { spell = 33763, type = "buff", unit = "target"}, -- Lifebloom
         { spell = 102401, type = "buff", unit = "player", talent = 6 }, -- Wild Charge
         { spell = 192081, type = "buff", unit = "player", talent = 9 }, -- Ironfur
         { spell = 22842, type = "buff", unit = "player", talent = 9 }, -- Frenzied Regeneration
@@ -2947,7 +2943,7 @@ templates.class.DRUID = {
       args = {
         { spell = 127797, type = "debuff", unit = "target"}, -- Ursol's Vortex
         { spell = 102359, type = "debuff", unit = "target", talent = 11 }, -- Mass Entanglement
-        { spell = 339, type = "debuff", unit = "target"}, -- Entangling Roots
+        { spell = 339, type = "debuff", unit = "multi"}, -- Entangling Roots
         { spell = 5211, type = "debuff", unit = "target", talent = 10 }, -- Mighty Bash
         { spell = 1079, type = "debuff", unit = "target", talent = 8 }, -- Rip
         { spell = 164815, type = "debuff", unit = "target"}, -- Sunfire
@@ -3048,7 +3044,7 @@ templates.class.DEMONHUNTER = {
         { spell = 198813, type = "debuff", unit = "target"}, -- Vengeful Retreat
         { spell = 258860, type = "debuff", unit = "target", talent = 15 }, -- Dark Slash
         { spell = 211881, type = "debuff", unit = "target", talent = 18 }, -- Fel Eruption
-
+        { spell = 217832, type = "debuff", unit = "multi" }, -- Imprison
       },
       icon = 1392554
     },
@@ -3078,7 +3074,6 @@ templates.class.DEMONHUNTER = {
         { spell = 258925, type = "ability", talent = 9 }, -- Fel Barrage
         { spell = 278326, type = "ability"}, -- Consume Magic
         { spell = 281854, type = "ability"}, -- Torment
-
       },
       icon = 1305156
     },
@@ -3131,7 +3126,7 @@ templates.class.DEMONHUNTER = {
         { spell = 210003, type = "debuff", unit = "target", talent = 3 }, -- Razor Spikes
         { spell = 207685, type = "debuff", unit = "target"}, -- Sigil of Misery
         { spell = 185245, type = "debuff", unit = "target"}, -- Torment
-
+        { spell = 217832, type = "debuff", unit = "multi" }, -- Imprison
       },
       icon = 1344647
     },

From be7ec13b3f724c6746af7c668c35923e35ecf143 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 8 Jul 2018 13:23:38 +0200
Subject: [PATCH 73/82] Revert "Workaround a issue in LibSpellRange"

This reverts commit 07cbbc7add3c16d17bd15b2882046822bb5da7f3.
---
 WeakAuras/Prototypes.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index f20de5a490..d299235df4 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -20,8 +20,7 @@ local L = WeakAuras.L
 
 local SpellRange = LibStub("SpellRange-1.0")
 function WeakAuras.IsSpellInRange(spellId, unit)
-  -- WORKAROUND https://wow.curseforge.com/projects/libspellrange-1-0/issues/2
-  return SpellRange.IsSpellInRange(spellId, unit) or IsSpellInRange(spellId, unit);
+  return SpellRange.IsSpellInRange(spellId, unit)
 end
 
 local LibRangeCheck = LibStub("LibRangeCheck-2.0")

From a92c2ea9d3582c757eb076fe809a865b0eecf4e6 Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 8 Jul 2018 14:02:25 +0200
Subject: [PATCH 74/82] Make Raid Buffs not use ownOnly

As it doesn't matter who applies them. Keep them at "player" though.

That's consistent with the other entries, which also only care about
the player.
Maybe moving them to the General section and making them group < 100%
would be better.
---
 WeakAurasTemplates/TriggerTemplates.lua     |  2 +-
 WeakAurasTemplates/TriggerTemplatesData.lua | 27 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/WeakAurasTemplates/TriggerTemplates.lua b/WeakAurasTemplates/TriggerTemplates.lua
index 2dc26aad84..fcec770e95 100644
--- a/WeakAurasTemplates/TriggerTemplates.lua
+++ b/WeakAurasTemplates/TriggerTemplates.lua
@@ -57,7 +57,7 @@ function WeakAuras.CreateTemplateView(frame)
               item.spell
             },
             debuffType = item.type == "buff" and "HELPFUL" or "HARMFUL",
-            ownOnly = true,
+            ownOnly = not item.forceOwnOnly and true or item.ownOnly,
           }
         },
       };
diff --git a/WeakAurasTemplates/TriggerTemplatesData.lua b/WeakAurasTemplates/TriggerTemplatesData.lua
index fc2097b8db..7c725a008e 100644
--- a/WeakAurasTemplates/TriggerTemplatesData.lua
+++ b/WeakAurasTemplates/TriggerTemplatesData.lua
@@ -64,7 +64,7 @@ templates.class.WARRIOR = {
         { spell = 248622, type = "buff", unit = "player", talent = 16}, -- In For The Kill
         { spell = 197690, type = "buff", unit = "player", talent = 12}, -- Defensive Stance
         { spell = 118038, type = "buff", unit = "player"}, -- Die by the Sword
-        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 6673, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Battle Shout
         { spell = 107574, type = "buff", unit = "player", talent = 17}, -- Avatar
         { spell = 262228, type = "buff", unit = "player", talent = 18}, -- Deadly Calm
         { spell = 32216, type = "buff", unit = "player", talent = 5}, -- Victorious
@@ -160,7 +160,7 @@ templates.class.WARRIOR = {
         { spell = 202225, type = "buff", unit = "player", talent = 10}, -- Furious Charge
         { spell = 184362, type = "buff", unit = "player"}, -- Enrage
         { spell = 184364, type = "buff", unit = "player"}, -- Enraged Regeneration
-        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 6673, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Battle Shout
         { spell = 97463, type = "buff", unit = "player"}, -- Rallying Cry
       },
       icon = 136224
@@ -232,7 +232,7 @@ templates.class.WARRIOR = {
         { spell = 871, type = "buff", unit = "player"}, -- Shield Wall
         { spell = 227744, type = "buff", unit = "player", talent = 21}, -- Ravager
         { spell = 202574, type = "buff", unit = "player", talent = 17}, -- Vengeance: Ignore Pain
-        { spell = 6673, type = "buff", unit = "player"}, -- Battle Shout
+        { spell = 6673, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Battle Shout
         { spell = 132404, type = "buff", unit = "player"}, -- Shield Block
         { spell = 202602, type = "buff", unit = "player", talent = 1}, -- Into the Fray
         { spell = 97463, type = "buff", unit = "player"}, -- Rallying Cry
@@ -1177,7 +1177,7 @@ templates.class.PRIEST = {
         { spell = 265258, type = "buff", unit = "player", talent = 2}, -- Twist of Fate
         { spell = 271466, type = "buff", unit = "player", talent = 20}, -- Luminous Barrier
         { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
-        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 21562, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Power Word: Fortitude
         { spell = 81782, type = "buff", unit = "target"}, -- Power Word: Barrier
         { spell = 33206, type = "buff", unit = "group"}, -- Pain Suppression
         { spell = 193065, type = "buff", unit = "player", talent = 5}, -- Masochism
@@ -1262,7 +1262,7 @@ templates.class.PRIEST = {
         { spell = 2096, type = "buff", unit = "player"}, -- Mind Vision
         { spell = 64843, type = "buff", unit = "player"}, -- Divine Hymn
         { spell = 19236, type = "buff", unit = "player"}, -- Desperate Prayer
-        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 21562, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Power Word: Fortitude
         { spell = 111759, type = "buff", unit = "player"}, -- Levitate
         { spell = 200183, type = "buff", unit = "player", talent = 20}, -- Apotheosis
         { spell = 27827, type = "buff", unit = "player"}, -- Spirit of Redemption
@@ -1352,7 +1352,7 @@ templates.class.PRIEST = {
         { spell = 194249, type = "buff", unit = "player"}, -- Voidform
         { spell = 47585, type = "buff", unit = "player"}, -- Dispersion
         { spell = 232698, type = "buff", unit = "player"}, -- Shadowform
-        { spell = 21562, type = "buff", unit = "player"}, -- Power Word: Fortitude
+        { spell = 21562, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Power Word: Fortitude
         { spell = 111759, type = "buff", unit = "player"}, -- Levitate
         { spell = 123254, type = "buff", unit = "player", talent = 7 }, -- Twist of Fate
       },
@@ -1717,7 +1717,7 @@ templates.class.MAGE = {
         { spell = 110960, type = "buff", unit = "player"}, -- Greater Invisibility
         { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
         { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
-        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
+        { spell = 1459, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil}, -- Arcane Intellect
         { spell = 212799, type = "buff", unit = "player"}, -- Displacement Beacon
         { spell = 210126, type = "buff", unit = "player", talent = 3 }, -- Arcane Familiar
         { spell = 236298, type = "buff", unit = "player", talent = 13 }, -- Chrono Shift
@@ -1728,7 +1728,6 @@ templates.class.MAGE = {
         { spell = 12051, type = "buff", unit = "player"}, -- Evocation
         { spell = 205025, type = "buff", unit = "player"}, -- Presence of Mind
         { spell = 264774, type = "buff", unit = "player", talent = 2 }, -- Rule of Threes
-        { spell = 113862, type = "buff", unit = "player"}, -- Greater Invisibility
         { spell = 12042, type = "buff", unit = "player"}, -- Arcane Power
 
       },
@@ -1809,7 +1808,7 @@ templates.class.MAGE = {
         { spell = 157644, type = "buff", unit = "player"}, -- Enhanced Pyrotechnics
         { spell = 190319, type = "buff", unit = "player"}, -- Combustion
         { spell = 66, type = "buff", unit = "player"}, -- Invisibility
-        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
+        { spell = 1459, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Arcane Intellect
         { spell = 130, type = "buff", unit = "player"}, -- Slow Fall
         { spell = 48108, type = "buff", unit = "player"}, -- Hot Streak!
       },
@@ -1884,8 +1883,7 @@ templates.class.MAGE = {
         { spell = 45438, type = "buff", unit = "player"}, -- Ice Block
         { spell = 66, type = "buff", unit = "player"}, -- Invisibility
         { spell = 116267, type = "buff", unit = "player", talent = 7 }, -- Incanter's Flow
-        { spell = 1459, type = "buff", unit = "player"}, -- Arcane Intellect
-        { spell = 32612, type = "buff", unit = "player"}, -- Invisibility
+        { spell = 1459, type = "buff", unit = "player", forceOwnOnly = true, ownOnly = nil }, -- Arcane Intellect
         { spell = 108839, type = "buff", unit = "player", talent = 6 }, -- Ice Floes
         { spell = 278310, type = "buff", unit = "player", talent = 11 }, -- Chain Reaction
         { spell = 12472, type = "buff", unit = "player"}, -- Icy Veins
@@ -3480,9 +3478,12 @@ tinsert(templates.general.args, {
   triggers = {[0] = { trigger = { type = "status", event = "Pet Behavior", unevent = "auto", use_behavior = true, behavior = "assist"}}}
 });
 
-tinsert(templates.general.args, { spell = 2825, type = "buff", unit = "player",
+tinsert(templates.general.args, {
+  spell = 2825, type = "buff", unit = "player",
+  forceOwnOnly = true,
+  ownOnly = nil,
   overideTitle = L["Bloodlust/Heroism"],
-  spellIds = {2825, 32182, 80353, 90355, 160452} } -- TODO 8.0
+  spellIds = {2825, 32182, 80353, 90355, 160452, 264667}}
 );
 
 -- Items section

From 0128295e0a2c0df31bf55804fe10f99f3afea51e Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 8 Jul 2018 14:22:17 +0200
Subject: [PATCH 75/82] Fix ESC handling

Github-Issue: 471
---
 .../OptionsFrames/OptionsFrame.lua            | 29 +++++++++++++++++
 WeakAurasOptions/WeakAurasOptions.lua         | 31 -------------------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index 0091415def..fd471564ae 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -130,6 +130,35 @@ function WeakAuras.CreateFrame()
   local odb = savedVars.odb;
   -------- Mostly Copied from AceGUIContainer-Frame--------
   frame = CreateFrame("FRAME", "WeakAurasOptions", UIParent);
+
+  frame:SetScript("OnHide", function()
+    frame:SetScript("OnUpdate", nil);
+    WeakAuras.SetDragging()
+
+    local tutFrame = WeakAuras.TutorialsFrame and WeakAuras.TutorialsFrame();
+    if(tutFrame and tutFrame:IsVisible()) then
+      tutFrame:Hide();
+    end
+
+    WeakAuras.PauseAllDynamicGroups();
+
+    for id, data in pairs(WeakAuras.regions) do
+      data.region:Collapse();
+    end
+
+    WeakAuras.ResumeAllDynamicGroups();
+
+    WeakAuras.ReloadAll();
+    WeakAuras.Resume();
+
+    if (WeakAuras.mouseFrame) then
+      WeakAuras.mouseFrame:OptionsClosed();
+    end
+    if (WeakAuras.personalRessourceDisplayFrame) then
+      WeakAuras.personalRessourceDisplayFrame:OptionsClosed();
+    end
+  end);
+
   tinsert(UISpecialFrames, frame:GetName());
   frame:SetBackdrop({
     bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background",
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 7b21664e37..ed6eaaf4c2 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -1337,36 +1337,9 @@ function WeakAuras.ShowOptions(msg)
 end
 
 function WeakAuras.HideOptions()
-  -- dynFrame:SetScript("OnUpdate", nil);
-  WeakAuras.UnlockUpdateInfo();
-  WeakAuras.SetDragging()
-
   if(frame) then
     frame:Hide();
   end
-
-  local tutFrame = WeakAuras.TutorialsFrame and WeakAuras.TutorialsFrame();
-  if(tutFrame and tutFrame:IsVisible()) then
-    tutFrame:Hide();
-  end
-
-  WeakAuras.PauseAllDynamicGroups();
-
-  for id, data in pairs(WeakAuras.regions) do
-    data.region:Collapse();
-  end
-
-  WeakAuras.ResumeAllDynamicGroups();
-
-  WeakAuras.ReloadAll();
-  WeakAuras.Resume();
-
-  if (WeakAuras.mouseFrame) then
-    WeakAuras.mouseFrame:OptionsClosed();
-  end
-  if (WeakAuras.personalRessourceDisplayFrame) then
-    WeakAuras.personalRessourceDisplayFrame:OptionsClosed();
-  end
 end
 
 function WeakAuras.IsOptionsOpen()
@@ -1429,10 +1402,6 @@ function WeakAuras.LockUpdateInfo()
   end);
 end
 
-function WeakAuras.UnlockUpdateInfo()
-  frame:SetScript("OnUpdate", nil);
-end
-
 function WeakAuras.SetIconNames(data)
   if (not thumbnails[data.id]) then return end;
   WeakAuras.SetIconName(data, WeakAuras.regions[data.id].region);

From e902d93974eae4498b866ccbd6a95d3494d45b6e Mon Sep 17 00:00:00 2001
From: Infus <infus@squorn.de>
Date: Sun, 8 Jul 2018 19:18:07 +0200
Subject: [PATCH 76/82] Simplify stacks code for Cooldown Progress

I think this should do the same thing, at least the talent switching
and conditions still work. The Prototypes code is a bit too complex
to know for sure though. Someone should clean up how trigger options,
trigger function test, and conditions are defined.
---
 WeakAuras/Prototypes.lua | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index d299235df4..aed9d3c5d1 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -1885,10 +1885,6 @@ WeakAuras.event_prototypes = {
             state.resort = true;
             state.changed = true;
           end
-          if (state.stacks ~= charges) then
-            state.changed = true;
-            state.stacks = charges;
-          end
           state.progressType = 'timed';
         ]=];
       else
@@ -1939,10 +1935,6 @@ WeakAuras.event_prototypes = {
             state.total = nil;
             state.progressType = 'timed';
           end
-          if (state.stacks ~= charges) then
-            state.changed = true;
-            state.stacks = charges;
-          end
         ]=];
         local trackedCharge = tonumber(trigger.trackcharge or 1) or 1;
         ret = ret .. ret2:format(trackedCharge - 1);
@@ -1997,6 +1989,15 @@ WeakAuras.event_prototypes = {
         display = L["Show if Charges"],
         type = "number",
       },
+      {
+        name = "stacks",
+        init = "charges",
+        hidden = true,
+        test = "true",
+        store = true,
+        display = L["Stacks"],
+        conditionType = "number"
+      },
       {
         hidden  = true,
         name = "maxCharges",
@@ -2061,9 +2062,6 @@ WeakAuras.event_prototypes = {
       end
       return icon;
     end,
-    stacksFunc = function(trigger)
-      return WeakAuras.GetSpellCharges(trigger.realSpellName);
-    end,
     hasSpellID = true,
     automaticrequired = true,
     automaticAutoHide = false

From acbb953ecdfa82ba158d33a666b5cf2787989a64 Mon Sep 17 00:00:00 2001
From: asakawa-k <alfiegorrell@gmail.com>
Date: Wed, 27 Jun 2018 16:25:06 +0100
Subject: [PATCH 77/82] Add functions commonly used by custom WA authors

GetUnitAura, GetUnitBuff, GetUnitDebuff - mimicking functionality from pre-8.0
GroupMembers - Very popular in Legion.
ClassColorName - Colors a units name according to their class
---
 WeakAuras/HelperFunctions.lua | 50 +++++++++++++++++++++++++++++++++++
 WeakAuras/WeakAuras.lua       |  2 ++
 WeakAuras/WeakAuras.toc       |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 WeakAuras/HelperFunctions.lua

diff --git a/WeakAuras/HelperFunctions.lua b/WeakAuras/HelperFunctions.lua
new file mode 100644
index 0000000000..781ea4df15
--- /dev/null
+++ b/WeakAuras/HelperFunctions.lua
@@ -0,0 +1,50 @@
+local UnitAura = UnitAura
+-- Unit Aura functions that return info about the first Aura matching the spellName or spellID given on the unit.
+local WA_GetUnitAura = function(unit, spell, filter)
+    for i = 1, 40 do
+        local name, _, _, _, _, _, _, _, _, spellId = UnitAura(unit, i, filter)
+        if not name then return end
+        if spell == spellId or spell == name then
+            return UnitAura(unit, i, filter)
+        end
+    end
+end
+local WA_GetUnitBuff = function(unit, spell, filter)
+    return WA_GetUnitAura(unit, spell, filter)
+end
+local WA_GetUnitDebuff = function(unit, spell, filter)
+    filter = filter and filter.."|HARMFUL" or "HARMFUL"
+    return WA_GetUnitAura(unit, spell, filter)
+end
+
+-- Function to assist iterating group members whether in a party or raid.
+local WA_IterateGroupMembers = function(reversed, forceParty)
+   local unit  = (not forceParty and IsInRaid()) and 'raid' or 'party'
+   local numGroupMembers = (forceParty and GetNumSubgroupMembers()  or GetNumGroupMembers()) - (unit == "party" and 1 or 0)
+   local i = reversed and numGroupMembers or (unit == 'party' and 0 or 1)
+   return function()
+      local ret
+      if i == 0 and unit == 'party' then
+         ret = 'player'
+      elseif i <= numGroupMembers and i > 0 then
+         ret = unit .. i
+      end
+      i = i + (reversed and -1 or 1)
+      return ret
+   end
+end
+
+-- Wrapping a unit's name in its class colour is very common in custom Auras
+local WA_ClassColorName = function(unit)
+    local _, class = UnitClass(unit)
+    if not class then return end
+    return RAID_CLASS_COLORS[class]:WrapTextInColorCode(UnitName(unit))
+end
+
+WeakAuras.helperFunctions = {
+  WA_GetUnitAura = WA_GetUnitAura,
+  WA_GetUnitBuff = WA_GetUnitBuff,
+  WA_GetUnitDebuff = WA_GetUnitDebuff,
+  WA_IterateGroupMembers = WA_IterateGroupMembers,
+  WA_ClassColorName = WA_ClassColorName,
+}
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index a91be9f834..9ce372f7ca 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -458,6 +458,8 @@ local exec_env = setmetatable({}, { __index =
       return forbidden
     elseif overrideFunctions[k] then
       return overrideFunctions[k]
+    elseif WeakAuras.helperFunctions[k] then
+      return WeakAuras.helperFunctions[k]
     else
       return _G[k]
     end
diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index db1efcafca..bc2b0016e8 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -27,6 +27,7 @@ WeakAuras.lua
 Transmission.lua
 BuffTrigger.lua
 GenericTrigger.lua
+HelperFunctions.lua
 
 RegionTypes\RegionPrototype.lua
 RegionTypes\ProgressTexture.lua

From ab5b656f2c9109d7c193b82dd4d089c693a283d3 Mon Sep 17 00:00:00 2001
From: Allen Leigh Faure <afaure6@gmail.com>
Date: Sun, 8 Jul 2018 15:41:45 -0500
Subject: [PATCH 78/82] partial reversion 0128295

This fixes github issue 474, though why exactly i am not sure.
Something about the options frame is interfering with the loaded state
of an aura in such a way as to make triggerStates forget about auras
that should be loaded.
---
 WeakAurasOptions/OptionsFrames/OptionsFrame.lua | 2 +-
 WeakAurasOptions/WeakAurasOptions.lua           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index fd471564ae..5c57d54a0d 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -132,7 +132,7 @@ function WeakAuras.CreateFrame()
   frame = CreateFrame("FRAME", "WeakAurasOptions", UIParent);
 
   frame:SetScript("OnHide", function()
-    frame:SetScript("OnUpdate", nil);
+    WeakAuras.UnlockUpdateInfo();
     WeakAuras.SetDragging()
 
     local tutFrame = WeakAuras.TutorialsFrame and WeakAuras.TutorialsFrame();
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index ed6eaaf4c2..053f5df37e 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -1402,6 +1402,12 @@ function WeakAuras.LockUpdateInfo()
   end);
 end
 
+function WeakAuras.UnlockUpdateInfo()
+  if frame then
+    frame:SetScript("OnUpdate", nil);
+  end
+end
+
 function WeakAuras.SetIconNames(data)
   if (not thumbnails[data.id]) then return end;
   WeakAuras.SetIconName(data, WeakAuras.regions[data.id].region);

From 20b7b9204104e811314567715544bab6c72c82ac Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 9 Jul 2018 17:06:17 +0200
Subject: [PATCH 79/82] correct formatting of new HelperFunctions file

---
 WeakAuras/HelperFunctions.lua | 52 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/WeakAuras/HelperFunctions.lua b/WeakAuras/HelperFunctions.lua
index 781ea4df15..7d6d85e6a9 100644
--- a/WeakAuras/HelperFunctions.lua
+++ b/WeakAuras/HelperFunctions.lua
@@ -1,44 +1,46 @@
 local UnitAura = UnitAura
 -- Unit Aura functions that return info about the first Aura matching the spellName or spellID given on the unit.
 local WA_GetUnitAura = function(unit, spell, filter)
-    for i = 1, 40 do
-        local name, _, _, _, _, _, _, _, _, spellId = UnitAura(unit, i, filter)
-        if not name then return end
-        if spell == spellId or spell == name then
-            return UnitAura(unit, i, filter)
-        end
+  for i = 1, 40 do
+    local name, _, _, _, _, _, _, _, _, spellId = UnitAura(unit, i, filter)
+    if not name then return end
+    if spell == spellId or spell == name then
+      return UnitAura(unit, i, filter)
     end
+  end
 end
+
 local WA_GetUnitBuff = function(unit, spell, filter)
-    return WA_GetUnitAura(unit, spell, filter)
+  return WA_GetUnitAura(unit, spell, filter)
 end
+
 local WA_GetUnitDebuff = function(unit, spell, filter)
-    filter = filter and filter.."|HARMFUL" or "HARMFUL"
-    return WA_GetUnitAura(unit, spell, filter)
+  filter = filter and filter.."|HARMFUL" or "HARMFUL"
+  return WA_GetUnitAura(unit, spell, filter)
 end
 
 -- Function to assist iterating group members whether in a party or raid.
 local WA_IterateGroupMembers = function(reversed, forceParty)
-   local unit  = (not forceParty and IsInRaid()) and 'raid' or 'party'
-   local numGroupMembers = (forceParty and GetNumSubgroupMembers()  or GetNumGroupMembers()) - (unit == "party" and 1 or 0)
-   local i = reversed and numGroupMembers or (unit == 'party' and 0 or 1)
-   return function()
-      local ret
-      if i == 0 and unit == 'party' then
-         ret = 'player'
-      elseif i <= numGroupMembers and i > 0 then
-         ret = unit .. i
-      end
-      i = i + (reversed and -1 or 1)
-      return ret
-   end
+  local unit  = (not forceParty and IsInRaid()) and 'raid' or 'party'
+  local numGroupMembers = (forceParty and GetNumSubgroupMembers()  or GetNumGroupMembers()) - (unit == "party" and 1 or 0)
+  local i = reversed and numGroupMembers or (unit == 'party' and 0 or 1)
+  return function()
+    local ret
+    if i == 0 and unit == 'party' then
+      ret = 'player'
+    elseif i <= numGroupMembers and i > 0 then
+      ret = unit .. i
+    end
+    i = i + (reversed and -1 or 1)
+    return ret
+  end
 end
 
 -- Wrapping a unit's name in its class colour is very common in custom Auras
 local WA_ClassColorName = function(unit)
-    local _, class = UnitClass(unit)
-    if not class then return end
-    return RAID_CLASS_COLORS[class]:WrapTextInColorCode(UnitName(unit))
+  local _, class = UnitClass(unit)
+  if not class then return end
+  return RAID_CLASS_COLORS[class]:WrapTextInColorCode(UnitName(unit))
 end
 
 WeakAuras.helperFunctions = {

From 78200c0ff6f721dcaf18685afa2b4164cd9dff6a Mon Sep 17 00:00:00 2001
From: Buds <mrbouyou@gmail.com>
Date: Tue, 10 Jul 2018 19:19:58 +0200
Subject: [PATCH 80/82] OnHide code was run on frame creation, fix #474 (#476)

OnHide code was run on creating WeakAuras Options

move OnHide block after frame:hide()
Github-Issue: 474
---
 .../OptionsFrames/OptionsFrame.lua            | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
index 5c57d54a0d..17abbe49d3 100644
--- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
+++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -130,6 +130,33 @@ function WeakAuras.CreateFrame()
   local odb = savedVars.odb;
   -------- Mostly Copied from AceGUIContainer-Frame--------
   frame = CreateFrame("FRAME", "WeakAurasOptions", UIParent);
+  tinsert(UISpecialFrames, frame:GetName());
+  frame:SetBackdrop({
+    bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background",
+    edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
+    tile = true,
+    tileSize = 32,
+    edgeSize = 32,
+    insets = { left = 8, right = 8, top = 8, bottom = 8 }
+  });
+  frame:SetBackdropColor(0, 0, 0, 1);
+  frame:EnableMouse(true);
+  frame:SetMovable(true);
+  frame:SetResizable(true);
+  frame:SetMinResize(610, 240);
+  frame:SetFrameStrata("DIALOG");
+  frame.window = "default";
+
+  local xOffset, yOffset;
+  if(db.frame) then
+    xOffset, yOffset = db.frame.xOffset, db.frame.yOffset;
+  end
+  if not(xOffset and yOffset) then
+    xOffset = (610 - GetScreenWidth()) / 2;
+    yOffset = (492 - GetScreenHeight()) / 2;
+  end
+  frame:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", xOffset, yOffset);
+  frame:Hide();
 
   frame:SetScript("OnHide", function()
     WeakAuras.UnlockUpdateInfo();
@@ -159,34 +186,6 @@ function WeakAuras.CreateFrame()
     end
   end);
 
-  tinsert(UISpecialFrames, frame:GetName());
-  frame:SetBackdrop({
-    bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background",
-    edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border",
-    tile = true,
-    tileSize = 32,
-    edgeSize = 32,
-    insets = { left = 8, right = 8, top = 8, bottom = 8 }
-  });
-  frame:SetBackdropColor(0, 0, 0, 1);
-  frame:EnableMouse(true);
-  frame:SetMovable(true);
-  frame:SetResizable(true);
-  frame:SetMinResize(610, 240);
-  frame:SetFrameStrata("DIALOG");
-  frame.window = "default";
-
-  local xOffset, yOffset;
-  if(db.frame) then
-    xOffset, yOffset = db.frame.xOffset, db.frame.yOffset;
-  end
-  if not(xOffset and yOffset) then
-    xOffset = (610 - GetScreenWidth()) / 2;
-    yOffset = (492 - GetScreenHeight()) / 2;
-  end
-  frame:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", xOffset, yOffset);
-  frame:Hide();
-
   local width, height;
   if(db.frame) then
     width, height = db.frame.width, db.frame.height;

From ab44440991c9c3048086c5235e4b528063c6dbdf Mon Sep 17 00:00:00 2001
From: Rehok <Rehok@users.noreply.github.com>
Date: Thu, 12 Jul 2018 18:18:27 +0100
Subject: [PATCH 81/82] Cooldown Progress (Equipment Slot): Add Name function

Github-Issue: 482
---
 WeakAuras/Prototypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index aed9d3c5d1..8e7b8df6bf 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2354,7 +2354,7 @@ WeakAuras.event_prototypes = {
       return duration, startTime + duration;
     end,
     nameFunc = function(trigger)
-      return "";
+      return GetItemInfo(GetInventoryItemID("player", trigger.itemSlot));
     end,
     iconFunc = function(trigger)
       return GetInventoryItemTexture("player", trigger.itemSlot or 0) or "Interface\\Icons\\INV_Misc_QuestionMark";

From 9b8f96a7aa4b59fcd167d45130c80e7db023c67e Mon Sep 17 00:00:00 2001
From: Aigars Bedeicis <aigars.bedeicis@edu.rtu.lv>
Date: Fri, 6 Jul 2018 15:31:58 +0300
Subject: [PATCH 82/82] Add Scale option to groups

Ticket-Nr: 827
---
 WeakAuras/RegionTypes/DynamicGroup.lua        |  9 +++++++-
 WeakAuras/RegionTypes/Group.lua               |  4 ++++
 WeakAurasOptions/OptionsFrames/MoverSizer.lua |  4 ++--
 .../RegionOptions/DynamicGroup.lua            | 23 ++++++++++++++++++-
 WeakAurasOptions/RegionOptions/Group.lua      | 21 +++++++++++++++++
 5 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/WeakAuras/RegionTypes/DynamicGroup.lua b/WeakAuras/RegionTypes/DynamicGroup.lua
index 3ad84871ad..9c7555b28f 100644
--- a/WeakAuras/RegionTypes/DynamicGroup.lua
+++ b/WeakAuras/RegionTypes/DynamicGroup.lua
@@ -19,7 +19,8 @@ local default = {
   radius = 200,
   rotation = 0,
   constantFactor = "RADIUS",
-  frameStrata = 1
+  frameStrata = 1,
+  scale = 1,
 };
 
 local function create(parent)
@@ -48,6 +49,9 @@ function WeakAuras.GetPolarCoordinates(x, y, originX, originY)
 end
 
 local function modify(parent, region, data)
+  -- Scale
+  region:SetScale(data.scale and data.scale > 0 and data.scale or 1)
+
   local selfPoint;
   if(data.grow == "RIGHT") then
     selfPoint = "LEFT";
@@ -275,6 +279,9 @@ local function modify(parent, region, data)
     for index, regionData in ipairs(region.controlledRegions) do
       if not(region.trays[regionData.key]) then
         region.trays[regionData.key] = CreateFrame("Frame", nil, region);
+        regionData.region:SetParent(region.trays[regionData.key])
+      else
+        regionData.region:SetParent(region.trays[regionData.key]) -- removing and adding aura back doesnt delete tray, so need to reparent it
       end
       if(regionData.data and regionData.region) then
         local tray = region.trays[regionData.key];
diff --git a/WeakAuras/RegionTypes/Group.lua b/WeakAuras/RegionTypes/Group.lua
index 86e290151d..067acb7b64 100644
--- a/WeakAuras/RegionTypes/Group.lua
+++ b/WeakAuras/RegionTypes/Group.lua
@@ -16,6 +16,7 @@ local default = {
   borderInset            = 11,
   borderSize            = 16,
   borderBackdrop        = "Blizzard Tooltip",
+  scale                 = 1,
 };
 
 -- Called when first creating a new region/display
@@ -76,6 +77,9 @@ local function modify(parent, region, data)
   -- Localize
   local border = region.border;
 
+  -- Scale
+  region:SetScale(data.scale and data.scale > 0 and data.scale or 1)
+
   -- Get overall bounding box
   local leftest, rightest, lowest, highest = 0, 0, 0, 0;
   for index, childId in ipairs(data.controlledChildren) do
diff --git a/WeakAurasOptions/OptionsFrames/MoverSizer.lua b/WeakAurasOptions/OptionsFrames/MoverSizer.lua
index 4165accbbe..f0d2f4dcb3 100644
--- a/WeakAurasOptions/OptionsFrames/MoverSizer.lua
+++ b/WeakAurasOptions/OptionsFrames/MoverSizer.lua
@@ -552,8 +552,8 @@ local function ConstructMoverSizer(parent)
       self.interims[i]:SetPoint("CENTER", self.anchorPointIcon, "CENTER", x, y);
       self.interims[i]:Show();
     end
-
-    self.text:SetText(("(%.2f, %.2f)"):format(dX, dY));
+    local regionScale = self.moving.region:GetScale()
+    self.text:SetText(("(%.2f, %.2f)"):format(dX*1/regionScale, dY*1/regionScale));
     local midx = (distance / 2) * cos(angle);
     local midy = (distance / 2) * sin(angle);
     self.text:SetPoint("CENTER", self.anchorPointIcon, "CENTER", midx, midy);
diff --git a/WeakAurasOptions/RegionOptions/DynamicGroup.lua b/WeakAurasOptions/RegionOptions/DynamicGroup.lua
index 397a079c07..3164dd5781 100644
--- a/WeakAurasOptions/RegionOptions/DynamicGroup.lua
+++ b/WeakAurasOptions/RegionOptions/DynamicGroup.lua
@@ -150,10 +150,31 @@ local function createOptions(id, data)
         data.sortHybridTable[id] = not(cur);
       end,
     },
+    scale = {
+      type = "range",
+      name = L["Group Scale"],
+      order = 50,
+      min = 0.05,
+      softMax = 2,
+      bigStep = 0.05,
+      get = function()
+        return data.scale or 1
+      end,
+      set = function(info, v)
+        data.scale = data.scale or 1
+        local change = 1 - (v/data.scale)
+        data.xOffset = data.xOffset/(1-change)
+        data.yOffset = data.yOffset/(1-change)
+        data.scale = v
+        WeakAuras.Add(data);
+        WeakAuras.SetThumbnail(data);
+        WeakAuras.ResetMoverSizer();
+      end
+    },
     spacer = {
       type = "header",
       name = "",
-      order = 50
+      order = 51
     }
   };
 
diff --git a/WeakAurasOptions/RegionOptions/Group.lua b/WeakAurasOptions/RegionOptions/Group.lua
index 9dbd27d0e8..ff405ff4f2 100644
--- a/WeakAurasOptions/RegionOptions/Group.lua
+++ b/WeakAurasOptions/RegionOptions/Group.lua
@@ -492,6 +492,27 @@ local function createOptions(id, data)
         WeakAuras.ResetMoverSizer();
       end
     },
+    scale = {
+      type = "range",
+      name = L["Group Scale"],
+      order = 45,
+      min = 0.05,
+      softMax = 2,
+      bigStep = 0.05,
+      get = function()
+        return data.scale or 1
+      end,
+      set = function(info, v)
+        data.scale = data.scale or 1
+        local change = 1 - (v/data.scale)
+        data.xOffset = data.xOffset/(1-change)
+        data.yOffset = data.yOffset/(1-change)
+        data.scale = v
+        WeakAuras.Add(data);
+        WeakAuras.SetThumbnail(data);
+        WeakAuras.ResetMoverSizer();
+      end
+    },
   };
 
   return {